From 026284bb2f841eedeab9055506bb3262024d9117 Mon Sep 17 00:00:00 2001
From: Jake Day <jake@ninebysix.com>
Date: Sun, 5 Nov 2017 21:38:20 -0500
Subject: [PATCH] updating to mainline 4.14.0-rc8

---
 kernel/.mailmap                               |   6 +
 .../ABI/testing/sysfs-class-remoteproc        |   4 +-
 .../ABI/testing/sysfs-devices-power           |   4 +-
 .../process/kernel-enforcement-statement.rst  |  22 +++-
 kernel/Kbuild                                 |   1 +
 kernel/Kconfig                                |   1 +
 kernel/MAINTAINERS                            |  21 ++-
 kernel/Makefile                               |   3 +-
 kernel/arch/Kconfig                           |   1 +
 kernel/arch/alpha/Kconfig                     |   1 +
 kernel/arch/alpha/Kconfig.debug               |   1 +
 kernel/arch/alpha/boot/bootloader.lds         |   1 +
 kernel/arch/alpha/boot/bootp.c                |   1 +
 kernel/arch/alpha/boot/bootpz.c               |   1 +
 kernel/arch/alpha/boot/head.S                 |   1 +
 kernel/arch/alpha/boot/main.c                 |   1 +
 kernel/arch/alpha/boot/misc.c                 |   1 +
 kernel/arch/alpha/boot/tools/mkbb.c           |   1 +
 kernel/arch/alpha/boot/tools/objstrip.c       |   1 +
 kernel/arch/alpha/include/asm/Kbuild          |   1 +
 kernel/arch/alpha/include/asm/a.out.h         |   1 +
 kernel/arch/alpha/include/asm/agp.h           |   1 +
 kernel/arch/alpha/include/asm/agp_backend.h   |   1 +
 kernel/arch/alpha/include/asm/atomic.h        |   1 +
 kernel/arch/alpha/include/asm/barrier.h       |   1 +
 kernel/arch/alpha/include/asm/bitops.h        |   1 +
 kernel/arch/alpha/include/asm/bug.h           |   1 +
 kernel/arch/alpha/include/asm/cache.h         |   1 +
 kernel/arch/alpha/include/asm/cacheflush.h    |   1 +
 kernel/arch/alpha/include/asm/checksum.h      |   1 +
 kernel/arch/alpha/include/asm/cmpxchg.h       |   1 +
 kernel/arch/alpha/include/asm/compiler.h      |   1 +
 kernel/arch/alpha/include/asm/console.h       |   1 +
 kernel/arch/alpha/include/asm/core_apecs.h    |   1 +
 kernel/arch/alpha/include/asm/core_cia.h      |   1 +
 kernel/arch/alpha/include/asm/core_irongate.h |   1 +
 kernel/arch/alpha/include/asm/core_lca.h      |   1 +
 kernel/arch/alpha/include/asm/core_marvel.h   |   1 +
 kernel/arch/alpha/include/asm/core_mcpcia.h   |   1 +
 kernel/arch/alpha/include/asm/core_polaris.h  |   1 +
 kernel/arch/alpha/include/asm/core_t2.h       |   1 +
 kernel/arch/alpha/include/asm/core_titan.h    |   1 +
 kernel/arch/alpha/include/asm/core_tsunami.h  |   1 +
 kernel/arch/alpha/include/asm/core_wildfire.h |   1 +
 kernel/arch/alpha/include/asm/delay.h         |   1 +
 kernel/arch/alpha/include/asm/dma-mapping.h   |   1 +
 kernel/arch/alpha/include/asm/dma.h           |   1 +
 kernel/arch/alpha/include/asm/elf.h           |   1 +
 kernel/arch/alpha/include/asm/err_common.h    |   1 +
 kernel/arch/alpha/include/asm/err_ev7.h       |   1 +
 kernel/arch/alpha/include/asm/extable.h       |   1 +
 kernel/arch/alpha/include/asm/fpu.h           |   1 +
 kernel/arch/alpha/include/asm/futex.h         |   1 +
 kernel/arch/alpha/include/asm/gct.h           |   1 +
 kernel/arch/alpha/include/asm/hardirq.h       |   1 +
 kernel/arch/alpha/include/asm/hw_irq.h        |   1 +
 kernel/arch/alpha/include/asm/hwrpb.h         |   1 +
 kernel/arch/alpha/include/asm/io.h            |   1 +
 kernel/arch/alpha/include/asm/io_trivial.h    |   1 +
 kernel/arch/alpha/include/asm/irq.h           |   1 +
 kernel/arch/alpha/include/asm/irqflags.h      |   1 +
 kernel/arch/alpha/include/asm/jensen.h        |   1 +
 kernel/arch/alpha/include/asm/kmap_types.h    |   1 +
 kernel/arch/alpha/include/asm/linkage.h       |   1 +
 kernel/arch/alpha/include/asm/local.h         |   1 +
 kernel/arch/alpha/include/asm/machvec.h       |   1 +
 kernel/arch/alpha/include/asm/mc146818rtc.h   |   1 +
 kernel/arch/alpha/include/asm/mce.h           |   1 +
 kernel/arch/alpha/include/asm/mmu.h           |   1 +
 kernel/arch/alpha/include/asm/mmu_context.h   |   1 +
 kernel/arch/alpha/include/asm/mmzone.h        |   1 +
 kernel/arch/alpha/include/asm/module.h        |   1 +
 kernel/arch/alpha/include/asm/page.h          |   1 +
 kernel/arch/alpha/include/asm/pal.h           |   1 +
 kernel/arch/alpha/include/asm/param.h         |   1 +
 kernel/arch/alpha/include/asm/parport.h       |   1 +
 kernel/arch/alpha/include/asm/pci.h           |   1 +
 kernel/arch/alpha/include/asm/percpu.h        |   1 +
 kernel/arch/alpha/include/asm/pgalloc.h       |   1 +
 kernel/arch/alpha/include/asm/pgtable.h       |   1 +
 kernel/arch/alpha/include/asm/processor.h     |   1 +
 kernel/arch/alpha/include/asm/ptrace.h        |   1 +
 kernel/arch/alpha/include/asm/rwsem.h         |   1 +
 kernel/arch/alpha/include/asm/serial.h        |   1 +
 kernel/arch/alpha/include/asm/shmparam.h      |   1 +
 kernel/arch/alpha/include/asm/signal.h        |   1 +
 kernel/arch/alpha/include/asm/smp.h           |   1 +
 kernel/arch/alpha/include/asm/socket.h        |   1 +
 kernel/arch/alpha/include/asm/special_insns.h |   1 +
 kernel/arch/alpha/include/asm/spinlock.h      |   1 +
 .../arch/alpha/include/asm/spinlock_types.h   |   1 +
 kernel/arch/alpha/include/asm/string.h        |   1 +
 kernel/arch/alpha/include/asm/switch_to.h     |   1 +
 kernel/arch/alpha/include/asm/syscall.h       |   1 +
 kernel/arch/alpha/include/asm/termios.h       |   1 +
 kernel/arch/alpha/include/asm/thread_info.h   |   1 +
 kernel/arch/alpha/include/asm/timex.h         |   1 +
 kernel/arch/alpha/include/asm/tlb.h           |   1 +
 kernel/arch/alpha/include/asm/tlbflush.h      |   1 +
 kernel/arch/alpha/include/asm/topology.h      |   1 +
 kernel/arch/alpha/include/asm/types.h         |   1 +
 kernel/arch/alpha/include/asm/uaccess.h       |   1 +
 kernel/arch/alpha/include/asm/ucontext.h      |   1 +
 kernel/arch/alpha/include/asm/unaligned.h     |   1 +
 kernel/arch/alpha/include/asm/unistd.h        |   1 +
 kernel/arch/alpha/include/asm/user.h          |   1 +
 kernel/arch/alpha/include/asm/vga.h           |   1 +
 .../arch/alpha/include/asm/word-at-a-time.h   |   1 +
 kernel/arch/alpha/include/asm/wrperfmon.h     |   1 +
 kernel/arch/alpha/include/asm/xchg.h          |   1 +
 kernel/arch/alpha/include/uapi/asm/a.out.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/auxvec.h   |   1 +
 .../arch/alpha/include/uapi/asm/bitsperlong.h |   1 +
 .../arch/alpha/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/compiler.h |   1 +
 kernel/arch/alpha/include/uapi/asm/console.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/errno.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/fcntl.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/fpu.h      |   1 +
 kernel/arch/alpha/include/uapi/asm/gentrap.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/ioctl.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/ioctls.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/ipcbuf.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/kvm_para.h |   1 +
 kernel/arch/alpha/include/uapi/asm/mman.h     |   1 +
 kernel/arch/alpha/include/uapi/asm/msgbuf.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/pal.h      |   1 +
 kernel/arch/alpha/include/uapi/asm/param.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/poll.h     |   1 +
 .../arch/alpha/include/uapi/asm/posix_types.h |   1 +
 kernel/arch/alpha/include/uapi/asm/ptrace.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/reg.h      |   1 +
 kernel/arch/alpha/include/uapi/asm/regdef.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/resource.h |   1 +
 kernel/arch/alpha/include/uapi/asm/sembuf.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/setup.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/shmbuf.h   |   1 +
 .../arch/alpha/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/siginfo.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/signal.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/socket.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/sockios.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/stat.h     |   1 +
 kernel/arch/alpha/include/uapi/asm/statfs.h   |   1 +
 kernel/arch/alpha/include/uapi/asm/swab.h     |   1 +
 kernel/arch/alpha/include/uapi/asm/sysinfo.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/termbits.h |   1 +
 kernel/arch/alpha/include/uapi/asm/termios.h  |   1 +
 kernel/arch/alpha/include/uapi/asm/types.h    |   1 +
 kernel/arch/alpha/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/alpha/kernel/Makefile             |   1 +
 kernel/arch/alpha/kernel/asm-offsets.c        |   1 +
 kernel/arch/alpha/kernel/binfmt_loader.c      |   1 +
 kernel/arch/alpha/kernel/console.c            |   1 +
 kernel/arch/alpha/kernel/core_apecs.c         |   1 +
 kernel/arch/alpha/kernel/core_cia.c           |   1 +
 kernel/arch/alpha/kernel/core_irongate.c      |   1 +
 kernel/arch/alpha/kernel/core_lca.c           |   1 +
 kernel/arch/alpha/kernel/core_marvel.c        |   1 +
 kernel/arch/alpha/kernel/core_mcpcia.c        |   1 +
 kernel/arch/alpha/kernel/core_polaris.c       |   1 +
 kernel/arch/alpha/kernel/core_t2.c            |   1 +
 kernel/arch/alpha/kernel/core_titan.c         |   1 +
 kernel/arch/alpha/kernel/core_tsunami.c       |   1 +
 kernel/arch/alpha/kernel/core_wildfire.c      |   1 +
 kernel/arch/alpha/kernel/entry.S              |   1 +
 kernel/arch/alpha/kernel/err_common.c         |   1 +
 kernel/arch/alpha/kernel/err_ev6.c            |   1 +
 kernel/arch/alpha/kernel/err_ev7.c            |   1 +
 kernel/arch/alpha/kernel/err_impl.h           |   1 +
 kernel/arch/alpha/kernel/err_marvel.c         |   1 +
 kernel/arch/alpha/kernel/err_titan.c          |   1 +
 kernel/arch/alpha/kernel/es1888.c             |   1 +
 kernel/arch/alpha/kernel/gct.c                |   1 +
 kernel/arch/alpha/kernel/head.S               |   1 +
 kernel/arch/alpha/kernel/io.c                 |   1 +
 kernel/arch/alpha/kernel/irq.c                |   1 +
 kernel/arch/alpha/kernel/irq_alpha.c          |   1 +
 kernel/arch/alpha/kernel/irq_i8259.c          |   1 +
 kernel/arch/alpha/kernel/irq_impl.h           |   1 +
 kernel/arch/alpha/kernel/irq_pyxis.c          |   1 +
 kernel/arch/alpha/kernel/irq_srm.c            |   1 +
 kernel/arch/alpha/kernel/machvec_impl.h       |   1 +
 kernel/arch/alpha/kernel/osf_sys.c            |   1 +
 kernel/arch/alpha/kernel/pc873xx.c            |   1 +
 kernel/arch/alpha/kernel/pc873xx.h            |   1 +
 kernel/arch/alpha/kernel/pci-noop.c           |   1 +
 kernel/arch/alpha/kernel/pci-sysfs.c          |   1 +
 kernel/arch/alpha/kernel/pci.c                |   1 +
 kernel/arch/alpha/kernel/pci_impl.h           |   1 +
 kernel/arch/alpha/kernel/pci_iommu.c          |   1 +
 kernel/arch/alpha/kernel/perf_event.c         |   1 +
 kernel/arch/alpha/kernel/process.c            |   1 +
 kernel/arch/alpha/kernel/proto.h              |   1 +
 kernel/arch/alpha/kernel/ptrace.c             |   1 +
 kernel/arch/alpha/kernel/rtc.c                |   1 +
 kernel/arch/alpha/kernel/setup.c              |   1 +
 kernel/arch/alpha/kernel/signal.c             |   1 +
 kernel/arch/alpha/kernel/smc37c93x.c          |   1 +
 kernel/arch/alpha/kernel/smp.c                |   1 +
 kernel/arch/alpha/kernel/srmcons.c            |   1 +
 kernel/arch/alpha/kernel/sys_alcor.c          |   1 +
 kernel/arch/alpha/kernel/sys_cabriolet.c      |   1 +
 kernel/arch/alpha/kernel/sys_dp264.c          |   1 +
 kernel/arch/alpha/kernel/sys_eb64p.c          |   1 +
 kernel/arch/alpha/kernel/sys_eiger.c          |   1 +
 kernel/arch/alpha/kernel/sys_jensen.c         |   1 +
 kernel/arch/alpha/kernel/sys_marvel.c         |   1 +
 kernel/arch/alpha/kernel/sys_miata.c          |   1 +
 kernel/arch/alpha/kernel/sys_mikasa.c         |   1 +
 kernel/arch/alpha/kernel/sys_nautilus.c       |   1 +
 kernel/arch/alpha/kernel/sys_noritake.c       |   1 +
 kernel/arch/alpha/kernel/sys_rawhide.c        |   1 +
 kernel/arch/alpha/kernel/sys_ruffian.c        |   1 +
 kernel/arch/alpha/kernel/sys_rx164.c          |   1 +
 kernel/arch/alpha/kernel/sys_sable.c          |   1 +
 kernel/arch/alpha/kernel/sys_sio.c            |   1 +
 kernel/arch/alpha/kernel/sys_sx164.c          |   1 +
 kernel/arch/alpha/kernel/sys_takara.c         |   1 +
 kernel/arch/alpha/kernel/sys_titan.c          |   1 +
 kernel/arch/alpha/kernel/sys_wildfire.c       |   1 +
 kernel/arch/alpha/kernel/systbls.S            |   1 +
 kernel/arch/alpha/kernel/time.c               |   1 +
 kernel/arch/alpha/kernel/traps.c              |   1 +
 kernel/arch/alpha/kernel/vmlinux.lds.S        |   1 +
 kernel/arch/alpha/lib/Makefile                |   1 +
 kernel/arch/alpha/lib/callback_srm.S          |   1 +
 kernel/arch/alpha/lib/checksum.c              |   1 +
 kernel/arch/alpha/lib/clear_page.S            |   1 +
 kernel/arch/alpha/lib/clear_user.S            |   1 +
 kernel/arch/alpha/lib/copy_page.S             |   1 +
 kernel/arch/alpha/lib/copy_user.S             |   1 +
 kernel/arch/alpha/lib/csum_ipv6_magic.S       |   1 +
 kernel/arch/alpha/lib/csum_partial_copy.c     |   1 +
 kernel/arch/alpha/lib/dbg_current.S           |   1 +
 kernel/arch/alpha/lib/dbg_stackcheck.S        |   1 +
 kernel/arch/alpha/lib/dbg_stackkill.S         |   1 +
 kernel/arch/alpha/lib/dec_and_lock.c          |   1 +
 kernel/arch/alpha/lib/divide.S                |   1 +
 kernel/arch/alpha/lib/ev6-clear_page.S        |   1 +
 kernel/arch/alpha/lib/ev6-clear_user.S        |   1 +
 kernel/arch/alpha/lib/ev6-copy_page.S         |   1 +
 kernel/arch/alpha/lib/ev6-copy_user.S         |   1 +
 kernel/arch/alpha/lib/ev6-csum_ipv6_magic.S   |   1 +
 kernel/arch/alpha/lib/ev6-divide.S            |   1 +
 kernel/arch/alpha/lib/ev6-memchr.S            |   1 +
 kernel/arch/alpha/lib/ev6-memcpy.S            |   1 +
 kernel/arch/alpha/lib/ev6-memset.S            |   1 +
 kernel/arch/alpha/lib/ev6-stxcpy.S            |   1 +
 kernel/arch/alpha/lib/ev6-stxncpy.S           |   1 +
 kernel/arch/alpha/lib/ev67-strcat.S           |   1 +
 kernel/arch/alpha/lib/ev67-strchr.S           |   1 +
 kernel/arch/alpha/lib/ev67-strlen.S           |   1 +
 kernel/arch/alpha/lib/ev67-strncat.S          |   1 +
 kernel/arch/alpha/lib/ev67-strrchr.S          |   1 +
 kernel/arch/alpha/lib/fls.c                   |   1 +
 kernel/arch/alpha/lib/fpreg.c                 |   1 +
 kernel/arch/alpha/lib/memcpy.c                |   1 +
 kernel/arch/alpha/lib/memmove.S               |   1 +
 kernel/arch/alpha/lib/memset.S                |   1 +
 kernel/arch/alpha/lib/srm_printk.c            |   1 +
 kernel/arch/alpha/lib/srm_puts.c              |   1 +
 kernel/arch/alpha/lib/stacktrace.c            |   1 +
 kernel/arch/alpha/lib/strcat.S                |   1 +
 kernel/arch/alpha/lib/strchr.S                |   1 +
 kernel/arch/alpha/lib/strcpy.S                |   1 +
 kernel/arch/alpha/lib/strlen.S                |   1 +
 kernel/arch/alpha/lib/strncat.S               |   1 +
 kernel/arch/alpha/lib/strncpy.S               |   1 +
 kernel/arch/alpha/lib/strrchr.S               |   1 +
 kernel/arch/alpha/lib/stxcpy.S                |   1 +
 kernel/arch/alpha/lib/stxncpy.S               |   1 +
 kernel/arch/alpha/lib/udelay.c                |   1 +
 kernel/arch/alpha/math-emu/sfp-util.h         |   1 +
 kernel/arch/alpha/mm/fault.c                  |   1 +
 kernel/arch/alpha/mm/init.c                   |   1 +
 kernel/arch/alpha/mm/numa.c                   |   1 +
 kernel/arch/alpha/oprofile/Makefile           |   1 +
 kernel/arch/arc/Kconfig.debug                 |   1 +
 kernel/arch/arc/boot/Makefile                 |   1 +
 kernel/arch/arc/boot/dts/Makefile             |   1 +
 kernel/arch/arc/include/asm/Kbuild            |   1 +
 kernel/arch/arc/include/asm/entry-arcv2.h     |   1 +
 kernel/arch/arc/include/asm/fb.h              |   1 +
 kernel/arch/arc/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/arc/include/uapi/asm/cachectl.h   |   1 +
 kernel/arch/arc/include/uapi/asm/elf.h        |   1 +
 kernel/arch/arc/include/uapi/asm/page.h       |   1 +
 kernel/arch/arc/include/uapi/asm/ptrace.h     |   1 +
 kernel/arch/arc/include/uapi/asm/sigcontext.h |   1 +
 kernel/arch/arc/include/uapi/asm/signal.h     |   1 +
 kernel/arch/arc/include/uapi/asm/swab.h       |   1 +
 kernel/arch/arc/include/uapi/asm/unistd.h     |   1 +
 kernel/arch/arc/kernel/sys.c                  |   1 +
 kernel/arch/arc/oprofile/Makefile             |   1 +
 kernel/arch/arc/plat-eznps/Kconfig            |   1 +
 kernel/arch/arm/Kconfig                       |   1 +
 kernel/arch/arm/Kconfig-nommu                 |   1 +
 kernel/arch/arm/Kconfig.debug                 |   1 +
 kernel/arch/arm/Makefile                      |   2 +
 kernel/arch/arm/boot/bootp/Makefile           |   1 +
 kernel/arch/arm/boot/bootp/initrd.S           |   1 +
 kernel/arch/arm/boot/bootp/kernel.S           |   1 +
 kernel/arch/arm/boot/compressed/Makefile      |   1 +
 .../arch/arm/boot/compressed/atags_to_fdt.c   |   1 +
 kernel/arch/arm/boot/compressed/big-endian.S  |   1 +
 kernel/arch/arm/boot/compressed/debug.S       |   1 +
 kernel/arch/arm/boot/compressed/decompress.c  |   1 +
 kernel/arch/arm/boot/compressed/head-sa1100.S |   1 +
 .../arch/arm/boot/compressed/head-sharpsl.S   |   1 +
 kernel/arch/arm/boot/compressed/head-xscale.S |   1 +
 kernel/arch/arm/boot/compressed/libfdt_env.h  |   1 +
 kernel/arch/arm/boot/compressed/misc.c        |   1 +
 kernel/arch/arm/boot/compressed/piggy.S       |   1 +
 kernel/arch/arm/boot/compressed/string.c      |   1 +
 kernel/arch/arm/boot/compressed/vmlinux.lds.S |   9 ++
 kernel/arch/arm/boot/dts/Makefile             |   1 +
 .../arm/boot/dts/am57xx-commercial-grade.dtsi |   1 +
 .../arm/boot/dts/am57xx-industrial-grade.dtsi |   1 +
 kernel/arch/arm/boot/dts/armada-375.dtsi      |   4 +-
 kernel/arch/arm/boot/dts/armada-38x.dtsi      |   4 +-
 kernel/arch/arm/boot/dts/armada-39x.dtsi      |   4 +-
 kernel/arch/arm/boot/dts/armv7-m.dtsi         |   1 +
 .../arch/arm/boot/dts/aspeed-ast2500-evb.dts  |   1 +
 .../arm/boot/dts/aspeed-bmc-opp-palmetto.dts  |   1 +
 .../arm/boot/dts/aspeed-bmc-opp-romulus.dts   |   1 +
 kernel/arch/arm/boot/dts/aspeed-g4.dtsi       |   1 +
 kernel/arch/arm/boot/dts/aspeed-g5.dtsi       |   1 +
 kernel/arch/arm/boot/dts/at91-ariettag25.dts  |   1 +
 .../arch/arm/boot/dts/bcm2835-rpi-a-plus.dts  |   1 +
 kernel/arch/arm/boot/dts/bcm2835-rpi-a.dts    |   1 +
 .../arch/arm/boot/dts/bcm2835-rpi-b-plus.dts  |   1 +
 .../arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts  |   1 +
 kernel/arch/arm/boot/dts/bcm2835-rpi-b.dts    |   1 +
 kernel/arch/arm/boot/dts/bcm2835.dtsi         |   1 +
 kernel/arch/arm/boot/dts/bcm2836-rpi-2-b.dts  |   1 +
 kernel/arch/arm/boot/dts/bcm2836.dtsi         |   1 +
 kernel/arch/arm/boot/dts/bcm2837-rpi-3-b.dts  |   1 +
 .../arm/boot/dts/bcm283x-rpi-smsc9512.dtsi    |   1 +
 .../arm/boot/dts/bcm283x-rpi-usb-otg.dtsi     |   1 +
 kernel/arch/arm/boot/dts/bcm63138.dtsi        |   1 +
 .../arm/boot/dts/bcm7445-bcm97445svmb.dts     |   1 +
 kernel/arch/arm/boot/dts/bcm7445.dtsi         |   1 +
 kernel/arch/arm/boot/dts/bcm963138dvt.dts     |   1 +
 kernel/arch/arm/boot/dts/dove-cubox-es.dts    |   1 +
 kernel/arch/arm/boot/dts/dove-cubox.dts       |   1 +
 kernel/arch/arm/boot/dts/dove-d2plug.dts      |   1 +
 kernel/arch/arm/boot/dts/dove-d3plug.dts      |   1 +
 kernel/arch/arm/boot/dts/dove-dove-db.dts     |   1 +
 kernel/arch/arm/boot/dts/dove.dtsi            |   1 +
 kernel/arch/arm/boot/dts/efm32gg-dk3750.dts   |   1 +
 kernel/arch/arm/boot/dts/efm32gg.dtsi         |   1 +
 .../arch/arm/boot/dts/elpida_ecb240abacn.dtsi |   1 +
 kernel/arch/arm/boot/dts/gemini-nas4220b.dts  |   1 +
 kernel/arch/arm/boot/dts/gemini-rut1xx.dts    |   1 +
 kernel/arch/arm/boot/dts/gemini-sq201.dts     |   1 +
 kernel/arch/arm/boot/dts/gemini-wbd111.dts    |   1 +
 kernel/arch/arm/boot/dts/gemini-wbd222.dts    |   1 +
 kernel/arch/arm/boot/dts/gemini.dtsi          |   1 +
 kernel/arch/arm/boot/dts/imx28-apx4devkit.dts |   1 +
 .../arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi   |   1 +
 kernel/arch/arm/boot/dts/integrator.dtsi      |   1 +
 kernel/arch/arm/boot/dts/integratorap.dts     |   1 +
 kernel/arch/arm/boot/dts/integratorcp.dts     |   1 +
 kernel/arch/arm/boot/dts/kirkwood-6192.dtsi   |   1 +
 kernel/arch/arm/boot/dts/kirkwood-6281.dtsi   |   1 +
 kernel/arch/arm/boot/dts/kirkwood-6282.dtsi   |   1 +
 .../arch/arm/boot/dts/kirkwood-98dx4122.dtsi  |   1 +
 .../arch/arm/boot/dts/kirkwood-cloudbox.dts   |   1 +
 kernel/arch/arm/boot/dts/kirkwood-dns320.dts  |   1 +
 kernel/arch/arm/boot/dts/kirkwood-dns325.dts  |   1 +
 kernel/arch/arm/boot/dts/kirkwood-dnskw.dtsi  |   1 +
 .../arch/arm/boot/dts/kirkwood-dockstar.dts   |   1 +
 .../arch/arm/boot/dts/kirkwood-dreamplug.dts  |   1 +
 .../arch/arm/boot/dts/kirkwood-goflexnet.dts  |   1 +
 .../dts/kirkwood-guruplug-server-plus.dts     |   1 +
 kernel/arch/arm/boot/dts/kirkwood-ib62x0.dts  |   1 +
 .../arch/arm/boot/dts/kirkwood-iconnect.dts   |   1 +
 .../arm/boot/dts/kirkwood-iomega_ix2_200.dts  |   1 +
 kernel/arch/arm/boot/dts/kirkwood-is2.dts     |   1 +
 .../arch/arm/boot/dts/kirkwood-km_common.dtsi |   1 +
 .../arm/boot/dts/kirkwood-km_fixedeth.dts     |   1 +
 .../arm/boot/dts/kirkwood-km_kirkwood.dts     |   1 +
 kernel/arch/arm/boot/dts/kirkwood-lschlv2.dts |   1 +
 kernel/arch/arm/boot/dts/kirkwood-lsxhl.dts   |   1 +
 kernel/arch/arm/boot/dts/kirkwood-lsxl.dtsi   |   1 +
 kernel/arch/arm/boot/dts/kirkwood-mplcec4.dts |   1 +
 .../arm/boot/dts/kirkwood-ns2-common.dtsi     |   1 +
 kernel/arch/arm/boot/dts/kirkwood-ns2.dts     |   1 +
 kernel/arch/arm/boot/dts/kirkwood-ns2lite.dts |   1 +
 kernel/arch/arm/boot/dts/kirkwood-ns2max.dts  |   1 +
 kernel/arch/arm/boot/dts/kirkwood-ns2mini.dts |   1 +
 kernel/arch/arm/boot/dts/kirkwood-nsa310.dts  |   1 +
 kernel/arch/arm/boot/dts/kirkwood-nsa310a.dts |   1 +
 .../arm/boot/dts/kirkwood-nsa3x0-common.dtsi  |   1 +
 .../arm/boot/dts/kirkwood-openblocks_a6.dts   |   1 +
 .../boot/dts/kirkwood-pogoplug-series-4.dts   |   1 +
 kernel/arch/arm/boot/dts/kirkwood-topkick.dts |   1 +
 .../arch/arm/boot/dts/kirkwood-ts219-6281.dts |   1 +
 .../arch/arm/boot/dts/kirkwood-ts219-6282.dts |   1 +
 kernel/arch/arm/boot/dts/kirkwood-ts219.dtsi  |   1 +
 kernel/arch/arm/boot/dts/kirkwood.dtsi        |   1 +
 .../arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi |   1 +
 .../arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi |   1 +
 .../arch/arm/boot/dts/omap-zoom-common.dtsi   |   1 +
 kernel/arch/arm/boot/dts/omap2420-n800.dts    |   1 +
 .../arch/arm/boot/dts/omap2420-n810-wimax.dts |   1 +
 kernel/arch/arm/boot/dts/omap2420-n810.dts    |   1 +
 .../arm/boot/dts/omap2420-n8x0-common.dtsi    |   1 +
 kernel/arch/arm/boot/dts/omap3-cm-t3517.dts   |   1 +
 kernel/arch/arm/boot/dts/omap3-cm-t3530.dts   |   1 +
 kernel/arch/arm/boot/dts/omap3-cm-t3730.dts   |   1 +
 kernel/arch/arm/boot/dts/omap3-cm-t3x.dtsi    |   1 +
 kernel/arch/arm/boot/dts/omap3-cm-t3x30.dtsi  |   1 +
 .../arch/arm/boot/dts/omap3-evm-common.dtsi   |   1 +
 .../dts/omap3-panel-sharp-ls037v7dw01.dtsi    |   1 +
 kernel/arch/arm/boot/dts/omap3-sb-t35.dtsi    |   1 +
 kernel/arch/arm/boot/dts/omap3-sbc-t3517.dts  |   1 +
 kernel/arch/arm/boot/dts/omap3-sbc-t3530.dts  |   1 +
 kernel/arch/arm/boot/dts/omap3-sbc-t3730.dts  |   1 +
 kernel/arch/arm/boot/dts/omap5-cm-t54.dts     |   1 +
 kernel/arch/arm/boot/dts/omap5-sbc-t54.dts    |   1 +
 kernel/arch/arm/boot/dts/pxa27x.dtsi          |   1 +
 kernel/arch/arm/boot/dts/pxa3xx.dtsi          |   1 +
 .../qcom-apq8064-arrow-sd-600eval-pins.dtsi   |   1 +
 .../dts/qcom-apq8064-arrow-sd-600eval.dts     |   1 +
 .../boot/dts/qcom-apq8064-asus-nexus7-flo.dts |   1 +
 .../arm/boot/dts/qcom-apq8064-cm-qs600.dts    |   1 +
 .../arm/boot/dts/qcom-apq8064-ifc6410.dts     |   1 +
 .../arch/arm/boot/dts/qcom-apq8064-pins.dtsi  |   1 +
 .../dts/qcom-apq8064-sony-xperia-yuga.dts     |   1 +
 .../arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi  |   1 +
 kernel/arch/arm/boot/dts/qcom-apq8064.dtsi    |   1 +
 .../arm/boot/dts/qcom-apq8074-dragonboard.dts |   1 +
 .../arm/boot/dts/qcom-apq8084-ifc6540.dts     |   1 +
 kernel/arch/arm/boot/dts/qcom-apq8084-mtp.dts |   1 +
 kernel/arch/arm/boot/dts/qcom-apq8084.dtsi    |   1 +
 .../arch/arm/boot/dts/qcom-ipq8064-ap148.dts  |   1 +
 .../arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi  |   1 +
 kernel/arch/arm/boot/dts/qcom-ipq8064.dtsi    |   1 +
 .../arch/arm/boot/dts/qcom-msm8660-surf.dts   |   1 +
 kernel/arch/arm/boot/dts/qcom-msm8660.dtsi    |   1 +
 kernel/arch/arm/boot/dts/qcom-msm8960-cdp.dts |   1 +
 kernel/arch/arm/boot/dts/qcom-msm8960.dtsi    |   1 +
 .../qcom-msm8974-lge-nexus5-hammerhead.dts    |   1 +
 .../dts/qcom-msm8974-sony-xperia-honami.dts   |   1 +
 kernel/arch/arm/boot/dts/qcom-msm8974.dtsi    |   1 +
 kernel/arch/arm/boot/dts/qcom-pm8841.dtsi     |   1 +
 kernel/arch/arm/boot/dts/qcom-pm8941.dtsi     |   1 +
 kernel/arch/arm/boot/dts/qcom-pma8084.dtsi    |   1 +
 kernel/arch/arm/boot/dts/sama5d2-pinfunc.h    |   1 +
 .../arch/arm/boot/dts/samsung_k3pe0e000b.dtsi |   1 +
 kernel/arch/arm/boot/dts/skeleton.dtsi        |   1 +
 kernel/arch/arm/boot/dts/skeleton64.dtsi      |   1 +
 kernel/arch/arm/boot/dts/st-pincfg.h          |   1 +
 .../arch/arm/boot/dts/ste-nomadik-nhk15.dts   |   1 +
 .../arch/arm/boot/dts/ste-nomadik-s8815.dts   |   1 +
 .../arm/boot/dts/ste-nomadik-stn8815.dtsi     |   1 +
 kernel/arch/arm/boot/dts/ste-u300.dts         |   1 +
 kernel/arch/arm/boot/dts/tango4-common.dtsi   |   1 +
 kernel/arch/arm/boot/dts/tango4-smp8758.dtsi  |   1 +
 .../arch/arm/boot/dts/tango4-vantage-1172.dts |   1 +
 kernel/arch/arm/boot/dts/tegra114-dalmore.dts |   1 +
 kernel/arch/arm/boot/dts/tegra114-roth.dts    |   1 +
 kernel/arch/arm/boot/dts/tegra114-tn7.dts     |   1 +
 kernel/arch/arm/boot/dts/tegra114.dtsi        |   1 +
 .../arm/boot/dts/tegra124-jetson-tk1-emc.dtsi |   1 +
 .../arch/arm/boot/dts/tegra124-jetson-tk1.dts |   1 +
 .../arm/boot/dts/tegra124-nyan-big-emc.dtsi   |   1 +
 .../arch/arm/boot/dts/tegra124-nyan-big.dts   |   1 +
 .../arm/boot/dts/tegra124-nyan-blaze-emc.dtsi |   1 +
 .../arch/arm/boot/dts/tegra124-nyan-blaze.dts |   1 +
 kernel/arch/arm/boot/dts/tegra124-nyan.dtsi   |   1 +
 kernel/arch/arm/boot/dts/tegra124-venice2.dts |   1 +
 kernel/arch/arm/boot/dts/tegra124.dtsi        |   1 +
 .../arm/boot/dts/tegra20-colibri-512.dtsi     |   1 +
 kernel/arch/arm/boot/dts/tegra20-harmony.dts  |   1 +
 kernel/arch/arm/boot/dts/tegra20-iris-512.dts |   1 +
 .../arch/arm/boot/dts/tegra20-medcom-wide.dts |   1 +
 kernel/arch/arm/boot/dts/tegra20-paz00.dts    |   1 +
 kernel/arch/arm/boot/dts/tegra20-plutux.dts   |   1 +
 kernel/arch/arm/boot/dts/tegra20-seaboard.dts |   1 +
 .../arch/arm/boot/dts/tegra20-tamonten.dtsi   |   1 +
 kernel/arch/arm/boot/dts/tegra20-tec.dts      |   1 +
 .../arch/arm/boot/dts/tegra20-trimslice.dts   |   1 +
 kernel/arch/arm/boot/dts/tegra20-ventana.dts  |   1 +
 kernel/arch/arm/boot/dts/tegra20.dtsi         |   1 +
 .../arch/arm/boot/dts/tegra30-apalis-eval.dts |   1 +
 kernel/arch/arm/boot/dts/tegra30-apalis.dtsi  |   1 +
 kernel/arch/arm/boot/dts/tegra30-beaver.dts   |   1 +
 .../arch/arm/boot/dts/tegra30-cardhu-a02.dts  |   1 +
 .../arch/arm/boot/dts/tegra30-cardhu-a04.dts  |   1 +
 kernel/arch/arm/boot/dts/tegra30-cardhu.dtsi  |   1 +
 .../arm/boot/dts/tegra30-colibri-eval-v3.dts  |   1 +
 kernel/arch/arm/boot/dts/tegra30-colibri.dtsi |   1 +
 kernel/arch/arm/boot/dts/tegra30.dtsi         |   1 +
 kernel/arch/arm/boot/dts/uniphier-ld4.dtsi    |   9 +-
 kernel/arch/arm/boot/dts/uniphier-pro4.dtsi   |   6 +-
 kernel/arch/arm/boot/dts/uniphier-sld8.dtsi   |   9 +-
 kernel/arch/arm/boot/dts/versatile-ab.dts     |   1 +
 kernel/arch/arm/boot/dts/versatile-pb.dts     |   1 +
 kernel/arch/arm/boot/dts/vexpress-v2m.dtsi    |   1 +
 .../arm/boot/dts/vexpress-v2p-ca15-tc1.dts    |   1 +
 .../arm/boot/dts/vexpress-v2p-ca15_a7.dts     |   1 +
 .../arch/arm/boot/dts/vexpress-v2p-ca5s.dts   |   1 +
 kernel/arch/arm/boot/dts/vexpress-v2p-ca9.dts |   1 +
 kernel/arch/arm/boot/dts/xenvm-4.2.dts        |   1 +
 kernel/arch/arm/boot/dts/zx296702-ad1.dts     |   1 +
 kernel/arch/arm/boot/dts/zx296702.dtsi        |   1 +
 kernel/arch/arm/common/Kconfig                |   1 +
 kernel/arch/arm/common/Makefile               |   1 +
 kernel/arch/arm/crypto/Kconfig                |   1 +
 kernel/arch/arm/crypto/Makefile               |   1 +
 kernel/arch/arm/crypto/sha1.h                 |   1 +
 kernel/arch/arm/crypto/sha256_glue.h          |   1 +
 kernel/arch/arm/crypto/sha512.h               |   1 +
 kernel/arch/arm/include/asm/Kbuild            |   1 -
 kernel/arch/arm/include/asm/arch_timer.h      |   1 +
 kernel/arch/arm/include/asm/barrier.h         |   1 +
 kernel/arch/arm/include/asm/bitops.h          |   1 +
 kernel/arch/arm/include/asm/bitrev.h          |   1 +
 kernel/arch/arm/include/asm/bug.h             |   1 +
 kernel/arch/arm/include/asm/cache.h           |   1 +
 kernel/arch/arm/include/asm/cachetype.h       |   1 +
 kernel/arch/arm/include/asm/checksum.h        |   1 +
 kernel/arch/arm/include/asm/cmpxchg.h         |   1 +
 kernel/arch/arm/include/asm/compiler.h        |   1 +
 kernel/arch/arm/include/asm/cp15.h            |   1 +
 kernel/arch/arm/include/asm/cpuidle.h         |   1 +
 kernel/arch/arm/include/asm/cputype.h         |   1 +
 kernel/arch/arm/include/asm/cti.h             |   1 +
 kernel/arch/arm/include/asm/delay.h           |   1 +
 kernel/arch/arm/include/asm/div64.h           |   1 +
 kernel/arch/arm/include/asm/dma-contiguous.h  |   1 +
 kernel/arch/arm/include/asm/dma-iommu.h       |   1 +
 kernel/arch/arm/include/asm/dma-mapping.h     |   1 +
 kernel/arch/arm/include/asm/dma.h             |   1 +
 kernel/arch/arm/include/asm/ecard.h           |   1 +
 kernel/arch/arm/include/asm/elf.h             |   1 +
 .../arch/arm/include/asm/entry-macro-multi.S  |   1 +
 kernel/arch/arm/include/asm/exception.h       |   1 +
 kernel/arch/arm/include/asm/fiq.h             |   1 +
 kernel/arch/arm/include/asm/fixmap.h          |   1 +
 kernel/arch/arm/include/asm/flat.h            |   1 +
 kernel/arch/arm/include/asm/ftrace.h          |   1 +
 kernel/arch/arm/include/asm/futex.h           |   1 +
 kernel/arch/arm/include/asm/gpio.h            |   1 +
 kernel/arch/arm/include/asm/hardirq.h         |   1 +
 kernel/arch/arm/include/asm/hardware/it8152.h |   1 +
 kernel/arch/arm/include/asm/hardware/sa1111.h |   1 +
 kernel/arch/arm/include/asm/highmem.h         |   1 +
 kernel/arch/arm/include/asm/hw_breakpoint.h   |   1 +
 kernel/arch/arm/include/asm/hw_irq.h          |   1 +
 kernel/arch/arm/include/asm/hwcap.h           |   1 +
 kernel/arch/arm/include/asm/hypervisor.h      |   1 +
 kernel/arch/arm/include/asm/ide.h             |   1 +
 kernel/arch/arm/include/asm/idmap.h           |   1 +
 kernel/arch/arm/include/asm/insn.h            |   1 +
 kernel/arch/arm/include/asm/irq.h             |   1 +
 kernel/arch/arm/include/asm/irq_work.h        |   1 +
 kernel/arch/arm/include/asm/irqflags.h        |   1 +
 kernel/arch/arm/include/asm/jump_label.h      |   1 +
 kernel/arch/arm/include/asm/kexec.h           |   1 +
 kernel/arch/arm/include/asm/kgdb.h            |   1 +
 kernel/arch/arm/include/asm/kmap_types.h      |   1 +
 kernel/arch/arm/include/asm/limits.h          |   1 +
 kernel/arch/arm/include/asm/linkage.h         |   1 +
 kernel/arch/arm/include/asm/mc146818rtc.h     |   1 +
 kernel/arch/arm/include/asm/mcs_spinlock.h    |   1 +
 kernel/arch/arm/include/asm/memblock.h        |   1 +
 kernel/arch/arm/include/asm/mmu.h             |   1 +
 kernel/arch/arm/include/asm/module.h          |   1 +
 kernel/arch/arm/include/asm/mpu.h             |   1 +
 kernel/arch/arm/include/asm/nwflash.h         |   1 +
 kernel/arch/arm/include/asm/paravirt.h        |   1 +
 kernel/arch/arm/include/asm/patch.h           |   1 +
 kernel/arch/arm/include/asm/pci.h             |   1 +
 kernel/arch/arm/include/asm/sections.h        |   1 +
 kernel/arch/arm/include/asm/shmparam.h        |   1 +
 kernel/arch/arm/include/asm/signal.h          |   1 +
 kernel/arch/arm/include/asm/smp_plat.h        |   1 +
 kernel/arch/arm/include/asm/smp_scu.h         |   1 +
 kernel/arch/arm/include/asm/smp_twd.h         |   1 +
 kernel/arch/arm/include/asm/sparsemem.h       |   1 +
 kernel/arch/arm/include/asm/spinlock.h        |   1 +
 kernel/arch/arm/include/asm/spinlock_types.h  |   1 +
 kernel/arch/arm/include/asm/stackprotector.h  |   1 +
 kernel/arch/arm/include/asm/stacktrace.h      |   1 +
 kernel/arch/arm/include/asm/string.h          |   1 +
 kernel/arch/arm/include/asm/suspend.h         |   1 +
 kernel/arch/arm/include/asm/swab.h            |   1 +
 kernel/arch/arm/include/asm/switch_to.h       |   1 +
 kernel/arch/arm/include/asm/sync_bitops.h     |   1 +
 kernel/arch/arm/include/asm/syscall.h         |   1 +
 kernel/arch/arm/include/asm/system_info.h     |   1 +
 kernel/arch/arm/include/asm/system_misc.h     |   1 +
 kernel/arch/arm/include/asm/therm.h           |   1 +
 kernel/arch/arm/include/asm/tls.h             |   1 +
 kernel/arch/arm/include/asm/topology.h        |   1 +
 kernel/arch/arm/include/asm/traps.h           |   1 +
 kernel/arch/arm/include/asm/ucontext.h        |   1 +
 kernel/arch/arm/include/asm/unaligned.h       |  27 ++++
 kernel/arch/arm/include/asm/user.h            |   1 +
 kernel/arch/arm/include/asm/v7m.h             |   1 +
 kernel/arch/arm/include/asm/vdso.h            |   1 +
 kernel/arch/arm/include/asm/vfp.h             |   1 +
 kernel/arch/arm/include/asm/vfpmacros.h       |   1 +
 kernel/arch/arm/include/asm/vga.h             |   1 +
 kernel/arch/arm/include/asm/word-at-a-time.h  |   1 +
 kernel/arch/arm/include/asm/xen/events.h      |   1 +
 kernel/arch/arm/include/debug/palmchip.S      |   1 +
 kernel/arch/arm/include/debug/uncompress.h    |   1 +
 kernel/arch/arm/include/uapi/asm/Kbuild       |   1 +
 kernel/arch/arm/include/uapi/asm/auxvec.h     |   1 +
 kernel/arch/arm/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/arm/include/uapi/asm/fcntl.h      |   1 +
 kernel/arch/arm/include/uapi/asm/hwcap.h      |   1 +
 kernel/arch/arm/include/uapi/asm/ioctls.h     |   1 +
 kernel/arch/arm/include/uapi/asm/kvm.h        |   1 +
 kernel/arch/arm/include/uapi/asm/kvm_para.h   |   1 +
 kernel/arch/arm/include/uapi/asm/perf_regs.h  |   1 +
 .../arch/arm/include/uapi/asm/posix_types.h   |   1 +
 kernel/arch/arm/include/uapi/asm/ptrace.h     |   1 +
 kernel/arch/arm/include/uapi/asm/setup.h      |   1 +
 kernel/arch/arm/include/uapi/asm/sigcontext.h |   1 +
 kernel/arch/arm/include/uapi/asm/signal.h     |   1 +
 kernel/arch/arm/include/uapi/asm/stat.h       |   1 +
 kernel/arch/arm/include/uapi/asm/statfs.h     |   1 +
 kernel/arch/arm/include/uapi/asm/swab.h       |   1 +
 kernel/arch/arm/include/uapi/asm/types.h      |   1 +
 kernel/arch/arm/include/uapi/asm/unistd.h     |   1 +
 kernel/arch/arm/kernel/Makefile               |   1 +
 kernel/arch/arm/kernel/atags.h                |   1 +
 kernel/arch/arm/kernel/atags_proc.c           |   1 +
 kernel/arch/arm/kernel/bios32.c               |   1 +
 kernel/arch/arm/kernel/elf.c                  |   1 +
 kernel/arch/arm/kernel/entry-header.S         |   1 +
 kernel/arch/arm/kernel/fiq.c                  |   1 +
 kernel/arch/arm/kernel/insn.c                 |   1 +
 kernel/arch/arm/kernel/io.c                   |   1 +
 kernel/arch/arm/kernel/jump_label.c           |   1 +
 kernel/arch/arm/kernel/kgdb.c                 |   1 +
 kernel/arch/arm/kernel/machine_kexec.c        |   1 +
 kernel/arch/arm/kernel/module.lds             |   1 +
 kernel/arch/arm/kernel/patch.c                |   1 +
 kernel/arch/arm/kernel/perf_callchain.c       |   1 +
 kernel/arch/arm/kernel/perf_event_v6.c        |   1 +
 kernel/arch/arm/kernel/perf_event_v7.c        |   1 +
 kernel/arch/arm/kernel/perf_event_xscale.c    |   1 +
 kernel/arch/arm/kernel/perf_regs.c            |   1 +
 kernel/arch/arm/kernel/reboot.h               |   1 +
 kernel/arch/arm/kernel/relocate_kernel.S      |   1 +
 kernel/arch/arm/kernel/sleep.S                |   1 +
 kernel/arch/arm/kernel/suspend.c              |   1 +
 kernel/arch/arm/kernel/vmlinux-xip.lds.S      |   1 +
 kernel/arch/arm/kernel/vmlinux.lds.S          |   1 +
 kernel/arch/arm/kvm/Kconfig                   |   1 +
 kernel/arch/arm/kvm/Makefile                  |   1 +
 kernel/arch/arm/kvm/emulate.c                 |   6 +-
 kernel/arch/arm/kvm/hyp/Makefile              |   3 +-
 kernel/arch/arm/kvm/trace.h                   |   1 +
 kernel/arch/arm/lib/Makefile                  |   1 +
 kernel/arch/arm/lib/bitops.h                  |   1 +
 kernel/arch/arm/lib/bswapsdi2.S               |   1 +
 kernel/arch/arm/mach-actions/Kconfig          |   1 +
 kernel/arch/arm/mach-alpine/Kconfig           |   1 +
 kernel/arch/arm/mach-at91/Makefile            |   1 +
 kernel/arch/arm/mach-at91/pm_data-offsets.c   |   1 +
 kernel/arch/arm/mach-axxia/Kconfig            |   1 +
 kernel/arch/arm/mach-axxia/Makefile           |   1 +
 kernel/arch/arm/mach-bcm/Kconfig              |   1 +
 kernel/arch/arm/mach-bcm/bcm63xx_smp.h        |   1 +
 kernel/arch/arm/mach-clps711x/Kconfig         |   1 +
 kernel/arch/arm/mach-clps711x/Makefile        |   1 +
 kernel/arch/arm/mach-cns3xxx/Kconfig          |   1 +
 kernel/arch/arm/mach-cns3xxx/Makefile         |   1 +
 kernel/arch/arm/mach-davinci/Kconfig          |   1 +
 kernel/arch/arm/mach-davinci/Makefile         |   1 +
 kernel/arch/arm/mach-davinci/Makefile.boot    |   1 +
 kernel/arch/arm/mach-davinci/asp.h            |   1 +
 kernel/arch/arm/mach-davinci/ddr2.h           |   1 +
 kernel/arch/arm/mach-davinci/usb-da8xx.c      |   1 +
 kernel/arch/arm/mach-davinci/usb.c            |   1 +
 kernel/arch/arm/mach-digicolor/Kconfig        |   1 +
 kernel/arch/arm/mach-dove/Kconfig             |   1 +
 kernel/arch/arm/mach-dove/Makefile            |   1 +
 kernel/arch/arm/mach-dove/mpp.h               |   1 +
 kernel/arch/arm/mach-ebsa110/io.c             |   1 +
 kernel/arch/arm/mach-efm32/dtmachine.c        |   1 +
 kernel/arch/arm/mach-ep93xx/Makefile          |   1 +
 .../mach-ep93xx/include/mach/ep93xx-regs.h    |   1 +
 .../mach-ep93xx/include/mach/gpio-ep93xx.h    |   1 +
 .../arm/mach-ep93xx/include/mach/hardware.h   |   1 +
 .../arch/arm/mach-ep93xx/include/mach/irqs.h  |   1 +
 .../arm/mach-ep93xx/include/mach/platform.h   |   1 +
 kernel/arch/arm/mach-ep93xx/timer-ep93xx.c    |   1 +
 kernel/arch/arm/mach-ep93xx/ts72xx.h          |   1 +
 kernel/arch/arm/mach-footbridge/Makefile      |   1 +
 kernel/arch/arm/mach-footbridge/cats-hw.c     |   1 +
 kernel/arch/arm/mach-footbridge/cats-pci.c    |   1 +
 kernel/arch/arm/mach-footbridge/common.h      |   1 +
 .../arch/arm/mach-footbridge/dc21285-timer.c  |   1 +
 kernel/arch/arm/mach-footbridge/dma.c         |   1 +
 kernel/arch/arm/mach-footbridge/ebsa285-pci.c |   1 +
 kernel/arch/arm/mach-footbridge/ebsa285.c     |   1 +
 .../arm/mach-footbridge/include/mach/irqs.h   |   1 +
 .../mach-footbridge/include/mach/isa-dma.h    |   1 +
 kernel/arch/arm/mach-footbridge/isa-rtc.c     |   1 +
 kernel/arch/arm/mach-footbridge/isa-timer.c   |   1 +
 .../arch/arm/mach-footbridge/netwinder-hw.c   |   1 +
 .../arch/arm/mach-footbridge/netwinder-pci.c  |   1 +
 .../arch/arm/mach-footbridge/personal-pci.c   |   1 +
 kernel/arch/arm/mach-footbridge/personal.c    |   1 +
 kernel/arch/arm/mach-gemini/board-dt.c        |   1 +
 kernel/arch/arm/mach-highbank/core.h          |   1 +
 kernel/arch/arm/mach-hisi/core.h              |   1 +
 kernel/arch/arm/mach-imx/Makefile             |   1 +
 kernel/arch/arm/mach-imx/cpu.c                |   1 +
 kernel/arch/arm/mach-imx/devices/Makefile     |   1 +
 kernel/arch/arm/mach-imx/ehci.h               |   1 +
 kernel/arch/arm/mach-imx/mx31.h               |   1 +
 kernel/arch/arm/mach-imx/mx35.h               |   1 +
 kernel/arch/arm/mach-imx/pcm037.h             |   1 +
 kernel/arch/arm/mach-imx/ulpi.h               |   1 +
 kernel/arch/arm/mach-integrator/Makefile      |   1 +
 kernel/arch/arm/mach-integrator/cm.h          |   1 +
 kernel/arch/arm/mach-integrator/common.h      |   1 +
 kernel/arch/arm/mach-integrator/impd1.h       |   1 +
 kernel/arch/arm/mach-integrator/lm.h          |   1 +
 kernel/arch/arm/mach-integrator/pci_v3.h      |   1 +
 kernel/arch/arm/mach-iop13xx/Kconfig          |   1 +
 kernel/arch/arm/mach-iop13xx/Makefile         |   1 +
 .../arm/mach-iop13xx/include/mach/hardware.h  |   1 +
 .../arm/mach-iop13xx/include/mach/iop13xx.h   |   1 +
 .../arm/mach-iop13xx/include/mach/iq81340.h   |   1 +
 .../arch/arm/mach-iop13xx/include/mach/irqs.h |   1 +
 .../arm/mach-iop13xx/include/mach/memory.h    |   1 +
 .../arch/arm/mach-iop13xx/include/mach/time.h |   1 +
 .../mach-iop13xx/include/mach/uncompress.h    |   1 +
 kernel/arch/arm/mach-iop13xx/msi.h            |   1 +
 kernel/arch/arm/mach-iop13xx/pci.h            |   1 +
 kernel/arch/arm/mach-iop32x/Kconfig           |   1 +
 kernel/arch/arm/mach-iop32x/Makefile          |   1 +
 kernel/arch/arm/mach-iop32x/gpio-iop32x.h     |   1 +
 .../arch/arm/mach-iop32x/include/mach/adma.h  |   1 +
 .../arm/mach-iop32x/include/mach/glantank.h   |   1 +
 .../arm/mach-iop32x/include/mach/hardware.h   |   1 +
 .../arm/mach-iop32x/include/mach/iq31244.h    |   1 +
 .../arm/mach-iop32x/include/mach/iq80321.h    |   1 +
 .../arch/arm/mach-iop32x/include/mach/n2100.h |   1 +
 .../arch/arm/mach-iop32x/include/mach/time.h  |   1 +
 .../arm/mach-iop32x/include/mach/uncompress.h |   1 +
 .../arch/arm/mach-iop33x/include/mach/adma.h  |   1 +
 .../arm/mach-iop33x/include/mach/hardware.h   |   1 +
 .../arm/mach-iop33x/include/mach/iq80331.h    |   1 +
 .../arm/mach-iop33x/include/mach/iq80332.h    |   1 +
 .../arch/arm/mach-iop33x/include/mach/time.h  |   1 +
 .../arm/mach-iop33x/include/mach/uncompress.h |   1 +
 kernel/arch/arm/mach-ixp4xx/Makefile          |   1 +
 kernel/arch/arm/mach-ixp4xx/avila-setup.c     |   1 +
 kernel/arch/arm/mach-ixp4xx/coyote-setup.c    |   1 +
 kernel/arch/arm/mach-ixp4xx/dsmg600-setup.c   |   1 +
 kernel/arch/arm/mach-ixp4xx/fsg-setup.c       |   1 +
 .../arch/arm/mach-ixp4xx/gateway7001-setup.c  |   1 +
 kernel/arch/arm/mach-ixp4xx/goramo_mlr.c      |   1 +
 .../arch/arm/mach-ixp4xx/include/mach/npe.h   |   1 +
 .../arm/mach-ixp4xx/include/mach/platform.h   |   1 +
 kernel/arch/arm/mach-ixp4xx/ixdp425-setup.c   |   1 +
 kernel/arch/arm/mach-ixp4xx/nas100d-setup.c   |   1 +
 kernel/arch/arm/mach-ixp4xx/nslu2-setup.c     |   1 +
 kernel/arch/arm/mach-ixp4xx/vulcan-setup.c    |   1 +
 kernel/arch/arm/mach-ixp4xx/wg302v2-setup.c   |   1 +
 kernel/arch/arm/mach-keystone/Makefile        |   1 +
 kernel/arch/arm/mach-ks8695/Makefile          |   1 +
 kernel/arch/arm/mach-mmp/Makefile             |   1 +
 kernel/arch/arm/mach-mmp/clock-mmp2.c         |   1 +
 kernel/arch/arm/mach-mmp/clock-pxa168.c       |   1 +
 kernel/arch/arm/mach-mmp/clock-pxa910.c       |   1 +
 kernel/arch/arm/mach-mmp/common.h             |   1 +
 kernel/arch/arm/mach-mmp/cputype.h            |   1 +
 kernel/arch/arm/mach-mmp/devices.h            |   1 +
 kernel/arch/arm/mach-mmp/irqs.h               |   1 +
 kernel/arch/arm/mach-mmp/mfp-mmp2.h           |   1 +
 kernel/arch/arm/mach-mmp/mfp-pxa168.h         |   1 +
 kernel/arch/arm/mach-mmp/mfp-pxa910.h         |   1 +
 kernel/arch/arm/mach-mmp/mfp.h                |   1 +
 kernel/arch/arm/mach-mmp/mmp2.h               |   1 +
 kernel/arch/arm/mach-mmp/pxa168.h             |   1 +
 kernel/arch/arm/mach-mmp/pxa910.h             |   1 +
 kernel/arch/arm/mach-mv78xx0/Makefile         |   1 +
 kernel/arch/arm/mach-mvebu/Makefile           |   1 +
 kernel/arch/arm/mach-omap1/Makefile           |   1 +
 kernel/arch/arm/mach-omap1/camera.h           |   1 +
 .../arch/arm/mach-omap1/include/mach/memory.h |   1 +
 kernel/arch/arm/mach-omap1/include/mach/usb.h |   1 +
 kernel/arch/arm/mach-omap1/mmc.h              |   1 +
 kernel/arch/arm/mach-omap1/reset.c            |   1 +
 kernel/arch/arm/mach-omap1/sram.h             |   1 +
 kernel/arch/arm/mach-omap2/Makefile           |   1 +
 kernel/arch/arm/mach-omap2/clock2xxx.h        |   1 +
 kernel/arch/arm/mach-omap2/clock3xxx.h        |   1 +
 .../arm/mach-omap2/clockdomains2420_data.c    |   1 +
 .../arm/mach-omap2/clockdomains2430_data.c    |   1 +
 .../mach-omap2/clockdomains2xxx_3xxx_data.c   |   1 +
 .../arm/mach-omap2/clockdomains3xxx_data.c    |   1 +
 .../arm/mach-omap2/common-board-devices.h     |   1 +
 kernel/arch/arm/mach-omap2/mmc.h              |   1 +
 kernel/arch/arm/mach-omap2/omap-pm-noop.c     |   1 +
 kernel/arch/arm/mach-omap2/omap-pm.h          |   1 +
 kernel/arch/arm/mach-omap2/opp2420_data.c     |   1 +
 kernel/arch/arm/mach-omap2/opp2430_data.c     |   1 +
 kernel/arch/arm/mach-omap2/opp2xxx.h          |   1 +
 kernel/arch/arm/mach-omap2/usb.h              |   1 +
 kernel/arch/arm/mach-omap2/vp.c               |   1 +
 kernel/arch/arm/mach-orion5x/Makefile         |   1 +
 kernel/arch/arm/mach-orion5x/common.h         |   1 +
 kernel/arch/arm/mach-orion5x/mpp.h            |   1 +
 kernel/arch/arm/mach-orion5x/ts78xx-fpga.h    |   1 +
 kernel/arch/arm/mach-orion5x/tsx09-common.h   |   1 +
 kernel/arch/arm/mach-prima2/Makefile          |   1 +
 kernel/arch/arm/mach-pxa/Makefile             |   1 +
 kernel/arch/arm/mach-pxa/cm-x2xx-pci.h        |   1 +
 kernel/arch/arm/mach-pxa/colibri.h            |   1 +
 kernel/arch/arm/mach-pxa/csb701.c             |   1 +
 kernel/arch/arm/mach-pxa/devices.c            |   1 +
 kernel/arch/arm/mach-pxa/devices.h            |   1 +
 .../arch/arm/mach-pxa/include/mach/addr-map.h |   1 +
 kernel/arch/arm/mach-pxa/include/mach/audio.h |   1 +
 .../arch/arm/mach-pxa/include/mach/bitfield.h |   1 +
 kernel/arch/arm/mach-pxa/include/mach/io.h    |   1 +
 .../arm/mach-pxa/include/mach/regs-ac97.h     |   1 +
 .../arch/arm/mach-pxa/include/mach/regs-lcd.h |   1 +
 .../arch/arm/mach-pxa/include/mach/regs-ost.h |   1 +
 .../arm/mach-pxa/include/mach/regs-uart.h     |   1 +
 kernel/arch/arm/mach-pxa/include/mach/reset.h |   1 +
 .../arch/arm/mach-pxa/include/mach/trizeps4.h |   1 +
 kernel/arch/arm/mach-pxa/littleton.h          |   1 +
 kernel/arch/arm/mach-pxa/mfp-pxa25x.h         |   1 +
 kernel/arch/arm/mach-pxa/mfp-pxa27x.h         |   1 +
 kernel/arch/arm/mach-pxa/mfp-pxa2xx.h         |   1 +
 kernel/arch/arm/mach-pxa/mfp-pxa3xx.h         |   1 +
 kernel/arch/arm/mach-pxa/mioa701.h            |   1 +
 kernel/arch/arm/mach-pxa/mxm8x10.h            |   1 +
 kernel/arch/arm/mach-pxa/pxa25x.h             |   1 +
 kernel/arch/arm/mach-pxa/pxa27x-udc.h         |   1 +
 kernel/arch/arm/mach-pxa/pxa27x.h             |   1 +
 kernel/arch/arm/mach-pxa/pxa300.h             |   1 +
 kernel/arch/arm/mach-pxa/pxa320.h             |   1 +
 kernel/arch/arm/mach-pxa/pxa3xx.h             |   1 +
 kernel/arch/arm/mach-pxa/pxa930.h             |   1 +
 kernel/arch/arm/mach-pxa/regs-rtc.h           |   1 +
 kernel/arch/arm/mach-pxa/regs-u2d.h           |   1 +
 kernel/arch/arm/mach-pxa/smemc.c              |   1 +
 kernel/arch/arm/mach-pxa/zylonite.h           |   1 +
 kernel/arch/arm/mach-rpc/fiq.S                |   1 +
 .../arm/mach-rpc/include/mach/entry-macro.S   |   1 +
 kernel/arch/arm/mach-rpc/irq.c                |   1 +
 .../arch/arm/mach-s3c24xx/include/mach/io.h   |   1 +
 .../arch/arm/mach-s3c64xx/include/mach/dma.h  |   1 +
 .../arch/arm/mach-s3c64xx/include/mach/irqs.h |   1 +
 .../arm/mach-s3c64xx/include/mach/regs-gpio.h |   1 +
 .../arch/arm/mach-s3c64xx/regs-gpio-memport.h |   1 +
 kernel/arch/arm/mach-sa1100/Makefile          |   1 +
 kernel/arch/arm/mach-sa1100/clock.c           |   1 +
 kernel/arch/arm/mach-sa1100/generic.h         |   1 +
 .../arm/mach-sa1100/include/mach/SA-1100.h    |   1 +
 .../arm/mach-sa1100/include/mach/assabet.h    |   1 +
 .../arm/mach-sa1100/include/mach/collie.h     |   1 +
 .../arm/mach-sa1100/include/mach/hardware.h   |   1 +
 .../arch/arm/mach-sa1100/include/mach/irqs.h  |   1 +
 .../arm/mach-sa1100/include/mach/memory.h     |   1 +
 .../arm/mach-sa1100/include/mach/neponset.h   |   1 +
 .../arch/arm/mach-sa1100/include/mach/reset.h |   1 +
 .../arm/mach-sa1100/include/mach/shannon.h    |   1 +
 .../arm/mach-sa1100/include/mach/simpad.h     |   1 +
 .../arm/mach-sa1100/include/mach/uncompress.h |   1 +
 kernel/arch/arm/mach-sa1100/lart.c            |   1 +
 kernel/arch/arm/mach-sa1100/neponset.c        |   1 +
 kernel/arch/arm/mach-sa1100/pleb.c            |   1 +
 kernel/arch/arm/mach-sa1100/shannon.c         |   1 +
 kernel/arch/arm/mach-sa1100/simpad.c          |   1 +
 kernel/arch/arm/mach-shmobile/Makefile        |   1 +
 kernel/arch/arm/mach-shmobile/common.h        |   1 +
 kernel/arch/arm/mach-shmobile/emev2.h         |   1 +
 kernel/arch/arm/mach-shmobile/r8a7779.h       |   1 +
 kernel/arch/arm/mach-shmobile/r8a7790.h       |   1 +
 kernel/arch/arm/mach-shmobile/r8a7791.h       |   1 +
 kernel/arch/arm/mach-shmobile/rcar-gen2.h     |   1 +
 kernel/arch/arm/mach-shmobile/sh73a0.h        |   1 +
 kernel/arch/arm/mach-socfpga/Makefile         |   1 +
 kernel/arch/arm/mach-spear/Makefile           |   1 +
 kernel/arch/arm/mach-tango/Kconfig            |   1 +
 kernel/arch/arm/mach-tango/Makefile           |   1 +
 kernel/arch/arm/mach-tango/platsmp.c          |   1 +
 kernel/arch/arm/mach-tango/pm.c               |   1 +
 kernel/arch/arm/mach-tango/setup.c            |   1 +
 kernel/arch/arm/mach-tango/smc.S              |   1 +
 kernel/arch/arm/mach-tango/smc.h              |   1 +
 kernel/arch/arm/mach-tegra/Kconfig            |   1 +
 kernel/arch/arm/mach-tegra/Makefile           |   1 +
 kernel/arch/arm/mach-u300/Kconfig             |   1 +
 kernel/arch/arm/mach-uniphier/Kconfig         |   1 +
 kernel/arch/arm/mach-ux500/Kconfig            |   1 +
 kernel/arch/arm/mach-versatile/Kconfig        |   1 +
 kernel/arch/arm/mach-vexpress/Kconfig         |   1 +
 kernel/arch/arm/mach-vexpress/Makefile        |   1 +
 kernel/arch/arm/mach-vexpress/v2m.c           |   1 +
 kernel/arch/arm/mach-vt8500/Kconfig           |   1 +
 kernel/arch/arm/mach-w90x900/Kconfig          |   1 +
 kernel/arch/arm/mach-w90x900/Makefile         |   1 +
 kernel/arch/arm/mach-zx/Kconfig               |   1 +
 kernel/arch/arm/mach-zynq/Kconfig             |   1 +
 kernel/arch/arm/mm/Kconfig                    |   1 +
 kernel/arch/arm/mm/Makefile                   |   1 +
 kernel/arch/arm/mm/abort-ev4.S                |   1 +
 kernel/arch/arm/mm/abort-ev4t.S               |   1 +
 kernel/arch/arm/mm/abort-ev5t.S               |   1 +
 kernel/arch/arm/mm/abort-ev5tj.S              |   1 +
 kernel/arch/arm/mm/abort-ev6.S                |   1 +
 kernel/arch/arm/mm/abort-ev7.S                |   1 +
 kernel/arch/arm/mm/abort-lv4t.S               |   1 +
 kernel/arch/arm/mm/abort-macro.S              |   1 +
 kernel/arch/arm/mm/abort-nommu.S              |   1 +
 kernel/arch/arm/mm/dma.h                      |   1 +
 kernel/arch/arm/mm/extable.c                  |   1 +
 kernel/arch/arm/mm/fault.h                    |   1 +
 kernel/arch/arm/mm/fsr-2level.c               |   1 +
 kernel/arch/arm/mm/fsr-3level.c               |   1 +
 kernel/arch/arm/mm/idmap.c                    |   1 +
 kernel/arch/arm/mm/iomap.c                    |   1 +
 kernel/arch/arm/mm/l2c-l2x0-resume.S          |   1 +
 kernel/arch/arm/mm/mm.h                       |   1 +
 kernel/arch/arm/mm/mmap.c                     |   1 +
 kernel/arch/arm/mm/pabort-legacy.S            |   1 +
 kernel/arch/arm/mm/pabort-v6.S                |   1 +
 kernel/arch/arm/mm/pabort-v7.S                |   1 +
 kernel/arch/arm/mm/physaddr.c                 |   1 +
 kernel/arch/arm/mm/proc-macros.S              |   1 +
 kernel/arch/arm/nwfpe/ARM-gcc.h               |   1 +
 kernel/arch/arm/nwfpe/Makefile                |   1 +
 kernel/arch/arm/oprofile/Makefile             |   1 +
 kernel/arch/arm/plat-iop/Makefile             |   1 +
 kernel/arch/arm/plat-omap/Kconfig             |   1 +
 kernel/arch/arm/plat-omap/include/plat/sram.h |   1 +
 .../plat-versatile/include/plat/sched_clock.h |   1 +
 kernel/arch/arm/probes/Makefile               |   1 +
 kernel/arch/arm/probes/kprobes/Makefile       |   1 +
 kernel/arch/arm/tools/Makefile                |   1 +
 kernel/arch/arm/tools/gen-mach-types          |   1 +
 kernel/arch/arm/tools/syscallhdr.sh           |   1 +
 kernel/arch/arm/tools/syscallnr.sh            |   1 +
 kernel/arch/arm/tools/syscalltbl.sh           |   1 +
 kernel/arch/arm/vdso/Makefile                 |   1 +
 kernel/arch/arm/vdso/datapage.S               |   1 +
 kernel/arch/arm64/boot/dts/Makefile           |   1 +
 kernel/arch/arm64/boot/dts/allwinner/Makefile |   1 +
 kernel/arch/arm64/boot/dts/amd/Makefile       |   1 +
 .../boot/dts/amd/amd-overdrive-rev-b0.dts     |   1 +
 .../boot/dts/amd/amd-overdrive-rev-b1.dts     |   1 +
 .../arch/arm64/boot/dts/amd/amd-overdrive.dts |   1 +
 .../arm64/boot/dts/amd/amd-seattle-clks.dtsi  |   1 +
 .../arm64/boot/dts/amd/amd-seattle-soc.dtsi   |   1 +
 .../boot/dts/amd/amd-seattle-xgbe-b.dtsi      |   1 +
 kernel/arch/arm64/boot/dts/amd/husky.dts      |   1 +
 kernel/arch/arm64/boot/dts/amlogic/Makefile   |   1 +
 kernel/arch/arm64/boot/dts/apm/Makefile       |   1 +
 kernel/arch/arm64/boot/dts/arm/Makefile       |   1 +
 .../boot/dts/arm/foundation-v8-gicv3.dts      |   1 +
 .../arch/arm64/boot/dts/arm/foundation-v8.dts |   1 +
 .../arm64/boot/dts/arm/foundation-v8.dtsi     |   1 +
 kernel/arch/arm64/boot/dts/arm/juno-base.dtsi |   1 +
 .../arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi |   1 +
 .../arm64/boot/dts/arm/rtsm_ve-aemv8a.dts     |   1 +
 .../boot/dts/arm/rtsm_ve-motherboard.dtsi     |   1 +
 .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts |   1 +
 kernel/arch/arm64/boot/dts/broadcom/Makefile  |   1 +
 .../boot/dts/broadcom/bcm2837-rpi-3-b.dts     |   1 +
 .../arm64/boot/dts/broadcom/stingray/Makefile |   1 +
 kernel/arch/arm64/boot/dts/cavium/Makefile    |   1 +
 kernel/arch/arm64/boot/dts/exynos/Makefile    |   1 +
 kernel/arch/arm64/boot/dts/freescale/Makefile |   1 +
 kernel/arch/arm64/boot/dts/hisilicon/Makefile |   1 +
 .../boot/dts/hisilicon/hi3660-hikey960.dts    |   1 +
 .../arch/arm64/boot/dts/hisilicon/hi3660.dtsi |   1 +
 .../arm64/boot/dts/hisilicon/hi6220-hikey.dts |   1 +
 .../arch/arm64/boot/dts/hisilicon/hi6220.dtsi |   1 +
 .../boot/dts/hisilicon/hikey-pinctrl.dtsi     |   1 +
 .../boot/dts/hisilicon/hikey960-pinctrl.dtsi  |   1 +
 kernel/arch/arm64/boot/dts/lg/Makefile        |   1 +
 kernel/arch/arm64/boot/dts/lg/lg1312-ref.dts  |   1 +
 kernel/arch/arm64/boot/dts/lg/lg1312.dtsi     |   1 +
 kernel/arch/arm64/boot/dts/lg/lg1313-ref.dts  |   1 +
 kernel/arch/arm64/boot/dts/lg/lg1313.dtsi     |   1 +
 kernel/arch/arm64/boot/dts/marvell/Makefile   |   1 +
 kernel/arch/arm64/boot/dts/mediatek/Makefile  |   1 +
 kernel/arch/arm64/boot/dts/nvidia/Makefile    |   1 +
 .../arm64/boot/dts/nvidia/tegra132-norrin.dts |   1 +
 .../arch/arm64/boot/dts/nvidia/tegra132.dtsi  |   1 +
 .../boot/dts/nvidia/tegra186-p2771-0000.dts   |   1 +
 .../arm64/boot/dts/nvidia/tegra186-p3310.dtsi |   1 +
 .../arch/arm64/boot/dts/nvidia/tegra186.dtsi  |   1 +
 .../arm64/boot/dts/nvidia/tegra210-p2180.dtsi |   1 +
 .../boot/dts/nvidia/tegra210-p2371-0000.dts   |   1 +
 .../boot/dts/nvidia/tegra210-p2371-2180.dts   |   1 +
 .../arm64/boot/dts/nvidia/tegra210-p2530.dtsi |   1 +
 .../arm64/boot/dts/nvidia/tegra210-p2571.dts  |   1 +
 .../arm64/boot/dts/nvidia/tegra210-p2595.dtsi |   1 +
 .../arm64/boot/dts/nvidia/tegra210-p2597.dtsi |   1 +
 .../arm64/boot/dts/nvidia/tegra210-smaug.dts  |   1 +
 .../arch/arm64/boot/dts/nvidia/tegra210.dtsi  |   1 +
 kernel/arch/arm64/boot/dts/qcom/Makefile      |   1 +
 .../boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi  |   1 +
 .../boot/dts/qcom/apq8016-sbc-soc-pins.dtsi   |   1 +
 .../dts/qcom/apq8096-db820c-pmic-pins.dtsi    |   1 +
 kernel/arch/arm64/boot/dts/qcom/pm8004.dtsi   |   1 +
 kernel/arch/arm64/boot/dts/qcom/pm8916.dtsi   |   1 +
 kernel/arch/arm64/boot/dts/qcom/pm8994.dtsi   |   1 +
 kernel/arch/arm64/boot/dts/qcom/pmi8994.dtsi  |   1 +
 kernel/arch/arm64/boot/dts/renesas/Makefile   |   1 +
 kernel/arch/arm64/boot/dts/rockchip/Makefile  |   1 +
 kernel/arch/arm64/boot/dts/socionext/Makefile |   1 +
 .../boot/dts/socionext/uniphier-ld11.dtsi     |   9 +-
 kernel/arch/arm64/boot/dts/sprd/Makefile      |   1 +
 kernel/arch/arm64/crypto/Kconfig              |   1 +
 kernel/arch/arm64/crypto/aes-ce-setkey.h      |   1 +
 kernel/arch/arm64/include/asm/alternative.h   |   1 +
 kernel/arch/arm64/include/asm/asm-uaccess.h   |   1 +
 kernel/arch/arm64/include/asm/bitrev.h        |   1 +
 kernel/arch/arm64/include/asm/boot.h          |   1 +
 kernel/arch/arm64/include/asm/clocksource.h   |   1 +
 kernel/arch/arm64/include/asm/cpuidle.h       |   1 +
 kernel/arch/arm64/include/asm/current.h       |   1 +
 kernel/arch/arm64/include/asm/efi.h           |   1 +
 kernel/arch/arm64/include/asm/extable.h       |   1 +
 kernel/arch/arm64/include/asm/hypervisor.h    |   1 +
 kernel/arch/arm64/include/asm/irq.h           |   1 +
 kernel/arch/arm64/include/asm/irq_work.h      |   1 +
 kernel/arch/arm64/include/asm/kasan.h         |   1 +
 kernel/arch/arm64/include/asm/lse.h           |   1 +
 kernel/arch/arm64/include/asm/mmzone.h        |   1 +
 kernel/arch/arm64/include/asm/numa.h          |   1 +
 kernel/arch/arm64/include/asm/paravirt.h      |   1 +
 kernel/arch/arm64/include/asm/pci.h           |   1 +
 kernel/arch/arm64/include/asm/stack_pointer.h |   1 +
 .../arch/arm64/include/asm/stackprotector.h   |   1 +
 kernel/arch/arm64/include/asm/suspend.h       |   1 +
 kernel/arch/arm64/include/asm/sync_bitops.h   |   1 +
 kernel/arch/arm64/include/asm/topology.h      |   1 +
 kernel/arch/arm64/include/asm/xen/events.h    |   1 +
 kernel/arch/arm64/include/asm/xen/xen-ops.h   |   1 +
 kernel/arch/arm64/include/uapi/asm/Kbuild     |   1 +
 kernel/arch/arm64/include/uapi/asm/auxvec.h   |   1 +
 .../arch/arm64/include/uapi/asm/bitsperlong.h |   1 +
 .../arch/arm64/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/arm64/include/uapi/asm/fcntl.h    |   1 +
 kernel/arch/arm64/include/uapi/asm/hwcap.h    |   1 +
 kernel/arch/arm64/include/uapi/asm/kvm.h      |   1 +
 kernel/arch/arm64/include/uapi/asm/param.h    |   1 +
 .../arch/arm64/include/uapi/asm/perf_regs.h   |   1 +
 .../arch/arm64/include/uapi/asm/posix_types.h |   1 +
 kernel/arch/arm64/include/uapi/asm/ptrace.h   |   1 +
 kernel/arch/arm64/include/uapi/asm/setup.h    |   1 +
 .../arch/arm64/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/arm64/include/uapi/asm/siginfo.h  |   1 +
 kernel/arch/arm64/include/uapi/asm/signal.h   |   1 +
 kernel/arch/arm64/include/uapi/asm/stat.h     |   1 +
 kernel/arch/arm64/include/uapi/asm/statfs.h   |   1 +
 kernel/arch/arm64/include/uapi/asm/ucontext.h |   1 +
 kernel/arch/arm64/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/arm64/kernel/Makefile             |   1 +
 kernel/arch/arm64/kernel/acpi_numa.c          |   1 +
 kernel/arch/arm64/kernel/perf_regs.c          |   1 +
 kernel/arch/arm64/kernel/probes/Makefile      |   1 +
 .../arm64/kernel/probes/kprobes_trampoline.S  |   1 +
 kernel/arch/arm64/kernel/sleep.S              |   1 +
 kernel/arch/arm64/kernel/suspend.c            |   1 +
 .../arm64/kernel/trace-events-emulation.h     |   1 +
 kernel/arch/arm64/kernel/traps.c              |   2 +-
 kernel/arch/arm64/kernel/vdso/Makefile        |   1 +
 .../arm64/kernel/vdso/gen_vdso_offsets.sh     |   1 +
 kernel/arch/arm64/kernel/vmlinux.lds.S        |   1 +
 kernel/arch/arm64/kvm/Kconfig                 |   1 +
 kernel/arch/arm64/kvm/Makefile                |   1 +
 kernel/arch/arm64/kvm/hyp/Makefile            |   3 +-
 kernel/arch/arm64/kvm/inject_fault.c          |  16 ++-
 kernel/arch/arm64/kvm/trace.h                 |   1 +
 kernel/arch/arm64/lib/Makefile                |   1 +
 kernel/arch/arm64/mm/Makefile                 |   1 +
 kernel/arch/arm64/mm/extable.c                |   1 +
 kernel/arch/arm64/mm/physaddr.c               |   1 +
 kernel/arch/arm64/mm/ptdump_debugfs.c         |   1 +
 kernel/arch/blackfin/Kconfig                  |   1 +
 kernel/arch/blackfin/Kconfig.debug            |   1 +
 kernel/arch/blackfin/include/asm/clkdev.h     |   1 +
 kernel/arch/blackfin/include/asm/pci.h        |   1 +
 kernel/arch/blackfin/include/asm/rwlock.h     |   1 +
 .../blackfin/include/mach-common/ports-a.h    |   1 +
 .../blackfin/include/mach-common/ports-b.h    |   1 +
 .../blackfin/include/mach-common/ports-c.h    |   1 +
 .../blackfin/include/mach-common/ports-d.h    |   1 +
 .../blackfin/include/mach-common/ports-e.h    |   1 +
 .../blackfin/include/mach-common/ports-f.h    |   1 +
 .../blackfin/include/mach-common/ports-g.h    |   1 +
 .../blackfin/include/mach-common/ports-h.h    |   1 +
 .../blackfin/include/mach-common/ports-i.h    |   1 +
 .../blackfin/include/mach-common/ports-j.h    |   1 +
 .../blackfin/include/uapi/asm/bfin_sport.h    |   1 +
 .../blackfin/include/uapi/asm/byteorder.h     |   1 +
 .../arch/blackfin/include/uapi/asm/cachectl.h |   1 +
 kernel/arch/blackfin/include/uapi/asm/fcntl.h |   1 +
 .../blackfin/include/uapi/asm/fixed_code.h    |   1 +
 .../arch/blackfin/include/uapi/asm/ioctls.h   |   1 +
 kernel/arch/blackfin/include/uapi/asm/poll.h  |   1 +
 .../blackfin/include/uapi/asm/posix_types.h   |   1 +
 .../arch/blackfin/include/uapi/asm/ptrace.h   |   1 +
 .../blackfin/include/uapi/asm/sigcontext.h    |   1 +
 .../arch/blackfin/include/uapi/asm/siginfo.h  |   1 +
 .../arch/blackfin/include/uapi/asm/signal.h   |   1 +
 kernel/arch/blackfin/include/uapi/asm/stat.h  |   1 +
 kernel/arch/blackfin/include/uapi/asm/swab.h  |   1 +
 .../arch/blackfin/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/blackfin/kernel/Makefile          |   1 +
 .../arch/blackfin/kernel/cplb-nompu/Makefile  |   1 +
 kernel/arch/blackfin/lib/Makefile             |   1 +
 kernel/arch/blackfin/mach-bf518/Kconfig       |   1 +
 .../arch/blackfin/mach-bf518/boards/Kconfig   |   1 +
 kernel/arch/blackfin/mach-bf527/Kconfig       |   1 +
 .../arch/blackfin/mach-bf527/boards/Kconfig   |   1 +
 .../arch/blackfin/mach-bf527/boards/Makefile  |   1 +
 kernel/arch/blackfin/mach-bf533/Kconfig       |   1 +
 .../arch/blackfin/mach-bf533/boards/Kconfig   |   1 +
 .../arch/blackfin/mach-bf533/boards/Makefile  |   1 +
 kernel/arch/blackfin/mach-bf537/Kconfig       |   1 +
 .../arch/blackfin/mach-bf537/boards/Kconfig   |   1 +
 .../arch/blackfin/mach-bf537/boards/Makefile  |   1 +
 kernel/arch/blackfin/mach-bf538/Kconfig       |   1 +
 .../arch/blackfin/mach-bf538/boards/Kconfig   |   1 +
 kernel/arch/blackfin/mach-bf548/Kconfig       |   1 +
 .../arch/blackfin/mach-bf548/boards/Kconfig   |   1 +
 kernel/arch/blackfin/mach-bf561/Kconfig       |   1 +
 .../arch/blackfin/mach-bf561/boards/Kconfig   |   1 +
 kernel/arch/blackfin/mach-bf609/Kconfig       |   1 +
 .../arch/blackfin/mach-bf609/boards/Kconfig   |   1 +
 kernel/arch/blackfin/mach-bf609/clock.c       |   1 +
 kernel/arch/blackfin/mach-bf609/dpm.S         |   1 +
 kernel/arch/blackfin/mach-common/Makefile     |   1 +
 kernel/arch/blackfin/mach-common/clock.h      |   1 +
 kernel/arch/blackfin/oprofile/Makefile        |   1 +
 kernel/arch/c6x/Kconfig                       |   1 +
 kernel/arch/c6x/boot/Makefile                 |   1 +
 kernel/arch/c6x/boot/dts/Makefile             |   1 +
 kernel/arch/c6x/boot/dts/tms320c6455.dtsi     |   1 +
 kernel/arch/c6x/boot/dts/tms320c6457.dtsi     |   1 +
 kernel/arch/c6x/boot/dts/tms320c6472.dtsi     |   1 +
 kernel/arch/c6x/boot/dts/tms320c6474.dtsi     |   1 +
 kernel/arch/c6x/boot/dts/tms320c6678.dtsi     |   1 +
 kernel/arch/c6x/include/asm/flat.h            |   1 +
 kernel/arch/c6x/include/asm/linkage.h         |   1 +
 kernel/arch/c6x/include/asm/megamod-pic.h     |   1 +
 kernel/arch/c6x/include/asm/page.h            |   1 +
 kernel/arch/c6x/include/asm/sections.h        |   1 +
 kernel/arch/c6x/include/asm/timer64.h         |   1 +
 kernel/arch/c6x/include/asm/tlb.h             |   1 +
 kernel/arch/c6x/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/c6x/include/uapi/asm/ptrace.h     |   1 +
 kernel/arch/c6x/include/uapi/asm/setup.h      |   1 +
 kernel/arch/c6x/include/uapi/asm/sigcontext.h |   1 +
 kernel/arch/c6x/include/uapi/asm/swab.h       |   1 +
 kernel/arch/c6x/include/uapi/asm/unistd.h     |   1 +
 kernel/arch/c6x/kernel/Makefile               |   1 +
 kernel/arch/c6x/kernel/asm-offsets.c          |   1 +
 kernel/arch/c6x/kernel/vmlinux.lds.S          |   1 +
 kernel/arch/c6x/platforms/Kconfig             |   1 +
 kernel/arch/cris/Kconfig                      |   1 +
 kernel/arch/cris/Kconfig.debug                |   1 +
 kernel/arch/cris/arch-v10/Kconfig             |   1 +
 kernel/arch/cris/arch-v10/drivers/Kconfig     |   1 +
 kernel/arch/cris/arch-v10/drivers/Makefile    |   1 +
 kernel/arch/cris/arch-v10/drivers/eeprom.c    |   1 +
 kernel/arch/cris/arch-v10/drivers/gpio.c      |   1 +
 kernel/arch/cris/arch-v10/drivers/i2c.c       |   1 +
 kernel/arch/cris/arch-v10/drivers/i2c.h       |   1 +
 .../arch/cris/arch-v10/drivers/sync_serial.c  |   1 +
 kernel/arch/cris/arch-v10/kernel/Makefile     |   1 +
 kernel/arch/cris/arch-v10/kernel/crisksyms.c  |   1 +
 kernel/arch/cris/arch-v10/kernel/debugport.c  |   1 +
 kernel/arch/cris/arch-v10/kernel/dma.c        |   1 +
 kernel/arch/cris/arch-v10/kernel/entry.S      |   1 +
 kernel/arch/cris/arch-v10/kernel/fasttimer.c  |   1 +
 kernel/arch/cris/arch-v10/kernel/head.S       |   1 +
 .../cris/arch-v10/kernel/io_interface_mux.c   |   1 +
 kernel/arch/cris/arch-v10/kernel/irq.c        |   1 +
 kernel/arch/cris/arch-v10/kernel/kgdb.c       |   1 +
 kernel/arch/cris/arch-v10/kernel/process.c    |   1 +
 kernel/arch/cris/arch-v10/kernel/ptrace.c     |   1 +
 kernel/arch/cris/arch-v10/kernel/setup.c      |   1 +
 kernel/arch/cris/arch-v10/kernel/shadows.c    |   1 +
 kernel/arch/cris/arch-v10/kernel/signal.c     |   1 +
 kernel/arch/cris/arch-v10/kernel/time.c       |   1 +
 kernel/arch/cris/arch-v10/kernel/traps.c      |   1 +
 kernel/arch/cris/arch-v10/lib/checksum.S      |   1 +
 kernel/arch/cris/arch-v10/lib/checksumcopy.S  |   1 +
 kernel/arch/cris/arch-v10/lib/csumcpfruser.S  |   1 +
 kernel/arch/cris/arch-v10/lib/dram_init.S     |   1 +
 kernel/arch/cris/arch-v10/lib/hw_settings.S   |   1 +
 kernel/arch/cris/arch-v10/lib/usercopy.c      |   1 +
 kernel/arch/cris/arch-v10/mm/fault.c          |   1 +
 kernel/arch/cris/arch-v10/mm/init.c           |   1 +
 kernel/arch/cris/arch-v10/mm/tlb.c            |   1 +
 kernel/arch/cris/arch-v32/Kconfig             |   1 +
 kernel/arch/cris/arch-v32/drivers/Kconfig     |   1 +
 kernel/arch/cris/arch-v32/drivers/Makefile    |   1 +
 kernel/arch/cris/arch-v32/drivers/cryptocop.c |   1 +
 kernel/arch/cris/arch-v32/drivers/pci/bios.c  |   1 +
 kernel/arch/cris/arch-v32/drivers/pci/dma.c   |   1 +
 kernel/arch/cris/arch-v32/kernel/Makefile     |   1 +
 kernel/arch/cris/arch-v32/kernel/cache.c      |   1 +
 kernel/arch/cris/arch-v32/kernel/cacheflush.S |   1 +
 kernel/arch/cris/arch-v32/kernel/crisksyms.c  |   1 +
 kernel/arch/cris/arch-v32/kernel/debugport.c  |   1 +
 kernel/arch/cris/arch-v32/kernel/entry.S      |   1 +
 kernel/arch/cris/arch-v32/kernel/fasttimer.c  |   1 +
 kernel/arch/cris/arch-v32/kernel/head.S       |   1 +
 kernel/arch/cris/arch-v32/kernel/irq.c        |   1 +
 kernel/arch/cris/arch-v32/kernel/kgdb.c       |   1 +
 kernel/arch/cris/arch-v32/kernel/kgdb_asm.S   |   1 +
 kernel/arch/cris/arch-v32/kernel/process.c    |   1 +
 kernel/arch/cris/arch-v32/kernel/ptrace.c     |   1 +
 kernel/arch/cris/arch-v32/kernel/setup.c      |   1 +
 kernel/arch/cris/arch-v32/kernel/signal.c     |   1 +
 kernel/arch/cris/arch-v32/kernel/time.c       |   1 +
 kernel/arch/cris/arch-v32/kernel/traps.c      |   1 +
 kernel/arch/cris/arch-v32/lib/checksum.S      |   1 +
 kernel/arch/cris/arch-v32/lib/checksumcopy.S  |   1 +
 kernel/arch/cris/arch-v32/lib/csumcpfruser.S  |   1 +
 kernel/arch/cris/arch-v32/lib/delay.c         |   1 +
 kernel/arch/cris/arch-v32/lib/usercopy.c      |   1 +
 kernel/arch/cris/arch-v32/mach-a3/Kconfig     |   1 +
 kernel/arch/cris/arch-v32/mach-a3/arbiter.c   |   1 +
 kernel/arch/cris/arch-v32/mach-a3/dma.c       |   1 +
 kernel/arch/cris/arch-v32/mach-a3/dram_init.S |   1 +
 .../arch/cris/arch-v32/mach-a3/hw_settings.S  |   1 +
 kernel/arch/cris/arch-v32/mach-a3/pinmux.c    |   1 +
 kernel/arch/cris/arch-v32/mach-fs/Kconfig     |   1 +
 kernel/arch/cris/arch-v32/mach-fs/arbiter.c   |   1 +
 kernel/arch/cris/arch-v32/mach-fs/dma.c       |   1 +
 kernel/arch/cris/arch-v32/mach-fs/dram_init.S |   1 +
 .../arch/cris/arch-v32/mach-fs/hw_settings.S  |   1 +
 kernel/arch/cris/arch-v32/mach-fs/pinmux.c    |   1 +
 kernel/arch/cris/arch-v32/mm/init.c           |   1 +
 kernel/arch/cris/arch-v32/mm/intmem.c         |   1 +
 kernel/arch/cris/arch-v32/mm/l2cache.c        |   1 +
 kernel/arch/cris/arch-v32/mm/mmu.S            |   1 +
 kernel/arch/cris/arch-v32/mm/tlb.c            |   1 +
 kernel/arch/cris/boot/Makefile                |   1 +
 kernel/arch/cris/boot/compressed/Makefile     |   1 +
 .../cris/boot/compressed/decompress_v10.lds   |   1 +
 .../cris/boot/compressed/decompress_v32.lds   |   1 +
 kernel/arch/cris/boot/compressed/head_v10.S   |   1 +
 kernel/arch/cris/boot/compressed/head_v32.S   |   1 +
 kernel/arch/cris/boot/compressed/misc.c       |   1 +
 kernel/arch/cris/boot/dts/Makefile            |   1 +
 kernel/arch/cris/boot/dts/artpec3.dtsi        |   1 +
 kernel/arch/cris/boot/dts/dev88.dts           |   1 +
 kernel/arch/cris/boot/dts/etraxfs.dtsi        |   1 +
 kernel/arch/cris/boot/dts/p1343.dts           |   1 +
 kernel/arch/cris/boot/rescue/Makefile         |   1 +
 kernel/arch/cris/boot/rescue/head_v10.S       |   1 +
 kernel/arch/cris/boot/rescue/head_v32.S       |   1 +
 kernel/arch/cris/boot/rescue/kimagerescue.S   |   1 +
 kernel/arch/cris/boot/rescue/rescue_v10.lds   |   1 +
 kernel/arch/cris/boot/rescue/rescue_v32.lds   |   1 +
 kernel/arch/cris/boot/rescue/testrescue.S     |   1 +
 kernel/arch/cris/boot/tools/build.c           |   1 +
 .../arch/cris/include/arch-v10/arch/bitops.h  |   1 +
 kernel/arch/cris/include/arch-v10/arch/bug.h  |   1 +
 .../arch/cris/include/arch-v10/arch/cache.h   |   1 +
 .../cris/include/arch-v10/arch/checksum.h     |   1 +
 .../arch/cris/include/arch-v10/arch/delay.h   |   1 +
 kernel/arch/cris/include/arch-v10/arch/dma.h  |   1 +
 kernel/arch/cris/include/arch-v10/arch/io.h   |   1 +
 .../include/arch-v10/arch/io_interface_mux.h  |   1 +
 kernel/arch/cris/include/arch-v10/arch/irq.h  |   1 +
 .../cris/include/arch-v10/arch/irqflags.h     |   1 +
 .../arch/cris/include/arch-v10/arch/memmap.h  |   1 +
 kernel/arch/cris/include/arch-v10/arch/mmu.h  |   1 +
 .../arch/cris/include/arch-v10/arch/offset.h  |   1 +
 kernel/arch/cris/include/arch-v10/arch/page.h |   1 +
 .../arch/cris/include/arch-v10/arch/pgtable.h |   1 +
 .../cris/include/arch-v10/arch/processor.h    |   1 +
 kernel/arch/cris/include/arch-v10/arch/swab.h |   1 +
 .../arch/cris/include/arch-v10/arch/system.h  |   1 +
 .../cris/include/arch-v10/arch/thread_info.h  |   1 +
 .../arch/cris/include/arch-v10/arch/timex.h   |   1 +
 kernel/arch/cris/include/arch-v10/arch/tlb.h  |   1 +
 .../arch/cris/include/arch-v10/arch/uaccess.h |   1 +
 .../arch/cris/include/arch-v10/arch/unistd.h  |   1 +
 .../arch/cris/include/arch-v32/arch/bitops.h  |   1 +
 kernel/arch/cris/include/arch-v32/arch/bug.h  |   1 +
 .../arch/cris/include/arch-v32/arch/cache.h   |   1 +
 .../cris/include/arch-v32/arch/checksum.h     |   1 +
 .../cris/include/arch-v32/arch/cryptocop.h    |   1 +
 .../arch/cris/include/arch-v32/arch/delay.h   |   1 +
 .../include/arch-v32/arch/hwregs/Makefile     |   1 +
 .../arch-v32/arch/hwregs/asm/ata_defs_asm.h   |   1 +
 .../arch/hwregs/asm/bif_core_defs_asm.h       |   1 +
 .../arch/hwregs/asm/bif_dma_defs_asm.h        |   1 +
 .../arch/hwregs/asm/bif_slave_defs_asm.h      |   1 +
 .../arch/hwregs/asm/config_defs_asm.h         |   1 +
 .../arch-v32/arch/hwregs/asm/cris_defs_asm.h  |   1 +
 .../arch-v32/arch/hwregs/asm/cris_supp_reg.h  |   1 +
 .../arch-v32/arch/hwregs/asm/dma_defs_asm.h   |   1 +
 .../arch-v32/arch/hwregs/asm/eth_defs_asm.h   |   1 +
 .../arch-v32/arch/hwregs/asm/gio_defs_asm.h   |   1 +
 .../arch-v32/arch/hwregs/asm/intr_vect.h      |   1 +
 .../arch/hwregs/asm/intr_vect_defs_asm.h      |   1 +
 .../arch/hwregs/asm/irq_nmi_defs_asm.h        |   1 +
 .../arch-v32/arch/hwregs/asm/marb_defs_asm.h  |   1 +
 .../arch-v32/arch/hwregs/asm/mmu_defs_asm.h   |   1 +
 .../arch-v32/arch/hwregs/asm/mmu_supp_reg.h   |   1 +
 .../arch/hwregs/asm/rt_trace_defs_asm.h       |   1 +
 .../arch-v32/arch/hwregs/asm/ser_defs_asm.h   |   1 +
 .../arch-v32/arch/hwregs/asm/sser_defs_asm.h  |   1 +
 .../arch/hwregs/asm/strcop_defs_asm.h         |   1 +
 .../arch/hwregs/asm/strmux_defs_asm.h         |   1 +
 .../arch-v32/arch/hwregs/asm/timer_defs_asm.h |   1 +
 .../include/arch-v32/arch/hwregs/ata_defs.h   |   1 +
 .../arch-v32/arch/hwregs/bif_core_defs.h      |   1 +
 .../arch-v32/arch/hwregs/bif_dma_defs.h       |   1 +
 .../arch-v32/arch/hwregs/bif_slave_defs.h     |   1 +
 .../arch-v32/arch/hwregs/config_defs.h        |   1 +
 .../include/arch-v32/arch/hwregs/cpu_vect.h   |   1 +
 .../cris/include/arch-v32/arch/hwregs/dma.h   |   1 +
 .../include/arch-v32/arch/hwregs/dma_defs.h   |   1 +
 .../include/arch-v32/arch/hwregs/eth_defs.h   |   1 +
 .../arch-v32/arch/hwregs/extmem_defs.h        |   1 +
 .../include/arch-v32/arch/hwregs/iop/Makefile |   1 +
 .../hwregs/iop/asm/iop_crc_par_defs_asm.h     |   1 +
 .../arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h |   1 +
 .../hwregs/iop/asm/iop_dmc_out_defs_asm.h     |   1 +
 .../hwregs/iop/asm/iop_fifo_in_defs_asm.h     |   1 +
 .../iop/asm/iop_fifo_in_extra_defs_asm.h      |   1 +
 .../hwregs/iop/asm/iop_fifo_out_defs_asm.h    |   1 +
 .../iop/asm/iop_fifo_out_extra_defs_asm.h     |   1 +
 .../arch/hwregs/iop/asm/iop_mpu_defs_asm.h    |   1 +
 .../arch/hwregs/iop/asm/iop_reg_space_asm.h   |   1 +
 .../arch/hwregs/iop/asm/iop_sap_in_defs_asm.h |   1 +
 .../hwregs/iop/asm/iop_sap_out_defs_asm.h     |   1 +
 .../hwregs/iop/asm/iop_scrc_in_defs_asm.h     |   1 +
 .../hwregs/iop/asm/iop_scrc_out_defs_asm.h    |   1 +
 .../arch/hwregs/iop/asm/iop_spu_defs_asm.h    |   1 +
 .../arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h |   1 +
 .../arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h |   1 +
 .../arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h |   1 +
 .../arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h |   1 +
 .../hwregs/iop/asm/iop_timer_grp_defs_asm.h   |   1 +
 .../hwregs/iop/asm/iop_trigger_grp_defs_asm.h |   1 +
 .../hwregs/iop/asm/iop_version_defs_asm.h     |   1 +
 .../arch/hwregs/iop/iop_crc_par_defs.h        |   1 +
 .../arch/hwregs/iop/iop_dmc_in_defs.h         |   1 +
 .../arch/hwregs/iop/iop_dmc_out_defs.h        |   1 +
 .../arch/hwregs/iop/iop_fifo_in_defs.h        |   1 +
 .../arch/hwregs/iop/iop_fifo_in_extra_defs.h  |   1 +
 .../arch/hwregs/iop/iop_fifo_out_defs.h       |   1 +
 .../arch/hwregs/iop/iop_fifo_out_extra_defs.h |   1 +
 .../arch-v32/arch/hwregs/iop/iop_mpu_defs.h   |   1 +
 .../arch-v32/arch/hwregs/iop/iop_mpu_macros.h |   1 +
 .../arch-v32/arch/hwregs/iop/iop_reg_space.h  |   1 +
 .../arch/hwregs/iop/iop_sap_in_defs.h         |   1 +
 .../arch/hwregs/iop/iop_sap_out_defs.h        |   1 +
 .../arch/hwregs/iop/iop_scrc_in_defs.h        |   1 +
 .../arch/hwregs/iop/iop_scrc_out_defs.h       |   1 +
 .../arch-v32/arch/hwregs/iop/iop_spu_defs.h   |   1 +
 .../arch/hwregs/iop/iop_sw_cfg_defs.h         |   1 +
 .../arch/hwregs/iop/iop_sw_cpu_defs.h         |   1 +
 .../arch/hwregs/iop/iop_sw_mpu_defs.h         |   1 +
 .../arch/hwregs/iop/iop_sw_spu_defs.h         |   1 +
 .../arch/hwregs/iop/iop_timer_grp_defs.h      |   1 +
 .../arch/hwregs/iop/iop_trigger_grp_defs.h    |   1 +
 .../arch/hwregs/iop/iop_version_defs.h        |   1 +
 .../arch-v32/arch/hwregs/irq_nmi_defs.h       |   1 +
 .../arch-v32/arch/hwregs/marb_bp_defs.h       |   1 +
 .../include/arch-v32/arch/hwregs/marb_defs.h  |   1 +
 .../include/arch-v32/arch/hwregs/reg_rdwr.h   |   1 +
 .../arch-v32/arch/hwregs/rt_trace_defs.h      |   1 +
 .../include/arch-v32/arch/hwregs/ser_defs.h   |   1 +
 .../include/arch-v32/arch/hwregs/sser_defs.h  |   1 +
 .../include/arch-v32/arch/hwregs/strcop.h     |   1 +
 .../arch-v32/arch/hwregs/strcop_defs.h        |   1 +
 .../include/arch-v32/arch/hwregs/supp_reg.h   |   1 +
 .../arch/cris/include/arch-v32/arch/intmem.h  |   1 +
 kernel/arch/cris/include/arch-v32/arch/irq.h  |   1 +
 .../cris/include/arch-v32/arch/irqflags.h     |   1 +
 kernel/arch/cris/include/arch-v32/arch/mmu.h  |   1 +
 .../arch/cris/include/arch-v32/arch/offset.h  |   1 +
 kernel/arch/cris/include/arch-v32/arch/page.h |   1 +
 .../arch/cris/include/arch-v32/arch/pgtable.h |   1 +
 .../cris/include/arch-v32/arch/processor.h    |   1 +
 kernel/arch/cris/include/arch-v32/arch/swab.h |   1 +
 .../arch/cris/include/arch-v32/arch/system.h  |   1 +
 .../cris/include/arch-v32/arch/thread_info.h  |   1 +
 .../arch/cris/include/arch-v32/arch/timex.h   |   1 +
 kernel/arch/cris/include/arch-v32/arch/tlb.h  |   1 +
 .../arch/cris/include/arch-v32/arch/uaccess.h |   1 +
 .../arch/cris/include/arch-v32/arch/unistd.h  |   1 +
 .../include/arch-v32/mach-a3/mach/arbiter.h   |   1 +
 .../cris/include/arch-v32/mach-a3/mach/dma.h  |   1 +
 .../mach-a3/mach/hwregs/asm/clkgen_defs_asm.h |   1 +
 .../mach-a3/mach/hwregs/asm/ddr2_defs_asm.h   |   1 +
 .../mach-a3/mach/hwregs/asm/gio_defs_asm.h    |   1 +
 .../mach-a3/mach/hwregs/asm/pinmux_defs_asm.h |   1 +
 .../mach-a3/mach/hwregs/asm/pio_defs_asm.h    |   1 +
 .../mach-a3/mach/hwregs/asm/reg_map_asm.h     |   1 +
 .../mach-a3/mach/hwregs/asm/timer_defs_asm.h  |   1 +
 .../mach-a3/mach/hwregs/clkgen_defs.h         |   1 +
 .../arch-v32/mach-a3/mach/hwregs/ddr2_defs.h  |   1 +
 .../arch-v32/mach-a3/mach/hwregs/gio_defs.h   |   1 +
 .../arch-v32/mach-a3/mach/hwregs/intr_vect.h  |   1 +
 .../mach-a3/mach/hwregs/intr_vect_defs.h      |   1 +
 .../mach/hwregs/iop/asm/iop_reg_space_asm.h   |   1 +
 .../mach/hwregs/iop/asm/iop_sap_in_defs_asm.h |   1 +
 .../hwregs/iop/asm/iop_sap_out_defs_asm.h     |   1 +
 .../mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h |   1 +
 .../mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h |   1 +
 .../mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h |   1 +
 .../mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h |   1 +
 .../hwregs/iop/asm/iop_version_defs_asm.h     |   1 +
 .../mach-a3/mach/hwregs/iop/iop_reg_space.h   |   1 +
 .../mach-a3/mach/hwregs/iop/iop_sap_in_defs.h |   1 +
 .../mach/hwregs/iop/iop_sap_out_defs.h        |   1 +
 .../mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h |   1 +
 .../mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h |   1 +
 .../mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h |   1 +
 .../mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h |   1 +
 .../mach/hwregs/iop/iop_version_defs.h        |   1 +
 .../mach-a3/mach/hwregs/l2cache_defs.h        |   1 +
 .../mach-a3/mach/hwregs/marb_bar_defs.h       |   1 +
 .../mach-a3/mach/hwregs/marb_foo_defs.h       |   1 +
 .../mach-a3/mach/hwregs/pinmux_defs.h         |   1 +
 .../arch-v32/mach-a3/mach/hwregs/pio_defs.h   |   1 +
 .../arch-v32/mach-a3/mach/hwregs/reg_map.h    |   1 +
 .../mach-a3/mach/hwregs/strmux_defs.h         |   1 +
 .../arch-v32/mach-a3/mach/hwregs/timer_defs.h |   1 +
 .../include/arch-v32/mach-a3/mach/memmap.h    |   1 +
 .../include/arch-v32/mach-a3/mach/pinmux.h    |   1 +
 .../include/arch-v32/mach-fs/mach/arbiter.h   |   1 +
 .../cris/include/arch-v32/mach-fs/mach/dma.h  |   1 +
 .../mach/hwregs/asm/bif_core_defs_asm.h       |   1 +
 .../mach-fs/mach/hwregs/asm/config_defs_asm.h |   1 +
 .../mach-fs/mach/hwregs/asm/gio_defs_asm.h    |   1 +
 .../mach-fs/mach/hwregs/asm/pinmux_defs_asm.h |   1 +
 .../mach-fs/mach/hwregs/asm/reg_map_asm.h     |   1 +
 .../mach-fs/mach/hwregs/asm/timer_defs_asm.h  |   1 +
 .../mach-fs/mach/hwregs/bif_core_defs.h       |   1 +
 .../mach-fs/mach/hwregs/bif_dma_defs.h        |   1 +
 .../mach-fs/mach/hwregs/bif_slave_defs.h      |   1 +
 .../mach-fs/mach/hwregs/config_defs.h         |   1 +
 .../arch-v32/mach-fs/mach/hwregs/gio_defs.h   |   1 +
 .../arch-v32/mach-fs/mach/hwregs/intr_vect.h  |   1 +
 .../mach-fs/mach/hwregs/intr_vect_defs.h      |   1 +
 .../mach-fs/mach/hwregs/marb_bp_defs.h        |   1 +
 .../arch-v32/mach-fs/mach/hwregs/marb_defs.h  |   1 +
 .../mach-fs/mach/hwregs/pinmux_defs.h         |   1 +
 .../arch-v32/mach-fs/mach/hwregs/reg_map.h    |   1 +
 .../mach-fs/mach/hwregs/strmux_defs.h         |   1 +
 .../arch-v32/mach-fs/mach/hwregs/timer_defs.h |   1 +
 .../include/arch-v32/mach-fs/mach/memmap.h    |   1 +
 .../include/arch-v32/mach-fs/mach/pinmux.h    |   1 +
 kernel/arch/cris/include/asm/axisflashmap.h   |   1 +
 kernel/arch/cris/include/asm/bitops.h         |   1 +
 kernel/arch/cris/include/asm/bug.h            |   1 +
 kernel/arch/cris/include/asm/cache.h          |   1 +
 kernel/arch/cris/include/asm/cacheflush.h     |   1 +
 kernel/arch/cris/include/asm/checksum.h       |   1 +
 kernel/arch/cris/include/asm/delay.h          |   1 +
 kernel/arch/cris/include/asm/dma-mapping.h    |   1 +
 kernel/arch/cris/include/asm/dma.h            |   1 +
 kernel/arch/cris/include/asm/eshlibld.h       |   1 +
 kernel/arch/cris/include/asm/etraxi2c.h       |   1 +
 kernel/arch/cris/include/asm/fasttimer.h      |   1 +
 kernel/arch/cris/include/asm/fb.h             |   1 +
 kernel/arch/cris/include/asm/io.h             |   1 +
 kernel/arch/cris/include/asm/irq.h            |   1 +
 kernel/arch/cris/include/asm/mmu.h            |   1 +
 kernel/arch/cris/include/asm/mmu_context.h    |   1 +
 kernel/arch/cris/include/asm/page.h           |   1 +
 kernel/arch/cris/include/asm/pci.h            |   1 +
 kernel/arch/cris/include/asm/pgalloc.h        |   1 +
 kernel/arch/cris/include/asm/pgtable.h        |   1 +
 kernel/arch/cris/include/asm/processor.h      |   1 +
 kernel/arch/cris/include/asm/ptrace.h         |   1 +
 kernel/arch/cris/include/asm/segment.h        |   1 +
 kernel/arch/cris/include/asm/serial.h         |   1 +
 kernel/arch/cris/include/asm/shmparam.h       |   1 +
 kernel/arch/cris/include/asm/signal.h         |   1 +
 kernel/arch/cris/include/asm/stacktrace.h     |   1 +
 kernel/arch/cris/include/asm/string.h         |   1 +
 kernel/arch/cris/include/asm/swab.h           |   1 +
 kernel/arch/cris/include/asm/switch_to.h      |   1 +
 kernel/arch/cris/include/asm/termios.h        |   1 +
 kernel/arch/cris/include/asm/thread_info.h    |   1 +
 kernel/arch/cris/include/asm/timex.h          |   1 +
 kernel/arch/cris/include/asm/tlb.h            |   1 +
 kernel/arch/cris/include/asm/tlbflush.h       |   1 +
 kernel/arch/cris/include/asm/uaccess.h        |   1 +
 kernel/arch/cris/include/asm/ucontext.h       |   1 +
 kernel/arch/cris/include/asm/unaligned.h      |   1 +
 kernel/arch/cris/include/asm/unistd.h         |   1 +
 kernel/arch/cris/include/asm/user.h           |   1 +
 .../include/uapi/arch-v10/arch/sv_addr_ag.h   |   1 +
 .../cris/include/uapi/arch-v10/arch/svinto.h  |   1 +
 .../cris/include/uapi/arch-v10/arch/user.h    |   1 +
 .../include/uapi/arch-v32/arch/cryptocop.h    |   1 +
 .../cris/include/uapi/arch-v32/arch/user.h    |   1 +
 kernel/arch/cris/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/cris/include/uapi/asm/elf.h       |   1 +
 kernel/arch/cris/include/uapi/asm/elf_v10.h   |   1 +
 kernel/arch/cris/include/uapi/asm/elf_v32.h   |   1 +
 kernel/arch/cris/include/uapi/asm/ethernet.h  |   1 +
 kernel/arch/cris/include/uapi/asm/etraxgpio.h |   1 +
 kernel/arch/cris/include/uapi/asm/ioctls.h    |   1 +
 kernel/arch/cris/include/uapi/asm/param.h     |   1 +
 .../arch/cris/include/uapi/asm/posix_types.h  |   1 +
 kernel/arch/cris/include/uapi/asm/ptrace.h    |   1 +
 .../arch/cris/include/uapi/asm/ptrace_v10.h   |   1 +
 .../arch/cris/include/uapi/asm/ptrace_v32.h   |   1 +
 kernel/arch/cris/include/uapi/asm/rs485.h     |   1 +
 kernel/arch/cris/include/uapi/asm/setup.h     |   1 +
 .../arch/cris/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/cris/include/uapi/asm/signal.h    |   1 +
 kernel/arch/cris/include/uapi/asm/stat.h      |   1 +
 .../arch/cris/include/uapi/asm/sync_serial.h  |   1 +
 kernel/arch/cris/include/uapi/asm/termbits.h  |   1 +
 kernel/arch/cris/include/uapi/asm/termios.h   |   1 +
 kernel/arch/cris/include/uapi/asm/unistd.h    |   1 +
 kernel/arch/cris/kernel/Makefile              |   1 +
 kernel/arch/cris/kernel/asm-offsets.c         |   1 +
 kernel/arch/cris/kernel/crisksyms.c           |   1 +
 kernel/arch/cris/kernel/devicetree.c          |   1 +
 kernel/arch/cris/kernel/irq.c                 |   1 +
 kernel/arch/cris/kernel/process.c             |   1 +
 kernel/arch/cris/kernel/profile.c             |   1 +
 kernel/arch/cris/kernel/ptrace.c              |   1 +
 kernel/arch/cris/kernel/setup.c               |   1 +
 kernel/arch/cris/kernel/sys_cris.c            |   1 +
 kernel/arch/cris/kernel/time.c                |   1 +
 kernel/arch/cris/kernel/traps.c               |   1 +
 kernel/arch/cris/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/cris/mm/fault.c                   |   1 +
 kernel/arch/cris/mm/init.c                    |   1 +
 kernel/arch/cris/mm/ioremap.c                 |   1 +
 kernel/arch/cris/mm/tlb.c                     |   1 +
 kernel/arch/frv/Kconfig                       |   1 +
 kernel/arch/frv/Kconfig.debug                 |   1 +
 kernel/arch/frv/include/asm/atomic_defs.h     |   1 +
 kernel/arch/frv/include/asm/dma-mapping.h     |   1 +
 kernel/arch/frv/include/asm/fpu.h             |   1 +
 kernel/arch/frv/include/asm/futex.h           |   1 +
 kernel/arch/frv/include/asm/kmap_types.h      |   1 +
 kernel/arch/frv/include/asm/local.h           |   1 +
 kernel/arch/frv/include/asm/math-emu.h        |   1 +
 kernel/arch/frv/include/asm/page.h            |   1 +
 kernel/arch/frv/include/asm/percpu.h          |   1 +
 kernel/arch/frv/include/asm/shmparam.h        |   1 +
 kernel/arch/frv/include/asm/signal.h          |   1 +
 kernel/arch/frv/include/asm/smp.h             |   1 +
 kernel/arch/frv/include/asm/termios.h         |   1 +
 kernel/arch/frv/include/asm/timex.h           |   1 +
 kernel/arch/frv/include/asm/tlb.h             |   1 +
 kernel/arch/frv/include/asm/topology.h        |   1 +
 kernel/arch/frv/include/asm/ucontext.h        |   1 +
 kernel/arch/frv/include/asm/unistd.h          |   1 +
 .../arch/frv/include/uapi/asm/bitsperlong.h   |   1 +
 kernel/arch/frv/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/frv/include/uapi/asm/errno.h      |   1 +
 kernel/arch/frv/include/uapi/asm/fcntl.h      |   1 +
 kernel/arch/frv/include/uapi/asm/ioctl.h      |   1 +
 kernel/arch/frv/include/uapi/asm/ioctls.h     |   1 +
 kernel/arch/frv/include/uapi/asm/ipcbuf.h     |   1 +
 kernel/arch/frv/include/uapi/asm/kvm_para.h   |   1 +
 kernel/arch/frv/include/uapi/asm/mman.h       |   1 +
 kernel/arch/frv/include/uapi/asm/msgbuf.h     |   1 +
 kernel/arch/frv/include/uapi/asm/param.h      |   1 +
 kernel/arch/frv/include/uapi/asm/poll.h       |   1 +
 .../arch/frv/include/uapi/asm/posix_types.h   |   1 +
 kernel/arch/frv/include/uapi/asm/ptrace.h     |   1 +
 kernel/arch/frv/include/uapi/asm/registers.h  |   1 +
 kernel/arch/frv/include/uapi/asm/resource.h   |   1 +
 kernel/arch/frv/include/uapi/asm/sembuf.h     |   1 +
 kernel/arch/frv/include/uapi/asm/setup.h      |   1 +
 kernel/arch/frv/include/uapi/asm/shmbuf.h     |   1 +
 kernel/arch/frv/include/uapi/asm/sigcontext.h |   1 +
 kernel/arch/frv/include/uapi/asm/siginfo.h    |   1 +
 kernel/arch/frv/include/uapi/asm/signal.h     |   1 +
 kernel/arch/frv/include/uapi/asm/socket.h     |   1 +
 kernel/arch/frv/include/uapi/asm/sockios.h    |   1 +
 kernel/arch/frv/include/uapi/asm/stat.h       |   1 +
 kernel/arch/frv/include/uapi/asm/statfs.h     |   1 +
 kernel/arch/frv/include/uapi/asm/swab.h       |   1 +
 kernel/arch/frv/include/uapi/asm/termbits.h   |   1 +
 kernel/arch/frv/include/uapi/asm/termios.h    |   1 +
 kernel/arch/frv/include/uapi/asm/types.h      |   1 +
 kernel/arch/frv/include/uapi/asm/unistd.h     |   1 +
 kernel/arch/frv/kernel/Makefile               |   1 +
 kernel/arch/frv/kernel/asm-offsets.c          |   1 +
 kernel/arch/frv/kernel/frv_ksyms.c            |   1 +
 kernel/arch/frv/kernel/vmlinux.lds.S          |   1 +
 kernel/arch/frv/lib/atomic-lib.c              |   1 +
 kernel/arch/frv/mb93090-mb00/Makefile         |   1 +
 kernel/arch/frv/mb93090-mb00/pci-frv.h        |   1 +
 kernel/arch/frv/mb93090-mb00/pci-irq.c        |   1 +
 kernel/arch/frv/mm/extable.c                  |   1 +
 kernel/arch/frv/mm/fault.c                    |   1 +
 kernel/arch/h8300/Kconfig                     |   1 +
 kernel/arch/h8300/Kconfig.cpu                 |   1 +
 kernel/arch/h8300/boot/Makefile               |   1 +
 kernel/arch/h8300/boot/compressed/Makefile    |   1 +
 kernel/arch/h8300/boot/compressed/head.S      |   1 +
 kernel/arch/h8300/boot/compressed/misc.c      |   1 +
 kernel/arch/h8300/boot/compressed/vmlinux.lds |   1 +
 kernel/arch/h8300/boot/dts/Makefile           |   1 +
 kernel/arch/h8300/boot/dts/edosk2674.dts      |   1 +
 kernel/arch/h8300/boot/dts/h8300h_sim.dts     |   1 +
 kernel/arch/h8300/boot/dts/h8s_sim.dts        |   1 +
 kernel/arch/h8300/include/asm/atomic.h        |   1 +
 kernel/arch/h8300/include/asm/bitops.h        |   1 +
 kernel/arch/h8300/include/asm/bug.h           |   1 +
 kernel/arch/h8300/include/asm/byteorder.h     |   1 +
 kernel/arch/h8300/include/asm/cache.h         |   1 +
 kernel/arch/h8300/include/asm/cmpxchg.h       |   1 +
 kernel/arch/h8300/include/asm/dma-mapping.h   |   1 +
 kernel/arch/h8300/include/asm/elf.h           |   1 +
 kernel/arch/h8300/include/asm/flat.h          |   1 +
 kernel/arch/h8300/include/asm/hash.h          |   1 +
 kernel/arch/h8300/include/asm/io.h            |   1 +
 kernel/arch/h8300/include/asm/irq.h           |   1 +
 kernel/arch/h8300/include/asm/irqflags.h      |   1 +
 kernel/arch/h8300/include/asm/page.h          |   1 +
 kernel/arch/h8300/include/asm/pci.h           |   1 +
 kernel/arch/h8300/include/asm/pgtable.h       |   1 +
 kernel/arch/h8300/include/asm/processor.h     |   1 +
 kernel/arch/h8300/include/asm/ptrace.h        |   1 +
 kernel/arch/h8300/include/asm/segment.h       |   1 +
 kernel/arch/h8300/include/asm/signal.h        |   1 +
 kernel/arch/h8300/include/asm/string.h        |   1 +
 kernel/arch/h8300/include/asm/switch_to.h     |   1 +
 kernel/arch/h8300/include/asm/syscall.h       |   1 +
 kernel/arch/h8300/include/asm/thread_info.h   |   1 +
 kernel/arch/h8300/include/asm/tlb.h           |   1 +
 kernel/arch/h8300/include/asm/uaccess.h       |   1 +
 kernel/arch/h8300/include/asm/user.h          |   1 +
 .../arch/h8300/include/uapi/asm/bitsperlong.h |   1 +
 .../arch/h8300/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/h8300/include/uapi/asm/ptrace.h   |   1 +
 .../arch/h8300/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/h8300/include/uapi/asm/signal.h   |   1 +
 kernel/arch/h8300/kernel/Makefile             |   1 +
 kernel/arch/h8300/kernel/asm-offsets.c        |   1 +
 kernel/arch/h8300/kernel/entry.S              |   1 +
 kernel/arch/h8300/kernel/h8300_ksyms.c        |   1 +
 kernel/arch/h8300/kernel/head_ram.S           |   1 +
 kernel/arch/h8300/kernel/head_rom.S           |   1 +
 kernel/arch/h8300/kernel/irq.c                |   1 +
 kernel/arch/h8300/kernel/module.c             |   1 +
 kernel/arch/h8300/kernel/process.c            |   1 +
 kernel/arch/h8300/kernel/setup.c              |   1 +
 kernel/arch/h8300/kernel/syscalls.c           |   1 +
 kernel/arch/h8300/kernel/vmlinux.lds.S        |   1 +
 kernel/arch/h8300/lib/abs.S                   |   1 +
 kernel/arch/h8300/lib/ashldi3.c               |   1 +
 kernel/arch/h8300/lib/ashrdi3.c               |   1 +
 kernel/arch/h8300/lib/delay.c                 |   1 +
 kernel/arch/h8300/lib/libgcc.h                |   1 +
 kernel/arch/h8300/lib/lshrdi3.c               |   1 +
 kernel/arch/h8300/lib/memcpy.S                |   1 +
 kernel/arch/h8300/lib/memset.S                |   1 +
 kernel/arch/h8300/lib/moddivsi3.S             |   1 +
 kernel/arch/h8300/lib/modsi3.S                |   1 +
 kernel/arch/h8300/lib/muldi3.c                |   1 +
 kernel/arch/h8300/lib/mulsi3.S                |   1 +
 kernel/arch/h8300/lib/strncpy.S               |   1 +
 kernel/arch/h8300/lib/ucmpdi2.c               |   1 +
 kernel/arch/h8300/lib/udivsi3.S               |   1 +
 kernel/arch/h8300/mm/fault.c                  |   1 +
 kernel/arch/h8300/mm/init.c                   |   1 +
 kernel/arch/h8300/mm/memory.c                 |   1 +
 kernel/arch/hexagon/Kconfig                   |   1 +
 kernel/arch/hexagon/Makefile                  |   1 +
 kernel/arch/hexagon/include/asm/Kbuild        |   1 +
 kernel/arch/hexagon/include/asm/futex.h       |   1 +
 .../hexagon/include/uapi/asm/bitsperlong.h    |   1 +
 .../arch/hexagon/include/uapi/asm/byteorder.h |   1 +
 .../arch/hexagon/include/uapi/asm/kvm_para.h  |   1 +
 kernel/arch/hexagon/include/uapi/asm/param.h  |   1 +
 kernel/arch/hexagon/include/uapi/asm/ptrace.h |   1 +
 .../arch/hexagon/include/uapi/asm/registers.h |   1 +
 kernel/arch/hexagon/include/uapi/asm/setup.h  |   1 +
 .../hexagon/include/uapi/asm/sigcontext.h     |   1 +
 kernel/arch/hexagon/include/uapi/asm/signal.h |   1 +
 kernel/arch/hexagon/include/uapi/asm/swab.h   |   1 +
 kernel/arch/hexagon/include/uapi/asm/unistd.h |   1 +
 kernel/arch/hexagon/include/uapi/asm/user.h   |   1 +
 kernel/arch/hexagon/kernel/Makefile           |   1 +
 kernel/arch/ia64/Kconfig                      |   1 +
 kernel/arch/ia64/Kconfig.debug                |   1 +
 kernel/arch/ia64/dig/Makefile                 |   1 +
 kernel/arch/ia64/dig/setup.c                  |   1 +
 kernel/arch/ia64/hp/common/hwsw_iommu.c       |   1 +
 kernel/arch/ia64/hp/sim/Kconfig               |   1 +
 kernel/arch/ia64/hp/sim/Makefile              |   1 +
 kernel/arch/ia64/hp/sim/boot/boot_head.S      |   1 +
 kernel/arch/ia64/hp/sim/boot/bootloader.c     |   1 +
 kernel/arch/ia64/hp/sim/boot/bootloader.lds   |   1 +
 kernel/arch/ia64/hp/sim/boot/fw-emu.c         |   1 +
 kernel/arch/ia64/hp/sim/boot/ssc.h            |   1 +
 kernel/arch/ia64/hp/sim/hpsim.S               |   1 +
 kernel/arch/ia64/hp/sim/hpsim_console.c       |   1 +
 kernel/arch/ia64/hp/sim/hpsim_irq.c           |   1 +
 kernel/arch/ia64/hp/sim/hpsim_setup.c         |   1 +
 kernel/arch/ia64/hp/sim/hpsim_ssc.h           |   1 +
 kernel/arch/ia64/hp/sim/simeth.c              |   1 +
 kernel/arch/ia64/hp/sim/simscsi.c             |   1 +
 kernel/arch/ia64/hp/sim/simserial.c           |   1 +
 kernel/arch/ia64/include/asm/acpi.h           |   2 +
 kernel/arch/ia64/include/asm/agp.h            |   1 +
 kernel/arch/ia64/include/asm/asm-prototypes.h |   1 +
 kernel/arch/ia64/include/asm/asmmacro.h       |   1 +
 kernel/arch/ia64/include/asm/atomic.h         |   1 +
 kernel/arch/ia64/include/asm/barrier.h        |   1 +
 kernel/arch/ia64/include/asm/bitops.h         |   1 +
 kernel/arch/ia64/include/asm/bug.h            |   1 +
 kernel/arch/ia64/include/asm/bugs.h           |   1 +
 kernel/arch/ia64/include/asm/cache.h          |   1 +
 kernel/arch/ia64/include/asm/cacheflush.h     |   1 +
 kernel/arch/ia64/include/asm/checksum.h       |   1 +
 kernel/arch/ia64/include/asm/clocksource.h    |   1 +
 kernel/arch/ia64/include/asm/cpu.h            |   1 +
 kernel/arch/ia64/include/asm/current.h        |   1 +
 kernel/arch/ia64/include/asm/cyclone.h        |   1 +
 kernel/arch/ia64/include/asm/delay.h          |   1 +
 kernel/arch/ia64/include/asm/dma-mapping.h    |   1 +
 kernel/arch/ia64/include/asm/dma.h            |   1 +
 kernel/arch/ia64/include/asm/dmi.h            |   1 +
 kernel/arch/ia64/include/asm/early_ioremap.h  |   1 +
 kernel/arch/ia64/include/asm/elf.h            |   1 +
 kernel/arch/ia64/include/asm/esi.h            |   1 +
 kernel/arch/ia64/include/asm/extable.h        |   1 +
 kernel/arch/ia64/include/asm/fb.h             |   1 +
 kernel/arch/ia64/include/asm/fpswa.h          |   1 +
 kernel/arch/ia64/include/asm/ftrace.h         |   1 +
 kernel/arch/ia64/include/asm/futex.h          |   1 +
 kernel/arch/ia64/include/asm/gcc_intrin.h     |   1 +
 kernel/arch/ia64/include/asm/hardirq.h        |   1 +
 kernel/arch/ia64/include/asm/hpsim.h          |   1 +
 kernel/arch/ia64/include/asm/hugetlb.h        |   1 +
 kernel/arch/ia64/include/asm/hw_irq.h         |   1 +
 kernel/arch/ia64/include/asm/idle.h           |   1 +
 kernel/arch/ia64/include/asm/intrinsics.h     |   1 +
 kernel/arch/ia64/include/asm/io.h             |   1 +
 kernel/arch/ia64/include/asm/iommu.h          |   1 +
 kernel/arch/ia64/include/asm/iommu_table.h    |   1 +
 kernel/arch/ia64/include/asm/iosapic.h        |   1 +
 kernel/arch/ia64/include/asm/irq.h            |   1 +
 kernel/arch/ia64/include/asm/irq_remapping.h  |   1 +
 kernel/arch/ia64/include/asm/irqflags.h       |   1 +
 kernel/arch/ia64/include/asm/kexec.h          |   1 +
 kernel/arch/ia64/include/asm/kmap_types.h     |   1 +
 kernel/arch/ia64/include/asm/kregs.h          |   1 +
 kernel/arch/ia64/include/asm/libata-portmap.h |   1 +
 kernel/arch/ia64/include/asm/linkage.h        |   1 +
 kernel/arch/ia64/include/asm/machvec.h        |   1 +
 kernel/arch/ia64/include/asm/machvec_dig.h    |   1 +
 .../arch/ia64/include/asm/machvec_dig_vtd.h   |   1 +
 kernel/arch/ia64/include/asm/machvec_hpsim.h  |   1 +
 kernel/arch/ia64/include/asm/machvec_hpzx1.h  |   1 +
 .../ia64/include/asm/machvec_hpzx1_swiotlb.h  |   1 +
 kernel/arch/ia64/include/asm/machvec_init.h   |   1 +
 kernel/arch/ia64/include/asm/mca.h            |   1 +
 kernel/arch/ia64/include/asm/mca_asm.h        |   1 +
 kernel/arch/ia64/include/asm/mman.h           |   1 +
 kernel/arch/ia64/include/asm/mmu.h            |   1 +
 kernel/arch/ia64/include/asm/mmu_context.h    |   1 +
 kernel/arch/ia64/include/asm/module.h         |   1 +
 kernel/arch/ia64/include/asm/msidef.h         |   1 +
 kernel/arch/ia64/include/asm/page.h           |   1 +
 kernel/arch/ia64/include/asm/pal.h            |   1 +
 kernel/arch/ia64/include/asm/param.h          |   1 +
 kernel/arch/ia64/include/asm/parport.h        |   1 +
 kernel/arch/ia64/include/asm/patch.h          |   1 +
 kernel/arch/ia64/include/asm/pci.h            |   1 +
 kernel/arch/ia64/include/asm/percpu.h         |   1 +
 kernel/arch/ia64/include/asm/perfmon.h        |   1 +
 kernel/arch/ia64/include/asm/pgalloc.h        |   1 +
 kernel/arch/ia64/include/asm/pgtable.h        |   1 +
 kernel/arch/ia64/include/asm/processor.h      |   1 +
 kernel/arch/ia64/include/asm/ptrace.h         |   1 +
 kernel/arch/ia64/include/asm/rwsem.h          |   1 +
 kernel/arch/ia64/include/asm/sal.h            |   1 +
 kernel/arch/ia64/include/asm/sections.h       |   1 +
 kernel/arch/ia64/include/asm/shmparam.h       |   1 +
 kernel/arch/ia64/include/asm/signal.h         |   1 +
 kernel/arch/ia64/include/asm/smp.h            |   1 +
 kernel/arch/ia64/include/asm/sn/ioc3.h        |   1 +
 kernel/arch/ia64/include/asm/sparsemem.h      |   1 +
 kernel/arch/ia64/include/asm/spinlock.h       |   1 +
 kernel/arch/ia64/include/asm/spinlock_types.h |   1 +
 kernel/arch/ia64/include/asm/string.h         |   1 +
 kernel/arch/ia64/include/asm/swiotlb.h        |   1 +
 kernel/arch/ia64/include/asm/switch_to.h      |   1 +
 kernel/arch/ia64/include/asm/termios.h        |   1 +
 kernel/arch/ia64/include/asm/thread_info.h    |   1 +
 kernel/arch/ia64/include/asm/timex.h          |   1 +
 kernel/arch/ia64/include/asm/tlb.h            |   1 +
 kernel/arch/ia64/include/asm/tlbflush.h       |   1 +
 kernel/arch/ia64/include/asm/types.h          |   1 +
 kernel/arch/ia64/include/asm/uaccess.h        |   1 +
 kernel/arch/ia64/include/asm/unaligned.h      |   1 +
 kernel/arch/ia64/include/asm/unistd.h         |   1 +
 kernel/arch/ia64/include/asm/unwind.h         |   1 +
 kernel/arch/ia64/include/asm/user.h           |   1 +
 kernel/arch/ia64/include/asm/ustack.h         |   1 +
 kernel/arch/ia64/include/asm/uv/uv.h          |   1 +
 kernel/arch/ia64/include/asm/vga.h            |   1 +
 kernel/arch/ia64/include/uapi/asm/auxvec.h    |   1 +
 .../arch/ia64/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/arch/ia64/include/uapi/asm/break.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/ia64/include/uapi/asm/cmpxchg.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/errno.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/fcntl.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/fpu.h       |   1 +
 .../arch/ia64/include/uapi/asm/gcc_intrin.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/ia64regs.h  |   1 +
 .../arch/ia64/include/uapi/asm/intel_intrin.h |   1 +
 .../arch/ia64/include/uapi/asm/intrinsics.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/ioctl.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/ioctls.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/ipcbuf.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/mman.h      |   1 +
 kernel/arch/ia64/include/uapi/asm/msgbuf.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/param.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/perfmon.h   |   1 +
 .../include/uapi/asm/perfmon_default_smpl.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/poll.h      |   1 +
 .../arch/ia64/include/uapi/asm/posix_types.h  |   1 +
 kernel/arch/ia64/include/uapi/asm/ptrace.h    |   1 +
 .../ia64/include/uapi/asm/ptrace_offsets.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/resource.h  |   1 +
 kernel/arch/ia64/include/uapi/asm/rse.h       |   1 +
 kernel/arch/ia64/include/uapi/asm/sembuf.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/setup.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/shmbuf.h    |   1 +
 .../arch/ia64/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/siginfo.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/signal.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/socket.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/sockios.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/stat.h      |   1 +
 kernel/arch/ia64/include/uapi/asm/statfs.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/swab.h      |   1 +
 kernel/arch/ia64/include/uapi/asm/termbits.h  |   1 +
 kernel/arch/ia64/include/uapi/asm/termios.h   |   1 +
 kernel/arch/ia64/include/uapi/asm/types.h     |   1 +
 kernel/arch/ia64/include/uapi/asm/ucontext.h  |   1 +
 kernel/arch/ia64/include/uapi/asm/unistd.h    |   1 +
 kernel/arch/ia64/include/uapi/asm/ustack.h    |   1 +
 kernel/arch/ia64/kernel/Makefile              |   1 +
 kernel/arch/ia64/kernel/Makefile.gate         |   1 +
 kernel/arch/ia64/kernel/asm-offsets.c         |   1 +
 kernel/arch/ia64/kernel/audit.c               |   1 +
 kernel/arch/ia64/kernel/brl_emu.c             |   1 +
 kernel/arch/ia64/kernel/crash.c               |   1 +
 kernel/arch/ia64/kernel/crash_dump.c          |   1 +
 kernel/arch/ia64/kernel/cyclone.c             |   1 +
 kernel/arch/ia64/kernel/dma-mapping.c         |   1 +
 kernel/arch/ia64/kernel/efi.c                 |   1 +
 kernel/arch/ia64/kernel/efi_stub.S            |   1 +
 kernel/arch/ia64/kernel/elfcore.c             |   1 +
 kernel/arch/ia64/kernel/entry.S               |   1 +
 kernel/arch/ia64/kernel/entry.h               |   1 +
 kernel/arch/ia64/kernel/fsys.S                |   1 +
 kernel/arch/ia64/kernel/fsyscall_gtod_data.h  |   1 +
 kernel/arch/ia64/kernel/gate.S                |   1 +
 kernel/arch/ia64/kernel/gate.lds.S            |   1 +
 kernel/arch/ia64/kernel/head.S                |   1 +
 kernel/arch/ia64/kernel/ia64_ksyms.c          |   1 +
 kernel/arch/ia64/kernel/init_task.c           |   1 +
 kernel/arch/ia64/kernel/iosapic.c             |   1 +
 kernel/arch/ia64/kernel/irq.c                 |   1 +
 kernel/arch/ia64/kernel/irq_ia64.c            |   1 +
 kernel/arch/ia64/kernel/irq_lsapic.c          |   1 +
 kernel/arch/ia64/kernel/ivt.S                 |   1 +
 kernel/arch/ia64/kernel/machvec.c             |   1 +
 kernel/arch/ia64/kernel/mca_asm.S             |   1 +
 kernel/arch/ia64/kernel/mca_drv.h             |   1 +
 kernel/arch/ia64/kernel/mca_drv_asm.S         |   1 +
 kernel/arch/ia64/kernel/minstate.h            |   1 +
 kernel/arch/ia64/kernel/module.c              |   1 +
 kernel/arch/ia64/kernel/msi_ia64.c            |   1 +
 kernel/arch/ia64/kernel/nr-irqs.c             |   1 +
 kernel/arch/ia64/kernel/pal.S                 |   1 +
 kernel/arch/ia64/kernel/patch.c               |   1 +
 kernel/arch/ia64/kernel/pci-dma.c             |   1 +
 kernel/arch/ia64/kernel/pci-swiotlb.c         |   1 +
 kernel/arch/ia64/kernel/perfmon_generic.h     |   1 +
 kernel/arch/ia64/kernel/perfmon_itanium.h     |   1 +
 kernel/arch/ia64/kernel/perfmon_mckinley.h    |   1 +
 kernel/arch/ia64/kernel/perfmon_montecito.h   |   1 +
 kernel/arch/ia64/kernel/process.c             |   1 +
 kernel/arch/ia64/kernel/ptrace.c              |   1 +
 kernel/arch/ia64/kernel/setup.c               |   1 +
 kernel/arch/ia64/kernel/sigframe.h            |   1 +
 kernel/arch/ia64/kernel/signal.c              |   1 +
 kernel/arch/ia64/kernel/stacktrace.c          |   1 +
 kernel/arch/ia64/kernel/sys_ia64.c            |   1 +
 kernel/arch/ia64/kernel/traps.c               |   1 +
 kernel/arch/ia64/kernel/unaligned.c           |   1 +
 kernel/arch/ia64/kernel/unwind.c              |   1 +
 kernel/arch/ia64/kernel/unwind_decoder.c      |   1 +
 kernel/arch/ia64/kernel/unwind_i.h            |   1 +
 kernel/arch/ia64/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/ia64/lib/Makefile                 |   1 +
 kernel/arch/ia64/lib/carta_random.S           |   1 +
 kernel/arch/ia64/lib/checksum.c               |   1 +
 kernel/arch/ia64/lib/clear_page.S             |   1 +
 kernel/arch/ia64/lib/clear_user.S             |   1 +
 kernel/arch/ia64/lib/copy_page.S              |   1 +
 kernel/arch/ia64/lib/copy_page_mck.S          |   1 +
 kernel/arch/ia64/lib/copy_user.S              |   1 +
 kernel/arch/ia64/lib/csum_partial_copy.c      |   1 +
 kernel/arch/ia64/lib/do_csum.S                |   1 +
 kernel/arch/ia64/lib/idiv32.S                 |   1 +
 kernel/arch/ia64/lib/idiv64.S                 |   1 +
 kernel/arch/ia64/lib/io.c                     |   1 +
 kernel/arch/ia64/lib/ip_fast_csum.S           |   1 +
 kernel/arch/ia64/lib/memcpy.S                 |   1 +
 kernel/arch/ia64/lib/memcpy_mck.S             |   1 +
 kernel/arch/ia64/lib/memset.S                 |   1 +
 kernel/arch/ia64/lib/strlen.S                 |   1 +
 kernel/arch/ia64/lib/strncpy_from_user.S      |   1 +
 kernel/arch/ia64/lib/strnlen_user.S           |   1 +
 kernel/arch/ia64/mm/Makefile                  |   1 +
 kernel/arch/ia64/mm/discontig.c               |   1 +
 kernel/arch/ia64/mm/extable.c                 |   1 +
 kernel/arch/ia64/mm/fault.c                   |   1 +
 kernel/arch/ia64/mm/hugetlbpage.c             |   1 +
 kernel/arch/ia64/mm/init.c                    |   1 +
 kernel/arch/ia64/module.lds                   |   1 +
 kernel/arch/ia64/oprofile/Makefile            |   1 +
 kernel/arch/ia64/pci/fixup.c                  |   1 +
 kernel/arch/ia64/scripts/check-gas            |   1 +
 kernel/arch/ia64/scripts/check-segrel.S       |   1 +
 kernel/arch/ia64/scripts/check-segrel.lds     |   1 +
 kernel/arch/ia64/scripts/check-text-align.S   |   1 +
 kernel/arch/ia64/scripts/toolchain-flags      |   1 +
 kernel/arch/ia64/scripts/unwcheck.py          |   1 +
 kernel/arch/ia64/sn/kernel/sn2/timer.c        |   1 +
 kernel/arch/m32r/Kconfig                      |   1 +
 kernel/arch/m32r/Kconfig.debug                |   1 +
 kernel/arch/m32r/Makefile                     |   1 +
 kernel/arch/m32r/boot/compressed/Makefile     |   1 +
 kernel/arch/m32r/boot/compressed/boot.h       |   1 +
 kernel/arch/m32r/boot/compressed/head.S       |   1 +
 kernel/arch/m32r/boot/compressed/m32r_sio.c   |   1 +
 kernel/arch/m32r/boot/compressed/misc.c       |   1 +
 .../arch/m32r/boot/compressed/vmlinux.lds.S   |   1 +
 kernel/arch/m32r/boot/setup.S                 |   1 +
 kernel/arch/m32r/include/asm/assembler.h      |   1 +
 kernel/arch/m32r/include/asm/atomic.h         |   1 +
 kernel/arch/m32r/include/asm/bitops.h         |   1 +
 kernel/arch/m32r/include/asm/bug.h            |   1 +
 kernel/arch/m32r/include/asm/bugs.h           |   1 +
 kernel/arch/m32r/include/asm/cache.h          |   1 +
 kernel/arch/m32r/include/asm/cachectl.h       |   1 +
 kernel/arch/m32r/include/asm/cacheflush.h     |   1 +
 kernel/arch/m32r/include/asm/cmpxchg.h        |   1 +
 kernel/arch/m32r/include/asm/dma-mapping.h    |   1 +
 kernel/arch/m32r/include/asm/dma.h            |   1 +
 kernel/arch/m32r/include/asm/elf.h            |   1 +
 .../arch/m32r/include/asm/emergency-restart.h |   1 +
 kernel/arch/m32r/include/asm/fb.h             |   1 +
 kernel/arch/m32r/include/asm/hardirq.h        |   1 +
 kernel/arch/m32r/include/asm/io.h             |   1 +
 kernel/arch/m32r/include/asm/irq.h            |   1 +
 kernel/arch/m32r/include/asm/kmap_types.h     |   1 +
 kernel/arch/m32r/include/asm/linkage.h        |   1 +
 kernel/arch/m32r/include/asm/local.h          |   1 +
 kernel/arch/m32r/include/asm/m32102.h         |   1 +
 kernel/arch/m32r/include/asm/m32r.h           |   1 +
 kernel/arch/m32r/include/asm/m32r_mp_fpga.h   |   1 +
 kernel/arch/m32r/include/asm/mc146818rtc.h    |   1 +
 kernel/arch/m32r/include/asm/mmu.h            |   1 +
 kernel/arch/m32r/include/asm/mmu_context.h    |   1 +
 kernel/arch/m32r/include/asm/mmzone.h         |   1 +
 kernel/arch/m32r/include/asm/page.h           |   1 +
 kernel/arch/m32r/include/asm/pci.h            |   1 +
 kernel/arch/m32r/include/asm/percpu.h         |   1 +
 kernel/arch/m32r/include/asm/pgalloc.h        |   1 +
 kernel/arch/m32r/include/asm/pgtable-2level.h |   1 +
 kernel/arch/m32r/include/asm/pgtable.h        |   1 +
 kernel/arch/m32r/include/asm/rtc.h            |   1 +
 kernel/arch/m32r/include/asm/s1d13806.h       |   1 +
 kernel/arch/m32r/include/asm/segment.h        |   1 +
 kernel/arch/m32r/include/asm/serial.h         |   1 +
 kernel/arch/m32r/include/asm/setup.h          |   1 +
 kernel/arch/m32r/include/asm/shmparam.h       |   1 +
 kernel/arch/m32r/include/asm/signal.h         |   1 +
 kernel/arch/m32r/include/asm/smp.h            |   1 +
 kernel/arch/m32r/include/asm/spinlock.h       |   1 +
 kernel/arch/m32r/include/asm/spinlock_types.h |   1 +
 kernel/arch/m32r/include/asm/string.h         |   1 +
 kernel/arch/m32r/include/asm/syscall.h        |   1 +
 kernel/arch/m32r/include/asm/termios.h        |   1 +
 kernel/arch/m32r/include/asm/thread_info.h    |   1 +
 kernel/arch/m32r/include/asm/timex.h          |   1 +
 kernel/arch/m32r/include/asm/tlb.h            |   1 +
 kernel/arch/m32r/include/asm/tlbflush.h       |   1 +
 kernel/arch/m32r/include/asm/topology.h       |   1 +
 kernel/arch/m32r/include/asm/types.h          |   1 +
 kernel/arch/m32r/include/asm/uaccess.h        |   1 +
 kernel/arch/m32r/include/asm/ucontext.h       |   1 +
 kernel/arch/m32r/include/asm/unaligned.h      |   1 +
 kernel/arch/m32r/include/asm/unistd.h         |   1 +
 kernel/arch/m32r/include/asm/user.h           |   1 +
 kernel/arch/m32r/include/asm/vga.h            |   1 +
 kernel/arch/m32r/include/asm/xor.h            |   1 +
 .../arch/m32r/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/arch/m32r/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/m32r/include/uapi/asm/errno.h     |   1 +
 kernel/arch/m32r/include/uapi/asm/fcntl.h     |   1 +
 kernel/arch/m32r/include/uapi/asm/ioctl.h     |   1 +
 kernel/arch/m32r/include/uapi/asm/ioctls.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/ipcbuf.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/msgbuf.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/param.h     |   1 +
 kernel/arch/m32r/include/uapi/asm/poll.h      |   1 +
 .../arch/m32r/include/uapi/asm/posix_types.h  |   1 +
 kernel/arch/m32r/include/uapi/asm/ptrace.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/resource.h  |   1 +
 kernel/arch/m32r/include/uapi/asm/sembuf.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/setup.h     |   1 +
 kernel/arch/m32r/include/uapi/asm/shmbuf.h    |   1 +
 .../arch/m32r/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/m32r/include/uapi/asm/signal.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/socket.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/sockios.h   |   1 +
 kernel/arch/m32r/include/uapi/asm/stat.h      |   1 +
 kernel/arch/m32r/include/uapi/asm/statfs.h    |   1 +
 kernel/arch/m32r/include/uapi/asm/swab.h      |   1 +
 kernel/arch/m32r/include/uapi/asm/termbits.h  |   1 +
 kernel/arch/m32r/include/uapi/asm/termios.h   |   1 +
 kernel/arch/m32r/include/uapi/asm/unistd.h    |   1 +
 kernel/arch/m32r/kernel/Makefile              |   1 +
 kernel/arch/m32r/kernel/align.c               |   1 +
 kernel/arch/m32r/kernel/asm-offsets.c         |   1 +
 kernel/arch/m32r/kernel/entry.S               |   1 +
 kernel/arch/m32r/kernel/head.S                |   1 +
 kernel/arch/m32r/kernel/irq.c                 |   1 +
 kernel/arch/m32r/kernel/m32r_ksyms.c          |   1 +
 kernel/arch/m32r/kernel/process.c             |   1 +
 kernel/arch/m32r/kernel/ptrace.c              |   1 +
 kernel/arch/m32r/kernel/setup.c               |   1 +
 kernel/arch/m32r/kernel/signal.c              |   1 +
 kernel/arch/m32r/kernel/sys_m32r.c            |   1 +
 kernel/arch/m32r/kernel/syscall_table.S       |   1 +
 kernel/arch/m32r/kernel/time.c                |   1 +
 kernel/arch/m32r/kernel/traps.c               |   1 +
 kernel/arch/m32r/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/m32r/lib/ashxdi3.S                |   1 +
 kernel/arch/m32r/lib/delay.c                  |   1 +
 kernel/arch/m32r/lib/libgcc.h                 |   1 +
 kernel/arch/m32r/lib/memcpy.S                 |   1 +
 kernel/arch/m32r/lib/memset.S                 |   1 +
 kernel/arch/m32r/lib/strlen.S                 |   1 +
 kernel/arch/m32r/lib/ucmpdi2.c                |   1 +
 kernel/arch/m32r/lib/usercopy.c               |   1 +
 kernel/arch/m32r/mm/Makefile                  |   1 +
 kernel/arch/m32r/mm/cache.c                   |   1 +
 kernel/arch/m32r/mm/discontig.c               |   1 +
 kernel/arch/m32r/mm/extable.c                 |   1 +
 kernel/arch/m32r/mm/fault-nommu.c             |   1 +
 kernel/arch/m32r/mm/fault.c                   |   1 +
 kernel/arch/m32r/mm/init.c                    |   1 +
 kernel/arch/m32r/mm/mmu.S                     |   1 +
 kernel/arch/m32r/oprofile/Makefile            |   1 +
 kernel/arch/m32r/platforms/Makefile           |   1 +
 kernel/arch/m32r/platforms/m32104ut/io.c      |   1 +
 kernel/arch/m32r/platforms/m32104ut/setup.c   |   1 +
 kernel/arch/m32r/platforms/mappi/io.c         |   1 +
 kernel/arch/m32r/platforms/mappi/setup.c      |   1 +
 kernel/arch/m32r/platforms/mappi2/io.c        |   1 +
 kernel/arch/m32r/platforms/mappi2/setup.c     |   1 +
 kernel/arch/m32r/platforms/mappi3/io.c        |   1 +
 kernel/arch/m32r/platforms/mappi3/setup.c     |   1 +
 kernel/arch/m32r/platforms/oaks32r/io.c       |   1 +
 kernel/arch/m32r/platforms/oaks32r/setup.c    |   1 +
 kernel/arch/m32r/platforms/usrv/setup.c       |   1 +
 kernel/arch/m68k/68000/Makefile               |   1 +
 kernel/arch/m68k/68000/bootlogo-vz.h          |   1 +
 kernel/arch/m68k/68000/bootlogo.h             |   1 +
 kernel/arch/m68k/68000/head.S                 |   1 +
 kernel/arch/m68k/Kconfig                      |   1 +
 kernel/arch/m68k/Kconfig.bus                  |   1 +
 kernel/arch/m68k/Kconfig.cpu                  |   1 +
 kernel/arch/m68k/Kconfig.debug                |   1 +
 kernel/arch/m68k/Kconfig.devices              |   1 +
 kernel/arch/m68k/Kconfig.machine              |   1 +
 kernel/arch/m68k/amiga/chipram.c              |   1 +
 kernel/arch/m68k/apollo/config.c              |   1 +
 kernel/arch/m68k/apollo/dn_ints.c             |   1 +
 kernel/arch/m68k/bvme6000/rtc.c               |   1 +
 kernel/arch/m68k/coldfire/Makefile            |   1 +
 kernel/arch/m68k/coldfire/cache.c             |   1 +
 kernel/arch/m68k/coldfire/clk.c               |   1 +
 kernel/arch/m68k/coldfire/dma.c               |   1 +
 kernel/arch/m68k/coldfire/dma_timer.c         |   1 +
 kernel/arch/m68k/coldfire/firebee.c           |   1 +
 kernel/arch/m68k/coldfire/head.S              |   1 +
 kernel/arch/m68k/coldfire/m5206.c             |   1 +
 kernel/arch/m68k/coldfire/m520x.c             |   1 +
 kernel/arch/m68k/coldfire/m523x.c             |   1 +
 kernel/arch/m68k/coldfire/m5249.c             |   1 +
 kernel/arch/m68k/coldfire/m525x.c             |   1 +
 kernel/arch/m68k/coldfire/m5272.c             |   1 +
 kernel/arch/m68k/coldfire/m527x.c             |   1 +
 kernel/arch/m68k/coldfire/m528x.c             |   1 +
 kernel/arch/m68k/coldfire/m5307.c             |   1 +
 kernel/arch/m68k/coldfire/m5407.c             |   1 +
 kernel/arch/m68k/coldfire/m5441x.c            |   1 +
 kernel/arch/m68k/coldfire/m54xx.c             |   1 +
 kernel/arch/m68k/coldfire/nettel.c            |   1 +
 kernel/arch/m68k/coldfire/pit.c               |   1 +
 kernel/arch/m68k/coldfire/sltimers.c          |   1 +
 kernel/arch/m68k/coldfire/timers.c            |   1 +
 kernel/arch/m68k/coldfire/vectors.c           |   1 +
 kernel/arch/m68k/fpsp040/Makefile             |   1 +
 kernel/arch/m68k/hp300/config.c               |   1 +
 kernel/arch/m68k/hp300/time.c                 |   1 +
 kernel/arch/m68k/include/asm/MC68328.h        |   1 +
 kernel/arch/m68k/include/asm/MC68EZ328.h      |   1 +
 kernel/arch/m68k/include/asm/MC68VZ328.h      |   1 +
 kernel/arch/m68k/include/asm/adb_iop.h        |   1 +
 kernel/arch/m68k/include/asm/apollohw.h       |   1 +
 kernel/arch/m68k/include/asm/atafd.h          |   1 +
 kernel/arch/m68k/include/asm/atafdreg.h       |   1 +
 kernel/arch/m68k/include/asm/atari_joystick.h |   1 +
 kernel/arch/m68k/include/asm/atari_stdma.h    |   1 +
 kernel/arch/m68k/include/asm/atari_stram.h    |   1 +
 kernel/arch/m68k/include/asm/atomic.h         |   1 +
 kernel/arch/m68k/include/asm/bootstd.h        |   1 +
 kernel/arch/m68k/include/asm/bug.h            |   1 +
 kernel/arch/m68k/include/asm/bugs.h           |   1 +
 kernel/arch/m68k/include/asm/bvme6000hw.h     |   1 +
 kernel/arch/m68k/include/asm/cache.h          |   1 +
 kernel/arch/m68k/include/asm/cacheflush.h     |   1 +
 kernel/arch/m68k/include/asm/cacheflush_mm.h  |   1 +
 kernel/arch/m68k/include/asm/cacheflush_no.h  |   1 +
 kernel/arch/m68k/include/asm/checksum.h       |   1 +
 kernel/arch/m68k/include/asm/cmpxchg.h        |   1 +
 kernel/arch/m68k/include/asm/coldfire.h       |   1 +
 kernel/arch/m68k/include/asm/contregs.h       |   1 +
 kernel/arch/m68k/include/asm/current.h        |   1 +
 kernel/arch/m68k/include/asm/delay.h          |   1 +
 kernel/arch/m68k/include/asm/div64.h          |   1 +
 kernel/arch/m68k/include/asm/dma-mapping.h    |   1 +
 kernel/arch/m68k/include/asm/dma.h            |   1 +
 kernel/arch/m68k/include/asm/dvma.h           |   1 +
 kernel/arch/m68k/include/asm/elf.h            |   1 +
 kernel/arch/m68k/include/asm/entry.h          |   1 +
 kernel/arch/m68k/include/asm/fb.h             |   1 +
 kernel/arch/m68k/include/asm/fbio.h           |   1 +
 kernel/arch/m68k/include/asm/flat.h           |   1 +
 kernel/arch/m68k/include/asm/fpu.h            |   1 +
 kernel/arch/m68k/include/asm/hardirq.h        |   1 +
 kernel/arch/m68k/include/asm/hash.h           |   1 +
 kernel/arch/m68k/include/asm/hp300hw.h        |   1 +
 kernel/arch/m68k/include/asm/hwtest.h         |   1 +
 kernel/arch/m68k/include/asm/ide.h            |   1 +
 kernel/arch/m68k/include/asm/idprom.h         |   1 +
 kernel/arch/m68k/include/asm/intersil.h       |   1 +
 kernel/arch/m68k/include/asm/io.h             |   1 +
 kernel/arch/m68k/include/asm/io_mm.h          |   1 +
 kernel/arch/m68k/include/asm/io_no.h          |   1 +
 kernel/arch/m68k/include/asm/irq.h            |   1 +
 kernel/arch/m68k/include/asm/irqflags.h       |   1 +
 kernel/arch/m68k/include/asm/kexec.h          |   1 +
 kernel/arch/m68k/include/asm/linkage.h        |   1 +
 kernel/arch/m68k/include/asm/m5206sim.h       |   1 +
 kernel/arch/m68k/include/asm/m520xsim.h       |   1 +
 kernel/arch/m68k/include/asm/m523xsim.h       |   1 +
 kernel/arch/m68k/include/asm/m525xsim.h       |   1 +
 kernel/arch/m68k/include/asm/m5272sim.h       |   1 +
 kernel/arch/m68k/include/asm/m527xsim.h       |   1 +
 kernel/arch/m68k/include/asm/m528xsim.h       |   1 +
 kernel/arch/m68k/include/asm/m52xxacr.h       |   1 +
 kernel/arch/m68k/include/asm/m5307sim.h       |   1 +
 kernel/arch/m68k/include/asm/m53xxacr.h       |   1 +
 kernel/arch/m68k/include/asm/m53xxsim.h       |   1 +
 kernel/arch/m68k/include/asm/m5407sim.h       |   1 +
 kernel/arch/m68k/include/asm/m5441xsim.h      |   1 +
 kernel/arch/m68k/include/asm/m54xxacr.h       |   1 +
 kernel/arch/m68k/include/asm/m54xxgpt.h       |   1 +
 kernel/arch/m68k/include/asm/m54xxsim.h       |   1 +
 kernel/arch/m68k/include/asm/mac_asc.h        |   1 +
 kernel/arch/m68k/include/asm/mac_baboon.h     |   1 +
 kernel/arch/m68k/include/asm/mac_iop.h        |   1 +
 kernel/arch/m68k/include/asm/mac_oss.h        |   1 +
 kernel/arch/m68k/include/asm/mac_psc.h        |   1 +
 kernel/arch/m68k/include/asm/mac_via.h        |   1 +
 kernel/arch/m68k/include/asm/machdep.h        |   1 +
 kernel/arch/m68k/include/asm/machines.h       |   1 +
 kernel/arch/m68k/include/asm/macintosh.h      |   1 +
 kernel/arch/m68k/include/asm/math-emu.h       |   1 +
 kernel/arch/m68k/include/asm/mc146818rtc.h    |   1 +
 kernel/arch/m68k/include/asm/mcf8390.h        |   1 +
 kernel/arch/m68k/include/asm/mcf_pgalloc.h    |   1 +
 kernel/arch/m68k/include/asm/mcf_pgtable.h    |   1 +
 kernel/arch/m68k/include/asm/mcfclk.h         |   1 +
 kernel/arch/m68k/include/asm/mcfdma.h         |   1 +
 kernel/arch/m68k/include/asm/mcfintc.h        |   1 +
 kernel/arch/m68k/include/asm/mcfpit.h         |   1 +
 kernel/arch/m68k/include/asm/mcfsim.h         |   1 +
 kernel/arch/m68k/include/asm/mcfslt.h         |   1 +
 kernel/arch/m68k/include/asm/mcftimer.h       |   1 +
 kernel/arch/m68k/include/asm/mcfuart.h        |   1 +
 kernel/arch/m68k/include/asm/mcfwdebug.h      |   1 +
 kernel/arch/m68k/include/asm/mmu.h            |   1 +
 kernel/arch/m68k/include/asm/mmu_context.h    |   1 +
 kernel/arch/m68k/include/asm/mmzone.h         |   1 +
 kernel/arch/m68k/include/asm/module.h         |   1 +
 .../arch/m68k/include/asm/motorola_pgalloc.h  |   1 +
 .../arch/m68k/include/asm/motorola_pgtable.h  |   1 +
 kernel/arch/m68k/include/asm/movs.h           |   1 +
 kernel/arch/m68k/include/asm/mvme147hw.h      |   1 +
 kernel/arch/m68k/include/asm/mvme16xhw.h      |   1 +
 kernel/arch/m68k/include/asm/nettel.h         |   1 +
 kernel/arch/m68k/include/asm/nubus.h          |   1 +
 kernel/arch/m68k/include/asm/openprom.h       |   1 +
 kernel/arch/m68k/include/asm/oplib.h          |   1 +
 kernel/arch/m68k/include/asm/page.h           |   1 +
 kernel/arch/m68k/include/asm/page_mm.h        |   1 +
 kernel/arch/m68k/include/asm/page_no.h        |   1 +
 kernel/arch/m68k/include/asm/page_offset.h    |   1 +
 kernel/arch/m68k/include/asm/parport.h        |   1 +
 kernel/arch/m68k/include/asm/pci.h            |   1 +
 kernel/arch/m68k/include/asm/pgalloc.h        |   1 +
 kernel/arch/m68k/include/asm/pgtable.h        |   1 +
 kernel/arch/m68k/include/asm/pgtable_mm.h     |   1 +
 kernel/arch/m68k/include/asm/pgtable_no.h     |   1 +
 kernel/arch/m68k/include/asm/processor.h      |   1 +
 kernel/arch/m68k/include/asm/ptrace.h         |   1 +
 kernel/arch/m68k/include/asm/q40_master.h     |   1 +
 kernel/arch/m68k/include/asm/q40ints.h        |   1 +
 kernel/arch/m68k/include/asm/quicc_simple.h   |   1 +
 kernel/arch/m68k/include/asm/raw_io.h         |   1 +
 kernel/arch/m68k/include/asm/segment.h        |   1 +
 kernel/arch/m68k/include/asm/serial.h         |   1 +
 kernel/arch/m68k/include/asm/signal.h         |   1 +
 kernel/arch/m68k/include/asm/string.h         |   1 +
 kernel/arch/m68k/include/asm/sun3-head.h      |   1 +
 kernel/arch/m68k/include/asm/sun3_pgalloc.h   |   1 +
 kernel/arch/m68k/include/asm/sun3_pgtable.h   |   1 +
 kernel/arch/m68k/include/asm/sun3mmu.h        |   1 +
 kernel/arch/m68k/include/asm/sun3x.h          |   1 +
 kernel/arch/m68k/include/asm/sun3xflop.h      |   1 +
 kernel/arch/m68k/include/asm/sun3xprom.h      |   1 +
 kernel/arch/m68k/include/asm/switch_to.h      |   1 +
 kernel/arch/m68k/include/asm/thread_info.h    |   1 +
 kernel/arch/m68k/include/asm/timex.h          |   1 +
 kernel/arch/m68k/include/asm/tlb.h            |   1 +
 kernel/arch/m68k/include/asm/tlbflush.h       |   1 +
 kernel/arch/m68k/include/asm/uaccess.h        |   1 +
 kernel/arch/m68k/include/asm/uaccess_mm.h     |   1 +
 kernel/arch/m68k/include/asm/uaccess_no.h     |   1 +
 kernel/arch/m68k/include/asm/ucontext.h       |   1 +
 kernel/arch/m68k/include/asm/unaligned.h      |   1 +
 kernel/arch/m68k/include/asm/unistd.h         |   1 +
 kernel/arch/m68k/include/asm/user.h           |   1 +
 kernel/arch/m68k/include/asm/vga.h            |   1 +
 kernel/arch/m68k/include/asm/virtconvert.h    |   1 +
 kernel/arch/m68k/include/asm/zorro.h          |   1 +
 kernel/arch/m68k/include/uapi/asm/a.out.h     |   1 +
 .../m68k/include/uapi/asm/bootinfo-amiga.h    |   1 +
 .../m68k/include/uapi/asm/bootinfo-apollo.h   |   1 +
 .../m68k/include/uapi/asm/bootinfo-atari.h    |   1 +
 .../m68k/include/uapi/asm/bootinfo-hp300.h    |   1 +
 .../arch/m68k/include/uapi/asm/bootinfo-mac.h |   1 +
 .../arch/m68k/include/uapi/asm/bootinfo-q40.h |   1 +
 .../arch/m68k/include/uapi/asm/bootinfo-vme.h |   1 +
 kernel/arch/m68k/include/uapi/asm/bootinfo.h  |   1 +
 kernel/arch/m68k/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/m68k/include/uapi/asm/cachectl.h  |   1 +
 kernel/arch/m68k/include/uapi/asm/fcntl.h     |   1 +
 kernel/arch/m68k/include/uapi/asm/ioctls.h    |   1 +
 kernel/arch/m68k/include/uapi/asm/param.h     |   1 +
 kernel/arch/m68k/include/uapi/asm/poll.h      |   1 +
 .../arch/m68k/include/uapi/asm/posix_types.h  |   1 +
 kernel/arch/m68k/include/uapi/asm/ptrace.h    |   1 +
 kernel/arch/m68k/include/uapi/asm/setup.h     |   1 +
 .../arch/m68k/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/m68k/include/uapi/asm/signal.h    |   1 +
 kernel/arch/m68k/include/uapi/asm/stat.h      |   1 +
 kernel/arch/m68k/include/uapi/asm/swab.h      |   1 +
 kernel/arch/m68k/include/uapi/asm/unistd.h    |   1 +
 kernel/arch/m68k/kernel/Makefile              |   1 +
 kernel/arch/m68k/kernel/asm-offsets.c         |   1 +
 kernel/arch/m68k/kernel/bootinfo_proc.c       |   1 +
 kernel/arch/m68k/kernel/machine_kexec.c       |   1 +
 kernel/arch/m68k/kernel/process.c             |   1 +
 kernel/arch/m68k/kernel/relocate_kernel.S     |   1 +
 kernel/arch/m68k/kernel/setup.c               |   1 +
 kernel/arch/m68k/kernel/setup_mm.c            |   1 +
 kernel/arch/m68k/kernel/setup_no.c            |   1 +
 kernel/arch/m68k/kernel/sun3-head.S           |   1 +
 kernel/arch/m68k/kernel/sys_m68k.c            |   1 +
 kernel/arch/m68k/kernel/syscalltable.S        |   1 +
 kernel/arch/m68k/kernel/vmlinux-nommu.lds     |   1 +
 kernel/arch/m68k/kernel/vmlinux-std.lds       |   1 +
 kernel/arch/m68k/kernel/vmlinux-sun3.lds      |   1 +
 kernel/arch/m68k/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/m68k/lib/Makefile                 |   1 +
 kernel/arch/m68k/mac/baboon.c                 |   1 +
 kernel/arch/m68k/mac/mac_penguin.S            |   1 +
 kernel/arch/m68k/mac/macboing.c               |   1 +
 kernel/arch/m68k/mac/macints.c                |   1 +
 kernel/arch/m68k/mac/misc.c                   |   1 +
 kernel/arch/m68k/mac/oss.c                    |   1 +
 kernel/arch/m68k/mac/via.c                    |   1 +
 kernel/arch/m68k/mm/Makefile                  |   1 +
 kernel/arch/m68k/mm/cache.c                   |   1 +
 kernel/arch/m68k/mm/fault.c                   |   1 +
 kernel/arch/m68k/mm/hwtest.c                  |   1 +
 kernel/arch/m68k/mm/init.c                    |   1 +
 kernel/arch/m68k/mm/kmap.c                    |   1 +
 kernel/arch/m68k/mm/mcfmmu.c                  |   1 +
 kernel/arch/m68k/mm/memory.c                  |   1 +
 kernel/arch/m68k/mm/motorola.c                |   1 +
 kernel/arch/m68k/mm/sun3mmu.c                 |   1 +
 kernel/arch/m68k/mvme16x/rtc.c                |   1 +
 kernel/arch/m68k/sun3/dvma.c                  |   1 +
 kernel/arch/m68k/sun3/idprom.c                |   1 +
 kernel/arch/m68k/sun3/leds.c                  |   1 +
 kernel/arch/m68k/sun3/mmu_emu.c               |   1 +
 kernel/arch/m68k/sun3/prom/console.c          |   1 +
 kernel/arch/m68k/sun3/prom/init.c             |   1 +
 kernel/arch/m68k/sun3/prom/misc.c             |   1 +
 kernel/arch/m68k/sun3/prom/printf.c           |   1 +
 kernel/arch/m68k/sun3/sun3dvma.c              |   1 +
 kernel/arch/m68k/sun3x/config.c               |   1 +
 kernel/arch/m68k/sun3x/dvma.c                 |   1 +
 kernel/arch/m68k/sun3x/prom.c                 |   1 +
 kernel/arch/m68k/sun3x/time.c                 |   1 +
 kernel/arch/m68k/sun3x/time.h                 |   1 +
 kernel/arch/m68k/tools/amiga/Makefile         |   1 +
 kernel/arch/metag/Kconfig                     |   1 +
 kernel/arch/metag/Kconfig.debug               |   1 +
 kernel/arch/metag/Kconfig.soc                 |   1 +
 kernel/arch/metag/boot/dts/Makefile           |   1 +
 kernel/arch/metag/boot/dts/skeleton.dtsi      |   1 +
 kernel/arch/metag/include/asm/atomic.h        |   1 +
 kernel/arch/metag/include/asm/atomic_lnkget.h |   1 +
 kernel/arch/metag/include/asm/atomic_lock1.h  |   1 +
 kernel/arch/metag/include/asm/barrier.h       |   1 +
 kernel/arch/metag/include/asm/bitops.h        |   1 +
 kernel/arch/metag/include/asm/bug.h           |   1 +
 kernel/arch/metag/include/asm/cache.h         |   1 +
 kernel/arch/metag/include/asm/cacheflush.h    |   1 +
 kernel/arch/metag/include/asm/cachepart.h     |   1 +
 kernel/arch/metag/include/asm/checksum.h      |   1 +
 kernel/arch/metag/include/asm/cmpxchg.h       |   1 +
 kernel/arch/metag/include/asm/cmpxchg_irq.h   |   1 +
 .../arch/metag/include/asm/cmpxchg_lnkget.h   |   1 +
 kernel/arch/metag/include/asm/cmpxchg_lock1.h |   1 +
 kernel/arch/metag/include/asm/core_reg.h      |   1 +
 kernel/arch/metag/include/asm/cpu.h           |   1 +
 kernel/arch/metag/include/asm/da.h            |   1 +
 kernel/arch/metag/include/asm/delay.h         |   1 +
 kernel/arch/metag/include/asm/div64.h         |   1 +
 kernel/arch/metag/include/asm/dma-mapping.h   |   1 +
 kernel/arch/metag/include/asm/elf.h           |   1 +
 kernel/arch/metag/include/asm/ftrace.h        |   1 +
 kernel/arch/metag/include/asm/global_lock.h   |   1 +
 kernel/arch/metag/include/asm/highmem.h       |   1 +
 kernel/arch/metag/include/asm/hugetlb.h       |   1 +
 kernel/arch/metag/include/asm/hwthread.h      |   1 +
 kernel/arch/metag/include/asm/io.h            |   1 +
 kernel/arch/metag/include/asm/irq.h           |   1 +
 kernel/arch/metag/include/asm/irqflags.h      |   1 +
 kernel/arch/metag/include/asm/l2cache.h       |   1 +
 kernel/arch/metag/include/asm/linkage.h       |   1 +
 kernel/arch/metag/include/asm/mman.h          |   1 +
 kernel/arch/metag/include/asm/mmu.h           |   1 +
 kernel/arch/metag/include/asm/mmu_context.h   |   1 +
 kernel/arch/metag/include/asm/mmzone.h        |   1 +
 kernel/arch/metag/include/asm/module.h        |   1 +
 kernel/arch/metag/include/asm/page.h          |   1 +
 kernel/arch/metag/include/asm/pgalloc.h       |   1 +
 kernel/arch/metag/include/asm/pgtable-bits.h  |   1 +
 kernel/arch/metag/include/asm/pgtable.h       |   1 +
 kernel/arch/metag/include/asm/processor.h     |   1 +
 kernel/arch/metag/include/asm/ptrace.h        |   1 +
 kernel/arch/metag/include/asm/setup.h         |   1 +
 kernel/arch/metag/include/asm/smp.h           |   1 +
 kernel/arch/metag/include/asm/sparsemem.h     |   1 +
 kernel/arch/metag/include/asm/spinlock.h      |   1 +
 .../arch/metag/include/asm/spinlock_lnkget.h  |   1 +
 .../arch/metag/include/asm/spinlock_lock1.h   |   1 +
 .../arch/metag/include/asm/spinlock_types.h   |   1 +
 kernel/arch/metag/include/asm/stacktrace.h    |   1 +
 kernel/arch/metag/include/asm/string.h        |   1 +
 kernel/arch/metag/include/asm/syscalls.h      |   1 +
 kernel/arch/metag/include/asm/tcm.h           |   1 +
 kernel/arch/metag/include/asm/thread_info.h   |   1 +
 kernel/arch/metag/include/asm/tlb.h           |   1 +
 kernel/arch/metag/include/asm/tlbflush.h      |   1 +
 kernel/arch/metag/include/asm/topology.h      |   1 +
 kernel/arch/metag/include/asm/uaccess.h       |   1 +
 kernel/arch/metag/include/asm/user_gateway.h  |   1 +
 .../arch/metag/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/metag/include/uapi/asm/ech.h      |   1 +
 kernel/arch/metag/include/uapi/asm/ptrace.h   |   1 +
 .../arch/metag/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/metag/include/uapi/asm/siginfo.h  |   1 +
 kernel/arch/metag/include/uapi/asm/swab.h     |   1 +
 kernel/arch/metag/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/metag/kernel/Makefile             |   1 +
 kernel/arch/metag/kernel/asm-offsets.c        |   1 +
 kernel/arch/metag/kernel/cachepart.c          |   1 +
 kernel/arch/metag/kernel/core_reg.c           |   1 +
 kernel/arch/metag/kernel/head.S               |   1 +
 kernel/arch/metag/kernel/irq.c                |   1 +
 kernel/arch/metag/kernel/machines.c           |   1 +
 kernel/arch/metag/kernel/metag_ksyms.c        |   1 +
 kernel/arch/metag/kernel/perf_callchain.c     |   1 +
 kernel/arch/metag/kernel/process.c            |   1 +
 kernel/arch/metag/kernel/signal.c             |   1 +
 kernel/arch/metag/kernel/sys_metag.c          |   1 +
 kernel/arch/metag/kernel/tbiunexp.S           |   1 +
 kernel/arch/metag/kernel/tcm.c                |   1 +
 kernel/arch/metag/kernel/time.c               |   1 +
 kernel/arch/metag/kernel/user_gateway.S       |   1 +
 kernel/arch/metag/kernel/vmlinux.lds.S        |   1 +
 kernel/arch/metag/lib/Makefile                |   1 +
 kernel/arch/metag/lib/ashldi3.S               |   1 +
 kernel/arch/metag/lib/ashrdi3.S               |   1 +
 kernel/arch/metag/lib/clear_page.S            |   1 +
 kernel/arch/metag/lib/cmpdi2.S                |   1 +
 kernel/arch/metag/lib/copy_page.S             |   1 +
 kernel/arch/metag/lib/delay.c                 |   1 +
 kernel/arch/metag/lib/div64.S                 |   1 +
 kernel/arch/metag/lib/divsi3.S                |   1 +
 kernel/arch/metag/lib/ip_fast_csum.S          |   1 +
 kernel/arch/metag/lib/lshrdi3.S               |   1 +
 kernel/arch/metag/lib/memcpy.S                |   1 +
 kernel/arch/metag/lib/memmove.S               |   1 +
 kernel/arch/metag/lib/memset.S                |   1 +
 kernel/arch/metag/lib/modsi3.S                |   1 +
 kernel/arch/metag/lib/muldi3.S                |   1 +
 kernel/arch/metag/lib/ucmpdi2.S               |   1 +
 kernel/arch/metag/lib/usercopy.c              |   1 +
 kernel/arch/metag/mm/Kconfig                  |   1 +
 kernel/arch/metag/mm/Makefile                 |   1 +
 kernel/arch/metag/mm/extable.c                |   1 +
 kernel/arch/metag/mm/fault.c                  |   1 +
 kernel/arch/metag/mm/highmem.c                |   1 +
 kernel/arch/metag/mm/hugetlbpage.c            |   1 +
 kernel/arch/metag/mm/init.c                   |   1 +
 kernel/arch/metag/mm/ioremap.c                |   1 +
 kernel/arch/metag/mm/l2cache.c                |   1 +
 kernel/arch/metag/mm/maccess.c                |   1 +
 kernel/arch/metag/mm/mmu-meta1.c              |   1 +
 kernel/arch/metag/mm/mmu-meta2.c              |   1 +
 kernel/arch/metag/oprofile/Makefile           |   1 +
 kernel/arch/metag/oprofile/backtrace.h        |   1 +
 kernel/arch/metag/tbx/Makefile                |   1 +
 kernel/arch/microblaze/Makefile               |   1 +
 kernel/arch/microblaze/boot/Makefile          |   1 +
 kernel/arch/microblaze/boot/dts/Makefile      |   1 +
 .../arch/microblaze/include/asm/asm-compat.h  |   1 +
 kernel/arch/microblaze/include/asm/atomic.h   |   1 +
 kernel/arch/microblaze/include/asm/cmpxchg.h  |   1 +
 kernel/arch/microblaze/include/asm/ftrace.h   |   1 +
 kernel/arch/microblaze/include/asm/futex.h    |   1 +
 kernel/arch/microblaze/include/asm/hash.h     |   1 +
 kernel/arch/microblaze/include/asm/highmem.h  |   1 +
 kernel/arch/microblaze/include/asm/kgdb.h     |   1 +
 .../arch/microblaze/include/asm/mmu_context.h |   1 +
 kernel/arch/microblaze/include/asm/seccomp.h  |   1 +
 kernel/arch/microblaze/include/asm/syscall.h  |   1 +
 .../arch/microblaze/include/uapi/asm/auxvec.h |   1 +
 .../microblaze/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/microblaze/include/uapi/asm/elf.h |   1 +
 .../microblaze/include/uapi/asm/posix_types.h |   1 +
 .../arch/microblaze/include/uapi/asm/ptrace.h |   1 +
 .../arch/microblaze/include/uapi/asm/setup.h  |   1 +
 .../microblaze/include/uapi/asm/sigcontext.h  |   1 +
 .../arch/microblaze/include/uapi/asm/unistd.h |   1 +
 kernel/arch/microblaze/kernel/Makefile        |   1 +
 kernel/arch/microblaze/kernel/cpu/Makefile    |   1 +
 kernel/arch/microblaze/kernel/dma.c           |   1 +
 kernel/arch/microblaze/kernel/syscall_table.S |   1 +
 kernel/arch/microblaze/lib/Makefile           |   1 +
 kernel/arch/microblaze/lib/ashldi3.c          |   1 +
 kernel/arch/microblaze/lib/ashrdi3.c          |   1 +
 kernel/arch/microblaze/lib/cmpdi2.c           |   1 +
 kernel/arch/microblaze/lib/divsi3.S           |   1 +
 kernel/arch/microblaze/lib/libgcc.h           |   1 +
 kernel/arch/microblaze/lib/lshrdi3.c          |   1 +
 kernel/arch/microblaze/lib/modsi3.S           |   1 +
 kernel/arch/microblaze/lib/muldi3.c           |   1 +
 kernel/arch/microblaze/lib/mulsi3.S           |   1 +
 kernel/arch/microblaze/lib/ucmpdi2.c          |   1 +
 kernel/arch/microblaze/lib/udivsi3.S          |   1 +
 kernel/arch/microblaze/lib/umodsi3.S          |   1 +
 kernel/arch/microblaze/mm/highmem.c           |   1 +
 kernel/arch/microblaze/oprofile/Makefile      |   1 +
 kernel/arch/microblaze/pci/iomap.c            |   1 +
 kernel/arch/mips/Kconfig                      |   1 +
 kernel/arch/mips/Kconfig.debug                |   1 +
 kernel/arch/mips/Makefile.postlink            |   1 +
 kernel/arch/mips/alchemy/Kconfig              |   1 +
 kernel/arch/mips/alchemy/common/clock.c       |   1 +
 kernel/arch/mips/alchemy/devboards/db1300.c   |   1 +
 kernel/arch/mips/alchemy/devboards/db1550.c   |   1 +
 kernel/arch/mips/alchemy/devboards/db1xxx.c   |   1 +
 kernel/arch/mips/alchemy/devboards/platform.c |   1 +
 kernel/arch/mips/alchemy/devboards/platform.h |   1 +
 kernel/arch/mips/alchemy/devboards/pm.c       |   1 +
 kernel/arch/mips/ar7/Makefile                 |   1 +
 kernel/arch/mips/ath25/Kconfig                |   1 +
 kernel/arch/mips/ath25/ar2315.h               |   1 +
 kernel/arch/mips/ath25/ar5312.h               |   1 +
 kernel/arch/mips/ath25/devices.c              |   1 +
 kernel/arch/mips/ath25/devices.h              |   1 +
 kernel/arch/mips/ath79/Kconfig                |   1 +
 kernel/arch/mips/bcm47xx/Kconfig              |   1 +
 kernel/arch/mips/bcm47xx/bcm47xx_private.h    |   1 +
 kernel/arch/mips/bcm47xx/board.c              |   1 +
 kernel/arch/mips/bcm47xx/buttons.c            |   1 +
 kernel/arch/mips/bcm47xx/leds.c               |   1 +
 kernel/arch/mips/bcm47xx/workarounds.c        |   1 +
 kernel/arch/mips/bcm63xx/Kconfig              |   1 +
 kernel/arch/mips/bcm63xx/Makefile             |   1 +
 kernel/arch/mips/bcm63xx/boards/Kconfig       |   1 +
 kernel/arch/mips/bmips/Kconfig                |   1 +
 kernel/arch/mips/boot/compressed/dbg.c        |   1 +
 kernel/arch/mips/boot/compressed/string.c     |   1 +
 kernel/arch/mips/boot/compressed/uart-16550.c |   1 +
 .../arch/mips/boot/compressed/uart-alchemy.c  |   1 +
 kernel/arch/mips/boot/compressed/uart-prom.c  |   1 +
 kernel/arch/mips/boot/dts/Makefile            |   1 +
 kernel/arch/mips/boot/dts/brcm/Makefile       |   1 +
 .../boot/dts/brcm/bcm3368-netgear-cvg834g.dts |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm3368.dtsi   |   1 +
 .../mips/boot/dts/brcm/bcm3384_viper.dtsi     |   1 +
 .../mips/boot/dts/brcm/bcm3384_zephyr.dtsi    |   1 +
 .../dts/brcm/bcm63268-comtrend-vr-3032u.dts   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm63268.dtsi  |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm6328.dtsi   |   1 +
 .../dts/brcm/bcm6358-neufbox4-sercomm.dts     |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm6358.dtsi   |   1 +
 .../dts/brcm/bcm6362-neufbox6-sercomm.dts     |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm6362.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm6368.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7125.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7346.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7358.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7360.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7362.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7420.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7425.dtsi   |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm7435.dtsi   |   1 +
 .../arch/mips/boot/dts/brcm/bcm93384wvg.dts   |   1 +
 .../mips/boot/dts/brcm/bcm93384wvg_viper.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm96368mvwg.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm97125cbmb.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm97346dbsmb.dts |   1 +
 .../arch/mips/boot/dts/brcm/bcm97358svmb.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm97360svmb.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm97362svmb.dts  |   1 +
 kernel/arch/mips/boot/dts/brcm/bcm97420c.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm97425svmb.dts  |   1 +
 .../arch/mips/boot/dts/brcm/bcm97435svmb.dts  |   1 +
 .../dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi     |   1 +
 .../boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi |   1 +
 .../arch/mips/boot/dts/brcm/bcm9ejtagprb.dts  |   1 +
 .../arch/mips/boot/dts/cavium-octeon/Makefile |   1 +
 .../boot/dts/cavium-octeon/octeon_3xxx.dts    |   1 +
 .../boot/dts/cavium-octeon/octeon_3xxx.dtsi   |   1 +
 .../boot/dts/cavium-octeon/octeon_68xx.dts    |   1 +
 kernel/arch/mips/boot/dts/img/Makefile        |   1 +
 kernel/arch/mips/boot/dts/img/boston.dts      |   1 +
 kernel/arch/mips/boot/dts/ingenic/Makefile    |   1 +
 kernel/arch/mips/boot/dts/ingenic/ci20.dts    |   1 +
 kernel/arch/mips/boot/dts/ingenic/jz4740.dtsi |   1 +
 kernel/arch/mips/boot/dts/ingenic/jz4780.dtsi |   1 +
 kernel/arch/mips/boot/dts/ingenic/qi_lb60.dts |   1 +
 kernel/arch/mips/boot/dts/lantiq/Makefile     |   1 +
 kernel/arch/mips/boot/dts/lantiq/danube.dtsi  |   1 +
 .../arch/mips/boot/dts/lantiq/easy50712.dts   |   1 +
 kernel/arch/mips/boot/dts/mti/Makefile        |   1 +
 kernel/arch/mips/boot/dts/mti/malta.dts       |   1 +
 kernel/arch/mips/boot/dts/mti/sead3.dts       |   1 +
 kernel/arch/mips/boot/dts/netlogic/Makefile   |   1 +
 .../arch/mips/boot/dts/netlogic/xlp_evp.dts   |   1 +
 .../arch/mips/boot/dts/netlogic/xlp_fvp.dts   |   1 +
 .../arch/mips/boot/dts/netlogic/xlp_gvp.dts   |   1 +
 .../arch/mips/boot/dts/netlogic/xlp_rvp.dts   |   1 +
 .../arch/mips/boot/dts/netlogic/xlp_svp.dts   |   1 +
 kernel/arch/mips/boot/dts/pic32/Makefile      |   1 +
 kernel/arch/mips/boot/dts/qca/Makefile        |   1 +
 kernel/arch/mips/boot/dts/qca/ar9132.dtsi     |   1 +
 .../boot/dts/qca/ar9132_tl_wr1043nd_v1.dts    |   1 +
 kernel/arch/mips/boot/dts/qca/ar9331.dtsi     |   1 +
 .../mips/boot/dts/qca/ar9331_dpt_module.dts   |   1 +
 .../mips/boot/dts/qca/ar9331_dragino_ms14.dts |   1 +
 .../arch/mips/boot/dts/qca/ar9331_omega.dts   |   1 +
 .../mips/boot/dts/qca/ar9331_tl_mr3020.dts    |   1 +
 kernel/arch/mips/boot/dts/ralink/Makefile     |   1 +
 kernel/arch/mips/boot/dts/ralink/mt7620a.dtsi |   1 +
 .../mips/boot/dts/ralink/mt7620a_eval.dts     |   1 +
 kernel/arch/mips/boot/dts/ralink/rt2880.dtsi  |   1 +
 .../arch/mips/boot/dts/ralink/rt2880_eval.dts |   1 +
 kernel/arch/mips/boot/dts/ralink/rt3050.dtsi  |   1 +
 .../arch/mips/boot/dts/ralink/rt3052_eval.dts |   1 +
 kernel/arch/mips/boot/dts/ralink/rt3883.dtsi  |   1 +
 .../arch/mips/boot/dts/ralink/rt3883_eval.dts |   1 +
 kernel/arch/mips/boot/dts/xilfpga/Makefile    |   1 +
 .../mips/boot/dts/xilfpga/microAptiv.dtsi     |   1 +
 .../arch/mips/boot/dts/xilfpga/nexys4ddr.dts  |   1 +
 kernel/arch/mips/boot/ecoff.h                 |   1 +
 kernel/arch/mips/boot/tools/Makefile          |   1 +
 kernel/arch/mips/boot/tools/relocs.c          |   1 +
 kernel/arch/mips/boot/tools/relocs.h          |   1 +
 kernel/arch/mips/boot/tools/relocs_32.c       |   1 +
 kernel/arch/mips/boot/tools/relocs_64.c       |   1 +
 kernel/arch/mips/boot/tools/relocs_main.c     |   1 +
 kernel/arch/mips/cavium-octeon/Kconfig        |   1 +
 .../arch/mips/cavium-octeon/crypto/Makefile   |   1 +
 kernel/arch/mips/dec/int-handler.S            |   1 +
 kernel/arch/mips/dec/prom/cmdline.c           |   1 +
 kernel/arch/mips/dec/prom/dectypes.h          |   1 +
 kernel/arch/mips/dec/prom/identify.c          |   1 +
 kernel/arch/mips/dec/prom/init.c              |   1 +
 kernel/arch/mips/dec/prom/locore.S            |   1 +
 kernel/arch/mips/dec/prom/memory.c            |   1 +
 kernel/arch/mips/dec/reset.c                  |   1 +
 kernel/arch/mips/dec/time.c                   |   1 +
 kernel/arch/mips/fw/arc/Makefile              |   1 +
 kernel/arch/mips/fw/arc/arc_con.c             |   1 +
 kernel/arch/mips/fw/arc/memory.c              |   1 +
 kernel/arch/mips/fw/arc/salone.c              |   1 +
 kernel/arch/mips/generic/Kconfig              |   1 +
 kernel/arch/mips/generic/Makefile             |   2 +-
 kernel/arch/mips/generic/Platform             |   2 +-
 kernel/arch/mips/generic/board-ni169445.its.S |   2 +-
 kernel/arch/mips/generic/board-sead3.c        |   2 +-
 kernel/arch/mips/generic/init.c               |   4 +-
 kernel/arch/mips/generic/irq.c                |   2 +-
 kernel/arch/mips/generic/kexec.c              |   2 +-
 kernel/arch/mips/generic/proc.c               |   2 +-
 kernel/arch/mips/generic/vmlinux.its.S        |   1 +
 kernel/arch/mips/generic/yamon-dt.c           |   2 +-
 kernel/arch/mips/include/asm/asm-prototypes.h |   1 +
 kernel/arch/mips/include/asm/asmmacro-32.h    |   1 +
 kernel/arch/mips/include/asm/asmmacro-64.h    |   1 +
 kernel/arch/mips/include/asm/bitrev.h         |   1 +
 kernel/arch/mips/include/asm/bmips-spaces.h   |   1 +
 kernel/arch/mips/include/asm/bug.h            |   1 +
 kernel/arch/mips/include/asm/bugs.h           |   1 +
 kernel/arch/mips/include/asm/clock.h          |   1 +
 kernel/arch/mips/include/asm/cmp.h            |   1 +
 kernel/arch/mips/include/asm/compat-signal.h  |   1 +
 kernel/arch/mips/include/asm/compat.h         |   1 +
 kernel/arch/mips/include/asm/cpu.h            |   1 +
 kernel/arch/mips/include/asm/dma-mapping.h    |   1 +
 kernel/arch/mips/include/asm/dma.h            |   1 +
 kernel/arch/mips/include/asm/dsemul.h         |   2 +-
 kernel/arch/mips/include/asm/edac.h           |   1 +
 kernel/arch/mips/include/asm/extable.h        |   1 +
 kernel/arch/mips/include/asm/fw/arc/hinv.h    |   1 +
 kernel/arch/mips/include/asm/gio_device.h     |   1 +
 kernel/arch/mips/include/asm/highmem.h        |   1 +
 kernel/arch/mips/include/asm/hpet.h           |   1 +
 kernel/arch/mips/include/asm/idle.h           |   1 +
 kernel/arch/mips/include/asm/isadep.h         |   1 +
 kernel/arch/mips/include/asm/jazzdma.h        |   1 +
 kernel/arch/mips/include/asm/kdebug.h         |   1 +
 kernel/arch/mips/include/asm/kgdb.h           |   1 +
 kernel/arch/mips/include/asm/kmap_types.h     |   1 +
 kernel/arch/mips/include/asm/kvm_para.h       |   1 +
 kernel/arch/mips/include/asm/lasat/ds1603.h   |   1 +
 kernel/arch/mips/include/asm/lasat/eeprom.h   |   1 +
 kernel/arch/mips/include/asm/lasat/head.h     |   1 +
 kernel/arch/mips/include/asm/lasat/lasatint.h |   1 +
 kernel/arch/mips/include/asm/lasat/picvue.h   |   1 +
 kernel/arch/mips/include/asm/lasat/serial.h   |   1 +
 kernel/arch/mips/include/asm/linkage.h        |   1 +
 kernel/arch/mips/include/asm/local.h          |   1 +
 kernel/arch/mips/include/asm/m48t37.h         |   1 +
 kernel/arch/mips/include/asm/maar.h           |   2 +-
 .../include/asm/mach-ath25/ath25_platform.h   |   1 +
 .../mips/include/asm/mach-au1x00/au1200fb.h   |   1 +
 .../mips/include/asm/mach-au1x00/au1550_spi.h |   1 +
 .../mips/include/asm/mach-au1x00/au1550nd.h   |   1 +
 .../mips/include/asm/mach-au1x00/au1xxx_eth.h |   1 +
 .../include/asm/mach-au1x00/gpio-au1300.h     |   1 +
 .../arch/mips/include/asm/mach-au1x00/prom.h  |   1 +
 .../include/asm/mach-bcm47xx/bcm47xx_board.h  |   1 +
 .../asm/mach-bcm47xx/cpu-feature-overrides.h  |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_board.h  |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_cpu.h    |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_cs.h     |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_dsp.h        |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_enet.h       |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_flash.h      |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_hsspi.h      |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_pci.h        |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h     |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_spi.h        |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_uart.h       |   1 +
 .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h   |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_gpio.h   |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_io.h     |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_irq.h    |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_iudma.h  |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_nvram.h  |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_regs.h   |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_reset.h  |   1 +
 .../include/asm/mach-bcm63xx/bcm63xx_timer.h  |   1 +
 .../include/asm/mach-bcm63xx/board_bcm963xx.h |   1 +
 .../asm/mach-bcm63xx/cpu-feature-overrides.h  |   1 +
 .../mips/include/asm/mach-bcm63xx/ioremap.h   |   1 +
 .../arch/mips/include/asm/mach-bcm63xx/irq.h  |   1 +
 .../asm/mach-bmips/cpu-feature-overrides.h    |   1 +
 .../mips/include/asm/mach-bmips/ioremap.h     |   1 +
 .../arch/mips/include/asm/mach-db1x00/bcsr.h  |   1 +
 .../mips/include/asm/mach-generic/kmalloc.h   |   1 +
 .../arch/mips/include/asm/mach-ip27/mmzone.h  |   1 +
 .../mips/include/asm/mach-ip27/topology.h     |   1 +
 .../arch/mips/include/asm/mach-ip32/kmalloc.h |   1 +
 .../arch/mips/include/asm/mach-jz4740/base.h  |   1 +
 .../mips/include/asm/mach-jz4740/jz4740_mmc.h |   1 +
 kernel/arch/mips/include/asm/mach-lasat/irq.h |   1 +
 .../include/asm/mach-lasat/mach-gt64120.h     |   1 +
 .../include/asm/mach-loongson64/boot_param.h  |   1 +
 .../asm/mach-loongson64/cs5536/cs5536.h       |   1 +
 .../asm/mach-loongson64/cs5536/cs5536_mfgpt.h |   1 +
 .../asm/mach-loongson64/cs5536/cs5536_pci.h   |   1 +
 .../asm/mach-loongson64/cs5536/cs5536_vsm.h   |   1 +
 .../mips/include/asm/mach-loongson64/irq.h    |   1 +
 .../asm/mach-loongson64/loongson_hwmon.h      |   1 +
 .../mips/include/asm/mach-loongson64/spaces.h |   1 +
 .../include/asm/mach-loongson64/topology.h    |   1 +
 .../include/asm/mach-loongson64/workarounds.h |   1 +
 kernel/arch/mips/include/asm/mach-malta/irq.h |   1 +
 .../include/asm/mach-malta/mach-gt64120.h     |   1 +
 .../include/asm/mach-malta/malta-dtshim.h     |   2 +-
 .../mips/include/asm/mach-malta/malta-pm.h    |   2 +-
 .../arch/mips/include/asm/mach-ralink/irq.h   |   1 +
 .../arch/mips/include/asm/mach-rc32434/dma.h  |   1 +
 .../mips/include/asm/mach-rc32434/dma_v.h     |   1 +
 .../arch/mips/include/asm/mach-rc32434/gpio.h |   1 +
 .../arch/mips/include/asm/mach-rc32434/irq.h  |   1 +
 .../mips/include/asm/mach-rc32434/rc32434.h   |   1 +
 .../include/asm/mach-tx39xx/mangle-port.h     |   1 +
 .../asm/mach-tx49xx/cpu-feature-overrides.h   |   1 +
 .../mips/include/asm/mach-tx49xx/kmalloc.h    |   1 +
 .../include/asm/mach-tx49xx/mangle-port.h     |   1 +
 .../arch/mips/include/asm/mach-vr41xx/irq.h   |   1 +
 kernel/arch/mips/include/asm/machine.h        |   2 +-
 .../mips/include/asm/mips-boards/launch.h     |   1 +
 kernel/arch/mips/include/asm/mips-cm.h        |   6 +-
 kernel/arch/mips/include/asm/mips-cpc.h       |   2 +-
 kernel/arch/mips/include/asm/mips-cps.h       |   2 +-
 kernel/arch/mips/include/asm/mips-gic.h       |   2 +-
 kernel/arch/mips/include/asm/mips_mt.h        |   1 +
 kernel/arch/mips/include/asm/mipsmtregs.h     |   1 +
 kernel/arch/mips/include/asm/mipsprom.h       |   1 +
 kernel/arch/mips/include/asm/mmu.h            |   1 +
 kernel/arch/mips/include/asm/mmzone.h         |   1 +
 kernel/arch/mips/include/asm/module.h         |   1 +
 kernel/arch/mips/include/asm/msa.h            |   2 +-
 kernel/arch/mips/include/asm/nile4.h          |   1 +
 .../mips/include/asm/octeon/cvmx-config.h     |   1 +
 kernel/arch/mips/include/asm/pm-cps.h         |   2 +-
 kernel/arch/mips/include/asm/seccomp.h        |   1 +
 kernel/arch/mips/include/asm/setup.h          |   1 +
 kernel/arch/mips/include/asm/sgi/pi1.h        |   1 +
 kernel/arch/mips/include/asm/smp-cps.h        |   2 +-
 kernel/arch/mips/include/asm/sn/hub.h         |   1 +
 kernel/arch/mips/include/asm/sn/ioc3.h        |   1 +
 kernel/arch/mips/include/asm/sn/klkernvars.h  |   1 +
 .../arch/mips/include/asm/sn/mapped_kernel.h  |   1 +
 kernel/arch/mips/include/asm/sn/sn_private.h  |   1 +
 kernel/arch/mips/include/asm/sparsemem.h      |   1 +
 kernel/arch/mips/include/asm/spinlock_types.h |   1 +
 kernel/arch/mips/include/asm/spram.h          |   1 +
 kernel/arch/mips/include/asm/stackframe.h     |   8 +-
 kernel/arch/mips/include/asm/stackprotector.h |   1 +
 kernel/arch/mips/include/asm/stacktrace.h     |   1 +
 kernel/arch/mips/include/asm/thread_info.h    |   1 +
 kernel/arch/mips/include/asm/tlb.h            |   1 +
 kernel/arch/mips/include/asm/tlbex.h          |   1 +
 kernel/arch/mips/include/asm/tlbflush.h       |   1 +
 kernel/arch/mips/include/asm/tlbmisc.h        |   1 +
 kernel/arch/mips/include/asm/txx9/boards.h    |   1 +
 kernel/arch/mips/include/asm/vga.h            |   1 +
 kernel/arch/mips/include/asm/yamon-dt.h       |   2 +-
 kernel/arch/mips/include/uapi/asm/auxvec.h    |   1 +
 kernel/arch/mips/include/uapi/asm/bitfield.h  |   1 +
 .../arch/mips/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/arch/mips/include/uapi/asm/break.h     |   1 +
 kernel/arch/mips/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/mips/include/uapi/asm/cachectl.h  |   1 +
 kernel/arch/mips/include/uapi/asm/errno.h     |   1 +
 kernel/arch/mips/include/uapi/asm/fcntl.h     |   1 +
 kernel/arch/mips/include/uapi/asm/hwcap.h     |   1 +
 kernel/arch/mips/include/uapi/asm/inst.h      |   1 +
 kernel/arch/mips/include/uapi/asm/ioctl.h     |   1 +
 kernel/arch/mips/include/uapi/asm/ioctls.h    |   1 +
 kernel/arch/mips/include/uapi/asm/kvm.h       |   1 +
 kernel/arch/mips/include/uapi/asm/mman.h      |   1 +
 kernel/arch/mips/include/uapi/asm/msgbuf.h    |   1 +
 kernel/arch/mips/include/uapi/asm/param.h     |   1 +
 kernel/arch/mips/include/uapi/asm/poll.h      |   1 +
 .../arch/mips/include/uapi/asm/posix_types.h  |   1 +
 kernel/arch/mips/include/uapi/asm/ptrace.h    |   1 +
 kernel/arch/mips/include/uapi/asm/reg.h       |   1 +
 kernel/arch/mips/include/uapi/asm/resource.h  |   1 +
 kernel/arch/mips/include/uapi/asm/sembuf.h    |   1 +
 kernel/arch/mips/include/uapi/asm/setup.h     |   1 +
 kernel/arch/mips/include/uapi/asm/sgidefs.h   |   1 +
 kernel/arch/mips/include/uapi/asm/shmbuf.h    |   1 +
 .../arch/mips/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/mips/include/uapi/asm/siginfo.h   |   1 +
 kernel/arch/mips/include/uapi/asm/signal.h    |   1 +
 kernel/arch/mips/include/uapi/asm/socket.h    |   1 +
 kernel/arch/mips/include/uapi/asm/sockios.h   |   1 +
 kernel/arch/mips/include/uapi/asm/stat.h      |   1 +
 kernel/arch/mips/include/uapi/asm/statfs.h    |   1 +
 kernel/arch/mips/include/uapi/asm/swab.h      |   1 +
 kernel/arch/mips/include/uapi/asm/sysmips.h   |   1 +
 kernel/arch/mips/include/uapi/asm/termbits.h  |   1 +
 kernel/arch/mips/include/uapi/asm/termios.h   |   1 +
 kernel/arch/mips/include/uapi/asm/types.h     |   1 +
 kernel/arch/mips/include/uapi/asm/ucontext.h  |   1 +
 kernel/arch/mips/include/uapi/asm/unistd.h    |   1 +
 kernel/arch/mips/jazz/Kconfig                 |   1 +
 kernel/arch/mips/jazz/jazzdma.c               |   1 +
 kernel/arch/mips/jazz/reset.c                 |   1 +
 kernel/arch/mips/jz4740/Kconfig               |   1 +
 kernel/arch/mips/jz4740/Makefile              |   1 +
 kernel/arch/mips/jz4740/reset.h               |   1 +
 kernel/arch/mips/kernel/Makefile              |   1 +
 kernel/arch/mips/kernel/asm-offsets.c         |   1 +
 kernel/arch/mips/kernel/binfmt_elfn32.c       |   1 +
 kernel/arch/mips/kernel/binfmt_elfo32.c       |   1 +
 kernel/arch/mips/kernel/cmpxchg.c             |   2 +-
 kernel/arch/mips/kernel/cps-vec-ns16550.S     |   2 +-
 kernel/arch/mips/kernel/cps-vec.S             |   2 +-
 kernel/arch/mips/kernel/crash.c               |   1 +
 kernel/arch/mips/kernel/crash_dump.c          |   1 +
 kernel/arch/mips/kernel/elf.c                 |   2 +-
 kernel/arch/mips/kernel/ftrace.c              |   1 +
 kernel/arch/mips/kernel/i8253.c               |   1 +
 kernel/arch/mips/kernel/linux32.c             |   1 +
 kernel/arch/mips/kernel/mips-cm.c             |   2 +-
 kernel/arch/mips/kernel/mips-cpc.c            |   2 +-
 kernel/arch/mips/kernel/mips-mt-fpaff.c       |   1 +
 kernel/arch/mips/kernel/mips-mt.c             |   1 +
 kernel/arch/mips/kernel/pm-cps.c              |   2 +-
 kernel/arch/mips/kernel/probes-common.h       |   2 +-
 kernel/arch/mips/kernel/proc.c                |   1 +
 kernel/arch/mips/kernel/r2300_switch.S        |   1 +
 kernel/arch/mips/kernel/relocate.c            |   2 +-
 kernel/arch/mips/kernel/smp-cmp.c             |   6 +-
 kernel/arch/mips/kernel/smp-cps.c             |   4 +-
 kernel/arch/mips/kernel/smp.c                 |  24 +++-
 kernel/arch/mips/kernel/spinlock_test.c       |   1 +
 kernel/arch/mips/kernel/sync-r4k.c            |   1 +
 kernel/arch/mips/kernel/sysrq.c               |   1 +
 kernel/arch/mips/kernel/topology.c            |   1 +
 kernel/arch/mips/kernel/uprobes.c             |   1 +
 kernel/arch/mips/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/mips/kvm/Kconfig                  |   1 +
 kernel/arch/mips/kvm/Makefile                 |   1 +
 kernel/arch/mips/lantiq/Kconfig               |   1 +
 kernel/arch/mips/lasat/Kconfig                |   1 +
 kernel/arch/mips/lasat/Makefile               |   1 +
 kernel/arch/mips/lasat/at93c.c                |   1 +
 kernel/arch/mips/lasat/at93c.h                |   1 +
 kernel/arch/mips/lasat/ds1603.c               |   1 +
 kernel/arch/mips/lasat/ds1603.h               |   1 +
 kernel/arch/mips/lasat/image/Makefile         |   1 +
 kernel/arch/mips/lasat/image/head.S           |   1 +
 kernel/arch/mips/lasat/lasat_models.h         |   1 +
 kernel/arch/mips/lasat/picvue.h               |   1 +
 kernel/arch/mips/lasat/prom.c                 |   1 +
 kernel/arch/mips/lasat/prom.h                 |   1 +
 kernel/arch/mips/lib/Makefile                 |   1 +
 kernel/arch/mips/lib/ashldi3.c                |   1 +
 kernel/arch/mips/lib/ashrdi3.c                |   1 +
 kernel/arch/mips/lib/bswapdi.c                |   1 +
 kernel/arch/mips/lib/bswapsi.c                |   1 +
 kernel/arch/mips/lib/cmpdi2.c                 |   1 +
 kernel/arch/mips/lib/dump_tlb.c               |   1 +
 kernel/arch/mips/lib/iomap-pci.c              |   1 +
 kernel/arch/mips/lib/iomap.c                  |   1 +
 kernel/arch/mips/lib/libgcc.h                 |   1 +
 kernel/arch/mips/lib/lshrdi3.c                |   1 +
 kernel/arch/mips/lib/r3k_dump_tlb.c           |   1 +
 kernel/arch/mips/lib/ucmpdi2.c                |   1 +
 kernel/arch/mips/loongson32/Kconfig           |   1 +
 kernel/arch/mips/loongson64/Kconfig           |   1 +
 kernel/arch/mips/loongson64/common/Makefile   |   1 +
 .../arch/mips/loongson64/common/dma-swiotlb.c |   1 +
 .../mips/loongson64/loongson-3/acpi_init.c    |   1 +
 kernel/arch/mips/loongson64/loongson-3/hpet.c |   1 +
 kernel/arch/mips/loongson64/loongson-3/irq.c  |   1 +
 kernel/arch/mips/loongson64/loongson-3/smp.h  |   1 +
 kernel/arch/mips/math-emu/Makefile            |   1 +
 kernel/arch/mips/math-emu/dsemul.c            |   1 +
 kernel/arch/mips/math-emu/me-debugfs.c        |   1 +
 kernel/arch/mips/mm/Makefile                  |   1 +
 kernel/arch/mips/mm/c-r3k.c                   |   1 +
 kernel/arch/mips/mm/c-tx39.c                  |   1 +
 kernel/arch/mips/mm/gup.c                     |   1 +
 kernel/arch/mips/mm/highmem.c                 |   1 +
 kernel/arch/mips/mm/sc-debugfs.c              |   2 +-
 kernel/arch/mips/mm/sc-ip22.c                 |   1 +
 kernel/arch/mips/mm/sc-mips.c                 |   1 +
 kernel/arch/mips/mm/sc-r5k.c                  |   1 +
 kernel/arch/mips/mm/sc-rm7k.c                 |   1 +
 kernel/arch/mips/mm/tlb-r3k.c                 |   1 +
 kernel/arch/mips/mm/uasm-micromips.c          |   2 +-
 kernel/arch/mips/mti-malta/Makefile           |   1 +
 kernel/arch/mips/mti-malta/malta-dt.c         |   2 +-
 kernel/arch/mips/mti-malta/malta-dtshim.c     |   2 +-
 kernel/arch/mips/mti-malta/malta-pm.c         |   2 +-
 kernel/arch/mips/net/ebpf_jit.c               |   2 +-
 kernel/arch/mips/netlogic/Kconfig             |   1 +
 kernel/arch/mips/netlogic/common/Makefile     |   1 +
 kernel/arch/mips/netlogic/xlp/Makefile        |   1 +
 kernel/arch/mips/oprofile/Makefile            |   1 +
 kernel/arch/mips/oprofile/backtrace.c         |   1 +
 kernel/arch/mips/paravirt/Kconfig             |   1 +
 kernel/arch/mips/pci/Makefile                 |   1 +
 kernel/arch/mips/pci/fixup-ip32.c             |   1 +
 kernel/arch/mips/pci/fixup-malta.c            |   1 +
 kernel/arch/mips/pci/ops-loongson3.c          |   1 +
 kernel/arch/mips/pci/ops-nile4.c              |   1 +
 kernel/arch/mips/pci/pci-alchemy.c            |   1 +
 kernel/arch/mips/pci/pci-bcm63xx.h            |   1 +
 kernel/arch/mips/pci/pci-generic.c            |   2 +-
 kernel/arch/mips/pic32/Kconfig                |   1 +
 kernel/arch/mips/pistachio/Kconfig            |   1 +
 kernel/arch/mips/pmcs-msp71xx/Kconfig         |   1 +
 kernel/arch/mips/pmcs-msp71xx/Makefile        |   1 +
 kernel/arch/mips/power/hibernate.c            |   1 +
 kernel/arch/mips/ralink/Kconfig               |   1 +
 kernel/arch/mips/rb532/setup.c                |   1 +
 kernel/arch/mips/sgi-ip22/Makefile            |   1 +
 kernel/arch/mips/sgi-ip22/ip22-berr.c         |   1 +
 kernel/arch/mips/sgi-ip22/ip22-hpc.c          |   1 +
 kernel/arch/mips/sgi-ip22/ip22-int.c          |   1 +
 kernel/arch/mips/sgi-ip22/ip22-mc.c           |   1 +
 kernel/arch/mips/sgi-ip22/ip22-nvram.c        |   1 +
 kernel/arch/mips/sgi-ip22/ip22-platform.c     |   1 +
 kernel/arch/mips/sgi-ip22/ip22-setup.c        |   1 +
 kernel/arch/mips/sgi-ip22/ip28-berr.c         |   1 +
 kernel/arch/mips/sgi-ip27/Kconfig             |   1 +
 kernel/arch/mips/sgi-ip27/Makefile            |   1 +
 kernel/arch/mips/sgi-ip27/ip27-irq-pci.c      |   1 +
 kernel/arch/mips/sgi-ip27/ip27-irq.c          |   1 +
 kernel/arch/mips/sgi-ip27/ip27-klconfig.c     |   1 +
 kernel/arch/mips/sgi-ip27/ip27-klnuma.c       |   1 +
 kernel/arch/mips/sgi-ip27/ip27-nmi.c          |   1 +
 kernel/arch/mips/sgi-ip27/ip27-timer.c        |   1 +
 kernel/arch/mips/sibyte/Kconfig               |   1 +
 kernel/arch/mips/sibyte/Makefile              |   1 +
 kernel/arch/mips/sibyte/common/cfe_console.c  |   1 +
 kernel/arch/mips/sibyte/swarm/platform.c      |   1 +
 kernel/arch/mips/sni/reset.c                  |   1 +
 kernel/arch/mips/sni/time.c                   |   1 +
 .../arch/mips/tools/generic-board-config.sh   |   2 +-
 kernel/arch/mips/txx9/Kconfig                 |   1 +
 kernel/arch/mips/txx9/Makefile                |   1 +
 kernel/arch/mips/txx9/generic/Makefile        |   1 +
 kernel/arch/mips/vdso/Makefile                |   1 +
 kernel/arch/mips/vr41xx/Kconfig               |   1 +
 kernel/arch/mips/xilfpga/Kconfig              |   1 +
 kernel/arch/mn10300/Kconfig                   |   1 +
 kernel/arch/mn10300/Kconfig.debug             |   1 +
 kernel/arch/mn10300/boot/compressed/Makefile  |   1 +
 kernel/arch/mn10300/boot/tools/build.c        |   1 +
 kernel/arch/mn10300/include/asm/kmap_types.h  |   1 +
 kernel/arch/mn10300/include/asm/mmu.h         |   1 +
 kernel/arch/mn10300/include/asm/page_offset.h |   1 +
 kernel/arch/mn10300/include/asm/shmparam.h    |   1 +
 .../arch/mn10300/include/asm/spinlock_types.h |   1 +
 kernel/arch/mn10300/include/asm/termios.h     |   1 +
 .../mn10300/include/uapi/asm/bitsperlong.h    |   1 +
 .../arch/mn10300/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/mn10300/include/uapi/asm/errno.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/fcntl.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/ioctl.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/ioctls.h |   1 +
 kernel/arch/mn10300/include/uapi/asm/ipcbuf.h |   1 +
 .../arch/mn10300/include/uapi/asm/kvm_para.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/mman.h   |   1 +
 kernel/arch/mn10300/include/uapi/asm/msgbuf.h |   1 +
 kernel/arch/mn10300/include/uapi/asm/param.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/poll.h   |   1 +
 .../mn10300/include/uapi/asm/posix_types.h    |   1 +
 kernel/arch/mn10300/include/uapi/asm/ptrace.h |   1 +
 .../arch/mn10300/include/uapi/asm/resource.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/sembuf.h |   1 +
 kernel/arch/mn10300/include/uapi/asm/setup.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/shmbuf.h |   1 +
 .../mn10300/include/uapi/asm/sigcontext.h     |   1 +
 kernel/arch/mn10300/include/uapi/asm/signal.h |   1 +
 kernel/arch/mn10300/include/uapi/asm/socket.h |   1 +
 .../arch/mn10300/include/uapi/asm/sockios.h   |   1 +
 kernel/arch/mn10300/include/uapi/asm/stat.h   |   1 +
 kernel/arch/mn10300/include/uapi/asm/swab.h   |   1 +
 .../arch/mn10300/include/uapi/asm/termbits.h  |   1 +
 .../arch/mn10300/include/uapi/asm/termios.h   |   1 +
 kernel/arch/mn10300/include/uapi/asm/types.h  |   1 +
 kernel/arch/mn10300/include/uapi/asm/unistd.h |   1 +
 kernel/arch/mn10300/kernel/Makefile           |   1 +
 kernel/arch/mn10300/kernel/asm-offsets.c      |   1 +
 kernel/arch/mn10300/kernel/gdb-stub.c         |   1 +
 kernel/arch/mn10300/mm/Kconfig.cache          |   1 +
 kernel/arch/mn10300/mm/Makefile               |   1 +
 kernel/arch/mn10300/oprofile/Makefile         |   1 +
 .../proc-mn103e010/include/proc/intctl-regs.h |   1 +
 .../proc-mn2ws0050/include/proc/intctl-regs.h |   1 +
 .../unit-asb2364/include/unit/fpga-regs.h     |   1 +
 kernel/arch/nios2/Kconfig                     |   1 +
 kernel/arch/nios2/Kconfig.debug               |   1 +
 kernel/arch/nios2/boot/compressed/Makefile    |   1 +
 .../arch/nios2/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/nios2/include/uapi/asm/elf.h      |   1 +
 kernel/arch/nios2/include/uapi/asm/ptrace.h   |   1 +
 .../arch/nios2/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/nios2/include/uapi/asm/signal.h   |   1 +
 kernel/arch/nios2/include/uapi/asm/swab.h     |   1 +
 kernel/arch/nios2/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/nios2/kernel/Makefile             |   1 +
 kernel/arch/nios2/mm/Makefile                 |   1 +
 kernel/arch/openrisc/Kconfig                  |   1 +
 kernel/arch/openrisc/boot/dts/Makefile        |   1 +
 kernel/arch/openrisc/boot/dts/or1ksim.dts     |   1 +
 kernel/arch/openrisc/include/asm/futex.h      |   1 +
 kernel/arch/openrisc/include/asm/string.h     |   1 +
 kernel/arch/openrisc/include/uapi/asm/elf.h   |   1 +
 kernel/arch/openrisc/include/uapi/asm/param.h |   1 +
 .../arch/openrisc/include/uapi/asm/ptrace.h   |   1 +
 .../openrisc/include/uapi/asm/sigcontext.h    |   1 +
 .../arch/openrisc/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/openrisc/kernel/Makefile          |   1 +
 kernel/arch/openrisc/kernel/vmlinux.h         |   1 +
 kernel/arch/openrisc/lib/memcpy.c             |   1 +
 kernel/arch/parisc/Kconfig                    |   1 +
 kernel/arch/parisc/Kconfig.debug              |   1 +
 kernel/arch/parisc/include/asm/agp.h          |   1 +
 kernel/arch/parisc/include/asm/atomic.h       |   1 +
 kernel/arch/parisc/include/asm/bitops.h       |   1 +
 kernel/arch/parisc/include/asm/bug.h          |   1 +
 kernel/arch/parisc/include/asm/bugs.h         |   1 +
 kernel/arch/parisc/include/asm/cache.h        |   1 +
 kernel/arch/parisc/include/asm/cacheflush.h   |   1 +
 kernel/arch/parisc/include/asm/checksum.h     |   1 +
 kernel/arch/parisc/include/asm/cmpxchg.h      |   1 +
 kernel/arch/parisc/include/asm/compat.h       |   1 +
 .../arch/parisc/include/asm/compat_ucontext.h |   1 +
 kernel/arch/parisc/include/asm/delay.h        |   1 +
 kernel/arch/parisc/include/asm/dma-mapping.h  |   1 +
 kernel/arch/parisc/include/asm/dma.h          |   1 +
 kernel/arch/parisc/include/asm/elf.h          |   1 +
 kernel/arch/parisc/include/asm/fb.h           |   1 +
 kernel/arch/parisc/include/asm/fixmap.h       |   1 +
 kernel/arch/parisc/include/asm/ftrace.h       |   1 +
 kernel/arch/parisc/include/asm/futex.h        |   1 +
 kernel/arch/parisc/include/asm/hardirq.h      |   1 +
 kernel/arch/parisc/include/asm/hardware.h     |   1 +
 kernel/arch/parisc/include/asm/hash.h         |   1 +
 kernel/arch/parisc/include/asm/hugetlb.h      |   1 +
 kernel/arch/parisc/include/asm/ide.h          |   1 +
 kernel/arch/parisc/include/asm/io.h           |   1 +
 kernel/arch/parisc/include/asm/irq.h          |   1 +
 kernel/arch/parisc/include/asm/irqflags.h     |   1 +
 kernel/arch/parisc/include/asm/kbdleds.h      |   1 +
 kernel/arch/parisc/include/asm/kmap_types.h   |   1 +
 kernel/arch/parisc/include/asm/ldcw.h         |   1 +
 kernel/arch/parisc/include/asm/led.h          |   1 +
 kernel/arch/parisc/include/asm/linkage.h      |   1 +
 kernel/arch/parisc/include/asm/machdep.h      |   1 +
 kernel/arch/parisc/include/asm/mckinley.h     |   1 +
 kernel/arch/parisc/include/asm/mmu.h          |   1 +
 kernel/arch/parisc/include/asm/mmu_context.h  |   1 +
 kernel/arch/parisc/include/asm/mmzone.h       |   1 +
 kernel/arch/parisc/include/asm/module.h       |   1 +
 kernel/arch/parisc/include/asm/page.h         |   1 +
 .../arch/parisc/include/asm/parisc-device.h   |   1 +
 kernel/arch/parisc/include/asm/parport.h      |   1 +
 kernel/arch/parisc/include/asm/pci.h          |   1 +
 kernel/arch/parisc/include/asm/pdc.h          |   1 +
 kernel/arch/parisc/include/asm/perf.h         |   1 +
 kernel/arch/parisc/include/asm/pgalloc.h      |   1 +
 kernel/arch/parisc/include/asm/pgtable.h      |   1 +
 kernel/arch/parisc/include/asm/prefetch.h     |   1 +
 kernel/arch/parisc/include/asm/processor.h    |   1 +
 kernel/arch/parisc/include/asm/psw.h          |   1 +
 kernel/arch/parisc/include/asm/ptrace.h       |   1 +
 kernel/arch/parisc/include/asm/ropes.h        |   1 +
 kernel/arch/parisc/include/asm/rt_sigframe.h  |   1 +
 kernel/arch/parisc/include/asm/runway.h       |   1 +
 kernel/arch/parisc/include/asm/sections.h     |   1 +
 kernel/arch/parisc/include/asm/shmparam.h     |   1 +
 kernel/arch/parisc/include/asm/signal.h       |   1 +
 kernel/arch/parisc/include/asm/smp.h          |   1 +
 kernel/arch/parisc/include/asm/socket.h       |   1 +
 .../arch/parisc/include/asm/special_insns.h   |   1 +
 kernel/arch/parisc/include/asm/spinlock.h     |   1 +
 .../arch/parisc/include/asm/spinlock_types.h  |   1 +
 kernel/arch/parisc/include/asm/string.h       |   1 +
 kernel/arch/parisc/include/asm/superio.h      |   1 +
 kernel/arch/parisc/include/asm/switch_to.h    |   1 +
 kernel/arch/parisc/include/asm/syscall.h      |   1 +
 kernel/arch/parisc/include/asm/termios.h      |   1 +
 kernel/arch/parisc/include/asm/thread_info.h  |   1 +
 kernel/arch/parisc/include/asm/timex.h        |   1 +
 kernel/arch/parisc/include/asm/tlb.h          |   1 +
 kernel/arch/parisc/include/asm/tlbflush.h     |   1 +
 kernel/arch/parisc/include/asm/traps.h        |   1 +
 kernel/arch/parisc/include/asm/uaccess.h      |   1 +
 kernel/arch/parisc/include/asm/ucontext.h     |   1 +
 kernel/arch/parisc/include/asm/unaligned.h    |   1 +
 kernel/arch/parisc/include/asm/unistd.h       |   1 +
 kernel/arch/parisc/include/asm/unwind.h       |   1 +
 .../parisc/include/uapi/asm/bitsperlong.h     |   1 +
 .../arch/parisc/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/errno.h   |   1 +
 kernel/arch/parisc/include/uapi/asm/fcntl.h   |   1 +
 kernel/arch/parisc/include/uapi/asm/ioctl.h   |   1 +
 kernel/arch/parisc/include/uapi/asm/ioctls.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/ipcbuf.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/mman.h    |   1 +
 kernel/arch/parisc/include/uapi/asm/msgbuf.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/pdc.h     |   1 +
 .../parisc/include/uapi/asm/posix_types.h     |   1 +
 kernel/arch/parisc/include/uapi/asm/ptrace.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/sembuf.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/setup.h   |   1 +
 kernel/arch/parisc/include/uapi/asm/shmbuf.h  |   1 +
 .../arch/parisc/include/uapi/asm/sigcontext.h |   1 +
 kernel/arch/parisc/include/uapi/asm/siginfo.h |   1 +
 kernel/arch/parisc/include/uapi/asm/signal.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/socket.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/sockios.h |   1 +
 kernel/arch/parisc/include/uapi/asm/stat.h    |   1 +
 kernel/arch/parisc/include/uapi/asm/statfs.h  |   1 +
 kernel/arch/parisc/include/uapi/asm/swab.h    |   1 +
 .../arch/parisc/include/uapi/asm/termbits.h   |   1 +
 kernel/arch/parisc/include/uapi/asm/termios.h |   1 +
 kernel/arch/parisc/include/uapi/asm/types.h   |   1 +
 kernel/arch/parisc/include/uapi/asm/unistd.h  |   1 +
 kernel/arch/parisc/kernel/Makefile            |   1 +
 kernel/arch/parisc/kernel/audit.c             |   1 +
 kernel/arch/parisc/kernel/binfmt_elf32.c      |   1 +
 kernel/arch/parisc/kernel/compat_audit.c      |   1 +
 kernel/arch/parisc/kernel/ftrace.c            |   1 +
 kernel/arch/parisc/kernel/pa7300lc.c          |   1 +
 kernel/arch/parisc/kernel/pci-dma.c           |   1 +
 kernel/arch/parisc/kernel/pdt.c               |   1 +
 kernel/arch/parisc/kernel/ptrace.c            |   1 +
 kernel/arch/parisc/kernel/signal.c            |   1 +
 kernel/arch/parisc/kernel/sys_parisc32.c      |   1 +
 kernel/arch/parisc/kernel/time.c              |   1 +
 kernel/arch/parisc/kernel/traps.c             |   1 +
 kernel/arch/parisc/kernel/unwind.c            |   1 +
 kernel/arch/parisc/kernel/vmlinux.lds.S       |   1 +
 kernel/arch/parisc/lib/bitops.c               |   1 +
 kernel/arch/parisc/lib/delay.c                |   1 +
 kernel/arch/parisc/lib/io.c                   |   1 +
 kernel/arch/parisc/lib/iomap.c                |   1 +
 kernel/arch/parisc/lib/ucmpdi2.c              |   1 +
 kernel/arch/parisc/math-emu/Makefile          |   1 +
 kernel/arch/parisc/mm/hugetlbpage.c           |   1 +
 kernel/arch/parisc/mm/init.c                  |   1 +
 kernel/arch/parisc/mm/ioremap.c               |   1 +
 kernel/arch/parisc/oprofile/Makefile          |   1 +
 kernel/arch/powerpc/Kconfig                   |   1 +
 kernel/arch/powerpc/Kconfig.debug             |   1 +
 kernel/arch/powerpc/Makefile.postlink         |   1 +
 kernel/arch/powerpc/boot/Makefile             |   1 +
 kernel/arch/powerpc/boot/cpm-serial.c         |   1 +
 kernel/arch/powerpc/boot/cuboot.h             |   1 +
 kernel/arch/powerpc/boot/dcr.h                |   1 +
 .../arch/powerpc/boot/dts/virtex440-ml510.dts |   1 +
 kernel/arch/powerpc/boot/elf.h                |   1 +
 kernel/arch/powerpc/boot/epapr-wrapper.c      |   1 +
 kernel/arch/powerpc/boot/fixed-head.S         |   1 +
 kernel/arch/powerpc/boot/fsl-soc.h            |   1 +
 kernel/arch/powerpc/boot/io.h                 |   1 +
 kernel/arch/powerpc/boot/libfdt_env.h         |   1 +
 kernel/arch/powerpc/boot/mktree.c             |   1 +
 kernel/arch/powerpc/boot/motload-head.S       |   1 +
 kernel/arch/powerpc/boot/mpc52xx-psc.c        |   1 +
 kernel/arch/powerpc/boot/mpc8xx.h             |   1 +
 kernel/arch/powerpc/boot/ns16550.c            |   1 +
 kernel/arch/powerpc/boot/of.h                 |   1 +
 kernel/arch/powerpc/boot/planetcore.h         |   1 +
 kernel/arch/powerpc/boot/pq2.h                |   1 +
 kernel/arch/powerpc/boot/pseries-head.S       |   1 +
 kernel/arch/powerpc/boot/redboot.h            |   1 +
 kernel/arch/powerpc/boot/rs6000.h             |   1 +
 kernel/arch/powerpc/boot/stdio.h              |   1 +
 kernel/arch/powerpc/boot/stdlib.h             |   1 +
 kernel/arch/powerpc/boot/string.h             |   1 +
 kernel/arch/powerpc/boot/swab.h               |   1 +
 kernel/arch/powerpc/boot/types.h              |   1 +
 kernel/arch/powerpc/boot/virtex405-head.S     |   1 +
 kernel/arch/powerpc/boot/xz_config.h          |   1 +
 kernel/arch/powerpc/boot/zImage.coff.lds.S    |   1 +
 kernel/arch/powerpc/boot/zImage.lds.S         |   1 +
 kernel/arch/powerpc/boot/zImage.ps3.lds.S     |   1 +
 kernel/arch/powerpc/crypto/Makefile           |   1 +
 kernel/arch/powerpc/crypto/sha1-powerpc-asm.S |   1 +
 kernel/arch/powerpc/include/asm/agp.h         |   1 +
 kernel/arch/powerpc/include/asm/archrandom.h  |   1 +
 kernel/arch/powerpc/include/asm/atomic.h      |   1 +
 kernel/arch/powerpc/include/asm/backlight.h   |   1 +
 kernel/arch/powerpc/include/asm/barrier.h     |   1 +
 .../arch/powerpc/include/asm/book3s/32/hash.h |   1 +
 .../powerpc/include/asm/book3s/32/mmu-hash.h  |   1 +
 .../powerpc/include/asm/book3s/32/pgalloc.h   |   1 +
 .../powerpc/include/asm/book3s/32/pgtable.h   |   1 +
 .../powerpc/include/asm/book3s/64/hash-4k.h   |   1 +
 .../powerpc/include/asm/book3s/64/hash-64k.h  |   1 +
 .../arch/powerpc/include/asm/book3s/64/hash.h |   1 +
 .../powerpc/include/asm/book3s/64/hugetlb.h   |   1 +
 .../arch/powerpc/include/asm/book3s/64/mmu.h  |   1 +
 .../include/asm/book3s/64/pgtable-4k.h        |   1 +
 .../include/asm/book3s/64/pgtable-64k.h       |   1 +
 .../powerpc/include/asm/book3s/64/pgtable.h   |   1 +
 .../powerpc/include/asm/book3s/64/radix-4k.h  |   1 +
 .../powerpc/include/asm/book3s/64/radix-64k.h |   1 +
 .../powerpc/include/asm/book3s/64/radix.h     |   1 +
 .../include/asm/book3s/64/tlbflush-hash.h     |   1 +
 .../include/asm/book3s/64/tlbflush-radix.h    |   1 +
 .../powerpc/include/asm/book3s/64/tlbflush.h  |   1 +
 .../arch/powerpc/include/asm/book3s/pgalloc.h |   1 +
 .../arch/powerpc/include/asm/book3s/pgtable.h |   1 +
 kernel/arch/powerpc/include/asm/bootx.h       |   1 +
 kernel/arch/powerpc/include/asm/btext.h       |   1 +
 kernel/arch/powerpc/include/asm/bug.h         |   1 +
 kernel/arch/powerpc/include/asm/cache.h       |   1 +
 kernel/arch/powerpc/include/asm/cell-regs.h   |   1 +
 kernel/arch/powerpc/include/asm/cmpxchg.h     |   1 +
 .../arch/powerpc/include/asm/code-patching.h  |  10 +-
 kernel/arch/powerpc/include/asm/compat.h      |   1 +
 .../powerpc/include/asm/context_tracking.h    |   1 +
 kernel/arch/powerpc/include/asm/cpm.h         |   1 +
 kernel/arch/powerpc/include/asm/cpm1.h        |   1 +
 kernel/arch/powerpc/include/asm/cpm2.h        |   1 +
 .../powerpc/include/asm/cpu_has_feature.h     |   1 +
 kernel/arch/powerpc/include/asm/cpuidle.h     |   1 +
 kernel/arch/powerpc/include/asm/cputable.h    |   1 +
 kernel/arch/powerpc/include/asm/cputhreads.h  |   1 +
 kernel/arch/powerpc/include/asm/dbdma.h       |   1 +
 kernel/arch/powerpc/include/asm/dcr-regs.h    |   1 +
 kernel/arch/powerpc/include/asm/debug.h       |   1 +
 kernel/arch/powerpc/include/asm/dma-mapping.h |   1 +
 kernel/arch/powerpc/include/asm/dma.h         |   1 +
 kernel/arch/powerpc/include/asm/dt_cpu_ftrs.h |   1 +
 kernel/arch/powerpc/include/asm/exec.h        |   1 +
 kernel/arch/powerpc/include/asm/extable.h     |   1 +
 kernel/arch/powerpc/include/asm/fb.h          |   1 +
 kernel/arch/powerpc/include/asm/ftrace.h      |   1 +
 kernel/arch/powerpc/include/asm/futex.h       |   1 +
 kernel/arch/powerpc/include/asm/grackle.h     |   1 +
 kernel/arch/powerpc/include/asm/hardirq.h     |   1 +
 kernel/arch/powerpc/include/asm/head-64.h     |   1 +
 kernel/arch/powerpc/include/asm/heathrow.h    |   1 +
 kernel/arch/powerpc/include/asm/highmem.h     |   1 +
 kernel/arch/powerpc/include/asm/hugetlb.h     |   1 +
 kernel/arch/powerpc/include/asm/hvcall.h      |   1 +
 kernel/arch/powerpc/include/asm/hvsi.h        |   1 +
 kernel/arch/powerpc/include/asm/hw_irq.h      |   1 +
 kernel/arch/powerpc/include/asm/i8259.h       |   1 +
 kernel/arch/powerpc/include/asm/ide.h         |   1 +
 kernel/arch/powerpc/include/asm/ima.h         |   1 +
 kernel/arch/powerpc/include/asm/immap_cpm2.h  |   1 +
 kernel/arch/powerpc/include/asm/io-defs.h     |   1 +
 kernel/arch/powerpc/include/asm/irq_work.h    |   1 +
 kernel/arch/powerpc/include/asm/irqflags.h    |   1 +
 kernel/arch/powerpc/include/asm/isa-bridge.h  |   1 +
 kernel/arch/powerpc/include/asm/kdebug.h      |   1 +
 kernel/arch/powerpc/include/asm/kdump.h       |   1 +
 kernel/arch/powerpc/include/asm/kexec.h       |   1 +
 kernel/arch/powerpc/include/asm/keylargo.h    |   1 +
 .../arch/powerpc/include/asm/libata-portmap.h |   1 +
 kernel/arch/powerpc/include/asm/linkage.h     |   1 +
 kernel/arch/powerpc/include/asm/local.h       |   1 +
 kernel/arch/powerpc/include/asm/macio.h       |   1 +
 kernel/arch/powerpc/include/asm/mediabay.h    |   1 +
 kernel/arch/powerpc/include/asm/mmu-40x.h     |   1 +
 kernel/arch/powerpc/include/asm/mmu-44x.h     |   1 +
 kernel/arch/powerpc/include/asm/mmu-8xx.h     |   1 +
 kernel/arch/powerpc/include/asm/mmu-book3e.h  |   1 +
 kernel/arch/powerpc/include/asm/mmu.h         |   1 +
 kernel/arch/powerpc/include/asm/mmu_context.h |   1 +
 kernel/arch/powerpc/include/asm/mmzone.h      |   1 +
 kernel/arch/powerpc/include/asm/mpc6xx.h      |   1 +
 kernel/arch/powerpc/include/asm/mpc8260.h     |   1 +
 kernel/arch/powerpc/include/asm/mpic.h        |   1 +
 kernel/arch/powerpc/include/asm/nmi.h         |   1 +
 .../powerpc/include/asm/nohash/32/pgalloc.h   |   1 +
 .../powerpc/include/asm/nohash/32/pgtable.h   |   1 +
 .../powerpc/include/asm/nohash/32/pte-40x.h   |   1 +
 .../powerpc/include/asm/nohash/32/pte-44x.h   |   1 +
 .../powerpc/include/asm/nohash/32/pte-8xx.h   |   1 +
 .../include/asm/nohash/32/pte-fsl-booke.h     |   1 +
 .../include/asm/nohash/64/pgtable-4k.h        |   1 +
 .../include/asm/nohash/64/pgtable-64k.h       |   1 +
 .../powerpc/include/asm/nohash/64/pgtable.h   |   1 +
 .../arch/powerpc/include/asm/nohash/pgalloc.h |   1 +
 .../arch/powerpc/include/asm/nohash/pgtable.h |   1 +
 .../powerpc/include/asm/nohash/pte-book3e.h   |   1 +
 kernel/arch/powerpc/include/asm/ohare.h       |   1 +
 kernel/arch/powerpc/include/asm/page_32.h     |   1 +
 kernel/arch/powerpc/include/asm/parport.h     |   1 +
 kernel/arch/powerpc/include/asm/percpu.h      |   1 +
 kernel/arch/powerpc/include/asm/pgalloc.h     |   1 +
 .../powerpc/include/asm/pgtable-be-types.h    |   1 +
 .../arch/powerpc/include/asm/pgtable-types.h  |   1 +
 kernel/arch/powerpc/include/asm/pgtable.h     |   1 +
 .../arch/powerpc/include/asm/plpar_wrappers.h |   1 +
 kernel/arch/powerpc/include/asm/pmac_pfunc.h  |   1 +
 kernel/arch/powerpc/include/asm/pte-common.h  |   1 +
 kernel/arch/powerpc/include/asm/reg.h         |   1 +
 kernel/arch/powerpc/include/asm/reg_8xx.h     |   1 +
 kernel/arch/powerpc/include/asm/reg_fsl_emb.h |   1 +
 kernel/arch/powerpc/include/asm/runlatch.h    |   1 +
 kernel/arch/powerpc/include/asm/seccomp.h     |   1 +
 kernel/arch/powerpc/include/asm/sections.h    |   1 +
 kernel/arch/powerpc/include/asm/setup.h       |   1 +
 kernel/arch/powerpc/include/asm/shmparam.h    |   1 +
 kernel/arch/powerpc/include/asm/signal.h      |   1 +
 kernel/arch/powerpc/include/asm/smu.h         |   1 +
 kernel/arch/powerpc/include/asm/sparsemem.h   |   1 +
 .../arch/powerpc/include/asm/spinlock_types.h |   1 +
 kernel/arch/powerpc/include/asm/string.h      |   1 +
 kernel/arch/powerpc/include/asm/switch_to.h   |   1 +
 kernel/arch/powerpc/include/asm/synch.h       |   1 +
 kernel/arch/powerpc/include/asm/syscalls.h    |   1 +
 kernel/arch/powerpc/include/asm/systbl.h      |   1 +
 kernel/arch/powerpc/include/asm/thread_info.h |   1 +
 kernel/arch/powerpc/include/asm/timex.h       |   1 +
 kernel/arch/powerpc/include/asm/tm.h          |   1 +
 kernel/arch/powerpc/include/asm/topology.h    |   1 +
 kernel/arch/powerpc/include/asm/trace.h       |   1 +
 kernel/arch/powerpc/include/asm/uaccess.h     |   1 +
 kernel/arch/powerpc/include/asm/unaligned.h   |   1 +
 kernel/arch/powerpc/include/asm/uninorth.h    |   1 +
 kernel/arch/powerpc/include/asm/user.h        |   1 +
 kernel/arch/powerpc/include/asm/vdso.h        |   1 +
 kernel/arch/powerpc/include/asm/vga.h         |   1 +
 kernel/arch/powerpc/include/asm/xics.h        |   1 +
 kernel/arch/powerpc/include/uapi/asm/auxvec.h |   1 +
 .../powerpc/include/uapi/asm/bitsperlong.h    |   1 +
 kernel/arch/powerpc/include/uapi/asm/bootx.h  |   1 +
 .../arch/powerpc/include/uapi/asm/byteorder.h |   1 +
 .../arch/powerpc/include/uapi/asm/cputable.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/eeh.h    |   1 +
 kernel/arch/powerpc/include/uapi/asm/elf.h    |   1 +
 .../powerpc/include/uapi/asm/epapr_hcalls.h   |   1 +
 kernel/arch/powerpc/include/uapi/asm/errno.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/fcntl.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/ioctl.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/ioctls.h |   1 +
 kernel/arch/powerpc/include/uapi/asm/ipcbuf.h |   1 +
 kernel/arch/powerpc/include/uapi/asm/kvm.h    |   1 +
 .../arch/powerpc/include/uapi/asm/kvm_para.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/mman.h   |   1 +
 kernel/arch/powerpc/include/uapi/asm/msgbuf.h |   1 +
 kernel/arch/powerpc/include/uapi/asm/nvram.h  |   1 +
 .../arch/powerpc/include/uapi/asm/opal-prd.h  |   1 +
 .../powerpc/include/uapi/asm/perf_event.h     |   1 +
 .../arch/powerpc/include/uapi/asm/perf_regs.h |   1 +
 .../powerpc/include/uapi/asm/posix_types.h    |   1 +
 kernel/arch/powerpc/include/uapi/asm/ps3fb.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/ptrace.h |   1 +
 kernel/arch/powerpc/include/uapi/asm/sembuf.h |   1 +
 kernel/arch/powerpc/include/uapi/asm/setup.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/shmbuf.h |   1 +
 .../powerpc/include/uapi/asm/sigcontext.h     |   1 +
 .../arch/powerpc/include/uapi/asm/siginfo.h   |   1 +
 kernel/arch/powerpc/include/uapi/asm/signal.h |   1 +
 kernel/arch/powerpc/include/uapi/asm/socket.h |   1 +
 .../arch/powerpc/include/uapi/asm/spu_info.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/stat.h   |   1 +
 kernel/arch/powerpc/include/uapi/asm/swab.h   |   1 +
 .../arch/powerpc/include/uapi/asm/termbits.h  |   1 +
 .../arch/powerpc/include/uapi/asm/termios.h   |   1 +
 kernel/arch/powerpc/include/uapi/asm/tm.h     |   1 +
 kernel/arch/powerpc/include/uapi/asm/types.h  |   1 +
 .../arch/powerpc/include/uapi/asm/ucontext.h  |   1 +
 kernel/arch/powerpc/include/uapi/asm/unistd.h |   1 +
 kernel/arch/powerpc/kernel/Makefile           |   1 +
 kernel/arch/powerpc/kernel/align.c            |   2 +-
 kernel/arch/powerpc/kernel/audit.c            |   1 +
 kernel/arch/powerpc/kernel/btext.c            |   1 +
 kernel/arch/powerpc/kernel/cacheinfo.h        |   1 +
 kernel/arch/powerpc/kernel/compat_audit.c     |   1 +
 kernel/arch/powerpc/kernel/dma-iommu.c        |   1 +
 kernel/arch/powerpc/kernel/exceptions-64s.S   |   1 +
 .../powerpc/kernel/fsl_booke_entry_mapping.S  |   1 +
 kernel/arch/powerpc/kernel/head_booke.h       |   1 +
 kernel/arch/powerpc/kernel/iomap.c            |   1 +
 kernel/arch/powerpc/kernel/kprobes.c          |   7 +-
 kernel/arch/powerpc/kernel/legacy_serial.c    |   1 +
 kernel/arch/powerpc/kernel/prom_parse.c       |   1 +
 kernel/arch/powerpc/kernel/rtas-proc.c        |   1 +
 kernel/arch/powerpc/kernel/rtas-rtc.c         |   1 +
 kernel/arch/powerpc/kernel/smp-tbsync.c       |   1 +
 kernel/arch/powerpc/kernel/swsusp_32.S        |   1 +
 kernel/arch/powerpc/kernel/swsusp_booke.S     |   1 +
 kernel/arch/powerpc/kernel/tau_6xx.c          |   1 +
 kernel/arch/powerpc/kernel/tm.S               |   1 +
 kernel/arch/powerpc/kernel/trace/Makefile     |   1 +
 kernel/arch/powerpc/kernel/trace/ftrace.c     |   1 +
 kernel/arch/powerpc/kernel/vdso32/Makefile    |   1 +
 .../arch/powerpc/kernel/vdso32/vdso32.lds.S   |   1 +
 .../powerpc/kernel/vdso32/vdso32_wrapper.S    |   1 +
 kernel/arch/powerpc/kernel/vdso64/Makefile    |   1 +
 .../arch/powerpc/kernel/vdso64/vdso64.lds.S   |   1 +
 .../powerpc/kernel/vdso64/vdso64_wrapper.S    |   1 +
 kernel/arch/powerpc/kernel/vecemu.c           |   1 +
 kernel/arch/powerpc/kernel/vector.S           |   1 +
 kernel/arch/powerpc/kernel/vmlinux.lds.S      |   1 +
 kernel/arch/powerpc/kernel/watchdog.c         |   1 +
 kernel/arch/powerpc/kvm/Kconfig               |   1 +
 kernel/arch/powerpc/kvm/Makefile              |   1 +
 kernel/arch/powerpc/kvm/book3s_hv_rm_xive.c   |   1 +
 kernel/arch/powerpc/kvm/irq.h                 |   1 +
 kernel/arch/powerpc/kvm/trace.h               |   1 +
 kernel/arch/powerpc/kvm/trace_book3s.h        |   1 +
 kernel/arch/powerpc/kvm/trace_booke.h         |   1 +
 kernel/arch/powerpc/kvm/trace_hv.h            |   1 +
 kernel/arch/powerpc/kvm/trace_pr.h            |   1 +
 kernel/arch/powerpc/lib/Makefile              |   1 +
 kernel/arch/powerpc/lib/alloc.c               |   1 +
 kernel/arch/powerpc/lib/xor_vmx.h             |   1 +
 kernel/arch/powerpc/math-emu/Makefile         |   1 +
 kernel/arch/powerpc/math-emu/fabs.c           |   1 +
 kernel/arch/powerpc/math-emu/fadd.c           |   1 +
 kernel/arch/powerpc/math-emu/fadds.c          |   1 +
 kernel/arch/powerpc/math-emu/fcmpo.c          |   1 +
 kernel/arch/powerpc/math-emu/fcmpu.c          |   1 +
 kernel/arch/powerpc/math-emu/fctiw.c          |   1 +
 kernel/arch/powerpc/math-emu/fctiwz.c         |   1 +
 kernel/arch/powerpc/math-emu/fdiv.c           |   1 +
 kernel/arch/powerpc/math-emu/fdivs.c          |   1 +
 kernel/arch/powerpc/math-emu/fmadd.c          |   1 +
 kernel/arch/powerpc/math-emu/fmadds.c         |   1 +
 kernel/arch/powerpc/math-emu/fmr.c            |   1 +
 kernel/arch/powerpc/math-emu/fmsub.c          |   1 +
 kernel/arch/powerpc/math-emu/fmsubs.c         |   1 +
 kernel/arch/powerpc/math-emu/fmul.c           |   1 +
 kernel/arch/powerpc/math-emu/fmuls.c          |   1 +
 kernel/arch/powerpc/math-emu/fnabs.c          |   1 +
 kernel/arch/powerpc/math-emu/fneg.c           |   1 +
 kernel/arch/powerpc/math-emu/fnmadd.c         |   1 +
 kernel/arch/powerpc/math-emu/fnmadds.c        |   1 +
 kernel/arch/powerpc/math-emu/fnmsub.c         |   1 +
 kernel/arch/powerpc/math-emu/fnmsubs.c        |   1 +
 kernel/arch/powerpc/math-emu/fre.c            |   1 +
 kernel/arch/powerpc/math-emu/fres.c           |   1 +
 kernel/arch/powerpc/math-emu/frsp.c           |   1 +
 kernel/arch/powerpc/math-emu/frsqrte.c        |   1 +
 kernel/arch/powerpc/math-emu/frsqrtes.c       |   1 +
 kernel/arch/powerpc/math-emu/fsel.c           |   1 +
 kernel/arch/powerpc/math-emu/fsqrt.c          |   1 +
 kernel/arch/powerpc/math-emu/fsqrts.c         |   1 +
 kernel/arch/powerpc/math-emu/fsub.c           |   1 +
 kernel/arch/powerpc/math-emu/fsubs.c          |   1 +
 kernel/arch/powerpc/math-emu/lfd.c            |   1 +
 kernel/arch/powerpc/math-emu/lfs.c            |   1 +
 kernel/arch/powerpc/math-emu/math.c           |   1 +
 kernel/arch/powerpc/math-emu/mcrfs.c          |   1 +
 kernel/arch/powerpc/math-emu/mffs.c           |   1 +
 kernel/arch/powerpc/math-emu/mtfsb0.c         |   1 +
 kernel/arch/powerpc/math-emu/mtfsb1.c         |   1 +
 kernel/arch/powerpc/math-emu/mtfsf.c          |   1 +
 kernel/arch/powerpc/math-emu/mtfsfi.c         |   1 +
 kernel/arch/powerpc/math-emu/stfd.c           |   1 +
 kernel/arch/powerpc/math-emu/stfiwx.c         |   1 +
 kernel/arch/powerpc/math-emu/stfs.c           |   1 +
 kernel/arch/powerpc/math-emu/udivmodti4.c     |   1 +
 kernel/arch/powerpc/mm/Makefile               |   1 +
 kernel/arch/powerpc/mm/highmem.c              |   1 +
 kernel/arch/powerpc/mm/hugetlbpage-book3e.c   |   1 +
 kernel/arch/powerpc/mm/hugetlbpage-hash64.c   |   1 +
 kernel/arch/powerpc/mm/hugetlbpage-radix.c    |   1 +
 kernel/arch/powerpc/mm/tlb-radix.c            |   2 +
 kernel/arch/powerpc/mm/vphn.c                 |   1 +
 kernel/arch/powerpc/mm/vphn.h                 |   1 +
 kernel/arch/powerpc/net/Makefile              |   1 +
 kernel/arch/powerpc/oprofile/Makefile         |   1 +
 kernel/arch/powerpc/perf/Makefile             |   1 +
 kernel/arch/powerpc/perf/hv-24x7-catalog.h    |   1 +
 kernel/arch/powerpc/perf/hv-24x7-domains.h    |   1 +
 kernel/arch/powerpc/perf/hv-24x7.h            |   1 +
 kernel/arch/powerpc/perf/hv-common.c          |   1 +
 kernel/arch/powerpc/perf/hv-common.h          |   1 +
 kernel/arch/powerpc/perf/hv-gpci-requests.h   |   1 +
 kernel/arch/powerpc/perf/hv-gpci.h            |   1 +
 kernel/arch/powerpc/perf/imc-pmu.c            |  18 ++-
 kernel/arch/powerpc/perf/req-gen/_begin.h     |   1 +
 kernel/arch/powerpc/perf/req-gen/_clear.h     |   1 +
 .../powerpc/perf/req-gen/_request-begin.h     |   1 +
 .../arch/powerpc/perf/req-gen/_request-end.h  |   1 +
 kernel/arch/powerpc/perf/req-gen/perf.h       |   1 +
 kernel/arch/powerpc/platforms/40x/Kconfig     |   1 +
 kernel/arch/powerpc/platforms/44x/44x.h       |   1 +
 kernel/arch/powerpc/platforms/44x/Kconfig     |   1 +
 kernel/arch/powerpc/platforms/44x/Makefile    |   1 +
 .../arch/powerpc/platforms/44x/virtex_ml510.c |   1 +
 kernel/arch/powerpc/platforms/512x/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/512x/Makefile   |   1 +
 kernel/arch/powerpc/platforms/52xx/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/52xx/Makefile   |   1 +
 .../arch/powerpc/platforms/52xx/lite5200_pm.c |   1 +
 .../powerpc/platforms/52xx/lite5200_sleep.S   |   1 +
 .../arch/powerpc/platforms/52xx/mpc52xx_pm.c  |   1 +
 .../powerpc/platforms/52xx/mpc52xx_sleep.S    |   1 +
 kernel/arch/powerpc/platforms/82xx/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/82xx/Makefile   |   1 +
 kernel/arch/powerpc/platforms/82xx/pq2.h      |   1 +
 kernel/arch/powerpc/platforms/83xx/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/83xx/Makefile   |   1 +
 kernel/arch/powerpc/platforms/83xx/mpc83xx.h  |   1 +
 kernel/arch/powerpc/platforms/85xx/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/85xx/Makefile   |   1 +
 kernel/arch/powerpc/platforms/85xx/mpc85xx.h  |   1 +
 kernel/arch/powerpc/platforms/85xx/smp.h      |   1 +
 kernel/arch/powerpc/platforms/86xx/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/86xx/Makefile   |   1 +
 kernel/arch/powerpc/platforms/8xx/Kconfig     |   1 +
 kernel/arch/powerpc/platforms/8xx/Makefile    |   1 +
 .../arch/powerpc/platforms/8xx/m8xx_setup.c   |   1 +
 kernel/arch/powerpc/platforms/Kconfig         |   1 +
 kernel/arch/powerpc/platforms/Kconfig.cputype |   1 +
 kernel/arch/powerpc/platforms/Makefile        |   1 +
 .../arch/powerpc/platforms/amigaone/Kconfig   |   1 +
 kernel/arch/powerpc/platforms/cell/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/cell/Makefile   |   1 +
 .../arch/powerpc/platforms/cell/interrupt.h   |   1 +
 kernel/arch/powerpc/platforms/cell/ras.h      |   1 +
 .../powerpc/platforms/cell/spufs/Makefile     |   1 +
 .../arch/powerpc/platforms/cell/spufs/run.c   |   1 +
 .../powerpc/platforms/cell/spufs/sputrace.h   |   1 +
 .../powerpc/platforms/cell/spufs/syscalls.c   |   1 +
 kernel/arch/powerpc/platforms/chrp/Kconfig    |   1 +
 kernel/arch/powerpc/platforms/chrp/chrp.h     |   1 +
 kernel/arch/powerpc/platforms/chrp/pci.c      |   1 +
 .../arch/powerpc/platforms/chrp/pegasos_eth.c |   1 +
 kernel/arch/powerpc/platforms/chrp/setup.c    |   1 +
 kernel/arch/powerpc/platforms/chrp/smp.c      |   1 +
 kernel/arch/powerpc/platforms/chrp/time.c     |   1 +
 .../powerpc/platforms/embedded6xx/Kconfig     |   1 +
 .../powerpc/platforms/embedded6xx/Makefile    |   1 +
 kernel/arch/powerpc/platforms/maple/Kconfig   |   1 +
 kernel/arch/powerpc/platforms/maple/maple.h   |   1 +
 kernel/arch/powerpc/platforms/pasemi/Kconfig  |   1 +
 kernel/arch/powerpc/platforms/pasemi/pasemi.h |   1 +
 .../arch/powerpc/platforms/powermac/Kconfig   |   1 +
 .../arch/powerpc/platforms/powermac/Makefile  |   1 +
 .../powerpc/platforms/powermac/pfunc_base.c   |   1 +
 kernel/arch/powerpc/platforms/powermac/pmac.h |   1 +
 kernel/arch/powerpc/platforms/powermac/time.c |   1 +
 .../powerpc/platforms/powermac/udbg_adb.c     |   1 +
 kernel/arch/powerpc/platforms/powernv/Kconfig |   1 +
 .../arch/powerpc/platforms/powernv/Makefile   |   1 +
 .../platforms/powernv/opal-tracepoints.c      |   1 +
 kernel/arch/powerpc/platforms/powernv/pci.h   |   1 +
 .../arch/powerpc/platforms/powernv/powernv.h  |   1 +
 kernel/arch/powerpc/platforms/ps3/Kconfig     |   1 +
 kernel/arch/powerpc/platforms/ps3/Makefile    |   1 +
 kernel/arch/powerpc/platforms/pseries/Kconfig |   1 +
 .../arch/powerpc/platforms/pseries/Makefile   |   1 +
 .../powerpc/platforms/pseries/of_helpers.c    |   1 +
 .../powerpc/platforms/pseries/of_helpers.h    |   1 +
 .../platforms/pseries/offline_states.h        |   1 +
 kernel/arch/powerpc/purgatory/Makefile        |   1 +
 kernel/arch/powerpc/sysdev/Kconfig            |   1 +
 kernel/arch/powerpc/sysdev/Makefile           |   1 +
 kernel/arch/powerpc/sysdev/cpm1.c             |   1 +
 kernel/arch/powerpc/sysdev/cpm2_pic.h         |   1 +
 kernel/arch/powerpc/sysdev/fsl_soc.h          |   1 +
 kernel/arch/powerpc/sysdev/ge/ge_pic.h        |   1 +
 kernel/arch/powerpc/sysdev/micropatch.c       |   1 +
 kernel/arch/powerpc/sysdev/mpc5xxx_clocks.c   |   1 +
 kernel/arch/powerpc/sysdev/mv64x60.h          |   1 +
 kernel/arch/powerpc/sysdev/simple_gpio.h      |   1 +
 kernel/arch/powerpc/sysdev/xics/Kconfig       |   1 +
 kernel/arch/powerpc/sysdev/xics/Makefile      |   1 +
 kernel/arch/powerpc/sysdev/xics/ics-rtas.c    |   1 +
 kernel/arch/powerpc/sysdev/xive/Kconfig       |   1 +
 .../tools/gcc-check-mprofile-kernel.sh        |   1 +
 kernel/arch/powerpc/xmon/Makefile             |   1 +
 kernel/arch/powerpc/xmon/nonstdio.h           |   1 +
 kernel/arch/powerpc/xmon/spr_access.S         |   1 +
 kernel/arch/s390/Kconfig                      |   1 +
 kernel/arch/s390/Kconfig.debug                |   1 +
 kernel/arch/s390/appldata/appldata.h          |   1 +
 kernel/arch/s390/boot/Makefile                |   1 +
 kernel/arch/s390/boot/compressed/Makefile     |   1 +
 kernel/arch/s390/boot/compressed/head.S       |   1 +
 kernel/arch/s390/boot/compressed/misc.c       |   1 +
 .../arch/s390/boot/compressed/vmlinux.lds.S   |   1 +
 kernel/arch/s390/crypto/Makefile              |   1 +
 kernel/arch/s390/crypto/crc32be-vx.S          |   1 +
 kernel/arch/s390/crypto/crc32le-vx.S          |   1 +
 kernel/arch/s390/hypfs/hypfs.h                |   1 +
 kernel/arch/s390/hypfs/hypfs_dbfs.c           |   1 +
 kernel/arch/s390/hypfs/hypfs_diag.c           |   1 +
 kernel/arch/s390/hypfs/hypfs_diag0c.c         |   1 +
 kernel/arch/s390/hypfs/hypfs_sprp.c           |   1 +
 kernel/arch/s390/hypfs/hypfs_vm.c             |   1 +
 kernel/arch/s390/include/asm/airq.h           |   1 +
 kernel/arch/s390/include/asm/appldata.h       |   1 +
 kernel/arch/s390/include/asm/archrandom.h     |   1 +
 kernel/arch/s390/include/asm/asm-prototypes.h |   1 +
 kernel/arch/s390/include/asm/atomic.h         |   1 +
 kernel/arch/s390/include/asm/atomic_ops.h     |   1 +
 kernel/arch/s390/include/asm/barrier.h        |   1 +
 kernel/arch/s390/include/asm/bitops.h         |   1 +
 kernel/arch/s390/include/asm/bug.h            |   1 +
 kernel/arch/s390/include/asm/cache.h          |   1 +
 kernel/arch/s390/include/asm/ccwdev.h         |   1 +
 kernel/arch/s390/include/asm/ccwgroup.h       |   1 +
 kernel/arch/s390/include/asm/checksum.h       |   1 +
 kernel/arch/s390/include/asm/chpid.h          |   1 +
 kernel/arch/s390/include/asm/cio.h            |   1 +
 kernel/arch/s390/include/asm/clp.h            |   1 +
 kernel/arch/s390/include/asm/cmb.h            |   1 +
 kernel/arch/s390/include/asm/cmpxchg.h        |   1 +
 kernel/arch/s390/include/asm/compat.h         |   1 +
 kernel/arch/s390/include/asm/cpacf.h          |   1 +
 kernel/arch/s390/include/asm/cpcmd.h          |   1 +
 kernel/arch/s390/include/asm/cpu.h            |   1 +
 kernel/arch/s390/include/asm/cpufeature.h     |   1 +
 kernel/arch/s390/include/asm/cputime.h        |   1 +
 kernel/arch/s390/include/asm/crw.h            |   1 +
 kernel/arch/s390/include/asm/css_chars.h      |   1 +
 kernel/arch/s390/include/asm/ctl_reg.h        |   1 +
 kernel/arch/s390/include/asm/current.h        |   1 +
 kernel/arch/s390/include/asm/debug.h          |   1 +
 kernel/arch/s390/include/asm/delay.h          |   1 +
 kernel/arch/s390/include/asm/diag.h           |   1 +
 kernel/arch/s390/include/asm/dis.h            |   1 +
 kernel/arch/s390/include/asm/dma-mapping.h    |   1 +
 kernel/arch/s390/include/asm/dma.h            |   1 +
 kernel/arch/s390/include/asm/eadm.h           |   1 +
 kernel/arch/s390/include/asm/ebcdic.h         |   1 +
 kernel/arch/s390/include/asm/elf.h            |   1 +
 kernel/arch/s390/include/asm/exec.h           |   1 +
 kernel/arch/s390/include/asm/extable.h        |   1 +
 kernel/arch/s390/include/asm/extmem.h         |   1 +
 kernel/arch/s390/include/asm/facility.h       |   1 +
 kernel/arch/s390/include/asm/fcx.h            |   1 +
 kernel/arch/s390/include/asm/fpu/api.h        |   1 +
 kernel/arch/s390/include/asm/fpu/internal.h   |   1 +
 kernel/arch/s390/include/asm/fpu/types.h      |   1 +
 kernel/arch/s390/include/asm/ftrace.h         |   1 +
 kernel/arch/s390/include/asm/futex.h          |   1 +
 kernel/arch/s390/include/asm/gmap.h           |   1 +
 kernel/arch/s390/include/asm/hardirq.h        |   1 +
 kernel/arch/s390/include/asm/hugetlb.h        |   1 +
 kernel/arch/s390/include/asm/hw_irq.h         |   1 +
 kernel/arch/s390/include/asm/idals.h          |   1 +
 kernel/arch/s390/include/asm/idle.h           |   1 +
 kernel/arch/s390/include/asm/io.h             |   1 +
 kernel/arch/s390/include/asm/ipl.h            |   1 +
 kernel/arch/s390/include/asm/irq.h            |   1 +
 kernel/arch/s390/include/asm/irqflags.h       |   1 +
 kernel/arch/s390/include/asm/isc.h            |   1 +
 kernel/arch/s390/include/asm/itcw.h           |   1 +
 kernel/arch/s390/include/asm/jump_label.h     |   1 +
 kernel/arch/s390/include/asm/kdebug.h         |   1 +
 kernel/arch/s390/include/asm/kexec.h          |   1 +
 kernel/arch/s390/include/asm/linkage.h        |   1 +
 kernel/arch/s390/include/asm/lowcore.h        |   1 +
 kernel/arch/s390/include/asm/mmu.h            |   1 +
 kernel/arch/s390/include/asm/mmu_context.h    |   1 +
 kernel/arch/s390/include/asm/mmzone.h         |   1 +
 kernel/arch/s390/include/asm/module.h         |   1 +
 kernel/arch/s390/include/asm/nmi.h            |   1 +
 kernel/arch/s390/include/asm/numa.h           |   1 +
 kernel/arch/s390/include/asm/os_info.h        |   1 +
 kernel/arch/s390/include/asm/page-states.h    |   1 +
 kernel/arch/s390/include/asm/page.h           |   1 +
 kernel/arch/s390/include/asm/pci.h            |   1 +
 kernel/arch/s390/include/asm/pci_clp.h        |   1 +
 kernel/arch/s390/include/asm/pci_debug.h      |   1 +
 kernel/arch/s390/include/asm/pci_dma.h        |   1 +
 kernel/arch/s390/include/asm/pci_insn.h       |   1 +
 kernel/arch/s390/include/asm/pci_io.h         |   1 +
 kernel/arch/s390/include/asm/percpu.h         |   1 +
 kernel/arch/s390/include/asm/perf_event.h     |   1 +
 kernel/arch/s390/include/asm/pgalloc.h        |   1 +
 kernel/arch/s390/include/asm/pgtable.h        |   1 +
 kernel/arch/s390/include/asm/pkey.h           |   1 +
 kernel/arch/s390/include/asm/preempt.h        |   1 +
 kernel/arch/s390/include/asm/processor.h      |   1 +
 kernel/arch/s390/include/asm/ptrace.h         |   1 +
 kernel/arch/s390/include/asm/qdio.h           |   1 +
 kernel/arch/s390/include/asm/reset.h          |   1 +
 kernel/arch/s390/include/asm/runtime_instr.h  |   1 +
 kernel/arch/s390/include/asm/rwsem.h          |   1 +
 kernel/arch/s390/include/asm/schid.h          |   1 +
 kernel/arch/s390/include/asm/sclp.h           |   1 +
 kernel/arch/s390/include/asm/scsw.h           |   1 +
 kernel/arch/s390/include/asm/seccomp.h        |   1 +
 kernel/arch/s390/include/asm/sections.h       |   1 +
 kernel/arch/s390/include/asm/serial.h         |   1 +
 kernel/arch/s390/include/asm/set_memory.h     |   1 +
 kernel/arch/s390/include/asm/setup.h          |   1 +
 kernel/arch/s390/include/asm/shmparam.h       |   1 +
 kernel/arch/s390/include/asm/signal.h         |   1 +
 kernel/arch/s390/include/asm/sigp.h           |   1 +
 kernel/arch/s390/include/asm/smp.h            |   1 +
 kernel/arch/s390/include/asm/sparsemem.h      |   1 +
 kernel/arch/s390/include/asm/spinlock.h       |   1 +
 kernel/arch/s390/include/asm/spinlock_types.h |   1 +
 kernel/arch/s390/include/asm/stp.h            |   1 +
 kernel/arch/s390/include/asm/string.h         |   1 +
 kernel/arch/s390/include/asm/switch_to.h      |   1 +
 kernel/arch/s390/include/asm/termios.h        |   1 +
 kernel/arch/s390/include/asm/thread_info.h    |   1 +
 kernel/arch/s390/include/asm/timex.h          |   1 +
 kernel/arch/s390/include/asm/tlb.h            |   1 +
 kernel/arch/s390/include/asm/tlbflush.h       |   1 +
 kernel/arch/s390/include/asm/topology.h       |   1 +
 kernel/arch/s390/include/asm/trace/diag.h     |   1 +
 kernel/arch/s390/include/asm/trace/zcrypt.h   |   1 +
 kernel/arch/s390/include/asm/uaccess.h        |   1 +
 kernel/arch/s390/include/asm/unistd.h         |   1 +
 kernel/arch/s390/include/asm/uprobes.h        |   1 +
 kernel/arch/s390/include/asm/user.h           |   1 +
 kernel/arch/s390/include/asm/vdso.h           |   1 +
 kernel/arch/s390/include/asm/vtime.h          |   1 +
 kernel/arch/s390/include/asm/vtimer.h         |   1 +
 kernel/arch/s390/include/asm/vx-insn.h        |   1 +
 kernel/arch/s390/include/asm/xor.h            |   1 +
 kernel/arch/s390/include/uapi/asm/auxvec.h    |   1 +
 .../arch/s390/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/arch/s390/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/s390/include/uapi/asm/chpid.h     |   1 +
 kernel/arch/s390/include/uapi/asm/chsc.h      |   1 +
 kernel/arch/s390/include/uapi/asm/clp.h       |   1 +
 kernel/arch/s390/include/uapi/asm/cmb.h       |   1 +
 kernel/arch/s390/include/uapi/asm/dasd.h      |   1 +
 kernel/arch/s390/include/uapi/asm/debug.h     |   1 +
 .../s390/include/uapi/asm/guarded_storage.h   |   1 +
 kernel/arch/s390/include/uapi/asm/hypfs.h     |   1 +
 kernel/arch/s390/include/uapi/asm/ioctls.h    |   1 +
 kernel/arch/s390/include/uapi/asm/ipcbuf.h    |   1 +
 kernel/arch/s390/include/uapi/asm/kvm.h       |   1 +
 kernel/arch/s390/include/uapi/asm/kvm_para.h  |   1 +
 kernel/arch/s390/include/uapi/asm/kvm_perf.h  |   1 +
 .../arch/s390/include/uapi/asm/kvm_virtio.h   |   1 +
 kernel/arch/s390/include/uapi/asm/monwriter.h |   1 +
 kernel/arch/s390/include/uapi/asm/msgbuf.h    |   1 +
 kernel/arch/s390/include/uapi/asm/pkey.h      |   1 +
 .../arch/s390/include/uapi/asm/posix_types.h  |   1 +
 kernel/arch/s390/include/uapi/asm/ptrace.h    |   1 +
 kernel/arch/s390/include/uapi/asm/qeth.h      |   1 +
 kernel/arch/s390/include/uapi/asm/schid.h     |   1 +
 kernel/arch/s390/include/uapi/asm/sclp_ctl.h  |   1 +
 kernel/arch/s390/include/uapi/asm/sembuf.h    |   1 +
 kernel/arch/s390/include/uapi/asm/setup.h     |   1 +
 kernel/arch/s390/include/uapi/asm/shmbuf.h    |   1 +
 kernel/arch/s390/include/uapi/asm/sie.h       |   1 +
 .../arch/s390/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/s390/include/uapi/asm/siginfo.h   |   1 +
 kernel/arch/s390/include/uapi/asm/signal.h    |   1 +
 kernel/arch/s390/include/uapi/asm/socket.h    |   1 +
 kernel/arch/s390/include/uapi/asm/stat.h      |   1 +
 kernel/arch/s390/include/uapi/asm/statfs.h    |   1 +
 kernel/arch/s390/include/uapi/asm/tape390.h   |   1 +
 kernel/arch/s390/include/uapi/asm/termios.h   |   1 +
 kernel/arch/s390/include/uapi/asm/types.h     |   1 +
 kernel/arch/s390/include/uapi/asm/ucontext.h  |   1 +
 kernel/arch/s390/include/uapi/asm/unistd.h    |   1 +
 .../arch/s390/include/uapi/asm/virtio-ccw.h   |   1 +
 kernel/arch/s390/include/uapi/asm/vtoc.h      |   1 +
 kernel/arch/s390/include/uapi/asm/zcrypt.h    |   1 +
 kernel/arch/s390/kernel/Makefile              |   1 +
 kernel/arch/s390/kernel/als.c                 |   1 +
 kernel/arch/s390/kernel/asm-offsets.c         |   1 +
 kernel/arch/s390/kernel/audit.c               |   1 +
 kernel/arch/s390/kernel/audit.h               |   1 +
 kernel/arch/s390/kernel/base.S                |   1 +
 kernel/arch/s390/kernel/cache.c               |   1 +
 kernel/arch/s390/kernel/compat_audit.c        |   1 +
 kernel/arch/s390/kernel/compat_linux.c        |   1 +
 kernel/arch/s390/kernel/compat_linux.h        |   1 +
 kernel/arch/s390/kernel/compat_ptrace.h       |   1 +
 kernel/arch/s390/kernel/compat_signal.c       |   1 +
 kernel/arch/s390/kernel/compat_wrapper.c      |   1 +
 kernel/arch/s390/kernel/cpcmd.c               |   1 +
 kernel/arch/s390/kernel/crash_dump.c          |   1 +
 kernel/arch/s390/kernel/debug.c               |   1 +
 kernel/arch/s390/kernel/diag.c                |   1 +
 kernel/arch/s390/kernel/early.c               |   1 +
 kernel/arch/s390/kernel/early_printk.c        |   1 +
 kernel/arch/s390/kernel/ebcdic.c              |   1 +
 kernel/arch/s390/kernel/entry.S               |   1 +
 kernel/arch/s390/kernel/entry.h               |   1 +
 kernel/arch/s390/kernel/fpu.c                 |   1 +
 kernel/arch/s390/kernel/ftrace.c              |   1 +
 kernel/arch/s390/kernel/guarded_storage.c     |   1 +
 kernel/arch/s390/kernel/head.S                |   1 +
 kernel/arch/s390/kernel/head64.S              |   1 +
 kernel/arch/s390/kernel/head_kdump.S          |   1 +
 kernel/arch/s390/kernel/idle.c                |   1 +
 kernel/arch/s390/kernel/irq.c                 |   1 +
 kernel/arch/s390/kernel/jump_label.c          |   1 +
 kernel/arch/s390/kernel/kdebugfs.c            |   1 +
 kernel/arch/s390/kernel/machine_kexec.c       |   1 +
 kernel/arch/s390/kernel/mcount.S              |   1 +
 kernel/arch/s390/kernel/os_info.c             |   1 +
 kernel/arch/s390/kernel/perf_cpum_cf_events.c |   1 +
 kernel/arch/s390/kernel/pgm_check.S           |   1 +
 kernel/arch/s390/kernel/process.c             |   1 +
 kernel/arch/s390/kernel/processor.c           |   1 +
 kernel/arch/s390/kernel/ptrace.c              |   1 +
 kernel/arch/s390/kernel/reipl.S               |   1 +
 kernel/arch/s390/kernel/relocate_kernel.S     |   1 +
 kernel/arch/s390/kernel/runtime_instr.c       |   1 +
 kernel/arch/s390/kernel/signal.c              |   1 +
 kernel/arch/s390/kernel/smp.c                 |   1 +
 kernel/arch/s390/kernel/suspend.c             |   1 +
 kernel/arch/s390/kernel/swsusp.S              |   1 +
 kernel/arch/s390/kernel/sys_s390.c            |   1 +
 kernel/arch/s390/kernel/syscalls.S            |   1 +
 kernel/arch/s390/kernel/sysinfo.c             |   1 +
 kernel/arch/s390/kernel/trace.c               |   1 +
 kernel/arch/s390/kernel/traps.c               |   1 +
 kernel/arch/s390/kernel/uprobes.c             |   1 +
 kernel/arch/s390/kernel/vdso32/Makefile       |   1 +
 kernel/arch/s390/kernel/vdso32/getcpu.S       |   1 +
 kernel/arch/s390/kernel/vdso32/note.S         |   1 +
 kernel/arch/s390/kernel/vdso32/vdso32.lds.S   |   1 +
 .../arch/s390/kernel/vdso32/vdso32_wrapper.S  |   1 +
 kernel/arch/s390/kernel/vdso64/Makefile       |   1 +
 kernel/arch/s390/kernel/vdso64/getcpu.S       |   1 +
 kernel/arch/s390/kernel/vdso64/vdso64.lds.S   |   1 +
 .../arch/s390/kernel/vdso64/vdso64_wrapper.S  |   1 +
 kernel/arch/s390/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/s390/kvm/Kconfig                  |   1 +
 kernel/arch/s390/kvm/gaccess.c                |   1 +
 kernel/arch/s390/kvm/trace-s390.h             |   1 +
 kernel/arch/s390/kvm/trace.h                  |   1 +
 kernel/arch/s390/lib/Makefile                 |   1 +
 kernel/arch/s390/lib/delay.c                  |   1 +
 kernel/arch/s390/lib/find.c                   |   1 +
 kernel/arch/s390/lib/mem.S                    |   1 +
 kernel/arch/s390/lib/probes.c                 |   1 +
 kernel/arch/s390/lib/spinlock.c               |   1 +
 kernel/arch/s390/lib/string.c                 |   1 +
 kernel/arch/s390/lib/uaccess.c                |   1 +
 kernel/arch/s390/lib/xor.c                    |   1 +
 kernel/arch/s390/mm/Makefile                  |   1 +
 kernel/arch/s390/mm/dump_pagetables.c         |   1 +
 kernel/arch/s390/mm/extmem.c                  |   1 +
 kernel/arch/s390/mm/fault.c                   |   1 +
 kernel/arch/s390/mm/gup.c                     |   1 +
 kernel/arch/s390/mm/hugetlbpage.c             |   1 +
 kernel/arch/s390/mm/init.c                    |   1 +
 kernel/arch/s390/mm/maccess.c                 |   1 +
 kernel/arch/s390/mm/mem_detect.c              |   1 +
 kernel/arch/s390/mm/page-states.c             |   1 +
 kernel/arch/s390/mm/pageattr.c                |   1 +
 kernel/arch/s390/mm/pgalloc.c                 |   1 +
 kernel/arch/s390/mm/vmem.c                    |   1 +
 kernel/arch/s390/net/bpf_jit.S                |   1 +
 kernel/arch/s390/net/bpf_jit.h                |   1 +
 kernel/arch/s390/net/bpf_jit_comp.c           |   1 +
 kernel/arch/s390/numa/mode_emu.c              |   1 +
 kernel/arch/s390/numa/numa.c                  |   1 +
 kernel/arch/s390/numa/numa_mode.h             |   1 +
 kernel/arch/s390/numa/toptree.c               |   1 +
 kernel/arch/s390/numa/toptree.h               |   1 +
 kernel/arch/s390/oprofile/Makefile            |   1 +
 kernel/arch/s390/oprofile/init.c              |   1 +
 kernel/arch/s390/pci/pci_clp.c                |   1 +
 kernel/arch/s390/pci/pci_event.c              |   1 +
 kernel/arch/s390/pci/pci_mmio.c               |   1 +
 kernel/arch/s390/pci/pci_sysfs.c              |   1 +
 kernel/arch/s390/tools/Makefile               |   1 +
 kernel/arch/s390/tools/gen_facilities.c       |   1 +
 kernel/arch/score/Kconfig                     |   1 +
 kernel/arch/score/Kconfig.debug               |   1 +
 kernel/arch/score/include/asm/asmmacro.h      |   1 +
 kernel/arch/score/include/asm/atomic.h        |   1 +
 kernel/arch/score/include/asm/bitops.h        |   1 +
 kernel/arch/score/include/asm/bug.h           |   1 +
 kernel/arch/score/include/asm/bugs.h          |   1 +
 kernel/arch/score/include/asm/cache.h         |   1 +
 kernel/arch/score/include/asm/cacheflush.h    |   1 +
 kernel/arch/score/include/asm/checksum.h      |   1 +
 kernel/arch/score/include/asm/cmpxchg.h       |   1 +
 kernel/arch/score/include/asm/delay.h         |   1 +
 kernel/arch/score/include/asm/device.h        |   1 +
 kernel/arch/score/include/asm/div64.h         |   1 +
 kernel/arch/score/include/asm/dma.h           |   1 +
 kernel/arch/score/include/asm/elf.h           |   1 +
 .../score/include/asm/emergency-restart.h     |   1 +
 kernel/arch/score/include/asm/exec.h          |   1 +
 kernel/arch/score/include/asm/fixmap.h        |   1 +
 kernel/arch/score/include/asm/futex.h         |   1 +
 kernel/arch/score/include/asm/hardirq.h       |   1 +
 kernel/arch/score/include/asm/io.h            |   1 +
 kernel/arch/score/include/asm/irq.h           |   1 +
 kernel/arch/score/include/asm/irq_regs.h      |   1 +
 kernel/arch/score/include/asm/irqflags.h      |   1 +
 kernel/arch/score/include/asm/kdebug.h        |   1 +
 kernel/arch/score/include/asm/kmap_types.h    |   1 +
 kernel/arch/score/include/asm/linkage.h       |   1 +
 kernel/arch/score/include/asm/local.h         |   1 +
 kernel/arch/score/include/asm/mmu.h           |   1 +
 kernel/arch/score/include/asm/mmu_context.h   |   1 +
 kernel/arch/score/include/asm/module.h        |   1 +
 kernel/arch/score/include/asm/page.h          |   1 +
 kernel/arch/score/include/asm/percpu.h        |   1 +
 kernel/arch/score/include/asm/pgalloc.h       |   1 +
 kernel/arch/score/include/asm/pgtable-bits.h  |   1 +
 kernel/arch/score/include/asm/pgtable.h       |   1 +
 kernel/arch/score/include/asm/processor.h     |   1 +
 kernel/arch/score/include/asm/ptrace.h        |   1 +
 kernel/arch/score/include/asm/scoreregs.h     |   1 +
 kernel/arch/score/include/asm/segment.h       |   1 +
 kernel/arch/score/include/asm/setup.h         |   1 +
 kernel/arch/score/include/asm/shmparam.h      |   1 +
 kernel/arch/score/include/asm/string.h        |   1 +
 kernel/arch/score/include/asm/switch_to.h     |   1 +
 kernel/arch/score/include/asm/syscalls.h      |   1 +
 kernel/arch/score/include/asm/thread_info.h   |   1 +
 kernel/arch/score/include/asm/timex.h         |   1 +
 kernel/arch/score/include/asm/tlb.h           |   1 +
 kernel/arch/score/include/asm/tlbflush.h      |   1 +
 kernel/arch/score/include/asm/topology.h      |   1 +
 kernel/arch/score/include/asm/uaccess.h       |   1 +
 kernel/arch/score/include/asm/unaligned.h     |   1 +
 kernel/arch/score/include/asm/user.h          |   1 +
 .../arch/score/include/uapi/asm/bitsperlong.h |   1 +
 .../arch/score/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/score/include/uapi/asm/errno.h    |   1 +
 kernel/arch/score/include/uapi/asm/fcntl.h    |   1 +
 kernel/arch/score/include/uapi/asm/ioctl.h    |   1 +
 kernel/arch/score/include/uapi/asm/ioctls.h   |   1 +
 kernel/arch/score/include/uapi/asm/ipcbuf.h   |   1 +
 kernel/arch/score/include/uapi/asm/kvm_para.h |   1 +
 kernel/arch/score/include/uapi/asm/mman.h     |   1 +
 kernel/arch/score/include/uapi/asm/msgbuf.h   |   1 +
 kernel/arch/score/include/uapi/asm/param.h    |   1 +
 kernel/arch/score/include/uapi/asm/poll.h     |   1 +
 .../arch/score/include/uapi/asm/posix_types.h |   1 +
 kernel/arch/score/include/uapi/asm/ptrace.h   |   1 +
 kernel/arch/score/include/uapi/asm/resource.h |   1 +
 kernel/arch/score/include/uapi/asm/sembuf.h   |   1 +
 kernel/arch/score/include/uapi/asm/setup.h    |   1 +
 kernel/arch/score/include/uapi/asm/shmbuf.h   |   1 +
 .../arch/score/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/score/include/uapi/asm/signal.h   |   1 +
 kernel/arch/score/include/uapi/asm/socket.h   |   1 +
 kernel/arch/score/include/uapi/asm/sockios.h  |   1 +
 kernel/arch/score/include/uapi/asm/stat.h     |   1 +
 kernel/arch/score/include/uapi/asm/statfs.h   |   1 +
 kernel/arch/score/include/uapi/asm/swab.h     |   1 +
 kernel/arch/score/include/uapi/asm/termbits.h |   1 +
 kernel/arch/score/include/uapi/asm/termios.h  |   1 +
 kernel/arch/score/include/uapi/asm/types.h    |   1 +
 kernel/arch/score/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/score/kernel/Makefile             |   1 +
 kernel/arch/score/kernel/sys_call_table.c     |   1 +
 kernel/arch/sh/Kconfig                        |   1 +
 kernel/arch/sh/Kconfig.cpu                    |   1 +
 kernel/arch/sh/Kconfig.debug                  |   1 +
 kernel/arch/sh/boards/Kconfig                 |   1 +
 kernel/arch/sh/boards/Makefile                |   1 +
 kernel/arch/sh/boards/board-edosk7705.c       |   1 +
 kernel/arch/sh/boards/board-polaris.c         |   1 +
 kernel/arch/sh/boards/board-secureedge5410.c  |   1 +
 kernel/arch/sh/boards/board-sh2007.c          |   1 +
 kernel/arch/sh/boards/board-shmin.c           |   1 +
 kernel/arch/sh/boards/mach-highlander/Kconfig |   1 +
 .../arch/sh/boards/mach-highlander/Makefile   |   1 +
 kernel/arch/sh/boards/mach-migor/Kconfig      |   1 +
 kernel/arch/sh/boards/mach-r2d/Kconfig        |   1 +
 kernel/arch/sh/boards/mach-r2d/irq.c          |   1 +
 kernel/arch/sh/boards/mach-rsk/Kconfig        |   1 +
 kernel/arch/sh/boards/mach-sdk7780/Kconfig    |   1 +
 kernel/arch/sh/boards/mach-se/7206/irq.c      |   1 +
 kernel/arch/sh/boards/mach-se/7206/setup.c    |   1 +
 kernel/arch/sh/boards/mach-se/7343/setup.c    |   1 +
 kernel/arch/sh/boards/mach-se/770x/irq.c      |   1 +
 kernel/arch/sh/boards/mach-se/770x/setup.c    |   1 +
 kernel/arch/sh/boards/mach-se/7751/irq.c      |   1 +
 kernel/arch/sh/boards/mach-se/7751/setup.c    |   1 +
 kernel/arch/sh/boards/mach-se/Makefile        |   1 +
 kernel/arch/sh/boards/mach-se/board-se7619.c  |   1 +
 kernel/arch/sh/boards/mach-sh03/rtc.c         |   1 +
 kernel/arch/sh/boards/mach-sh03/setup.c       |   1 +
 kernel/arch/sh/boot/compressed/Makefile       |   1 +
 kernel/arch/sh/boot/compressed/cache.c        |   1 +
 kernel/arch/sh/boot/compressed/head_32.S      |   1 +
 kernel/arch/sh/boot/compressed/misc.c         |   1 +
 kernel/arch/sh/boot/dts/j2_mimas_v2.dts       |   1 +
 kernel/arch/sh/boot/romimage/Makefile         |   1 +
 kernel/arch/sh/boot/romimage/head.S           |   1 +
 kernel/arch/sh/cchips/Kconfig                 |   1 +
 kernel/arch/sh/cchips/hd6446x/hd64461.c       |   1 +
 kernel/arch/sh/drivers/Kconfig                |   1 +
 kernel/arch/sh/drivers/Makefile               |   1 +
 kernel/arch/sh/drivers/dma/Kconfig            |   1 +
 kernel/arch/sh/drivers/pci/Makefile           |   1 +
 kernel/arch/sh/drivers/pci/common.c           |   1 +
 kernel/arch/sh/drivers/pci/fixups-cayman.c    |   1 +
 kernel/arch/sh/drivers/pci/fixups-se7751.c    |   1 +
 kernel/arch/sh/drivers/pci/fixups-sh03.c      |   1 +
 kernel/arch/sh/drivers/pci/pci-sh4.h          |   1 +
 kernel/arch/sh/include/asm/adc.h              |   1 +
 kernel/arch/sh/include/asm/alignment.h        |   1 +
 kernel/arch/sh/include/asm/atomic-grb.h       |   1 +
 kernel/arch/sh/include/asm/atomic-irq.h       |   1 +
 kernel/arch/sh/include/asm/atomic-llsc.h      |   1 +
 kernel/arch/sh/include/asm/atomic.h           |   1 +
 kernel/arch/sh/include/asm/barrier.h          |   1 +
 kernel/arch/sh/include/asm/bitops-cas.h       |   1 +
 kernel/arch/sh/include/asm/bitops-grb.h       |   1 +
 kernel/arch/sh/include/asm/bitops-llsc.h      |   1 +
 kernel/arch/sh/include/asm/bitops-op32.h      |   1 +
 kernel/arch/sh/include/asm/bitops.h           |   1 +
 kernel/arch/sh/include/asm/bl_bit.h           |   1 +
 kernel/arch/sh/include/asm/bl_bit_32.h        |   1 +
 kernel/arch/sh/include/asm/bug.h              |   1 +
 kernel/arch/sh/include/asm/bugs.h             |   1 +
 kernel/arch/sh/include/asm/cache.h            |   1 +
 kernel/arch/sh/include/asm/cache_insns.h      |   1 +
 kernel/arch/sh/include/asm/cache_insns_32.h   |   1 +
 kernel/arch/sh/include/asm/cacheflush.h       |   1 +
 kernel/arch/sh/include/asm/checksum.h         |   1 +
 kernel/arch/sh/include/asm/clock.h            |   1 +
 kernel/arch/sh/include/asm/cmpxchg-cas.h      |   1 +
 kernel/arch/sh/include/asm/cmpxchg-grb.h      |   1 +
 kernel/arch/sh/include/asm/cmpxchg-irq.h      |   1 +
 kernel/arch/sh/include/asm/cmpxchg-llsc.h     |   1 +
 kernel/arch/sh/include/asm/cmpxchg.h          |   1 +
 kernel/arch/sh/include/asm/dma-mapping.h      |   1 +
 kernel/arch/sh/include/asm/dmabrg.h           |   1 +
 kernel/arch/sh/include/asm/elf.h              |   1 +
 kernel/arch/sh/include/asm/entry-macros.S     |   1 +
 kernel/arch/sh/include/asm/extable.h          |   1 +
 kernel/arch/sh/include/asm/fpu.h              |   1 +
 kernel/arch/sh/include/asm/ftrace.h           |   1 +
 kernel/arch/sh/include/asm/futex-cas.h        |   1 +
 kernel/arch/sh/include/asm/futex-irq.h        |   1 +
 kernel/arch/sh/include/asm/futex-llsc.h       |   1 +
 kernel/arch/sh/include/asm/futex.h            |   1 +
 kernel/arch/sh/include/asm/hardirq.h          |   1 +
 kernel/arch/sh/include/asm/hd64461.h          |   1 +
 kernel/arch/sh/include/asm/heartbeat.h        |   1 +
 kernel/arch/sh/include/asm/hugetlb.h          |   1 +
 kernel/arch/sh/include/asm/hw_breakpoint.h    |   1 +
 kernel/arch/sh/include/asm/hw_irq.h           |   1 +
 kernel/arch/sh/include/asm/i2c-sh7760.h       |   1 +
 kernel/arch/sh/include/asm/io.h               |   1 +
 kernel/arch/sh/include/asm/io_generic.h       |   1 +
 kernel/arch/sh/include/asm/io_noioport.h      |   1 +
 kernel/arch/sh/include/asm/io_trapped.h       |   1 +
 kernel/arch/sh/include/asm/irq.h              |   1 +
 kernel/arch/sh/include/asm/irqflags.h         |   1 +
 kernel/arch/sh/include/asm/kdebug.h           |   1 +
 kernel/arch/sh/include/asm/kexec.h            |   1 +
 kernel/arch/sh/include/asm/kgdb.h             |   1 +
 kernel/arch/sh/include/asm/kmap_types.h       |   1 +
 kernel/arch/sh/include/asm/kprobes.h          |   1 +
 kernel/arch/sh/include/asm/linkage.h          |   1 +
 kernel/arch/sh/include/asm/mmu.h              |   1 +
 kernel/arch/sh/include/asm/mmu_context.h      |   1 +
 kernel/arch/sh/include/asm/mmu_context_32.h   |   1 +
 kernel/arch/sh/include/asm/mmzone.h           |   1 +
 kernel/arch/sh/include/asm/module.h           |   1 +
 kernel/arch/sh/include/asm/page.h             |   1 +
 kernel/arch/sh/include/asm/pci.h              |   1 +
 kernel/arch/sh/include/asm/perf_event.h       |   1 +
 kernel/arch/sh/include/asm/pgalloc.h          |   1 +
 kernel/arch/sh/include/asm/pgtable-2level.h   |   1 +
 kernel/arch/sh/include/asm/pgtable-3level.h   |   1 +
 kernel/arch/sh/include/asm/pgtable_32.h       |   1 +
 kernel/arch/sh/include/asm/posix_types.h      |   1 +
 kernel/arch/sh/include/asm/processor.h        |   1 +
 kernel/arch/sh/include/asm/processor_32.h     |   1 +
 kernel/arch/sh/include/asm/ptrace.h           |   1 +
 kernel/arch/sh/include/asm/ptrace_32.h        |   1 +
 kernel/arch/sh/include/asm/ptrace_64.h        |   1 +
 kernel/arch/sh/include/asm/push-switch.h      |   1 +
 kernel/arch/sh/include/asm/reboot.h           |   1 +
 kernel/arch/sh/include/asm/romimage-macros.h  |   1 +
 kernel/arch/sh/include/asm/rtc.h              |   1 +
 kernel/arch/sh/include/asm/seccomp.h          |   1 +
 kernel/arch/sh/include/asm/sections.h         |   1 +
 kernel/arch/sh/include/asm/segment.h          |   1 +
 kernel/arch/sh/include/asm/setup.h            |   1 +
 kernel/arch/sh/include/asm/sh7760fb.h         |   1 +
 kernel/arch/sh/include/asm/sh_bios.h          |   1 +
 kernel/arch/sh/include/asm/smc37c93x.h        |   1 +
 kernel/arch/sh/include/asm/smp-ops.h          |   1 +
 kernel/arch/sh/include/asm/smp.h              |   1 +
 kernel/arch/sh/include/asm/sparsemem.h        |   1 +
 kernel/arch/sh/include/asm/spi.h              |   1 +
 kernel/arch/sh/include/asm/spinlock_types.h   |   1 +
 kernel/arch/sh/include/asm/sram.h             |   1 +
 kernel/arch/sh/include/asm/stackprotector.h   |   1 +
 kernel/arch/sh/include/asm/stacktrace.h       |   1 +
 kernel/arch/sh/include/asm/string.h           |   1 +
 kernel/arch/sh/include/asm/string_64.h        |   1 +
 kernel/arch/sh/include/asm/suspend.h          |   1 +
 kernel/arch/sh/include/asm/switch_to_32.h     |   1 +
 kernel/arch/sh/include/asm/syscall.h          |   1 +
 kernel/arch/sh/include/asm/syscall_32.h       |   1 +
 kernel/arch/sh/include/asm/syscall_64.h       |   1 +
 kernel/arch/sh/include/asm/syscalls.h         |   1 +
 kernel/arch/sh/include/asm/syscalls_32.h      |   1 +
 kernel/arch/sh/include/asm/syscalls_64.h      |   1 +
 kernel/arch/sh/include/asm/thread_info.h      |   1 +
 kernel/arch/sh/include/asm/timex.h            |   1 +
 kernel/arch/sh/include/asm/tlb.h              |   1 +
 kernel/arch/sh/include/asm/tlbflush.h         |   1 +
 kernel/arch/sh/include/asm/topology.h         |   1 +
 kernel/arch/sh/include/asm/traps.h            |   1 +
 kernel/arch/sh/include/asm/traps_32.h         |   1 +
 kernel/arch/sh/include/asm/types.h            |   1 +
 kernel/arch/sh/include/asm/uaccess.h          |   1 +
 kernel/arch/sh/include/asm/uaccess_32.h       |   1 +
 kernel/arch/sh/include/asm/unaligned-sh4a.h   |   1 +
 kernel/arch/sh/include/asm/unaligned.h        |   1 +
 kernel/arch/sh/include/asm/uncached.h         |   1 +
 kernel/arch/sh/include/asm/unistd.h           |   1 +
 kernel/arch/sh/include/asm/unwinder.h         |   1 +
 kernel/arch/sh/include/asm/user.h             |   1 +
 kernel/arch/sh/include/asm/vmlinux.lds.h      |   1 +
 kernel/arch/sh/include/asm/word-at-a-time.h   |   1 +
 kernel/arch/sh/include/cpu-common/cpu/rtc.h   |   1 +
 .../sh/include/cpu-common/cpu/sigcontext.h    |   1 +
 .../arch/sh/include/cpu-sh2a/cpu/addrspace.h  |   1 +
 kernel/arch/sh/include/cpu-sh2a/cpu/rtc.h     |   1 +
 kernel/arch/sh/include/cpu-sh2a/cpu/sh7203.h  |   1 +
 kernel/arch/sh/include/cpu-sh2a/cpu/sh7264.h  |   1 +
 kernel/arch/sh/include/cpu-sh2a/cpu/sh7269.h  |   1 +
 kernel/arch/sh/include/cpu-sh3/cpu/adc.h      |   1 +
 kernel/arch/sh/include/cpu-sh3/cpu/dac.h      |   1 +
 kernel/arch/sh/include/cpu-sh3/cpu/dma.h      |   1 +
 kernel/arch/sh/include/cpu-sh3/cpu/serial.h   |   1 +
 kernel/arch/sh/include/cpu-sh3/cpu/sh7720.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/dma.h      |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/rtc.h      |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/sh7722.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/sh7723.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/sh7724.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/sh7734.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/sh7757.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/sh7785.h   |   1 +
 kernel/arch/sh/include/cpu-sh4/cpu/shx3.h     |   1 +
 .../arch/sh/include/cpu-sh4/cpu/sigcontext.h  |   1 +
 kernel/arch/sh/include/cpu-sh4a/cpu/dma.h     |   1 +
 kernel/arch/sh/include/cpu-sh4a/cpu/serial.h  |   1 +
 .../arch/sh/include/cpu-sh5/cpu/addrspace.h   |   1 +
 .../arch/sh/include/cpu-sh5/cpu/mmu_context.h |   1 +
 kernel/arch/sh/include/cpu-sh5/cpu/rtc.h      |   1 +
 .../sh/include/mach-common/mach/highlander.h  |   1 +
 kernel/arch/sh/include/mach-common/mach/r2d.h |   1 +
 .../sh/include/mach-common/mach/romimage.h    |   1 +
 .../arch/sh/include/mach-common/mach/sh2007.h |   1 +
 .../sh/include/mach-common/mach/sh7785lcr.h   |   1 +
 .../arch/sh/include/mach-common/mach/shmin.h  |   1 +
 .../arch/sh/include/mach-common/mach/titan.h  |   1 +
 .../sh/include/mach-common/mach/urquell.h     |   1 +
 .../sh/include/mach-dreamcast/mach/maple.h    |   1 +
 .../sh/include/mach-ecovec24/mach/romimage.h  |   1 +
 .../sh/include/mach-kfr2r09/mach/kfr2r09.h    |   1 +
 .../sh/include/mach-kfr2r09/mach/romimage.h   |   1 +
 .../arch/sh/include/mach-landisk/mach/gio.h   |   1 +
 .../mach-landisk/mach/iodata_landisk.h        |   1 +
 .../arch/sh/include/mach-migor/mach/migor.h   |   1 +
 .../arch/sh/include/mach-sdk7786/mach/fpga.h  |   1 +
 .../arch/sh/include/mach-sdk7786/mach/irq.h   |   1 +
 kernel/arch/sh/include/mach-se/mach/mrshpc.h  |   1 +
 kernel/arch/sh/include/mach-se/mach/se.h      |   1 +
 kernel/arch/sh/include/mach-se/mach/se7206.h  |   1 +
 kernel/arch/sh/include/mach-se/mach/se7343.h  |   1 +
 kernel/arch/sh/include/mach-se/mach/se7751.h  |   1 +
 kernel/arch/sh/include/mach-sh03/mach/io.h    |   1 +
 kernel/arch/sh/include/mach-sh03/mach/sh03.h  |   1 +
 .../sh/include/mach-x3proto/mach/hardware.h   |   1 +
 .../arch/sh/include/mach-x3proto/mach/ilsel.h |   1 +
 kernel/arch/sh/include/uapi/asm/auxvec.h      |   1 +
 kernel/arch/sh/include/uapi/asm/byteorder.h   |   1 +
 kernel/arch/sh/include/uapi/asm/cachectl.h    |   1 +
 .../arch/sh/include/uapi/asm/cpu-features.h   |   1 +
 .../arch/sh/include/uapi/asm/hw_breakpoint.h  |   1 +
 kernel/arch/sh/include/uapi/asm/ioctls.h      |   1 +
 kernel/arch/sh/include/uapi/asm/posix_types.h |   1 +
 .../arch/sh/include/uapi/asm/posix_types_32.h |   1 +
 .../arch/sh/include/uapi/asm/posix_types_64.h |   1 +
 kernel/arch/sh/include/uapi/asm/ptrace.h      |   1 +
 kernel/arch/sh/include/uapi/asm/ptrace_32.h   |   1 +
 kernel/arch/sh/include/uapi/asm/ptrace_64.h   |   1 +
 kernel/arch/sh/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/sh/include/uapi/asm/signal.h      |   1 +
 kernel/arch/sh/include/uapi/asm/sockios.h     |   1 +
 kernel/arch/sh/include/uapi/asm/stat.h        |   1 +
 kernel/arch/sh/include/uapi/asm/swab.h        |   1 +
 kernel/arch/sh/include/uapi/asm/unistd.h      |   1 +
 kernel/arch/sh/include/uapi/asm/unistd_32.h   |   1 +
 kernel/arch/sh/include/uapi/asm/unistd_64.h   |   1 +
 kernel/arch/sh/kernel/Makefile                |   1 +
 kernel/arch/sh/kernel/asm-offsets.c           |   1 +
 kernel/arch/sh/kernel/cpu/Makefile            |   1 +
 kernel/arch/sh/kernel/cpu/adc.c               |   1 +
 kernel/arch/sh/kernel/cpu/clock-cpg.c         |   1 +
 kernel/arch/sh/kernel/cpu/fpu.c               |   1 +
 kernel/arch/sh/kernel/cpu/irq/imask.c         |   1 +
 kernel/arch/sh/kernel/cpu/proc.c              |   1 +
 kernel/arch/sh/kernel/cpu/sh2a/Makefile       |   1 +
 kernel/arch/sh/kernel/cpu/sh3/Makefile        |   1 +
 kernel/arch/sh/kernel/cpu/sh3/serial-sh770x.c |   1 +
 kernel/arch/sh/kernel/cpu/sh3/serial-sh7710.c |   1 +
 kernel/arch/sh/kernel/cpu/sh3/serial-sh7720.c |   1 +
 kernel/arch/sh/kernel/cpu/sh4/Makefile        |   1 +
 kernel/arch/sh/kernel/cpu/sh4a/Makefile       |   1 +
 .../arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c   |   1 +
 .../arch/sh/kernel/cpu/sh4a/serial-sh7722.c   |   1 +
 kernel/arch/sh/kernel/cpu/sh5/Makefile        |   1 +
 kernel/arch/sh/kernel/crash_dump.c            |   1 +
 kernel/arch/sh/kernel/ftrace.c                |   1 +
 kernel/arch/sh/kernel/irq.c                   |   1 +
 kernel/arch/sh/kernel/kdebugfs.c              |   1 +
 kernel/arch/sh/kernel/process.c               |   1 +
 kernel/arch/sh/kernel/ptrace.c                |   1 +
 kernel/arch/sh/kernel/reboot.c                |   1 +
 kernel/arch/sh/kernel/setup.c                 |   1 +
 kernel/arch/sh/kernel/sh_ksyms_32.c           |   1 +
 kernel/arch/sh/kernel/signal_32.c             |   1 +
 kernel/arch/sh/kernel/sys_sh.c                |   1 +
 kernel/arch/sh/kernel/sys_sh32.c              |   1 +
 kernel/arch/sh/kernel/traps.c                 |   1 +
 kernel/arch/sh/kernel/vmlinux.lds.S           |   1 +
 kernel/arch/sh/kernel/vsyscall/Makefile       |   1 +
 .../arch/sh/kernel/vsyscall/vsyscall-note.S   |   1 +
 .../sh/kernel/vsyscall/vsyscall-sigreturn.S   |   1 +
 .../sh/kernel/vsyscall/vsyscall-syscall.S     |   1 +
 .../arch/sh/kernel/vsyscall/vsyscall-trapa.S  |   1 +
 kernel/arch/sh/kernel/vsyscall/vsyscall.lds.S |   1 +
 kernel/arch/sh/lib/Makefile                   |   1 +
 kernel/arch/sh/lib/__clear_user.S             |   1 +
 kernel/arch/sh/lib/ashldi3.c                  |   1 +
 kernel/arch/sh/lib/ashrdi3.c                  |   1 +
 kernel/arch/sh/lib/copy_page.S                |   1 +
 kernel/arch/sh/lib/delay.c                    |   1 +
 kernel/arch/sh/lib/div64-generic.c            |   1 +
 kernel/arch/sh/lib/div64.S                    |   1 +
 kernel/arch/sh/lib/lshrdi3.c                  |   1 +
 kernel/arch/sh/lib/memchr.S                   |   1 +
 kernel/arch/sh/lib/memcpy-sh4.S               |   1 +
 kernel/arch/sh/lib/memcpy.S                   |   1 +
 kernel/arch/sh/lib/memmove.S                  |   1 +
 kernel/arch/sh/lib/memset-sh4.S               |   1 +
 kernel/arch/sh/lib/memset.S                   |   1 +
 kernel/arch/sh/lib/strlen.S                   |   1 +
 kernel/arch/sh/lib64/copy_user_memcpy.S       |   1 +
 kernel/arch/sh/lib64/memcpy.S                 |   1 +
 kernel/arch/sh/lib64/memset.S                 |   1 +
 kernel/arch/sh/lib64/sdivsi3.S                |   1 +
 kernel/arch/sh/lib64/strcpy.S                 |   1 +
 kernel/arch/sh/lib64/strlen.S                 |   1 +
 kernel/arch/sh/lib64/udivdi3.S                |   1 +
 kernel/arch/sh/lib64/udivsi3.S                |   1 +
 kernel/arch/sh/math-emu/sfp-util.h            |   1 +
 kernel/arch/sh/mm/Kconfig                     |   1 +
 kernel/arch/sh/mm/Makefile                    |   1 +
 kernel/arch/sh/mm/extable_32.c                |   1 +
 kernel/arch/sh/mm/flush-sh4.c                 |   1 +
 kernel/arch/sh/mm/gup.c                       |   1 +
 kernel/arch/sh/mm/hugetlbpage.c               |   1 +
 kernel/arch/sh/mm/ioremap_fixed.c             |   1 +
 kernel/arch/sh/mm/pgtable.c                   |   1 +
 kernel/arch/sh/mm/uncached.c                  |   1 +
 kernel/arch/sh/oprofile/Makefile              |   1 +
 kernel/arch/sh/tools/gen-mach-types           |   1 +
 kernel/arch/sparc/Kconfig.debug               |   1 +
 kernel/arch/sparc/Makefile                    |   1 +
 kernel/arch/sparc/boot/Makefile               |   1 +
 kernel/arch/sparc/crypto/Makefile             |   1 +
 kernel/arch/sparc/crypto/aes_asm.S            |   1 +
 kernel/arch/sparc/crypto/camellia_asm.S       |   1 +
 kernel/arch/sparc/crypto/crc32c_asm.S         |   1 +
 kernel/arch/sparc/crypto/crop_devid.c         |   1 +
 kernel/arch/sparc/crypto/des_asm.S            |   1 +
 kernel/arch/sparc/crypto/md5_asm.S            |   1 +
 kernel/arch/sparc/crypto/opcodes.h            |   1 +
 kernel/arch/sparc/crypto/sha1_asm.S           |   1 +
 kernel/arch/sparc/crypto/sha256_asm.S         |   1 +
 kernel/arch/sparc/crypto/sha512_asm.S         |   1 +
 kernel/arch/sparc/include/asm/agp.h           |   1 +
 kernel/arch/sparc/include/asm/apb.h           |   1 +
 .../arch/sparc/include/asm/asm-prototypes.h   |   1 +
 kernel/arch/sparc/include/asm/asm.h           |   1 +
 kernel/arch/sparc/include/asm/asmmacro.h      |   1 +
 kernel/arch/sparc/include/asm/atomic.h        |   1 +
 kernel/arch/sparc/include/asm/atomic_32.h     |   1 +
 kernel/arch/sparc/include/asm/atomic_64.h     |   1 +
 kernel/arch/sparc/include/asm/auxio.h         |   1 +
 kernel/arch/sparc/include/asm/auxio_32.h      |   1 +
 kernel/arch/sparc/include/asm/auxio_64.h      |   1 +
 kernel/arch/sparc/include/asm/backoff.h       |   1 +
 kernel/arch/sparc/include/asm/barrier.h       |   1 +
 kernel/arch/sparc/include/asm/barrier_32.h    |   1 +
 kernel/arch/sparc/include/asm/barrier_64.h    |   1 +
 kernel/arch/sparc/include/asm/bbc.h           |   1 +
 kernel/arch/sparc/include/asm/bitext.h        |   1 +
 kernel/arch/sparc/include/asm/bitops.h        |   1 +
 kernel/arch/sparc/include/asm/bitops_32.h     |   1 +
 kernel/arch/sparc/include/asm/bitops_64.h     |   1 +
 kernel/arch/sparc/include/asm/btext.h         |   1 +
 kernel/arch/sparc/include/asm/bug.h           |   1 +
 kernel/arch/sparc/include/asm/bugs.h          |   1 +
 kernel/arch/sparc/include/asm/cache.h         |   1 +
 kernel/arch/sparc/include/asm/cacheflush.h    |   1 +
 kernel/arch/sparc/include/asm/cacheflush_32.h |   1 +
 kernel/arch/sparc/include/asm/cacheflush_64.h |   1 +
 kernel/arch/sparc/include/asm/cachetlb_32.h   |   1 +
 kernel/arch/sparc/include/asm/chafsr.h        |   1 +
 kernel/arch/sparc/include/asm/checksum.h      |   1 +
 kernel/arch/sparc/include/asm/checksum_32.h   |   1 +
 kernel/arch/sparc/include/asm/checksum_64.h   |   1 +
 kernel/arch/sparc/include/asm/chmctrl.h       |   1 +
 kernel/arch/sparc/include/asm/cmpxchg.h       |   1 +
 kernel/arch/sparc/include/asm/cmpxchg_32.h    |   1 +
 kernel/arch/sparc/include/asm/cmpxchg_64.h    |   1 +
 kernel/arch/sparc/include/asm/compat.h        |   1 +
 kernel/arch/sparc/include/asm/compat_signal.h |   1 +
 kernel/arch/sparc/include/asm/contregs.h      |   1 +
 kernel/arch/sparc/include/asm/cpu_type.h      |   1 +
 kernel/arch/sparc/include/asm/cpudata.h       |   1 +
 kernel/arch/sparc/include/asm/cpudata_32.h    |   1 +
 kernel/arch/sparc/include/asm/cpudata_64.h    |   1 +
 kernel/arch/sparc/include/asm/current.h       |   1 +
 kernel/arch/sparc/include/asm/dcr.h           |   1 +
 kernel/arch/sparc/include/asm/dcu.h           |   1 +
 kernel/arch/sparc/include/asm/delay.h         |   1 +
 kernel/arch/sparc/include/asm/delay_32.h      |   1 +
 kernel/arch/sparc/include/asm/delay_64.h      |   1 +
 kernel/arch/sparc/include/asm/dma-mapping.h   |   1 +
 kernel/arch/sparc/include/asm/dma.h           |   1 +
 kernel/arch/sparc/include/asm/ebus_dma.h      |   1 +
 kernel/arch/sparc/include/asm/ecc.h           |   1 +
 kernel/arch/sparc/include/asm/elf.h           |   1 +
 kernel/arch/sparc/include/asm/elf_32.h        |   1 +
 kernel/arch/sparc/include/asm/elf_64.h        |   1 +
 kernel/arch/sparc/include/asm/estate.h        |   1 +
 kernel/arch/sparc/include/asm/extable_64.h    |   1 +
 kernel/arch/sparc/include/asm/fb.h            |   1 +
 kernel/arch/sparc/include/asm/fbio.h          |   1 +
 kernel/arch/sparc/include/asm/fhc.h           |   1 +
 kernel/arch/sparc/include/asm/floppy.h        |   1 +
 kernel/arch/sparc/include/asm/floppy_32.h     |   1 +
 kernel/arch/sparc/include/asm/floppy_64.h     |   1 +
 kernel/arch/sparc/include/asm/fpumacro.h      |   1 +
 kernel/arch/sparc/include/asm/ftrace.h        |   1 +
 kernel/arch/sparc/include/asm/futex.h         |   1 +
 kernel/arch/sparc/include/asm/futex_64.h      |   1 +
 kernel/arch/sparc/include/asm/hardirq.h       |   1 +
 kernel/arch/sparc/include/asm/hardirq_32.h    |   1 +
 kernel/arch/sparc/include/asm/hardirq_64.h    |   1 +
 kernel/arch/sparc/include/asm/head.h          |   1 +
 kernel/arch/sparc/include/asm/head_32.h       |   1 +
 kernel/arch/sparc/include/asm/head_64.h       |   1 +
 kernel/arch/sparc/include/asm/hibernate.h     |   1 +
 kernel/arch/sparc/include/asm/highmem.h       |   1 +
 kernel/arch/sparc/include/asm/hugetlb.h       |   1 +
 kernel/arch/sparc/include/asm/hvtramp.h       |   1 +
 kernel/arch/sparc/include/asm/hypervisor.h    |   1 +
 kernel/arch/sparc/include/asm/ide.h           |   1 +
 kernel/arch/sparc/include/asm/idprom.h        |   1 +
 kernel/arch/sparc/include/asm/intr_queue.h    |   1 +
 kernel/arch/sparc/include/asm/io-unit.h       |   1 +
 kernel/arch/sparc/include/asm/io.h            |   1 +
 kernel/arch/sparc/include/asm/io_32.h         |   1 +
 kernel/arch/sparc/include/asm/io_64.h         |   1 +
 kernel/arch/sparc/include/asm/ioctls.h        |   1 +
 kernel/arch/sparc/include/asm/iommu.h         |   1 +
 kernel/arch/sparc/include/asm/iommu_32.h      |   1 +
 kernel/arch/sparc/include/asm/iommu_64.h      |   1 +
 kernel/arch/sparc/include/asm/irq.h           |   1 +
 kernel/arch/sparc/include/asm/irq_32.h        |   1 +
 kernel/arch/sparc/include/asm/irq_64.h        |   1 +
 kernel/arch/sparc/include/asm/irqflags.h      |   1 +
 kernel/arch/sparc/include/asm/irqflags_32.h   |   1 +
 kernel/arch/sparc/include/asm/irqflags_64.h   |   1 +
 kernel/arch/sparc/include/asm/jump_label.h    |   1 +
 kernel/arch/sparc/include/asm/kdebug.h        |   1 +
 kernel/arch/sparc/include/asm/kdebug_32.h     |   1 +
 kernel/arch/sparc/include/asm/kdebug_64.h     |   1 +
 kernel/arch/sparc/include/asm/kgdb.h          |   1 +
 kernel/arch/sparc/include/asm/kmap_types.h    |   1 +
 kernel/arch/sparc/include/asm/kprobes.h       |   1 +
 kernel/arch/sparc/include/asm/ldc.h           |   1 +
 kernel/arch/sparc/include/asm/leon.h          |   1 +
 kernel/arch/sparc/include/asm/leon_amba.h     |   1 +
 kernel/arch/sparc/include/asm/leon_pci.h      |   1 +
 kernel/arch/sparc/include/asm/lsu.h           |   1 +
 kernel/arch/sparc/include/asm/machines.h      |   1 +
 kernel/arch/sparc/include/asm/mbus.h          |   1 +
 kernel/arch/sparc/include/asm/mc146818rtc.h   |   1 +
 .../arch/sparc/include/asm/mc146818rtc_32.h   |   1 +
 .../arch/sparc/include/asm/mc146818rtc_64.h   |   1 +
 kernel/arch/sparc/include/asm/mdesc.h         |   1 +
 kernel/arch/sparc/include/asm/memctrl.h       |   1 +
 kernel/arch/sparc/include/asm/mman.h          |   1 +
 kernel/arch/sparc/include/asm/mmu.h           |   1 +
 kernel/arch/sparc/include/asm/mmu_32.h        |   1 +
 kernel/arch/sparc/include/asm/mmu_64.h        |   1 +
 kernel/arch/sparc/include/asm/mmu_context.h   |   1 +
 .../arch/sparc/include/asm/mmu_context_32.h   |   1 +
 .../arch/sparc/include/asm/mmu_context_64.h   |   1 +
 kernel/arch/sparc/include/asm/mmzone.h        |   1 +
 kernel/arch/sparc/include/asm/msi.h           |   1 +
 kernel/arch/sparc/include/asm/mxcc.h          |   1 +
 kernel/arch/sparc/include/asm/nmi.h           |   1 +
 kernel/arch/sparc/include/asm/ns87303.h       |   1 +
 kernel/arch/sparc/include/asm/obio.h          |   1 +
 kernel/arch/sparc/include/asm/openprom.h      |   1 +
 kernel/arch/sparc/include/asm/oplib.h         |   1 +
 kernel/arch/sparc/include/asm/oplib_32.h      |   1 +
 kernel/arch/sparc/include/asm/oplib_64.h      |   1 +
 kernel/arch/sparc/include/asm/page.h          |   1 +
 kernel/arch/sparc/include/asm/page_32.h       |   1 +
 kernel/arch/sparc/include/asm/page_64.h       |   1 +
 kernel/arch/sparc/include/asm/parport.h       |   1 +
 kernel/arch/sparc/include/asm/pbm.h           |   1 +
 kernel/arch/sparc/include/asm/pci.h           |   1 +
 kernel/arch/sparc/include/asm/pci_32.h        |   1 +
 kernel/arch/sparc/include/asm/pci_64.h        |   1 +
 kernel/arch/sparc/include/asm/pcic.h          |   1 +
 kernel/arch/sparc/include/asm/pcr.h           |   1 +
 kernel/arch/sparc/include/asm/percpu.h        |   1 +
 kernel/arch/sparc/include/asm/percpu_32.h     |   1 +
 kernel/arch/sparc/include/asm/percpu_64.h     |   1 +
 kernel/arch/sparc/include/asm/perf_event.h    |   1 +
 kernel/arch/sparc/include/asm/pgalloc.h       |   1 +
 kernel/arch/sparc/include/asm/pgalloc_32.h    |   1 +
 kernel/arch/sparc/include/asm/pgalloc_64.h    |   1 +
 kernel/arch/sparc/include/asm/pgtable.h       |   1 +
 kernel/arch/sparc/include/asm/pgtable_32.h    |   1 +
 kernel/arch/sparc/include/asm/pgtable_64.h    |   1 +
 kernel/arch/sparc/include/asm/pgtsrmmu.h      |   1 +
 kernel/arch/sparc/include/asm/pil.h           |   1 +
 kernel/arch/sparc/include/asm/processor.h     |   1 +
 kernel/arch/sparc/include/asm/processor_32.h  |   1 +
 kernel/arch/sparc/include/asm/processor_64.h  |   1 +
 kernel/arch/sparc/include/asm/psr.h           |   1 +
 kernel/arch/sparc/include/asm/ptrace.h        |   1 +
 kernel/arch/sparc/include/asm/qrwlock.h       |   1 +
 kernel/arch/sparc/include/asm/qspinlock.h     |   1 +
 kernel/arch/sparc/include/asm/ross.h          |   1 +
 kernel/arch/sparc/include/asm/sbi.h           |   1 +
 kernel/arch/sparc/include/asm/scratchpad.h    |   1 +
 kernel/arch/sparc/include/asm/seccomp.h       |   1 +
 kernel/arch/sparc/include/asm/sections.h      |   1 +
 kernel/arch/sparc/include/asm/setup.h         |   1 +
 kernel/arch/sparc/include/asm/sfafsr.h        |   1 +
 kernel/arch/sparc/include/asm/sfp-machine.h   |   1 +
 kernel/arch/sparc/include/asm/shmparam.h      |   1 +
 kernel/arch/sparc/include/asm/shmparam_32.h   |   1 +
 kernel/arch/sparc/include/asm/shmparam_64.h   |   1 +
 kernel/arch/sparc/include/asm/sigcontext.h    |   1 +
 kernel/arch/sparc/include/asm/signal.h        |   1 +
 kernel/arch/sparc/include/asm/smp.h           |   1 +
 kernel/arch/sparc/include/asm/smp_32.h        |   1 +
 kernel/arch/sparc/include/asm/smp_64.h        |   1 +
 kernel/arch/sparc/include/asm/sparsemem.h     |   1 +
 kernel/arch/sparc/include/asm/spinlock.h      |   1 +
 kernel/arch/sparc/include/asm/spinlock_32.h   |   1 +
 kernel/arch/sparc/include/asm/spinlock_64.h   |   1 +
 .../arch/sparc/include/asm/spinlock_types.h   |   1 +
 kernel/arch/sparc/include/asm/spitfire.h      |   1 +
 kernel/arch/sparc/include/asm/stacktrace.h    |   1 +
 kernel/arch/sparc/include/asm/starfire.h      |   1 +
 kernel/arch/sparc/include/asm/string.h        |   1 +
 kernel/arch/sparc/include/asm/string_32.h     |   1 +
 kernel/arch/sparc/include/asm/string_64.h     |   1 +
 kernel/arch/sparc/include/asm/sunbpp.h        |   1 +
 kernel/arch/sparc/include/asm/swift.h         |   1 +
 kernel/arch/sparc/include/asm/switch_to.h     |   1 +
 kernel/arch/sparc/include/asm/switch_to_32.h  |   1 +
 kernel/arch/sparc/include/asm/switch_to_64.h  |   1 +
 kernel/arch/sparc/include/asm/syscall.h       |   1 +
 kernel/arch/sparc/include/asm/syscalls.h      |   1 +
 kernel/arch/sparc/include/asm/termbits.h      |   1 +
 kernel/arch/sparc/include/asm/termios.h       |   1 +
 kernel/arch/sparc/include/asm/thread_info.h   |   1 +
 .../arch/sparc/include/asm/thread_info_32.h   |   1 +
 .../arch/sparc/include/asm/thread_info_64.h   |   1 +
 kernel/arch/sparc/include/asm/timer.h         |   1 +
 kernel/arch/sparc/include/asm/timer_32.h      |   1 +
 kernel/arch/sparc/include/asm/timer_64.h      |   1 +
 kernel/arch/sparc/include/asm/timex.h         |   1 +
 kernel/arch/sparc/include/asm/timex_32.h      |   1 +
 kernel/arch/sparc/include/asm/timex_64.h      |   1 +
 kernel/arch/sparc/include/asm/tlb.h           |   1 +
 kernel/arch/sparc/include/asm/tlb_32.h        |   1 +
 kernel/arch/sparc/include/asm/tlb_64.h        |   1 +
 kernel/arch/sparc/include/asm/tlbflush.h      |   1 +
 kernel/arch/sparc/include/asm/tlbflush_32.h   |   1 +
 kernel/arch/sparc/include/asm/tlbflush_64.h   |   1 +
 kernel/arch/sparc/include/asm/topology.h      |   1 +
 kernel/arch/sparc/include/asm/topology_32.h   |   1 +
 kernel/arch/sparc/include/asm/topology_64.h   |   1 +
 kernel/arch/sparc/include/asm/trap_block.h    |   1 +
 kernel/arch/sparc/include/asm/traps.h         |   1 +
 kernel/arch/sparc/include/asm/tsb.h           |   1 +
 kernel/arch/sparc/include/asm/tsunami.h       |   1 +
 kernel/arch/sparc/include/asm/ttable.h        |   1 +
 kernel/arch/sparc/include/asm/turbosparc.h    |   1 +
 kernel/arch/sparc/include/asm/uaccess.h       |   1 +
 kernel/arch/sparc/include/asm/uaccess_32.h    |   1 +
 kernel/arch/sparc/include/asm/uaccess_64.h    |   1 +
 kernel/arch/sparc/include/asm/unaligned.h     |   1 +
 kernel/arch/sparc/include/asm/unistd.h        |   1 +
 kernel/arch/sparc/include/asm/upa.h           |   1 +
 kernel/arch/sparc/include/asm/vaddrs.h        |   1 +
 kernel/arch/sparc/include/asm/vga.h           |   1 +
 kernel/arch/sparc/include/asm/viking.h        |   1 +
 kernel/arch/sparc/include/asm/vio.h           |   1 +
 kernel/arch/sparc/include/asm/visasm.h        |   1 +
 kernel/arch/sparc/include/asm/winmacro.h      |   1 +
 kernel/arch/sparc/include/asm/xor.h           |   1 +
 kernel/arch/sparc/include/uapi/asm/apc.h      |   1 +
 kernel/arch/sparc/include/uapi/asm/asi.h      |   1 +
 .../arch/sparc/include/uapi/asm/bitsperlong.h |   1 +
 .../arch/sparc/include/uapi/asm/byteorder.h   |   1 +
 .../arch/sparc/include/uapi/asm/display7seg.h |   1 +
 kernel/arch/sparc/include/uapi/asm/envctrl.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/errno.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/fbio.h     |   1 +
 kernel/arch/sparc/include/uapi/asm/fcntl.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/ioctl.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/ioctls.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/ipcbuf.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/jsflash.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/kvm_para.h |   1 +
 kernel/arch/sparc/include/uapi/asm/mman.h     |   1 +
 kernel/arch/sparc/include/uapi/asm/msgbuf.h   |   1 +
 .../arch/sparc/include/uapi/asm/openpromio.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/param.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/perfctr.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/poll.h     |   1 +
 .../arch/sparc/include/uapi/asm/posix_types.h |   1 +
 kernel/arch/sparc/include/uapi/asm/psr.h      |   1 +
 .../arch/sparc/include/uapi/asm/psrcompat.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/pstate.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/ptrace.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/resource.h |   1 +
 kernel/arch/sparc/include/uapi/asm/sembuf.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/setup.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/shmbuf.h   |   1 +
 .../arch/sparc/include/uapi/asm/sigcontext.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/siginfo.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/signal.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/socket.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/sockios.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/stat.h     |   1 +
 kernel/arch/sparc/include/uapi/asm/statfs.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/swab.h     |   1 +
 kernel/arch/sparc/include/uapi/asm/termbits.h |   1 +
 kernel/arch/sparc/include/uapi/asm/termios.h  |   1 +
 kernel/arch/sparc/include/uapi/asm/traps.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/uctx.h     |   1 +
 kernel/arch/sparc/include/uapi/asm/unistd.h   |   1 +
 kernel/arch/sparc/include/uapi/asm/utrap.h    |   1 +
 kernel/arch/sparc/include/uapi/asm/watchdog.h |   1 +
 kernel/arch/sparc/kernel/Makefile             |   1 +
 kernel/arch/sparc/kernel/apc.c                |   1 +
 kernel/arch/sparc/kernel/asm-offsets.c        |   1 +
 kernel/arch/sparc/kernel/audit.c              |   1 +
 kernel/arch/sparc/kernel/auxio_32.c           |   1 +
 kernel/arch/sparc/kernel/auxio_64.c           |   1 +
 kernel/arch/sparc/kernel/btext.c              |   1 +
 kernel/arch/sparc/kernel/central.c            |   1 +
 kernel/arch/sparc/kernel/cherrs.S             |   1 +
 kernel/arch/sparc/kernel/compat_audit.c       |   1 +
 kernel/arch/sparc/kernel/cpu.c                |   1 +
 kernel/arch/sparc/kernel/cpumap.c             |   1 +
 kernel/arch/sparc/kernel/cpumap.h             |   1 +
 kernel/arch/sparc/kernel/devices.c            |   1 +
 kernel/arch/sparc/kernel/dma.c                |   1 +
 kernel/arch/sparc/kernel/dtlb_miss.S          |   1 +
 kernel/arch/sparc/kernel/dtlb_prot.S          |   1 +
 kernel/arch/sparc/kernel/ebus.c               |   1 +
 kernel/arch/sparc/kernel/entry.S              |   1 +
 kernel/arch/sparc/kernel/entry.h              |   1 +
 kernel/arch/sparc/kernel/etrap_32.S           |   1 +
 kernel/arch/sparc/kernel/etrap_64.S           |   1 +
 kernel/arch/sparc/kernel/fpu_traps.S          |   1 +
 kernel/arch/sparc/kernel/ftrace.c             |   1 +
 kernel/arch/sparc/kernel/getsetcc.S           |   1 +
 kernel/arch/sparc/kernel/head_32.S            |   1 +
 kernel/arch/sparc/kernel/head_64.S            |   1 +
 kernel/arch/sparc/kernel/hvapi.c              |   1 +
 kernel/arch/sparc/kernel/hvcalls.S            |   1 +
 kernel/arch/sparc/kernel/hvtramp.S            |   1 +
 kernel/arch/sparc/kernel/idprom.c             |   1 +
 kernel/arch/sparc/kernel/iommu.c              |   1 +
 kernel/arch/sparc/kernel/iommu_common.h       |   1 +
 kernel/arch/sparc/kernel/ioport.c             |   1 +
 kernel/arch/sparc/kernel/irq.h                |   1 +
 kernel/arch/sparc/kernel/irq_32.c             |   1 +
 kernel/arch/sparc/kernel/irq_64.c             |   1 +
 kernel/arch/sparc/kernel/itlb_miss.S          |   1 +
 kernel/arch/sparc/kernel/ivec.S               |   1 +
 kernel/arch/sparc/kernel/jump_label.c         |   1 +
 kernel/arch/sparc/kernel/kernel.h             |   1 +
 kernel/arch/sparc/kernel/kgdb_32.c            |   1 +
 kernel/arch/sparc/kernel/kgdb_64.c            |   1 +
 kernel/arch/sparc/kernel/kprobes.c            |   1 +
 kernel/arch/sparc/kernel/kstack.h             |   1 +
 kernel/arch/sparc/kernel/ktlb.S               |   1 +
 kernel/arch/sparc/kernel/ldc.c                |   1 +
 kernel/arch/sparc/kernel/leon_kernel.c        |   1 +
 kernel/arch/sparc/kernel/leon_pci.c           |   1 +
 kernel/arch/sparc/kernel/leon_pci_grpci1.c    |   1 +
 kernel/arch/sparc/kernel/leon_pci_grpci2.c    |   1 +
 kernel/arch/sparc/kernel/leon_pmc.c           |   1 +
 kernel/arch/sparc/kernel/leon_smp.c           |   1 +
 kernel/arch/sparc/kernel/mdesc.c              |   1 +
 kernel/arch/sparc/kernel/misctrap.S           |   1 +
 kernel/arch/sparc/kernel/module.c             |   1 +
 kernel/arch/sparc/kernel/of_device_32.c       |   1 +
 kernel/arch/sparc/kernel/of_device_64.c       |   1 +
 kernel/arch/sparc/kernel/of_device_common.h   |   1 +
 kernel/arch/sparc/kernel/pci.c                |   1 +
 kernel/arch/sparc/kernel/pci_common.c         |   1 +
 kernel/arch/sparc/kernel/pci_fire.c           |   1 +
 kernel/arch/sparc/kernel/pci_impl.h           |   1 +
 kernel/arch/sparc/kernel/pci_msi.c            |   1 +
 kernel/arch/sparc/kernel/pci_psycho.c         |   1 +
 kernel/arch/sparc/kernel/pci_sabre.c          |   1 +
 kernel/arch/sparc/kernel/pci_schizo.c         |   1 +
 kernel/arch/sparc/kernel/pci_sun4v.c          |   1 +
 kernel/arch/sparc/kernel/pci_sun4v.h          |   1 +
 kernel/arch/sparc/kernel/pci_sun4v_asm.S      |   1 +
 kernel/arch/sparc/kernel/pcic.c               |   1 +
 kernel/arch/sparc/kernel/perf_event.c         |   1 +
 kernel/arch/sparc/kernel/pmc.c                |   1 +
 kernel/arch/sparc/kernel/power.c              |   1 +
 kernel/arch/sparc/kernel/process_32.c         |   1 +
 kernel/arch/sparc/kernel/process_64.c         |   1 +
 kernel/arch/sparc/kernel/prom.h               |   1 +
 kernel/arch/sparc/kernel/prom_irqtrans.c      |   1 +
 kernel/arch/sparc/kernel/psycho_common.c      |   1 +
 kernel/arch/sparc/kernel/psycho_common.h      |   1 +
 kernel/arch/sparc/kernel/ptrace_32.c          |   1 +
 kernel/arch/sparc/kernel/reboot.c             |   1 +
 kernel/arch/sparc/kernel/rtrap_32.S           |   1 +
 kernel/arch/sparc/kernel/rtrap_64.S           |   1 +
 kernel/arch/sparc/kernel/sbus.c               |   1 +
 kernel/arch/sparc/kernel/setup_32.c           |   1 +
 kernel/arch/sparc/kernel/setup_64.c           |   1 +
 kernel/arch/sparc/kernel/signal32.c           |   1 +
 kernel/arch/sparc/kernel/signal_32.c          |   1 +
 kernel/arch/sparc/kernel/signal_64.c          |   1 +
 kernel/arch/sparc/kernel/sigutil.h            |   1 +
 kernel/arch/sparc/kernel/sigutil_32.c         |   1 +
 kernel/arch/sparc/kernel/sigutil_64.c         |   1 +
 kernel/arch/sparc/kernel/smp_32.c             |   1 +
 kernel/arch/sparc/kernel/smp_64.c             |   1 +
 kernel/arch/sparc/kernel/spiterrs.S           |   1 +
 kernel/arch/sparc/kernel/sstate.c             |   1 +
 kernel/arch/sparc/kernel/starfire.c           |   1 +
 kernel/arch/sparc/kernel/sun4d_irq.c          |   1 +
 kernel/arch/sparc/kernel/sun4d_smp.c          |   1 +
 kernel/arch/sparc/kernel/sun4m_irq.c          |   1 +
 kernel/arch/sparc/kernel/sun4m_smp.c          |   1 +
 kernel/arch/sparc/kernel/sun4v_ivec.S         |   1 +
 kernel/arch/sparc/kernel/sun4v_tlb_miss.S     |   1 +
 kernel/arch/sparc/kernel/sys32.S              |   1 +
 kernel/arch/sparc/kernel/sys_sparc32.c        |   1 +
 kernel/arch/sparc/kernel/sys_sparc_32.c       |   1 +
 kernel/arch/sparc/kernel/sys_sparc_64.c       |   1 +
 kernel/arch/sparc/kernel/syscalls.S           |   1 +
 kernel/arch/sparc/kernel/sysfs.c              |   1 +
 kernel/arch/sparc/kernel/systbls.h            |   1 +
 kernel/arch/sparc/kernel/systbls_32.S         |   1 +
 kernel/arch/sparc/kernel/systbls_64.S         |   1 +
 kernel/arch/sparc/kernel/time_32.c            |   1 +
 kernel/arch/sparc/kernel/time_64.c            |   1 +
 kernel/arch/sparc/kernel/trampoline_32.S      |   1 +
 kernel/arch/sparc/kernel/trampoline_64.S      |   1 +
 kernel/arch/sparc/kernel/traps_32.c           |   1 +
 kernel/arch/sparc/kernel/tsb.S                |   1 +
 kernel/arch/sparc/kernel/ttable_32.S          |   1 +
 kernel/arch/sparc/kernel/ttable_64.S          |   1 +
 kernel/arch/sparc/kernel/una_asm_32.S         |   1 +
 kernel/arch/sparc/kernel/una_asm_64.S         |   1 +
 kernel/arch/sparc/kernel/unaligned_32.c       |   1 +
 kernel/arch/sparc/kernel/unaligned_64.c       |   1 +
 kernel/arch/sparc/kernel/urtt_fill.S          |   1 +
 kernel/arch/sparc/kernel/utrap.S              |   1 +
 kernel/arch/sparc/kernel/vio.c                |   1 +
 kernel/arch/sparc/kernel/viohs.c              |   1 +
 kernel/arch/sparc/kernel/visemul.c            |   1 +
 kernel/arch/sparc/kernel/vmlinux.lds.S        |   1 +
 kernel/arch/sparc/kernel/windows.c            |   1 +
 kernel/arch/sparc/kernel/winfixup.S           |   1 +
 kernel/arch/sparc/kernel/wof.S                |   1 +
 kernel/arch/sparc/kernel/wuf.S                |   1 +
 kernel/arch/sparc/lib/GENbzero.S              |   1 +
 kernel/arch/sparc/lib/GENcopy_from_user.S     |   1 +
 kernel/arch/sparc/lib/GENcopy_to_user.S       |   1 +
 kernel/arch/sparc/lib/GENmemcpy.S             |   1 +
 kernel/arch/sparc/lib/GENpage.S               |   1 +
 kernel/arch/sparc/lib/GENpatch.S              |   1 +
 kernel/arch/sparc/lib/Makefile                |   1 +
 kernel/arch/sparc/lib/NG2copy_from_user.S     |   1 +
 kernel/arch/sparc/lib/NG2copy_to_user.S       |   1 +
 kernel/arch/sparc/lib/NG2memcpy.S             |   1 +
 kernel/arch/sparc/lib/NG2patch.S              |   1 +
 kernel/arch/sparc/lib/NG4clear_page.S         |   1 +
 kernel/arch/sparc/lib/NG4copy_from_user.S     |   1 +
 kernel/arch/sparc/lib/NG4copy_page.S          |   1 +
 kernel/arch/sparc/lib/NG4copy_to_user.S       |   1 +
 kernel/arch/sparc/lib/NG4memcpy.S             |   1 +
 kernel/arch/sparc/lib/NG4memset.S             |   1 +
 kernel/arch/sparc/lib/NG4patch.S              |   1 +
 kernel/arch/sparc/lib/NGbzero.S               |   1 +
 kernel/arch/sparc/lib/NGcopy_from_user.S      |   1 +
 kernel/arch/sparc/lib/NGcopy_to_user.S        |   1 +
 kernel/arch/sparc/lib/NGmemcpy.S              |   1 +
 kernel/arch/sparc/lib/NGpage.S                |   1 +
 kernel/arch/sparc/lib/NGpatch.S               |   1 +
 kernel/arch/sparc/lib/PeeCeeI.c               |   1 +
 kernel/arch/sparc/lib/U1copy_from_user.S      |   1 +
 kernel/arch/sparc/lib/U1copy_to_user.S        |   1 +
 kernel/arch/sparc/lib/U1memcpy.S              |   1 +
 kernel/arch/sparc/lib/U3copy_from_user.S      |   1 +
 kernel/arch/sparc/lib/U3copy_to_user.S        |   1 +
 kernel/arch/sparc/lib/U3memcpy.S              |   1 +
 kernel/arch/sparc/lib/U3patch.S               |   1 +
 kernel/arch/sparc/lib/VISsave.S               |   1 +
 kernel/arch/sparc/lib/ashldi3.S               |   1 +
 kernel/arch/sparc/lib/ashrdi3.S               |   1 +
 kernel/arch/sparc/lib/atomic32.c              |   1 +
 kernel/arch/sparc/lib/atomic_64.S             |   1 +
 kernel/arch/sparc/lib/bitext.c                |   1 +
 kernel/arch/sparc/lib/bitops.S                |   1 +
 kernel/arch/sparc/lib/blockops.S              |   1 +
 kernel/arch/sparc/lib/bzero.S                 |   1 +
 kernel/arch/sparc/lib/checksum_32.S           |   1 +
 kernel/arch/sparc/lib/checksum_64.S           |   1 +
 kernel/arch/sparc/lib/clear_page.S            |   1 +
 kernel/arch/sparc/lib/cmpdi2.c                |   1 +
 kernel/arch/sparc/lib/copy_in_user.S          |   1 +
 kernel/arch/sparc/lib/copy_page.S             |   1 +
 kernel/arch/sparc/lib/copy_user.S             |   1 +
 kernel/arch/sparc/lib/csum_copy.S             |   1 +
 kernel/arch/sparc/lib/csum_copy_from_user.S   |   1 +
 kernel/arch/sparc/lib/csum_copy_to_user.S     |   1 +
 kernel/arch/sparc/lib/ffs.S                   |   1 +
 kernel/arch/sparc/lib/hweight.S               |   1 +
 kernel/arch/sparc/lib/iomap.c                 |   1 +
 kernel/arch/sparc/lib/ipcsum.S                |   1 +
 kernel/arch/sparc/lib/libgcc.h                |   1 +
 kernel/arch/sparc/lib/locks.S                 |   1 +
 kernel/arch/sparc/lib/lshrdi3.S               |   1 +
 kernel/arch/sparc/lib/mcount.S                |   1 +
 kernel/arch/sparc/lib/memcmp.S                |   1 +
 kernel/arch/sparc/lib/memcpy.S                |   1 +
 kernel/arch/sparc/lib/memmove.S               |   1 +
 kernel/arch/sparc/lib/memscan_32.S            |   1 +
 kernel/arch/sparc/lib/memscan_64.S            |   1 +
 kernel/arch/sparc/lib/memset.S                |   1 +
 kernel/arch/sparc/lib/multi3.S                |   1 +
 kernel/arch/sparc/lib/strlen.S                |   1 +
 kernel/arch/sparc/lib/strncmp_32.S            |   1 +
 kernel/arch/sparc/lib/strncmp_64.S            |   1 +
 kernel/arch/sparc/lib/ucmpdi2.c               |   1 +
 kernel/arch/sparc/lib/xor.S                   |   1 +
 kernel/arch/sparc/math-emu/math_32.c          |   1 +
 kernel/arch/sparc/math-emu/math_64.c          |   1 +
 kernel/arch/sparc/math-emu/sfp-util_32.h      |   1 +
 kernel/arch/sparc/math-emu/sfp-util_64.h      |   1 +
 kernel/arch/sparc/mm/Makefile                 |   1 +
 kernel/arch/sparc/mm/extable.c                |   1 +
 kernel/arch/sparc/mm/fault_32.c               |   1 +
 kernel/arch/sparc/mm/fault_64.c               |   1 +
 kernel/arch/sparc/mm/gup.c                    |   1 +
 kernel/arch/sparc/mm/highmem.c                |   1 +
 kernel/arch/sparc/mm/hugetlbpage.c            |   1 +
 kernel/arch/sparc/mm/hypersparc.S             |   1 +
 kernel/arch/sparc/mm/init_32.c                |   1 +
 kernel/arch/sparc/mm/init_64.c                |   1 +
 kernel/arch/sparc/mm/init_64.h                |   1 +
 kernel/arch/sparc/mm/io-unit.c                |   1 +
 kernel/arch/sparc/mm/iommu.c                  |   1 +
 kernel/arch/sparc/mm/leon_mm.c                |   1 +
 kernel/arch/sparc/mm/mm_32.h                  |   1 +
 kernel/arch/sparc/mm/srmmu.c                  |   1 +
 kernel/arch/sparc/mm/srmmu_access.S           |   1 +
 kernel/arch/sparc/mm/swift.S                  |   1 +
 kernel/arch/sparc/mm/tlb.c                    |   1 +
 kernel/arch/sparc/mm/tsb.c                    |   1 +
 kernel/arch/sparc/mm/tsunami.S                |   1 +
 kernel/arch/sparc/mm/ultra.S                  |   1 +
 kernel/arch/sparc/mm/viking.S                 |   1 +
 kernel/arch/sparc/net/bpf_jit_32.h            |   1 +
 kernel/arch/sparc/net/bpf_jit_64.h            |   1 +
 kernel/arch/sparc/net/bpf_jit_asm_32.S        |   1 +
 kernel/arch/sparc/net/bpf_jit_asm_64.S        |   1 +
 kernel/arch/sparc/net/bpf_jit_comp_32.c       |   1 +
 kernel/arch/sparc/net/bpf_jit_comp_64.c       |   1 +
 kernel/arch/sparc/power/hibernate.c           |   1 +
 kernel/arch/sparc/power/hibernate_asm.S       |   1 +
 kernel/arch/sparc/prom/Makefile               |   1 +
 kernel/arch/sparc/prom/bootstr_32.c           |   1 +
 kernel/arch/sparc/prom/bootstr_64.c           |   1 +
 kernel/arch/sparc/prom/cif.S                  |   1 +
 kernel/arch/sparc/prom/console_32.c           |   1 +
 kernel/arch/sparc/prom/console_64.c           |   1 +
 kernel/arch/sparc/prom/init_32.c              |   1 +
 kernel/arch/sparc/prom/init_64.c              |   1 +
 kernel/arch/sparc/prom/memory.c               |   1 +
 kernel/arch/sparc/prom/misc_32.c              |   1 +
 kernel/arch/sparc/prom/misc_64.c              |   1 +
 kernel/arch/sparc/prom/mp.c                   |   1 +
 kernel/arch/sparc/prom/p1275.c                |   1 +
 kernel/arch/sparc/prom/printf.c               |   1 +
 kernel/arch/sparc/prom/ranges.c               |   1 +
 kernel/arch/sparc/prom/tree_32.c              |   1 +
 kernel/arch/sparc/prom/tree_64.c              |   1 +
 kernel/arch/tile/Kconfig                      |   1 +
 kernel/arch/tile/Kconfig.debug                |   1 +
 kernel/arch/tile/Makefile                     |   2 +
 kernel/arch/tile/gxio/Kconfig                 |   1 +
 kernel/arch/tile/gxio/Makefile                |   1 +
 kernel/arch/tile/include/asm/div64.h          |   1 +
 kernel/arch/tile/include/asm/irq_work.h       |   1 +
 kernel/arch/tile/include/asm/word-at-a-time.h |   1 +
 kernel/arch/tile/include/uapi/arch/abi.h      |   1 +
 kernel/arch/tile/include/uapi/arch/chip.h     |   1 +
 .../arch/tile/include/uapi/arch/chip_tilegx.h |   1 +
 .../tile/include/uapi/arch/chip_tilepro.h     |   1 +
 kernel/arch/tile/include/uapi/arch/icache.h   |   1 +
 .../arch/tile/include/uapi/arch/interrupts.h  |   1 +
 .../tile/include/uapi/arch/interrupts_32.h    |   1 +
 .../tile/include/uapi/arch/interrupts_64.h    |   1 +
 kernel/arch/tile/include/uapi/arch/intreg.h   |   1 +
 kernel/arch/tile/include/uapi/arch/opcode.h   |   1 +
 .../tile/include/uapi/arch/opcode_tilegx.h    |   1 +
 .../tile/include/uapi/arch/opcode_tilepro.h   |   1 +
 kernel/arch/tile/include/uapi/arch/sim.h      |   1 +
 kernel/arch/tile/include/uapi/arch/sim_def.h  |   1 +
 kernel/arch/tile/include/uapi/arch/spr_def.h  |   1 +
 .../arch/tile/include/uapi/arch/spr_def_32.h  |   1 +
 .../arch/tile/include/uapi/arch/spr_def_64.h  |   1 +
 kernel/arch/tile/include/uapi/asm/auxvec.h    |   1 +
 .../arch/tile/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/arch/tile/include/uapi/asm/byteorder.h |   1 +
 kernel/arch/tile/include/uapi/asm/cachectl.h  |   1 +
 kernel/arch/tile/include/uapi/asm/hardwall.h  |   1 +
 kernel/arch/tile/include/uapi/asm/kvm_para.h  |   1 +
 kernel/arch/tile/include/uapi/asm/mman.h      |   1 +
 kernel/arch/tile/include/uapi/asm/ptrace.h    |   1 +
 kernel/arch/tile/include/uapi/asm/setup.h     |   1 +
 .../arch/tile/include/uapi/asm/sigcontext.h   |   1 +
 kernel/arch/tile/include/uapi/asm/siginfo.h   |   1 +
 kernel/arch/tile/include/uapi/asm/signal.h    |   1 +
 kernel/arch/tile/include/uapi/asm/stat.h      |   1 +
 kernel/arch/tile/include/uapi/asm/swab.h      |   1 +
 kernel/arch/tile/include/uapi/asm/unistd.h    |   1 +
 kernel/arch/tile/kernel/Makefile              |   1 +
 kernel/arch/tile/kernel/hvglue.S              |   1 +
 kernel/arch/tile/kernel/time.c                |   1 +
 kernel/arch/tile/kernel/vdso/Makefile         |   1 +
 kernel/arch/tile/kernel/vmlinux.lds.S         |   1 +
 kernel/arch/tile/kvm/Kconfig                  |   1 +
 kernel/arch/tile/lib/Makefile                 |   1 +
 kernel/arch/um/Kconfig.char                   |   1 +
 kernel/arch/um/Kconfig.common                 |   1 +
 kernel/arch/um/Kconfig.debug                  |   1 +
 kernel/arch/um/Kconfig.net                    |   1 +
 kernel/arch/um/Kconfig.rest                   |   1 +
 kernel/arch/um/Kconfig.um                     |   1 +
 kernel/arch/um/drivers/cow.h                  |   1 +
 kernel/arch/um/drivers/cow_sys.h              |   1 +
 kernel/arch/um/drivers/slip.h                 |   1 +
 kernel/arch/um/drivers/slip_common.c          |   1 +
 kernel/arch/um/drivers/slip_common.h          |   1 +
 kernel/arch/um/drivers/slirp.h                |   1 +
 kernel/arch/um/drivers/stderr_console.c       |   1 +
 kernel/arch/um/include/asm/bugs.h             |   1 +
 kernel/arch/um/include/asm/cache.h            |   1 +
 kernel/arch/um/include/asm/common.lds.S       |   1 +
 kernel/arch/um/include/asm/dma.h              |   1 +
 kernel/arch/um/include/asm/fixmap.h           |   1 +
 kernel/arch/um/include/asm/hardirq.h          |   1 +
 kernel/arch/um/include/asm/io.h               |   1 +
 kernel/arch/um/include/asm/irq.h              |   1 +
 kernel/arch/um/include/asm/irqflags.h         |   1 +
 kernel/arch/um/include/asm/sections.h         |   1 +
 kernel/arch/um/include/asm/setup.h            |   1 +
 kernel/arch/um/include/asm/smp.h              |   1 +
 kernel/arch/um/include/asm/stacktrace.h       |   1 +
 kernel/arch/um/include/asm/sysrq.h            |   1 +
 kernel/arch/um/include/asm/timex.h            |   1 +
 kernel/arch/um/include/asm/tlb.h              |   1 +
 .../arch/um/include/shared/common-offsets.h   |   1 +
 kernel/arch/um/include/shared/init.h          |   1 +
 kernel/arch/um/include/shared/longjmp.h       |   1 +
 kernel/arch/um/kernel/dyn.lds.S               |   1 +
 kernel/arch/um/kernel/kmsg_dump.c             |   1 +
 kernel/arch/um/kernel/uml.lds.S               |   1 +
 kernel/arch/um/os-Linux/elf_aux.c             |   1 +
 kernel/arch/um/os-Linux/user_syms.c           |   1 +
 kernel/arch/um/scripts/Makefile.rules         |   1 +
 kernel/arch/unicore32/Kconfig                 |   1 +
 kernel/arch/unicore32/Kconfig.debug           |   1 +
 .../arch/unicore32/include/mach/regs-ac97.h   |   1 +
 .../arch/unicore32/include/mach/regs-dmac.h   |   1 +
 .../arch/unicore32/include/mach/regs-gpio.h   |   1 +
 kernel/arch/unicore32/include/mach/regs-i2c.h |   1 +
 .../arch/unicore32/include/mach/regs-intc.h   |   1 +
 .../arch/unicore32/include/mach/regs-nand.h   |   1 +
 kernel/arch/unicore32/include/mach/regs-ost.h |   1 +
 kernel/arch/unicore32/include/mach/regs-pci.h |   1 +
 kernel/arch/unicore32/include/mach/regs-pm.h  |   1 +
 kernel/arch/unicore32/include/mach/regs-ps2.h |   1 +
 .../arch/unicore32/include/mach/regs-resetc.h |   1 +
 kernel/arch/unicore32/include/mach/regs-rtc.h |   1 +
 kernel/arch/unicore32/include/mach/regs-sdc.h |   1 +
 kernel/arch/unicore32/include/mach/regs-spi.h |   1 +
 .../arch/unicore32/include/mach/regs-umal.h   |   1 +
 .../arch/unicore32/include/mach/regs-unigfx.h |   1 +
 .../unicore32/include/uapi/asm/byteorder.h    |   1 +
 .../arch/unicore32/include/uapi/asm/ptrace.h  |   1 +
 .../unicore32/include/uapi/asm/sigcontext.h   |   1 +
 .../arch/unicore32/include/uapi/asm/unistd.h  |   1 +
 kernel/arch/unicore32/kernel/Makefile         |   1 +
 kernel/arch/unicore32/kernel/ksyms.h          |   1 +
 kernel/arch/unicore32/lib/Makefile            |   1 +
 kernel/arch/unicore32/mm/Kconfig              |   1 +
 kernel/arch/unicore32/mm/Makefile             |   1 +
 kernel/arch/x86/Kconfig                       |   1 +
 kernel/arch/x86/Kconfig.cpu                   |   1 +
 kernel/arch/x86/Kconfig.debug                 |   1 +
 kernel/arch/x86/Makefile                      |   1 +
 kernel/arch/x86/Makefile.um                   |   1 +
 kernel/arch/x86/Makefile_32.cpu               |   1 +
 kernel/arch/x86/boot/code16gcc.h              |   1 +
 kernel/arch/x86/boot/compressed/Makefile      |   1 +
 kernel/arch/x86/boot/compressed/cmdline.c     |   1 +
 kernel/arch/x86/boot/compressed/cpuflags.c    |   1 +
 kernel/arch/x86/boot/compressed/eboot.h       |   1 +
 kernel/arch/x86/boot/compressed/efi_stub_32.S |   1 +
 .../arch/x86/boot/compressed/efi_thunk_64.S   |   1 +
 kernel/arch/x86/boot/compressed/error.c       |   1 +
 kernel/arch/x86/boot/compressed/error.h       |   1 +
 kernel/arch/x86/boot/compressed/head_32.S     |   1 +
 kernel/arch/x86/boot/compressed/head_64.S     |   1 +
 kernel/arch/x86/boot/compressed/kaslr.c       |   1 +
 kernel/arch/x86/boot/compressed/misc.c        |   1 +
 kernel/arch/x86/boot/compressed/misc.h        |   1 +
 kernel/arch/x86/boot/compressed/pagetable.c   |   1 +
 kernel/arch/x86/boot/compressed/string.c      |   1 +
 kernel/arch/x86/boot/compressed/vmlinux.lds.S |   1 +
 kernel/arch/x86/boot/cpuflags.c               |   1 +
 kernel/arch/x86/boot/cpuflags.h               |   1 +
 kernel/arch/x86/boot/ctype.h                  |   1 +
 kernel/arch/x86/boot/early_serial_console.c   |   1 +
 kernel/arch/x86/boot/header.S                 |   1 +
 kernel/arch/x86/boot/string.h                 |   1 +
 kernel/arch/x86/boot/tools/build.c            |   1 +
 kernel/arch/x86/crypto/Makefile               |   1 +
 kernel/arch/x86/crypto/chacha20-avx2-x86_64.S |   4 +-
 .../arch/x86/crypto/chacha20-ssse3-x86_64.S   |   4 +-
 .../arch/x86/crypto/salsa20-x86_64-asm_64.S   |   1 +
 kernel/arch/x86/crypto/sha1-mb/Makefile       |   1 +
 kernel/arch/x86/crypto/sha256-mb/Makefile     |   1 +
 kernel/arch/x86/crypto/sha512-mb/Makefile     |   1 +
 kernel/arch/x86/entry/Makefile                |   1 +
 kernel/arch/x86/entry/calling.h               |   1 +
 kernel/arch/x86/entry/entry_32.S              |   1 +
 kernel/arch/x86/entry/entry_64.S              |   1 +
 kernel/arch/x86/entry/entry_64_compat.S       |   1 +
 kernel/arch/x86/entry/syscall_32.c            |   1 +
 kernel/arch/x86/entry/syscall_64.c            |   1 +
 kernel/arch/x86/entry/syscalls/Makefile       |   1 +
 kernel/arch/x86/entry/syscalls/syscallhdr.sh  |   1 +
 kernel/arch/x86/entry/syscalls/syscalltbl.sh  |   1 +
 kernel/arch/x86/entry/vdso/Makefile           |   1 +
 kernel/arch/x86/entry/vdso/vdso-layout.lds.S  |   1 +
 kernel/arch/x86/entry/vdso/vdso.lds.S         |   1 +
 kernel/arch/x86/entry/vdso/vdso2c.h           |   1 +
 kernel/arch/x86/entry/vdso/vdso32-setup.c     |   1 +
 kernel/arch/x86/entry/vdso/vdso32/note.S      |   1 +
 kernel/arch/x86/entry/vdso/vdso32/sigreturn.S |   1 +
 .../arch/x86/entry/vdso/vdso32/system_call.S  |   1 +
 .../x86/entry/vdso/vdso32/vclock_gettime.c    |   1 +
 .../arch/x86/entry/vdso/vdso32/vdso32.lds.S   |   1 +
 kernel/arch/x86/entry/vdso/vdsox32.lds.S      |   1 +
 kernel/arch/x86/entry/vsyscall/vsyscall_64.c  |   1 +
 .../arch/x86/entry/vsyscall/vsyscall_gtod.c   |   1 +
 .../arch/x86/entry/vsyscall/vsyscall_trace.h  |   1 +
 kernel/arch/x86/events/Kconfig                |   1 +
 kernel/arch/x86/events/amd/Makefile           |   1 +
 kernel/arch/x86/events/intel/Makefile         |   1 +
 kernel/arch/x86/events/intel/ds.c             |   1 +
 kernel/arch/x86/events/intel/knc.c            |   1 +
 kernel/arch/x86/events/intel/lbr.c            |   1 +
 kernel/arch/x86/events/intel/p6.c             |   1 +
 kernel/arch/x86/events/intel/uncore.h         |   1 +
 kernel/arch/x86/events/intel/uncore_nhmex.c   |   1 +
 kernel/arch/x86/events/intel/uncore_snb.c     |   1 +
 kernel/arch/x86/events/intel/uncore_snbep.c   |   1 +
 kernel/arch/x86/events/msr.c                  |   1 +
 kernel/arch/x86/ia32/audit.c                  |   1 +
 kernel/arch/x86/ia32/ia32_signal.c            |   1 +
 kernel/arch/x86/ia32/sys_ia32.c               |   1 +
 kernel/arch/x86/include/asm/acpi.h            |   2 +
 kernel/arch/x86/include/asm/agp.h             |   1 +
 kernel/arch/x86/include/asm/alternative-asm.h |   1 +
 kernel/arch/x86/include/asm/alternative.h     |   1 +
 kernel/arch/x86/include/asm/amd_nb.h          |   1 +
 kernel/arch/x86/include/asm/apic_flat_64.h    |   1 +
 kernel/arch/x86/include/asm/apicdef.h         |   1 +
 kernel/arch/x86/include/asm/apm.h             |   1 +
 kernel/arch/x86/include/asm/arch_hweight.h    |   1 +
 kernel/arch/x86/include/asm/asm-prototypes.h  |   1 +
 kernel/arch/x86/include/asm/asm.h             |   1 +
 kernel/arch/x86/include/asm/atomic.h          |   1 +
 kernel/arch/x86/include/asm/atomic64_32.h     |   1 +
 kernel/arch/x86/include/asm/atomic64_64.h     |   1 +
 kernel/arch/x86/include/asm/barrier.h         |   1 +
 kernel/arch/x86/include/asm/bios_ebda.h       |   1 +
 kernel/arch/x86/include/asm/bitops.h          |   1 +
 kernel/arch/x86/include/asm/boot.h            |   1 +
 kernel/arch/x86/include/asm/bootparam_utils.h |   1 +
 kernel/arch/x86/include/asm/bug.h             |   1 +
 kernel/arch/x86/include/asm/bugs.h            |   1 +
 kernel/arch/x86/include/asm/cache.h           |   1 +
 kernel/arch/x86/include/asm/cacheflush.h      |   1 +
 kernel/arch/x86/include/asm/ce4100.h          |   1 +
 kernel/arch/x86/include/asm/checksum.h        |   1 +
 kernel/arch/x86/include/asm/checksum_32.h     |   1 +
 kernel/arch/x86/include/asm/checksum_64.h     |   1 +
 kernel/arch/x86/include/asm/clocksource.h     |   1 +
 kernel/arch/x86/include/asm/cmdline.h         |   1 +
 kernel/arch/x86/include/asm/cmpxchg.h         |   1 +
 kernel/arch/x86/include/asm/cmpxchg_32.h      |   1 +
 kernel/arch/x86/include/asm/cmpxchg_64.h      |   1 +
 kernel/arch/x86/include/asm/compat.h          |   1 +
 kernel/arch/x86/include/asm/cpu.h             |   1 +
 kernel/arch/x86/include/asm/cpu_device_id.h   |   1 +
 kernel/arch/x86/include/asm/cpufeature.h      |   1 +
 kernel/arch/x86/include/asm/cpufeatures.h     |   1 +
 kernel/arch/x86/include/asm/cpumask.h         |   1 +
 kernel/arch/x86/include/asm/crash.h           |   1 +
 kernel/arch/x86/include/asm/crypto/aes.h      |   1 +
 kernel/arch/x86/include/asm/crypto/camellia.h |   1 +
 .../arch/x86/include/asm/crypto/glue_helper.h |   1 +
 .../arch/x86/include/asm/crypto/serpent-avx.h |   1 +
 .../x86/include/asm/crypto/serpent-sse2.h     |   1 +
 kernel/arch/x86/include/asm/crypto/twofish.h  |   1 +
 kernel/arch/x86/include/asm/current.h         |   1 +
 kernel/arch/x86/include/asm/debugreg.h        |   1 +
 kernel/arch/x86/include/asm/delay.h           |   1 +
 kernel/arch/x86/include/asm/desc.h            |   1 +
 kernel/arch/x86/include/asm/desc_defs.h       |   1 +
 kernel/arch/x86/include/asm/device.h          |   1 +
 kernel/arch/x86/include/asm/div64.h           |   1 +
 kernel/arch/x86/include/asm/dma-mapping.h     |   1 +
 kernel/arch/x86/include/asm/dma.h             |   1 +
 kernel/arch/x86/include/asm/dmi.h             |   1 +
 kernel/arch/x86/include/asm/dwarf2.h          |   1 +
 kernel/arch/x86/include/asm/e820/api.h        |   1 +
 kernel/arch/x86/include/asm/e820/types.h      |   1 +
 kernel/arch/x86/include/asm/edac.h            |   1 +
 kernel/arch/x86/include/asm/efi.h             |   1 +
 kernel/arch/x86/include/asm/elf.h             |   1 +
 .../arch/x86/include/asm/emergency-restart.h  |   1 +
 kernel/arch/x86/include/asm/entry_arch.h      |   1 +
 kernel/arch/x86/include/asm/espfix.h          |   1 +
 kernel/arch/x86/include/asm/export.h          |   1 +
 kernel/arch/x86/include/asm/extable.h         |   1 +
 kernel/arch/x86/include/asm/fb.h              |   1 +
 kernel/arch/x86/include/asm/fpu/api.h         |   1 +
 kernel/arch/x86/include/asm/fpu/internal.h    |   1 +
 kernel/arch/x86/include/asm/fpu/regset.h      |   1 +
 kernel/arch/x86/include/asm/fpu/signal.h      |   1 +
 kernel/arch/x86/include/asm/fpu/types.h       |   1 +
 kernel/arch/x86/include/asm/fpu/xstate.h      |   1 +
 kernel/arch/x86/include/asm/frame.h           |   1 +
 kernel/arch/x86/include/asm/ftrace.h          |   1 +
 kernel/arch/x86/include/asm/futex.h           |   1 +
 kernel/arch/x86/include/asm/gart.h            |   1 +
 kernel/arch/x86/include/asm/hardirq.h         |   1 +
 kernel/arch/x86/include/asm/highmem.h         |   1 +
 kernel/arch/x86/include/asm/hpet.h            |   1 +
 kernel/arch/x86/include/asm/hugetlb.h         |   1 +
 kernel/arch/x86/include/asm/hw_breakpoint.h   |   1 +
 kernel/arch/x86/include/asm/hw_irq.h          |   1 +
 kernel/arch/x86/include/asm/hypertransport.h  |   1 +
 kernel/arch/x86/include/asm/i8259.h           |   1 +
 kernel/arch/x86/include/asm/ia32.h            |   1 +
 kernel/arch/x86/include/asm/ia32_unistd.h     |   1 +
 kernel/arch/x86/include/asm/init.h            |   1 +
 kernel/arch/x86/include/asm/inst.h            |   1 +
 kernel/arch/x86/include/asm/intel-family.h    |   1 +
 kernel/arch/x86/include/asm/intel_mid_vrtc.h  |   1 +
 kernel/arch/x86/include/asm/intel_pmc_ipc.h   |   1 +
 kernel/arch/x86/include/asm/intel_pt.h        |   1 +
 kernel/arch/x86/include/asm/intel_punit_ipc.h |   1 +
 kernel/arch/x86/include/asm/intel_rdt_sched.h |   1 +
 kernel/arch/x86/include/asm/intel_scu_ipc.h   |   1 +
 kernel/arch/x86/include/asm/io.h              |   1 +
 kernel/arch/x86/include/asm/io_apic.h         |   1 +
 kernel/arch/x86/include/asm/iommu.h           |   1 +
 kernel/arch/x86/include/asm/iommu_table.h     |   1 +
 kernel/arch/x86/include/asm/iosf_mbi.h        |   1 +
 kernel/arch/x86/include/asm/irq.h             |   1 +
 kernel/arch/x86/include/asm/irq_regs.h        |   1 +
 kernel/arch/x86/include/asm/irq_vectors.h     |   1 +
 kernel/arch/x86/include/asm/irq_work.h        |   1 +
 kernel/arch/x86/include/asm/irqdomain.h       |   1 +
 kernel/arch/x86/include/asm/irqflags.h        |   1 +
 kernel/arch/x86/include/asm/jump_label.h      |   1 +
 kernel/arch/x86/include/asm/kasan.h           |   1 +
 kernel/arch/x86/include/asm/kaslr.h           |   1 +
 kernel/arch/x86/include/asm/kbdleds.h         |   1 +
 kernel/arch/x86/include/asm/kdebug.h          |   1 +
 kernel/arch/x86/include/asm/kexec-bzimage64.h |   1 +
 kernel/arch/x86/include/asm/kexec.h           |   1 +
 kernel/arch/x86/include/asm/kgdb.h            |   1 +
 kernel/arch/x86/include/asm/kmap_types.h      |   1 +
 kernel/arch/x86/include/asm/kmemcheck.h       |   1 +
 kernel/arch/x86/include/asm/kvm_emulate.h     |   1 +
 kernel/arch/x86/include/asm/kvm_guest.h       |   1 +
 kernel/arch/x86/include/asm/kvm_page_track.h  |   1 +
 kernel/arch/x86/include/asm/kvm_para.h        |   1 +
 kernel/arch/x86/include/asm/kvmclock.h        |   1 +
 kernel/arch/x86/include/asm/linkage.h         |   1 +
 kernel/arch/x86/include/asm/local.h           |   1 +
 kernel/arch/x86/include/asm/mach_timer.h      |   1 +
 kernel/arch/x86/include/asm/mach_traps.h      |   1 +
 kernel/arch/x86/include/asm/math_emu.h        |   1 +
 kernel/arch/x86/include/asm/mc146818rtc.h     |   1 +
 kernel/arch/x86/include/asm/mce.h             |   1 +
 kernel/arch/x86/include/asm/microcode.h       |   1 +
 kernel/arch/x86/include/asm/microcode_amd.h   |   1 +
 kernel/arch/x86/include/asm/microcode_intel.h |   1 +
 kernel/arch/x86/include/asm/misc.h            |   1 +
 kernel/arch/x86/include/asm/mmconfig.h        |   1 +
 kernel/arch/x86/include/asm/mmu.h             |   1 +
 kernel/arch/x86/include/asm/mmu_context.h     |   1 +
 kernel/arch/x86/include/asm/mmx.h             |   1 +
 kernel/arch/x86/include/asm/mmzone.h          |   1 +
 kernel/arch/x86/include/asm/mmzone_32.h       |   1 +
 kernel/arch/x86/include/asm/mmzone_64.h       |   1 +
 kernel/arch/x86/include/asm/module.h          |   1 +
 kernel/arch/x86/include/asm/mpspec.h          |   1 +
 kernel/arch/x86/include/asm/mpspec_def.h      |   1 +
 kernel/arch/x86/include/asm/mpx.h             |   1 +
 kernel/arch/x86/include/asm/mshyperv.h        |   1 +
 kernel/arch/x86/include/asm/msi.h             |   1 +
 kernel/arch/x86/include/asm/msidef.h          |   1 +
 kernel/arch/x86/include/asm/msr-index.h       |   1 +
 kernel/arch/x86/include/asm/msr-trace.h       |   1 +
 kernel/arch/x86/include/asm/msr.h             |   1 +
 kernel/arch/x86/include/asm/mwait.h           |   1 +
 kernel/arch/x86/include/asm/nmi.h             |   1 +
 kernel/arch/x86/include/asm/nops.h            |   1 +
 kernel/arch/x86/include/asm/numa.h            |   1 +
 kernel/arch/x86/include/asm/numa_32.h         |   1 +
 kernel/arch/x86/include/asm/olpc.h            |   1 +
 kernel/arch/x86/include/asm/olpc_ofw.h        |   1 +
 kernel/arch/x86/include/asm/page.h            |   1 +
 kernel/arch/x86/include/asm/page_32.h         |   1 +
 kernel/arch/x86/include/asm/page_32_types.h   |   1 +
 kernel/arch/x86/include/asm/page_64.h         |   1 +
 kernel/arch/x86/include/asm/page_64_types.h   |   1 +
 kernel/arch/x86/include/asm/page_types.h      |   1 +
 kernel/arch/x86/include/asm/paravirt.h        |   1 +
 kernel/arch/x86/include/asm/paravirt_types.h  |   1 +
 kernel/arch/x86/include/asm/parport.h         |   1 +
 kernel/arch/x86/include/asm/pat.h             |   1 +
 kernel/arch/x86/include/asm/pci-direct.h      |   1 +
 kernel/arch/x86/include/asm/pci-functions.h   |   1 +
 kernel/arch/x86/include/asm/pci.h             |   1 +
 kernel/arch/x86/include/asm/pci_64.h          |   1 +
 kernel/arch/x86/include/asm/pci_x86.h         |   1 +
 kernel/arch/x86/include/asm/percpu.h          |   1 +
 kernel/arch/x86/include/asm/perf_event.h      |   1 +
 kernel/arch/x86/include/asm/perf_event_p4.h   |   1 +
 kernel/arch/x86/include/asm/pgalloc.h         |   1 +
 kernel/arch/x86/include/asm/pgtable-2level.h  |   1 +
 .../x86/include/asm/pgtable-2level_types.h    |   1 +
 kernel/arch/x86/include/asm/pgtable-3level.h  |   1 +
 .../x86/include/asm/pgtable-3level_types.h    |   1 +
 kernel/arch/x86/include/asm/pgtable.h         |   1 +
 kernel/arch/x86/include/asm/pgtable_32.h      |   1 +
 .../arch/x86/include/asm/pgtable_32_types.h   |   1 +
 kernel/arch/x86/include/asm/pgtable_64.h      |   1 +
 .../arch/x86/include/asm/pgtable_64_types.h   |   1 +
 kernel/arch/x86/include/asm/pgtable_types.h   |   1 +
 kernel/arch/x86/include/asm/pkeys.h           |   1 +
 kernel/arch/x86/include/asm/pm-trace.h        |   1 +
 kernel/arch/x86/include/asm/posix_types.h     |   1 +
 kernel/arch/x86/include/asm/preempt.h         |   1 +
 kernel/arch/x86/include/asm/probe_roms.h      |   1 +
 kernel/arch/x86/include/asm/processor-cyrix.h |   1 +
 kernel/arch/x86/include/asm/processor-flags.h |   1 +
 kernel/arch/x86/include/asm/processor.h       |   1 +
 kernel/arch/x86/include/asm/proto.h           |   1 +
 kernel/arch/x86/include/asm/ptrace.h          |   1 +
 kernel/arch/x86/include/asm/purgatory.h       |   1 +
 kernel/arch/x86/include/asm/pvclock-abi.h     |   1 +
 kernel/arch/x86/include/asm/pvclock.h         |   1 +
 kernel/arch/x86/include/asm/qrwlock.h         |   1 +
 kernel/arch/x86/include/asm/qspinlock.h       |   1 +
 .../arch/x86/include/asm/qspinlock_paravirt.h |   1 +
 kernel/arch/x86/include/asm/realmode.h        |   1 +
 kernel/arch/x86/include/asm/reboot.h          |   1 +
 kernel/arch/x86/include/asm/reboot_fixups.h   |   1 +
 kernel/arch/x86/include/asm/rio.h             |   1 +
 kernel/arch/x86/include/asm/rmwcc.h           |   1 +
 kernel/arch/x86/include/asm/rwsem.h           |   1 +
 kernel/arch/x86/include/asm/seccomp.h         |   1 +
 kernel/arch/x86/include/asm/sections.h        |   1 +
 kernel/arch/x86/include/asm/segment.h         |   1 +
 kernel/arch/x86/include/asm/serial.h          |   1 +
 kernel/arch/x86/include/asm/set_memory.h      |   1 +
 kernel/arch/x86/include/asm/setup.h           |   1 +
 kernel/arch/x86/include/asm/shmparam.h        |   1 +
 kernel/arch/x86/include/asm/sigcontext.h      |   1 +
 kernel/arch/x86/include/asm/sigframe.h        |   1 +
 kernel/arch/x86/include/asm/sighandling.h     |   1 +
 kernel/arch/x86/include/asm/signal.h          |   1 +
 kernel/arch/x86/include/asm/simd.h            |   1 +
 kernel/arch/x86/include/asm/smp.h             |   1 +
 kernel/arch/x86/include/asm/sparsemem.h       |   1 +
 kernel/arch/x86/include/asm/special_insns.h   |   1 +
 kernel/arch/x86/include/asm/spinlock.h        |   1 +
 kernel/arch/x86/include/asm/spinlock_types.h  |   1 +
 kernel/arch/x86/include/asm/sta2x11.h         |   1 +
 kernel/arch/x86/include/asm/stackprotector.h  |   1 +
 kernel/arch/x86/include/asm/stacktrace.h      |   1 +
 kernel/arch/x86/include/asm/string.h          |   1 +
 kernel/arch/x86/include/asm/string_32.h       |   1 +
 kernel/arch/x86/include/asm/string_64.h       |   1 +
 kernel/arch/x86/include/asm/suspend.h         |   1 +
 kernel/arch/x86/include/asm/suspend_32.h      |   1 +
 kernel/arch/x86/include/asm/suspend_64.h      |   1 +
 kernel/arch/x86/include/asm/svm.h             |   1 +
 kernel/arch/x86/include/asm/swiotlb.h         |   1 +
 kernel/arch/x86/include/asm/switch_to.h       |   1 +
 kernel/arch/x86/include/asm/sync_bitops.h     |   1 +
 kernel/arch/x86/include/asm/text-patching.h   |   1 +
 kernel/arch/x86/include/asm/thread_info.h     |   1 +
 kernel/arch/x86/include/asm/time.h            |   1 +
 kernel/arch/x86/include/asm/timer.h           |   1 +
 kernel/arch/x86/include/asm/timex.h           |   1 +
 kernel/arch/x86/include/asm/tlb.h             |   1 +
 kernel/arch/x86/include/asm/tlbbatch.h        |   1 +
 kernel/arch/x86/include/asm/tlbflush.h        |   1 +
 .../arch/x86/include/asm/trace/exceptions.h   |   1 +
 kernel/arch/x86/include/asm/trace/fpu.h       |   1 +
 .../arch/x86/include/asm/trace/irq_vectors.h  |   1 +
 kernel/arch/x86/include/asm/trace/mpx.h       |   1 +
 kernel/arch/x86/include/asm/trace_clock.h     |   1 +
 kernel/arch/x86/include/asm/traps.h           |   1 +
 kernel/arch/x86/include/asm/tsc.h             |   1 +
 kernel/arch/x86/include/asm/uaccess.h         |   1 +
 kernel/arch/x86/include/asm/uaccess_32.h      |   1 +
 kernel/arch/x86/include/asm/uaccess_64.h      |   1 +
 kernel/arch/x86/include/asm/unaligned.h       |   1 +
 kernel/arch/x86/include/asm/unistd.h          |   1 +
 kernel/arch/x86/include/asm/unwind.h          |   1 +
 kernel/arch/x86/include/asm/user.h            |   1 +
 kernel/arch/x86/include/asm/user32.h          |   1 +
 kernel/arch/x86/include/asm/user_32.h         |   1 +
 kernel/arch/x86/include/asm/user_64.h         |   1 +
 kernel/arch/x86/include/asm/uv/uv.h           |   1 +
 kernel/arch/x86/include/asm/vdso.h            |   1 +
 kernel/arch/x86/include/asm/vga.h             |   1 +
 kernel/arch/x86/include/asm/vgtod.h           |   1 +
 kernel/arch/x86/include/asm/vm86.h            |   1 +
 kernel/arch/x86/include/asm/vsyscall.h        |   1 +
 kernel/arch/x86/include/asm/word-at-a-time.h  |   1 +
 kernel/arch/x86/include/asm/x2apic.h          |   1 +
 kernel/arch/x86/include/asm/x86_init.h        |   1 +
 kernel/arch/x86/include/asm/xen/events.h      |   1 +
 .../arch/x86/include/asm/xen/interface_32.h   |   1 +
 .../arch/x86/include/asm/xen/interface_64.h   |   1 +
 .../arch/x86/include/asm/xen/page-coherent.h  |   1 +
 kernel/arch/x86/include/asm/xen/page.h        |   1 +
 kernel/arch/x86/include/asm/xen/pci.h         |   1 +
 kernel/arch/x86/include/asm/xen/swiotlb-xen.h |   1 +
 kernel/arch/x86/include/asm/xen/trace_types.h |   1 +
 kernel/arch/x86/include/asm/xor_64.h          |   1 +
 kernel/arch/x86/include/uapi/asm/a.out.h      |   1 +
 kernel/arch/x86/include/uapi/asm/auxvec.h     |   1 +
 .../arch/x86/include/uapi/asm/bitsperlong.h   |   1 +
 kernel/arch/x86/include/uapi/asm/boot.h       |   1 +
 kernel/arch/x86/include/uapi/asm/bootparam.h  |   1 +
 kernel/arch/x86/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/x86/include/uapi/asm/debugreg.h   |   1 +
 kernel/arch/x86/include/uapi/asm/e820.h       |   1 +
 .../arch/x86/include/uapi/asm/hw_breakpoint.h |   1 +
 kernel/arch/x86/include/uapi/asm/hwcap2.h     |   1 +
 kernel/arch/x86/include/uapi/asm/hyperv.h     |   1 +
 kernel/arch/x86/include/uapi/asm/ist.h        |   1 +
 kernel/arch/x86/include/uapi/asm/kvm.h        |   1 +
 kernel/arch/x86/include/uapi/asm/kvm_para.h   |   1 +
 kernel/arch/x86/include/uapi/asm/kvm_perf.h   |   1 +
 kernel/arch/x86/include/uapi/asm/ldt.h        |   1 +
 kernel/arch/x86/include/uapi/asm/mce.h        |   1 +
 kernel/arch/x86/include/uapi/asm/mman.h       |   1 +
 kernel/arch/x86/include/uapi/asm/msr.h        |   1 +
 kernel/arch/x86/include/uapi/asm/mtrr.h       |   1 +
 kernel/arch/x86/include/uapi/asm/perf_regs.h  |   1 +
 .../arch/x86/include/uapi/asm/posix_types.h   |   1 +
 .../x86/include/uapi/asm/posix_types_32.h     |   1 +
 .../x86/include/uapi/asm/posix_types_64.h     |   1 +
 .../x86/include/uapi/asm/posix_types_x32.h    |   1 +
 kernel/arch/x86/include/uapi/asm/prctl.h      |   1 +
 .../x86/include/uapi/asm/processor-flags.h    |   1 +
 kernel/arch/x86/include/uapi/asm/ptrace-abi.h |   1 +
 kernel/arch/x86/include/uapi/asm/ptrace.h     |   1 +
 kernel/arch/x86/include/uapi/asm/sembuf.h     |   1 +
 kernel/arch/x86/include/uapi/asm/sigcontext.h |   1 +
 .../arch/x86/include/uapi/asm/sigcontext32.h  |   1 +
 kernel/arch/x86/include/uapi/asm/siginfo.h    |   1 +
 kernel/arch/x86/include/uapi/asm/signal.h     |   1 +
 kernel/arch/x86/include/uapi/asm/stat.h       |   1 +
 kernel/arch/x86/include/uapi/asm/statfs.h     |   1 +
 kernel/arch/x86/include/uapi/asm/svm.h        |   1 +
 kernel/arch/x86/include/uapi/asm/swab.h       |   1 +
 kernel/arch/x86/include/uapi/asm/types.h      |   1 +
 kernel/arch/x86/include/uapi/asm/ucontext.h   |   1 +
 kernel/arch/x86/include/uapi/asm/unistd.h     |   1 +
 kernel/arch/x86/include/uapi/asm/vm86.h       |   1 +
 kernel/arch/x86/include/uapi/asm/vmx.h        |   1 +
 kernel/arch/x86/include/uapi/asm/vsyscall.h   |   1 +
 kernel/arch/x86/kernel/Makefile               |   1 +
 kernel/arch/x86/kernel/acpi/Makefile          |   1 +
 kernel/arch/x86/kernel/acpi/sleep.c           |   1 +
 kernel/arch/x86/kernel/acpi/sleep.h           |   1 +
 kernel/arch/x86/kernel/aperture_64.c          |   1 +
 kernel/arch/x86/kernel/apic/Makefile          |   1 +
 kernel/arch/x86/kernel/apic/apic_noop.c       |   1 +
 kernel/arch/x86/kernel/apic/bigsmp_32.c       |   1 +
 kernel/arch/x86/kernel/apic/hw_nmi.c          |   1 +
 kernel/arch/x86/kernel/apic/io_apic.c         |   1 +
 kernel/arch/x86/kernel/apic/ipi.c             |   1 +
 kernel/arch/x86/kernel/apic/x2apic_cluster.c  |   1 +
 kernel/arch/x86/kernel/apic/x2apic_phys.c     |   1 +
 kernel/arch/x86/kernel/asm-offsets.c          |   1 +
 kernel/arch/x86/kernel/asm-offsets_32.c       |   1 +
 kernel/arch/x86/kernel/asm-offsets_64.c       |   1 +
 kernel/arch/x86/kernel/audit_64.c             |   1 +
 kernel/arch/x86/kernel/bootflag.c             |   1 +
 kernel/arch/x86/kernel/check.c                |   1 +
 kernel/arch/x86/kernel/cpu/Makefile           |   3 +-
 kernel/arch/x86/kernel/cpu/aperfmperf.c       |  11 +-
 kernel/arch/x86/kernel/cpu/bugs.c             |   1 +
 kernel/arch/x86/kernel/cpu/centaur.c          |   1 +
 kernel/arch/x86/kernel/cpu/cpu.h              |   1 +
 kernel/arch/x86/kernel/cpu/cyrix.c            |   1 +
 kernel/arch/x86/kernel/cpu/intel.c            |   1 +
 kernel/arch/x86/kernel/cpu/intel_cacheinfo.c  |   1 +
 kernel/arch/x86/kernel/cpu/intel_rdt.h        |   1 +
 kernel/arch/x86/kernel/cpu/match.c            |   1 +
 kernel/arch/x86/kernel/cpu/mcheck/Makefile    |   1 +
 .../arch/x86/kernel/cpu/mcheck/dev-mcelog.c   | 117 ++++-------------
 .../arch/x86/kernel/cpu/mcheck/mce-internal.h |   1 +
 kernel/arch/x86/kernel/cpu/mcheck/mce_intel.c |   1 +
 kernel/arch/x86/kernel/cpu/mcheck/p5.c        |   1 +
 kernel/arch/x86/kernel/cpu/mcheck/threshold.c |   1 +
 kernel/arch/x86/kernel/cpu/mcheck/winchip.c   |   1 +
 kernel/arch/x86/kernel/cpu/mkcapflags.sh      |   1 +
 kernel/arch/x86/kernel/cpu/mtrr/amd.c         |   1 +
 kernel/arch/x86/kernel/cpu/mtrr/centaur.c     |   1 +
 kernel/arch/x86/kernel/cpu/mtrr/cyrix.c       |   1 +
 kernel/arch/x86/kernel/cpu/mtrr/if.c          |   1 +
 kernel/arch/x86/kernel/cpu/mtrr/mtrr.h        |   1 +
 kernel/arch/x86/kernel/cpu/perfctr-watchdog.c |   1 +
 kernel/arch/x86/kernel/cpu/powerflags.c       |   1 +
 kernel/arch/x86/kernel/cpu/proc.c             |  13 +-
 kernel/arch/x86/kernel/cpu/topology.c         |   1 +
 kernel/arch/x86/kernel/cpu/transmeta.c        |   1 +
 kernel/arch/x86/kernel/cpu/umc.c              |   1 +
 kernel/arch/x86/kernel/crash_dump_32.c        |   1 +
 kernel/arch/x86/kernel/crash_dump_64.c        |   1 +
 kernel/arch/x86/kernel/devicetree.c           |   1 +
 kernel/arch/x86/kernel/doublefault.c          |   1 +
 kernel/arch/x86/kernel/dumpstack_32.c         |   1 +
 kernel/arch/x86/kernel/dumpstack_64.c         |   1 +
 kernel/arch/x86/kernel/early-quirks.c         |   1 +
 kernel/arch/x86/kernel/early_printk.c         |   1 +
 kernel/arch/x86/kernel/ebda.c                 |   1 +
 kernel/arch/x86/kernel/fpu/bugs.c             |   1 +
 kernel/arch/x86/kernel/fpu/regset.c           |   1 +
 kernel/arch/x86/kernel/fpu/signal.c           |   1 +
 kernel/arch/x86/kernel/ftrace.c               |   1 +
 kernel/arch/x86/kernel/ftrace_32.S            |   1 +
 kernel/arch/x86/kernel/ftrace_64.S            |   1 +
 kernel/arch/x86/kernel/head32.c               |   1 +
 kernel/arch/x86/kernel/head64.c               |   1 +
 kernel/arch/x86/kernel/head_32.S              |   1 +
 kernel/arch/x86/kernel/head_64.S              |   1 +
 kernel/arch/x86/kernel/i8253.c                |   1 +
 kernel/arch/x86/kernel/i8259.c                |   1 +
 kernel/arch/x86/kernel/io_delay.c             |   1 +
 kernel/arch/x86/kernel/ioport.c               |   1 +
 kernel/arch/x86/kernel/irq_32.c               |   1 +
 kernel/arch/x86/kernel/irq_64.c               |   1 +
 kernel/arch/x86/kernel/irq_work.c             |   1 +
 kernel/arch/x86/kernel/irqinit.c              |   1 +
 kernel/arch/x86/kernel/jump_label.c           |   1 +
 kernel/arch/x86/kernel/kprobes/common.h       |   1 +
 kernel/arch/x86/kernel/kvmclock.c             |   2 +-
 kernel/arch/x86/kernel/ldt.c                  |   1 +
 kernel/arch/x86/kernel/mmconf-fam10h_64.c     |   1 +
 kernel/arch/x86/kernel/module.c               |  13 ++
 kernel/arch/x86/kernel/mpparse.c              |   1 +
 kernel/arch/x86/kernel/nmi_selftest.c         |   1 +
 kernel/arch/x86/kernel/paravirt-spinlocks.c   |   1 +
 kernel/arch/x86/kernel/paravirt_patch_32.c    |   1 +
 kernel/arch/x86/kernel/paravirt_patch_64.c    |   1 +
 kernel/arch/x86/kernel/pci-dma.c              |   1 +
 kernel/arch/x86/kernel/pci-iommu_table.c      |   1 +
 kernel/arch/x86/kernel/pci-nommu.c            |   1 +
 kernel/arch/x86/kernel/pci-swiotlb.c          |   1 +
 kernel/arch/x86/kernel/pcspeaker.c            |   1 +
 kernel/arch/x86/kernel/perf_regs.c            |   1 +
 kernel/arch/x86/kernel/platform-quirks.c      |   1 +
 kernel/arch/x86/kernel/pmem.c                 |   1 +
 kernel/arch/x86/kernel/probe_roms.c           |   1 +
 kernel/arch/x86/kernel/process.c              |   1 +
 kernel/arch/x86/kernel/quirks.c               |   1 +
 kernel/arch/x86/kernel/reboot.c               |   1 +
 kernel/arch/x86/kernel/reboot_fixups_32.c     |   1 +
 kernel/arch/x86/kernel/resource.c             |   1 +
 kernel/arch/x86/kernel/rtc.c                  |   1 +
 kernel/arch/x86/kernel/setup_percpu.c         |   1 +
 kernel/arch/x86/kernel/signal.c               |   1 +
 kernel/arch/x86/kernel/signal_compat.c        |   1 +
 kernel/arch/x86/kernel/step.c                 |   1 +
 kernel/arch/x86/kernel/sys_x86_64.c           |   1 +
 kernel/arch/x86/kernel/time.c                 |   1 +
 kernel/arch/x86/kernel/tls.c                  |   1 +
 kernel/arch/x86/kernel/trace_clock.c          |   1 +
 kernel/arch/x86/kernel/tracepoint.c           |   1 +
 kernel/arch/x86/kernel/tsc_sync.c             |   1 +
 kernel/arch/x86/kernel/vm86_32.c              |   1 +
 kernel/arch/x86/kernel/vmlinux.lds.S          |   1 +
 kernel/arch/x86/kvm/Kconfig                   |   1 +
 kernel/arch/x86/kvm/Makefile                  |   1 +
 kernel/arch/x86/kvm/cpuid.h                   |   1 +
 kernel/arch/x86/kvm/i8254.h                   |   1 +
 kernel/arch/x86/kvm/ioapic.h                  |   1 +
 kernel/arch/x86/kvm/kvm_cache_regs.h          |   1 +
 kernel/arch/x86/kvm/lapic.c                   |   5 +
 kernel/arch/x86/kvm/lapic.h                   |   1 +
 kernel/arch/x86/kvm/mmu.h                     |   1 +
 kernel/arch/x86/kvm/mmutrace.h                |   1 +
 kernel/arch/x86/kvm/pmu.h                     |   1 +
 kernel/arch/x86/kvm/trace.h                   |   1 +
 kernel/arch/x86/kvm/tss.h                     |   1 +
 kernel/arch/x86/kvm/vmx.c                     |   3 -
 kernel/arch/x86/kvm/x86.h                     |   1 +
 kernel/arch/x86/lib/Makefile                  |   1 +
 kernel/arch/x86/lib/cache-smp.c               |   1 +
 kernel/arch/x86/lib/copy_page_64.S            |   1 +
 kernel/arch/x86/lib/csum-partial_64.c         |   1 +
 kernel/arch/x86/lib/delay.c                   |   1 +
 kernel/arch/x86/lib/getuser.S                 |   1 +
 kernel/arch/x86/lib/hweight.S                 |   1 +
 kernel/arch/x86/lib/kaslr.c                   |   1 +
 kernel/arch/x86/lib/memcpy_32.c               |   1 +
 kernel/arch/x86/lib/memmove_64.S              |   1 +
 kernel/arch/x86/lib/memset_64.S               |   1 +
 kernel/arch/x86/lib/misc.c                    |   1 +
 kernel/arch/x86/lib/mmx_32.c                  |   1 +
 kernel/arch/x86/lib/msr-reg-export.c          |   1 +
 kernel/arch/x86/lib/msr-reg.S                 |   1 +
 kernel/arch/x86/lib/msr-smp.c                 |   1 +
 kernel/arch/x86/lib/msr.c                     |   1 +
 kernel/arch/x86/lib/putuser.S                 |   1 +
 kernel/arch/x86/lib/string_32.c               |   1 +
 kernel/arch/x86/lib/strstr_32.c               |   1 +
 kernel/arch/x86/lib/usercopy_32.c             |   1 +
 kernel/arch/x86/math-emu/Makefile             |   1 +
 kernel/arch/x86/math-emu/control_w.h          |   1 +
 kernel/arch/x86/math-emu/div_Xsig.S           |   1 +
 kernel/arch/x86/math-emu/div_small.S          |   1 +
 kernel/arch/x86/math-emu/errors.c             |   1 +
 kernel/arch/x86/math-emu/exception.h          |   1 +
 kernel/arch/x86/math-emu/fpu_arith.c          |   1 +
 kernel/arch/x86/math-emu/fpu_asm.h            |   1 +
 kernel/arch/x86/math-emu/fpu_aux.c            |   1 +
 kernel/arch/x86/math-emu/fpu_emu.h            |   1 +
 kernel/arch/x86/math-emu/fpu_entry.c          |   1 +
 kernel/arch/x86/math-emu/fpu_etc.c            |   1 +
 kernel/arch/x86/math-emu/fpu_proto.h          |   1 +
 kernel/arch/x86/math-emu/fpu_system.h         |   1 +
 kernel/arch/x86/math-emu/fpu_tags.c           |   1 +
 kernel/arch/x86/math-emu/fpu_trig.c           |   1 +
 kernel/arch/x86/math-emu/get_address.c        |   1 +
 kernel/arch/x86/math-emu/load_store.c         |   1 +
 kernel/arch/x86/math-emu/mul_Xsig.S           |   1 +
 kernel/arch/x86/math-emu/poly.h               |   1 +
 kernel/arch/x86/math-emu/poly_2xm1.c          |   1 +
 kernel/arch/x86/math-emu/poly_atan.c          |   1 +
 kernel/arch/x86/math-emu/poly_l2.c            |   1 +
 kernel/arch/x86/math-emu/poly_sin.c           |   1 +
 kernel/arch/x86/math-emu/poly_tan.c           |   1 +
 kernel/arch/x86/math-emu/polynom_Xsig.S       |   1 +
 kernel/arch/x86/math-emu/reg_add_sub.c        |   1 +
 kernel/arch/x86/math-emu/reg_compare.c        |   1 +
 kernel/arch/x86/math-emu/reg_constant.c       |   1 +
 kernel/arch/x86/math-emu/reg_constant.h       |   1 +
 kernel/arch/x86/math-emu/reg_convert.c        |   1 +
 kernel/arch/x86/math-emu/reg_divide.c         |   1 +
 kernel/arch/x86/math-emu/reg_ld_str.c         |   1 +
 kernel/arch/x86/math-emu/reg_mul.c            |   1 +
 kernel/arch/x86/math-emu/reg_norm.S           |   1 +
 kernel/arch/x86/math-emu/reg_round.S          |   1 +
 kernel/arch/x86/math-emu/reg_u_add.S          |   1 +
 kernel/arch/x86/math-emu/reg_u_div.S          |   1 +
 kernel/arch/x86/math-emu/reg_u_mul.S          |   1 +
 kernel/arch/x86/math-emu/reg_u_sub.S          |   1 +
 kernel/arch/x86/math-emu/round_Xsig.S         |   1 +
 kernel/arch/x86/math-emu/shr_Xsig.S           |   1 +
 kernel/arch/x86/math-emu/status_w.h           |   1 +
 kernel/arch/x86/math-emu/wm_shrx.S            |   1 +
 kernel/arch/x86/math-emu/wm_sqrt.S            |   1 +
 kernel/arch/x86/mm/Makefile                   |   1 +
 kernel/arch/x86/mm/amdtopology.c              |   1 +
 kernel/arch/x86/mm/fault.c                    |  12 +-
 kernel/arch/x86/mm/hugetlbpage.c              |   1 +
 kernel/arch/x86/mm/ident_map.c                |   1 +
 kernel/arch/x86/mm/kasan_init_64.c            |   1 +
 kernel/arch/x86/mm/kaslr.c                    |   1 +
 kernel/arch/x86/mm/kmemcheck/error.c          |   1 +
 kernel/arch/x86/mm/kmemcheck/error.h          |   1 +
 kernel/arch/x86/mm/kmemcheck/opcode.c         |   1 +
 kernel/arch/x86/mm/kmemcheck/opcode.h         |   1 +
 kernel/arch/x86/mm/kmemcheck/pte.c            |   1 +
 kernel/arch/x86/mm/kmemcheck/pte.h            |   1 +
 kernel/arch/x86/mm/kmemcheck/selftest.c       |   1 +
 kernel/arch/x86/mm/kmemcheck/selftest.h       |   1 +
 kernel/arch/x86/mm/kmemcheck/shadow.h         |   1 +
 kernel/arch/x86/mm/kmmio.c                    |   1 +
 kernel/arch/x86/mm/mm_internal.h              |   1 +
 kernel/arch/x86/mm/mpx.c                      |   1 +
 kernel/arch/x86/mm/numa_64.c                  |   1 +
 kernel/arch/x86/mm/numa_emulation.c           |   1 +
 kernel/arch/x86/mm/numa_internal.h            |   1 +
 kernel/arch/x86/mm/pageattr-test.c            |   1 +
 kernel/arch/x86/mm/pat_internal.h             |   1 +
 kernel/arch/x86/mm/pat_rbtree.c               |   1 +
 kernel/arch/x86/mm/pgtable.c                  |   1 +
 kernel/arch/x86/mm/pgtable_32.c               |   1 +
 kernel/arch/x86/mm/physaddr.c                 |   1 +
 kernel/arch/x86/mm/physaddr.h                 |   1 +
 kernel/arch/x86/mm/setup_nx.c                 |   1 +
 kernel/arch/x86/mm/srat.c                     |   1 +
 kernel/arch/x86/mm/tlb.c                      |  17 ++-
 kernel/arch/x86/oprofile/Makefile             |   1 +
 kernel/arch/x86/pci/Makefile                  |   1 +
 kernel/arch/x86/pci/acpi.c                    |   1 +
 kernel/arch/x86/pci/amd_bus.c                 |   1 +
 kernel/arch/x86/pci/bus_numa.c                |   1 +
 kernel/arch/x86/pci/bus_numa.h                |   1 +
 kernel/arch/x86/pci/direct.c                  |   1 +
 kernel/arch/x86/pci/early.c                   |   1 +
 kernel/arch/x86/pci/fixup.c                   |   1 +
 kernel/arch/x86/pci/i386.c                    |   1 +
 kernel/arch/x86/pci/init.c                    |   1 +
 kernel/arch/x86/pci/intel_mid_pci.c           |   1 +
 kernel/arch/x86/pci/irq.c                     |   1 +
 kernel/arch/x86/pci/mmconfig-shared.c         |   1 +
 kernel/arch/x86/pci/mmconfig_64.c             |   1 +
 kernel/arch/x86/pci/pcbios.c                  |   1 +
 kernel/arch/x86/platform/Makefile             |   1 +
 kernel/arch/x86/platform/efi/Makefile         |   1 +
 kernel/arch/x86/platform/efi/efi.c            |   1 +
 kernel/arch/x86/platform/efi/efi_32.c         |   1 +
 kernel/arch/x86/platform/efi/efi_64.c         |   1 +
 kernel/arch/x86/platform/efi/efi_stub_32.S    |   1 +
 kernel/arch/x86/platform/efi/efi_stub_64.S    |   1 +
 kernel/arch/x86/platform/efi/efi_thunk_64.S   |   1 +
 .../platform/intel-mid/device_libs/Makefile   |   1 +
 .../x86/platform/intel-quark/imr_selftest.c   |   1 +
 kernel/arch/x86/platform/olpc/Makefile        |   1 +
 kernel/arch/x86/platform/olpc/xo1-wakeup.S    |   1 +
 kernel/arch/x86/power/Makefile                |   1 +
 kernel/arch/x86/power/hibernate_asm_32.S      |   1 +
 kernel/arch/x86/purgatory/Makefile            |   1 +
 kernel/arch/x86/ras/Kconfig                   |   1 +
 kernel/arch/x86/realmode/init.c               |   1 +
 kernel/arch/x86/realmode/rm/header.S          |   1 +
 kernel/arch/x86/realmode/rm/realmode.h        |   1 +
 kernel/arch/x86/realmode/rm/realmode.lds.S    |   1 +
 kernel/arch/x86/realmode/rm/reboot.S          |   1 +
 kernel/arch/x86/realmode/rm/stack.S           |   1 +
 kernel/arch/x86/realmode/rm/trampoline_32.S   |   1 +
 kernel/arch/x86/realmode/rm/trampoline_64.S   |   1 +
 .../arch/x86/realmode/rm/trampoline_common.S  |   1 +
 kernel/arch/x86/realmode/rm/wakemain.c        |   1 +
 kernel/arch/x86/realmode/rm/wakeup.h          |   1 +
 kernel/arch/x86/realmode/rm/wakeup_asm.S      |   1 +
 kernel/arch/x86/realmode/rmpiggy.S            |   1 +
 kernel/arch/x86/tools/Makefile                |   1 +
 kernel/arch/x86/tools/distill.awk             |   1 +
 kernel/arch/x86/tools/gen-insn-attr-x86.awk   |   1 +
 kernel/arch/x86/tools/relocs.c                |   1 +
 kernel/arch/x86/tools/relocs.h                |   1 +
 kernel/arch/x86/tools/relocs_32.c             |   1 +
 kernel/arch/x86/tools/relocs_64.c             |   1 +
 kernel/arch/x86/tools/relocs_common.c         |   1 +
 kernel/arch/x86/um/Kconfig                    |   1 +
 kernel/arch/x86/um/Makefile                   |   1 +
 kernel/arch/x86/um/asm/arch_hweight.h         |   1 +
 kernel/arch/x86/um/asm/barrier.h              |   1 +
 kernel/arch/x86/um/asm/checksum.h             |   1 +
 kernel/arch/x86/um/asm/desc.h                 |   1 +
 kernel/arch/x86/um/asm/module.h               |   1 +
 kernel/arch/x86/um/asm/processor.h            |   1 +
 kernel/arch/x86/um/asm/ptrace.h               |   1 +
 kernel/arch/x86/um/asm/segment.h              |   1 +
 kernel/arch/x86/um/asm/syscall.h              |   1 +
 kernel/arch/x86/um/elfcore.c                  |   1 +
 kernel/arch/x86/um/mem_64.c                   |   1 +
 kernel/arch/x86/um/os-Linux/mcontext.c        |   1 +
 kernel/arch/x86/um/os-Linux/task_size.c       |   1 +
 kernel/arch/x86/um/os-Linux/tls.c             |   1 +
 kernel/arch/x86/um/setjmp_32.S                |   1 +
 kernel/arch/x86/um/setjmp_64.S                |   1 +
 kernel/arch/x86/um/shared/sysdep/archsetjmp.h |   1 +
 .../arch/x86/um/shared/sysdep/archsetjmp_32.h |   1 +
 .../arch/x86/um/shared/sysdep/archsetjmp_64.h |   1 +
 kernel/arch/x86/um/shared/sysdep/faultinfo.h  |   1 +
 .../x86/um/shared/sysdep/kernel-offsets.h     |   1 +
 kernel/arch/x86/um/shared/sysdep/ptrace.h     |   1 +
 .../arch/x86/um/shared/sysdep/ptrace_user.h   |   1 +
 kernel/arch/x86/um/shared/sysdep/stub.h       |   1 +
 kernel/arch/x86/um/shared/sysdep/syscalls.h   |   1 +
 kernel/arch/x86/um/shared/sysdep/tls.h        |   1 +
 kernel/arch/x86/um/stub_32.S                  |   1 +
 kernel/arch/x86/um/stub_64.S                  |   1 +
 kernel/arch/x86/um/sys_call_table_32.c        |   1 +
 kernel/arch/x86/um/sys_call_table_64.c        |   1 +
 kernel/arch/x86/um/syscalls_32.c              |   1 +
 kernel/arch/x86/um/tls_64.c                   |   1 +
 kernel/arch/x86/um/user-offsets.c             |   1 +
 kernel/arch/x86/um/vdso/Makefile              |   1 +
 kernel/arch/x86/um/vdso/checkundef.sh         |   1 +
 kernel/arch/x86/um/vdso/vdso-layout.lds.S     |   1 +
 kernel/arch/x86/um/vdso/vdso.S                |   1 +
 kernel/arch/x86/um/vdso/vdso.lds.S            |   1 +
 kernel/arch/x86/xen/Kconfig                   |   1 +
 kernel/arch/x86/xen/Makefile                  |   1 +
 kernel/arch/x86/xen/apic.c                    |   1 +
 kernel/arch/x86/xen/debugfs.c                 |   1 +
 kernel/arch/x86/xen/debugfs.h                 |   1 +
 kernel/arch/x86/xen/enlighten_pv.c            |   1 +
 kernel/arch/x86/xen/enlighten_pvh.c           |   1 +
 kernel/arch/x86/xen/irq.c                     |   1 +
 kernel/arch/x86/xen/mmu.h                     |   1 +
 kernel/arch/x86/xen/mmu_hvm.c                 |   1 +
 kernel/arch/x86/xen/multicalls.c              |   1 +
 kernel/arch/x86/xen/multicalls.h              |   1 +
 kernel/arch/x86/xen/pmu.c                     |   1 +
 kernel/arch/x86/xen/pmu.h                     |   1 +
 kernel/arch/x86/xen/setup.c                   |   1 +
 kernel/arch/x86/xen/smp.c                     |   1 +
 kernel/arch/x86/xen/smp.h                     |   1 +
 kernel/arch/x86/xen/smp_hvm.c                 |   1 +
 kernel/arch/x86/xen/smp_pv.c                  |   1 +
 kernel/arch/x86/xen/spinlock.c                |   1 +
 kernel/arch/x86/xen/suspend.c                 |   1 +
 kernel/arch/x86/xen/suspend_hvm.c             |   1 +
 kernel/arch/x86/xen/suspend_pv.c              |   1 +
 kernel/arch/x86/xen/time.c                    |   1 +
 kernel/arch/x86/xen/trace.c                   |   1 +
 kernel/arch/x86/xen/vga.c                     |   1 +
 kernel/arch/x86/xen/xen-asm.S                 |   1 +
 kernel/arch/x86/xen/xen-asm_32.S              |   1 +
 kernel/arch/x86/xen/xen-asm_64.S              |   1 +
 kernel/arch/x86/xen/xen-head.S                |   1 +
 kernel/arch/x86/xen/xen-ops.h                 |   1 +
 kernel/arch/xtensa/Kconfig                    |   1 +
 kernel/arch/xtensa/Kconfig.debug              |   1 +
 .../arch/xtensa/boot/boot-redboot/bootstrap.S |   1 +
 kernel/arch/xtensa/boot/dts/csp.dts           |   1 +
 kernel/arch/xtensa/boot/dts/kc705.dts         |   1 +
 kernel/arch/xtensa/boot/dts/kc705_nommu.dts   |   1 +
 kernel/arch/xtensa/boot/dts/lx200mx.dts       |   1 +
 kernel/arch/xtensa/boot/dts/lx60.dts          |   1 +
 kernel/arch/xtensa/boot/dts/ml605.dts         |   1 +
 .../xtensa/boot/dts/xtfpga-flash-128m.dtsi    |   1 +
 .../xtensa/boot/dts/xtfpga-flash-16m.dtsi     |   1 +
 .../arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi |   1 +
 kernel/arch/xtensa/boot/dts/xtfpga.dtsi       |   1 +
 kernel/arch/xtensa/boot/lib/Makefile          |   1 +
 kernel/arch/xtensa/boot/lib/zmem.c            |   1 +
 kernel/arch/xtensa/include/asm/flat.h         |   1 +
 .../arch/xtensa/include/asm/nommu_context.h   |   1 +
 .../arch/xtensa/include/asm/spinlock_types.h  |   1 +
 kernel/arch/xtensa/include/asm/unistd.h       |   1 +
 .../arch/xtensa/include/uapi/asm/byteorder.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/ioctls.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/ipcbuf.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/mman.h    |   1 +
 kernel/arch/xtensa/include/uapi/asm/msgbuf.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/param.h   |   1 +
 kernel/arch/xtensa/include/uapi/asm/poll.h    |   1 +
 .../xtensa/include/uapi/asm/posix_types.h     |   1 +
 kernel/arch/xtensa/include/uapi/asm/ptrace.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/sembuf.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/setup.h   |   1 +
 kernel/arch/xtensa/include/uapi/asm/shmbuf.h  |   1 +
 .../arch/xtensa/include/uapi/asm/sigcontext.h |   1 +
 kernel/arch/xtensa/include/uapi/asm/signal.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/socket.h  |   1 +
 kernel/arch/xtensa/include/uapi/asm/sockios.h |   1 +
 kernel/arch/xtensa/include/uapi/asm/stat.h    |   1 +
 kernel/arch/xtensa/include/uapi/asm/swab.h    |   1 +
 .../arch/xtensa/include/uapi/asm/termbits.h   |   1 +
 kernel/arch/xtensa/include/uapi/asm/types.h   |   1 +
 kernel/arch/xtensa/include/uapi/asm/unistd.h  |   1 +
 kernel/arch/xtensa/kernel/Makefile            |   1 +
 kernel/arch/xtensa/kernel/irq.c               |   1 +
 kernel/arch/xtensa/mm/mmu.c                   |   1 +
 kernel/arch/xtensa/oprofile/Makefile          |   1 +
 kernel/block/Kconfig                          |   1 +
 kernel/block/Kconfig.iosched                  |   1 +
 kernel/block/Makefile                         |   1 +
 kernel/block/blk-ioc.c                        |   1 +
 kernel/block/blk-lib.c                        |   1 +
 kernel/block/blk-map.c                        |   1 +
 kernel/block/blk-merge.c                      |   1 +
 kernel/block/blk-mq-debugfs.h                 |   1 +
 kernel/block/blk-mq-sched.h                   |   1 +
 kernel/block/blk-mq-tag.h                     |   1 +
 kernel/block/blk-mq.h                         |   1 +
 kernel/block/blk-softirq.c                    |   1 +
 kernel/block/blk-stat.h                       |   1 +
 kernel/block/blk-sysfs.c                      |   1 +
 kernel/block/blk-tag.c                        |   1 +
 kernel/block/blk-throttle.c                   |   1 +
 kernel/block/blk-wbt.h                        |   1 +
 kernel/block/blk.h                            |   1 +
 kernel/block/bounce.c                         |   1 +
 kernel/block/cmdline-parser.c                 |   1 +
 kernel/block/compat_ioctl.c                   |   1 +
 kernel/block/partition-generic.c              |   1 +
 kernel/block/partitions/Kconfig               |   1 +
 kernel/block/partitions/Makefile              |   1 +
 kernel/block/partitions/acorn.h               |   1 +
 kernel/block/partitions/aix.c                 |   1 +
 kernel/block/partitions/amiga.c               |   1 +
 kernel/block/partitions/atari.c               |   1 +
 kernel/block/partitions/atari.h               |   1 +
 kernel/block/partitions/check.c               |   1 +
 kernel/block/partitions/check.h               |   1 +
 kernel/block/partitions/cmdline.c             |   1 +
 kernel/block/partitions/cmdline.h             |   1 +
 kernel/block/partitions/ibm.c                 |   1 +
 kernel/block/partitions/karma.c               |   1 +
 kernel/block/partitions/mac.c                 |   1 +
 kernel/block/partitions/mac.h                 |   1 +
 kernel/block/partitions/msdos.c               |   1 +
 kernel/block/partitions/osf.c                 |   1 +
 kernel/block/partitions/sgi.c                 |   1 +
 kernel/block/partitions/sun.c                 |   1 +
 kernel/block/partitions/sysv68.c              |   1 +
 kernel/block/partitions/ultrix.c              |   1 +
 kernel/certs/Kconfig                          |   1 +
 kernel/certs/Makefile                         |   1 +
 kernel/certs/blacklist_hashes.c               |   1 +
 kernel/certs/blacklist_nohashes.c             |   1 +
 kernel/certs/system_certificates.S            |   1 +
 kernel/crypto/Kconfig                         |   1 +
 kernel/crypto/Makefile                        |   1 +
 kernel/crypto/asymmetric_keys/Kconfig         |   1 +
 kernel/crypto/asymmetric_keys/Makefile        |   1 +
 kernel/crypto/async_tx/Kconfig                |   1 +
 kernel/crypto/async_tx/Makefile               |   1 +
 kernel/crypto/ecc_curve_defs.h                |   1 +
 kernel/crypto/ripemd.h                        |   1 +
 kernel/drivers/Kconfig                        |   1 +
 kernel/drivers/Makefile                       |   1 +
 kernel/drivers/accessibility/Kconfig          |   1 +
 kernel/drivers/acpi/Kconfig                   |   1 +
 kernel/drivers/acpi/Makefile                  |   1 +
 kernel/drivers/acpi/acpica/Makefile           |   1 +
 kernel/drivers/acpi/apei/Kconfig              |   1 +
 kernel/drivers/acpi/apei/Makefile             |   1 +
 kernel/drivers/acpi/apei/apei-internal.h      |   1 +
 kernel/drivers/acpi/battery.h                 |   1 +
 kernel/drivers/acpi/dptf/Kconfig              |   1 +
 kernel/drivers/acpi/event.c                   |   1 +
 kernel/drivers/acpi/nfit/Kconfig              |   1 +
 kernel/drivers/acpi/pmic/intel_pmic.h         |   1 +
 kernel/drivers/acpi/proc.c                    |   1 +
 kernel/drivers/acpi/processor_idle.c          |   2 +
 kernel/drivers/acpi/processor_pdc.c           |   1 +
 kernel/drivers/acpi/reboot.c                  |   1 +
 kernel/drivers/acpi/sbshc.h                   |   1 +
 kernel/drivers/acpi/sleep.h                   |   1 +
 kernel/drivers/acpi/sysfs.c                   |   1 +
 kernel/drivers/acpi/wakeup.c                  |   1 +
 kernel/drivers/amba/Kconfig                   |   1 +
 kernel/drivers/android/Kconfig                |   1 +
 kernel/drivers/ata/Kconfig                    |   1 +
 kernel/drivers/ata/Makefile                   |   1 +
 kernel/drivers/ata/libata-transport.h         |   1 +
 kernel/drivers/ata/libata-zpodd.c             |   1 +
 kernel/drivers/ata/sata_gemini.h              |   1 +
 kernel/drivers/ata/sis.h                      |   1 +
 kernel/drivers/atm/Kconfig                    |   1 +
 kernel/drivers/atm/Makefile                   |   1 +
 kernel/drivers/atm/eni.h                      |   1 +
 kernel/drivers/atm/fore200e.h                 |   1 +
 kernel/drivers/atm/idt77105.h                 |   1 +
 kernel/drivers/atm/idt77252_tables.h          |   1 +
 kernel/drivers/atm/midway.h                   |   1 +
 kernel/drivers/atm/nicstar.h                  |   1 +
 kernel/drivers/atm/nicstarmac.c               |   1 +
 kernel/drivers/atm/solos-attrlist.c           |   1 +
 kernel/drivers/atm/suni.h                     |   1 +
 kernel/drivers/atm/tonga.h                    |   1 +
 kernel/drivers/atm/uPD98401.h                 |   1 +
 kernel/drivers/atm/uPD98402.h                 |   1 +
 kernel/drivers/atm/zatm.h                     |   1 +
 kernel/drivers/atm/zeprom.h                   |   1 +
 kernel/drivers/auxdisplay/Kconfig             |   1 +
 kernel/drivers/auxdisplay/Makefile            |   1 +
 kernel/drivers/auxdisplay/img-ascii-lcd.c     |   2 +-
 kernel/drivers/base/Kconfig                   |   1 +
 kernel/drivers/base/Makefile                  |   1 +
 kernel/drivers/base/base.h                    |   1 +
 kernel/drivers/base/cpu.c                     |   3 +-
 kernel/drivers/base/devtmpfs.c                |   1 +
 kernel/drivers/base/dma-coherent.c            |   1 +
 kernel/drivers/base/memory.c                  |   1 +
 kernel/drivers/base/node.c                    |   1 +
 kernel/drivers/base/power/Makefile            |   1 +
 kernel/drivers/base/power/domain_governor.c   |  53 ++++----
 kernel/drivers/base/power/power.h             |   1 +
 kernel/drivers/base/power/qos.c               |   2 +-
 kernel/drivers/base/power/runtime.c           |   2 +-
 kernel/drivers/base/power/sysfs.c             |  27 +---
 kernel/drivers/base/regmap/Kconfig            |   1 +
 kernel/drivers/base/regmap/Makefile           |   1 +
 kernel/drivers/base/regmap/trace.h            |   1 +
 kernel/drivers/base/test/Kconfig              |   1 +
 kernel/drivers/bcma/Kconfig                   |   1 +
 kernel/drivers/bcma/Makefile                  |   1 +
 kernel/drivers/bcma/bcma_private.h            |   1 +
 kernel/drivers/bcma/scan.h                    |   1 +
 kernel/drivers/block/Kconfig                  |   1 +
 kernel/drivers/block/Makefile                 |   1 +
 kernel/drivers/block/drbd/Kconfig             |   1 +
 kernel/drivers/block/drbd/Makefile            |   1 +
 kernel/drivers/block/drbd/drbd_debugfs.c      |   1 +
 kernel/drivers/block/drbd/drbd_debugfs.h      |   1 +
 kernel/drivers/block/drbd/drbd_interval.c     |   1 +
 kernel/drivers/block/drbd/drbd_interval.h     |   1 +
 kernel/drivers/block/drbd/drbd_nla.c          |   1 +
 kernel/drivers/block/drbd/drbd_nla.h          |   1 +
 kernel/drivers/block/drbd/drbd_protocol.h     |   1 +
 kernel/drivers/block/drbd/drbd_state.h        |   1 +
 kernel/drivers/block/drbd/drbd_state_change.h |   1 +
 kernel/drivers/block/drbd/drbd_strings.h      |   1 +
 kernel/drivers/block/mtip32xx/Kconfig         |   1 +
 kernel/drivers/block/paride/Kconfig           |   1 +
 kernel/drivers/block/paride/Makefile          |   1 +
 kernel/drivers/block/paride/mkd               |   1 +
 kernel/drivers/block/virtio_blk.c             |  12 ++
 kernel/drivers/block/zram/Kconfig             |   1 +
 kernel/drivers/bluetooth/Kconfig              |   1 +
 kernel/drivers/bluetooth/Makefile             |   1 +
 kernel/drivers/bus/Kconfig                    |   1 +
 kernel/drivers/bus/Makefile                   |   1 +
 kernel/drivers/cdrom/Makefile                 |   1 +
 kernel/drivers/char/Kconfig                   |   1 +
 kernel/drivers/char/Makefile                  |   1 +
 kernel/drivers/char/agp/Kconfig               |   1 +
 kernel/drivers/char/agp/Makefile              |   1 +
 kernel/drivers/char/agp/intel-agp.h           |   1 +
 kernel/drivers/char/agp/isoch.c               |   1 +
 kernel/drivers/char/applicom.h                |   1 +
 kernel/drivers/char/ds1302.c                  |   1 +
 kernel/drivers/char/hw_random/Makefile        |   1 +
 kernel/drivers/char/hw_random/n2-asm.S        |   1 +
 kernel/drivers/char/hw_random/n2rng.h         |   1 +
 kernel/drivers/char/ipmi/Makefile             |   1 +
 kernel/drivers/char/ipmi/ipmi_dmi.c           |   1 +
 kernel/drivers/char/ipmi/ipmi_dmi.h           |   1 +
 kernel/drivers/char/mem.c                     |   1 +
 kernel/drivers/char/misc.c                    |   1 +
 kernel/drivers/char/nwbutton.h                |   1 +
 kernel/drivers/char/pcmcia/cm4040_cs.h        |   1 +
 kernel/drivers/char/tpm/Makefile              |   1 +
 kernel/drivers/char/tpm/st33zp24/Makefile     |   1 +
 kernel/drivers/char/tpm/tpm-dev.h             |   1 +
 kernel/drivers/char/tpm/tpm_eventlog.h        |   1 +
 kernel/drivers/clk/Makefile                   |   1 +
 kernel/drivers/clk/at91/Makefile              |   1 +
 kernel/drivers/clk/bcm/Makefile               |   1 +
 kernel/drivers/clk/clk-gemini.c               |   1 +
 kernel/drivers/clk/clk-tango4.c               |   1 +
 kernel/drivers/clk/h8300/clk-div.c            |   1 +
 kernel/drivers/clk/h8300/clk-h8s2678.c        |   1 +
 kernel/drivers/clk/hisilicon/Makefile         |   1 +
 kernel/drivers/clk/imgtec/clk-boston.c        |   2 +-
 kernel/drivers/clk/imx/Makefile               |   1 +
 kernel/drivers/clk/imx/clk-imx27.c            |   1 +
 kernel/drivers/clk/imx/clk-pllv1.c            |   1 +
 kernel/drivers/clk/imx/clk-pllv2.c            |   1 +
 kernel/drivers/clk/imx/clk.c                  |   1 +
 kernel/drivers/clk/imx/clk.h                  |   1 +
 kernel/drivers/clk/ingenic/cgu.c              |   2 +-
 kernel/drivers/clk/ingenic/cgu.h              |   2 +-
 kernel/drivers/clk/ingenic/jz4740-cgu.c       |   2 +-
 kernel/drivers/clk/ingenic/jz4780-cgu.c       |   2 +-
 kernel/drivers/clk/mediatek/Makefile          |   1 +
 kernel/drivers/clk/mmp/Makefile               |   1 +
 kernel/drivers/clk/mmp/clk.c                  |   1 +
 kernel/drivers/clk/mmp/clk.h                  |   1 +
 kernel/drivers/clk/mmp/reset.c                |   1 +
 kernel/drivers/clk/mmp/reset.h                |   1 +
 kernel/drivers/clk/mvebu/Makefile             |   1 +
 kernel/drivers/clk/mvebu/dove-divider.c       |   1 +
 kernel/drivers/clk/mvebu/dove-divider.h       |   1 +
 kernel/drivers/clk/qcom/Makefile              |   1 +
 kernel/drivers/clk/renesas/Makefile           |   1 +
 kernel/drivers/clk/renesas/clk-div6.h         |   1 +
 kernel/drivers/clk/rockchip/Makefile          |   1 +
 kernel/drivers/clk/samsung/Makefile           |   1 +
 kernel/drivers/clk/sirf/atlas6.h              |   1 +
 kernel/drivers/clk/sirf/prima2.h              |   1 +
 kernel/drivers/clk/socfpga/Makefile           |   1 +
 kernel/drivers/clk/spear/Makefile             |   1 +
 kernel/drivers/clk/st/clkgen.h                |   1 +
 kernel/drivers/clk/sunxi-ng/Makefile          |   1 +
 kernel/drivers/clk/sunxi-ng/ccu_mult.h        |   1 +
 kernel/drivers/clk/sunxi-ng/ccu_mux.h         |   1 +
 kernel/drivers/clk/sunxi/Makefile             |   1 +
 kernel/drivers/clk/sunxi/clk-factors.h        |   1 +
 kernel/drivers/clk/sunxi/clk-sun9i-cpus.c     |   1 +
 kernel/drivers/clk/tegra/Makefile             |   1 +
 kernel/drivers/clk/tegra/clk-id.h             |   1 +
 kernel/drivers/clk/ti/Makefile                |   1 +
 kernel/drivers/clk/uniphier/Makefile          |   1 +
 .../drivers/clk/uniphier/clk-uniphier-sys.c   |   6 +-
 kernel/drivers/clk/ux500/Makefile             |   1 +
 kernel/drivers/clk/versatile/clk-icst.h       |   1 +
 kernel/drivers/clocksource/Makefile           |   1 +
 kernel/drivers/clocksource/h8300_timer16.c    |   1 +
 kernel/drivers/clocksource/h8300_timer8.c     |   1 +
 kernel/drivers/clocksource/h8300_tpu.c        |   1 +
 kernel/drivers/clocksource/i8253.c            |   1 +
 kernel/drivers/clocksource/tango_xtal.c       |   1 +
 kernel/drivers/clocksource/tcb_clksrc.c       |   1 +
 kernel/drivers/clocksource/timer-fttmr010.c   |   1 +
 kernel/drivers/clocksource/timer-of.h         |   1 +
 kernel/drivers/clocksource/timer-sp.h         |   1 +
 kernel/drivers/cpufreq/Makefile               |   1 +
 kernel/drivers/cpufreq/cris-artpec3-cpufreq.c |   1 +
 kernel/drivers/cpufreq/cris-etraxfs-cpufreq.c |   1 +
 kernel/drivers/cpufreq/ppc_cbe_cpufreq.h      |   1 +
 kernel/drivers/cpuidle/Makefile               |   1 +
 kernel/drivers/cpuidle/cpuidle-cps.c          |   2 +-
 kernel/drivers/cpuidle/cpuidle-powernv.c      |   1 +
 kernel/drivers/cpuidle/cpuidle-pseries.c      |   1 +
 kernel/drivers/cpuidle/cpuidle.h              |   1 +
 kernel/drivers/cpuidle/dt_idle_states.h       |   1 +
 kernel/drivers/cpuidle/governors/menu.c       |   4 +-
 kernel/drivers/crypto/Makefile                |   1 +
 kernel/drivers/crypto/atmel-aes-regs.h        |   1 +
 kernel/drivers/crypto/atmel-sha-regs.h        |   1 +
 kernel/drivers/crypto/atmel-tdes-regs.h       |   1 +
 kernel/drivers/crypto/caam/Makefile           |   1 +
 kernel/drivers/crypto/caam/caamalg_desc.h     |   1 +
 kernel/drivers/crypto/caam/caampkc.h          |   1 +
 kernel/drivers/crypto/caam/compat.h           |   1 +
 kernel/drivers/crypto/caam/ctrl.h             |   1 +
 kernel/drivers/crypto/caam/desc.h             |   1 +
 kernel/drivers/crypto/caam/desc_constr.h      |   1 +
 kernel/drivers/crypto/caam/error.c            |   1 +
 kernel/drivers/crypto/caam/error.h            |   1 +
 kernel/drivers/crypto/caam/intern.h           |   1 +
 kernel/drivers/crypto/caam/jr.h               |   1 +
 kernel/drivers/crypto/caam/key_gen.c          |   1 +
 kernel/drivers/crypto/caam/key_gen.h          |   1 +
 kernel/drivers/crypto/caam/pdb.h              |   1 +
 kernel/drivers/crypto/caam/pkc_desc.c         |   1 +
 kernel/drivers/crypto/caam/qi.c               |   1 +
 kernel/drivers/crypto/caam/qi.h               |   1 +
 kernel/drivers/crypto/caam/regs.h             |   1 +
 kernel/drivers/crypto/caam/sg_sw_sec4.h       |   1 +
 kernel/drivers/crypto/cavium/nitrox/Makefile  |   1 +
 .../crypto/cavium/nitrox/nitrox_algs.c        |   1 +
 .../crypto/cavium/nitrox/nitrox_common.h      |   1 +
 .../drivers/crypto/cavium/nitrox/nitrox_csr.h |   1 +
 .../drivers/crypto/cavium/nitrox/nitrox_dev.h |   1 +
 .../drivers/crypto/cavium/nitrox/nitrox_hal.c |   1 +
 .../drivers/crypto/cavium/nitrox/nitrox_isr.c |   1 +
 .../drivers/crypto/cavium/nitrox/nitrox_lib.c |   1 +
 .../drivers/crypto/cavium/nitrox/nitrox_req.h |   1 +
 .../crypto/cavium/nitrox/nitrox_reqmgr.c      |   1 +
 kernel/drivers/crypto/cavium/zip/Makefile     |   1 +
 kernel/drivers/crypto/ccp/Makefile            |   1 +
 kernel/drivers/crypto/marvell/cesa.h          |   1 +
 kernel/drivers/crypto/mv_cesa.h               |   1 +
 kernel/drivers/crypto/n2_asm.S                |   1 +
 kernel/drivers/crypto/n2_core.h               |   1 +
 kernel/drivers/crypto/nx/Makefile             |   1 +
 kernel/drivers/crypto/nx/nx-842.h             |   1 +
 kernel/drivers/crypto/nx/nx.h                 |   1 +
 kernel/drivers/crypto/nx/nx_csbcpb.h          |   1 +
 kernel/drivers/crypto/qat/Makefile            |   1 +
 kernel/drivers/crypto/qat/qat_common/Makefile |   1 +
 kernel/drivers/crypto/qce/Makefile            |   1 +
 .../drivers/crypto/rockchip/rk3288_crypto.h   |   1 +
 kernel/drivers/crypto/virtio/Makefile         |   1 +
 kernel/drivers/crypto/vmx/Makefile            |   1 +
 kernel/drivers/crypto/vmx/aesp8-ppc.h         |   1 +
 kernel/drivers/crypto/vmx/ppc-xlate.pl        |   1 +
 kernel/drivers/dax/Makefile                   |   1 +
 kernel/drivers/devfreq/Makefile               |   1 +
 kernel/drivers/dio/dio.c                      |   1 +
 kernel/drivers/dma-buf/sync_trace.h           |   1 +
 kernel/drivers/dma/Makefile                   |   1 +
 kernel/drivers/dma/bestcomm/Makefile          |   1 +
 kernel/drivers/dma/dmaengine.h                |   1 +
 kernel/drivers/dma/dw/Makefile                |   1 +
 kernel/drivers/dma/qcom/Makefile              |   1 +
 kernel/drivers/dma/sh/Makefile                |   1 +
 kernel/drivers/edac/amd64_edac_dbg.c          |   1 +
 kernel/drivers/edac/amd64_edac_inj.c          |   1 +
 kernel/drivers/edac/edac_module.h             |   1 +
 kernel/drivers/edac/mce_amd.h                 |   1 +
 kernel/drivers/eisa/Makefile                  |   1 +
 kernel/drivers/extcon/Makefile                |   1 +
 kernel/drivers/extcon/extcon.h                |   1 +
 kernel/drivers/firewire/Makefile              |   1 +
 kernel/drivers/firewire/core.h                |   1 +
 kernel/drivers/firewire/nosy-user.h           |   1 +
 kernel/drivers/firewire/nosy.h                |   1 +
 kernel/drivers/firewire/ohci.h                |   1 +
 kernel/drivers/firmware/Makefile              |   1 +
 kernel/drivers/firmware/efi/Makefile          |   1 +
 kernel/drivers/firmware/efi/libstub/Makefile  |   7 +-
 .../drivers/firmware/efi/libstub/arm-stub.c   |   7 +-
 kernel/drivers/firmware/efi/libstub/efistub.h |   1 +
 kernel/drivers/firmware/efi/libstub/string.c  |   1 +
 kernel/drivers/firmware/efi/memmap.c          |   1 +
 kernel/drivers/firmware/efi/reboot.c          |   1 +
 kernel/drivers/firmware/efi/test/efi_test.h   |   1 +
 kernel/drivers/firmware/google/Makefile       |   1 +
 kernel/drivers/fmc/Makefile                   |   1 +
 kernel/drivers/fpga/Makefile                  |   1 +
 kernel/drivers/gpio/Makefile                  |   1 +
 kernel/drivers/gpio/gpio-etraxfs.c            |   1 +
 kernel/drivers/gpio/gpio-ftgpio010.c          |   1 +
 kernel/drivers/gpu/drm/Makefile               |   1 +
 kernel/drivers/gpu/drm/amd/amdgpu/Makefile    |   1 +
 .../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h |   1 +
 .../gpu/drm/amd/amdgpu/amdgpu_trace_points.c  |   1 +
 kernel/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c  |   4 +
 kernel/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c  |  12 +-
 kernel/drivers/gpu/drm/amd/amdkfd/Makefile    |   1 +
 kernel/drivers/gpu/drm/amd/powerplay/Makefile |   1 +
 .../gpu/drm/amd/powerplay/hwmgr/Makefile      |   1 +
 .../drm/amd/powerplay/hwmgr/pp_overdriver.c   |   1 +
 .../drivers/gpu/drm/amd/powerplay/inc/smu72.h |   1 +
 .../drm/amd/powerplay/inc/smu72_discrete.h    |   1 +
 .../gpu/drm/amd/powerplay/smumgr/Makefile     |   1 +
 .../gpu/drm/amd/scheduler/gpu_sched_trace.h   |   1 +
 kernel/drivers/gpu/drm/arm/hdlcd_drv.h        |   1 +
 kernel/drivers/gpu/drm/armada/Makefile        |   1 +
 kernel/drivers/gpu/drm/armada/armada_trace.c  |   1 +
 kernel/drivers/gpu/drm/armada/armada_trace.h  |   1 +
 kernel/drivers/gpu/drm/ast/ast_dp501.c        |   1 +
 kernel/drivers/gpu/drm/ast/ast_dram_tables.h  |   1 +
 kernel/drivers/gpu/drm/atmel-hlcdc/Makefile   |   1 +
 kernel/drivers/gpu/drm/bochs/bochs.h          |   1 +
 kernel/drivers/gpu/drm/bridge/Makefile        |   1 +
 .../gpu/drm/bridge/synopsys/dw-hdmi-audio.h   |   1 +
 kernel/drivers/gpu/drm/drm_trace.h            |   1 +
 kernel/drivers/gpu/drm/etnaviv/Makefile       |   1 +
 kernel/drivers/gpu/drm/etnaviv/state.xml.h    |   1 +
 kernel/drivers/gpu/drm/etnaviv/state_3d.xml.h |   1 +
 kernel/drivers/gpu/drm/etnaviv/state_hi.xml.h |   1 +
 kernel/drivers/gpu/drm/exynos/Makefile        |   1 +
 kernel/drivers/gpu/drm/fsl-dcu/Makefile       |   1 +
 kernel/drivers/gpu/drm/gma500/Makefile        |   1 +
 kernel/drivers/gpu/drm/i2c/Makefile           |   1 +
 kernel/drivers/gpu/drm/i915/Makefile          |   1 +
 kernel/drivers/gpu/drm/i915/gvt/Makefile      |   1 +
 kernel/drivers/gpu/drm/i915/i915_gem.c        |   2 +
 .../drivers/gpu/drm/i915/i915_gem_context.c   |   2 +
 .../gpu/drm/i915/i915_gem_execbuffer.c        |   4 +
 kernel/drivers/gpu/drm/i915/i915_trace.h      |   1 +
 .../drivers/gpu/drm/i915/i915_trace_points.c  |   1 +
 kernel/drivers/gpu/drm/i915/intel_acpi.c      |   1 +
 kernel/drivers/gpu/drm/i915/intel_display.c   |  19 ++-
 kernel/drivers/gpu/drm/i915/intel_dp.c        |  13 +-
 kernel/drivers/gpu/drm/i915/intel_drv.h       |   1 -
 kernel/drivers/gpu/drm/i915/intel_pm.c        |  51 +++-----
 .../drivers/gpu/drm/i915/intel_ringbuffer.h   |   1 +
 .../drm/i915/selftests/i915_live_selftests.h  |   1 +
 .../drm/i915/selftests/i915_mock_selftests.h  |   1 +
 .../gpu/drm/i915/selftests/mock_gem_device.h  |   1 +
 .../gpu/drm/i915/selftests/mock_gem_object.h  |   1 +
 kernel/drivers/gpu/drm/imx/Makefile           |   1 +
 kernel/drivers/gpu/drm/imx/imx-drm.h          |   1 +
 kernel/drivers/gpu/drm/imx/ipuv3-plane.h      |   1 +
 kernel/drivers/gpu/drm/lib/drm_random.c       |   1 +
 kernel/drivers/gpu/drm/lib/drm_random.h       |   1 +
 kernel/drivers/gpu/drm/mediatek/Makefile      |   1 +
 kernel/drivers/gpu/drm/mgag200/mgag200_reg.h  |   1 +
 kernel/drivers/gpu/drm/msm/Makefile           |   1 +
 .../drivers/gpu/drm/nouveau/dispnv04/cursor.c |   1 +
 .../drivers/gpu/drm/nouveau/dispnv04/disp.h   |   1 +
 .../gpu/drm/nouveau/include/nvif/cl0002.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl0046.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl006b.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl0080.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl506e.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl506f.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl5070.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl507a.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl507b.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl507c.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl507d.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl507e.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl826e.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl826f.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl906f.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cl9097.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/cla06f.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/class.h      |   1 +
 .../gpu/drm/nouveau/include/nvif/client.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/device.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/driver.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/event.h      |   1 +
 .../gpu/drm/nouveau/include/nvif/if0000.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/if0001.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/if0002.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/if0003.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/if0004.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/if0005.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/ioctl.h      |   1 +
 .../gpu/drm/nouveau/include/nvif/notify.h     |   1 +
 .../gpu/drm/nouveau/include/nvif/object.h     |   1 +
 .../drivers/gpu/drm/nouveau/include/nvif/os.h |   1 +
 .../gpu/drm/nouveau/include/nvif/unpack.h     |   1 +
 .../drm/nouveau/include/nvkm/core/client.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/debug.h |   1 +
 .../drm/nouveau/include/nvkm/core/device.h    |   1 +
 .../drm/nouveau/include/nvkm/core/engine.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/enum.h  |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/event.h |   1 +
 .../drm/nouveau/include/nvkm/core/firmware.h  |   1 +
 .../drm/nouveau/include/nvkm/core/gpuobj.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/ioctl.h |   1 +
 .../drm/nouveau/include/nvkm/core/memory.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/mm.h    |   1 +
 .../drm/nouveau/include/nvkm/core/notify.h    |   1 +
 .../drm/nouveau/include/nvkm/core/object.h    |   1 +
 .../drm/nouveau/include/nvkm/core/oproxy.h    |   1 +
 .../drm/nouveau/include/nvkm/core/option.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/os.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/pci.h   |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/ramht.h |   1 +
 .../drm/nouveau/include/nvkm/core/subdev.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/core/tegra.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/bsp.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/ce.h  |   1 +
 .../drm/nouveau/include/nvkm/engine/cipher.h  |   1 +
 .../drm/nouveau/include/nvkm/engine/disp.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/dma.h |   1 +
 .../drm/nouveau/include/nvkm/engine/falcon.h  |   1 +
 .../drm/nouveau/include/nvkm/engine/fifo.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/gr.h  |   1 +
 .../drm/nouveau/include/nvkm/engine/mpeg.h    |   1 +
 .../drm/nouveau/include/nvkm/engine/msenc.h   |   1 +
 .../drm/nouveau/include/nvkm/engine/mspdec.h  |   1 +
 .../drm/nouveau/include/nvkm/engine/msppp.h   |   1 +
 .../drm/nouveau/include/nvkm/engine/msvld.h   |   1 +
 .../drm/nouveau/include/nvkm/engine/nvdec.h   |   1 +
 .../drm/nouveau/include/nvkm/engine/nvenc.h   |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/pm.h  |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/sec.h |   1 +
 .../drm/nouveau/include/nvkm/engine/sec2.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/sw.h  |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/vic.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/engine/vp.h  |   1 +
 .../drm/nouveau/include/nvkm/engine/xtensa.h  |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/bar.h |   1 +
 .../drm/nouveau/include/nvkm/subdev/bios.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/M0203.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/M0205.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/M0209.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/P0260.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/bit.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/bmp.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/boost.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/conn.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/cstep.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/dcb.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/disp.h   |   1 +
 .../drm/nouveau/include/nvkm/subdev/bios/dp.h |   1 +
 .../nouveau/include/nvkm/subdev/bios/extdev.h |   1 +
 .../nouveau/include/nvkm/subdev/bios/fan.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/gpio.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/i2c.h    |   1 +
 .../include/nvkm/subdev/bios/iccsense.h       |   1 +
 .../nouveau/include/nvkm/subdev/bios/image.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/init.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/mxm.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/npde.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/pcir.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/perf.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/pll.h    |   1 +
 .../nouveau/include/nvkm/subdev/bios/pmu.h    |   1 +
 .../include/nvkm/subdev/bios/power_budget.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/ramcfg.h |   1 +
 .../nouveau/include/nvkm/subdev/bios/rammap.h |   1 +
 .../nouveau/include/nvkm/subdev/bios/therm.h  |   1 +
 .../nouveau/include/nvkm/subdev/bios/timing.h |   1 +
 .../nouveau/include/nvkm/subdev/bios/vmap.h   |   1 +
 .../nouveau/include/nvkm/subdev/bios/volt.h   |   1 +
 .../include/nvkm/subdev/bios/vpstate.h        |   1 +
 .../nouveau/include/nvkm/subdev/bios/xpio.h   |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/bus.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/clk.h |   1 +
 .../drm/nouveau/include/nvkm/subdev/devinit.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/fb.h  |   1 +
 .../drm/nouveau/include/nvkm/subdev/fuse.h    |   1 +
 .../drm/nouveau/include/nvkm/subdev/gpio.h    |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/i2c.h |   1 +
 .../drm/nouveau/include/nvkm/subdev/ibus.h    |   1 +
 .../nouveau/include/nvkm/subdev/iccsense.h    |   1 +
 .../drm/nouveau/include/nvkm/subdev/instmem.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/ltc.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/mc.h  |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/mmu.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/mxm.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/pci.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/pmu.h |   1 +
 .../drm/nouveau/include/nvkm/subdev/therm.h   |   1 +
 .../drm/nouveau/include/nvkm/subdev/timer.h   |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/top.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/vga.h |   1 +
 .../drm/nouveau/include/nvkm/subdev/volt.h    |   1 +
 .../drivers/gpu/drm/nouveau/nouveau_abi16.h   |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_acpi.c |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_acpi.h |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_bo.h   |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_chan.h |   1 +
 .../drivers/gpu/drm/nouveau/nouveau_debugfs.h |   1 +
 .../drivers/gpu/drm/nouveau/nouveau_display.h |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_drv.h  |   1 +
 .../drivers/gpu/drm/nouveau/nouveau_fence.h   |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_gem.h  |   1 +
 .../drivers/gpu/drm/nouveau/nouveau_ioctl.h   |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_reg.h  |   1 +
 .../drivers/gpu/drm/nouveau/nouveau_sgdma.c   |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_ttm.h  |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_usif.h |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_vga.c  |   1 +
 kernel/drivers/gpu/drm/nouveau/nouveau_vga.h  |   1 +
 kernel/drivers/gpu/drm/nouveau/nv10_fence.h   |   1 +
 kernel/drivers/gpu/drm/nouveau/nv50_display.c |   6 +-
 .../nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h   |   1 +
 .../nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/ce/priv.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/device/acpi.h |   1 +
 .../gpu/drm/nouveau/nvkm/engine/device/ctrl.h |   1 +
 .../gpu/drm/nouveau/nvkm/engine/device/priv.h |   1 +
 .../drm/nouveau/nvkm/engine/disp/channv50.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/conn.h   |   1 +
 .../drm/nouveau/nvkm/engine/disp/dmacnv50.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/dp.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/hdmi.c   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/hdmi.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/head.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/ior.h    |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/nv50.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/outp.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/priv.h   |   1 +
 .../drm/nouveau/nvkm/engine/disp/rootnv50.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/dma/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/engine/dma/user.h    |   1 +
 .../gpu/drm/nouveau/nvkm/engine/fifo/chan.h   |   1 +
 .../drm/nouveau/nvkm/engine/fifo/changf100.h  |   1 +
 .../drm/nouveau/nvkm/engine/fifo/changk104.h  |   1 +
 .../drm/nouveau/nvkm/engine/fifo/channv04.h   |   1 +
 .../drm/nouveau/nvkm/engine/fifo/channv50.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/fifo/gf100.h  |   1 +
 .../gpu/drm/nouveau/nvkm/engine/fifo/gk104.h  |   1 +
 .../gpu/drm/nouveau/nvkm/engine/fifo/nv04.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/fifo/nv50.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/fifo/priv.h   |   1 +
 .../drm/nouveau/nvkm/engine/fifo/regsnv04.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h  |   1 +
 .../nvkm/engine/gr/fuc/gpcgf100.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/gpcgf117.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/gpcgk104.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/gpcgk110.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/gpcgk208.fuc5.h        |   1 +
 .../nvkm/engine/gr/fuc/gpcgm107.fuc5.h        |   1 +
 .../nvkm/engine/gr/fuc/hubgf100.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/hubgf117.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/hubgk104.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/hubgk110.fuc3.h        |   1 +
 .../nvkm/engine/gr/fuc/hubgk208.fuc5.h        |   1 +
 .../nvkm/engine/gr/fuc/hubgm107.fuc5.h        |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv10.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv20.c     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv20.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv25.c     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv2a.c     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv30.c     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv34.c     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv35.c     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv40.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/nv50.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/priv.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/gr/regs.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/mpeg/priv.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/mspdec/priv.h |   1 +
 .../gpu/drm/nouveau/nvkm/engine/msppp/priv.h  |   1 +
 .../gpu/drm/nouveau/nvkm/engine/msvld/priv.h  |   1 +
 .../gpu/drm/nouveau/nvkm/engine/nvdec/priv.h  |   1 +
 .../gpu/drm/nouveau/nvkm/engine/pm/gf100.h    |   1 +
 .../gpu/drm/nouveau/nvkm/engine/pm/nv40.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/pm/priv.h     |   1 +
 .../nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/sec2/priv.h   |   1 +
 .../gpu/drm/nouveau/nvkm/engine/sw/chan.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/sw/nv50.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/sw/nvsw.h     |   1 +
 .../gpu/drm/nouveau/nvkm/engine/sw/priv.h     |   1 +
 .../gpu/drm/nouveau/nvkm/falcon/priv.h        |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/bar/gf100.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/bar/nv50.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/bar/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/bios/priv.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/bus/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/clk/gt215.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/clk/nv50.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/clk/pll.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/clk/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/clk/seq.h     |   1 +
 .../drm/nouveau/nvkm/subdev/devinit/nv04.h    |   1 +
 .../drm/nouveau/nvkm/subdev/devinit/nv50.h    |   1 +
 .../drm/nouveau/nvkm/subdev/devinit/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/gf100.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/nv50.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/priv.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/ram.h      |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h  |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/fuse/priv.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/gpio/priv.h   |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/i2c/aux.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/i2c/bus.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/i2c/pad.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/i2c/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/ibus/priv.h   |   1 +
 .../drm/nouveau/nvkm/subdev/iccsense/priv.h   |   1 +
 .../drm/nouveau/nvkm/subdev/instmem/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/ltc/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/mc/priv.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/mmu/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/mxm/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/pci/agp.h     |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/pci/priv.h    |   1 +
 .../nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h  |   1 +
 .../nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h  |   1 +
 .../nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h  |   1 +
 .../nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h  |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h  |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/pmu/memx.c    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/pmu/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/timer/priv.h  |   1 +
 .../drm/nouveau/nvkm/subdev/timer/regsnv04.h  |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/top/priv.h    |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/volt/priv.h   |   1 +
 kernel/drivers/gpu/drm/omapdrm/Makefile       |   1 +
 .../drivers/gpu/drm/omapdrm/displays/Makefile |   1 +
 kernel/drivers/gpu/drm/omapdrm/dss/Makefile   |   1 +
 .../drivers/gpu/drm/omapdrm/dss/hdmi_common.c |   1 +
 kernel/drivers/gpu/drm/panel/Makefile         |   1 +
 kernel/drivers/gpu/drm/pl111/Makefile         |   1 +
 kernel/drivers/gpu/drm/radeon/Makefile        |   1 +
 kernel/drivers/gpu/drm/radeon/mkregtable.c    |   1 +
 kernel/drivers/gpu/drm/radeon/r100_track.h    |   1 +
 kernel/drivers/gpu/drm/radeon/radeon_dp_mst.c |   1 +
 .../drivers/gpu/drm/radeon/radeon_legacy_tv.c |   1 +
 kernel/drivers/gpu/drm/radeon/radeon_trace.h  |   1 +
 .../gpu/drm/radeon/radeon_trace_points.c      |   1 +
 kernel/drivers/gpu/drm/rcar-du/Makefile       |   1 +
 kernel/drivers/gpu/drm/rockchip/Makefile      |   1 +
 .../gpu/drm/selftests/drm_mm_selftests.h      |   1 +
 kernel/drivers/gpu/drm/shmobile/Makefile      |   1 +
 kernel/drivers/gpu/drm/sti/Makefile           |   1 +
 kernel/drivers/gpu/drm/sun4i/Makefile         |   1 +
 kernel/drivers/gpu/drm/tegra/Makefile         |   1 +
 kernel/drivers/gpu/drm/tilcdc/Makefile        |   1 +
 kernel/drivers/gpu/drm/ttm/Makefile           |   1 +
 kernel/drivers/gpu/drm/vc4/Makefile           |   1 +
 kernel/drivers/gpu/drm/virtio/Makefile        |   1 +
 kernel/drivers/gpu/drm/vmwgfx/Makefile        |   1 +
 .../vmwgfx/device_include/vm_basic_types.h    |   1 +
 kernel/drivers/gpu/drm/zte/Makefile           |   1 +
 kernel/drivers/gpu/host1x/Makefile            |   1 +
 kernel/drivers/gpu/ipu-v3/Makefile            |   1 +
 kernel/drivers/hid/Makefile                   |   1 +
 kernel/drivers/hid/hid-lg.h                   |   1 +
 kernel/drivers/hid/hid-lg4ff.h                |   1 +
 kernel/drivers/hid/intel-ish-hid/Makefile     |   1 +
 kernel/drivers/hid/usbhid/Makefile            |   1 +
 kernel/drivers/hsi/Makefile                   |   1 +
 kernel/drivers/hv/Makefile                    |   1 +
 kernel/drivers/hwmon/Makefile                 |   1 +
 kernel/drivers/hwmon/adt7x10.h                |   1 +
 kernel/drivers/hwmon/pmbus/Makefile           |   1 +
 kernel/drivers/hwspinlock/Makefile            |   1 +
 kernel/drivers/hwtracing/coresight/Makefile   |   1 +
 kernel/drivers/hwtracing/intel_th/Makefile    |   1 +
 kernel/drivers/hwtracing/stm/Makefile         |   1 +
 kernel/drivers/i2c/Makefile                   |   1 +
 kernel/drivers/i2c/busses/Makefile            |   1 +
 kernel/drivers/i2c/busses/i2c-octeon-core.h   |   1 +
 kernel/drivers/i2c/muxes/Makefile             |   1 +
 kernel/drivers/ide/Makefile                   |   1 +
 kernel/drivers/ide/ide-acpi.c                 |   1 +
 kernel/drivers/ide/ide-cd.c                   |   1 +
 kernel/drivers/ide/ide-cd.h                   |   1 +
 kernel/drivers/ide/ide-cd_ioctl.c             |   1 +
 kernel/drivers/ide/ide-cd_verbose.c           |   1 +
 kernel/drivers/ide/ide-devsets.c              |   1 +
 kernel/drivers/ide/ide-disk.c                 |   1 +
 kernel/drivers/ide/ide-disk.h                 |   1 +
 kernel/drivers/ide/ide-disk_ioctl.c           |   1 +
 kernel/drivers/ide/ide-disk_proc.c            |   1 +
 kernel/drivers/ide/ide-floppy.c               |   1 +
 kernel/drivers/ide/ide-floppy.h               |   1 +
 kernel/drivers/ide/ide-floppy_ioctl.c         |   1 +
 kernel/drivers/ide/ide-floppy_proc.c          |   1 +
 kernel/drivers/ide/ide-gd.h                   |   1 +
 kernel/drivers/ide/ide-park.c                 |   1 +
 kernel/drivers/ide/ide-pio-blacklist.c        |   1 +
 kernel/drivers/ide/ide-pm.c                   |   1 +
 kernel/drivers/ide/ide-sysfs.c                |   1 +
 kernel/drivers/ide/qd65xx.h                   |   1 +
 kernel/drivers/idle/intel_idle.c              |   9 +-
 kernel/drivers/iio/Makefile                   |   1 +
 kernel/drivers/iio/accel/Makefile             |   1 +
 kernel/drivers/iio/accel/bmc150-accel.h       |   1 +
 kernel/drivers/iio/accel/kxsd9-i2c.c          |   1 +
 kernel/drivers/iio/accel/kxsd9.h              |   1 +
 kernel/drivers/iio/adc/Makefile               |   1 +
 kernel/drivers/iio/adc/qcom-vadc-common.c     |   1 +
 kernel/drivers/iio/adc/qcom-vadc-common.h     |   1 +
 kernel/drivers/iio/buffer/Makefile            |   1 +
 kernel/drivers/iio/common/Makefile            |   1 +
 .../iio/common/ssp_sensors/ssp_iio_sensor.h   |   1 +
 kernel/drivers/iio/common/st_sensors/Makefile |   1 +
 .../iio/common/st_sensors/st_sensors_core.h   |   1 +
 kernel/drivers/iio/dac/Makefile               |   1 +
 kernel/drivers/iio/dummy/Makefile             |   1 +
 kernel/drivers/iio/dummy/iio_dummy_evgen.h    |   1 +
 kernel/drivers/iio/gyro/Makefile              |   1 +
 kernel/drivers/iio/gyro/bmg160.h              |   1 +
 kernel/drivers/iio/gyro/mpu3050.h             |   1 +
 kernel/drivers/iio/humidity/Makefile          |   1 +
 kernel/drivers/iio/imu/Makefile               |   1 +
 kernel/drivers/iio/imu/adis16400_buffer.c     |   1 +
 kernel/drivers/iio/imu/bmi160/bmi160.h        |   1 +
 kernel/drivers/iio/imu/inv_mpu6050/Makefile   |   1 +
 kernel/drivers/iio/light/Makefile             |   1 +
 kernel/drivers/iio/magnetometer/Makefile      |   1 +
 kernel/drivers/iio/magnetometer/bmc150_magn.h |   1 +
 kernel/drivers/iio/potentiometer/Makefile     |   1 +
 kernel/drivers/iio/pressure/Makefile          |   1 +
 kernel/drivers/iio/pressure/bmp280-regmap.c   |   1 +
 kernel/drivers/iio/pressure/bmp280.h          |   1 +
 kernel/drivers/iio/proximity/Makefile         |   1 +
 kernel/drivers/iio/temperature/Makefile       |   1 +
 kernel/drivers/iio/trigger/Makefile           |   1 +
 kernel/drivers/infiniband/core/Makefile       |   1 +
 kernel/drivers/infiniband/core/nldev.c        |   4 +-
 kernel/drivers/infiniband/hw/Makefile         |   1 +
 kernel/drivers/infiniband/hw/bnxt_re/Makefile |   1 +
 kernel/drivers/infiniband/hw/cxgb3/Makefile   |   1 +
 kernel/drivers/infiniband/hw/hfi1/Makefile    |   1 +
 kernel/drivers/infiniband/hw/i40iw/Makefile   |   1 +
 kernel/drivers/infiniband/hw/mthca/Makefile   |   1 +
 kernel/drivers/infiniband/hw/qib/Makefile     |   1 +
 kernel/drivers/infiniband/hw/usnic/Makefile   |   1 +
 kernel/drivers/infiniband/sw/rxe/Makefile     |   1 +
 kernel/drivers/infiniband/ulp/Makefile        |   1 +
 kernel/drivers/infiniband/ulp/ipoib/Makefile  |   1 +
 .../drivers/infiniband/ulp/isert/ib_isert.h   |   1 +
 kernel/drivers/input/Makefile                 |   1 +
 kernel/drivers/input/gameport/Makefile        |   1 +
 kernel/drivers/input/joystick/Makefile        |   1 +
 kernel/drivers/input/keyboard/Makefile        |   1 +
 kernel/drivers/input/misc/Makefile            |   1 +
 kernel/drivers/input/mouse/Makefile           |   1 +
 kernel/drivers/input/mouse/byd.h              |   1 +
 kernel/drivers/input/mouse/cypress_ps2.h      |   1 +
 kernel/drivers/input/mouse/hgpk.h             |   1 +
 kernel/drivers/input/mouse/psmouse.h          |   1 +
 kernel/drivers/input/rmi4/Makefile            |   1 +
 kernel/drivers/input/serio/Makefile           |   1 +
 kernel/drivers/input/serio/i8042-sparcio.h    |   1 +
 kernel/drivers/input/sparse-keymap.c          |   1 +
 kernel/drivers/input/tablet/Makefile          |   1 +
 kernel/drivers/input/touchscreen/Makefile     |   1 +
 kernel/drivers/input/touchscreen/ar1021_i2c.c |   1 +
 .../drivers/input/touchscreen/tsc200x-core.h  |   1 +
 kernel/drivers/iommu/Makefile                 |   1 +
 kernel/drivers/iommu/intel_irq_remapping.c    |   1 +
 kernel/drivers/iommu/io-pgtable.h             |   1 +
 kernel/drivers/iommu/iommu-traces.c           |   1 +
 kernel/drivers/iommu/s390-iommu.c             |   1 +
 kernel/drivers/irqchip/Makefile               |   1 +
 kernel/drivers/irqchip/irq-ftintc010.c        |   1 +
 kernel/drivers/irqchip/irq-gic-realview.c     |   1 +
 kernel/drivers/irqchip/irq-imgpdc.c           |   1 +
 kernel/drivers/irqchip/irq-metag-ext.c        |   1 +
 kernel/drivers/irqchip/irq-metag.c            |   1 +
 kernel/drivers/irqchip/irq-mvebu-gicp.c       |   1 +
 kernel/drivers/irqchip/irq-mvebu-gicp.h       |   1 +
 kernel/drivers/irqchip/irq-renesas-h8300h.c   |   1 +
 kernel/drivers/irqchip/irq-renesas-h8s.c      |   1 +
 kernel/drivers/irqchip/irq-versatile-fpga.c   |   1 +
 kernel/drivers/isdn/Makefile                  |   1 +
 kernel/drivers/isdn/capi/Makefile             |   1 +
 kernel/drivers/isdn/capi/capilib.c            |   1 +
 kernel/drivers/isdn/gigaset/Makefile          |   1 +
 kernel/drivers/isdn/hardware/avm/Makefile     |   1 +
 kernel/drivers/isdn/hardware/eicon/Makefile   |   1 +
 kernel/drivers/isdn/hardware/eicon/adapter.h  |   1 +
 kernel/drivers/isdn/hardware/eicon/debug.c    |   1 +
 kernel/drivers/isdn/hardware/eicon/diva.c     |   1 +
 kernel/drivers/isdn/hardware/eicon/diva.h     |   1 +
 kernel/drivers/isdn/hardware/eicon/diva_pci.h |   1 +
 kernel/drivers/isdn/hardware/eicon/dqueue.h   |   1 +
 kernel/drivers/isdn/hardware/eicon/dsp_tst.h  |   1 +
 kernel/drivers/isdn/hardware/eicon/entity.h   |   1 +
 kernel/drivers/isdn/hardware/eicon/os_4bri.c  |   1 +
 kernel/drivers/isdn/hardware/eicon/os_4bri.h  |   1 +
 kernel/drivers/isdn/hardware/eicon/os_bri.c   |   1 +
 kernel/drivers/isdn/hardware/eicon/os_bri.h   |   1 +
 kernel/drivers/isdn/hardware/eicon/os_pri.c   |   1 +
 kernel/drivers/isdn/hardware/eicon/os_pri.h   |   1 +
 kernel/drivers/isdn/hardware/eicon/um_idi.c   |   1 +
 kernel/drivers/isdn/hardware/eicon/um_idi.h   |   1 +
 kernel/drivers/isdn/hardware/eicon/um_xdi.h   |   1 +
 .../drivers/isdn/hardware/eicon/xdi_adapter.h |   1 +
 kernel/drivers/isdn/hardware/eicon/xdi_msg.h  |   1 +
 kernel/drivers/isdn/hardware/mISDN/Makefile   |   1 +
 .../drivers/isdn/hardware/mISDN/hfc_multi.h   |   1 +
 .../isdn/hardware/mISDN/hfc_multi_8xx.h       |   1 +
 kernel/drivers/isdn/hardware/mISDN/hfcsusb.h  |   1 +
 kernel/drivers/isdn/hisax/Makefile            |   1 +
 kernel/drivers/isdn/hisax/hfc4s8s_l1.h        |   1 +
 kernel/drivers/isdn/hisax/hfc_usb.h           |   1 +
 kernel/drivers/isdn/hisax/hisax_fcpcipnp.h    |   1 +
 kernel/drivers/isdn/hisax/hisax_isac.h        |   1 +
 kernel/drivers/isdn/i4l/Makefile              |   1 +
 kernel/drivers/isdn/mISDN/Makefile            |   1 +
 kernel/drivers/isdn/mISDN/dsp_hwec.h          |   1 +
 kernel/drivers/isdn/mISDN/l1oip.h             |   1 +
 kernel/drivers/leds/Makefile                  |   1 +
 kernel/drivers/leds/trigger/Makefile          |   1 +
 kernel/drivers/lightnvm/Makefile              |   1 +
 kernel/drivers/macintosh/Makefile             |   1 +
 kernel/drivers/macintosh/adb-iop.c            |   1 +
 kernel/drivers/macintosh/adb.c                |   1 +
 kernel/drivers/macintosh/adbhid.c             |   1 +
 kernel/drivers/macintosh/ams/ams.h            |   1 +
 kernel/drivers/macintosh/ans-lcd.c            |   1 +
 kernel/drivers/macintosh/ans-lcd.h            |   1 +
 kernel/drivers/macintosh/macio-adb.c          |   1 +
 kernel/drivers/macintosh/macio_sysfs.c        |   1 +
 kernel/drivers/macintosh/via-cuda.c           |   1 +
 kernel/drivers/macintosh/via-macii.c          |   1 +
 kernel/drivers/macintosh/via-pmu-backlight.c  |   1 +
 kernel/drivers/macintosh/via-pmu-event.h      |   1 +
 kernel/drivers/macintosh/via-pmu.c            |   1 +
 kernel/drivers/macintosh/via-pmu68k.c         |   1 +
 kernel/drivers/mailbox/Makefile               |   1 +
 kernel/drivers/mcb/Makefile                   |   1 +
 kernel/drivers/mcb/mcb-internal.h             |   1 +
 kernel/drivers/md/Makefile                    |   1 +
 kernel/drivers/md/bcache/Makefile             |   1 +
 kernel/drivers/md/bcache/alloc.c              |   1 +
 kernel/drivers/md/bcache/bcache.h             |   1 +
 kernel/drivers/md/bcache/bset.c               |   1 +
 kernel/drivers/md/bcache/bset.h               |   1 +
 kernel/drivers/md/bcache/btree.c              |   1 +
 kernel/drivers/md/bcache/btree.h              |   1 +
 kernel/drivers/md/bcache/closure.h            |   1 +
 kernel/drivers/md/bcache/debug.c              |   1 +
 kernel/drivers/md/bcache/debug.h              |   1 +
 kernel/drivers/md/bcache/extents.c            |   1 +
 kernel/drivers/md/bcache/extents.h            |   1 +
 kernel/drivers/md/bcache/io.c                 |   1 +
 kernel/drivers/md/bcache/journal.c            |   1 +
 kernel/drivers/md/bcache/journal.h            |   1 +
 kernel/drivers/md/bcache/movinggc.c           |   1 +
 kernel/drivers/md/bcache/request.c            |   1 +
 kernel/drivers/md/bcache/request.h            |   1 +
 kernel/drivers/md/bcache/stats.c              |   1 +
 kernel/drivers/md/bcache/stats.h              |   1 +
 kernel/drivers/md/bcache/sysfs.c              |   1 +
 kernel/drivers/md/bcache/sysfs.h              |   1 +
 kernel/drivers/md/bcache/trace.c              |   1 +
 kernel/drivers/md/bcache/util.h               |   1 +
 kernel/drivers/md/bcache/writeback.c          |   1 +
 kernel/drivers/md/bcache/writeback.h          |   1 +
 kernel/drivers/md/bitmap.h                    |   1 +
 kernel/drivers/md/dm-builtin.c                |   1 +
 kernel/drivers/md/dm-stats.c                  |   1 +
 kernel/drivers/md/dm-stats.h                  |   1 +
 kernel/drivers/md/linear.h                    |   1 +
 kernel/drivers/md/md-cluster.h                |   1 +
 kernel/drivers/md/multipath.h                 |   1 +
 kernel/drivers/md/persistent-data/Makefile    |   1 +
 kernel/drivers/md/raid0.h                     |   1 +
 kernel/drivers/md/raid1-10.c                  |   1 +
 kernel/drivers/md/raid1.h                     |   1 +
 kernel/drivers/md/raid10.h                    |   1 +
 kernel/drivers/md/raid5-log.h                 |   1 +
 kernel/drivers/md/raid5.h                     |   1 +
 kernel/drivers/media/Makefile                 |   1 +
 kernel/drivers/media/cec/Makefile             |   1 +
 kernel/drivers/media/common/b2c2/Makefile     |   1 +
 .../media/common/b2c2/flexcop-common.h        |   1 +
 .../media/common/b2c2/flexcop-eeprom.c        |   1 +
 .../media/common/b2c2/flexcop-fe-tuner.c      |   1 +
 .../media/common/b2c2/flexcop-hw-filter.c     |   1 +
 .../drivers/media/common/b2c2/flexcop-i2c.c   |   1 +
 .../drivers/media/common/b2c2/flexcop-misc.c  |   1 +
 .../drivers/media/common/b2c2/flexcop-reg.h   |   1 +
 .../drivers/media/common/b2c2/flexcop-sram.c  |   1 +
 kernel/drivers/media/common/b2c2/flexcop.h    |   1 +
 .../media/common/b2c2/flexcop_ibi_value_be.h  |   1 +
 .../media/common/b2c2/flexcop_ibi_value_le.h  |   1 +
 kernel/drivers/media/common/btcx-risc.h       |   1 +
 .../drivers/media/common/cypress_firmware.h   |   1 +
 .../media/common/saa7146/saa7146_i2c.c        |   1 +
 .../media/common/saa7146/saa7146_vbi.c        |   1 +
 kernel/drivers/media/common/siano/Makefile    |   1 +
 kernel/drivers/media/dvb-core/Makefile        |   1 +
 kernel/drivers/media/dvb-core/dvb-usb-ids.h   |   1 +
 kernel/drivers/media/dvb-frontends/Makefile   |   1 +
 kernel/drivers/media/dvb-frontends/dib7000m.h |   1 +
 kernel/drivers/media/dvb-frontends/dib7000p.h |   1 +
 kernel/drivers/media/dvb-frontends/dib8000.h  |   1 +
 kernel/drivers/media/dvb-frontends/dib9000.h  |   1 +
 .../media/dvb-frontends/dibx000_common.h      |   1 +
 kernel/drivers/media/dvb-frontends/drxk.h     |   1 +
 .../drivers/media/dvb-frontends/drxk_hard.h   |   1 +
 kernel/drivers/media/dvb-frontends/drxk_map.h |   1 +
 kernel/drivers/media/dvb-frontends/dvb-pll.h  |   1 +
 .../media/dvb-frontends/nxt6000_priv.h        |   1 +
 kernel/drivers/media/dvb-frontends/si21xx.h   |   1 +
 kernel/drivers/media/dvb-frontends/sp887x.h   |   1 +
 .../media/dvb-frontends/tda18271c2dd.h        |   1 +
 .../media/dvb-frontends/tda18271c2dd_maps.h   |   1 +
 kernel/drivers/media/i2c/Makefile             |   1 +
 kernel/drivers/media/i2c/msp3400-driver.h     |   1 +
 kernel/drivers/media/i2c/soc_camera/Makefile  |   1 +
 kernel/drivers/media/i2c/tea6415c.h           |   1 +
 kernel/drivers/media/i2c/tea6420.h            |   1 +
 kernel/drivers/media/mmc/Makefile             |   1 +
 kernel/drivers/media/pci/Makefile             |   1 +
 kernel/drivers/media/pci/b2c2/Makefile        |   1 +
 kernel/drivers/media/pci/b2c2/flexcop-dma.c   |   1 +
 kernel/drivers/media/pci/bt8xx/Makefile       |   1 +
 kernel/drivers/media/pci/bt8xx/btcx-risc.h    |   1 +
 kernel/drivers/media/pci/bt8xx/bttv.h         |   1 +
 kernel/drivers/media/pci/bt8xx/dst_priv.h     |   1 +
 kernel/drivers/media/pci/cx18/Makefile        |   1 +
 kernel/drivers/media/pci/cx23885/Makefile     |   1 +
 .../drivers/media/pci/cx23885/cx23885-f300.h  |   1 +
 kernel/drivers/media/pci/cx25821/Makefile     |   1 +
 kernel/drivers/media/pci/cx88/Makefile        |   1 +
 kernel/drivers/media/pci/cx88/cx88-vbi.c      |   1 +
 kernel/drivers/media/pci/ddbridge/Makefile    |   1 +
 kernel/drivers/media/pci/ivtv/Makefile        |   1 +
 kernel/drivers/media/pci/mantis/Makefile      |   1 +
 .../drivers/media/pci/netup_unidvb/Makefile   |   1 +
 kernel/drivers/media/pci/ngene/Makefile       |   1 +
 kernel/drivers/media/pci/pt3/Makefile         |   1 +
 kernel/drivers/media/pci/saa7134/Makefile     |   1 +
 .../drivers/media/pci/saa7134/saa7134-reg.h   |   1 +
 kernel/drivers/media/pci/saa7164/Makefile     |   1 +
 kernel/drivers/media/pci/smipcie/Makefile     |   1 +
 kernel/drivers/media/pci/ttpci/Makefile       |   1 +
 kernel/drivers/media/pci/ttpci/av7110.h       |   1 +
 kernel/drivers/media/pci/ttpci/av7110_av.h    |   1 +
 kernel/drivers/media/pci/ttpci/av7110_ca.h    |   1 +
 kernel/drivers/media/pci/ttpci/av7110_hw.h    |   1 +
 kernel/drivers/media/pci/ttpci/av7110_ipack.c |   1 +
 kernel/drivers/media/pci/ttpci/av7110_ipack.h |   1 +
 kernel/drivers/media/pci/ttpci/budget.h       |   1 +
 kernel/drivers/media/pci/ttpci/dvb_filter.c   |   1 +
 kernel/drivers/media/pci/tw5864/tw5864-util.c |   1 +
 kernel/drivers/media/pci/tw686x/tw686x-regs.h |   1 +
 kernel/drivers/media/pci/zoran/Makefile       |   1 +
 kernel/drivers/media/platform/Makefile        |   1 +
 .../media/platform/atmel/atmel-isc-regs.h     |   1 +
 kernel/drivers/media/platform/coda/trace.h    |   1 +
 .../drivers/media/platform/davinci/Makefile   |   1 +
 .../media/platform/exynos4-is/Makefile        |   1 +
 .../media/platform/marvell-ccic/mcam-core.c   |   1 +
 .../media/platform/marvell-ccic/mcam-core.h   |   1 +
 .../drivers/media/platform/mtk-mdp/Makefile   |   1 +
 .../media/platform/mtk-vcodec/Makefile        |   1 +
 .../drivers/media/platform/omap3isp/Makefile  |   1 +
 .../media/platform/qcom/venus/Makefile        |   1 +
 .../drivers/media/platform/s5p-mfc/Makefile   |   1 +
 .../media/platform/sti/c8sectpfe/Makefile     |   1 +
 kernel/drivers/media/platform/ti-vpe/Makefile |   1 +
 kernel/drivers/media/platform/via-camera.h    |   1 +
 kernel/drivers/media/platform/vimc/Makefile   |   1 +
 kernel/drivers/media/platform/vivid/Makefile  |   1 +
 kernel/drivers/media/platform/vsp1/Makefile   |   1 +
 kernel/drivers/media/radio/Makefile           |   1 +
 kernel/drivers/media/radio/lm7000.h           |   1 +
 kernel/drivers/media/rc/Makefile              |   1 +
 kernel/drivers/media/rc/img-ir/Makefile       |   1 +
 kernel/drivers/media/rc/keymaps/Makefile      |   1 +
 kernel/drivers/media/tuners/Makefile          |   1 +
 kernel/drivers/media/tuners/fc0011.h          |   1 +
 kernel/drivers/media/tuners/mt2063.h          |   1 +
 kernel/drivers/media/usb/Makefile             |   1 +
 kernel/drivers/media/usb/as102/Makefile       |   1 +
 kernel/drivers/media/usb/au0828/Makefile      |   1 +
 kernel/drivers/media/usb/b2c2/flexcop-usb.h   |   1 +
 kernel/drivers/media/usb/cx231xx/Makefile     |   1 +
 kernel/drivers/media/usb/dvb-usb-v2/Makefile  |   1 +
 kernel/drivers/media/usb/dvb-usb-v2/gl861.h   |   1 +
 kernel/drivers/media/usb/dvb-usb-v2/usb_urb.c |   1 +
 kernel/drivers/media/usb/dvb-usb/Makefile     |   1 +
 .../drivers/media/usb/dvb-usb/af9005-script.h |   1 +
 kernel/drivers/media/usb/dvb-usb/az6027.h     |   1 +
 kernel/drivers/media/usb/dvb-usb/cxusb.h      |   1 +
 kernel/drivers/media/usb/dvb-usb/dib07x0.h    |   1 +
 kernel/drivers/media/usb/dvb-usb/digitv.h     |   1 +
 .../media/usb/dvb-usb/dvb-usb-common.h        |   1 +
 .../drivers/media/usb/dvb-usb/dvb-usb-dvb.c   |   1 +
 .../media/usb/dvb-usb/dvb-usb-firmware.c      |   1 +
 .../drivers/media/usb/dvb-usb/dvb-usb-i2c.c   |   1 +
 .../media/usb/dvb-usb/dvb-usb-remote.c        |   1 +
 .../drivers/media/usb/dvb-usb/dvb-usb-urb.c   |   1 +
 kernel/drivers/media/usb/dvb-usb/dvb-usb.h    |   1 +
 kernel/drivers/media/usb/dvb-usb/dw2102.h     |   1 +
 kernel/drivers/media/usb/dvb-usb/m920x.h      |   1 +
 kernel/drivers/media/usb/dvb-usb/usb-urb.c    |   1 +
 kernel/drivers/media/usb/dvb-usb/vp702x.h     |   1 +
 kernel/drivers/media/usb/em28xx/Makefile      |   1 +
 kernel/drivers/media/usb/em28xx/em28xx-reg.h  |   1 +
 kernel/drivers/media/usb/go7007/Makefile      |   1 +
 kernel/drivers/media/usb/gspca/Makefile       |   1 +
 kernel/drivers/media/usb/gspca/gl860/Makefile |   1 +
 kernel/drivers/media/usb/gspca/gspca.h        |   1 +
 kernel/drivers/media/usb/gspca/m5602/Makefile |   1 +
 .../drivers/media/usb/gspca/stv06xx/Makefile  |   1 +
 kernel/drivers/media/usb/pvrusb2/Makefile     |   1 +
 .../drivers/media/usb/pvrusb2/pvrusb2-dvb.h   |   1 +
 kernel/drivers/media/usb/pwc/pwc-nala.h       |   1 +
 kernel/drivers/media/usb/stk1160/Makefile     |   1 +
 kernel/drivers/media/usb/tm6000/Makefile      |   1 +
 .../media/usb/usbvision/usbvision-cards.h     |   1 +
 kernel/drivers/media/usb/uvc/Makefile         |   1 +
 kernel/drivers/media/usb/uvc/uvcvideo.h       |   1 +
 kernel/drivers/media/v4l2-core/Makefile       |   1 +
 kernel/drivers/media/v4l2-core/v4l2-trace.c   |   1 +
 kernel/drivers/media/v4l2-core/vb2-trace.c    |   1 +
 kernel/drivers/memory/Makefile                |   1 +
 kernel/drivers/memory/tegra/Makefile          |   1 +
 kernel/drivers/memstick/host/Makefile         |   1 +
 kernel/drivers/message/fusion/Makefile        |   1 +
 kernel/drivers/message/fusion/lsi/mpi.h       |   1 +
 kernel/drivers/message/fusion/lsi/mpi_cnfg.h  |   1 +
 kernel/drivers/message/fusion/lsi/mpi_fc.h    |   1 +
 kernel/drivers/message/fusion/lsi/mpi_init.h  |   1 +
 kernel/drivers/message/fusion/lsi/mpi_ioc.h   |   1 +
 kernel/drivers/message/fusion/lsi/mpi_lan.h   |   1 +
 .../drivers/message/fusion/lsi/mpi_log_fc.h   |   1 +
 .../drivers/message/fusion/lsi/mpi_log_sas.h  |   1 +
 kernel/drivers/message/fusion/lsi/mpi_raid.h  |   1 +
 kernel/drivers/message/fusion/lsi/mpi_sas.h   |   1 +
 kernel/drivers/message/fusion/lsi/mpi_targ.h  |   1 +
 kernel/drivers/message/fusion/lsi/mpi_tool.h  |   1 +
 kernel/drivers/message/fusion/lsi/mpi_type.h  |   1 +
 kernel/drivers/message/fusion/mptdebug.h      |   1 +
 kernel/drivers/mfd/Makefile                   |   1 +
 kernel/drivers/mfd/twl-core.h                 |   1 +
 kernel/drivers/misc/Makefile                  |   1 +
 kernel/drivers/misc/cxl/Makefile              |   1 +
 kernel/drivers/misc/cxl/flash.c               |   1 +
 kernel/drivers/misc/eeprom/Makefile           |   1 +
 kernel/drivers/misc/ibmasm/Makefile           |   1 +
 kernel/drivers/misc/lkdtm.h                   |   1 +
 kernel/drivers/misc/lkdtm_bugs.c              |   1 +
 kernel/drivers/misc/lkdtm_heap.c              |   1 +
 kernel/drivers/misc/lkdtm_perms.c             |   1 +
 kernel/drivers/misc/lkdtm_rodata.c            |   1 +
 kernel/drivers/misc/lkdtm_usercopy.c          |   1 +
 kernel/drivers/misc/mei/Makefile              |   1 +
 kernel/drivers/misc/mic/Makefile              |   1 +
 kernel/drivers/misc/mic/card/Makefile         |   1 +
 kernel/drivers/misc/mic/cosm/Makefile         |   1 +
 kernel/drivers/misc/mic/host/Makefile         |   1 +
 kernel/drivers/misc/mic/scif/Makefile         |   1 +
 kernel/drivers/misc/sgi-xp/Makefile           |   1 +
 kernel/drivers/mmc/core/Makefile              |   1 +
 kernel/drivers/mmc/core/block.h               |   1 +
 kernel/drivers/mmc/core/queue.h               |   1 +
 kernel/drivers/mmc/core/quirks.h              |   1 +
 kernel/drivers/mmc/core/sd.h                  |   1 +
 kernel/drivers/mmc/host/Makefile              |   1 +
 kernel/drivers/mmc/host/dw_mmc-zx.h           |   1 +
 kernel/drivers/mmc/host/dw_mmc.c              | 107 +++++++++++++--
 kernel/drivers/mmc/host/pxamci.h              |   1 +
 .../mmc/host/renesas_sdhi_internal_dmac.c     |  17 ++-
 kernel/drivers/mmc/host/sdhci-pci.h           |   1 +
 kernel/drivers/mmc/host/tmio_mmc_core.c       |  13 ++
 kernel/drivers/mtd/Makefile                   |   1 +
 kernel/drivers/mtd/chips/Makefile             |   1 +
 kernel/drivers/mtd/chips/fwh_lock.h           |   1 +
 kernel/drivers/mtd/devices/Makefile           |   1 +
 kernel/drivers/mtd/devices/bcm47xxsflash.h    |   1 +
 kernel/drivers/mtd/maps/Makefile              |   1 +
 kernel/drivers/mtd/maps/physmap_of_gemini.c   |   1 +
 kernel/drivers/mtd/maps/physmap_of_gemini.h   |   1 +
 .../drivers/mtd/maps/physmap_of_versatile.h   |   1 +
 kernel/drivers/mtd/maps/tsunami_flash.c       |   1 +
 kernel/drivers/mtd/mtdcore.h                  |   1 +
 kernel/drivers/mtd/nand/Makefile              |   1 +
 .../mtd/nand/bcm47xxnflash/bcm47xxnflash.h    |   1 +
 kernel/drivers/mtd/nand/brcmnand/Makefile     |   1 +
 kernel/drivers/mtd/onenand/Makefile           |   1 +
 kernel/drivers/mtd/onenand/onenand_bbt.c      |   1 +
 kernel/drivers/mtd/spi-nor/Makefile           |   1 +
 kernel/drivers/mtd/tests/Makefile             |   1 +
 kernel/drivers/mtd/tests/mtd_test.c           |   1 +
 kernel/drivers/mtd/tests/mtd_test.h           |   1 +
 kernel/drivers/mtd/ubi/Makefile               |   1 +
 kernel/drivers/mtd/ubi/wl.h                   |   1 +
 kernel/drivers/net/Makefile                   |   1 +
 kernel/drivers/net/appletalk/cops.h           |   1 +
 kernel/drivers/net/appletalk/ipddp.h          |   1 +
 kernel/drivers/net/appletalk/ltpc.h           |   1 +
 kernel/drivers/net/arcnet/Makefile            |   1 +
 kernel/drivers/net/arcnet/com9026.h           |   1 +
 kernel/drivers/net/bonding/bond_debugfs.c     |   1 +
 kernel/drivers/net/bonding/bond_procfs.c      |   1 +
 kernel/drivers/net/caif/Makefile              |   1 +
 kernel/drivers/net/can/Makefile               |   1 +
 kernel/drivers/net/can/sja1000/Makefile       |   1 +
 kernel/drivers/net/can/softing/softing.h      |   1 +
 .../net/can/softing/softing_platform.h        |   1 +
 kernel/drivers/net/can/usb/Makefile           |   1 +
 kernel/drivers/net/cris/eth_v10.c             |   1 +
 kernel/drivers/net/dsa/Makefile               |   1 +
 kernel/drivers/net/dsa/b53/Makefile           |   1 +
 kernel/drivers/net/dsa/dsa_loop.h             |   1 +
 kernel/drivers/net/dsa/lan9303.h              |   1 +
 kernel/drivers/net/dsa/mv88e6xxx/Makefile     |   1 +
 kernel/drivers/net/ethernet/3com/Makefile     |   1 +
 kernel/drivers/net/ethernet/8390/Makefile     |   1 +
 kernel/drivers/net/ethernet/Makefile          |   1 +
 kernel/drivers/net/ethernet/aeroflex/greth.h  |   1 +
 kernel/drivers/net/ethernet/alacritech/slic.h |   1 +
 kernel/drivers/net/ethernet/alteon/acenic.h   |   1 +
 kernel/drivers/net/ethernet/amd/7990.h        |   1 +
 kernel/drivers/net/ethernet/amd/Makefile      |   1 +
 kernel/drivers/net/ethernet/amd/hplance.h     |   1 +
 kernel/drivers/net/ethernet/amd/xgbe/Makefile |   1 +
 kernel/drivers/net/ethernet/arc/emac.h        |   1 +
 kernel/drivers/net/ethernet/arc/emac_mdio.c   |   1 +
 kernel/drivers/net/ethernet/atheros/Makefile  |   1 +
 kernel/drivers/net/ethernet/aurora/nb8800.h   |   1 +
 kernel/drivers/net/ethernet/broadcom/Makefile |   1 +
 kernel/drivers/net/ethernet/broadcom/b44.h    |   1 +
 .../net/ethernet/broadcom/bcm63xx_enet.h      |   1 +
 .../net/ethernet/broadcom/bcmsysport.c        |  10 +-
 kernel/drivers/net/ethernet/broadcom/bgmac.h  |   1 +
 kernel/drivers/net/ethernet/broadcom/tg3.h    |   1 +
 kernel/drivers/net/ethernet/cadence/Makefile  |   1 +
 .../net/ethernet/cavium/liquidio/Makefile     |   1 +
 .../net/ethernet/cavium/thunder/Makefile      |   1 +
 kernel/drivers/net/ethernet/chelsio/Makefile  |   1 +
 .../net/ethernet/chelsio/cxgb/fpga_defs.h     |   1 +
 .../net/ethernet/chelsio/cxgb/mv88e1xxx.c     |   1 +
 .../net/ethernet/chelsio/cxgb/mv88e1xxx.h     |   1 +
 .../net/ethernet/chelsio/cxgb/my3126.c        |   1 +
 kernel/drivers/net/ethernet/chelsio/cxgb/tp.c |   1 +
 kernel/drivers/net/ethernet/chelsio/cxgb/tp.h |   1 +
 .../net/ethernet/chelsio/cxgb/vsc7326.c       |   1 +
 .../net/ethernet/chelsio/cxgb/vsc7326_reg.h   |   1 +
 .../drivers/net/ethernet/chelsio/cxgb3/regs.h |   1 +
 .../net/ethernet/chelsio/cxgb3/sge_defs.h     |   1 +
 .../net/ethernet/chelsio/cxgb4/Makefile       |   1 +
 .../net/ethernet/cisco/enic/enic_clsf.c       |   1 +
 .../net/ethernet/cisco/enic/enic_clsf.h       |   1 +
 kernel/drivers/net/ethernet/davicom/dm9000.h  |   1 +
 .../drivers/net/ethernet/dec/tulip/Makefile   |   1 +
 .../drivers/net/ethernet/freescale/Makefile   |   1 +
 .../net/ethernet/freescale/dpaa/Makefile      |   1 +
 kernel/drivers/net/ethernet/freescale/fec.h   |   1 +
 .../net/ethernet/freescale/fman/Makefile      |   1 +
 .../net/ethernet/freescale/fs_enet/Makefile   |   1 +
 .../net/ethernet/freescale/fs_enet/fec.h      |   1 +
 .../net/ethernet/freescale/fs_enet/fs_enet.h  |   1 +
 .../drivers/net/ethernet/hisilicon/Makefile   |   1 +
 .../net/ethernet/hisilicon/hns/Makefile       |   1 +
 .../net/ethernet/hisilicon/hns/hns_enet.c     |   4 +-
 kernel/drivers/net/ethernet/i825xx/Makefile   |   1 +
 kernel/drivers/net/ethernet/ibm/emac/Makefile |   1 +
 kernel/drivers/net/ethernet/intel/Makefile    |   1 +
 .../net/ethernet/intel/i40evf/i40evf_client.c |   1 +
 .../net/ethernet/intel/i40evf/i40evf_client.h |   1 +
 kernel/drivers/net/ethernet/marvell/Makefile  |   1 +
 kernel/drivers/net/ethernet/marvell/skge.h    |   1 +
 kernel/drivers/net/ethernet/marvell/sky2.h    |   1 +
 .../net/ethernet/mellanox/mlx4/Makefile       |   1 +
 .../net/ethernet/mellanox/mlx4/mlx4_stats.h   |   1 +
 .../net/ethernet/mellanox/mlx5/core/Makefile  |   1 +
 .../net/ethernet/mellanox/mlxsw/Makefile      |   1 +
 .../drivers/net/ethernet/mellanox/mlxsw/i2c.c |   2 +-
 .../drivers/net/ethernet/mellanox/mlxsw/reg.h |  25 ++++
 kernel/drivers/net/ethernet/micrel/Makefile   |   1 +
 .../drivers/net/ethernet/micrel/ks8695net.h   |   1 +
 .../net/ethernet/microchip/enc28j60_hw.h      |   1 +
 .../net/ethernet/microchip/encx24j600_hw.h    |   1 +
 .../ethernet/myricom/myri10ge/myri10ge_mcp.h  |   1 +
 .../myri10ge/myri10ge_mcp_gen_header.h        |   1 +
 kernel/drivers/net/ethernet/natsemi/Makefile  |   1 +
 .../drivers/net/ethernet/natsemi/jazzsonic.c  |   1 +
 .../drivers/net/ethernet/natsemi/macsonic.c   |   1 +
 kernel/drivers/net/ethernet/natsemi/sonic.h   |   1 +
 kernel/drivers/net/ethernet/natsemi/xtsonic.c |   1 +
 .../net/ethernet/netronome/nfp/Makefile       |   1 +
 kernel/drivers/net/ethernet/qlogic/Makefile   |   1 +
 .../drivers/net/ethernet/qlogic/qed/Makefile  |   1 +
 .../net/ethernet/qlogic/qed/qed_selftest.h    |   1 +
 .../net/ethernet/qlogic/qlcnic/Makefile       |   1 +
 .../net/ethernet/qlogic/qlge/qlge_dbg.c       |   1 +
 .../net/ethernet/qlogic/qlge/qlge_ethtool.c   |   1 +
 .../net/ethernet/qlogic/qlge/qlge_mpi.c       |   1 +
 kernel/drivers/net/ethernet/qualcomm/Makefile |   1 +
 kernel/drivers/net/ethernet/realtek/atp.h     |   1 +
 kernel/drivers/net/ethernet/seeq/sgiseeq.h    |   1 +
 kernel/drivers/net/ethernet/sfc/Makefile      |   1 +
 .../drivers/net/ethernet/sfc/falcon/Makefile  |   1 +
 kernel/drivers/net/ethernet/sis/sis900.h      |   1 +
 kernel/drivers/net/ethernet/smsc/Makefile     |   1 +
 .../net/ethernet/stmicro/stmmac/Makefile      |   1 +
 .../ethernet/stmicro/stmmac/stmmac_platform.c |  16 +--
 kernel/drivers/net/ethernet/sun/Makefile      |   1 +
 kernel/drivers/net/ethernet/sun/niu.h         |   1 +
 kernel/drivers/net/ethernet/sun/sunbmac.h     |   1 +
 kernel/drivers/net/ethernet/sun/sungem.h      |   1 +
 kernel/drivers/net/ethernet/sun/sunhme.h      |   1 +
 kernel/drivers/net/ethernet/sun/sunqe.h       |   1 +
 .../drivers/net/ethernet/sun/sunvnet_common.h |   1 +
 kernel/drivers/net/ethernet/synopsys/Makefile |   1 +
 kernel/drivers/net/ethernet/ti/Makefile       |   1 +
 kernel/drivers/net/ethernet/tile/Makefile     |   1 +
 kernel/drivers/net/ethernet/toshiba/Makefile  |   1 +
 kernel/drivers/net/ethernet/xilinx/Makefile   |   1 +
 kernel/drivers/net/ethernet/xilinx/ll_temac.h |   1 +
 .../net/ethernet/xilinx/ll_temac_mdio.c       |   1 +
 .../net/ethernet/xilinx/xilinx_axienet.h      |   1 +
 .../net/ethernet/xilinx/xilinx_axienet_mdio.c |   1 +
 kernel/drivers/net/fddi/skfp/Makefile         |   1 +
 kernel/drivers/net/hamradio/Makefile          |   1 +
 kernel/drivers/net/hamradio/z8530.h           |   1 +
 kernel/drivers/net/hippi/rrunner.h            |   1 +
 kernel/drivers/net/ieee802154/Makefile        |   1 +
 kernel/drivers/net/phy/Makefile               |   1 +
 kernel/drivers/net/phy/dp83640_reg.h          |   1 +
 kernel/drivers/net/phy/marvell.c              |   8 +-
 kernel/drivers/net/phy/mdio-boardinfo.h       |   1 +
 kernel/drivers/net/phy/swphy.h                |   1 +
 kernel/drivers/net/ppp/Makefile               |   1 +
 kernel/drivers/net/ppp/ppp_mppe.h             |   1 +
 kernel/drivers/net/slip/slip.h                |   1 +
 kernel/drivers/net/tap.c                      |   2 +
 kernel/drivers/net/team/Makefile              |   1 +
 kernel/drivers/net/tun.c                      |   4 +
 kernel/drivers/net/usb/Makefile               |   1 +
 kernel/drivers/net/vrf.c                      |   2 +-
 kernel/drivers/net/wan/Makefile               |   1 +
 kernel/drivers/net/wan/hd64570.h              |   1 +
 kernel/drivers/net/wan/lapbether.c            |   1 -
 kernel/drivers/net/wan/lmc/lmc.h              |   1 +
 kernel/drivers/net/wan/lmc/lmc_debug.c        |   1 +
 kernel/drivers/net/wan/lmc/lmc_debug.h        |   1 +
 kernel/drivers/net/wan/lmc/lmc_proto.h        |   1 +
 kernel/drivers/net/wan/x25_asy.h              |   1 +
 kernel/drivers/net/wan/z85230.h               |   1 +
 kernel/drivers/net/wimax/i2400m/Makefile      |   1 +
 kernel/drivers/net/wireless/Makefile          |   1 +
 kernel/drivers/net/wireless/admtek/adm8211.h  |   1 +
 kernel/drivers/net/wireless/ath/Makefile      |   1 +
 .../drivers/net/wireless/ath/ath10k/Makefile  |   1 +
 .../drivers/net/wireless/ath/ath10k/htt_rx.c  | 122 ++++++++++++++----
 .../drivers/net/wireless/ath/ath10k/rx_desc.h |   3 +
 .../drivers/net/wireless/ath/ath5k/Makefile   |   1 +
 kernel/drivers/net/wireless/ath/ath5k/sysfs.c |   1 +
 kernel/drivers/net/wireless/ath/ath5k/trace.h |   1 +
 .../drivers/net/wireless/ath/ath6kl/trace.h   |   1 +
 .../drivers/net/wireless/ath/ath9k/Makefile   |   1 +
 .../net/wireless/ath/carl9170/version.h       |   1 +
 .../drivers/net/wireless/ath/wcn36xx/Makefile |   1 +
 .../drivers/net/wireless/ath/wcn36xx/main.c   |   1 -
 .../drivers/net/wireless/ath/wil6210/Makefile |   1 +
 .../net/wireless/broadcom/b43/Makefile        |   1 +
 .../drivers/net/wireless/broadcom/b43/b43.h   |   1 +
 .../drivers/net/wireless/broadcom/b43/bus.h   |   1 +
 .../net/wireless/broadcom/b43/debugfs.h       |   1 +
 .../drivers/net/wireless/broadcom/b43/dma.h   |   1 +
 .../drivers/net/wireless/broadcom/b43/leds.h  |   1 +
 kernel/drivers/net/wireless/broadcom/b43/lo.h |   1 +
 .../drivers/net/wireless/broadcom/b43/phy_a.h |   1 +
 .../net/wireless/broadcom/b43/phy_ac.h        |   1 +
 .../net/wireless/broadcom/b43/phy_common.h    |   1 +
 .../drivers/net/wireless/broadcom/b43/phy_g.h |   1 +
 .../net/wireless/broadcom/b43/phy_ht.h        |   1 +
 .../net/wireless/broadcom/b43/phy_lcn.h       |   1 +
 .../net/wireless/broadcom/b43/phy_lp.h        |   1 +
 .../drivers/net/wireless/broadcom/b43/phy_n.h |   1 +
 .../drivers/net/wireless/broadcom/b43/pio.h   |   1 +
 .../drivers/net/wireless/broadcom/b43/ppr.h   |   1 +
 .../net/wireless/broadcom/b43/radio_2055.h    |   1 +
 .../net/wireless/broadcom/b43/radio_2056.h    |   1 +
 .../net/wireless/broadcom/b43/radio_2057.h    |   1 +
 .../net/wireless/broadcom/b43/radio_2059.h    |   1 +
 .../net/wireless/broadcom/b43/rfkill.h        |   1 +
 .../drivers/net/wireless/broadcom/b43/sdio.h  |   1 +
 .../drivers/net/wireless/broadcom/b43/sysfs.h |   1 +
 .../net/wireless/broadcom/b43/tables.h        |   1 +
 .../net/wireless/broadcom/b43/tables_lpphy.h  |   1 +
 .../net/wireless/broadcom/b43/tables_nphy.h   |   1 +
 .../net/wireless/broadcom/b43/tables_phy_ht.h |   1 +
 .../wireless/broadcom/b43/tables_phy_lcn.h    |   1 +
 kernel/drivers/net/wireless/broadcom/b43/wa.h |   1 +
 .../drivers/net/wireless/broadcom/b43/xmit.h  |   1 +
 .../net/wireless/broadcom/b43legacy/Makefile  |   1 +
 .../wireless/broadcom/b43legacy/b43legacy.h   |   1 +
 .../net/wireless/broadcom/b43legacy/debugfs.h |   1 +
 .../net/wireless/broadcom/b43legacy/dma.h     |   1 +
 .../net/wireless/broadcom/b43legacy/ilt.h     |   1 +
 .../net/wireless/broadcom/b43legacy/leds.h    |   1 +
 .../net/wireless/broadcom/b43legacy/pio.h     |   1 +
 .../net/wireless/broadcom/b43legacy/rfkill.h  |   1 +
 .../net/wireless/broadcom/b43legacy/sysfs.h   |   1 +
 .../net/wireless/broadcom/b43legacy/xmit.h    |   1 +
 .../broadcom/brcm80211/brcmsmac/led.c         |   1 +
 kernel/drivers/net/wireless/cisco/airo.h      |   1 +
 .../net/wireless/intel/ipw2x00/Makefile       |   1 +
 .../net/wireless/intel/iwlegacy/Makefile      |   1 +
 .../net/wireless/intel/iwlwifi/Makefile       |   1 +
 .../net/wireless/intel/iwlwifi/dvm/Makefile   |   1 +
 .../net/wireless/intel/iwlwifi/mvm/Makefile   |   1 +
 .../net/wireless/intersil/hostap/Makefile     |   1 +
 .../net/wireless/intersil/hostap/hostap.h     |   1 +
 .../wireless/intersil/hostap/hostap_80211.h   |   1 +
 .../intersil/hostap/hostap_80211_rx.c         |   1 +
 .../intersil/hostap/hostap_80211_tx.c         |   1 +
 .../net/wireless/intersil/hostap/hostap_ap.c  |   1 +
 .../net/wireless/intersil/hostap/hostap_ap.h  |   1 +
 .../wireless/intersil/hostap/hostap_common.h  |   1 +
 .../wireless/intersil/hostap/hostap_config.h  |   1 +
 .../intersil/hostap/hostap_download.c         |   1 +
 .../wireless/intersil/hostap/hostap_info.c    |   1 +
 .../wireless/intersil/hostap/hostap_ioctl.c   |   1 +
 .../wireless/intersil/hostap/hostap_proc.c    |   1 +
 .../wireless/intersil/hostap/hostap_wlan.h    |   1 +
 .../net/wireless/intersil/orinoco/Makefile    |   1 +
 .../net/wireless/intersil/p54/Makefile        |   1 +
 .../net/wireless/marvell/libertas/Makefile    |   1 +
 .../net/wireless/marvell/libertas/cfg.c       |   1 +
 .../net/wireless/marvell/libertas/cfg.h       |   1 +
 .../net/wireless/marvell/libertas/cmd.h       |   1 +
 .../net/wireless/marvell/libertas/cmdresp.c   |   1 +
 .../net/wireless/marvell/libertas/debugfs.c   |   1 +
 .../net/wireless/marvell/libertas/debugfs.h   |   1 +
 .../net/wireless/marvell/libertas/decl.h      |   1 +
 .../net/wireless/marvell/libertas/defs.h      |   1 +
 .../net/wireless/marvell/libertas/dev.h       |   1 +
 .../net/wireless/marvell/libertas/ethtool.c   |   1 +
 .../net/wireless/marvell/libertas/host.h      |   1 +
 .../net/wireless/marvell/libertas/if_usb.h    |   1 +
 .../net/wireless/marvell/libertas/mesh.c      |   1 +
 .../net/wireless/marvell/libertas/mesh.h      |   1 +
 .../net/wireless/marvell/libertas/radiotap.h  |   1 +
 .../net/wireless/marvell/libertas/types.h     |   1 +
 .../wireless/marvell/libertas_tf/deb_defs.h   |   1 +
 .../net/wireless/quantenna/qtnfmac/Makefile   |   1 +
 .../net/wireless/ralink/rt2x00/Makefile       |   1 +
 kernel/drivers/net/wireless/ray_cs.h          |   1 +
 kernel/drivers/net/wireless/rayctl.h          |   1 +
 .../realtek/rtl818x/rtl8180/rtl8180.h         |   1 +
 .../realtek/rtl818x/rtl8180/rtl8225.h         |   1 +
 .../wireless/realtek/rtl818x/rtl8187/rfkill.h |   1 +
 .../net/wireless/realtek/rtlwifi/Makefile     |   1 +
 .../realtek/rtlwifi/btcoexist/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8188ee/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8192c/Makefile         |   1 +
 .../realtek/rtlwifi/rtl8192ce/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8192cu/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8192de/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8192ee/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8192se/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8723ae/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8723be/Makefile        |   1 +
 .../realtek/rtlwifi/rtl8723com/Makefile       |   1 +
 .../realtek/rtlwifi/rtl8821ae/Makefile        |   1 +
 kernel/drivers/net/wireless/rsi/Makefile      |   1 +
 .../drivers/net/wireless/st/cw1200/Makefile   |   1 +
 kernel/drivers/net/wireless/ti/Makefile       |   1 +
 .../drivers/net/wireless/ti/wl1251/Makefile   |   1 +
 kernel/drivers/net/wireless/ti/wl1251/acx.c   |   1 +
 kernel/drivers/net/wireless/ti/wl1251/cmd.c   |   1 +
 .../net/wireless/ti/wl1251/wl12xx_80211.h     |   1 +
 .../drivers/net/wireless/ti/wlcore/Makefile   |   1 +
 .../net/wireless/ti/wlcore/wl12xx_80211.h     |   1 +
 kernel/drivers/net/wireless/wl3501.h          |   1 +
 .../net/wireless/zydas/zd1211rw/Makefile      |   1 +
 kernel/drivers/nfc/Makefile                   |   1 +
 kernel/drivers/nfc/mei_phy.h                  |   1 +
 kernel/drivers/nfc/microread/Makefile         |   1 +
 kernel/drivers/nfc/nfcmrvl/Makefile           |   1 +
 kernel/drivers/nfc/st-nci/Makefile            |   1 +
 kernel/drivers/nubus/nubus.c                  |   1 +
 kernel/drivers/nubus/proc.c                   |   1 +
 kernel/drivers/nvdimm/Makefile                |   1 +
 kernel/drivers/nvdimm/pmem.h                  |   1 +
 kernel/drivers/nvme/host/Makefile             |   1 +
 kernel/drivers/nvme/host/core.c               |   1 +
 kernel/drivers/nvme/host/rdma.c               |  11 +-
 kernel/drivers/nvme/target/Makefile           |   1 +
 kernel/drivers/nvmem/Makefile                 |   1 +
 kernel/drivers/of/Makefile                    |   1 +
 kernel/drivers/of/unittest-data/Makefile      |   1 +
 kernel/drivers/of/unittest-data/overlay.dts   |   1 +
 .../of/unittest-data/overlay_bad_phandle.dts  |   1 +
 .../drivers/of/unittest-data/overlay_base.dts |   1 +
 kernel/drivers/of/unittest-data/testcases.dts |   1 +
 .../of/unittest-data/tests-interrupts.dtsi    |   1 +
 .../drivers/of/unittest-data/tests-match.dtsi |   1 +
 .../of/unittest-data/tests-overlay.dtsi       |   1 +
 .../of/unittest-data/tests-phandle.dtsi       |   1 +
 .../of/unittest-data/tests-platform.dtsi      |   1 +
 kernel/drivers/of/unittest.c                  |   1 +
 kernel/drivers/oprofile/nmi_timer_int.c       |   1 +
 kernel/drivers/oprofile/oprofile_perf.c       |   1 +
 kernel/drivers/parisc/Makefile                |   1 +
 kernel/drivers/parisc/iommu-helpers.h         |   1 +
 kernel/drivers/parport/Makefile               |   1 +
 kernel/drivers/parport/ieee1284_ops.c         |   1 +
 kernel/drivers/parport/multiface.h            |   1 +
 kernel/drivers/parport/probe.c                |   1 +
 kernel/drivers/parport/procfs.c               |   1 +
 kernel/drivers/pci/Makefile                   |   1 +
 kernel/drivers/pci/dwc/Makefile               |   1 +
 kernel/drivers/pci/host/Makefile              |   1 +
 kernel/drivers/pci/host/pci-ftpci100.c        |   1 +
 kernel/drivers/pci/host/pcie-tango.c          |   1 +
 kernel/drivers/pci/hotplug/Makefile           |   1 +
 kernel/drivers/pci/htirq.c                    |   1 +
 kernel/drivers/pci/irq.c                      |   1 +
 kernel/drivers/pci/pci-label.c                |   1 +
 kernel/drivers/pci/pci-sysfs.c                |   1 +
 kernel/drivers/pci/pci.h                      |   1 +
 kernel/drivers/pci/pcie/Makefile              |   1 +
 kernel/drivers/pci/pcie/aer/Makefile          |   1 +
 kernel/drivers/pci/pcie/aer/aerdrv.h          |   1 +
 kernel/drivers/pci/pcie/aer/aerdrv_acpi.c     |   1 +
 kernel/drivers/pci/pcie/aspm.c                |   1 +
 kernel/drivers/pci/pcie/portdrv.h             |   1 +
 kernel/drivers/pci/pcie/portdrv_core.c        |   1 +
 kernel/drivers/pci/pcie/portdrv_pci.c         |   1 +
 kernel/drivers/pci/proc.c                     |   1 +
 kernel/drivers/pci/quirks.c                   |   1 +
 kernel/drivers/pci/setup-res.c                |   1 +
 kernel/drivers/pci/syscall.c                  |   1 +
 kernel/drivers/pcmcia/Makefile                |   1 +
 kernel/drivers/pcmcia/bcm63xx_pcmcia.h        |   1 +
 kernel/drivers/pcmcia/i82092aa.h              |   1 +
 kernel/drivers/pcmcia/m32r_cfc.h              |   1 +
 kernel/drivers/pcmcia/m32r_pcc.h              |   1 +
 kernel/drivers/pcmcia/pd6729.h                |   1 +
 kernel/drivers/pcmcia/sa1100_assabet.c        |   1 +
 kernel/drivers/pcmcia/sa1100_cerf.c           |   1 +
 kernel/drivers/pcmcia/sa1100_generic.h        |   1 +
 kernel/drivers/pcmcia/sa1100_h3600.c          |   1 +
 kernel/drivers/pcmcia/sa1100_shannon.c        |   1 +
 kernel/drivers/pcmcia/sa1100_simpad.c         |   1 +
 kernel/drivers/pcmcia/sa1111_generic.h        |   1 +
 kernel/drivers/pcmcia/sa1111_jornada720.c     |   1 +
 kernel/drivers/pcmcia/sa1111_neponset.c       |   1 +
 kernel/drivers/pcmcia/soc_common.h            |   1 +
 kernel/drivers/pcmcia/yenta_socket.h          |   1 +
 kernel/drivers/perf/Makefile                  |   1 +
 kernel/drivers/perf/arm_pmu_platform.c        |   1 +
 kernel/drivers/phy/Makefile                   |   1 +
 kernel/drivers/phy/broadcom/Makefile          |   1 +
 kernel/drivers/phy/marvell/Makefile           |   1 +
 kernel/drivers/phy/qualcomm/Makefile          |   1 +
 kernel/drivers/phy/rockchip/Makefile          |   1 +
 kernel/drivers/phy/samsung/Makefile           |   1 +
 kernel/drivers/phy/ti/Makefile                |   1 +
 kernel/drivers/pinctrl/Makefile               |   1 +
 kernel/drivers/pinctrl/bcm/Makefile           |   1 +
 kernel/drivers/pinctrl/freescale/Makefile     |   1 +
 kernel/drivers/pinctrl/intel/Makefile         |   1 +
 kernel/drivers/pinctrl/mediatek/Makefile      |   1 +
 .../pinctrl/mediatek/pinctrl-mtk-mt6397.h     |   1 +
 .../pinctrl/mediatek/pinctrl-mtk-mt8127.h     |   1 +
 kernel/drivers/pinctrl/mvebu/Makefile         |   1 +
 kernel/drivers/pinctrl/nomadik/Makefile       |   1 +
 .../drivers/pinctrl/nomadik/pinctrl-abx500.h  |   1 +
 .../pinctrl/nomadik/pinctrl-nomadik-db8500.c  |   1 +
 .../pinctrl/nomadik/pinctrl-nomadik-db8540.c  |   1 +
 .../pinctrl/nomadik/pinctrl-nomadik-stn8815.c |   1 +
 .../drivers/pinctrl/nomadik/pinctrl-nomadik.h |   1 +
 kernel/drivers/pinctrl/pinctrl-coh901.h       |   1 +
 kernel/drivers/pinctrl/qcom/Makefile          |   1 +
 kernel/drivers/pinctrl/samsung/Makefile       |   1 +
 kernel/drivers/pinctrl/sh-pfc/Makefile        |   1 +
 kernel/drivers/pinctrl/sh-pfc/pfc-sh7722.c    |   1 +
 kernel/drivers/pinctrl/spear/Makefile         |   1 +
 kernel/drivers/pinctrl/stm32/Makefile         |   1 +
 kernel/drivers/pinctrl/sunxi/Makefile         |   1 +
 kernel/drivers/pinctrl/tegra/Makefile         |   1 +
 kernel/drivers/pinctrl/uniphier/Makefile      |   1 +
 kernel/drivers/pinctrl/vt8500/Makefile        |   1 +
 kernel/drivers/platform/Makefile              |   1 +
 kernel/drivers/platform/chrome/Makefile       |   1 +
 kernel/drivers/platform/x86/Makefile          |   1 +
 kernel/drivers/pnp/Makefile                   |   1 +
 kernel/drivers/pnp/base.h                     |   1 +
 kernel/drivers/pnp/card.c                     |   1 +
 kernel/drivers/pnp/core.c                     |   1 +
 kernel/drivers/pnp/driver.c                   |   1 +
 kernel/drivers/pnp/interface.c                |   1 +
 kernel/drivers/pnp/isapnp/compat.c            |   1 +
 kernel/drivers/pnp/manager.c                  |   1 +
 kernel/drivers/pnp/pnpacpi/pnpacpi.h          |   1 +
 kernel/drivers/pnp/pnpbios/bioscalls.c        |   1 +
 kernel/drivers/pnp/pnpbios/proc.c             |   1 +
 kernel/drivers/pnp/pnpbios/rsparser.c         |   1 +
 kernel/drivers/pnp/quirks.c                   |   1 +
 kernel/drivers/pnp/resource.c                 |   1 +
 kernel/drivers/pnp/support.c                  |   1 +
 kernel/drivers/pnp/system.c                   |   1 +
 kernel/drivers/power/reset/Makefile           |   1 +
 kernel/drivers/power/reset/gemini-poweroff.c  |   1 +
 kernel/drivers/power/reset/piix4-poweroff.c   |   4 +-
 kernel/drivers/power/supply/Makefile          |   1 +
 kernel/drivers/power/supply/ab8500_bmdata.c   |   1 +
 kernel/drivers/ptp/Makefile                   |   1 +
 kernel/drivers/pwm/Makefile                   |   1 +
 kernel/drivers/rapidio/Makefile               |   1 +
 kernel/drivers/rapidio/switches/Makefile      |   1 +
 kernel/drivers/ras/cec.c                      |   1 +
 kernel/drivers/ras/debugfs.h                  |   1 +
 kernel/drivers/ras/ras.c                      |   1 +
 kernel/drivers/regulator/Makefile             |   1 +
 kernel/drivers/regulator/fixed-helper.c       |   1 +
 kernel/drivers/remoteproc/Makefile            |   1 +
 kernel/drivers/remoteproc/qcom_common.h       |   1 +
 kernel/drivers/remoteproc/qcom_wcnss.h        |   1 +
 kernel/drivers/reset/Makefile                 |   1 +
 kernel/drivers/rpmsg/Makefile                 |   1 +
 kernel/drivers/rtc/Makefile                   |   1 +
 kernel/drivers/rtc/rtc-core.h                 |   1 +
 kernel/drivers/rtc/rtc-efi-platform.c         |   1 +
 kernel/drivers/rtc/rtc-sa1100.h               |   1 +
 kernel/drivers/s390/block/Makefile            |   1 +
 kernel/drivers/s390/block/dasd_3990_erp.c     |   1 +
 kernel/drivers/s390/block/dasd_alias.c        |   1 +
 kernel/drivers/s390/block/dasd_diag.h         |   1 +
 kernel/drivers/s390/block/dasd_eckd.h         |   1 +
 kernel/drivers/s390/block/dasd_eer.c          |   1 +
 kernel/drivers/s390/block/dasd_erp.c          |   1 +
 kernel/drivers/s390/block/dasd_fba.h          |   1 +
 kernel/drivers/s390/block/dasd_genhd.c        |   1 +
 kernel/drivers/s390/block/dasd_int.h          |   1 +
 kernel/drivers/s390/block/dasd_ioctl.c        |   1 +
 kernel/drivers/s390/block/dasd_proc.c         |   1 +
 kernel/drivers/s390/block/scm_blk.h           |   1 +
 kernel/drivers/s390/block/scm_drv.c           |   1 +
 kernel/drivers/s390/char/Makefile             |   1 +
 kernel/drivers/s390/char/con3215.c            |   1 +
 kernel/drivers/s390/char/con3270.c            |   1 +
 kernel/drivers/s390/char/ctrlchar.c           |   1 +
 kernel/drivers/s390/char/ctrlchar.h           |   1 +
 kernel/drivers/s390/char/defkeymap.c          |   1 +
 kernel/drivers/s390/char/diag_ftp.c           |   1 +
 kernel/drivers/s390/char/diag_ftp.h           |   1 +
 kernel/drivers/s390/char/hmcdrv_cache.c       |   1 +
 kernel/drivers/s390/char/hmcdrv_cache.h       |   1 +
 kernel/drivers/s390/char/hmcdrv_dev.c         |   1 +
 kernel/drivers/s390/char/hmcdrv_dev.h         |   1 +
 kernel/drivers/s390/char/hmcdrv_ftp.c         |   1 +
 kernel/drivers/s390/char/hmcdrv_ftp.h         |   1 +
 kernel/drivers/s390/char/keyboard.c           |   1 +
 kernel/drivers/s390/char/keyboard.h           |   1 +
 kernel/drivers/s390/char/raw3270.h            |   1 +
 kernel/drivers/s390/char/sclp.c               |   1 +
 kernel/drivers/s390/char/sclp.h               |   1 +
 kernel/drivers/s390/char/sclp_cmd.c           |   1 +
 kernel/drivers/s390/char/sclp_con.c           |   1 +
 kernel/drivers/s390/char/sclp_config.c        |   1 +
 kernel/drivers/s390/char/sclp_cpi_sys.c       |   1 +
 kernel/drivers/s390/char/sclp_cpi_sys.h       |   1 +
 kernel/drivers/s390/char/sclp_ctl.c           |   1 +
 kernel/drivers/s390/char/sclp_diag.h          |   1 +
 kernel/drivers/s390/char/sclp_early.c         |   1 +
 kernel/drivers/s390/char/sclp_early_core.c    |   1 +
 kernel/drivers/s390/char/sclp_ftp.c           |   1 +
 kernel/drivers/s390/char/sclp_ftp.h           |   1 +
 kernel/drivers/s390/char/sclp_ocf.c           |   1 +
 kernel/drivers/s390/char/sclp_pci.c           |   1 +
 kernel/drivers/s390/char/sclp_quiesce.c       |   1 +
 kernel/drivers/s390/char/sclp_rw.c            |   1 +
 kernel/drivers/s390/char/sclp_rw.h            |   1 +
 kernel/drivers/s390/char/sclp_sdias.c         |   1 +
 kernel/drivers/s390/char/sclp_sdias.h         |   1 +
 kernel/drivers/s390/char/sclp_tty.c           |   1 +
 kernel/drivers/s390/char/sclp_tty.h           |   1 +
 kernel/drivers/s390/char/sclp_vt220.c         |   1 +
 kernel/drivers/s390/char/tape.h               |   1 +
 kernel/drivers/s390/char/tape_3590.h          |   1 +
 kernel/drivers/s390/char/tape_char.c          |   1 +
 kernel/drivers/s390/char/tape_class.h         |   1 +
 kernel/drivers/s390/char/tape_proc.c          |   1 +
 kernel/drivers/s390/char/tape_std.c           |   1 +
 kernel/drivers/s390/char/tape_std.h           |   1 +
 kernel/drivers/s390/char/tty3270.h            |   1 +
 kernel/drivers/s390/char/vmcp.c               |   1 +
 kernel/drivers/s390/char/vmur.h               |   1 +
 kernel/drivers/s390/cio/Makefile              |   1 +
 kernel/drivers/s390/cio/airq.c                |   1 +
 kernel/drivers/s390/cio/blacklist.c           |   1 +
 kernel/drivers/s390/cio/ccwreq.c              |   1 +
 kernel/drivers/s390/cio/chp.h                 |   1 +
 kernel/drivers/s390/cio/chsc.h                |   1 +
 kernel/drivers/s390/cio/chsc_sch.h            |   1 +
 kernel/drivers/s390/cio/cio.h                 |   1 +
 kernel/drivers/s390/cio/cio_debug.h           |   1 +
 kernel/drivers/s390/cio/crw.c                 |   1 +
 kernel/drivers/s390/cio/css.h                 |   1 +
 kernel/drivers/s390/cio/device.h              |   1 +
 kernel/drivers/s390/cio/device_id.c           |   1 +
 kernel/drivers/s390/cio/device_pgid.c         |   1 +
 kernel/drivers/s390/cio/device_status.c       |   1 +
 kernel/drivers/s390/cio/eadm_sch.h            |   1 +
 kernel/drivers/s390/cio/fcx.c                 |   1 +
 kernel/drivers/s390/cio/idset.c               |   1 +
 kernel/drivers/s390/cio/idset.h               |   1 +
 kernel/drivers/s390/cio/io_sch.h              |   1 +
 kernel/drivers/s390/cio/ioasm.c               |   1 +
 kernel/drivers/s390/cio/ioasm.h               |   1 +
 kernel/drivers/s390/cio/itcw.c                |   1 +
 kernel/drivers/s390/cio/orb.h                 |   1 +
 kernel/drivers/s390/cio/qdio.h                |   1 +
 kernel/drivers/s390/cio/qdio_debug.c          |   1 +
 kernel/drivers/s390/cio/qdio_debug.h          |   1 +
 kernel/drivers/s390/cio/qdio_thinint.c        |   1 +
 kernel/drivers/s390/cio/trace.c               |   1 +
 kernel/drivers/s390/cio/trace.h               |   1 +
 kernel/drivers/s390/cio/vfio_ccw_cp.c         |   1 +
 kernel/drivers/s390/cio/vfio_ccw_cp.h         |   1 +
 kernel/drivers/s390/cio/vfio_ccw_fsm.c        |   1 +
 kernel/drivers/s390/cio/vfio_ccw_ops.c        |   1 +
 kernel/drivers/s390/cio/vfio_ccw_private.h    |   1 +
 kernel/drivers/s390/crypto/Makefile           |   1 +
 kernel/drivers/s390/crypto/ap_asm.h           |   1 +
 kernel/drivers/s390/crypto/ap_card.c          |   1 +
 kernel/drivers/s390/crypto/ap_debug.h         |   1 +
 kernel/drivers/s390/crypto/ap_queue.c         |   1 +
 kernel/drivers/s390/crypto/zcrypt_cex4.h      |   1 +
 kernel/drivers/s390/crypto/zcrypt_debug.h     |   1 +
 kernel/drivers/s390/net/Makefile              |   1 +
 kernel/drivers/s390/net/ctcm_dbug.c           |   1 +
 kernel/drivers/s390/net/ctcm_dbug.h           |   1 +
 kernel/drivers/s390/net/ctcm_fsms.c           |   1 +
 kernel/drivers/s390/net/ctcm_fsms.h           |   1 +
 kernel/drivers/s390/net/ctcm_main.h           |   1 +
 kernel/drivers/s390/net/ctcm_mpc.c            |   1 +
 kernel/drivers/s390/net/ctcm_mpc.h            |   1 +
 kernel/drivers/s390/net/ctcm_sysfs.c          |   1 +
 kernel/drivers/s390/net/fsm.h                 |   1 +
 kernel/drivers/s390/net/lcs.h                 |   1 +
 kernel/drivers/s390/net/qeth_core.h           |   1 +
 kernel/drivers/s390/net/qeth_core_mpc.c       |   1 +
 kernel/drivers/s390/net/qeth_core_mpc.h       |   1 +
 kernel/drivers/s390/net/qeth_l2.h             |   1 +
 kernel/drivers/s390/net/qeth_l2_sys.c         |   1 +
 kernel/drivers/s390/net/qeth_l3.h             |   1 +
 kernel/drivers/s390/net/qeth_l3_sys.c         |   1 +
 kernel/drivers/s390/net/smsgiucv.h            |   1 +
 kernel/drivers/s390/scsi/zfcp_ccw.c           |   1 +
 kernel/drivers/s390/scsi/zfcp_dbf.c           |   1 +
 kernel/drivers/s390/scsi/zfcp_dbf.h           |   1 +
 kernel/drivers/s390/scsi/zfcp_def.h           |   1 +
 kernel/drivers/s390/scsi/zfcp_erp.c           |   1 +
 kernel/drivers/s390/scsi/zfcp_ext.h           |   1 +
 kernel/drivers/s390/scsi/zfcp_fc.c            |   1 +
 kernel/drivers/s390/scsi/zfcp_fc.h            |   1 +
 kernel/drivers/s390/scsi/zfcp_fsf.c           |   1 +
 kernel/drivers/s390/scsi/zfcp_fsf.h           |   1 +
 kernel/drivers/s390/scsi/zfcp_qdio.c          |   1 +
 kernel/drivers/s390/scsi/zfcp_qdio.h          |   1 +
 kernel/drivers/s390/scsi/zfcp_reqlist.h       |   1 +
 kernel/drivers/s390/scsi/zfcp_scsi.c          |   1 +
 kernel/drivers/s390/scsi/zfcp_sysfs.c         |   1 +
 kernel/drivers/s390/scsi/zfcp_unit.c          |   1 +
 kernel/drivers/sbus/char/Makefile             |   1 +
 kernel/drivers/sbus/char/bbc_envctrl.c        |   1 +
 kernel/drivers/sbus/char/bbc_i2c.h            |   1 +
 kernel/drivers/sbus/char/max1617.h            |   1 +
 kernel/drivers/scsi/53c700.h                  |   1 +
 kernel/drivers/scsi/Makefile                  |   1 +
 kernel/drivers/scsi/NCR5380.c                 |   1 +
 kernel/drivers/scsi/NCR5380.h                 |   1 +
 kernel/drivers/scsi/NCR_D700.h                |   1 +
 kernel/drivers/scsi/NCR_Q720.h                |   1 +
 kernel/drivers/scsi/a2091.h                   |   1 +
 kernel/drivers/scsi/a3000.h                   |   1 +
 kernel/drivers/scsi/aha152x.h                 |   1 +
 kernel/drivers/scsi/aha1542.h                 |   1 +
 kernel/drivers/scsi/aha1740.h                 |   1 +
 kernel/drivers/scsi/aic7xxx/Makefile          |   1 +
 kernel/drivers/scsi/aic7xxx/aicasm/Makefile   |   1 +
 kernel/drivers/scsi/arm/Makefile              |   1 +
 kernel/drivers/scsi/atp870u.h                 |   1 +
 kernel/drivers/scsi/bfa/Makefile              |   1 +
 kernel/drivers/scsi/constants.c               |   1 +
 kernel/drivers/scsi/csiostor/Makefile         |   1 +
 kernel/drivers/scsi/dc395x.h                  |   1 +
 kernel/drivers/scsi/eata_generic.h            |   1 +
 kernel/drivers/scsi/eata_pio.h                |   1 +
 kernel/drivers/scsi/esp_scsi.h                |   1 +
 kernel/drivers/scsi/fcoe/libfcoe.h            |   1 +
 kernel/drivers/scsi/fnic/Makefile             |   1 +
 kernel/drivers/scsi/gdth.h                    |   1 +
 kernel/drivers/scsi/gdth_ioctl.h              |   1 +
 kernel/drivers/scsi/gdth_proc.c               |   1 +
 kernel/drivers/scsi/gdth_proc.h               |   1 +
 kernel/drivers/scsi/gvp11.h                   |   1 +
 kernel/drivers/scsi/ibmvscsi_tgt/libsrp.h     |   1 +
 kernel/drivers/scsi/imm.h                     |   1 +
 kernel/drivers/scsi/isci/Makefile             |   1 +
 kernel/drivers/scsi/libfc/Makefile            |   1 +
 kernel/drivers/scsi/mac53c94.h                |   1 +
 kernel/drivers/scsi/megaraid.h                |   1 +
 kernel/drivers/scsi/megaraid/Makefile         |   1 +
 kernel/drivers/scsi/mesh.h                    |   1 +
 kernel/drivers/scsi/mpt3sas/Makefile          |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2.h        |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h   |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_init.h   |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h    |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_raid.h   |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_sas.h    |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_tool.h   |   1 +
 kernel/drivers/scsi/mpt3sas/mpi/mpi2_type.h   |   1 +
 kernel/drivers/scsi/mvme147.c                 |   1 +
 kernel/drivers/scsi/mvme147.h                 |   1 +
 kernel/drivers/scsi/osst.h                    |   1 +
 kernel/drivers/scsi/osst_detect.h             |   1 +
 kernel/drivers/scsi/osst_options.h            |   1 +
 kernel/drivers/scsi/pcmcia/Makefile           |   1 +
 kernel/drivers/scsi/pm8001/Makefile           |   1 +
 kernel/drivers/scsi/ppa.h                     |   1 +
 kernel/drivers/scsi/qla2xxx/Makefile          |   1 +
 kernel/drivers/scsi/qla2xxx/qla_devtbl.h      |   1 +
 kernel/drivers/scsi/qla2xxx/qla_os.c          |   1 +
 kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h     |   1 +
 kernel/drivers/scsi/qlogicfas408.h            |   1 +
 kernel/drivers/scsi/qlogicpti.h               |   1 +
 kernel/drivers/scsi/scsi.h                    |   1 +
 kernel/drivers/scsi/scsi_common.c             |   1 +
 kernel/drivers/scsi/scsi_debugfs.c            |   1 +
 kernel/drivers/scsi/scsi_devinfo.c            |   1 +
 kernel/drivers/scsi/scsi_lib_dma.c            |   1 +
 kernel/drivers/scsi/scsi_logging.h            |   1 +
 kernel/drivers/scsi/scsi_priv.h               |   1 +
 kernel/drivers/scsi/scsi_proc.c               |   1 +
 kernel/drivers/scsi/scsi_sas_internal.h       |   1 +
 kernel/drivers/scsi/scsi_scan.c               |   1 +
 kernel/drivers/scsi/scsi_transport_api.h      |   1 +
 kernel/drivers/scsi/scsicam.c                 |   1 +
 kernel/drivers/scsi/sd.h                      |   1 +
 kernel/drivers/scsi/sense_codes.h             |   1 +
 kernel/drivers/scsi/snic/Makefile             |   1 +
 kernel/drivers/scsi/sr.h                      |   1 +
 kernel/drivers/scsi/sr_ioctl.c                |   1 +
 kernel/drivers/scsi/sr_vendor.c               |   1 +
 kernel/drivers/scsi/st.h                      |   1 +
 kernel/drivers/scsi/st_options.h              |   1 +
 kernel/drivers/scsi/ufs/Makefile              |   1 +
 kernel/drivers/scsi/wd719x.h                  |   1 +
 kernel/drivers/sh/Makefile                    |   1 +
 kernel/drivers/sh/intc/internals.h            |   1 +
 kernel/drivers/soc/Makefile                   |   1 +
 kernel/drivers/soc/dove/pmu.c                 |   1 +
 kernel/drivers/soc/fsl/qbman/Makefile         |   1 +
 kernel/drivers/soc/fsl/qe/Makefile            |   1 +
 kernel/drivers/soc/qcom/Makefile              |   1 +
 kernel/drivers/soc/renesas/Makefile           |   1 +
 kernel/drivers/soc/tegra/Makefile             |   1 +
 kernel/drivers/soc/tegra/fuse/Makefile        |   1 +
 kernel/drivers/soc/ti/Makefile                |   1 +
 kernel/drivers/spi/Makefile                   |   1 +
 kernel/drivers/spi/spi-bcm53xx.h              |   1 +
 kernel/drivers/spi/spi-bitbang-txrx.h         |   1 +
 kernel/drivers/spi/spi-cavium.h               |   1 +
 kernel/drivers/spi/spi-dw.h                   |   1 +
 kernel/drivers/ssb/Makefile                   |   1 +
 kernel/drivers/ssb/ssb_private.h              |   1 +
 kernel/drivers/staging/Makefile               |   1 +
 kernel/drivers/staging/android/ion/Makefile   |   1 +
 kernel/drivers/staging/board/board.h          |   1 +
 kernel/drivers/staging/board/kzm9d.c          |   1 +
 kernel/drivers/staging/comedi/Makefile        |   1 +
 .../drivers/staging/comedi/comedi_internal.h  |   1 +
 .../drivers/staging/comedi/drivers/Makefile   |   1 +
 .../drivers/staging/comedi/drivers/addi_tcw.h |   1 +
 .../staging/comedi/drivers/addi_watchdog.h    |   1 +
 .../staging/comedi/drivers/amcc_s5933.h       |   1 +
 .../drivers/staging/comedi/drivers/jr3_pci.h  |   1 +
 .../staging/comedi/drivers/ni_labpc_isadma.h  |   1 +
 .../staging/comedi/drivers/ni_labpc_regs.h    |   1 +
 kernel/drivers/staging/comedi/drivers/z8536.h |   1 +
 kernel/drivers/staging/dgnc/dgnc_utils.c      |   1 +
 kernel/drivers/staging/dgnc/dgnc_utils.h      |   1 +
 kernel/drivers/staging/fbtft/Makefile         |   1 +
 kernel/drivers/staging/fbtft/fbtft-bus.c      |   1 +
 kernel/drivers/staging/fbtft/fbtft-io.c       |   1 +
 kernel/drivers/staging/fbtft/fbtft-sysfs.c    |   1 +
 kernel/drivers/staging/fwserial/fwserial.h    |   1 +
 kernel/drivers/staging/gdm724x/Makefile       |   1 +
 kernel/drivers/staging/greybus/Makefile       |   1 +
 kernel/drivers/staging/greybus/greybus_id.h   |   1 +
 kernel/drivers/staging/greybus/tools/Makefile |   1 +
 kernel/drivers/staging/iio/Makefile           |   1 +
 kernel/drivers/staging/iio/adc/Makefile       |   1 +
 kernel/drivers/staging/iio/meter/Makefile     |   1 +
 kernel/drivers/staging/iio/meter/ade7854.h    |   1 +
 kernel/drivers/staging/iio/meter/meter.h      |   1 +
 .../staging/iio/trigger/iio-trig-bfin-timer.h |   1 +
 kernel/drivers/staging/ks7010/eap_packet.h    |   1 +
 .../staging/lustre/lnet/libcfs/Makefile       |   1 +
 .../drivers/staging/lustre/lnet/lnet/Makefile |   1 +
 .../staging/lustre/lustre/llite/Makefile      |   1 +
 .../staging/lustre/lustre/llite/xattr_cache.c |   1 +
 .../staging/lustre/lustre/lov/Makefile        |   1 +
 .../staging/lustre/lustre/obdclass/Makefile   |   1 +
 .../staging/lustre/lustre/ptlrpc/Makefile     |   1 +
 kernel/drivers/staging/media/Makefile         |   1 +
 .../staging/media/atomisp/i2c/Makefile        |   1 +
 .../staging/media/atomisp/i2c/imx/Makefile    |   1 +
 .../staging/media/atomisp/i2c/imx/ad5816g.c   |   1 +
 .../staging/media/atomisp/i2c/imx/ad5816g.h   |   1 +
 .../staging/media/atomisp/i2c/imx/common.h    |   1 +
 .../staging/media/atomisp/i2c/imx/drv201.c    |   1 +
 .../staging/media/atomisp/i2c/imx/drv201.h    |   1 +
 .../staging/media/atomisp/i2c/imx/dw9714.c    |   1 +
 .../staging/media/atomisp/i2c/imx/dw9714.h    |   1 +
 .../staging/media/atomisp/i2c/imx/imx134.h    |   1 +
 .../staging/media/atomisp/i2c/imx/imx175.h    |   1 +
 .../staging/media/atomisp/i2c/imx/imx219.h    |   1 +
 .../staging/media/atomisp/i2c/imx/imx227.h    |   1 +
 .../staging/media/atomisp/i2c/ov5693/Makefile |   1 +
 .../include/asm/intel_mid_pcihelpers.h        |   1 +
 .../media/atomisp/pci/atomisp2/Makefile       |   1 +
 .../platform/intel-mid/intel_mid_pcihelpers.c |   1 +
 kernel/drivers/staging/media/imx/Makefile     |   1 +
 kernel/drivers/staging/most/Makefile          |   1 +
 kernel/drivers/staging/nvec/Makefile          |   1 +
 kernel/drivers/staging/olpc_dcon/olpc_dcon.h  |   1 +
 kernel/drivers/staging/rtl8188eu/Makefile     |   1 +
 .../rtl8188eu/hal/Hal8188ERateAdaptive.c      |   1 +
 .../rtl8188eu/include/Hal8188ERateAdaptive.h  |   1 +
 .../drivers/staging/rtl8188eu/include/phy.h   |   1 +
 kernel/drivers/staging/rtl8188eu/include/rf.h |   1 +
 kernel/drivers/staging/rtl8192e/Makefile      |   1 +
 .../staging/rtl8192e/rtl8192e/Makefile        |   1 +
 kernel/drivers/staging/rtl8192u/Makefile      |   1 +
 .../staging/rtl8192u/ieee80211/Makefile       |   1 +
 .../staging/rtl8192u/ieee80211/dot11d.c       |   1 +
 .../staging/rtl8192u/ieee80211/dot11d.h       |   1 +
 .../staging/rtl8192u/ieee80211/rtl819x_BA.h   |   1 +
 .../rtl8192u/ieee80211/rtl819x_BAProc.c       |   1 +
 .../staging/rtl8192u/ieee80211/rtl819x_HT.h   |   1 +
 .../rtl8192u/ieee80211/rtl819x_HTProc.c       |   1 +
 .../staging/rtl8192u/ieee80211/rtl819x_Qos.h  |   1 +
 .../staging/rtl8192u/ieee80211/rtl819x_TS.h   |   1 +
 .../rtl8192u/ieee80211/rtl819x_TSProc.c       |   1 +
 kernel/drivers/staging/rtl8192u/r8192U_dm.c   |   1 +
 kernel/drivers/staging/rtl8192u/r8192U_dm.h   |   1 +
 .../drivers/staging/rtl8192u/r819xU_cmdpkt.c  |   1 +
 .../drivers/staging/rtl8192u/r819xU_cmdpkt.h  |   1 +
 .../staging/rtl8192u/r819xU_firmware.c        |   1 +
 .../staging/rtl8192u/r819xU_firmware.h        |   1 +
 .../staging/rtl8192u/r819xU_firmware_img.c    |   1 +
 .../staging/rtl8192u/r819xU_firmware_img.h    |   1 +
 kernel/drivers/staging/rtl8192u/r819xU_phy.c  |   1 +
 kernel/drivers/staging/rtl8192u/r819xU_phy.h  |   1 +
 .../drivers/staging/rtl8192u/r819xU_phyreg.h  |   1 +
 kernel/drivers/staging/rtl8712/Makefile       |   1 +
 .../drivers/staging/rtl8712/rtl8712_efuse.h   |   1 +
 .../drivers/staging/rtl8712/rtl871x_ioctl.h   |   1 +
 .../staging/rtl8712/rtl871x_mp_phy_regdef.h   |   1 +
 kernel/drivers/staging/rtl8712/rtl871x_recv.h |   1 +
 kernel/drivers/staging/rtl8723bs/Makefile     |   1 +
 .../staging/rtl8723bs/hal/Hal8723BReg.h       |   1 +
 .../rtl8723bs/include/Hal8723BPwrSeq.h        |   1 +
 .../staging/rtl8723bs/include/rtw_wifi_regd.h |   1 +
 .../staging/rtl8723bs/os_dep/wifi_regd.c      |   1 +
 kernel/drivers/staging/rts5208/trace.c        |   1 +
 kernel/drivers/staging/skein/Makefile         |   1 +
 kernel/drivers/staging/skein/skein_iv.h       |   1 +
 kernel/drivers/staging/skein/threefish_api.c  |   1 +
 kernel/drivers/staging/skein/threefish_api.h  |   1 +
 .../drivers/staging/skein/threefish_block.c   |   1 +
 kernel/drivers/staging/sm750fb/ddk750_chip.c  |   1 +
 kernel/drivers/staging/sm750fb/ddk750_chip.h  |   1 +
 .../drivers/staging/sm750fb/ddk750_display.c  |   1 +
 .../drivers/staging/sm750fb/ddk750_display.h  |   1 +
 kernel/drivers/staging/sm750fb/ddk750_dvi.c   |   1 +
 kernel/drivers/staging/sm750fb/ddk750_dvi.h   |   1 +
 kernel/drivers/staging/sm750fb/ddk750_hwi2c.c |   1 +
 kernel/drivers/staging/sm750fb/ddk750_hwi2c.h |   1 +
 kernel/drivers/staging/sm750fb/ddk750_mode.c  |   1 +
 kernel/drivers/staging/sm750fb/ddk750_mode.h  |   1 +
 kernel/drivers/staging/sm750fb/ddk750_power.c |   1 +
 kernel/drivers/staging/sm750fb/ddk750_power.h |   1 +
 kernel/drivers/staging/sm750fb/ddk750_reg.h   |   1 +
 .../drivers/staging/sm750fb/ddk750_sii164.c   |   1 +
 .../drivers/staging/sm750fb/ddk750_sii164.h   |   1 +
 kernel/drivers/staging/sm750fb/sm750.h        |   1 +
 kernel/drivers/staging/sm750fb/sm750_accel.c  |   1 +
 kernel/drivers/staging/sm750fb/sm750_accel.h  |   1 +
 kernel/drivers/staging/sm750fb/sm750_cursor.c |   1 +
 kernel/drivers/staging/sm750fb/sm750_cursor.h |   1 +
 kernel/drivers/staging/sm750fb/sm750_hw.c     |   1 +
 kernel/drivers/staging/speakup/Makefile       |   1 +
 kernel/drivers/staging/speakup/devsynth.c     |   1 +
 kernel/drivers/staging/speakup/i18n.c         |   1 +
 kernel/drivers/staging/speakup/i18n.h         |   1 +
 kernel/drivers/staging/speakup/selection.c    |   1 +
 kernel/drivers/staging/speakup/serialio.h     |   1 +
 kernel/drivers/staging/speakup/speakup.h      |   1 +
 kernel/drivers/staging/speakup/speakup_acnt.h |   1 +
 kernel/drivers/staging/speakup/speakup_dtlk.h |   1 +
 kernel/drivers/staging/speakup/speakupmap.h   |   1 +
 kernel/drivers/staging/speakup/spk_types.h    |   1 +
 .../drivers/staging/unisys/visorbus/Makefile  |   1 +
 kernel/drivers/staging/vboxvideo/Makefile     |   1 +
 kernel/drivers/staging/vc04_services/Makefile |   1 +
 .../vc04_services/bcm2835-camera/Makefile     |   1 +
 .../interface/vchiq_arm/vchiq_genversion      |   1 +
 kernel/drivers/staging/vme/devices/vme_pio2.h |   1 +
 kernel/drivers/staging/vme/devices/vme_user.h |   1 +
 kernel/drivers/staging/vt6655/Makefile        |   1 +
 kernel/drivers/staging/vt6656/Makefile        |   1 +
 kernel/drivers/staging/wilc1000/Makefile      |   1 +
 .../staging/wilc1000/coreconfigurator.c       |   1 +
 .../staging/wilc1000/coreconfigurator.h       |   1 +
 .../drivers/staging/wilc1000/host_interface.c |   1 +
 .../drivers/staging/wilc1000/host_interface.h |   1 +
 kernel/drivers/staging/wilc1000/linux_mon.c   |   1 +
 .../staging/wilc1000/wilc_wfi_cfgoperations.c |   1 +
 .../staging/wilc1000/wilc_wfi_cfgoperations.h |   1 +
 .../staging/wilc1000/wilc_wfi_netdevice.h     |   1 +
 kernel/drivers/staging/wilc1000/wilc_wlan.h   |   1 +
 .../drivers/staging/wilc1000/wilc_wlan_cfg.c  |   1 +
 .../drivers/staging/wilc1000/wilc_wlan_cfg.h  |   1 +
 .../drivers/staging/wilc1000/wilc_wlan_if.h   |   1 +
 kernel/drivers/staging/wlan-ng/Makefile       |   1 +
 kernel/drivers/staging/wlan-ng/cfg80211.c     |   1 +
 kernel/drivers/staging/wlan-ng/prism2usb.c    |   1 +
 kernel/drivers/staging/xgifb/XGI_main.h       |   1 +
 kernel/drivers/staging/xgifb/XGIfb.h          |   1 +
 kernel/drivers/staging/xgifb/vb_def.h         |   1 +
 kernel/drivers/staging/xgifb/vb_init.c        |   1 +
 kernel/drivers/staging/xgifb/vb_init.h        |   1 +
 kernel/drivers/staging/xgifb/vb_setmode.c     |   1 +
 kernel/drivers/staging/xgifb/vb_setmode.h     |   1 +
 kernel/drivers/staging/xgifb/vb_struct.h      |   1 +
 kernel/drivers/staging/xgifb/vb_table.h       |   1 +
 kernel/drivers/staging/xgifb/vb_util.h        |   1 +
 kernel/drivers/staging/xgifb/vgatypes.h       |   1 +
 kernel/drivers/target/Makefile                |   1 +
 kernel/drivers/target/iscsi/Makefile          |   1 +
 kernel/drivers/target/iscsi/cxgbit/Makefile   |   1 +
 kernel/drivers/target/iscsi/iscsi_target.h    |   1 +
 .../drivers/target/iscsi/iscsi_target_auth.h  |   1 +
 .../target/iscsi/iscsi_target_datain_values.h |   1 +
 .../target/iscsi/iscsi_target_device.h        |   1 +
 .../drivers/target/iscsi/iscsi_target_erl0.h  |   1 +
 .../drivers/target/iscsi/iscsi_target_erl1.h  |   1 +
 .../drivers/target/iscsi/iscsi_target_erl2.h  |   1 +
 .../drivers/target/iscsi/iscsi_target_login.h |   1 +
 .../drivers/target/iscsi/iscsi_target_nego.h  |   1 +
 .../target/iscsi/iscsi_target_nodeattrib.h    |   1 +
 .../target/iscsi/iscsi_target_parameters.h    |   1 +
 .../target/iscsi/iscsi_target_seq_pdu_list.h  |   1 +
 .../drivers/target/iscsi/iscsi_target_tmr.h   |   1 +
 .../drivers/target/iscsi/iscsi_target_tpg.h   |   1 +
 .../target/iscsi/iscsi_target_transport.c     |   1 +
 .../drivers/target/iscsi/iscsi_target_util.h  |   1 +
 kernel/drivers/target/loopback/tcm_loop.h     |   1 +
 kernel/drivers/target/sbp/sbp_target.h        |   1 +
 kernel/drivers/target/target_core_alua.h      |   1 +
 kernel/drivers/target/target_core_file.h      |   1 +
 kernel/drivers/target/target_core_iblock.h    |   1 +
 kernel/drivers/target/target_core_internal.h  |   1 +
 kernel/drivers/target/target_core_pr.h        |   1 +
 kernel/drivers/target/target_core_pscsi.h     |   1 +
 kernel/drivers/target/target_core_rd.h        |   1 +
 kernel/drivers/target/target_core_ua.h        |   1 +
 kernel/drivers/target/target_core_xcopy.h     |   1 +
 kernel/drivers/target/tcm_fc/Makefile         |   1 +
 kernel/drivers/tee/Makefile                   |   1 +
 kernel/drivers/tee/optee/Makefile             |   1 +
 kernel/drivers/thermal/Makefile               |   1 +
 .../drivers/thermal/int340x_thermal/Makefile  |   1 +
 .../int340x_thermal/acpi_thermal_rel.h        |   1 +
 kernel/drivers/thermal/tegra/Makefile         |   1 +
 .../drivers/thermal/ti-soc-thermal/Makefile   |   1 +
 kernel/drivers/thunderbolt/cap.c              |   1 +
 kernel/drivers/thunderbolt/ctl.c              |   1 +
 kernel/drivers/thunderbolt/ctl.h              |   1 +
 kernel/drivers/thunderbolt/eeprom.c           |   1 +
 kernel/drivers/thunderbolt/nhi.h              |   1 +
 kernel/drivers/thunderbolt/nhi_regs.h         |   1 +
 kernel/drivers/thunderbolt/path.c             |   1 +
 kernel/drivers/thunderbolt/switch.c           |   1 +
 kernel/drivers/thunderbolt/tb.c               |   1 +
 kernel/drivers/thunderbolt/tb.h               |   1 +
 kernel/drivers/thunderbolt/tb_regs.h          |   1 +
 kernel/drivers/thunderbolt/tunnel_pci.c       |   1 +
 kernel/drivers/thunderbolt/tunnel_pci.h       |   1 +
 kernel/drivers/tty/Makefile                   |   1 +
 kernel/drivers/tty/hvc/Makefile               |   1 +
 kernel/drivers/tty/hvc/hvc_irq.c              |   1 +
 kernel/drivers/tty/hvc/hvc_iucv.c             |   1 +
 kernel/drivers/tty/hvc/hvsi_lib.c             |   1 +
 kernel/drivers/tty/ipwireless/hardware.c      |   1 +
 kernel/drivers/tty/ipwireless/hardware.h      |   1 +
 kernel/drivers/tty/ipwireless/main.h          |   1 +
 kernel/drivers/tty/ipwireless/network.c       |   1 +
 kernel/drivers/tty/ipwireless/network.h       |   1 +
 .../drivers/tty/ipwireless/setup_protocol.h   |   1 +
 kernel/drivers/tty/ipwireless/tty.c           |   1 +
 kernel/drivers/tty/ipwireless/tty.h           |   1 +
 kernel/drivers/tty/moxa.h                     |   1 +
 kernel/drivers/tty/mxser.h                    |   1 +
 kernel/drivers/tty/pty.c                      |   1 +
 kernel/drivers/tty/rocket.h                   |   1 +
 kernel/drivers/tty/rocket_int.h               |   1 +
 kernel/drivers/tty/serial/8250/Makefile       |   1 +
 kernel/drivers/tty/serial/Makefile            |   1 +
 kernel/drivers/tty/serial/amba-pl011.h        |   1 +
 kernel/drivers/tty/serial/apbuart.h           |   1 +
 .../tty/serial/cpm_uart/cpm_uart_cpm1.h       |   1 +
 .../tty/serial/cpm_uart/cpm_uart_cpm2.h       |   1 +
 kernel/drivers/tty/serial/crisv10.c           |   1 +
 kernel/drivers/tty/serial/crisv10.h           |   1 +
 kernel/drivers/tty/serial/dz.h                |   1 +
 kernel/drivers/tty/serial/etraxfs-uart.c      |   1 +
 kernel/drivers/tty/serial/ip22zilog.h         |   1 +
 kernel/drivers/tty/serial/pmac_zilog.h        |   1 +
 kernel/drivers/tty/serial/sh-sci.h            |   1 +
 kernel/drivers/tty/serial/sunsab.h            |   1 +
 kernel/drivers/tty/serial/sunzilog.h          |   1 +
 kernel/drivers/tty/serial/zs.h                |   1 +
 kernel/drivers/tty/sysrq.c                    |   1 +
 kernel/drivers/tty/tty_mutex.c                |   1 +
 kernel/drivers/tty/vt/Makefile                |   1 +
 kernel/drivers/tty/vt/selection.c             |   1 +
 kernel/drivers/tty/vt/vc_screen.c             |   1 +
 kernel/drivers/tty/vt/vt_ioctl.c              |   1 +
 kernel/drivers/uio/Makefile                   |   1 +
 kernel/drivers/usb/Makefile                   |   1 +
 kernel/drivers/usb/atm/Makefile               |   1 +
 kernel/drivers/usb/chipidea/Makefile          |   1 +
 kernel/drivers/usb/chipidea/debug.c           |   1 +
 kernel/drivers/usb/chipidea/host.h            |   1 +
 kernel/drivers/usb/class/cdc-acm.h            |   1 +
 kernel/drivers/usb/common/Makefile            |   1 +
 kernel/drivers/usb/core/Makefile              |   1 +
 kernel/drivers/usb/dwc2/Makefile              |   1 +
 kernel/drivers/usb/dwc3/Makefile              |   1 +
 kernel/drivers/usb/gadget/Makefile            |   1 +
 kernel/drivers/usb/gadget/configfs.h          |   1 +
 kernel/drivers/usb/gadget/function/Makefile   |   1 +
 .../usb/gadget/function/f_mass_storage.h      |   1 +
 kernel/drivers/usb/gadget/function/g_zero.h   |   1 +
 .../usb/gadget/function/storage_common.h      |   1 +
 kernel/drivers/usb/gadget/function/tcm.h      |   1 +
 .../drivers/usb/gadget/function/uvc_queue.h   |   1 +
 kernel/drivers/usb/gadget/legacy/Makefile     |   1 +
 kernel/drivers/usb/gadget/udc/Makefile        |   1 +
 kernel/drivers/usb/gadget/udc/bdc/Makefile    |   1 +
 kernel/drivers/usb/gadget/udc/omap_udc.h      |   1 +
 kernel/drivers/usb/host/Makefile              |   1 +
 kernel/drivers/usb/host/fotg210.h             |   1 +
 kernel/drivers/usb/host/isp116x.h             |   1 +
 kernel/drivers/usb/host/isp1362.h             |   1 +
 kernel/drivers/usb/host/oxu210hp.h            |   1 +
 kernel/drivers/usb/host/pci-quirks.h          |   1 +
 kernel/drivers/usb/host/sl811.h               |   1 +
 kernel/drivers/usb/host/uhci-debug.c          |   1 +
 kernel/drivers/usb/host/uhci-grlib.c          |   1 +
 kernel/drivers/usb/host/uhci-hcd.h            |   1 +
 kernel/drivers/usb/host/uhci-hub.c            |   1 +
 kernel/drivers/usb/host/uhci-pci.c            |   1 +
 kernel/drivers/usb/host/uhci-platform.c       |   1 +
 kernel/drivers/usb/host/uhci-q.c              |   1 +
 kernel/drivers/usb/image/microtek.h           |   1 +
 kernel/drivers/usb/isp1760/isp1760-hcd.c      |   1 +
 kernel/drivers/usb/isp1760/isp1760-hcd.h      |   1 +
 kernel/drivers/usb/isp1760/isp1760-if.c       |   1 +
 kernel/drivers/usb/misc/Makefile              |   1 +
 kernel/drivers/usb/mon/mon_bin.c              |   1 +
 kernel/drivers/usb/mon/mon_stat.c             |   1 +
 kernel/drivers/usb/mon/mon_text.c             |   1 +
 kernel/drivers/usb/mon/usb_mon.h              |   1 +
 kernel/drivers/usb/mtu3/Makefile              |   1 +
 kernel/drivers/usb/musb/Makefile              |   1 +
 kernel/drivers/usb/musb/cppi_dma.h            |   1 +
 kernel/drivers/usb/phy/Makefile               |   1 +
 kernel/drivers/usb/phy/phy-am335x-control.h   |   1 +
 kernel/drivers/usb/phy/phy-generic.h          |   1 +
 kernel/drivers/usb/renesas_usbhs/Makefile     |   1 +
 kernel/drivers/usb/serial/Makefile            |   1 +
 kernel/drivers/usb/serial/cypress_m8.h        |   1 +
 kernel/drivers/usb/serial/ezusb_convert.pl    |   1 +
 kernel/drivers/usb/serial/ftdi_sio.h          |   1 +
 kernel/drivers/usb/serial/ftdi_sio_ids.h      |   1 +
 kernel/drivers/usb/serial/kl5kusb105.h        |   1 +
 kernel/drivers/usb/serial/kobil_sct.h         |   1 +
 kernel/drivers/usb/serial/usb-wwan.h          |   1 +
 kernel/drivers/usb/storage/Makefile           |   1 +
 kernel/drivers/usb/storage/option_ms.h        |   1 +
 kernel/drivers/usb/storage/sierra_ms.c        |   1 +
 kernel/drivers/usb/storage/sierra_ms.h        |   1 +
 kernel/drivers/usb/storage/uas-detect.h       |   1 +
 kernel/drivers/usb/typec/ucsi/Makefile        |   1 +
 kernel/drivers/usb/typec/ucsi/debug.h         |   1 +
 kernel/drivers/usb/typec/ucsi/trace.h         |   1 +
 kernel/drivers/usb/typec/ucsi/ucsi.h          |   1 +
 kernel/drivers/usb/usbip/Makefile             |   1 +
 kernel/drivers/usb/wusbcore/Makefile          |   1 +
 kernel/drivers/uwb/Makefile                   |   1 +
 kernel/drivers/uwb/i1480/dfu/Makefile         |   1 +
 kernel/drivers/vfio/Makefile                  |   1 +
 kernel/drivers/vfio/platform/Makefile         |   1 +
 kernel/drivers/vfio/platform/reset/Makefile   |   1 +
 kernel/drivers/vhost/Makefile                 |   1 +
 kernel/drivers/vhost/test.h                   |   1 +
 kernel/drivers/vhost/vhost.h                  |   1 +
 kernel/drivers/video/Makefile                 |   1 +
 kernel/drivers/video/backlight/Makefile       |   1 +
 kernel/drivers/video/console/Makefile         |   1 +
 kernel/drivers/video/fbdev/Makefile           |   1 +
 .../drivers/video/fbdev/amba-clcd-nomadik.h   |   1 +
 .../drivers/video/fbdev/amba-clcd-versatile.h |   1 +
 kernel/drivers/video/fbdev/atafb.h            |   1 +
 kernel/drivers/video/fbdev/atafb_utils.h      |   1 +
 kernel/drivers/video/fbdev/aty/Makefile       |   1 +
 kernel/drivers/video/fbdev/aty/ati_ids.h      |   1 +
 kernel/drivers/video/fbdev/aty/atyfb.h        |   1 +
 kernel/drivers/video/fbdev/aty/mach64_accel.c |   1 +
 kernel/drivers/video/fbdev/aty/mach64_ct.c    |   1 +
 .../drivers/video/fbdev/aty/mach64_cursor.c   |   1 +
 kernel/drivers/video/fbdev/aty/mach64_gx.c    |   1 +
 kernel/drivers/video/fbdev/aty/radeon_accel.c |   1 +
 kernel/drivers/video/fbdev/aty/radeon_i2c.c   |   1 +
 .../drivers/video/fbdev/aty/radeon_monitor.c  |   1 +
 kernel/drivers/video/fbdev/aty/radeon_pm.c    |   1 +
 kernel/drivers/video/fbdev/aty/radeonfb.h     |   1 +
 kernel/drivers/video/fbdev/carminefb.h        |   1 +
 kernel/drivers/video/fbdev/carminefb_regs.h   |   1 +
 kernel/drivers/video/fbdev/core/Makefile      |   1 +
 kernel/drivers/video/fbdev/core/fb_draw.h     |   1 +
 kernel/drivers/video/fbdev/efifb.c            |   1 +
 kernel/drivers/video/fbdev/geode/Makefile     |   1 +
 kernel/drivers/video/fbdev/i810/Makefile      |   1 +
 kernel/drivers/video/fbdev/intelfb/Makefile   |   1 +
 kernel/drivers/video/fbdev/intelfb/intelfb.h  |   1 +
 kernel/drivers/video/fbdev/matrox/g450_pll.h  |   1 +
 .../video/fbdev/matrox/matroxfb_DAC1064.h     |   1 +
 .../video/fbdev/matrox/matroxfb_Ti3026.h      |   1 +
 .../video/fbdev/matrox/matroxfb_accel.h       |   1 +
 .../video/fbdev/matrox/matroxfb_base.h        |   1 +
 .../video/fbdev/matrox/matroxfb_crtc2.h       |   1 +
 .../video/fbdev/matrox/matroxfb_g450.h        |   1 +
 .../video/fbdev/matrox/matroxfb_maven.h       |   1 +
 .../video/fbdev/matrox/matroxfb_misc.h        |   1 +
 .../drivers/video/fbdev/mb862xx/mb862xx_reg.h |   1 +
 .../drivers/video/fbdev/mb862xx/mb862xxfb.h   |   1 +
 .../video/fbdev/mb862xx/mb862xxfb_accel.h     |   1 +
 kernel/drivers/video/fbdev/mbx/mbxdebugfs.c   |   1 +
 kernel/drivers/video/fbdev/mbx/reg_bits.h     |   1 +
 kernel/drivers/video/fbdev/mbx/regs.h         |   1 +
 kernel/drivers/video/fbdev/mmp/panel/Kconfig  |   1 +
 kernel/drivers/video/fbdev/nvidia/Makefile    |   1 +
 kernel/drivers/video/fbdev/nvidia/nv_proto.h  |   1 +
 kernel/drivers/video/fbdev/nvidia/nv_type.h   |   1 +
 kernel/drivers/video/fbdev/omap/Makefile      |   1 +
 kernel/drivers/video/fbdev/omap/lcdc.h        |   1 +
 .../drivers/video/fbdev/omap2/omapfb/Makefile |   1 +
 .../fbdev/omap2/omapfb/displays/Makefile      |   1 +
 .../video/fbdev/omap2/omapfb/dss/Kconfig      |   1 +
 .../video/fbdev/omap2/omapfb/dss/Makefile     |   1 +
 .../fbdev/omap2/omapfb/dss/hdmi_common.c      |   1 +
 kernel/drivers/video/fbdev/pxa168fb.h         |   1 +
 kernel/drivers/video/fbdev/pxa3xx-gcu.h       |   1 +
 kernel/drivers/video/fbdev/riva/Makefile      |   1 +
 kernel/drivers/video/fbdev/riva/nv_type.h     |   1 +
 kernel/drivers/video/fbdev/riva/rivafb.h      |   1 +
 kernel/drivers/video/fbdev/sbuslib.c          |   1 +
 kernel/drivers/video/fbdev/sbuslib.h          |   1 +
 kernel/drivers/video/fbdev/sh_mobile_lcdcfb.h |   1 +
 kernel/drivers/video/fbdev/sticore.h          |   1 +
 kernel/drivers/video/fbdev/via/Makefile       |   1 +
 kernel/drivers/video/fbdev/wmt_ge_rops.h      |   1 +
 kernel/drivers/video/logo/Makefile            |   1 +
 kernel/drivers/virtio/Makefile                |   1 +
 kernel/drivers/vme/vme_bridge.h               |   1 +
 kernel/drivers/w1/masters/Makefile            |   1 +
 kernel/drivers/w1/slaves/Makefile             |   1 +
 kernel/drivers/watchdog/Makefile              |   1 +
 kernel/drivers/watchdog/iTCO_vendor.h         |   1 +
 kernel/drivers/watchdog/sp5100_tco.h          |   1 +
 kernel/drivers/watchdog/watchdog_pretimeout.h |   1 +
 kernel/drivers/xen/Makefile                   |   1 +
 kernel/drivers/xen/biomerge.c                 |   1 +
 kernel/drivers/xen/cpu_hotplug.c              |   1 +
 kernel/drivers/xen/events/events_2l.c         |   1 +
 kernel/drivers/xen/time.c                     |   1 +
 kernel/drivers/xen/xen-pciback/Makefile       |   1 +
 kernel/drivers/xen/xen-pciback/conf_space.c   |   1 +
 kernel/drivers/xen/xen-pciback/conf_space.h   |   1 +
 .../xen/xen-pciback/conf_space_capability.c   |   1 +
 .../xen/xen-pciback/conf_space_header.c       |   1 +
 .../xen/xen-pciback/conf_space_quirks.c       |   1 +
 .../xen/xen-pciback/conf_space_quirks.h       |   1 +
 kernel/drivers/xen/xen-pciback/passthrough.c  |   1 +
 kernel/drivers/xen/xen-pciback/pciback.h      |   1 +
 kernel/drivers/xen/xen-pciback/pciback_ops.c  |   1 +
 kernel/drivers/xen/xen-pciback/vpci.c         |   1 +
 kernel/drivers/xen/xen-pciback/xenbus.c       |   1 +
 kernel/drivers/xen/xen-selfballoon.c          |   1 +
 kernel/drivers/xen/xenbus/Makefile            |   1 +
 .../drivers/xen/xenbus/xenbus_dev_backend.c   |   1 +
 kernel/drivers/xen/xenfs/xenfs.h              |   1 +
 kernel/drivers/xen/xenfs/xenstored.c          |   1 +
 kernel/drivers/xen/xenfs/xensyms.c            |   1 +
 kernel/drivers/zorro/Makefile                 |   1 +
 kernel/drivers/zorro/gen-devlist.c            |   1 +
 kernel/drivers/zorro/names.c                  |   1 +
 kernel/drivers/zorro/proc.c                   |   1 +
 kernel/drivers/zorro/zorro.h                  |   1 +
 kernel/firmware/Makefile                      |   1 +
 kernel/fs/9p/Makefile                         |   1 +
 kernel/fs/Makefile                            |   1 +
 kernel/fs/adfs/adfs.h                         |   1 +
 kernel/fs/adfs/file.c                         |   1 +
 kernel/fs/affs/affs.h                         |   1 +
 kernel/fs/affs/amigaffs.c                     |   1 +
 kernel/fs/affs/amigaffs.h                     |   1 +
 kernel/fs/affs/bitmap.c                       |   1 +
 kernel/fs/affs/dir.c                          |   1 +
 kernel/fs/affs/file.c                         |   1 +
 kernel/fs/affs/inode.c                        |   1 +
 kernel/fs/affs/namei.c                        |   1 +
 kernel/fs/affs/symlink.c                      |   1 +
 kernel/fs/afs/Makefile                        |   1 +
 kernel/fs/afs/netdevices.c                    |   1 +
 kernel/fs/attr.c                              |   1 +
 kernel/fs/bad_inode.c                         |   1 +
 kernel/fs/befs/befs.h                         |   1 +
 kernel/fs/befs/befs_fs_types.h                |   1 +
 kernel/fs/befs/btree.h                        |   1 +
 kernel/fs/befs/datastream.c                   |   1 +
 kernel/fs/befs/datastream.h                   |   1 +
 kernel/fs/befs/debug.c                        |   1 +
 kernel/fs/befs/endian.h                       |   1 +
 kernel/fs/befs/inode.c                        |   1 +
 kernel/fs/befs/io.c                           |   1 +
 kernel/fs/bfs/bfs.h                           |   1 +
 kernel/fs/bfs/dir.c                           |   1 +
 kernel/fs/bfs/file.c                          |   1 +
 kernel/fs/binfmt_flat.c                       |   1 +
 kernel/fs/btrfs/Makefile                      |   1 +
 kernel/fs/btrfs/export.c                      |   1 +
 kernel/fs/btrfs/export.h                      |   1 +
 kernel/fs/btrfs/extent_io.c                   |   1 +
 kernel/fs/btrfs/extent_io.h                   |   1 +
 kernel/fs/btrfs/extent_map.c                  |   1 +
 kernel/fs/btrfs/extent_map.h                  |   1 +
 kernel/fs/btrfs/inode-map.h                   |   1 +
 kernel/fs/btrfs/sysfs.h                       |   1 +
 kernel/fs/cachefiles/Makefile                 |   1 +
 kernel/fs/ceph/Makefile                       |   1 +
 kernel/fs/ceph/addr.c                         |   1 +
 kernel/fs/ceph/caps.c                         |   1 +
 kernel/fs/ceph/ceph_frag.c                    |   1 +
 kernel/fs/ceph/debugfs.c                      |   1 +
 kernel/fs/ceph/dir.c                          |   1 +
 kernel/fs/ceph/export.c                       |   1 +
 kernel/fs/ceph/file.c                         |   1 +
 kernel/fs/ceph/inode.c                        |   1 +
 kernel/fs/ceph/ioctl.c                        |   1 +
 kernel/fs/ceph/ioctl.h                        |   1 +
 kernel/fs/ceph/locks.c                        |   1 +
 kernel/fs/ceph/mds_client.c                   |   1 +
 kernel/fs/ceph/mds_client.h                   |   1 +
 kernel/fs/ceph/mdsmap.c                       |   1 +
 kernel/fs/ceph/snap.c                         |   1 +
 kernel/fs/ceph/strings.c                      |   1 +
 kernel/fs/ceph/super.h                        |   1 +
 kernel/fs/ceph/xattr.c                        |   1 +
 kernel/fs/char_dev.c                          |   1 +
 kernel/fs/cifs/Makefile                       |   1 +
 kernel/fs/cifs/dir.c                          |   5 +-
 kernel/fs/coda/cache.c                        |   1 +
 kernel/fs/coda/cnode.c                        |   1 +
 kernel/fs/coda/coda_cache.h                   |   1 +
 kernel/fs/coda/coda_fs_i.h                    |   1 +
 kernel/fs/coda/coda_int.h                     |   1 +
 kernel/fs/coda/coda_linux.c                   |   1 +
 kernel/fs/coda/coda_linux.h                   |   1 +
 kernel/fs/coda/dir.c                          |   1 +
 kernel/fs/coda/file.c                         |   1 +
 kernel/fs/coda/inode.c                        |   1 +
 kernel/fs/coda/pioctl.c                       |   1 +
 kernel/fs/coda/symlink.c                      |   1 +
 kernel/fs/coda/sysctl.c                       |   1 +
 kernel/fs/coda/upcall.c                       |   1 +
 kernel/fs/compat_ioctl.c                      |   1 +
 kernel/fs/coredump.c                          |   1 +
 kernel/fs/cramfs/uncompress.c                 |   1 +
 kernel/fs/crypto/bio.c                        |   1 +
 kernel/fs/crypto/fname.c                      |   1 +
 kernel/fs/crypto/fscrypt_private.h            |   1 +
 kernel/fs/crypto/keyinfo.c                    |   1 +
 kernel/fs/crypto/policy.c                     |   1 +
 kernel/fs/dlm/Makefile                        |   1 +
 kernel/fs/drop_caches.c                       |   1 +
 kernel/fs/efs/dir.c                           |   1 +
 kernel/fs/efs/efs.h                           |   1 +
 kernel/fs/efs/file.c                          |   1 +
 kernel/fs/efs/namei.c                         |   1 +
 kernel/fs/efs/super.c                         |   1 +
 kernel/fs/efs/symlink.c                       |   1 +
 kernel/fs/ext2/Makefile                       |   1 +
 kernel/fs/ext2/acl.c                          |   1 +
 kernel/fs/ext2/acl.h                          |   1 +
 kernel/fs/ext2/balloc.c                       |   1 +
 kernel/fs/ext2/dir.c                          |   1 +
 kernel/fs/ext2/ext2.h                         |   1 +
 kernel/fs/ext2/file.c                         |   1 +
 kernel/fs/ext2/ialloc.c                       |   1 +
 kernel/fs/ext2/inode.c                        |   1 +
 kernel/fs/ext2/ioctl.c                        |   1 +
 kernel/fs/ext2/namei.c                        |   1 +
 kernel/fs/ext2/symlink.c                      |   1 +
 kernel/fs/ext2/xattr.c                        |   1 +
 kernel/fs/ext2/xattr.h                        |   1 +
 kernel/fs/ext2/xattr_security.c               |   1 +
 kernel/fs/ext2/xattr_trusted.c                |   1 +
 kernel/fs/ext2/xattr_user.c                   |   1 +
 kernel/fs/ext4/Makefile                       |   1 +
 kernel/fs/ext4/acl.c                          |   1 +
 kernel/fs/ext4/acl.h                          |   1 +
 kernel/fs/ext4/balloc.c                       |   1 +
 kernel/fs/ext4/bitmap.c                       |   1 +
 kernel/fs/ext4/block_validity.c               |   1 +
 kernel/fs/ext4/dir.c                          |   1 +
 kernel/fs/ext4/ext4.h                         |   1 +
 kernel/fs/ext4/ext4_jbd2.c                    |   1 +
 kernel/fs/ext4/extents_status.c               |   1 +
 kernel/fs/ext4/extents_status.h               |   1 +
 kernel/fs/ext4/file.c                         |   1 +
 kernel/fs/ext4/fsync.c                        |   1 +
 kernel/fs/ext4/ialloc.c                       |   1 +
 kernel/fs/ext4/indirect.c                     |   1 +
 kernel/fs/ext4/inode.c                        |   1 +
 kernel/fs/ext4/ioctl.c                        |   1 +
 kernel/fs/ext4/mballoc.h                      |   1 +
 kernel/fs/ext4/mmp.c                          |   1 +
 kernel/fs/ext4/namei.c                        |   1 +
 kernel/fs/ext4/page-io.c                      |   1 +
 kernel/fs/ext4/readpage.c                     |   1 +
 kernel/fs/ext4/resize.c                       |   1 +
 kernel/fs/ext4/symlink.c                      |   1 +
 kernel/fs/ext4/sysfs.c                        |   1 +
 kernel/fs/ext4/truncate.h                     |   1 +
 kernel/fs/ext4/xattr.c                        |   1 +
 kernel/fs/ext4/xattr.h                        |   1 +
 kernel/fs/ext4/xattr_security.c               |   1 +
 kernel/fs/ext4/xattr_trusted.c                |   1 +
 kernel/fs/ext4/xattr_user.c                   |   1 +
 kernel/fs/f2fs/Makefile                       |   1 +
 kernel/fs/fat/Makefile                        |   1 +
 kernel/fs/fat/cache.c                         |   1 +
 kernel/fs/fat/fat.h                           |   1 +
 kernel/fs/fcntl.c                             |   1 +
 kernel/fs/fhandle.c                           |   1 +
 kernel/fs/file.c                              |   1 +
 kernel/fs/filesystems.c                       |   1 +
 kernel/fs/fs_pin.c                            |   1 +
 kernel/fs/fscache/Makefile                    |   1 +
 kernel/fs/gfs2/Makefile                       |   1 +
 kernel/fs/gfs2/trace_gfs2.h                   |   1 +
 kernel/fs/hfs/attr.c                          |   1 +
 kernel/fs/hfs/bfind.c                         |   1 +
 kernel/fs/hfs/bnode.c                         |   1 +
 kernel/fs/hfs/brec.c                          |   1 +
 kernel/fs/hfs/btree.c                         |   1 +
 kernel/fs/hfs/btree.h                         |   1 +
 kernel/fs/hfsplus/Makefile                    |   1 +
 kernel/fs/hfsplus/acl.h                       |   1 +
 kernel/fs/hfsplus/attributes.c                |   1 +
 kernel/fs/hfsplus/bfind.c                     |   1 +
 kernel/fs/hfsplus/bitmap.c                    |   1 +
 kernel/fs/hfsplus/bnode.c                     |   1 +
 kernel/fs/hfsplus/brec.c                      |   1 +
 kernel/fs/hfsplus/btree.c                     |   1 +
 kernel/fs/hfsplus/catalog.c                   |   1 +
 kernel/fs/hfsplus/dir.c                       |   1 +
 kernel/fs/hfsplus/extents.c                   |   1 +
 kernel/fs/hfsplus/hfsplus_fs.h                |   1 +
 kernel/fs/hfsplus/hfsplus_raw.h               |   1 +
 kernel/fs/hfsplus/inode.c                     |   1 +
 kernel/fs/hfsplus/ioctl.c                     |   1 +
 kernel/fs/hfsplus/options.c                   |   1 +
 kernel/fs/hfsplus/posix_acl.c                 |   1 +
 kernel/fs/hfsplus/tables.c                    |   1 +
 kernel/fs/hfsplus/unicode.c                   |   1 +
 kernel/fs/hfsplus/wrapper.c                   |   1 +
 kernel/fs/hfsplus/xattr.c                     |   1 +
 kernel/fs/hfsplus/xattr.h                     |   1 +
 kernel/fs/hfsplus/xattr_security.c            |   1 +
 kernel/fs/hfsplus/xattr_trusted.c             |   1 +
 kernel/fs/hfsplus/xattr_user.c                |   1 +
 kernel/fs/hostfs/hostfs.h                     |   1 +
 kernel/fs/hpfs/alloc.c                        |   1 +
 kernel/fs/hpfs/anode.c                        |   1 +
 kernel/fs/hpfs/buffer.c                       |   1 +
 kernel/fs/hpfs/dentry.c                       |   1 +
 kernel/fs/hpfs/dir.c                          |   1 +
 kernel/fs/hpfs/dnode.c                        |   1 +
 kernel/fs/hpfs/ea.c                           |   1 +
 kernel/fs/hpfs/file.c                         |   1 +
 kernel/fs/hpfs/hpfs.h                         |   1 +
 kernel/fs/hpfs/hpfs_fn.h                      |   1 +
 kernel/fs/hpfs/inode.c                        |   1 +
 kernel/fs/hpfs/map.c                          |   1 +
 kernel/fs/hpfs/name.c                         |   1 +
 kernel/fs/hpfs/namei.c                        |   1 +
 kernel/fs/hugetlbfs/inode.c                   |   5 +-
 kernel/fs/ioctl.c                             |   1 +
 kernel/fs/isofs/Makefile                      |   1 +
 kernel/fs/isofs/dir.c                         |   1 +
 kernel/fs/isofs/export.c                      |   1 +
 kernel/fs/isofs/isofs.h                       |   1 +
 kernel/fs/isofs/joliet.c                      |   1 +
 kernel/fs/isofs/namei.c                       |   1 +
 kernel/fs/isofs/rock.c                        |   1 +
 kernel/fs/isofs/rock.h                        |   1 +
 kernel/fs/isofs/util.c                        |   1 +
 kernel/fs/jffs2/Makefile                      |   1 +
 kernel/fs/jfs/Makefile                        |   1 +
 kernel/fs/jfs/ioctl.c                         |   1 +
 kernel/fs/lockd/Makefile                      |   1 +
 kernel/fs/lockd/clnt4xdr.c                    |   1 +
 kernel/fs/lockd/clntxdr.c                     |   1 +
 kernel/fs/lockd/host.c                        |   1 +
 kernel/fs/lockd/mon.c                         |   1 +
 kernel/fs/lockd/netns.h                       |   1 +
 kernel/fs/lockd/procfs.c                      |   1 +
 kernel/fs/lockd/procfs.h                      |   1 +
 kernel/fs/lockd/svc4proc.c                    |   1 +
 kernel/fs/lockd/svclock.c                     |   1 +
 kernel/fs/lockd/svcproc.c                     |   1 +
 kernel/fs/lockd/svcshare.c                    |   1 +
 kernel/fs/lockd/xdr.c                         |   1 +
 kernel/fs/lockd/xdr4.c                        |   1 +
 kernel/fs/minix/bitmap.c                      |   1 +
 kernel/fs/minix/dir.c                         |   1 +
 kernel/fs/minix/file.c                        |   1 +
 kernel/fs/minix/itree_common.c                |   1 +
 kernel/fs/minix/itree_v1.c                    |   1 +
 kernel/fs/minix/itree_v2.c                    |   1 +
 kernel/fs/minix/minix.h                       |   1 +
 kernel/fs/minix/namei.c                       |   1 +
 kernel/fs/mount.h                             |   1 +
 kernel/fs/mpage.c                             |   1 +
 kernel/fs/namei.c                             |   1 +
 kernel/fs/ncpfs/Makefile                      |   1 +
 kernel/fs/ncpfs/dir.c                         |   1 +
 kernel/fs/ncpfs/file.c                        |   1 +
 kernel/fs/ncpfs/getopt.c                      |   1 +
 kernel/fs/ncpfs/getopt.h                      |   1 +
 kernel/fs/ncpfs/ioctl.c                       |   1 +
 kernel/fs/ncpfs/mmap.c                        |   1 +
 kernel/fs/ncpfs/ncp_fs.h                      |   1 +
 kernel/fs/ncpfs/ncp_fs_i.h                    |   1 +
 kernel/fs/ncpfs/ncp_fs_sb.h                   |   1 +
 kernel/fs/ncpfs/ncplib_kernel.c               |   1 +
 kernel/fs/ncpfs/ncplib_kernel.h               |   1 +
 kernel/fs/ncpfs/ncpsign_kernel.c              |   1 +
 kernel/fs/ncpfs/ncpsign_kernel.h              |   1 +
 kernel/fs/ncpfs/sock.c                        |   1 +
 kernel/fs/ncpfs/symlink.c                     |   1 +
 kernel/fs/nfs/Makefile                        |   1 +
 kernel/fs/nfs/blocklayout/dev.c               |   1 +
 kernel/fs/nfs/blocklayout/extent_tree.c       |   1 +
 kernel/fs/nfs/cache_lib.c                     |   1 +
 kernel/fs/nfs/cache_lib.h                     |   1 +
 kernel/fs/nfs/callback.c                      |   1 +
 kernel/fs/nfs/callback.h                      |   1 +
 kernel/fs/nfs/callback_proc.c                 |   1 +
 kernel/fs/nfs/callback_xdr.c                  |   1 +
 kernel/fs/nfs/delegation.h                    |   1 +
 kernel/fs/nfs/dns_resolve.c                   |   1 +
 kernel/fs/nfs/dns_resolve.h                   |   1 +
 kernel/fs/nfs/export.c                        |   1 +
 kernel/fs/nfs/flexfilelayout/flexfilelayout.h |   1 +
 .../fs/nfs/flexfilelayout/flexfilelayoutdev.c |   1 +
 kernel/fs/nfs/internal.h                      |   1 +
 kernel/fs/nfs/io.c                            |   1 +
 kernel/fs/nfs/iostat.h                        |   1 +
 kernel/fs/nfs/mount_clnt.c                    |   1 +
 kernel/fs/nfs/netns.h                         |   1 +
 kernel/fs/nfs/nfs.h                           |   1 +
 kernel/fs/nfs/nfs2xdr.c                       |   1 +
 kernel/fs/nfs/nfs3_fs.h                       |   1 +
 kernel/fs/nfs/nfs3acl.c                       |   1 +
 kernel/fs/nfs/nfs3proc.c                      |   1 +
 kernel/fs/nfs/nfs3xdr.c                       |   1 +
 kernel/fs/nfs/nfs42.h                         |   1 +
 kernel/fs/nfs/nfs42proc.c                     |   1 +
 kernel/fs/nfs/nfs42xdr.c                      |   1 +
 kernel/fs/nfs/nfs4_fs.h                       |   1 +
 kernel/fs/nfs/nfs4file.c                      |   1 +
 kernel/fs/nfs/nfs4getroot.c                   |   1 +
 kernel/fs/nfs/nfs4namespace.c                 |   1 +
 kernel/fs/nfs/nfs4session.h                   |   1 +
 kernel/fs/nfs/nfs4sysctl.c                    |   1 +
 kernel/fs/nfs/nfs4trace.c                     |   1 +
 kernel/fs/nfs/nfs4trace.h                     |   1 +
 kernel/fs/nfs/nfsroot.c                       |   1 +
 kernel/fs/nfs/nfstrace.c                      |   1 +
 kernel/fs/nfs/nfstrace.h                      |   1 +
 kernel/fs/nfs/proc.c                          |   1 +
 kernel/fs/nfs/symlink.c                       |   1 +
 kernel/fs/nfs/sysctl.c                        |   1 +
 kernel/fs/nfs/unlink.c                        |   1 +
 kernel/fs/nfsd/Makefile                       |   1 +
 kernel/fs/nfsd/auth.c                         |   1 +
 kernel/fs/nfsd/auth.h                         |   1 +
 kernel/fs/nfsd/blocklayout.c                  |   1 +
 kernel/fs/nfsd/blocklayoutxdr.c               |   1 +
 kernel/fs/nfsd/blocklayoutxdr.h               |   1 +
 kernel/fs/nfsd/cache.h                        |   1 +
 kernel/fs/nfsd/current_stateid.h              |   1 +
 kernel/fs/nfsd/export.c                       |   1 +
 kernel/fs/nfsd/export.h                       |   1 +
 kernel/fs/nfsd/fault_inject.c                 |   1 +
 kernel/fs/nfsd/flexfilelayout.c               |   1 +
 kernel/fs/nfsd/flexfilelayoutxdr.c            |   1 +
 kernel/fs/nfsd/flexfilelayoutxdr.h            |   1 +
 kernel/fs/nfsd/lockd.c                        |   1 +
 kernel/fs/nfsd/nfs2acl.c                      |   1 +
 kernel/fs/nfsd/nfs3acl.c                      |   1 +
 kernel/fs/nfsd/nfs3proc.c                     |   1 +
 kernel/fs/nfsd/nfs3xdr.c                      |   1 +
 kernel/fs/nfsd/nfs4layouts.c                  |   1 +
 kernel/fs/nfsd/nfscache.c                     |   1 +
 kernel/fs/nfsd/nfsd.h                         |   1 +
 kernel/fs/nfsd/nfsfh.c                        |   1 +
 kernel/fs/nfsd/nfsfh.h                        |   1 +
 kernel/fs/nfsd/nfsproc.c                      |   1 +
 kernel/fs/nfsd/nfssvc.c                       |   1 +
 kernel/fs/nfsd/nfsxdr.c                       |   1 +
 kernel/fs/nfsd/pnfs.h                         |   1 +
 kernel/fs/nfsd/stats.c                        |   1 +
 kernel/fs/nfsd/stats.h                        |   1 +
 kernel/fs/nfsd/trace.h                        |   1 +
 kernel/fs/nfsd/vfs.c                          |   1 +
 kernel/fs/nfsd/vfs.h                          |   1 +
 kernel/fs/nfsd/xdr.h                          |   1 +
 kernel/fs/nfsd/xdr3.h                         |   1 +
 kernel/fs/nfsd/xdr4cb.h                       |   1 +
 kernel/fs/nilfs2/Makefile                     |   1 +
 kernel/fs/nilfs2/export.h                     |   1 +
 kernel/fs/nls/Makefile                        |   1 +
 kernel/fs/notify/Makefile                     |   1 +
 kernel/fs/notify/fanotify/fanotify.c          |   1 +
 kernel/fs/notify/fanotify/fanotify.h          |   1 +
 kernel/fs/notify/fanotify/fanotify_user.c     |   1 +
 kernel/fs/notify/fdinfo.c                     |   1 +
 kernel/fs/notify/fdinfo.h                     |   1 +
 kernel/fs/notify/fsnotify.h                   |   1 +
 kernel/fs/notify/inotify/inotify.h            |   1 +
 kernel/fs/nsfs.c                              |   1 +
 kernel/fs/ntfs/Makefile                       |   1 +
 kernel/fs/ocfs2/Makefile                      |   1 +
 kernel/fs/ocfs2/alloc.c                       |  24 +++-
 kernel/fs/ocfs2/ioctl.c                       |   1 +
 kernel/fs/ocfs2/ioctl.h                       |   1 +
 kernel/fs/ocfs2/mmap.h                        |   1 +
 kernel/fs/ocfs2/ocfs2_trace.h                 |   1 +
 kernel/fs/ocfs2/quota.h                       |   1 +
 kernel/fs/ocfs2/quota_global.c                |   1 +
 kernel/fs/ocfs2/quota_local.c                 |   1 +
 kernel/fs/omfs/bitmap.c                       |   1 +
 kernel/fs/omfs/omfs.h                         |   1 +
 kernel/fs/omfs/omfs_fs.h                      |   1 +
 kernel/fs/orangefs/Makefile                   |   1 +
 kernel/fs/orangefs/acl.c                      |   1 +
 kernel/fs/orangefs/dcache.c                   |   1 +
 kernel/fs/orangefs/devorangefs-req.c          |   1 +
 kernel/fs/orangefs/dir.c                      |   1 +
 kernel/fs/orangefs/downcall.h                 |   1 +
 kernel/fs/orangefs/file.c                     |   1 +
 kernel/fs/orangefs/inode.c                    |   1 +
 kernel/fs/orangefs/namei.c                    |   1 +
 kernel/fs/orangefs/orangefs-bufmap.c          |   1 +
 kernel/fs/orangefs/orangefs-bufmap.h          |   1 +
 kernel/fs/orangefs/orangefs-cache.c           |   1 +
 kernel/fs/orangefs/orangefs-debug.h           |   1 +
 kernel/fs/orangefs/orangefs-debugfs.c         |   1 +
 kernel/fs/orangefs/orangefs-debugfs.h         |   1 +
 kernel/fs/orangefs/orangefs-dev-proto.h       |   1 +
 kernel/fs/orangefs/orangefs-kernel.h          |   1 +
 kernel/fs/orangefs/orangefs-sysfs.c           |   1 +
 kernel/fs/orangefs/orangefs-utils.c           |   1 +
 kernel/fs/orangefs/protocol.h                 |   1 +
 kernel/fs/orangefs/super.c                    |   1 +
 kernel/fs/orangefs/symlink.c                  |   1 +
 kernel/fs/orangefs/upcall.h                   |   1 +
 kernel/fs/orangefs/waitqueue.c                |   1 +
 kernel/fs/orangefs/xattr.c                    |   1 +
 kernel/fs/pipe.c                              |   1 +
 kernel/fs/proc/Makefile                       |   1 +
 kernel/fs/proc/array.c                        |   1 +
 kernel/fs/proc/base.c                         |   1 +
 kernel/fs/proc/cmdline.c                      |   1 +
 kernel/fs/proc/cpuinfo.c                      |   1 +
 kernel/fs/proc/devices.c                      |   1 +
 kernel/fs/proc/fd.c                           |   1 +
 kernel/fs/proc/fd.h                           |   1 +
 kernel/fs/proc/inode.c                        |   1 +
 kernel/fs/proc/interrupts.c                   |   1 +
 kernel/fs/proc/kcore.c                        |   1 +
 kernel/fs/proc/kmsg.c                         |   1 +
 kernel/fs/proc/loadavg.c                      |   1 +
 kernel/fs/proc/meminfo.c                      |   1 +
 kernel/fs/proc/namespaces.c                   |   1 +
 kernel/fs/proc/page.c                         |   1 +
 kernel/fs/proc/proc_sysctl.c                  |   1 +
 kernel/fs/proc/proc_tty.c                     |   1 +
 kernel/fs/proc/root.c                         |   1 +
 kernel/fs/proc/self.c                         |   1 +
 kernel/fs/proc/softirqs.c                     |   1 +
 kernel/fs/proc/stat.c                         |   1 +
 kernel/fs/proc/task_mmu.c                     |   7 +-
 kernel/fs/proc/task_nommu.c                   |   1 +
 kernel/fs/proc/thread_self.c                  |   1 +
 kernel/fs/proc/uptime.c                       |   1 +
 kernel/fs/proc/version.c                      |   1 +
 kernel/fs/proc_namespace.c                    |   1 +
 kernel/fs/pstore/Makefile                     |   1 +
 kernel/fs/pstore/internal.h                   |   1 +
 kernel/fs/qnx4/bitmap.c                       |   1 +
 kernel/fs/qnx4/dir.c                          |   1 +
 kernel/fs/qnx4/namei.c                        |   1 +
 kernel/fs/qnx4/qnx4.h                         |   1 +
 kernel/fs/qnx6/dir.c                          |   1 +
 kernel/fs/qnx6/namei.c                        |   1 +
 kernel/fs/qnx6/qnx6.h                         |   1 +
 kernel/fs/qnx6/super_mmi.c                    |   1 +
 kernel/fs/quota/Makefile                      |   1 +
 kernel/fs/quota/compat.c                      |   1 +
 kernel/fs/quota/dquot.c                       |   1 +
 kernel/fs/quota/kqid.c                        |   1 +
 kernel/fs/quota/netlink.c                     |   1 +
 kernel/fs/quota/quota.c                       |   1 +
 kernel/fs/quota/quota_tree.h                  |   1 +
 kernel/fs/quota/quotaio_v1.h                  |   1 +
 kernel/fs/quota/quotaio_v2.h                  |   1 +
 kernel/fs/read_write.c                        |   1 +
 kernel/fs/readdir.c                           |   1 +
 kernel/fs/reiserfs/Makefile                   |   1 +
 kernel/fs/reiserfs/acl.h                      |   1 +
 kernel/fs/reiserfs/journal.c                  |   1 +
 kernel/fs/reiserfs/lock.c                     |   1 +
 kernel/fs/reiserfs/reiserfs.h                 |   1 +
 kernel/fs/reiserfs/tail_conversion.c          |   1 +
 kernel/fs/reiserfs/xattr.c                    |   1 +
 kernel/fs/reiserfs/xattr.h                    |   1 +
 kernel/fs/reiserfs/xattr_acl.c                |   1 +
 kernel/fs/reiserfs/xattr_security.c           |   1 +
 kernel/fs/reiserfs/xattr_trusted.c            |   1 +
 kernel/fs/reiserfs/xattr_user.c               |   1 +
 kernel/fs/romfs/Makefile                      |   1 +
 kernel/fs/select.c                            |   1 +
 kernel/fs/seq_file.c                          |   1 +
 kernel/fs/signalfd.c                          |   1 +
 kernel/fs/squashfs/Makefile                   |   1 +
 kernel/fs/stat.c                              |   1 +
 kernel/fs/statfs.c                            |   1 +
 kernel/fs/super.c                             |   1 +
 kernel/fs/sync.c                              |   1 +
 kernel/fs/sysv/balloc.c                       |   1 +
 kernel/fs/sysv/dir.c                          |   1 +
 kernel/fs/sysv/file.c                         |   1 +
 kernel/fs/sysv/ialloc.c                       |   1 +
 kernel/fs/sysv/inode.c                        |   1 +
 kernel/fs/sysv/itree.c                        |   1 +
 kernel/fs/sysv/namei.c                        |   1 +
 kernel/fs/sysv/sysv.h                         |   1 +
 kernel/fs/timerfd.c                           |   1 +
 kernel/fs/ubifs/Makefile                      |   1 +
 kernel/fs/ubifs/crypto.c                      |   1 +
 kernel/fs/ubifs/misc.c                        |   1 +
 kernel/fs/udf/udf_i.h                         |   1 +
 kernel/fs/udf/udf_sb.h                        |   1 +
 kernel/fs/udf/udfdecl.h                       |   1 +
 kernel/fs/udf/udfend.h                        |   1 +
 kernel/fs/ufs/balloc.c                        |   1 +
 kernel/fs/ufs/cylinder.c                      |   1 +
 kernel/fs/ufs/dir.c                           |   1 +
 kernel/fs/ufs/file.c                          |   1 +
 kernel/fs/ufs/ialloc.c                        |   1 +
 kernel/fs/ufs/inode.c                         |   1 +
 kernel/fs/ufs/namei.c                         |   1 +
 kernel/fs/ufs/swab.h                          |   1 +
 kernel/fs/ufs/ufs.h                           |   1 +
 kernel/fs/ufs/ufs_fs.h                        |   1 +
 kernel/fs/ufs/util.c                          |   1 +
 kernel/fs/ufs/util.h                          |   1 +
 kernel/fs/utimes.c                            |   1 +
 kernel/fs/xfs/libxfs/xfs_cksum.h              |   1 +
 kernel/fs/xfs/xfs_discard.h                   |   1 +
 kernel/fs/xfs/xfs_message.h                   |   1 +
 kernel/fs/xfs/xfs_pnfs.c                      |   1 +
 kernel/fs/xfs/xfs_pnfs.h                      |   1 +
 kernel/include/acpi/acpi_io.h                 |   1 +
 kernel/include/acpi/acpi_numa.h               |   1 +
 kernel/include/acpi/apei.h                    |   1 +
 kernel/include/acpi/button.h                  |   1 +
 kernel/include/acpi/ghes.h                    |   1 +
 kernel/include/acpi/pdc_intel.h               |   1 +
 kernel/include/acpi/processor.h               |   1 +
 kernel/include/acpi/reboot.h                  |   1 +
 kernel/include/acpi/video.h                   |   1 +
 kernel/include/asm-generic/4level-fixup.h     |   1 +
 kernel/include/asm-generic/5level-fixup.h     |   1 +
 kernel/include/asm-generic/asm-prototypes.h   |   1 +
 kernel/include/asm-generic/atomic-long.h      |   1 +
 .../include/asm-generic/audit_change_attr.h   |   1 +
 kernel/include/asm-generic/audit_dir_write.h  |   1 +
 kernel/include/asm-generic/audit_read.h       |   1 +
 kernel/include/asm-generic/audit_write.h      |   1 +
 kernel/include/asm-generic/bitops.h           |   1 +
 kernel/include/asm-generic/bitops/__ffs.h     |   1 +
 kernel/include/asm-generic/bitops/__fls.h     |   1 +
 .../include/asm-generic/bitops/arch_hweight.h |   1 +
 kernel/include/asm-generic/bitops/atomic.h    |   1 +
 .../asm-generic/bitops/builtin-__ffs.h        |   1 +
 .../asm-generic/bitops/builtin-__fls.h        |   1 +
 .../include/asm-generic/bitops/builtin-ffs.h  |   1 +
 .../include/asm-generic/bitops/builtin-fls.h  |   1 +
 .../asm-generic/bitops/const_hweight.h        |   1 +
 .../asm-generic/bitops/ext2-atomic-setbit.h   |   1 +
 .../include/asm-generic/bitops/ext2-atomic.h  |   1 +
 kernel/include/asm-generic/bitops/ffs.h       |   1 +
 kernel/include/asm-generic/bitops/ffz.h       |   1 +
 kernel/include/asm-generic/bitops/find.h      |   1 +
 kernel/include/asm-generic/bitops/fls.h       |   1 +
 kernel/include/asm-generic/bitops/fls64.h     |   1 +
 kernel/include/asm-generic/bitops/hweight.h   |   1 +
 kernel/include/asm-generic/bitops/le.h        |   1 +
 kernel/include/asm-generic/bitops/lock.h      |   1 +
 .../include/asm-generic/bitops/non-atomic.h   |   1 +
 kernel/include/asm-generic/bitops/sched.h     |   1 +
 kernel/include/asm-generic/bitsperlong.h      |   1 +
 kernel/include/asm-generic/bug.h              |   1 +
 kernel/include/asm-generic/bugs.h             |   1 +
 kernel/include/asm-generic/cache.h            |   1 +
 kernel/include/asm-generic/cacheflush.h       |   1 +
 kernel/include/asm-generic/checksum.h         |   1 +
 kernel/include/asm-generic/cmpxchg-local.h    |   1 +
 kernel/include/asm-generic/cmpxchg.h          |   1 +
 kernel/include/asm-generic/current.h          |   1 +
 kernel/include/asm-generic/delay.h            |   1 +
 kernel/include/asm-generic/div64.h            |   1 +
 kernel/include/asm-generic/dma-contiguous.h   |   1 +
 kernel/include/asm-generic/dma.h              |   1 +
 kernel/include/asm-generic/early_ioremap.h    |   1 +
 .../include/asm-generic/emergency-restart.h   |   1 +
 kernel/include/asm-generic/extable.h          |   1 +
 kernel/include/asm-generic/fb.h               |   1 +
 kernel/include/asm-generic/futex.h            |   1 +
 kernel/include/asm-generic/getorder.h         |   1 +
 kernel/include/asm-generic/gpio.h             |   1 +
 kernel/include/asm-generic/hardirq.h          |   1 +
 kernel/include/asm-generic/hugetlb.h          |   1 +
 kernel/include/asm-generic/ide_iops.h         |   1 +
 kernel/include/asm-generic/int-ll64.h         |   1 +
 kernel/include/asm-generic/ioctl.h            |   1 +
 kernel/include/asm-generic/iomap.h            |   1 +
 kernel/include/asm-generic/irq.h              |   1 +
 kernel/include/asm-generic/irq_work.h         |   1 +
 kernel/include/asm-generic/irqflags.h         |   1 +
 kernel/include/asm-generic/kdebug.h           |   1 +
 kernel/include/asm-generic/kmap_types.h       |   1 +
 kernel/include/asm-generic/kprobes.h          |   1 +
 kernel/include/asm-generic/kvm_para.h         |   1 +
 kernel/include/asm-generic/local.h            |   1 +
 kernel/include/asm-generic/local64.h          |   1 +
 kernel/include/asm-generic/memory_model.h     |   1 +
 kernel/include/asm-generic/mm_hooks.h         |   1 +
 kernel/include/asm-generic/mmu.h              |   1 +
 kernel/include/asm-generic/mmu_context.h      |   1 +
 kernel/include/asm-generic/module.h           |   1 +
 kernel/include/asm-generic/msi.h              |   1 +
 kernel/include/asm-generic/page.h             |   1 +
 kernel/include/asm-generic/param.h            |   1 +
 kernel/include/asm-generic/parport.h          |   1 +
 kernel/include/asm-generic/pci.h              |   1 +
 kernel/include/asm-generic/percpu.h           |   1 +
 kernel/include/asm-generic/pgalloc.h          |   1 +
 .../include/asm-generic/pgtable-nop4d-hack.h  |   1 +
 kernel/include/asm-generic/pgtable-nop4d.h    |   1 +
 kernel/include/asm-generic/pgtable-nopmd.h    |   1 +
 kernel/include/asm-generic/pgtable-nopud.h    |   1 +
 kernel/include/asm-generic/pgtable.h          |   1 +
 kernel/include/asm-generic/preempt.h          |   1 +
 kernel/include/asm-generic/qrwlock_types.h    |   1 +
 kernel/include/asm-generic/resource.h         |   1 +
 kernel/include/asm-generic/rwsem.h            |   1 +
 kernel/include/asm-generic/sections.h         |   1 +
 kernel/include/asm-generic/serial.h           |   1 +
 kernel/include/asm-generic/set_memory.h       |   1 +
 kernel/include/asm-generic/signal.h           |   1 +
 kernel/include/asm-generic/simd.h             |   1 +
 kernel/include/asm-generic/spinlock.h         |   1 +
 kernel/include/asm-generic/statfs.h           |   1 +
 kernel/include/asm-generic/syscalls.h         |   1 +
 kernel/include/asm-generic/termios-base.h     |   1 +
 kernel/include/asm-generic/termios.h          |   1 +
 kernel/include/asm-generic/timex.h            |   1 +
 kernel/include/asm-generic/tlbflush.h         |   1 +
 kernel/include/asm-generic/trace_clock.h      |   1 +
 kernel/include/asm-generic/uaccess.h          |   1 +
 kernel/include/asm-generic/unaligned.h        |   1 +
 kernel/include/asm-generic/unistd.h           |   1 +
 kernel/include/asm-generic/vga.h              |   1 +
 kernel/include/asm-generic/word-at-a-time.h   |   1 +
 kernel/include/clocksource/timer-sp804.h      |   1 +
 kernel/include/crypto/ablk_helper.h           |   1 +
 kernel/include/crypto/aes.h                   |   1 +
 kernel/include/crypto/blowfish.h              |   1 +
 kernel/include/crypto/cast5.h                 |   1 +
 kernel/include/crypto/cast6.h                 |   1 +
 kernel/include/crypto/cast_common.h           |   1 +
 kernel/include/crypto/chacha20.h              |   1 +
 kernel/include/crypto/cryptd.h                |   1 +
 kernel/include/crypto/crypto_wq.h             |   1 +
 kernel/include/crypto/des.h                   |   1 +
 kernel/include/crypto/ghash.h                 |   1 +
 kernel/include/crypto/hmac.h                  |   1 +
 kernel/include/crypto/internal/simd.h         |   1 +
 kernel/include/crypto/lrw.h                   |   1 +
 kernel/include/crypto/mcryptd.h               |   1 +
 kernel/include/crypto/md5.h                   |   1 +
 kernel/include/crypto/null.h                  |   1 +
 kernel/include/crypto/poly1305.h              |   1 +
 kernel/include/crypto/serpent.h               |   1 +
 kernel/include/crypto/sha.h                   |   1 +
 kernel/include/crypto/sha3.h                  |   1 +
 kernel/include/crypto/twofish.h               |   1 +
 kernel/include/crypto/xts.h                   |   1 +
 kernel/include/drm/ati_pcigart.h              |   1 +
 kernel/include/drm/drm_agpsupport.h           |   1 +
 kernel/include/drm/drm_fb_cma_helper.h        |   1 +
 kernel/include/drm/drm_gem_cma_helper.h       |   1 +
 kernel/include/drm/drm_of.h                   |   1 +
 kernel/include/drm/drm_os_linux.h             |   1 +
 kernel/include/drm/drm_pciids.h               |   1 +
 kernel/include/drm/drm_sysfs.h                |   1 +
 kernel/include/drm/i2c/tda998x.h              |   1 +
 kernel/include/drm/intel-gtt.h                |   1 +
 kernel/include/dt-bindings/clock/berlin2.h    |   1 +
 kernel/include/dt-bindings/clock/berlin2q.h   |   1 +
 .../dt-bindings/clock/cortina,gemini-clock.h  |   1 +
 kernel/include/dt-bindings/clock/efm32-cmu.h  |   1 +
 .../dt-bindings/clock/exynos-audss-clk.h      |   1 +
 kernel/include/dt-bindings/clock/gxbb-clkc.h  |   1 +
 kernel/include/dt-bindings/clock/jz4740-cgu.h |   1 +
 kernel/include/dt-bindings/clock/jz4780-cgu.h |   1 +
 .../include/dt-bindings/clock/marvell,mmp2.h  |   1 +
 .../dt-bindings/clock/marvell,pxa168.h        |   1 +
 .../dt-bindings/clock/marvell,pxa1928.h       |   1 +
 .../dt-bindings/clock/marvell,pxa910.h        |   1 +
 .../include/dt-bindings/clock/meson8b-clkc.h  |   1 +
 .../include/dt-bindings/clock/mpc512x-clock.h |   1 +
 .../dt-bindings/clock/rockchip,rk808.h        |   1 +
 kernel/include/dt-bindings/clock/ste-ab8500.h |   1 +
 .../include/dt-bindings/clock/stih407-clks.h  |   1 +
 .../include/dt-bindings/clock/stih410-clks.h  |   1 +
 .../include/dt-bindings/clock/stih416-clks.h  |   1 +
 .../include/dt-bindings/clock/stih418-clks.h  |   1 +
 .../include/dt-bindings/clock/tegra114-car.h  |   1 +
 .../dt-bindings/clock/tegra124-car-common.h   |   1 +
 .../include/dt-bindings/clock/tegra124-car.h  |   1 +
 .../dt-bindings/clock/tegra186-clock.h        |   1 +
 .../include/dt-bindings/clock/tegra20-car.h   |   1 +
 .../include/dt-bindings/clock/tegra210-car.h  |   1 +
 .../include/dt-bindings/clock/tegra30-car.h   |   1 +
 kernel/include/dt-bindings/display/tda998x.h  |   1 +
 kernel/include/dt-bindings/gpio/gpio.h        |   1 +
 kernel/include/dt-bindings/gpio/tegra-gpio.h  |   1 +
 .../include/dt-bindings/gpio/tegra186-gpio.h  |   1 +
 .../dt-bindings/iio/adc/fsl-imx25-gcq.h       |   1 +
 kernel/include/dt-bindings/iio/adi,ad5592r.h  |   1 +
 kernel/include/dt-bindings/input/input.h      |   1 +
 .../interrupt-controller/arm-gic.h            |   1 +
 .../dt-bindings/interrupt-controller/irq.h    |   1 +
 .../interrupt-controller/mips-gic.h           |   1 +
 .../interrupt-controller/mvebu-icu.h          |   1 +
 kernel/include/dt-bindings/leds/common.h      |   1 +
 kernel/include/dt-bindings/leds/leds-ns2.h    |   1 +
 .../dt-bindings/mailbox/tegra186-hsp.h        |   1 +
 kernel/include/dt-bindings/media/c8sectpfe.h  |   1 +
 .../include/dt-bindings/memory/tegra114-mc.h  |   1 +
 .../include/dt-bindings/memory/tegra124-mc.h  |   1 +
 .../include/dt-bindings/memory/tegra210-mc.h  |   1 +
 .../include/dt-bindings/memory/tegra30-mc.h   |   1 +
 kernel/include/dt-bindings/mfd/as3722.h       |   1 +
 kernel/include/dt-bindings/mfd/dbx500-prcmu.h |   1 +
 kernel/include/dt-bindings/mfd/max77620.h     |   1 +
 kernel/include/dt-bindings/mfd/palmas.h       |   1 +
 kernel/include/dt-bindings/mfd/qcom-rpm.h     |   1 +
 kernel/include/dt-bindings/mfd/st-lpc.h       |   1 +
 kernel/include/dt-bindings/mfd/stm32f4-rcc.h  |   1 +
 kernel/include/dt-bindings/mfd/stm32f7-rcc.h  |   1 +
 kernel/include/dt-bindings/mux/mux.h          |   1 +
 kernel/include/dt-bindings/pinctrl/am33xx.h   |   1 +
 kernel/include/dt-bindings/pinctrl/am43xx.h   |   1 +
 kernel/include/dt-bindings/pinctrl/dm814x.h   |   1 +
 .../dt-bindings/pinctrl/mt6397-pinfunc.h      |   1 +
 .../dt-bindings/pinctrl/mt7623-pinfunc.h      |   1 +
 kernel/include/dt-bindings/pinctrl/omap.h     |   1 +
 .../dt-bindings/pinctrl/pinctrl-tegra-xusb.h  |   1 +
 .../dt-bindings/pinctrl/qcom,pmic-gpio.h      |   1 +
 .../dt-bindings/pinctrl/qcom,pmic-mpp.h       |   1 +
 .../dt-bindings/pinctrl/r7s72100-pinctrl.h    |   1 +
 .../dt-bindings/pinctrl/stm32f429-pinfunc.h   |   1 +
 .../dt-bindings/pinctrl/stm32f746-pinfunc.h   |   1 +
 .../dt-bindings/pinctrl/stm32h7-pinfunc.h     |   1 +
 .../include/dt-bindings/power/mt8173-power.h  |   1 +
 .../include/dt-bindings/power/rk3288-power.h  |   1 +
 .../include/dt-bindings/power/rk3328-power.h  |   1 +
 .../include/dt-bindings/power/rk3368-power.h  |   1 +
 .../include/dt-bindings/power/rk3399-power.h  |   1 +
 kernel/include/dt-bindings/pwm/pwm.h          |   1 +
 .../dt-bindings/reset/cortina,gemini-reset.h  |   1 +
 .../dt-bindings/reset/hisi,hi6220-resets.h    |   1 +
 .../dt-bindings/reset/pistachio-resets.h      |   1 +
 .../dt-bindings/reset/stih407-resets.h        |   1 +
 .../dt-bindings/reset/stih415-resets.h        |   1 +
 .../dt-bindings/reset/stih416-resets.h        |   1 +
 .../include/dt-bindings/reset/tegra124-car.h  |   1 +
 .../include/dt-bindings/reset/tegra210-car.h  |   1 +
 .../dt-bindings/soc/rockchip,boot-mode.h      |   1 +
 .../include/dt-bindings/sound/apq8016-lpass.h |   1 +
 .../dt-bindings/sound/audio-jack-events.h     |   1 +
 kernel/include/dt-bindings/sound/cs35l32.h    |   1 +
 .../dt-bindings/sound/fsl-imx-audmux.h        |   1 +
 .../include/dt-bindings/sound/samsung-i2s.h   |   1 +
 kernel/include/dt-bindings/sound/tas2552.h    |   1 +
 .../dt-bindings/sound/tlv320aic31xx-micbias.h |   1 +
 kernel/include/dt-bindings/thermal/lm90.h     |   1 +
 .../dt-bindings/thermal/tegra124-soctherm.h   |   1 +
 kernel/include/keys/ceph-type.h               |   1 +
 kernel/include/linux/8250_pci.h               |   1 +
 kernel/include/linux/a.out.h                  |   1 +
 kernel/include/linux/acct.h                   |   1 +
 kernel/include/linux/acpi_pmtmr.h             |   1 +
 kernel/include/linux/adb.h                    |   1 +
 kernel/include/linux/adfs_fs.h                |   1 +
 kernel/include/linux/aer.h                    |   1 +
 kernel/include/linux/ahci-remap.h             |   1 +
 kernel/include/linux/aio.h                    |   1 +
 kernel/include/linux/alarmtimer.h             |   1 +
 kernel/include/linux/altera_jtaguart.h        |   1 +
 kernel/include/linux/altera_uart.h            |   1 +
 kernel/include/linux/amba/mmci.h              |   1 +
 kernel/include/linux/amifd.h                  |   1 +
 kernel/include/linux/amifdreg.h               |   1 +
 kernel/include/linux/anon_inodes.h            |   1 +
 kernel/include/linux/apple_bl.h               |   1 +
 kernel/include/linux/arch_topology.h          |   1 +
 kernel/include/linux/ata_platform.h           |   1 +
 kernel/include/linux/atalk.h                  |   1 +
 kernel/include/linux/atm.h                    |   1 +
 kernel/include/linux/atm_tcp.h                |   1 +
 kernel/include/linux/atmdev.h                 |   1 +
 kernel/include/linux/atmel-mci.h              |   1 +
 kernel/include/linux/atmel-ssc.h              |   1 +
 kernel/include/linux/atomic.h                 |   1 +
 kernel/include/linux/auxvec.h                 |   1 +
 kernel/include/linux/average.h                |   1 +
 kernel/include/linux/backing-dev-defs.h       |   1 +
 kernel/include/linux/backing-dev.h            |   1 +
 kernel/include/linux/backlight.h              |   1 +
 kernel/include/linux/badblocks.h              |   1 +
 kernel/include/linux/balloon_compaction.h     |   1 +
 kernel/include/linux/bcd.h                    |   1 +
 kernel/include/linux/bcm47xx_wdt.h            |   1 +
 kernel/include/linux/bcm963xx_nvram.h         |   1 +
 kernel/include/linux/bcm963xx_tag.h           |   1 +
 kernel/include/linux/bcma/bcma.h              |   1 +
 .../include/linux/bcma/bcma_driver_arm_c9.h   |   1 +
 .../linux/bcma/bcma_driver_chipcommon.h       |   1 +
 .../include/linux/bcma/bcma_driver_gmac_cmn.h |   1 +
 kernel/include/linux/bcma/bcma_driver_mips.h  |   1 +
 kernel/include/linux/bcma/bcma_driver_pci.h   |   1 +
 kernel/include/linux/bcma/bcma_driver_pcie2.h |   1 +
 kernel/include/linux/bcma/bcma_regs.h         |   1 +
 kernel/include/linux/bcma/bcma_soc.h          |   1 +
 kernel/include/linux/binfmts.h                |   1 +
 kernel/include/linux/bit_spinlock.h           |   1 +
 kernel/include/linux/bitmap.h                 |   1 +
 kernel/include/linux/bitops.h                 |   1 +
 kernel/include/linux/bitrev.h                 |   1 +
 kernel/include/linux/blk-cgroup.h             |   1 +
 kernel/include/linux/blk-mq-pci.h             |   1 +
 kernel/include/linux/blk-mq-virtio.h          |   1 +
 kernel/include/linux/blk-mq.h                 |   1 +
 kernel/include/linux/blk_types.h              |   1 +
 kernel/include/linux/blkdev.h                 |   1 +
 kernel/include/linux/blkpg.h                  |   1 +
 kernel/include/linux/blktrace_api.h           |   1 +
 kernel/include/linux/blockgroup_lock.h        |   1 +
 kernel/include/linux/bootmem.h                |   1 +
 kernel/include/linux/bottom_half.h            |   1 +
 kernel/include/linux/bpf-cgroup.h             |   1 +
 kernel/include/linux/bpf_trace.h              |   1 +
 kernel/include/linux/bpf_types.h              |   1 +
 kernel/include/linux/brcmphy.h                |   1 +
 kernel/include/linux/bsearch.h                |   1 +
 kernel/include/linux/bsg.h                    |   1 +
 kernel/include/linux/btree-128.h              |   1 +
 kernel/include/linux/btree-type.h             |   1 +
 kernel/include/linux/btree.h                  |   1 +
 kernel/include/linux/btrfs.h                  |   1 +
 kernel/include/linux/buffer_head.h            |   1 +
 kernel/include/linux/bug.h                    |   1 +
 kernel/include/linux/build_bug.h              |   1 +
 kernel/include/linux/byteorder/big_endian.h   |   1 +
 kernel/include/linux/byteorder/generic.h      |   1 +
 .../include/linux/byteorder/little_endian.h   |   1 +
 kernel/include/linux/cache.h                  |   1 +
 kernel/include/linux/cacheinfo.h              |   1 +
 kernel/include/linux/can/core.h               |   1 +
 kernel/include/linux/can/dev.h                |   1 +
 kernel/include/linux/can/platform/cc770.h     |   1 +
 kernel/include/linux/can/platform/mcp251x.h   |   1 +
 kernel/include/linux/can/platform/rcar_can.h  |   1 +
 kernel/include/linux/can/platform/sja1000.h   |   1 +
 kernel/include/linux/can/skb.h                |   1 +
 kernel/include/linux/capability.h             |   1 +
 kernel/include/linux/cciss_ioctl.h            |   1 +
 kernel/include/linux/cdev.h                   |   1 +
 kernel/include/linux/cdrom.h                  |   1 +
 kernel/include/linux/ceph/auth.h              |   1 +
 kernel/include/linux/ceph/buffer.h            |   1 +
 kernel/include/linux/ceph/ceph_debug.h        |   1 +
 kernel/include/linux/ceph/ceph_features.h     |   1 +
 kernel/include/linux/ceph/ceph_frag.h         |   1 +
 kernel/include/linux/ceph/ceph_fs.h           |   1 +
 kernel/include/linux/ceph/ceph_hash.h         |   1 +
 kernel/include/linux/ceph/cls_lock_client.h   |   1 +
 kernel/include/linux/ceph/debugfs.h           |   1 +
 kernel/include/linux/ceph/decode.h            |   1 +
 kernel/include/linux/ceph/libceph.h           |   1 +
 kernel/include/linux/ceph/mdsmap.h            |   1 +
 kernel/include/linux/ceph/messenger.h         |   1 +
 kernel/include/linux/ceph/mon_client.h        |   1 +
 kernel/include/linux/ceph/msgpool.h           |   1 +
 kernel/include/linux/ceph/msgr.h              |   1 +
 kernel/include/linux/ceph/osd_client.h        |   1 +
 kernel/include/linux/ceph/osdmap.h            |   1 +
 kernel/include/linux/ceph/pagelist.h          |   1 +
 kernel/include/linux/ceph/rados.h             |   1 +
 kernel/include/linux/ceph/string_table.h      |   1 +
 kernel/include/linux/ceph/types.h             |   1 +
 kernel/include/linux/cgroup-defs.h            |   1 +
 kernel/include/linux/cgroup.h                 |   1 +
 kernel/include/linux/cgroup_subsys.h          |   1 +
 kernel/include/linux/circ_buf.h               |   1 +
 kernel/include/linux/cleancache.h             |   1 +
 kernel/include/linux/clk/mmp.h                |   1 +
 kernel/include/linux/clockchips.h             |   1 +
 kernel/include/linux/clocksource.h            |   1 +
 kernel/include/linux/cm4000_cs.h              |   1 +
 kernel/include/linux/cma.h                    |   1 +
 kernel/include/linux/cmdline-parser.h         |   1 +
 kernel/include/linux/coda_psdev.h             |   1 +
 kernel/include/linux/compaction.h             |   1 +
 kernel/include/linux/compat.h                 |   1 +
 kernel/include/linux/compiler-clang.h         |   1 +
 kernel/include/linux/compiler-gcc.h           |   1 +
 kernel/include/linux/compiler-intel.h         |   1 +
 kernel/include/linux/compiler.h               |   5 +-
 kernel/include/linux/completion.h             |   1 +
 kernel/include/linux/component.h              |   1 +
 kernel/include/linux/console_struct.h         |   1 +
 kernel/include/linux/consolemap.h             |   1 +
 kernel/include/linux/context_tracking.h       |   1 +
 kernel/include/linux/context_tracking_state.h |   1 +
 kernel/include/linux/coredump.h               |   1 +
 kernel/include/linux/coresight-stm.h          |   1 +
 kernel/include/linux/cpu.h                    |   1 +
 kernel/include/linux/cpuhotplug.h             |   1 +
 kernel/include/linux/cpumask.h                |   1 +
 kernel/include/linux/cpuset.h                 |   1 +
 kernel/include/linux/crash_core.h             |   1 +
 kernel/include/linux/crash_dump.h             |   1 +
 kernel/include/linux/crc-ccitt.h              |   1 +
 kernel/include/linux/crc-t10dif.h             |   1 +
 kernel/include/linux/crc32c.h                 |   1 +
 kernel/include/linux/crc4.h                   |   1 +
 kernel/include/linux/crc7.h                   |   1 +
 kernel/include/linux/crush/crush.h            |   1 +
 kernel/include/linux/crush/hash.h             |   1 +
 kernel/include/linux/crush/mapper.h           |   1 +
 kernel/include/linux/cryptohash.h             |   1 +
 kernel/include/linux/ctype.h                  |   1 +
 kernel/include/linux/cuda.h                   |   1 +
 kernel/include/linux/cyclades.h               |   1 +
 kernel/include/linux/dax.h                    |   1 +
 kernel/include/linux/dcache.h                 |   1 +
 kernel/include/linux/dccp.h                   |   1 +
 kernel/include/linux/dcookies.h               |   1 +
 kernel/include/linux/debug_locks.h            |   1 +
 kernel/include/linux/debugobjects.h           |   1 +
 kernel/include/linux/decompress/bunzip2.h     |   1 +
 kernel/include/linux/decompress/generic.h     |   1 +
 kernel/include/linux/decompress/inflate.h     |   1 +
 kernel/include/linux/decompress/mm.h          |   1 +
 kernel/include/linux/decompress/unlz4.h       |   1 +
 kernel/include/linux/decompress/unlzma.h      |   1 +
 kernel/include/linux/decompress/unlzo.h       |   1 +
 kernel/include/linux/delay.h                  |   1 +
 kernel/include/linux/delayed_call.h           |   1 +
 kernel/include/linux/dell-led.h               |   1 +
 kernel/include/linux/device_cgroup.h          |   1 +
 kernel/include/linux/dio.h                    |   1 +
 kernel/include/linux/dirent.h                 |   1 +
 kernel/include/linux/dma-direction.h          |   1 +
 kernel/include/linux/dma-mapping.h            |   1 +
 kernel/include/linux/dma/mmp-pdma.h           |   1 +
 kernel/include/linux/dma/pxa-dma.h            |   1 +
 kernel/include/linux/dma_remapping.h          |   1 +
 kernel/include/linux/dmi.h                    |   1 +
 kernel/include/linux/dnotify.h                |   1 +
 kernel/include/linux/dqblk_qtree.h            |   1 +
 kernel/include/linux/dqblk_v1.h               |   1 +
 kernel/include/linux/dqblk_v2.h               |   1 +
 kernel/include/linux/drbd_genl.h              |   1 +
 kernel/include/linux/drbd_genl_api.h          |   1 +
 kernel/include/linux/drbd_limits.h            |   1 +
 kernel/include/linux/ds2782_battery.h         |   1 +
 kernel/include/linux/dtlk.h                   |   1 +
 kernel/include/linux/dynamic_debug.h          |   1 +
 kernel/include/linux/dynamic_queue_limits.h   |   1 +
 kernel/include/linux/earlycpio.h              |   1 +
 kernel/include/linux/ecryptfs.h               |   1 +
 kernel/include/linux/eeprom_93xx46.h          |   1 +
 kernel/include/linux/efi-bgrt.h               |   1 +
 kernel/include/linux/efi.h                    |   1 +
 kernel/include/linux/efs_vh.h                 |   1 +
 kernel/include/linux/eisa.h                   |   1 +
 kernel/include/linux/elevator.h               |   1 +
 kernel/include/linux/elf-randomize.h          |   1 +
 kernel/include/linux/elf.h                    |   1 +
 kernel/include/linux/elfcore-compat.h         |   1 +
 kernel/include/linux/elfcore.h                |   1 +
 kernel/include/linux/elfnote.h                |   1 +
 kernel/include/linux/err.h                    |   1 +
 kernel/include/linux/errno.h                  |   1 +
 kernel/include/linux/errqueue.h               |   1 +
 kernel/include/linux/errseq.h                 |   1 +
 kernel/include/linux/ethtool.h                |   1 +
 kernel/include/linux/eventfd.h                |   1 +
 kernel/include/linux/evm.h                    |   1 +
 kernel/include/linux/exportfs.h               |   1 +
 kernel/include/linux/ext2_fs.h                |   1 +
 kernel/include/linux/extable.h                |   1 +
 kernel/include/linux/falloc.h                 |   1 +
 kernel/include/linux/fanotify.h               |   1 +
 kernel/include/linux/fault-inject.h           |   1 +
 kernel/include/linux/fb.h                     |   1 +
 kernel/include/linux/fcntl.h                  |   1 +
 kernel/include/linux/fd.h                     |   1 +
 kernel/include/linux/fdtable.h                |   1 +
 kernel/include/linux/file.h                   |   1 +
 kernel/include/linux/filter.h                 |   1 +
 kernel/include/linux/fips.h                   |   1 +
 kernel/include/linux/firewire.h               |   1 +
 kernel/include/linux/firmware.h               |   1 +
 kernel/include/linux/flat.h                   |   1 +
 kernel/include/linux/flex_array.h             |   1 +
 kernel/include/linux/flex_proportions.h       |   1 +
 kernel/include/linux/fmc-sdb.h                |   1 +
 kernel/include/linux/fpga/fpga-bridge.h       |   1 +
 kernel/include/linux/frame.h                  |   1 +
 kernel/include/linux/freezer.h                |   1 +
 kernel/include/linux/frontswap.h              |   1 +
 kernel/include/linux/fs.h                     |   1 +
 kernel/include/linux/fs_pin.h                 |   1 +
 kernel/include/linux/fs_stack.h               |   1 +
 kernel/include/linux/fs_struct.h              |   1 +
 kernel/include/linux/fscrypt_common.h         |   1 +
 kernel/include/linux/fscrypt_notsupp.h        |   1 +
 kernel/include/linux/fscrypt_supp.h           |   1 +
 kernel/include/linux/fsl/edac.h               |   1 +
 kernel/include/linux/fsnotify.h               |   1 +
 kernel/include/linux/fsnotify_backend.h       |   1 +
 kernel/include/linux/ftrace.h                 |   1 +
 kernel/include/linux/ftrace_irq.h             |   1 +
 kernel/include/linux/futex.h                  |   1 +
 kernel/include/linux/gcd.h                    |   1 +
 kernel/include/linux/genetlink.h              |   1 +
 kernel/include/linux/genhd.h                  |   1 +
 kernel/include/linux/genl_magic_func.h        |   1 +
 kernel/include/linux/genl_magic_struct.h      |   1 +
 kernel/include/linux/getcpu.h                 |   1 +
 kernel/include/linux/gfp.h                    |   1 +
 kernel/include/linux/glob.h                   |   1 +
 kernel/include/linux/goldfish.h               |   1 +
 kernel/include/linux/gpio-pxa.h               |   1 +
 kernel/include/linux/gpio.h                   |   1 +
 kernel/include/linux/gpio/consumer.h          |   1 +
 kernel/include/linux/gpio/driver.h            |   1 +
 kernel/include/linux/gpio/gpio-reg.h          |   1 +
 kernel/include/linux/gpio/machine.h           |   1 +
 kernel/include/linux/gpio_keys.h              |   1 +
 kernel/include/linux/hardirq.h                |   1 +
 kernel/include/linux/hashtable.h              |   1 +
 kernel/include/linux/hdlcdrv.h                |   1 +
 kernel/include/linux/highmem.h                |   1 +
 kernel/include/linux/highuid.h                |   1 +
 kernel/include/linux/hpet.h                   |   1 +
 kernel/include/linux/htcpld.h                 |   1 +
 kernel/include/linux/htirq.h                  |   1 +
 kernel/include/linux/huge_mm.h                |   1 +
 kernel/include/linux/hugetlb.h                |   1 +
 kernel/include/linux/hugetlb_inline.h         |   1 +
 kernel/include/linux/hw_breakpoint.h          |   1 +
 kernel/include/linux/hypervisor.h             |   1 +
 kernel/include/linux/i2c-algo-pca.h           |   1 +
 kernel/include/linux/i2c-omap.h               |   1 +
 kernel/include/linux/i2c-pca-platform.h       |   1 +
 kernel/include/linux/i2c-pxa.h                |   1 +
 kernel/include/linux/i7300_idle.h             |   1 +
 kernel/include/linux/icmpv6.h                 |   1 +
 kernel/include/linux/ide.h                    |   1 +
 kernel/include/linux/if_link.h                |   1 +
 kernel/include/linux/if_ltalk.h               |   1 +
 kernel/include/linux/if_macvlan.h             |   1 +
 kernel/include/linux/if_phonet.h              |   1 +
 kernel/include/linux/if_tap.h                 |   1 +
 kernel/include/linux/if_tunnel.h              |   1 +
 kernel/include/linux/ihex.h                   |   1 +
 kernel/include/linux/iio/buffer_impl.h        |   1 +
 kernel/include/linux/iio/dac/ad5421.h         |   1 +
 kernel/include/linux/iio/kfifo_buf.h          |   1 +
 .../include/linux/iio/magnetometer/ak8975.h   |   1 +
 kernel/include/linux/iio/triggered_buffer.h   |   1 +
 kernel/include/linux/iio/triggered_event.h    |   1 +
 kernel/include/linux/inet_diag.h              |   1 +
 kernel/include/linux/inetdevice.h             |   1 +
 kernel/include/linux/init.h                   |   1 +
 kernel/include/linux/init_ohci1394_dma.h      |   1 +
 kernel/include/linux/init_task.h              |   1 +
 kernel/include/linux/initrd.h                 |   1 +
 kernel/include/linux/inotify.h                |   1 +
 kernel/include/linux/input/cy8ctmg110_pdata.h |   1 +
 kernel/include/linux/input/gp2ap002a00f.h     |   1 +
 kernel/include/linux/input/gpio_tilt.h        |   1 +
 kernel/include/linux/input/ili210x.h          |   1 +
 kernel/include/linux/input/matrix_keypad.h    |   1 +
 kernel/include/linux/input/sh_keysc.h         |   1 +
 kernel/include/linux/interrupt.h              |   1 +
 kernel/include/linux/interval_tree.h          |   1 +
 kernel/include/linux/io-64-nonatomic-hi-lo.h  |   1 +
 kernel/include/linux/io-64-nonatomic-lo-hi.h  |   1 +
 kernel/include/linux/iocontext.h              |   1 +
 kernel/include/linux/iomap.h                  |   1 +
 kernel/include/linux/iommu-common.h           |   1 +
 kernel/include/linux/iommu-helper.h           |   1 +
 kernel/include/linux/ioport.h                 |   1 +
 kernel/include/linux/ioprio.h                 |   1 +
 kernel/include/linux/ipc.h                    |   1 +
 kernel/include/linux/ipc_namespace.h          |   1 +
 kernel/include/linux/ipv6.h                   |   1 +
 kernel/include/linux/irq.h                    |   1 +
 kernel/include/linux/irq_cpustat.h            |   1 +
 kernel/include/linux/irq_poll.h               |   1 +
 kernel/include/linux/irq_work.h               |   1 +
 kernel/include/linux/irqchip/metag-ext.h      |   1 +
 kernel/include/linux/irqchip/metag.h          |   1 +
 kernel/include/linux/irqchip/mmp.h            |   1 +
 kernel/include/linux/irqchip/versatile-fpga.h |   1 +
 kernel/include/linux/irqdesc.h                |   1 +
 kernel/include/linux/irqdomain.h              |   1 +
 kernel/include/linux/irqflags.h               |   1 +
 kernel/include/linux/irqhandler.h             |   1 +
 kernel/include/linux/irqnr.h                  |   1 +
 kernel/include/linux/irqreturn.h              |   1 +
 kernel/include/linux/isa.h                    |   1 +
 kernel/include/linux/isicom.h                 |   1 +
 kernel/include/linux/jiffies.h                |   1 +
 kernel/include/linux/journal-head.h           |   1 +
 kernel/include/linux/jump_label.h             |   1 +
 kernel/include/linux/jump_label_ratelimit.h   |   1 +
 kernel/include/linux/jz4740-adc.h             |   1 +
 kernel/include/linux/kallsyms.h               |   1 +
 kernel/include/linux/kasan-checks.h           |   1 +
 kernel/include/linux/kasan.h                  |   1 +
 kernel/include/linux/kbd_diacr.h              |   1 +
 kernel/include/linux/kbd_kern.h               |   1 +
 kernel/include/linux/kbuild.h                 |   1 +
 kernel/include/linux/kconfig.h                |   1 +
 kernel/include/linux/kcore.h                  |   1 +
 kernel/include/linux/kcov.h                   |   1 +
 kernel/include/linux/kd.h                     |   1 +
 kernel/include/linux/kdebug.h                 |   1 +
 kernel/include/linux/kdev_t.h                 |   1 +
 kernel/include/linux/kern_levels.h            |   1 +
 kernel/include/linux/kernel-page-flags.h      |   1 +
 kernel/include/linux/kernel.h                 |   1 +
 kernel/include/linux/kernel_stat.h            |   1 +
 kernel/include/linux/kernelcapi.h             |   1 +
 kernel/include/linux/kexec.h                  |   1 +
 kernel/include/linux/keyboard.h               |   1 +
 kernel/include/linux/khugepaged.h             |   1 +
 kernel/include/linux/kmemcheck.h              |   1 +
 kernel/include/linux/kobj_map.h               |   1 +
 kernel/include/linux/ksm.h                    |   1 +
 kernel/include/linux/kthread.h                |   1 +
 kernel/include/linux/kvm_para.h               |   1 +
 kernel/include/linux/l2tp.h                   |   1 +
 kernel/include/linux/lapb.h                   |   1 +
 kernel/include/linux/latencytop.h             |   1 +
 kernel/include/linux/lcd.h                    |   1 +
 kernel/include/linux/lcm.h                    |   1 +
 kernel/include/linux/leds_pwm.h               |   1 +
 kernel/include/linux/libfdt.h                 |   1 +
 kernel/include/linux/libfdt_env.h             |   1 +
 kernel/include/linux/lightnvm.h               |   1 +
 kernel/include/linux/linkage.h                |   1 +
 kernel/include/linux/linux_logo.h             |   1 +
 kernel/include/linux/lis3lv02d.h              |   1 +
 kernel/include/linux/list.h                   |   1 +
 kernel/include/linux/list_bl.h                |   1 +
 kernel/include/linux/list_lru.h               |   1 +
 kernel/include/linux/list_nulls.h             |   1 +
 kernel/include/linux/list_sort.h              |   1 +
 kernel/include/linux/lockd/bind.h             |   1 +
 kernel/include/linux/lockd/debug.h            |   1 +
 kernel/include/linux/lockd/lockd.h            |   1 +
 kernel/include/linux/lockd/nlm.h              |   1 +
 kernel/include/linux/lockd/share.h            |   1 +
 kernel/include/linux/lockd/xdr.h              |   1 +
 kernel/include/linux/lockd/xdr4.h             |   1 +
 kernel/include/linux/lockdep.h                |   1 +
 kernel/include/linux/lockref.h                |   1 +
 kernel/include/linux/lp.h                     |   1 +
 kernel/include/linux/lsm_audit.h              |   1 +
 kernel/include/linux/lzo.h                    |   1 +
 kernel/include/linux/mISDNdsp.h               |   1 +
 kernel/include/linux/maple.h                  |   1 +
 kernel/include/linux/marvell_phy.h            |   1 +
 kernel/include/linux/math64.h                 |   1 +
 kernel/include/linux/mbcache.h                |   1 +
 kernel/include/linux/mc6821.h                 |   1 +
 kernel/include/linux/mdio-bitbang.h           |   1 +
 kernel/include/linux/mei_cl_bus.h             |   1 +
 kernel/include/linux/memory.h                 |   1 +
 kernel/include/linux/memory_hotplug.h         |   1 +
 kernel/include/linux/mempolicy.h              |   1 +
 kernel/include/linux/mempool.h                |   1 +
 kernel/include/linux/memremap.h               |   1 +
 kernel/include/linux/mfd/da903x.h             |   1 +
 kernel/include/linux/mfd/dln2.h               |   1 +
 kernel/include/linux/mfd/ds1wm.h              |   1 +
 kernel/include/linux/mfd/ezx-pcap.h           |   1 +
 kernel/include/linux/mfd/imx25-tsadc.h        |   1 +
 kernel/include/linux/mfd/ipaq-micro.h         |   1 +
 kernel/include/linux/mfd/menelaus.h           |   1 +
 kernel/include/linux/mfd/pcf50633/pmic.h      |   1 +
 kernel/include/linux/mfd/qcom_rpm.h           |   1 +
 kernel/include/linux/mfd/rdc321x.h            |   1 +
 kernel/include/linux/mfd/tmio.h               |   1 +
 kernel/include/linux/mfd/tps6586x.h           |   1 +
 kernel/include/linux/migrate.h                |   1 +
 kernel/include/linux/migrate_mode.h           |   1 +
 kernel/include/linux/mii.h                    |   1 +
 kernel/include/linux/miscdevice.h             |   1 +
 kernel/include/linux/mm.h                     |   1 +
 kernel/include/linux/mm_inline.h              |   1 +
 kernel/include/linux/mm_types.h               |   1 +
 kernel/include/linux/mm_types_task.h          |   1 +
 kernel/include/linux/mman.h                   |   1 +
 kernel/include/linux/mmc/sdhci-pci-data.h     |   1 +
 kernel/include/linux/mmc/sdio_ids.h           |   1 +
 kernel/include/linux/mmdebug.h                |   1 +
 kernel/include/linux/mmiotrace.h              |   1 +
 kernel/include/linux/mmu_context.h            |   1 +
 kernel/include/linux/mmu_notifier.h           |   1 +
 kernel/include/linux/mmzone.h                 |   1 +
 kernel/include/linux/mnt_namespace.h          |   1 +
 kernel/include/linux/mod_devicetable.h        |   1 +
 kernel/include/linux/moduleloader.h           |   1 +
 kernel/include/linux/moduleparam.h            |   1 +
 kernel/include/linux/mount.h                  |   1 +
 kernel/include/linux/mpage.h                  |   1 +
 kernel/include/linux/mpls.h                   |   1 +
 kernel/include/linux/mpls_iptunnel.h          |   1 +
 kernel/include/linux/mroute.h                 |   1 +
 kernel/include/linux/mroute6.h                |   1 +
 kernel/include/linux/msdos_fs.h               |   1 +
 kernel/include/linux/msg.h                    |   1 +
 kernel/include/linux/msi.h                    |   1 +
 kernel/include/linux/mtd/inftl.h              |   1 +
 kernel/include/linux/mtd/mtdram.h             |   1 +
 kernel/include/linux/mtd/nand-gpio.h          |   1 +
 kernel/include/linux/mtd/pfow.h               |   1 +
 kernel/include/linux/mtd/qinfo.h              |   1 +
 kernel/include/linux/mutex.h                  |   1 +
 kernel/include/linux/mv643xx_eth.h            |   1 +
 kernel/include/linux/namei.h                  |   1 +
 kernel/include/linux/netfilter.h              |   1 +
 .../linux/netfilter/ipset/ip_set_bitmap.h     |   1 +
 .../linux/netfilter/ipset/ip_set_getport.h    |   1 +
 .../linux/netfilter/ipset/ip_set_hash.h       |   1 +
 .../linux/netfilter/ipset/ip_set_list.h       |   1 +
 kernel/include/linux/netfilter/ipset/pfxlen.h |   1 +
 .../linux/netfilter/nf_conntrack_amanda.h     |   1 +
 .../linux/netfilter/nf_conntrack_common.h     |   1 +
 .../linux/netfilter/nf_conntrack_dccp.h       |   1 +
 .../linux/netfilter/nf_conntrack_ftp.h        |   1 +
 .../linux/netfilter/nf_conntrack_h323.h       |   1 +
 .../linux/netfilter/nf_conntrack_irc.h        |   1 +
 .../linux/netfilter/nf_conntrack_pptp.h       |   1 +
 .../linux/netfilter/nf_conntrack_proto_gre.h  |   1 +
 .../linux/netfilter/nf_conntrack_sane.h       |   1 +
 .../linux/netfilter/nf_conntrack_sctp.h       |   1 +
 .../linux/netfilter/nf_conntrack_sip.h        |   1 +
 .../linux/netfilter/nf_conntrack_snmp.h       |   1 +
 .../linux/netfilter/nf_conntrack_tcp.h        |   1 +
 .../linux/netfilter/nf_conntrack_tftp.h       |   1 +
 .../netfilter/nf_conntrack_zones_common.h     |   1 +
 kernel/include/linux/netfilter/nfnetlink.h    |   1 +
 .../include/linux/netfilter/nfnetlink_acct.h  |   1 +
 kernel/include/linux/netfilter/x_tables.h     |   1 +
 kernel/include/linux/netfilter/xt_hashlimit.h |   1 +
 kernel/include/linux/netfilter/xt_physdev.h   |   1 +
 .../include/linux/netfilter_arp/arp_tables.h  |   1 +
 kernel/include/linux/netfilter_bridge.h       |   1 +
 .../linux/netfilter_bridge/ebt_802_3.h        |   1 +
 .../include/linux/netfilter_bridge/ebtables.h |   1 +
 kernel/include/linux/netfilter_defs.h         |   1 +
 kernel/include/linux/netfilter_ingress.h      |   1 +
 .../include/linux/netfilter_ipv4/ip_tables.h  |   1 +
 .../include/linux/netfilter_ipv6/ip6_tables.h |   1 +
 kernel/include/linux/netlink.h                |   1 +
 kernel/include/linux/netpoll.h                |   1 +
 kernel/include/linux/nfs.h                    |   1 +
 kernel/include/linux/nfs3.h                   |   1 +
 kernel/include/linux/nfs4.h                   |   1 +
 kernel/include/linux/nfs_fs.h                 |   1 +
 kernel/include/linux/nfs_fs_i.h               |   1 +
 kernel/include/linux/nfs_fs_sb.h              |   1 +
 kernel/include/linux/nfs_iostat.h             |   1 +
 kernel/include/linux/nfs_page.h               |   1 +
 kernel/include/linux/nfs_xdr.h                |   1 +
 kernel/include/linux/nfsacl.h                 |   1 +
 kernel/include/linux/nls.h                    |   1 +
 kernel/include/linux/nmi.h                    |   1 +
 kernel/include/linux/node.h                   |   1 +
 kernel/include/linux/nodemask.h               |   1 +
 kernel/include/linux/notifier.h               |   1 +
 kernel/include/linux/ns_common.h              |   1 +
 kernel/include/linux/nsc_gpio.h               |   1 +
 kernel/include/linux/nsproxy.h                |   1 +
 kernel/include/linux/nubus.h                  |   1 +
 kernel/include/linux/numa.h                   |   1 +
 kernel/include/linux/nvram.h                  |   1 +
 kernel/include/linux/of_address.h             |   1 +
 kernel/include/linux/of_device.h              |   1 +
 kernel/include/linux/of_iommu.h               |   1 +
 kernel/include/linux/of_irq.h                 |   1 +
 kernel/include/linux/of_pci.h                 |   1 +
 kernel/include/linux/of_reserved_mem.h        |   1 +
 kernel/include/linux/olpc-ec.h                |   1 +
 kernel/include/linux/omap-dma.h               |   1 +
 kernel/include/linux/once.h                   |   1 +
 kernel/include/linux/oom.h                    |   1 +
 kernel/include/linux/osq_lock.h               |   1 +
 kernel/include/linux/oxu210hp.h               |   1 +
 kernel/include/linux/page-flags-layout.h      |   1 +
 kernel/include/linux/page-flags.h             |   1 +
 kernel/include/linux/page-isolation.h         |   1 +
 kernel/include/linux/page_counter.h           |   1 +
 kernel/include/linux/page_ext.h               |   1 +
 kernel/include/linux/page_idle.h              |   1 +
 kernel/include/linux/page_owner.h             |   1 +
 kernel/include/linux/page_ref.h               |   1 +
 kernel/include/linux/pagemap.h                |   1 +
 kernel/include/linux/pagevec.h                |   1 +
 kernel/include/linux/parport_pc.h             |   1 +
 kernel/include/linux/parser.h                 |   1 +
 kernel/include/linux/patchkey.h               |   1 +
 kernel/include/linux/path.h                   |   1 +
 kernel/include/linux/pci-acpi.h               |   1 +
 kernel/include/linux/pci-aspm.h               |   1 +
 kernel/include/linux/pci-ats.h                |   1 +
 kernel/include/linux/pci-dma-compat.h         |   1 +
 kernel/include/linux/pci-dma.h                |   1 +
 kernel/include/linux/pci.h                    |   1 +
 kernel/include/linux/pci_ids.h                |   1 +
 kernel/include/linux/pcieport_if.h            |   1 +
 kernel/include/linux/percpu-refcount.h        |   1 +
 kernel/include/linux/percpu-rwsem.h           |   1 +
 kernel/include/linux/percpu.h                 |   1 +
 kernel/include/linux/percpu_counter.h         |   1 +
 kernel/include/linux/percpu_ida.h             |   1 +
 kernel/include/linux/perf_regs.h              |   1 +
 kernel/include/linux/personality.h            |   1 +
 kernel/include/linux/pfn.h                    |   1 +
 kernel/include/linux/pfn_t.h                  |   1 +
 kernel/include/linux/phy/ulpi_phy.h           |   1 +
 kernel/include/linux/phy_fixed.h              |   1 +
 kernel/include/linux/pid.h                    |   1 +
 kernel/include/linux/pid_namespace.h          |   1 +
 kernel/include/linux/pim.h                    |   1 +
 kernel/include/linux/pinctrl/pinctrl-state.h  |   1 +
 kernel/include/linux/pipe_fs_i.h              |   1 +
 kernel/include/linux/pkeys.h                  |   1 +
 kernel/include/linux/platform_data/ad7291.h   |   1 +
 kernel/include/linux/platform_data/ad7791.h   |   1 +
 kernel/include/linux/platform_data/ad7879.h   |   1 +
 .../linux/platform_data/asoc-imx-ssi.h        |   1 +
 .../linux/platform_data/asoc-kirkwood.h       |   1 +
 .../linux/platform_data/asoc-mx27vis.h        |   1 +
 .../linux/platform_data/asoc-palm27x.h        |   1 +
 kernel/include/linux/platform_data/bcmgenet.h |   1 +
 .../linux/platform_data/crypto-atmel.h        |   1 +
 .../include/linux/platform_data/dma-ep93xx.h  |   1 +
 .../linux/platform_data/dma-imx-sdma.h        |   1 +
 .../include/linux/platform_data/dma-mv_xor.h  |   1 +
 kernel/include/linux/platform_data/ds620.h    |   1 +
 .../include/linux/platform_data/efm32-spi.h   |   1 +
 .../include/linux/platform_data/efm32-uart.h  |   1 +
 .../linux/platform_data/gpio-htc-egpio.h      |   1 +
 .../include/linux/platform_data/i2c-nuc900.h  |   1 +
 .../linux/platform_data/irda-pxaficp.h        |   1 +
 kernel/include/linux/platform_data/itco_wdt.h |   1 +
 .../platform_data/keyboard-pxa930_rotary.h    |   1 +
 .../linux/platform_data/keypad-ep93xx.h       |   1 +
 .../linux/platform_data/keypad-pxa27x.h       |   1 +
 .../linux/platform_data/keypad-w90p910.h      |   1 +
 .../include/linux/platform_data/lcd-mipid.h   |   1 +
 .../include/linux/platform_data/max3421-hcd.h |   1 +
 kernel/include/linux/platform_data/max6639.h  |   1 +
 kernel/include/linux/platform_data/max732x.h  |   1 +
 .../linux/platform_data/media/ir-rx51.h       |   1 +
 .../linux/platform_data/media/mmp-camera.h    |   1 +
 .../linux/platform_data/media/omap4iss.h      |   1 +
 .../include/linux/platform_data/mmc-davinci.h |   1 +
 .../include/linux/platform_data/mmc-mxcmmc.h  |   1 +
 .../include/linux/platform_data/mmc-pxamci.h  |   1 +
 .../include/linux/platform_data/mmc-s3cmci.h  |   1 +
 .../linux/platform_data/mmc-sdhci-s3c.h       |   1 +
 .../platform_data/mouse-pxa930_trkball.h      |   1 +
 .../linux/platform_data/mtd-nand-pxa3xx.h     |   1 +
 kernel/include/linux/platform_data/omap1_bl.h |   1 +
 kernel/include/linux/platform_data/pca953x.h  |   1 +
 kernel/include/linux/platform_data/pcf857x.h  |   1 +
 .../linux/platform_data/pcmcia-pxa2xx_viper.h |   1 +
 .../linux/platform_data/pinctrl-single.h      |   1 +
 .../linux/platform_data/pixcir_i2c_ts.h       |   1 +
 .../include/linux/platform_data/pxa2xx_udc.h  |   1 +
 .../linux/platform_data/sa11x0-serial.h       |   1 +
 kernel/include/linux/platform_data/si5351.h   |   1 +
 .../include/linux/platform_data/spi-ep93xx.h  |   1 +
 kernel/include/linux/platform_data/spi-imx.h  |   1 +
 .../linux/platform_data/spi-omap2-mcspi.h     |   1 +
 .../linux/platform_data/st1232_pdata.h        |   1 +
 kernel/include/linux/platform_data/syscon.h   |   1 +
 kernel/include/linux/platform_data/tsc2007.h  |   1 +
 kernel/include/linux/platform_data/tsl2563.h  |   1 +
 .../linux/platform_data/usb-ehci-mxc.h        |   1 +
 .../linux/platform_data/usb-ohci-pxa27x.h     |   1 +
 kernel/include/linux/platform_data/usb3503.h  |   1 +
 .../platform_data/video-clcd-versatile.h      |   1 +
 .../linux/platform_data/video-ep93xx.h        |   1 +
 .../include/linux/platform_data/video-imxfb.h |   1 +
 .../include/linux/platform_data/video_s3c.h   |   1 +
 kernel/include/linux/pm-trace.h               |   1 +
 kernel/include/linux/pm_qos.h                 |   6 +-
 kernel/include/linux/pmu.h                    |   1 +
 kernel/include/linux/pnp.h                    |   1 +
 kernel/include/linux/poison.h                 |   1 +
 kernel/include/linux/poll.h                   |   1 +
 kernel/include/linux/posix-timers.h           |   1 +
 kernel/include/linux/posix_acl.h              |   1 +
 kernel/include/linux/posix_acl_xattr.h        |   1 +
 kernel/include/linux/power/bq27xxx_battery.h  |   1 +
 kernel/include/linux/pr.h                     |   1 +
 kernel/include/linux/preempt.h                |   1 +
 kernel/include/linux/prefetch.h               |   1 +
 kernel/include/linux/prime_numbers.h          |   1 +
 kernel/include/linux/printk.h                 |   1 +
 kernel/include/linux/proc_fs.h                |   1 +
 kernel/include/linux/proc_ns.h                |   1 +
 kernel/include/linux/processor.h              |   1 +
 kernel/include/linux/profile.h                |   1 +
 kernel/include/linux/projid.h                 |   1 +
 kernel/include/linux/ptrace.h                 |   1 +
 kernel/include/linux/purgatory.h              |   1 +
 kernel/include/linux/pvclock_gtod.h           |   1 +
 kernel/include/linux/pwm.h                    |   1 +
 kernel/include/linux/pwm_backlight.h          |   1 +
 kernel/include/linux/pxa168_eth.h             |   1 +
 kernel/include/linux/qed/qed_fcoe_if.h        |   1 +
 kernel/include/linux/qnx6_fs.h                |   1 +
 kernel/include/linux/quicklist.h              |   1 +
 kernel/include/linux/quotaops.h               |   1 +
 kernel/include/linux/raid/xor.h               |   1 +
 kernel/include/linux/ramfs.h                  |   1 +
 kernel/include/linux/random.h                 |   1 +
 kernel/include/linux/range.h                  |   1 +
 kernel/include/linux/ras.h                    |   1 +
 kernel/include/linux/ratelimit.h              |   1 +
 kernel/include/linux/rational.h               |   1 +
 kernel/include/linux/rbtree_latch.h           |   1 +
 kernel/include/linux/rculist.h                |   1 +
 kernel/include/linux/rculist_bl.h             |   1 +
 kernel/include/linux/rculist_nulls.h          |   1 +
 kernel/include/linux/rcupdate_wait.h          |   1 +
 kernel/include/linux/rcuwait.h                |   1 +
 kernel/include/linux/reboot-mode.h            |   1 +
 kernel/include/linux/reboot.h                 |   1 +
 kernel/include/linux/reciprocal_div.h         |   1 +
 kernel/include/linux/refcount.h               |   1 +
 kernel/include/linux/regulator/of_regulator.h |   1 +
 .../linux/regulator/userspace-consumer.h      |   1 +
 kernel/include/linux/relay.h                  |   1 +
 kernel/include/linux/reset-controller.h       |   1 +
 kernel/include/linux/reset.h                  |   1 +
 kernel/include/linux/resource.h               |   1 +
 kernel/include/linux/restart_block.h          |   1 +
 kernel/include/linux/ring_buffer.h            |   1 +
 kernel/include/linux/rmap.h                   |   1 +
 kernel/include/linux/rndis.h                  |   1 +
 kernel/include/linux/root_dev.h               |   1 +
 kernel/include/linux/rpmsg/qcom_smd.h         |   1 +
 kernel/include/linux/rtc.h                    |   1 +
 kernel/include/linux/rtmutex.h                |   1 +
 kernel/include/linux/rtnetlink.h              |   1 +
 kernel/include/linux/rwsem-spinlock.h         |   1 +
 kernel/include/linux/rwsem.h                  |   1 +
 kernel/include/linux/s3c_adc_battery.h        |   1 +
 kernel/include/linux/scatterlist.h            |   1 +
 kernel/include/linux/scc.h                    |   1 +
 kernel/include/linux/sched.h                  |   1 +
 kernel/include/linux/sched/autogroup.h        |   1 +
 kernel/include/linux/sched/clock.h            |   1 +
 kernel/include/linux/sched/coredump.h         |   1 +
 kernel/include/linux/sched/cpufreq.h          |   1 +
 kernel/include/linux/sched/cputime.h          |   1 +
 kernel/include/linux/sched/deadline.h         |   1 +
 kernel/include/linux/sched/debug.h            |   1 +
 kernel/include/linux/sched/hotplug.h          |   1 +
 kernel/include/linux/sched/idle.h             |   1 +
 kernel/include/linux/sched/init.h             |   1 +
 kernel/include/linux/sched/jobctl.h           |   1 +
 kernel/include/linux/sched/loadavg.h          |   1 +
 kernel/include/linux/sched/mm.h               |   1 +
 kernel/include/linux/sched/nohz.h             |   1 +
 kernel/include/linux/sched/numa_balancing.h   |   1 +
 kernel/include/linux/sched/prio.h             |   1 +
 kernel/include/linux/sched/rt.h               |   1 +
 kernel/include/linux/sched/signal.h           |   1 +
 kernel/include/linux/sched/stat.h             |   1 +
 kernel/include/linux/sched/sysctl.h           |   1 +
 kernel/include/linux/sched/task.h             |   1 +
 kernel/include/linux/sched/task_stack.h       |   1 +
 kernel/include/linux/sched/topology.h         |   1 +
 kernel/include/linux/sched/user.h             |   1 +
 kernel/include/linux/sched/wake_q.h           |   1 +
 kernel/include/linux/sched/xacct.h            |   1 +
 kernel/include/linux/screen_info.h            |   1 +
 kernel/include/linux/scx200.h                 |   1 +
 kernel/include/linux/scx200_gpio.h            |   1 +
 kernel/include/linux/sdb.h                    |   1 +
 kernel/include/linux/seccomp.h                |   1 +
 kernel/include/linux/securebits.h             |   1 +
 kernel/include/linux/seg6.h                   |   1 +
 kernel/include/linux/seg6_genl.h              |   1 +
 kernel/include/linux/seg6_hmac.h              |   1 +
 kernel/include/linux/seg6_iptunnel.h          |   1 +
 kernel/include/linux/selection.h              |   1 +
 kernel/include/linux/sem.h                    |   1 +
 kernel/include/linux/seq_buf.h                |   1 +
 kernel/include/linux/seq_file.h               |   1 +
 kernel/include/linux/seq_file_net.h           |   1 +
 kernel/include/linux/seqlock.h                |   1 +
 kernel/include/linux/serial_bcm63xx.h         |   1 +
 kernel/include/linux/serial_sci.h             |   1 +
 kernel/include/linux/sh_clk.h                 |   1 +
 kernel/include/linux/sh_eth.h                 |   1 +
 kernel/include/linux/sh_intc.h                |   1 +
 kernel/include/linux/sh_timer.h               |   1 +
 kernel/include/linux/shm.h                    |   1 +
 kernel/include/linux/shmem_fs.h               |   1 +
 kernel/include/linux/shrinker.h               |   1 +
 kernel/include/linux/signal.h                 |   1 +
 kernel/include/linux/signal_types.h           |   1 +
 kernel/include/linux/signalfd.h               |   1 +
 kernel/include/linux/sirfsoc_dma.h            |   1 +
 kernel/include/linux/slab.h                   |   1 +
 kernel/include/linux/slab_def.h               |   1 +
 kernel/include/linux/slub_def.h               |   1 +
 kernel/include/linux/smc911x.h                |   1 +
 kernel/include/linux/smc91x.h                 |   1 +
 kernel/include/linux/smp.h                    |   1 +
 kernel/include/linux/smpboot.h                |   1 +
 kernel/include/linux/smscphy.h                |   1 +
 kernel/include/linux/soc/brcmstb/brcmstb.h    |   1 +
 kernel/include/linux/soc/dove/pmu.h           |   1 +
 kernel/include/linux/soc/mediatek/infracfg.h  |   1 +
 kernel/include/linux/soc/qcom/mdt_loader.h    |   1 +
 kernel/include/linux/soc/qcom/smd-rpm.h       |   1 +
 kernel/include/linux/soc/qcom/smem.h          |   1 +
 kernel/include/linux/soc/qcom/smem_state.h    |   1 +
 kernel/include/linux/soc/qcom/wcnss_ctrl.h    |   1 +
 kernel/include/linux/soc/renesas/rcar-rst.h   |   1 +
 kernel/include/linux/soc/renesas/rcar-sysc.h  |   1 +
 kernel/include/linux/sock_diag.h              |   1 +
 kernel/include/linux/socket.h                 |   1 +
 kernel/include/linux/sonet.h                  |   1 +
 kernel/include/linux/sony-laptop.h            |   1 +
 kernel/include/linux/sort.h                   |   1 +
 kernel/include/linux/sound.h                  |   1 +
 kernel/include/linux/spi/ad7877.h             |   1 +
 kernel/include/linux/spi/ads7846.h            |   1 +
 kernel/include/linux/spi/at73c213.h           |   1 +
 kernel/include/linux/spi/corgi_lcd.h          |   1 +
 kernel/include/linux/spi/ds1305.h             |   1 +
 kernel/include/linux/spi/eeprom.h             |   1 +
 kernel/include/linux/spi/flash.h              |   1 +
 kernel/include/linux/spi/ifx_modem.h          |   1 +
 kernel/include/linux/spi/max7301.h            |   1 +
 kernel/include/linux/spi/mc33880.h            |   1 +
 kernel/include/linux/spi/mcp23s08.h           |   1 +
 kernel/include/linux/spi/mmc_spi.h            |   1 +
 kernel/include/linux/spi/sh_msiof.h           |   1 +
 kernel/include/linux/spi/spi_bitbang.h        |   1 +
 kernel/include/linux/spi/spi_gpio.h           |   1 +
 kernel/include/linux/spi/spi_oc_tiny.h        |   1 +
 kernel/include/linux/spi/tdo24m.h             |   1 +
 kernel/include/linux/spi/xilinx_spi.h         |   1 +
 kernel/include/linux/spinlock.h               |   1 +
 kernel/include/linux/splice.h                 |   1 +
 kernel/include/linux/ssb/ssb.h                |   1 +
 kernel/include/linux/ssb/ssb_driver_gige.h    |   1 +
 kernel/include/linux/ssb/ssb_driver_mips.h    |   1 +
 kernel/include/linux/ssb/ssb_driver_pci.h     |   1 +
 kernel/include/linux/ssb/ssb_embedded.h       |   1 +
 kernel/include/linux/ssb/ssb_regs.h           |   1 +
 kernel/include/linux/stackprotector.h         |   1 +
 kernel/include/linux/stacktrace.h             |   1 +
 kernel/include/linux/start_kernel.h           |   1 +
 kernel/include/linux/stat.h                   |   1 +
 kernel/include/linux/statfs.h                 |   1 +
 kernel/include/linux/stddef.h                 |   1 +
 kernel/include/linux/stmmac.h                 |   8 +-
 kernel/include/linux/stop_machine.h           |   1 +
 kernel/include/linux/string.h                 |   1 +
 kernel/include/linux/string_helpers.h         |   1 +
 kernel/include/linux/stringhash.h             |   1 +
 kernel/include/linux/sungem_phy.h             |   1 +
 kernel/include/linux/sunrpc/addr.h            |   1 +
 kernel/include/linux/sunrpc/auth.h            |   1 +
 kernel/include/linux/sunrpc/auth_gss.h        |   1 +
 kernel/include/linux/sunrpc/clnt.h            |   1 +
 kernel/include/linux/sunrpc/debug.h           |   1 +
 kernel/include/linux/sunrpc/gss_api.h         |   1 +
 kernel/include/linux/sunrpc/metrics.h         |   1 +
 kernel/include/linux/sunrpc/msg_prot.h        |   1 +
 kernel/include/linux/sunrpc/rpc_pipe_fs.h     |   1 +
 kernel/include/linux/sunrpc/sched.h           |   1 +
 kernel/include/linux/sunrpc/stats.h           |   1 +
 kernel/include/linux/sunrpc/svc.h             |   1 +
 kernel/include/linux/sunrpc/svc_xprt.h        |   1 +
 kernel/include/linux/sunrpc/svcauth.h         |   1 +
 kernel/include/linux/sunrpc/svcauth_gss.h     |   1 +
 kernel/include/linux/sunrpc/svcsock.h         |   1 +
 kernel/include/linux/sunrpc/timer.h           |   1 +
 kernel/include/linux/sunrpc/types.h           |   1 +
 kernel/include/linux/sunrpc/xdr.h             |   1 +
 kernel/include/linux/sunrpc/xprt.h            |   1 +
 kernel/include/linux/sunrpc/xprtmultipath.h   |   1 +
 kernel/include/linux/sunrpc/xprtsock.h        |   1 +
 kernel/include/linux/sunserialcore.h          |   1 +
 kernel/include/linux/suspend.h                |   1 +
 kernel/include/linux/svga.h                   |   1 +
 kernel/include/linux/sw842.h                  |   1 +
 kernel/include/linux/swab.h                   |   1 +
 kernel/include/linux/swait.h                  |   1 +
 kernel/include/linux/swap.h                   |   5 +
 kernel/include/linux/swap_cgroup.h            |   1 +
 kernel/include/linux/swap_slots.h             |   1 +
 kernel/include/linux/swapfile.h               |   1 +
 kernel/include/linux/swapops.h                |   1 +
 kernel/include/linux/swiotlb.h                |   1 +
 kernel/include/linux/sys.h                    |   1 +
 kernel/include/linux/sysctl.h                 |   1 +
 kernel/include/linux/sysfs.h                  |   1 +
 kernel/include/linux/sysrq.h                  |   1 +
 kernel/include/linux/sysv_fs.h                |   1 +
 kernel/include/linux/t10-pi.h                 |   1 +
 kernel/include/linux/task_io_accounting.h     |   1 +
 kernel/include/linux/task_io_accounting_ops.h |   1 +
 kernel/include/linux/task_work.h              |   1 +
 kernel/include/linux/taskstats_kern.h         |   1 +
 kernel/include/linux/textsearch.h             |   1 +
 kernel/include/linux/textsearch_fsm.h         |   1 +
 kernel/include/linux/thinkpad_acpi.h          |   1 +
 kernel/include/linux/thread_info.h            |   1 +
 kernel/include/linux/threads.h                |   1 +
 kernel/include/linux/tick.h                   |   1 +
 kernel/include/linux/time.h                   |   1 +
 kernel/include/linux/time64.h                 |   1 +
 kernel/include/linux/timekeeper_internal.h    |   1 +
 kernel/include/linux/timekeeping.h            |   1 +
 kernel/include/linux/timer.h                  |   1 +
 kernel/include/linux/timerfd.h                |   1 +
 kernel/include/linux/timerqueue.h             |   1 +
 kernel/include/linux/tpm_command.h            |   1 +
 kernel/include/linux/trace.h                  |   1 +
 kernel/include/linux/trace_clock.h            |   1 +
 kernel/include/linux/trace_events.h           |   1 +
 kernel/include/linux/trace_seq.h              |   1 +
 kernel/include/linux/tracepoint-defs.h        |   1 +
 kernel/include/linux/tsacct_kern.h            |   1 +
 kernel/include/linux/tty.h                    |   1 +
 kernel/include/linux/tty_driver.h             |   1 +
 kernel/include/linux/tty_flip.h               |   1 +
 kernel/include/linux/tty_ldisc.h              |   1 +
 kernel/include/linux/typecheck.h              |   1 +
 kernel/include/linux/types.h                  |   1 +
 kernel/include/linux/u64_stats_sync.h         |   1 +
 kernel/include/linux/uaccess.h                |   1 +
 kernel/include/linux/ucs2_string.h            |   1 +
 kernel/include/linux/uidgid.h                 |   1 +
 kernel/include/linux/ulpi/driver.h            |   1 +
 kernel/include/linux/ulpi/interface.h         |   1 +
 kernel/include/linux/ulpi/regs.h              |   1 +
 kernel/include/linux/unaligned/access_ok.h    |   1 +
 kernel/include/linux/unaligned/be_byteshift.h |   1 +
 kernel/include/linux/unaligned/be_memmove.h   |   1 +
 kernel/include/linux/unaligned/be_struct.h    |   1 +
 kernel/include/linux/unaligned/generic.h      |   1 +
 kernel/include/linux/unaligned/le_byteshift.h |   1 +
 kernel/include/linux/unaligned/le_memmove.h   |   1 +
 kernel/include/linux/unaligned/le_struct.h    |   1 +
 kernel/include/linux/unaligned/memmove.h      |   1 +
 kernel/include/linux/usb.h                    |   1 +
 kernel/include/linux/usb/atmel_usba_udc.h     |   1 +
 kernel/include/linux/usb/ch9.h                |   1 +
 kernel/include/linux/usb/chipidea.h           |   1 +
 kernel/include/linux/usb/ehci-dbgp.h          |   1 +
 kernel/include/linux/usb/ezusb.h              |   1 +
 kernel/include/linux/usb/functionfs.h         |   1 +
 kernel/include/linux/usb/gadget_configfs.h    |   1 +
 kernel/include/linux/usb/iowarrior.h          |   1 +
 kernel/include/linux/usb/irda.h               |   1 +
 kernel/include/linux/usb/isp116x.h            |   1 +
 kernel/include/linux/usb/isp1362.h            |   1 +
 kernel/include/linux/usb/isp1760.h            |   1 +
 kernel/include/linux/usb/musb.h               |   1 +
 kernel/include/linux/usb/otg.h                |   1 +
 kernel/include/linux/usb/phy.h                |   1 +
 kernel/include/linux/usb/quirks.h             |   1 +
 kernel/include/linux/usb/sl811.h              |   1 +
 kernel/include/linux/usb/typec.h              |   1 +
 kernel/include/linux/usb/uas.h                |   1 +
 kernel/include/linux/usb/usb_phy_generic.h    |   1 +
 kernel/include/linux/usb_usual.h              |   1 +
 kernel/include/linux/user-return-notifier.h   |   1 +
 kernel/include/linux/user_namespace.h         |   1 +
 kernel/include/linux/userfaultfd_k.h          |   1 +
 kernel/include/linux/util_macros.h            |   1 +
 kernel/include/linux/uts.h                    |   1 +
 kernel/include/linux/utsname.h                |   1 +
 kernel/include/linux/vermagic.h               |   1 +
 kernel/include/linux/vfs.h                    |   1 +
 kernel/include/linux/via.h                    |   1 +
 kernel/include/linux/virtio.h                 |   1 +
 kernel/include/linux/virtio_byteorder.h       |   1 +
 kernel/include/linux/virtio_config.h          |   1 +
 kernel/include/linux/virtio_net.h             |   1 +
 kernel/include/linux/virtio_ring.h            |   1 +
 kernel/include/linux/virtio_vsock.h           |   1 +
 kernel/include/linux/vm_event_item.h          |   1 +
 kernel/include/linux/vmacache.h               |   1 +
 kernel/include/linux/vmalloc.h                |   1 +
 kernel/include/linux/vme.h                    |   1 +
 kernel/include/linux/vmpressure.h             |   1 +
 kernel/include/linux/vmstat.h                 |   1 +
 kernel/include/linux/vt.h                     |   1 +
 kernel/include/linux/vt_buffer.h              |   1 +
 kernel/include/linux/vt_kern.h                |   1 +
 kernel/include/linux/vtime.h                  |   1 +
 kernel/include/linux/wait.h                   |   1 +
 kernel/include/linux/wait_bit.h               |   1 +
 kernel/include/linux/wanrouter.h              |   1 +
 kernel/include/linux/watchdog.h               |   1 +
 kernel/include/linux/win_minmax.h             |   1 +
 kernel/include/linux/wireless.h               |   1 +
 kernel/include/linux/wm97xx.h                 |   1 +
 kernel/include/linux/workqueue.h              |   1 +
 kernel/include/linux/writeback.h              |   1 +
 kernel/include/linux/ww_mutex.h               |   1 +
 kernel/include/linux/xattr.h                  |   1 +
 kernel/include/linux/z2_battery.h             |   1 +
 kernel/include/linux/zbud.h                   |   1 +
 kernel/include/linux/zpool.h                  |   1 +
 kernel/include/media/blackfin/bfin_capture.h  |   1 +
 kernel/include/media/drv-intf/saa7146.h       |   1 +
 kernel/include/media/drv-intf/saa7146_vv.h    |   1 +
 kernel/include/media/drv-intf/sh_mobile_ceu.h |   1 +
 kernel/include/media/i2c-addr.h               |   1 +
 kernel/include/media/i2c/ir-kbd-i2c.h         |   1 +
 kernel/include/media/i2c/mt9p031.h            |   1 +
 kernel/include/media/i2c/mt9t001.h            |   1 +
 kernel/include/media/i2c/mt9v032.h            |   1 +
 kernel/include/media/tuner-types.h            |   1 +
 kernel/include/media/tveeprom.h               |   1 +
 kernel/include/media/v4l2-dev.h               |   1 +
 kernel/include/media/v4l2-ioctl.h             |   1 +
 kernel/include/media/videobuf-dvb.h           |   1 +
 kernel/include/media/videobuf2-dvb.h          |   1 +
 kernel/include/net/Space.h                    |   1 +
 kernel/include/net/act_api.h                  |   7 +-
 kernel/include/net/addrconf.h                 |   1 +
 kernel/include/net/af_unix.h                  |   1 +
 kernel/include/net/ah.h                       |   1 +
 kernel/include/net/arp.h                      |   1 +
 kernel/include/net/atmclip.h                  |   1 +
 kernel/include/net/ax25.h                     |   1 +
 kernel/include/net/compat.h                   |   1 +
 kernel/include/net/datalink.h                 |   1 +
 kernel/include/net/dn.h                       |   1 +
 kernel/include/net/dn_dev.h                   |   1 +
 kernel/include/net/dn_fib.h                   |   1 +
 kernel/include/net/dn_neigh.h                 |   1 +
 kernel/include/net/dsfield.h                  |   1 +
 kernel/include/net/dst.h                      |   1 +
 kernel/include/net/dst_cache.h                |   1 +
 kernel/include/net/dst_metadata.h             |   1 +
 kernel/include/net/dst_ops.h                  |   1 +
 kernel/include/net/esp.h                      |   1 +
 kernel/include/net/fib_rules.h                |   1 +
 kernel/include/net/firewire.h                 |   1 +
 kernel/include/net/flow.h                     |   1 +
 kernel/include/net/flow_dissector.h           |   1 +
 kernel/include/net/fou.h                      |   1 +
 kernel/include/net/garp.h                     |   1 +
 kernel/include/net/gen_stats.h                |   1 +
 kernel/include/net/genetlink.h                |   1 +
 kernel/include/net/geneve.h                   |   1 +
 kernel/include/net/gre.h                      |   1 +
 kernel/include/net/gro_cells.h                |   1 +
 kernel/include/net/gtp.h                      |   1 +
 kernel/include/net/gue.h                      |   1 +
 kernel/include/net/hwbm.h                     |   1 +
 kernel/include/net/ife.h                      |   1 +
 kernel/include/net/inet_common.h              |   1 +
 kernel/include/net/inet_ecn.h                 |   1 +
 kernel/include/net/inet_frag.h                |   1 +
 kernel/include/net/inetpeer.h                 |   1 +
 kernel/include/net/ip6_route.h                |   1 +
 kernel/include/net/ip6_tunnel.h               |   1 +
 kernel/include/net/ip_tunnels.h               |   1 +
 kernel/include/net/ip_vs.h                    |   1 +
 kernel/include/net/ipcomp.h                   |   1 +
 kernel/include/net/ipconfig.h                 |   1 +
 kernel/include/net/ipx.h                      |   1 +
 kernel/include/net/iucv/af_iucv.h             |   1 +
 kernel/include/net/iucv/iucv.h                |   1 +
 kernel/include/net/iw_handler.h               |   1 +
 kernel/include/net/lapb.h                     |   1 +
 kernel/include/net/lib80211.h                 |   1 +
 kernel/include/net/lwtunnel.h                 |   1 +
 kernel/include/net/mld.h                      |   1 +
 kernel/include/net/mrp.h                      |   1 +
 kernel/include/net/ncsi.h                     |   1 +
 kernel/include/net/ndisc.h                    |   1 +
 kernel/include/net/neighbour.h                |   1 +
 kernel/include/net/net_namespace.h            |   1 +
 kernel/include/net/net_ratelimit.h            |   1 +
 kernel/include/net/netevent.h                 |   1 +
 kernel/include/net/netfilter/br_netfilter.h   |   1 +
 .../net/netfilter/ipv4/nf_conntrack_ipv4.h    |   1 +
 .../net/netfilter/ipv4/nf_defrag_ipv4.h       |   1 +
 .../include/net/netfilter/ipv4/nf_dup_ipv4.h  |   1 +
 .../net/netfilter/ipv4/nf_nat_masquerade.h    |   1 +
 kernel/include/net/netfilter/ipv4/nf_reject.h |   1 +
 .../net/netfilter/ipv6/nf_conntrack_icmpv6.h  |   1 +
 .../net/netfilter/ipv6/nf_conntrack_ipv6.h    |   1 +
 .../net/netfilter/ipv6/nf_defrag_ipv6.h       |   1 +
 .../include/net/netfilter/ipv6/nf_dup_ipv6.h  |   1 +
 .../net/netfilter/ipv6/nf_nat_masquerade.h    |   1 +
 kernel/include/net/netfilter/ipv6/nf_reject.h |   1 +
 kernel/include/net/netfilter/nf_conntrack.h   |   1 +
 .../include/net/netfilter/nf_conntrack_core.h |   1 +
 .../net/netfilter/nf_conntrack_ecache.h       |   1 +
 .../net/netfilter/nf_conntrack_expect.h       |   1 +
 .../net/netfilter/nf_conntrack_extend.h       |   1 +
 .../net/netfilter/nf_conntrack_helper.h       |   1 +
 .../net/netfilter/nf_conntrack_l3proto.h      |   1 +
 .../net/netfilter/nf_conntrack_l4proto.h      |   1 +
 .../net/netfilter/nf_conntrack_labels.h       |   1 +
 .../net/netfilter/nf_conntrack_seqadj.h       |   1 +
 .../net/netfilter/nf_conntrack_synproxy.h     |   1 +
 .../net/netfilter/nf_conntrack_timeout.h      |   1 +
 .../net/netfilter/nf_conntrack_timestamp.h    |   1 +
 .../net/netfilter/nf_conntrack_tuple.h        |   1 +
 .../net/netfilter/nf_conntrack_zones.h        |   1 +
 kernel/include/net/netfilter/nf_dup_netdev.h  |   1 +
 kernel/include/net/netfilter/nf_log.h         |   1 +
 kernel/include/net/netfilter/nf_nat.h         |   1 +
 kernel/include/net/netfilter/nf_nat_core.h    |   1 +
 kernel/include/net/netfilter/nf_nat_helper.h  |   1 +
 kernel/include/net/netfilter/nf_nat_l3proto.h |   1 +
 kernel/include/net/netfilter/nf_nat_l4proto.h |   1 +
 .../include/net/netfilter/nf_nat_redirect.h   |   1 +
 kernel/include/net/netfilter/nf_queue.h       |   1 +
 kernel/include/net/netfilter/nf_socket.h      |   1 +
 kernel/include/net/netfilter/nf_tables.h      |   1 +
 kernel/include/net/netfilter/nf_tables_core.h |   1 +
 kernel/include/net/netfilter/nf_tables_ipv4.h |   1 +
 kernel/include/net/netfilter/nf_tables_ipv6.h |   1 +
 kernel/include/net/netfilter/nfnetlink_log.h  |   1 +
 kernel/include/net/netfilter/nft_dup.h        |   1 +
 kernel/include/net/netfilter/nft_fib.h        |   1 +
 kernel/include/net/netfilter/nft_masq.h       |   1 +
 kernel/include/net/netfilter/nft_meta.h       |   1 +
 kernel/include/net/netfilter/nft_redir.h      |   1 +
 kernel/include/net/netfilter/nft_reject.h     |   1 +
 kernel/include/net/netfilter/xt_rateest.h     |   1 +
 kernel/include/net/netlink.h                  |   1 +
 kernel/include/net/netns/can.h                |   1 +
 kernel/include/net/netns/conntrack.h          |   1 +
 kernel/include/net/netns/core.h               |   1 +
 kernel/include/net/netns/dccp.h               |   1 +
 kernel/include/net/netns/generic.h            |   1 +
 kernel/include/net/netns/hash.h               |   1 +
 kernel/include/net/netns/ieee802154_6lowpan.h |   1 +
 kernel/include/net/netns/ipv4.h               |   1 +
 kernel/include/net/netns/ipv6.h               |   1 +
 kernel/include/net/netns/mib.h                |   1 +
 kernel/include/net/netns/mpls.h               |   1 +
 kernel/include/net/netns/netfilter.h          |   1 +
 kernel/include/net/netns/nftables.h           |   1 +
 kernel/include/net/netns/packet.h             |   1 +
 kernel/include/net/netns/sctp.h               |   1 +
 kernel/include/net/netns/unix.h               |   1 +
 kernel/include/net/netns/x_tables.h           |   1 +
 kernel/include/net/netns/xfrm.h               |   1 +
 kernel/include/net/netrom.h                   |   1 +
 kernel/include/net/nexthop.h                  |   1 +
 kernel/include/net/p8022.h                    |   1 +
 kernel/include/net/pkt_cls.h                  |   1 +
 kernel/include/net/pkt_sched.h                |   1 +
 kernel/include/net/pptp.h                     |   1 +
 kernel/include/net/psample.h                  |   1 +
 kernel/include/net/psnap.h                    |   1 +
 kernel/include/net/rawv6.h                    |   1 +
 kernel/include/net/red.h                      |   1 +
 kernel/include/net/rose.h                     |   1 +
 kernel/include/net/rtnetlink.h                |   1 +
 kernel/include/net/sch_generic.h              |   1 +
 kernel/include/net/scm.h                      |   1 +
 kernel/include/net/secure_seq.h               |   1 +
 kernel/include/net/smc.h                      |   1 +
 kernel/include/net/sock_reuseport.h           |   1 +
 kernel/include/net/stp.h                      |   1 +
 kernel/include/net/tc_act/tc_connmark.h       |   1 +
 kernel/include/net/tc_act/tc_csum.h           |   1 +
 kernel/include/net/tc_act/tc_defact.h         |   1 +
 kernel/include/net/tc_act/tc_gact.h           |   1 +
 kernel/include/net/tc_act/tc_ife.h            |   1 +
 kernel/include/net/tc_act/tc_ipt.h            |   1 +
 kernel/include/net/tc_act/tc_mirred.h         |   1 +
 kernel/include/net/tc_act/tc_nat.h            |   1 +
 kernel/include/net/tc_act/tc_pedit.h          |   1 +
 kernel/include/net/tc_act/tc_sample.h         |   1 +
 kernel/include/net/tcp.h                      |   6 +-
 kernel/include/net/transp_v6.h                |   1 +
 kernel/include/net/tso.h                      |   1 +
 kernel/include/net/udp_tunnel.h               |   1 +
 kernel/include/net/udplite.h                  |   1 +
 kernel/include/net/vxlan.h                    |   1 +
 kernel/include/net/wext.h                     |   1 +
 kernel/include/net/x25.h                      |   1 +
 kernel/include/net/x25device.h                |   1 +
 kernel/include/net/xfrm.h                     |   1 +
 kernel/include/ras/ras_event.h                |   1 +
 kernel/include/rdma/rdma_netlink.h            |   1 +
 kernel/include/scsi/osd_attributes.h          |   1 +
 kernel/include/scsi/scsi.h                    |   1 +
 kernel/include/scsi/scsi_cmnd.h               |   1 +
 kernel/include/scsi/scsi_common.h             |   1 +
 kernel/include/scsi/scsi_dbg.h                |   1 +
 kernel/include/scsi/scsi_device.h             |   1 +
 kernel/include/scsi/scsi_devinfo.h            |   1 +
 kernel/include/scsi/scsi_driver.h             |   1 +
 kernel/include/scsi/scsi_eh.h                 |   1 +
 kernel/include/scsi/scsi_host.h               |   1 +
 kernel/include/scsi/scsi_ioctl.h              |   1 +
 kernel/include/scsi/scsi_proto.h              |   1 +
 kernel/include/scsi/scsi_request.h            |   1 +
 kernel/include/scsi/scsi_tcq.h                |   1 +
 kernel/include/scsi/scsi_transport_sas.h      |   1 +
 kernel/include/scsi/scsi_transport_srp.h      |   1 +
 kernel/include/scsi/scsicam.h                 |   1 +
 kernel/include/scsi/sg.h                      |   1 +
 kernel/include/sound/aci.h                    |   1 +
 kernel/include/sound/alc5623.h                |   1 +
 kernel/include/sound/hda_chmap.h              |   1 +
 kernel/include/sound/hda_i915.h               |   1 +
 kernel/include/sound/hda_register.h           |   1 +
 kernel/include/sound/hda_regmap.h             |   1 +
 kernel/include/sound/hda_verbs.h              |   1 +
 kernel/include/sound/hdaudio.h                |   1 +
 kernel/include/sound/hdaudio_ext.h            |   1 +
 kernel/include/sound/l3.h                     |   1 +
 kernel/include/sound/pcm_drm_eld.h            |   1 +
 kernel/include/sound/pcm_iec958.h             |   1 +
 kernel/include/sound/pxa2xx-lib.h             |   1 +
 kernel/include/sound/s3c24xx_uda134x.h        |   1 +
 kernel/include/sound/snd_wavefront.h          |   1 +
 kernel/include/sound/tas5086.h                |   1 +
 .../include/target/iscsi/iscsi_target_core.h  |   1 +
 .../include/target/iscsi/iscsi_target_stat.h  |   1 +
 kernel/include/target/iscsi/iscsi_transport.h |   1 +
 kernel/include/target/target_core_backend.h   |   1 +
 kernel/include/target/target_core_base.h      |   1 +
 kernel/include/target/target_core_fabric.h    |   1 +
 kernel/include/trace/define_trace.h           |   1 +
 kernel/include/trace/events/9p.h              |   1 +
 kernel/include/trace/events/alarmtimer.h      |   1 +
 kernel/include/trace/events/asoc.h            |   1 +
 kernel/include/trace/events/bcache.h          |   1 +
 kernel/include/trace/events/block.h           |   1 +
 kernel/include/trace/events/bpf.h             |   1 +
 kernel/include/trace/events/btrfs.h           |   1 +
 kernel/include/trace/events/cgroup.h          |   1 +
 kernel/include/trace/events/cma.h             |   1 +
 kernel/include/trace/events/compaction.h      |   1 +
 .../include/trace/events/context_tracking.h   |   1 +
 kernel/include/trace/events/cpuhp.h           |   1 +
 kernel/include/trace/events/devlink.h         |   1 +
 kernel/include/trace/events/dma_fence.h       |   1 +
 kernel/include/trace/events/ext4.h            |   1 +
 kernel/include/trace/events/f2fs.h            |   1 +
 kernel/include/trace/events/fib.h             |   1 +
 kernel/include/trace/events/fib6.h            |   1 +
 kernel/include/trace/events/filelock.h        |   1 +
 kernel/include/trace/events/filemap.h         |   1 +
 kernel/include/trace/events/fs_dax.h          |   1 +
 kernel/include/trace/events/fsi.h             |   1 +
 kernel/include/trace/events/fsi_master_gpio.h |   1 +
 kernel/include/trace/events/gpio.h            |   1 +
 kernel/include/trace/events/hswadsp.h         |   1 +
 kernel/include/trace/events/huge_memory.h     |   1 +
 kernel/include/trace/events/intel-sst.h       |   1 +
 kernel/include/trace/events/intel_ish.h       |   1 +
 kernel/include/trace/events/iommu.h           |   1 +
 kernel/include/trace/events/ipi.h             |   1 +
 kernel/include/trace/events/irq.h             |   1 +
 kernel/include/trace/events/jbd2.h            |   1 +
 kernel/include/trace/events/kmem.h            |   1 +
 kernel/include/trace/events/kvm.h             |   1 +
 kernel/include/trace/events/libata.h          |   1 +
 kernel/include/trace/events/lock.h            |   1 +
 kernel/include/trace/events/mce.h             |   1 +
 kernel/include/trace/events/mdio.h            |   1 +
 kernel/include/trace/events/migrate.h         |   1 +
 kernel/include/trace/events/mmc.h             |   1 +
 kernel/include/trace/events/mmflags.h         |   1 +
 kernel/include/trace/events/module.h          |   1 +
 kernel/include/trace/events/napi.h            |   1 +
 kernel/include/trace/events/net.h             |   1 +
 kernel/include/trace/events/nilfs2.h          |   1 +
 kernel/include/trace/events/nmi.h             |   1 +
 kernel/include/trace/events/oom.h             |   1 +
 kernel/include/trace/events/page_isolation.h  |   1 +
 kernel/include/trace/events/page_ref.h        |   1 +
 kernel/include/trace/events/pagemap.h         |   1 +
 kernel/include/trace/events/percpu.h          |   1 +
 kernel/include/trace/events/power.h           |   1 +
 .../include/trace/events/power_cpu_migrate.h  |   1 +
 kernel/include/trace/events/printk.h          |   1 +
 kernel/include/trace/events/random.h          |   1 +
 kernel/include/trace/events/rcu.h             |   1 +
 kernel/include/trace/events/regulator.h       |   1 +
 kernel/include/trace/events/rpm.h             |   1 +
 kernel/include/trace/events/sched.h           |   1 +
 kernel/include/trace/events/scsi.h            |   1 +
 kernel/include/trace/events/signal.h          |   1 +
 kernel/include/trace/events/skb.h             |   1 +
 kernel/include/trace/events/sock.h            |   1 +
 kernel/include/trace/events/spi.h             |   1 +
 kernel/include/trace/events/spmi.h            |   1 +
 kernel/include/trace/events/sunrpc.h          |   1 +
 kernel/include/trace/events/sunvnet.h         |   1 +
 kernel/include/trace/events/swiotlb.h         |   1 +
 kernel/include/trace/events/syscalls.h        |   1 +
 kernel/include/trace/events/target.h          |   1 +
 kernel/include/trace/events/task.h            |   1 +
 kernel/include/trace/events/thermal.h         |   1 +
 .../trace/events/thermal_power_allocator.h    |   1 +
 kernel/include/trace/events/thp.h             |   1 +
 kernel/include/trace/events/timer.h           |   1 +
 kernel/include/trace/events/tlb.h             |   1 +
 kernel/include/trace/events/udp.h             |   1 +
 kernel/include/trace/events/v4l2.h            |   1 +
 kernel/include/trace/events/vb2.h             |   1 +
 kernel/include/trace/events/vmscan.h          |   1 +
 .../events/vsock_virtio_transport_common.h    |   1 +
 kernel/include/trace/events/wbt.h             |   1 +
 kernel/include/trace/events/workqueue.h       |   1 +
 kernel/include/trace/events/writeback.h       |   1 +
 kernel/include/trace/events/xdp.h             |   1 +
 kernel/include/trace/events/xen.h             |   1 +
 kernel/include/trace/perf.h                   |   1 +
 kernel/include/trace/syscall.h                |   1 +
 kernel/include/trace/trace_events.h           |   1 +
 kernel/include/uapi/asm-generic/bitsperlong.h |   1 +
 kernel/include/uapi/asm-generic/errno-base.h  |   1 +
 kernel/include/uapi/asm-generic/errno.h       |   1 +
 kernel/include/uapi/asm-generic/fcntl.h       |   1 +
 kernel/include/uapi/asm-generic/int-l64.h     |   1 +
 kernel/include/uapi/asm-generic/int-ll64.h    |   1 +
 kernel/include/uapi/asm-generic/ioctl.h       |   1 +
 kernel/include/uapi/asm-generic/ioctls.h      |   1 +
 kernel/include/uapi/asm-generic/ipcbuf.h      |   1 +
 kernel/include/uapi/asm-generic/mman-common.h |   1 +
 kernel/include/uapi/asm-generic/mman.h        |   1 +
 kernel/include/uapi/asm-generic/msgbuf.h      |   1 +
 kernel/include/uapi/asm-generic/param.h       |   1 +
 kernel/include/uapi/asm-generic/poll.h        |   1 +
 kernel/include/uapi/asm-generic/posix_types.h |   1 +
 kernel/include/uapi/asm-generic/resource.h    |   1 +
 kernel/include/uapi/asm-generic/sembuf.h      |   1 +
 kernel/include/uapi/asm-generic/setup.h       |   1 +
 kernel/include/uapi/asm-generic/shmbuf.h      |   1 +
 kernel/include/uapi/asm-generic/shmparam.h    |   1 +
 kernel/include/uapi/asm-generic/siginfo.h     |   1 +
 kernel/include/uapi/asm-generic/signal-defs.h |   1 +
 kernel/include/uapi/asm-generic/signal.h      |   1 +
 kernel/include/uapi/asm-generic/socket.h      |   1 +
 kernel/include/uapi/asm-generic/sockios.h     |   1 +
 kernel/include/uapi/asm-generic/stat.h        |   1 +
 kernel/include/uapi/asm-generic/statfs.h      |   1 +
 kernel/include/uapi/asm-generic/swab.h        |   1 +
 kernel/include/uapi/asm-generic/termbits.h    |   1 +
 kernel/include/uapi/asm-generic/termios.h     |   1 +
 kernel/include/uapi/asm-generic/types.h       |   1 +
 kernel/include/uapi/asm-generic/ucontext.h    |   1 +
 kernel/include/uapi/asm-generic/unistd.h      |   1 +
 kernel/include/uapi/drm/armada_drm.h          |   1 +
 kernel/include/uapi/drm/etnaviv_drm.h         |   1 +
 kernel/include/uapi/drm/exynos_drm.h          |   1 +
 kernel/include/uapi/drm/i810_drm.h            |   1 +
 kernel/include/uapi/drm/omap_drm.h            |   1 +
 kernel/include/uapi/linux/a.out.h             |   1 +
 kernel/include/uapi/linux/acct.h              |   1 +
 kernel/include/uapi/linux/adb.h               |   1 +
 kernel/include/uapi/linux/adfs_fs.h           |   1 +
 kernel/include/uapi/linux/affs_hardblocks.h   |   1 +
 kernel/include/uapi/linux/am437x-vpfe.h       |   1 +
 kernel/include/uapi/linux/android/binder.h    |   1 +
 kernel/include/uapi/linux/apm_bios.h          |   1 +
 kernel/include/uapi/linux/arcfb.h             |   1 +
 kernel/include/uapi/linux/aspeed-lpc-ctrl.h   |   1 +
 kernel/include/uapi/linux/atalk.h             |   1 +
 kernel/include/uapi/linux/atm.h               |   1 +
 kernel/include/uapi/linux/atm_eni.h           |   1 +
 kernel/include/uapi/linux/atm_he.h            |   1 +
 kernel/include/uapi/linux/atm_idt77105.h      |   1 +
 kernel/include/uapi/linux/atm_nicstar.h       |   1 +
 kernel/include/uapi/linux/atm_tcp.h           |   1 +
 kernel/include/uapi/linux/atm_zatm.h          |   1 +
 kernel/include/uapi/linux/atmapi.h            |   1 +
 kernel/include/uapi/linux/atmarp.h            |   1 +
 kernel/include/uapi/linux/atmbr2684.h         |   1 +
 kernel/include/uapi/linux/atmclip.h           |   1 +
 kernel/include/uapi/linux/atmdev.h            |   1 +
 kernel/include/uapi/linux/atmioc.h            |   1 +
 kernel/include/uapi/linux/atmlec.h            |   1 +
 kernel/include/uapi/linux/atmmpc.h            |   1 +
 kernel/include/uapi/linux/atmppp.h            |   1 +
 kernel/include/uapi/linux/atmsap.h            |   1 +
 kernel/include/uapi/linux/atmsvc.h            |   1 +
 kernel/include/uapi/linux/audit.h             |   1 +
 kernel/include/uapi/linux/auto_dev-ioctl.h    |   1 +
 kernel/include/uapi/linux/auto_fs.h           |   1 +
 kernel/include/uapi/linux/auto_fs4.h          |   1 +
 kernel/include/uapi/linux/auxvec.h            |   1 +
 kernel/include/uapi/linux/ax25.h              |   1 +
 kernel/include/uapi/linux/b1lli.h             |   1 +
 kernel/include/uapi/linux/baycom.h            |   1 +
 kernel/include/uapi/linux/bcache.h            |   1 +
 kernel/include/uapi/linux/bcm933xx_hcs.h      |   1 +
 kernel/include/uapi/linux/bfs_fs.h            |   1 +
 kernel/include/uapi/linux/binfmts.h           |   1 +
 kernel/include/uapi/linux/blkpg.h             |   1 +
 kernel/include/uapi/linux/blktrace_api.h      |   1 +
 kernel/include/uapi/linux/blkzoned.h          |   1 +
 kernel/include/uapi/linux/bpf.h               |   2 +-
 kernel/include/uapi/linux/bpf_common.h        |   1 +
 kernel/include/uapi/linux/bpf_perf_event.h    |   1 +
 kernel/include/uapi/linux/bpqether.h          |   1 +
 kernel/include/uapi/linux/bsg.h               |   1 +
 kernel/include/uapi/linux/bt-bmc.h            |   1 +
 kernel/include/uapi/linux/btrfs.h             |   1 +
 kernel/include/uapi/linux/btrfs_tree.h        |   1 +
 .../include/uapi/linux/byteorder/big_endian.h |   1 +
 .../uapi/linux/byteorder/little_endian.h      |   1 +
 kernel/include/uapi/linux/caif/caif_socket.h  |   1 +
 kernel/include/uapi/linux/caif/if_caif.h      |   1 +
 kernel/include/uapi/linux/can.h               |   1 +
 kernel/include/uapi/linux/can/bcm.h           |   1 +
 kernel/include/uapi/linux/can/error.h         |   1 +
 kernel/include/uapi/linux/can/gw.h            |   1 +
 kernel/include/uapi/linux/can/netlink.h       |   1 +
 kernel/include/uapi/linux/can/raw.h           |   1 +
 kernel/include/uapi/linux/can/vxcan.h         |   1 +
 kernel/include/uapi/linux/capability.h        |   1 +
 kernel/include/uapi/linux/capi.h              |   1 +
 kernel/include/uapi/linux/cciss_defs.h        |   1 +
 kernel/include/uapi/linux/cciss_ioctl.h       |   1 +
 kernel/include/uapi/linux/cdrom.h             |   1 +
 kernel/include/uapi/linux/cec-funcs.h         |   1 +
 kernel/include/uapi/linux/cec.h               |   1 +
 kernel/include/uapi/linux/cgroupstats.h       |   1 +
 kernel/include/uapi/linux/chio.h              |   1 +
 kernel/include/uapi/linux/cifs/cifs_mount.h   |   1 +
 kernel/include/uapi/linux/cm4000_cs.h         |   1 +
 kernel/include/uapi/linux/cn_proc.h           |   1 +
 kernel/include/uapi/linux/coda_psdev.h        |   1 +
 kernel/include/uapi/linux/coff.h              |   1 +
 kernel/include/uapi/linux/connector.h         |   1 +
 kernel/include/uapi/linux/const.h             |   1 +
 kernel/include/uapi/linux/coresight-stm.h     |   1 +
 kernel/include/uapi/linux/cramfs_fs.h         |   1 +
 kernel/include/uapi/linux/cryptouser.h        |   1 +
 kernel/include/uapi/linux/cuda.h              |   1 +
 kernel/include/uapi/linux/cyclades.h          |   1 +
 kernel/include/uapi/linux/cycx_cfm.h          |   1 +
 kernel/include/uapi/linux/dcbnl.h             |   1 +
 kernel/include/uapi/linux/dccp.h              |   1 +
 kernel/include/uapi/linux/devlink.h           |   1 +
 kernel/include/uapi/linux/dlm.h               |   1 +
 kernel/include/uapi/linux/dlm_device.h        |   1 +
 kernel/include/uapi/linux/dlm_netlink.h       |   1 +
 kernel/include/uapi/linux/dlm_plock.h         |   1 +
 kernel/include/uapi/linux/dlmconstants.h      |   1 +
 kernel/include/uapi/linux/dm-ioctl.h          |   1 +
 kernel/include/uapi/linux/dm-log-userspace.h  |   1 +
 kernel/include/uapi/linux/dma-buf.h           |   1 +
 kernel/include/uapi/linux/dn.h                |   1 +
 kernel/include/uapi/linux/dqblk_xfs.h         |   1 +
 kernel/include/uapi/linux/dvb/audio.h         |   1 +
 kernel/include/uapi/linux/dvb/ca.h            |   1 +
 kernel/include/uapi/linux/dvb/dmx.h           |   1 +
 kernel/include/uapi/linux/dvb/frontend.h      |   1 +
 kernel/include/uapi/linux/dvb/net.h           |   1 +
 kernel/include/uapi/linux/dvb/osd.h           |   1 +
 kernel/include/uapi/linux/dvb/version.h       |   1 +
 kernel/include/uapi/linux/dvb/video.h         |   1 +
 kernel/include/uapi/linux/edd.h               |   1 +
 kernel/include/uapi/linux/efs_fs_sb.h         |   1 +
 kernel/include/uapi/linux/elf-em.h            |   1 +
 kernel/include/uapi/linux/elf-fdpic.h         |   1 +
 kernel/include/uapi/linux/elf.h               |   1 +
 kernel/include/uapi/linux/elfcore.h           |   1 +
 kernel/include/uapi/linux/errqueue.h          |   1 +
 kernel/include/uapi/linux/ethtool.h           |   1 +
 kernel/include/uapi/linux/eventpoll.h         |   1 +
 kernel/include/uapi/linux/fadvise.h           |   1 +
 kernel/include/uapi/linux/falloc.h            |   1 +
 kernel/include/uapi/linux/fanotify.h          |   1 +
 kernel/include/uapi/linux/fb.h                |   1 +
 kernel/include/uapi/linux/fcntl.h             |   1 +
 kernel/include/uapi/linux/fd.h                |   1 +
 kernel/include/uapi/linux/fdreg.h             |   1 +
 kernel/include/uapi/linux/fib_rules.h         |   1 +
 kernel/include/uapi/linux/fiemap.h            |   1 +
 kernel/include/uapi/linux/filter.h            |   1 +
 kernel/include/uapi/linux/flat.h              |   1 +
 kernel/include/uapi/linux/fou.h               |   1 +
 kernel/include/uapi/linux/fs.h                |   1 +
 kernel/include/uapi/linux/fsl_hypervisor.h    |   1 +
 kernel/include/uapi/linux/fsmap.h             |   1 +
 kernel/include/uapi/linux/fuse.h              |   1 +
 kernel/include/uapi/linux/futex.h             |   1 +
 kernel/include/uapi/linux/gameport.h          |   1 +
 kernel/include/uapi/linux/gen_stats.h         |   1 +
 kernel/include/uapi/linux/genetlink.h         |   1 +
 .../include/uapi/linux/genwqe/genwqe_card.h   |   1 +
 kernel/include/uapi/linux/gfs2_ondisk.h       |   1 +
 kernel/include/uapi/linux/gigaset_dev.h       |   1 +
 kernel/include/uapi/linux/gpio.h              |   1 +
 kernel/include/uapi/linux/gsmmux.h            |   1 +
 kernel/include/uapi/linux/gtp.h               |   1 +
 kernel/include/uapi/linux/hash_info.h         |   1 +
 kernel/include/uapi/linux/hdlc.h              |   1 +
 kernel/include/uapi/linux/hdlc/ioctl.h        |   1 +
 kernel/include/uapi/linux/hdlcdrv.h           |   1 +
 kernel/include/uapi/linux/hdreg.h             |   1 +
 kernel/include/uapi/linux/hid.h               |   1 +
 kernel/include/uapi/linux/hiddev.h            |   1 +
 kernel/include/uapi/linux/hidraw.h            |   1 +
 kernel/include/uapi/linux/hpet.h              |   1 +
 kernel/include/uapi/linux/hsi/cs-protocol.h   |   1 +
 kernel/include/uapi/linux/hsi/hsi_char.h      |   1 +
 kernel/include/uapi/linux/hsr_netlink.h       |   1 +
 kernel/include/uapi/linux/hw_breakpoint.h     |   1 +
 kernel/include/uapi/linux/hyperv.h            |   1 +
 kernel/include/uapi/linux/hysdn_if.h          |   1 +
 kernel/include/uapi/linux/i2c-dev.h           |   1 +
 kernel/include/uapi/linux/i2c.h               |   1 +
 kernel/include/uapi/linux/i2o-dev.h           |   1 +
 kernel/include/uapi/linux/i8k.h               |   1 +
 kernel/include/uapi/linux/icmp.h              |   1 +
 kernel/include/uapi/linux/icmpv6.h            |   1 +
 kernel/include/uapi/linux/if.h                |   1 +
 kernel/include/uapi/linux/if_addr.h           |   1 +
 kernel/include/uapi/linux/if_addrlabel.h      |   1 +
 kernel/include/uapi/linux/if_alg.h            |   1 +
 kernel/include/uapi/linux/if_arcnet.h         |   1 +
 kernel/include/uapi/linux/if_arp.h            |   1 +
 kernel/include/uapi/linux/if_bonding.h        |   1 +
 kernel/include/uapi/linux/if_bridge.h         |   1 +
 kernel/include/uapi/linux/if_cablemodem.h     |   1 +
 kernel/include/uapi/linux/if_eql.h            |   1 +
 kernel/include/uapi/linux/if_ether.h          |   1 +
 kernel/include/uapi/linux/if_fc.h             |   1 +
 kernel/include/uapi/linux/if_fddi.h           |   1 +
 kernel/include/uapi/linux/if_frad.h           |   1 +
 kernel/include/uapi/linux/if_hippi.h          |   1 +
 kernel/include/uapi/linux/if_infiniband.h     |   1 +
 kernel/include/uapi/linux/if_link.h           |   1 +
 kernel/include/uapi/linux/if_ltalk.h          |   1 +
 kernel/include/uapi/linux/if_macsec.h         |   1 +
 kernel/include/uapi/linux/if_packet.h         |   1 +
 kernel/include/uapi/linux/if_phonet.h         |   1 +
 kernel/include/uapi/linux/if_plip.h           |   1 +
 kernel/include/uapi/linux/if_pppol2tp.h       |   1 +
 kernel/include/uapi/linux/if_pppox.h          |   1 +
 kernel/include/uapi/linux/if_slip.h           |   1 +
 kernel/include/uapi/linux/if_team.h           |   1 +
 kernel/include/uapi/linux/if_tun.h            |   1 +
 kernel/include/uapi/linux/if_tunnel.h         |   1 +
 kernel/include/uapi/linux/if_vlan.h           |   1 +
 kernel/include/uapi/linux/if_x25.h            |   1 +
 kernel/include/uapi/linux/ife.h               |   1 +
 kernel/include/uapi/linux/igmp.h              |   1 +
 kernel/include/uapi/linux/iio/events.h        |   1 +
 kernel/include/uapi/linux/iio/types.h         |   1 +
 kernel/include/uapi/linux/ila.h               |   1 +
 kernel/include/uapi/linux/in.h                |   1 +
 kernel/include/uapi/linux/in6.h               |   1 +
 kernel/include/uapi/linux/in_route.h          |   1 +
 kernel/include/uapi/linux/inet_diag.h         |   1 +
 kernel/include/uapi/linux/inotify.h           |   1 +
 kernel/include/uapi/linux/input-event-codes.h |   1 +
 kernel/include/uapi/linux/input.h             |   1 +
 kernel/include/uapi/linux/ioctl.h             |   1 +
 kernel/include/uapi/linux/ip.h                |   1 +
 kernel/include/uapi/linux/ip6_tunnel.h        |   1 +
 kernel/include/uapi/linux/ip_vs.h             |   1 +
 kernel/include/uapi/linux/ipc.h               |   1 +
 kernel/include/uapi/linux/ipmi.h              |   1 +
 kernel/include/uapi/linux/ipmi_msgdefs.h      |   1 +
 kernel/include/uapi/linux/ipsec.h             |   1 +
 kernel/include/uapi/linux/ipv6.h              |   1 +
 kernel/include/uapi/linux/ipv6_route.h        |   1 +
 kernel/include/uapi/linux/ipx.h               |   1 +
 kernel/include/uapi/linux/irda.h              |   1 +
 kernel/include/uapi/linux/isdn.h              |   1 +
 kernel/include/uapi/linux/isdn/capicmd.h      |   1 +
 kernel/include/uapi/linux/isdn_divertif.h     |   1 +
 kernel/include/uapi/linux/isdn_ppp.h          |   1 +
 kernel/include/uapi/linux/isdnif.h            |   1 +
 kernel/include/uapi/linux/iso_fs.h            |   1 +
 kernel/include/uapi/linux/ivtv.h              |   1 +
 kernel/include/uapi/linux/ivtvfb.h            |   1 +
 kernel/include/uapi/linux/ixjuser.h           |   1 +
 kernel/include/uapi/linux/joystick.h          |   1 +
 kernel/include/uapi/linux/kcm.h               |   1 +
 kernel/include/uapi/linux/kcmp.h              |   1 +
 kernel/include/uapi/linux/kcov.h              |   1 +
 kernel/include/uapi/linux/kd.h                |   1 +
 kernel/include/uapi/linux/kdev_t.h            |   1 +
 kernel/include/uapi/linux/kernel-page-flags.h |   1 +
 kernel/include/uapi/linux/kernel.h            |   1 +
 kernel/include/uapi/linux/kernelcapi.h        |   1 +
 kernel/include/uapi/linux/kexec.h             |   1 +
 kernel/include/uapi/linux/keyboard.h          |   1 +
 kernel/include/uapi/linux/keyctl.h            |   1 +
 kernel/include/uapi/linux/kvm.h               |   1 +
 kernel/include/uapi/linux/kvm_para.h          |   1 +
 kernel/include/uapi/linux/l2tp.h              |   1 +
 kernel/include/uapi/linux/libc-compat.h       |   1 +
 kernel/include/uapi/linux/lightnvm.h          |   1 +
 kernel/include/uapi/linux/limits.h            |   1 +
 kernel/include/uapi/linux/lirc.h              |   1 +
 kernel/include/uapi/linux/llc.h               |   1 +
 kernel/include/uapi/linux/loop.h              |   1 +
 kernel/include/uapi/linux/lp.h                |   1 +
 kernel/include/uapi/linux/lwtunnel.h          |   1 +
 kernel/include/uapi/linux/magic.h             |   1 +
 kernel/include/uapi/linux/major.h             |   1 +
 kernel/include/uapi/linux/map_to_7segment.h   |   1 +
 kernel/include/uapi/linux/matroxfb.h          |   1 +
 kernel/include/uapi/linux/max2175.h           |   1 +
 kernel/include/uapi/linux/mdio.h              |   1 +
 kernel/include/uapi/linux/media-bus-format.h  |   1 +
 kernel/include/uapi/linux/media.h             |   1 +
 kernel/include/uapi/linux/mei.h               |   1 +
 kernel/include/uapi/linux/memfd.h             |   1 +
 kernel/include/uapi/linux/mempolicy.h         |   1 +
 kernel/include/uapi/linux/meye.h              |   1 +
 kernel/include/uapi/linux/mic_common.h        |   1 +
 kernel/include/uapi/linux/mic_ioctl.h         |   1 +
 kernel/include/uapi/linux/mii.h               |   1 +
 kernel/include/uapi/linux/minix_fs.h          |   1 +
 kernel/include/uapi/linux/mman.h              |   1 +
 kernel/include/uapi/linux/mmc/ioctl.h         |   1 +
 kernel/include/uapi/linux/mmtimer.h           |   1 +
 kernel/include/uapi/linux/module.h            |   1 +
 kernel/include/uapi/linux/mpls.h              |   1 +
 kernel/include/uapi/linux/mpls_iptunnel.h     |   1 +
 kernel/include/uapi/linux/mqueue.h            |   1 +
 kernel/include/uapi/linux/mroute.h            |   1 +
 kernel/include/uapi/linux/mroute6.h           |   1 +
 kernel/include/uapi/linux/msdos_fs.h          |   1 +
 kernel/include/uapi/linux/msg.h               |   1 +
 kernel/include/uapi/linux/mtio.h              |   1 +
 kernel/include/uapi/linux/n_r3964.h           |   1 +
 kernel/include/uapi/linux/nbd-netlink.h       |   1 +
 kernel/include/uapi/linux/nbd.h               |   1 +
 kernel/include/uapi/linux/ncp.h               |   1 +
 kernel/include/uapi/linux/ncp_fs.h            |   1 +
 kernel/include/uapi/linux/ncp_mount.h         |   1 +
 kernel/include/uapi/linux/ncp_no.h            |   1 +
 kernel/include/uapi/linux/neighbour.h         |   1 +
 kernel/include/uapi/linux/net.h               |   1 +
 kernel/include/uapi/linux/net_dropmon.h       |   1 +
 kernel/include/uapi/linux/net_namespace.h     |   1 +
 kernel/include/uapi/linux/net_tstamp.h        |   1 +
 kernel/include/uapi/linux/netconf.h           |   1 +
 kernel/include/uapi/linux/netdevice.h         |   1 +
 kernel/include/uapi/linux/netfilter.h         |   1 +
 .../uapi/linux/netfilter/ipset/ip_set.h       |   1 +
 .../linux/netfilter/ipset/ip_set_bitmap.h     |   1 +
 .../uapi/linux/netfilter/ipset/ip_set_hash.h  |   1 +
 .../uapi/linux/netfilter/ipset/ip_set_list.h  |   1 +
 .../linux/netfilter/nf_conntrack_common.h     |   1 +
 .../uapi/linux/netfilter/nf_conntrack_ftp.h   |   1 +
 .../uapi/linux/netfilter/nf_conntrack_sctp.h  |   1 +
 .../uapi/linux/netfilter/nf_conntrack_tcp.h   |   1 +
 .../netfilter/nf_conntrack_tuple_common.h     |   1 +
 kernel/include/uapi/linux/netfilter/nf_log.h  |   1 +
 kernel/include/uapi/linux/netfilter/nf_nat.h  |   1 +
 .../include/uapi/linux/netfilter/nf_tables.h  |   1 +
 .../uapi/linux/netfilter/nf_tables_compat.h   |   1 +
 .../include/uapi/linux/netfilter/nfnetlink.h  |   1 +
 .../uapi/linux/netfilter/nfnetlink_acct.h     |   1 +
 .../uapi/linux/netfilter/nfnetlink_compat.h   |   1 +
 .../linux/netfilter/nfnetlink_conntrack.h     |   1 +
 .../uapi/linux/netfilter/nfnetlink_cthelper.h |   1 +
 .../linux/netfilter/nfnetlink_cttimeout.h     |   1 +
 .../uapi/linux/netfilter/nfnetlink_log.h      |   1 +
 .../uapi/linux/netfilter/nfnetlink_queue.h    |   1 +
 .../include/uapi/linux/netfilter/x_tables.h   |   1 +
 .../include/uapi/linux/netfilter/xt_AUDIT.h   |   1 +
 .../uapi/linux/netfilter/xt_CHECKSUM.h        |   1 +
 .../uapi/linux/netfilter/xt_CLASSIFY.h        |   1 +
 .../uapi/linux/netfilter/xt_CONNMARK.h        |   1 +
 .../uapi/linux/netfilter/xt_CONNSECMARK.h     |   1 +
 kernel/include/uapi/linux/netfilter/xt_CT.h   |   1 +
 kernel/include/uapi/linux/netfilter/xt_DSCP.h |   1 +
 .../include/uapi/linux/netfilter/xt_HMARK.h   |   1 +
 .../uapi/linux/netfilter/xt_IDLETIMER.h       |   1 +
 kernel/include/uapi/linux/netfilter/xt_LED.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_LOG.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_MARK.h |   1 +
 .../include/uapi/linux/netfilter/xt_NFLOG.h   |   1 +
 .../include/uapi/linux/netfilter/xt_NFQUEUE.h |   1 +
 .../include/uapi/linux/netfilter/xt_RATEEST.h |   1 +
 .../include/uapi/linux/netfilter/xt_SECMARK.h |   1 +
 .../uapi/linux/netfilter/xt_SYNPROXY.h        |   1 +
 .../include/uapi/linux/netfilter/xt_TCPMSS.h  |   1 +
 .../uapi/linux/netfilter/xt_TCPOPTSTRIP.h     |   1 +
 kernel/include/uapi/linux/netfilter/xt_TEE.h  |   1 +
 .../include/uapi/linux/netfilter/xt_TPROXY.h  |   1 +
 .../uapi/linux/netfilter/xt_addrtype.h        |   1 +
 kernel/include/uapi/linux/netfilter/xt_bpf.h  |   1 +
 .../include/uapi/linux/netfilter/xt_cgroup.h  |   1 +
 .../include/uapi/linux/netfilter/xt_cluster.h |   1 +
 .../include/uapi/linux/netfilter/xt_comment.h |   1 +
 .../uapi/linux/netfilter/xt_connbytes.h       |   1 +
 .../uapi/linux/netfilter/xt_connlabel.h       |   1 +
 .../uapi/linux/netfilter/xt_connlimit.h       |   1 +
 .../uapi/linux/netfilter/xt_connmark.h        |   1 +
 .../uapi/linux/netfilter/xt_conntrack.h       |   1 +
 kernel/include/uapi/linux/netfilter/xt_cpu.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_dccp.h |   1 +
 .../uapi/linux/netfilter/xt_devgroup.h        |   1 +
 kernel/include/uapi/linux/netfilter/xt_dscp.h |   1 +
 kernel/include/uapi/linux/netfilter/xt_ecn.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_esp.h  |   1 +
 .../uapi/linux/netfilter/xt_hashlimit.h       |   1 +
 .../include/uapi/linux/netfilter/xt_helper.h  |   1 +
 .../include/uapi/linux/netfilter/xt_ipcomp.h  |   1 +
 .../include/uapi/linux/netfilter/xt_iprange.h |   1 +
 kernel/include/uapi/linux/netfilter/xt_ipvs.h |   1 +
 kernel/include/uapi/linux/netfilter/xt_l2tp.h |   1 +
 .../include/uapi/linux/netfilter/xt_length.h  |   1 +
 .../include/uapi/linux/netfilter/xt_limit.h   |   1 +
 kernel/include/uapi/linux/netfilter/xt_mac.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_mark.h |   1 +
 .../uapi/linux/netfilter/xt_multiport.h       |   1 +
 .../include/uapi/linux/netfilter/xt_nfacct.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_osf.h  |   1 +
 .../include/uapi/linux/netfilter/xt_owner.h   |   1 +
 .../include/uapi/linux/netfilter/xt_physdev.h |   1 +
 .../include/uapi/linux/netfilter/xt_pkttype.h |   1 +
 .../include/uapi/linux/netfilter/xt_policy.h  |   1 +
 .../include/uapi/linux/netfilter/xt_quota.h   |   1 +
 .../include/uapi/linux/netfilter/xt_rateest.h |   1 +
 .../include/uapi/linux/netfilter/xt_realm.h   |   1 +
 .../include/uapi/linux/netfilter/xt_recent.h  |   1 +
 .../uapi/linux/netfilter/xt_rpfilter.h        |   1 +
 kernel/include/uapi/linux/netfilter/xt_sctp.h |   1 +
 kernel/include/uapi/linux/netfilter/xt_set.h  |   1 +
 .../include/uapi/linux/netfilter/xt_socket.h  |   1 +
 .../include/uapi/linux/netfilter/xt_state.h   |   1 +
 .../uapi/linux/netfilter/xt_statistic.h       |   1 +
 .../include/uapi/linux/netfilter/xt_string.h  |   1 +
 .../include/uapi/linux/netfilter/xt_tcpmss.h  |   1 +
 .../include/uapi/linux/netfilter/xt_tcpudp.h  |   1 +
 kernel/include/uapi/linux/netfilter/xt_time.h |   1 +
 kernel/include/uapi/linux/netfilter/xt_u32.h  |   1 +
 kernel/include/uapi/linux/netfilter_arp.h     |   1 +
 .../uapi/linux/netfilter_arp/arp_tables.h     |   1 +
 .../uapi/linux/netfilter_arp/arpt_mangle.h    |   1 +
 kernel/include/uapi/linux/netfilter_bridge.h  |   1 +
 .../uapi/linux/netfilter_bridge/ebt_802_3.h   |   1 +
 .../uapi/linux/netfilter_bridge/ebt_among.h   |   1 +
 .../uapi/linux/netfilter_bridge/ebt_arp.h     |   1 +
 .../linux/netfilter_bridge/ebt_arpreply.h     |   1 +
 .../uapi/linux/netfilter_bridge/ebt_ip.h      |   1 +
 .../uapi/linux/netfilter_bridge/ebt_ip6.h     |   1 +
 .../uapi/linux/netfilter_bridge/ebt_limit.h   |   1 +
 .../uapi/linux/netfilter_bridge/ebt_log.h     |   1 +
 .../uapi/linux/netfilter_bridge/ebt_mark_m.h  |   1 +
 .../uapi/linux/netfilter_bridge/ebt_mark_t.h  |   1 +
 .../uapi/linux/netfilter_bridge/ebt_nat.h     |   1 +
 .../uapi/linux/netfilter_bridge/ebt_nflog.h   |   1 +
 .../uapi/linux/netfilter_bridge/ebt_pkttype.h |   1 +
 .../linux/netfilter_bridge/ebt_redirect.h     |   1 +
 .../uapi/linux/netfilter_bridge/ebt_stp.h     |   1 +
 .../uapi/linux/netfilter_bridge/ebt_vlan.h    |   1 +
 .../uapi/linux/netfilter_bridge/ebtables.h    |   1 +
 kernel/include/uapi/linux/netfilter_decnet.h  |   1 +
 kernel/include/uapi/linux/netfilter_ipv4.h    |   1 +
 .../uapi/linux/netfilter_ipv4/ip_tables.h     |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_ECN.h       |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_LOG.h       |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_REJECT.h    |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_TTL.h       |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_ah.h        |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_ecn.h       |   1 +
 .../uapi/linux/netfilter_ipv4/ipt_ttl.h       |   1 +
 kernel/include/uapi/linux/netfilter_ipv6.h    |   1 +
 .../uapi/linux/netfilter_ipv6/ip6_tables.h    |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_HL.h       |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_LOG.h      |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_NPT.h      |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_REJECT.h   |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_ah.h       |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_frag.h     |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_hl.h       |   1 +
 .../linux/netfilter_ipv6/ip6t_ipv6header.h    |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_mh.h       |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_opts.h     |   1 +
 .../uapi/linux/netfilter_ipv6/ip6t_rt.h       |   1 +
 kernel/include/uapi/linux/netlink.h           |   1 +
 kernel/include/uapi/linux/netlink_diag.h      |   1 +
 kernel/include/uapi/linux/netrom.h            |   1 +
 kernel/include/uapi/linux/nfs.h               |   1 +
 kernel/include/uapi/linux/nfs2.h              |   1 +
 kernel/include/uapi/linux/nfs3.h              |   1 +
 kernel/include/uapi/linux/nfs4.h              |   1 +
 kernel/include/uapi/linux/nfs4_mount.h        |   1 +
 kernel/include/uapi/linux/nfs_fs.h            |   1 +
 kernel/include/uapi/linux/nfs_mount.h         |   1 +
 kernel/include/uapi/linux/nfsacl.h            |   1 +
 kernel/include/uapi/linux/nfsd/cld.h          |   1 +
 kernel/include/uapi/linux/nfsd/debug.h        |   1 +
 kernel/include/uapi/linux/nfsd/export.h       |   1 +
 kernel/include/uapi/linux/nfsd/nfsfh.h        |   1 +
 kernel/include/uapi/linux/nfsd/stats.h        |   1 +
 kernel/include/uapi/linux/nilfs2_api.h        |   1 +
 kernel/include/uapi/linux/nilfs2_ondisk.h     |   1 +
 kernel/include/uapi/linux/nsfs.h              |   1 +
 kernel/include/uapi/linux/nubus.h             |   1 +
 kernel/include/uapi/linux/nvme_ioctl.h        |   1 +
 kernel/include/uapi/linux/nvram.h             |   1 +
 kernel/include/uapi/linux/omap3isp.h          |   1 +
 kernel/include/uapi/linux/omapfb.h            |   1 +
 kernel/include/uapi/linux/oom.h               |   1 +
 kernel/include/uapi/linux/openvswitch.h       |   1 +
 kernel/include/uapi/linux/packet_diag.h       |   1 +
 kernel/include/uapi/linux/param.h             |   1 +
 kernel/include/uapi/linux/patchkey.h          |   1 +
 kernel/include/uapi/linux/pci.h               |   1 +
 kernel/include/uapi/linux/pci_regs.h          |   1 +
 kernel/include/uapi/linux/pcitest.h           |   1 +
 kernel/include/uapi/linux/perf_event.h        |   1 +
 kernel/include/uapi/linux/personality.h       |   1 +
 kernel/include/uapi/linux/pfkeyv2.h           |   1 +
 kernel/include/uapi/linux/pg.h                |   1 +
 kernel/include/uapi/linux/phantom.h           |   1 +
 kernel/include/uapi/linux/phonet.h            |   1 +
 kernel/include/uapi/linux/pkt_cls.h           |   1 +
 kernel/include/uapi/linux/pkt_sched.h         |   1 +
 kernel/include/uapi/linux/pktcdvd.h           |   1 +
 kernel/include/uapi/linux/pmu.h               |   1 +
 kernel/include/uapi/linux/posix_acl.h         |   1 +
 kernel/include/uapi/linux/posix_acl_xattr.h   |   1 +
 kernel/include/uapi/linux/posix_types.h       |   1 +
 kernel/include/uapi/linux/ppdev.h             |   1 +
 kernel/include/uapi/linux/ppp-comp.h          |   1 +
 kernel/include/uapi/linux/ppp-ioctl.h         |   1 +
 kernel/include/uapi/linux/ppp_defs.h          |   1 +
 kernel/include/uapi/linux/pps.h               |   1 +
 kernel/include/uapi/linux/pr.h                |   1 +
 kernel/include/uapi/linux/prctl.h             |   1 +
 kernel/include/uapi/linux/psample.h           |   1 +
 kernel/include/uapi/linux/psci.h              |   1 +
 kernel/include/uapi/linux/ptp_clock.h         |   1 +
 kernel/include/uapi/linux/ptrace.h            |   1 +
 kernel/include/uapi/linux/qnx4_fs.h           |   1 +
 kernel/include/uapi/linux/qnxtypes.h          |   1 +
 kernel/include/uapi/linux/qrtr.h              |   1 +
 kernel/include/uapi/linux/radeonfb.h          |   1 +
 kernel/include/uapi/linux/raid/md_p.h         |   1 +
 kernel/include/uapi/linux/raid/md_u.h         |   1 +
 kernel/include/uapi/linux/random.h            |   1 +
 kernel/include/uapi/linux/raw.h               |   1 +
 kernel/include/uapi/linux/rds.h               |   1 +
 kernel/include/uapi/linux/reboot.h            |   1 +
 kernel/include/uapi/linux/reiserfs_fs.h       |   1 +
 kernel/include/uapi/linux/reiserfs_xattr.h    |   1 +
 kernel/include/uapi/linux/resource.h          |   1 +
 kernel/include/uapi/linux/rio_cm_cdev.h       |   1 +
 kernel/include/uapi/linux/rio_mport_cdev.h    |   1 +
 kernel/include/uapi/linux/romfs_fs.h          |   1 +
 kernel/include/uapi/linux/rose.h              |   1 +
 kernel/include/uapi/linux/route.h             |   1 +
 kernel/include/uapi/linux/rpmsg.h             |   1 +
 kernel/include/uapi/linux/rtc.h               |   1 +
 kernel/include/uapi/linux/rtnetlink.h         |   1 +
 kernel/include/uapi/linux/scc.h               |   1 +
 kernel/include/uapi/linux/sched.h             |   1 +
 kernel/include/uapi/linux/sched/types.h       |   1 +
 kernel/include/uapi/linux/scif_ioctl.h        |   1 +
 kernel/include/uapi/linux/screen_info.h       |   1 +
 kernel/include/uapi/linux/sctp.h              |   1 +
 kernel/include/uapi/linux/sdla.h              |   1 +
 kernel/include/uapi/linux/seccomp.h           |   1 +
 kernel/include/uapi/linux/securebits.h        |   1 +
 kernel/include/uapi/linux/sed-opal.h          |   1 +
 kernel/include/uapi/linux/seg6.h              |   1 +
 kernel/include/uapi/linux/seg6_genl.h         |   1 +
 kernel/include/uapi/linux/seg6_hmac.h         |   1 +
 kernel/include/uapi/linux/seg6_iptunnel.h     |   1 +
 kernel/include/uapi/linux/selinux_netlink.h   |   1 +
 kernel/include/uapi/linux/sem.h               |   1 +
 kernel/include/uapi/linux/serial.h            |   1 +
 kernel/include/uapi/linux/serial_core.h       |   1 +
 kernel/include/uapi/linux/serial_reg.h        |   1 +
 kernel/include/uapi/linux/serio.h             |   1 +
 kernel/include/uapi/linux/shm.h               |   1 +
 kernel/include/uapi/linux/signal.h            |   1 +
 kernel/include/uapi/linux/signalfd.h          |   1 +
 kernel/include/uapi/linux/smc.h               |   1 +
 kernel/include/uapi/linux/smc_diag.h          |   1 +
 kernel/include/uapi/linux/smiapp.h            |   1 +
 kernel/include/uapi/linux/snmp.h              |   1 +
 kernel/include/uapi/linux/sock_diag.h         |   1 +
 kernel/include/uapi/linux/socket.h            |   1 +
 kernel/include/uapi/linux/sockios.h           |   1 +
 kernel/include/uapi/linux/sonet.h             |   1 +
 kernel/include/uapi/linux/sonypi.h            |   1 +
 kernel/include/uapi/linux/sound.h             |   1 +
 kernel/include/uapi/linux/spi/spidev.h        |   1 +
 kernel/include/uapi/linux/stat.h              |   1 +
 kernel/include/uapi/linux/stddef.h            |   1 +
 kernel/include/uapi/linux/stm.h               |   1 +
 kernel/include/uapi/linux/string.h            |   1 +
 kernel/include/uapi/linux/sunrpc/debug.h      |   1 +
 kernel/include/uapi/linux/suspend_ioctls.h    |   1 +
 kernel/include/uapi/linux/swab.h              |   1 +
 kernel/include/uapi/linux/switchtec_ioctl.h   |   1 +
 kernel/include/uapi/linux/sync_file.h         |   1 +
 kernel/include/uapi/linux/synclink.h          |   1 +
 kernel/include/uapi/linux/sysctl.h            |   1 +
 kernel/include/uapi/linux/sysinfo.h           |   1 +
 kernel/include/uapi/linux/target_core_user.h  |   1 +
 kernel/include/uapi/linux/taskstats.h         |   1 +
 kernel/include/uapi/linux/tc_act/tc_bpf.h     |   1 +
 .../include/uapi/linux/tc_act/tc_connmark.h   |   1 +
 kernel/include/uapi/linux/tc_act/tc_csum.h    |   1 +
 kernel/include/uapi/linux/tc_act/tc_defact.h  |   1 +
 kernel/include/uapi/linux/tc_act/tc_gact.h    |   1 +
 kernel/include/uapi/linux/tc_act/tc_ife.h     |   1 +
 kernel/include/uapi/linux/tc_act/tc_ipt.h     |   1 +
 kernel/include/uapi/linux/tc_act/tc_mirred.h  |   1 +
 kernel/include/uapi/linux/tc_act/tc_nat.h     |   1 +
 kernel/include/uapi/linux/tc_act/tc_pedit.h   |   1 +
 kernel/include/uapi/linux/tc_act/tc_sample.h  |   1 +
 kernel/include/uapi/linux/tc_act/tc_skbedit.h |   1 +
 kernel/include/uapi/linux/tc_act/tc_skbmod.h  |   1 +
 .../include/uapi/linux/tc_act/tc_tunnel_key.h |   1 +
 kernel/include/uapi/linux/tc_act/tc_vlan.h    |   1 +
 .../include/uapi/linux/tc_ematch/tc_em_cmp.h  |   1 +
 .../include/uapi/linux/tc_ematch/tc_em_meta.h |   1 +
 .../uapi/linux/tc_ematch/tc_em_nbyte.h        |   1 +
 .../include/uapi/linux/tc_ematch/tc_em_text.h |   1 +
 kernel/include/uapi/linux/tcp.h               |   1 +
 kernel/include/uapi/linux/tcp_metrics.h       |   1 +
 kernel/include/uapi/linux/telephony.h         |   1 +
 kernel/include/uapi/linux/termios.h           |   1 +
 kernel/include/uapi/linux/thermal.h           |   1 +
 kernel/include/uapi/linux/time.h              |   1 +
 kernel/include/uapi/linux/timerfd.h           |   1 +
 kernel/include/uapi/linux/times.h             |   1 +
 kernel/include/uapi/linux/tiocl.h             |   1 +
 kernel/include/uapi/linux/tipc.h              |   1 +
 kernel/include/uapi/linux/tipc_config.h       |   1 +
 kernel/include/uapi/linux/tipc_netlink.h      |   1 +
 kernel/include/uapi/linux/tls.h               |   1 +
 kernel/include/uapi/linux/toshiba.h           |   1 +
 kernel/include/uapi/linux/tty.h               |   1 +
 kernel/include/uapi/linux/tty_flags.h         |   1 +
 kernel/include/uapi/linux/types.h             |   1 +
 kernel/include/uapi/linux/udf_fs_i.h          |   1 +
 kernel/include/uapi/linux/udp.h               |   1 +
 kernel/include/uapi/linux/uhid.h              |   1 +
 kernel/include/uapi/linux/uinput.h            |   1 +
 kernel/include/uapi/linux/uio.h               |   1 +
 kernel/include/uapi/linux/uleds.h             |   1 +
 kernel/include/uapi/linux/ultrasound.h        |   1 +
 kernel/include/uapi/linux/un.h                |   1 +
 kernel/include/uapi/linux/unistd.h            |   1 +
 kernel/include/uapi/linux/unix_diag.h         |   1 +
 kernel/include/uapi/linux/usb/audio.h         |   1 +
 kernel/include/uapi/linux/usb/cdc-wdm.h       |   1 +
 kernel/include/uapi/linux/usb/cdc.h           |   1 +
 kernel/include/uapi/linux/usb/ch11.h          |   1 +
 kernel/include/uapi/linux/usb/ch9.h           |   1 +
 kernel/include/uapi/linux/usb/functionfs.h    |   1 +
 kernel/include/uapi/linux/usb/g_printer.h     |   1 +
 kernel/include/uapi/linux/usb/gadgetfs.h      |   1 +
 kernel/include/uapi/linux/usb/midi.h          |   1 +
 kernel/include/uapi/linux/usb/tmc.h           |   1 +
 kernel/include/uapi/linux/usb/video.h         |   1 +
 kernel/include/uapi/linux/usbdevice_fs.h      |   1 +
 kernel/include/uapi/linux/usbip.h             |   1 +
 kernel/include/uapi/linux/userfaultfd.h       |   1 +
 kernel/include/uapi/linux/userio.h            |   1 +
 kernel/include/uapi/linux/utime.h             |   1 +
 kernel/include/uapi/linux/utsname.h           |   1 +
 kernel/include/uapi/linux/uuid.h              |   1 +
 kernel/include/uapi/linux/uvcvideo.h          |   1 +
 kernel/include/uapi/linux/v4l2-common.h       |   1 +
 kernel/include/uapi/linux/v4l2-controls.h     |   1 +
 kernel/include/uapi/linux/v4l2-dv-timings.h   |   1 +
 kernel/include/uapi/linux/v4l2-mediabus.h     |   1 +
 kernel/include/uapi/linux/v4l2-subdev.h       |   1 +
 kernel/include/uapi/linux/veth.h              |   1 +
 kernel/include/uapi/linux/vfio.h              |   1 +
 kernel/include/uapi/linux/vfio_ccw.h          |   1 +
 kernel/include/uapi/linux/vhost.h             |   1 +
 kernel/include/uapi/linux/videodev2.h         |   1 +
 kernel/include/uapi/linux/vm_sockets.h        |   1 +
 kernel/include/uapi/linux/vsockmon.h          |   1 +
 kernel/include/uapi/linux/vt.h                |   1 +
 kernel/include/uapi/linux/vtpm_proxy.h        |   1 +
 kernel/include/uapi/linux/wait.h              |   1 +
 kernel/include/uapi/linux/wanrouter.h         |   1 +
 kernel/include/uapi/linux/watchdog.h          |   1 +
 kernel/include/uapi/linux/wireless.h          |   1 +
 kernel/include/uapi/linux/x25.h               |   1 +
 kernel/include/uapi/linux/xattr.h             |   1 +
 kernel/include/uapi/linux/xfrm.h              |   1 +
 .../include/uapi/linux/xilinx-v4l2-controls.h |   1 +
 kernel/include/uapi/linux/zorro.h             |   1 +
 kernel/include/uapi/linux/zorro_ids.h         |   1 +
 kernel/include/uapi/misc/cxl.h                |   1 +
 kernel/include/uapi/mtd/inftl-user.h          |   1 +
 kernel/include/uapi/mtd/mtd-abi.h             |   1 +
 kernel/include/uapi/mtd/mtd-user.h            |   1 +
 kernel/include/uapi/mtd/nftl-user.h           |   1 +
 kernel/include/uapi/mtd/ubi-user.h            |   1 +
 kernel/include/uapi/rdma/bnxt_re-abi.h        |   1 +
 kernel/include/uapi/rdma/cxgb3-abi.h          |   1 +
 kernel/include/uapi/rdma/cxgb4-abi.h          |   1 +
 kernel/include/uapi/rdma/hfi/hfi1_ioctl.h     |   1 +
 kernel/include/uapi/rdma/hfi/hfi1_user.h      |   1 +
 kernel/include/uapi/rdma/hns-abi.h            |   1 +
 kernel/include/uapi/rdma/ib_user_cm.h         |   1 +
 kernel/include/uapi/rdma/ib_user_mad.h        |   1 +
 kernel/include/uapi/rdma/ib_user_sa.h         |   1 +
 kernel/include/uapi/rdma/ib_user_verbs.h      |   1 +
 kernel/include/uapi/rdma/mlx4-abi.h           |   1 +
 kernel/include/uapi/rdma/mlx5-abi.h           |   1 +
 kernel/include/uapi/rdma/mthca-abi.h          |   1 +
 kernel/include/uapi/rdma/nes-abi.h            |   1 +
 kernel/include/uapi/rdma/ocrdma-abi.h         |   1 +
 kernel/include/uapi/rdma/qedr-abi.h           |   1 +
 kernel/include/uapi/rdma/rdma_netlink.h       |   1 +
 kernel/include/uapi/rdma/rdma_user_cm.h       |   1 +
 kernel/include/uapi/rdma/rdma_user_ioctl.h    |   1 +
 kernel/include/uapi/rdma/rdma_user_rxe.h      |   1 +
 kernel/include/uapi/rdma/vmw_pvrdma-abi.h     |   1 +
 kernel/include/uapi/scsi/cxlflash_ioctl.h     |   1 +
 kernel/include/uapi/scsi/fc/fc_els.h          |   1 +
 kernel/include/uapi/scsi/fc/fc_fs.h           |   1 +
 kernel/include/uapi/scsi/fc/fc_gs.h           |   1 +
 kernel/include/uapi/scsi/fc/fc_ns.h           |   1 +
 kernel/include/uapi/scsi/scsi_bsg_fc.h        |   1 +
 kernel/include/uapi/scsi/scsi_netlink.h       |   1 +
 kernel/include/uapi/scsi/scsi_netlink_fc.h    |   1 +
 kernel/include/uapi/sound/asequencer.h        |   1 +
 kernel/include/uapi/sound/asoc.h              |   1 +
 kernel/include/uapi/sound/asound.h            |   7 +-
 kernel/include/uapi/sound/asound_fm.h         |   1 +
 kernel/include/uapi/sound/compress_offload.h  |   1 +
 kernel/include/uapi/sound/compress_params.h   |   1 +
 kernel/include/uapi/sound/emu10k1.h           |   1 +
 kernel/include/uapi/sound/firewire.h          |   1 +
 kernel/include/uapi/sound/hdsp.h              |   1 +
 kernel/include/uapi/sound/hdspm.h             |   1 +
 kernel/include/uapi/sound/sb16_csp.h          |   1 +
 kernel/include/uapi/sound/sfnt_info.h         |   1 +
 kernel/include/uapi/sound/snd_sst_tokens.h    |   1 +
 kernel/include/uapi/sound/tlv.h               |   1 +
 kernel/include/uapi/sound/usb_stream.h        |   1 +
 kernel/include/uapi/video/edid.h              |   1 +
 kernel/include/uapi/video/sisfb.h             |   1 +
 kernel/include/uapi/video/uvesafb.h           |   1 +
 kernel/include/uapi/xen/evtchn.h              |   1 +
 kernel/include/uapi/xen/gntdev.h              |   1 +
 kernel/include/uapi/xen/privcmd.h             |   1 +
 kernel/include/video/aty128.h                 |   1 +
 kernel/include/video/edid.h                   |   1 +
 kernel/include/video/iga.h                    |   1 +
 kernel/include/video/mbxfb.h                  |   1 +
 kernel/include/video/newport.h                |   1 +
 kernel/include/video/radeon.h                 |   1 +
 kernel/include/video/sh_mobile_lcdc.h         |   1 +
 kernel/include/video/sh_mobile_meram.h        |   1 +
 kernel/include/video/sstfb.h                  |   1 +
 kernel/include/video/tdfx.h                   |   1 +
 kernel/include/video/trident.h                |   1 +
 kernel/include/video/udlfb.h                  |   1 +
 kernel/include/video/uvesafb.h                |   1 +
 kernel/include/xen/arm/hypervisor.h           |   1 +
 kernel/include/xen/arm/interface.h            |   1 +
 kernel/include/xen/arm/page-coherent.h        |   1 +
 kernel/include/xen/arm/page.h                 |   1 +
 kernel/include/xen/balloon.h                  |   1 +
 kernel/include/xen/events.h                   |   1 +
 kernel/include/xen/features.h                 |   1 +
 kernel/include/xen/hvc-console.h              |   1 +
 kernel/include/xen/hvm.h                      |   1 +
 kernel/include/xen/interface/event_channel.h  |   1 +
 kernel/include/xen/interface/features.h       |   1 +
 kernel/include/xen/interface/io/blkif.h       |   1 +
 kernel/include/xen/interface/io/console.h     |   1 +
 kernel/include/xen/interface/io/protocols.h   |   1 +
 kernel/include/xen/interface/io/ring.h        |   1 +
 kernel/include/xen/interface/io/xenbus.h      |   1 +
 kernel/include/xen/interface/io/xs_wire.h     |   1 +
 kernel/include/xen/interface/memory.h         |   1 +
 kernel/include/xen/interface/nmi.h            |   1 +
 kernel/include/xen/interface/version.h        |   1 +
 kernel/include/xen/interface/xenpmu.h         |   1 +
 kernel/include/xen/page.h                     |   1 +
 kernel/include/xen/platform_pci.h             |   1 +
 kernel/include/xen/swiotlb-xen.h              |   1 +
 kernel/include/xen/tmem.h                     |   1 +
 kernel/include/xen/xen-ops.h                  |   1 +
 kernel/include/xen/xen.h                      |   1 +
 kernel/init/Makefile                          |   1 +
 kernel/init/calibrate.c                       |   1 +
 kernel/init/do_mounts.h                       |   1 +
 kernel/init/do_mounts_initrd.c                |   1 +
 kernel/init/do_mounts_md.c                    |   1 +
 kernel/init/do_mounts_rd.c                    |   1 +
 kernel/init/init_task.c                       |   1 +
 kernel/init/initramfs.c                       |   1 +
 kernel/ipc/Makefile                           |   1 +
 kernel/ipc/compat.c                           |   1 +
 kernel/ipc/msg.c                              |   1 +
 kernel/ipc/namespace.c                        |   1 +
 kernel/ipc/sem.c                              |   1 +
 kernel/ipc/shm.c                              |   1 +
 kernel/ipc/syscall.c                          |   1 +
 kernel/ipc/util.c                             |   1 +
 kernel/ipc/util.h                             |   1 +
 kernel/kernel/Makefile                        |   1 +
 kernel/kernel/acct.c                          |   1 +
 kernel/kernel/audit_tree.c                    |   1 +
 kernel/kernel/bounds.c                        |   1 +
 kernel/kernel/bpf/Makefile                    |   1 +
 kernel/kernel/bpf/sockmap.c                   |  16 ++-
 kernel/kernel/capability.c                    |   1 +
 kernel/kernel/cgroup/Makefile                 |   1 +
 kernel/kernel/cgroup/cgroup-internal.h        |   1 +
 kernel/kernel/cgroup/debug.c                  |   1 +
 kernel/kernel/cgroup/namespace.c              |   1 +
 kernel/kernel/dma.c                           |   1 +
 kernel/kernel/elfcore.c                       |   1 +
 kernel/kernel/events/Makefile                 |   1 +
 kernel/kernel/events/core.c                   |   6 +-
 kernel/kernel/events/internal.h               |   1 +
 kernel/kernel/exec_domain.c                   |   1 +
 kernel/kernel/futex.c                         |  35 ++++-
 kernel/kernel/futex_compat.c                  |   1 +
 kernel/kernel/gcov/Makefile                   |   1 +
 kernel/kernel/gcov/base.c                     |   1 +
 kernel/kernel/gcov/fs.c                       |   1 +
 kernel/kernel/gcov/gcc_3_4.c                  |   1 +
 kernel/kernel/gcov/gcc_4_7.c                  |   1 +
 kernel/kernel/gcov/gcov.h                     |   1 +
 kernel/kernel/groups.c                        |   1 +
 kernel/kernel/irq/Makefile                    |   1 +
 kernel/kernel/irq/affinity.c                  |   1 +
 kernel/kernel/irq/autoprobe.c                 |   1 +
 kernel/kernel/irq/debug.h                     |   1 +
 kernel/kernel/irq/internals.h                 |   1 +
 kernel/kernel/irq/migration.c                 |   1 +
 kernel/kernel/irq/proc.c                      |   1 +
 kernel/kernel/irq/resend.c                    |   1 +
 kernel/kernel/irq/settings.h                  |   1 +
 kernel/kernel/irq/spurious.c                  |   1 +
 kernel/kernel/kcmp.c                          |   1 +
 kernel/kernel/kcov.c                          |   1 +
 kernel/kernel/kexec_internal.h                |   1 +
 kernel/kernel/livepatch/core.h                |   1 +
 kernel/kernel/livepatch/patch.h               |   1 +
 kernel/kernel/livepatch/transition.h          |   1 +
 kernel/kernel/locking/Makefile                |   1 +
 kernel/kernel/locking/lockdep_internals.h     |   1 +
 kernel/kernel/locking/lockdep_proc.c          |   1 +
 kernel/kernel/locking/mcs_spinlock.h          |   1 +
 kernel/kernel/locking/mutex-debug.h           |   1 +
 kernel/kernel/locking/mutex.h                 |   1 +
 kernel/kernel/locking/osq_lock.c              |   1 +
 kernel/kernel/locking/qspinlock_paravirt.h    |   1 +
 kernel/kernel/locking/rtmutex-debug.c         |   1 +
 kernel/kernel/locking/rtmutex-debug.h         |   1 +
 kernel/kernel/locking/rtmutex.h               |   1 +
 kernel/kernel/locking/rtmutex_common.h        |   1 +
 kernel/kernel/locking/rwsem-spinlock.c        |   1 +
 kernel/kernel/locking/rwsem-xadd.c            |   1 +
 kernel/kernel/locking/rwsem.c                 |   1 +
 kernel/kernel/locking/rwsem.h                 |   1 +
 kernel/kernel/locking/spinlock.c              |   1 +
 kernel/kernel/power/Makefile                  |   1 +
 kernel/kernel/power/autosleep.c               |   1 +
 kernel/kernel/power/console.c                 |   1 +
 kernel/kernel/power/power.h                   |   1 +
 kernel/kernel/power/process.c                 |   1 +
 kernel/kernel/power/wakelock.c                |   1 +
 kernel/kernel/printk/braille.c                |   1 +
 kernel/kernel/printk/braille.h                |   1 +
 kernel/kernel/printk/console_cmdline.h        |   1 +
 kernel/kernel/range.c                         |   1 +
 kernel/kernel/rcu/Makefile                    |   1 +
 kernel/kernel/sched/Makefile                  |   1 +
 kernel/kernel/sched/autogroup.c               |   1 +
 kernel/kernel/sched/autogroup.h               |   1 +
 kernel/kernel/sched/completion.c              |   1 +
 kernel/kernel/sched/cpuacct.c                 |   1 +
 kernel/kernel/sched/cpuacct.h                 |   1 +
 kernel/kernel/sched/cpudeadline.h             |   1 +
 kernel/kernel/sched/cpupri.h                  |   1 +
 kernel/kernel/sched/deadline.c                |   1 +
 kernel/kernel/sched/fair.c                    |   1 +
 kernel/kernel/sched/features.h                |   1 +
 kernel/kernel/sched/idle_task.c               |   1 +
 kernel/kernel/sched/loadavg.c                 |   1 +
 kernel/kernel/sched/rt.c                      |   1 +
 kernel/kernel/sched/sched-pelt.h              |   1 +
 kernel/kernel/sched/sched.h                   |   1 +
 kernel/kernel/sched/stats.c                   |   1 +
 kernel/kernel/sched/stats.h                   |   1 +
 kernel/kernel/sched/stop_task.c               |   1 +
 kernel/kernel/sched/swait.c                   |   1 +
 kernel/kernel/sched/topology.c                |   1 +
 kernel/kernel/seccomp.c                       |   1 +
 kernel/kernel/signal.c                        |   2 +-
 kernel/kernel/smpboot.h                       |   1 +
 kernel/kernel/sys.c                           |   1 +
 kernel/kernel/sys_ni.c                        |   1 +
 kernel/kernel/sysctl_binary.c                 |   1 +
 kernel/kernel/task_work.c                     |   1 +
 kernel/kernel/time/Makefile                   |   1 +
 kernel/kernel/time/itimer.c                   |   1 +
 kernel/kernel/time/ntp.c                      |   1 +
 kernel/kernel/time/ntp_internal.h             |   1 +
 kernel/kernel/time/posix-cpu-timers.c         |   1 +
 kernel/kernel/time/posix-timers.h             |   1 +
 kernel/kernel/time/tick-broadcast-hrtimer.c   |   1 +
 kernel/kernel/time/tick-internal.h            |   1 +
 kernel/kernel/time/tick-sched.h               |   1 +
 kernel/kernel/time/timekeeping.h              |   1 +
 kernel/kernel/time/timekeeping_internal.h     |   1 +
 kernel/kernel/trace/Makefile                  |   1 +
 kernel/kernel/trace/power-traces.c            |   1 +
 kernel/kernel/trace/rpm-traces.c              |   1 +
 kernel/kernel/trace/trace.h                   |   1 +
 kernel/kernel/trace/trace_benchmark.c         |   1 +
 kernel/kernel/trace/trace_benchmark.h         |   1 +
 kernel/kernel/trace/trace_branch.c            |   1 +
 kernel/kernel/trace/trace_entries.h           |   1 +
 .../kernel/trace/trace_events_filter_test.h   |   1 +
 kernel/kernel/trace/trace_export.c            |   1 +
 kernel/kernel/trace/trace_functions.c         |   1 +
 kernel/kernel/trace/trace_functions_graph.c   |   1 +
 kernel/kernel/trace/trace_kdb.c               |   1 +
 kernel/kernel/trace/trace_mmiotrace.c         |   1 +
 kernel/kernel/trace/trace_nop.c               |   1 +
 kernel/kernel/trace/trace_output.h            |   1 +
 kernel/kernel/trace/trace_sched_switch.c      |   1 +
 kernel/kernel/trace/trace_sched_wakeup.c      |   1 +
 kernel/kernel/trace/trace_selftest.c          |   1 +
 kernel/kernel/trace/trace_selftest_dynamic.c  |   1 +
 kernel/kernel/trace/trace_stack.c             |   1 +
 kernel/kernel/trace/trace_stat.c              |   1 +
 kernel/kernel/trace/trace_stat.h              |   1 +
 kernel/kernel/trace/trace_syscalls.c          |   1 +
 kernel/kernel/trace/tracing_map.h             |   1 +
 kernel/kernel/uid16.c                         |   1 +
 kernel/kernel/watchdog.c                      |   1 +
 kernel/kernel/watchdog_hld.c                  |  16 ++-
 kernel/kernel/workqueue_internal.h            |   1 +
 kernel/lib/842/842.h                          |   1 +
 kernel/lib/842/842_debugfs.h                  |   1 +
 kernel/lib/Makefile                           |   1 +
 kernel/lib/argv_split.c                       |   1 +
 kernel/lib/asn1_decoder.c                     |   3 +
 kernel/lib/audit.c                            |   1 +
 kernel/lib/bcd.c                              |   1 +
 kernel/lib/bug.c                              |   1 +
 kernel/lib/bust_spinlocks.c                   |   1 +
 kernel/lib/check_signature.c                  |   1 +
 kernel/lib/clz_tab.c                          |   1 +
 kernel/lib/compat_audit.c                     |   1 +
 kernel/lib/cpumask.c                          |   1 +
 kernel/lib/crc32defs.h                        |   1 +
 kernel/lib/ctype.c                            |   1 +
 kernel/lib/debug_info.c                       |   1 +
 kernel/lib/dec_and_lock.c                     |   1 +
 kernel/lib/decompress.c                       |   1 +
 kernel/lib/decompress_inflate.c               |   1 +
 kernel/lib/devres.c                           |   1 +
 kernel/lib/div64.c                            |   1 +
 kernel/lib/dma-noop.c                         |   1 +
 kernel/lib/dma-virt.c                         |   1 +
 kernel/lib/dump_stack.c                       |   1 +
 kernel/lib/dynamic_queue_limits.c             |   1 +
 kernel/lib/errseq.c                           |   1 +
 kernel/lib/flex_proportions.c                 |   1 +
 kernel/lib/fonts/Makefile                     |   1 +
 kernel/lib/fonts/font_10x18.c                 |   1 +
 kernel/lib/fonts/font_6x10.c                  |   1 +
 kernel/lib/fonts/font_6x11.c                  |   1 +
 kernel/lib/fonts/font_7x14.c                  |   1 +
 kernel/lib/fonts/font_8x16.c                  |   1 +
 kernel/lib/fonts/font_8x8.c                   |   1 +
 kernel/lib/fonts/font_acorn_8x8.c             |   1 +
 kernel/lib/fonts/font_pearl_8x8.c             |   1 +
 kernel/lib/fonts/font_sun12x22.c              |   1 +
 kernel/lib/fonts/font_sun8x16.c               |   1 +
 kernel/lib/gen_crc32table.c                   |   1 +
 kernel/lib/hweight.c                          |   1 +
 kernel/lib/inflate.c                          |   1 +
 kernel/lib/int_sqrt.c                         |   1 +
 kernel/lib/iomap.c                            |   1 +
 kernel/lib/iommu-common.c                     |   1 +
 kernel/lib/iommu-helper.c                     |   1 +
 kernel/lib/ioremap.c                          |   2 +
 kernel/lib/irq_poll.c                         |   1 +
 kernel/lib/kasprintf.c                        |   1 +
 kernel/lib/kstrtox.c                          |   1 +
 kernel/lib/kstrtox.h                          |   1 +
 kernel/lib/list_sort.c                        |   1 +
 kernel/lib/locking-selftest-hardirq.h         |   1 +
 kernel/lib/locking-selftest-mutex.h           |   1 +
 kernel/lib/locking-selftest-rlock.h           |   1 +
 kernel/lib/locking-selftest-rsem.h            |   1 +
 kernel/lib/locking-selftest-rtmutex.h         |   1 +
 kernel/lib/locking-selftest-softirq.h         |   1 +
 kernel/lib/locking-selftest-spin.h            |   1 +
 kernel/lib/locking-selftest-wlock.h           |   1 +
 kernel/lib/locking-selftest-wsem.h            |   1 +
 kernel/lib/locking-selftest.c                 |   1 +
 kernel/lib/lockref.c                          |   1 +
 kernel/lib/lzo/lzodefs.h                      |   1 +
 kernel/lib/memweight.c                        |   1 +
 kernel/lib/mpi/Makefile                       |   1 +
 kernel/lib/net_utils.c                        |   1 +
 kernel/lib/nlattr.c                           |   1 +
 kernel/lib/nmi_backtrace.c                    |   1 +
 kernel/lib/nodemask.c                         |   1 +
 kernel/lib/notifier-error-inject.h            |   1 +
 kernel/lib/once.c                             |   1 +
 kernel/lib/percpu_counter.c                   |   1 +
 kernel/lib/raid6/Makefile                     |   1 +
 kernel/lib/raid6/recov_s390xc.c               |   1 +
 kernel/lib/raid6/s390vx.uc                    |   1 +
 kernel/lib/raid6/test/Makefile                |   1 +
 kernel/lib/random32.c                         |   1 +
 kernel/lib/rational.c                         |   1 +
 kernel/lib/reciprocal_div.c                   |   1 +
 kernel/lib/refcount.c                         |   1 +
 kernel/lib/seq_buf.c                          |   1 +
 kernel/lib/sha1.c                             |   1 +
 kernel/lib/smp_processor_id.c                 |   1 +
 kernel/lib/sort.c                             |   1 +
 kernel/lib/string.c                           |   1 +
 kernel/lib/strncpy_from_user.c                |   1 +
 kernel/lib/strnlen_user.c                     |   1 +
 kernel/lib/syscall.c                          |   1 +
 kernel/lib/ubsan.h                            |   1 +
 kernel/lib/ucs2_string.c                      |   1 +
 kernel/lib/usercopy.c                         |   1 +
 kernel/lib/win_minmax.c                       |   1 +
 kernel/mm/Makefile                            |   1 +
 kernel/mm/bootmem.c                           |   1 +
 kernel/mm/cma.h                               |   1 +
 kernel/mm/cma_debug.c                         |   1 +
 kernel/mm/compaction.c                        |   1 +
 kernel/mm/debug.c                             |   1 +
 kernel/mm/debug_page_ref.c                    |   1 +
 kernel/mm/early_ioremap.c                     |   1 +
 kernel/mm/fadvise.c                           |   1 +
 kernel/mm/failslab.c                          |   1 +
 kernel/mm/frame_vector.c                      |   1 +
 kernel/mm/highmem.c                           |   1 +
 kernel/mm/huge_memory.c                       |   3 +
 kernel/mm/hugetlb.c                           |  32 ++++-
 kernel/mm/init-mm.c                           |   1 +
 kernel/mm/kasan/Makefile                      |   1 +
 kernel/mm/kasan/kasan.h                       |   1 +
 kernel/mm/khugepaged.c                        |   1 +
 kernel/mm/kmemcheck.c                         |   1 +
 kernel/mm/madvise.c                           |   1 +
 kernel/mm/mempool.c                           |   1 +
 kernel/mm/memtest.c                           |   1 +
 kernel/mm/migrate.c                           |   1 +
 kernel/mm/mincore.c                           |   1 +
 kernel/mm/mlock.c                             |   1 +
 kernel/mm/mmzone.c                            |   1 +
 kernel/mm/mprotect.c                          |   1 +
 kernel/mm/mremap.c                            |   1 +
 kernel/mm/msync.c                             |   1 +
 kernel/mm/nobootmem.c                         |   1 +
 kernel/mm/page_counter.c                      |   1 +
 kernel/mm/page_ext.c                          |   1 +
 kernel/mm/page_idle.c                         |   1 +
 kernel/mm/page_io.c                           |   1 +
 kernel/mm/page_isolation.c                    |   1 +
 kernel/mm/page_owner.c                        |   1 +
 kernel/mm/page_poison.c                       |   1 +
 kernel/mm/page_vma_mapped.c                   |   1 +
 kernel/mm/pagewalk.c                          |   1 +
 kernel/mm/percpu-internal.h                   |   1 +
 kernel/mm/pgtable-generic.c                   |   1 +
 kernel/mm/quicklist.c                         |   1 +
 kernel/mm/slab.c                              |   1 +
 kernel/mm/slab.h                              |   1 +
 kernel/mm/slab_common.c                       |   1 +
 kernel/mm/slob.c                              |   1 +
 kernel/mm/slub.c                              |   1 +
 kernel/mm/sparse-vmemmap.c                    |   1 +
 kernel/mm/sparse.c                            |   1 +
 kernel/mm/swap_cgroup.c                       |   1 +
 kernel/mm/swap_slots.c                        |   1 +
 kernel/mm/swap_state.c                        |   1 +
 kernel/mm/swapfile.c                          |  23 +++-
 kernel/mm/vmacache.c                          |   1 +
 kernel/mm/vmscan.c                            |   1 +
 kernel/mm/workingset.c                        |   1 +
 kernel/net/6lowpan/6lowpan_i.h                |   1 +
 kernel/net/6lowpan/Makefile                   |   1 +
 kernel/net/6lowpan/nhc.h                      |   1 +
 kernel/net/802/Makefile                       |   1 +
 kernel/net/8021q/Makefile                     |   1 +
 kernel/net/8021q/vlan.h                       |   1 +
 kernel/net/8021q/vlan_core.c                  |   1 +
 kernel/net/8021q/vlanproc.h                   |   1 +
 kernel/net/9p/Makefile                        |   1 +
 kernel/net/Makefile                           |   1 +
 kernel/net/appletalk/dev.c                    |   1 +
 kernel/net/appletalk/sysctl_net_atalk.c       |   1 +
 kernel/net/atm/Makefile                       |   1 +
 kernel/net/atm/addr.c                         |   1 +
 kernel/net/atm/addr.h                         |   1 +
 kernel/net/atm/atm_misc.c                     |   1 +
 kernel/net/atm/atm_sysfs.c                    |   1 +
 kernel/net/atm/common.h                       |   1 +
 kernel/net/atm/ioctl.c                        |   1 +
 kernel/net/atm/lec.h                          |   1 +
 kernel/net/atm/lec_arpc.h                     |   1 +
 kernel/net/atm/mpc.h                          |   1 +
 kernel/net/atm/mpoa_caches.c                  |   1 +
 kernel/net/atm/mpoa_caches.h                  |   1 +
 kernel/net/atm/mpoa_proc.c                    |   1 +
 kernel/net/atm/proc.c                         |   1 +
 kernel/net/atm/protocols.h                    |   1 +
 kernel/net/atm/pvc.c                          |   1 +
 kernel/net/atm/raw.c                          |   1 +
 kernel/net/atm/resources.c                    |   1 +
 kernel/net/atm/resources.h                    |   1 +
 kernel/net/atm/signaling.c                    |   1 +
 kernel/net/atm/signaling.h                    |   1 +
 kernel/net/atm/svc.c                          |   1 +
 kernel/net/ax25/Makefile                      |   1 +
 kernel/net/bluetooth/Makefile                 |   1 +
 kernel/net/bluetooth/hci_sysfs.c              |   1 +
 kernel/net/bridge/Makefile                    |   1 +
 kernel/net/bridge/br_mdb.c                    |   1 +
 kernel/net/bridge/br_switchdev.c              |   1 +
 kernel/net/bridge/netfilter/Makefile          |   1 +
 kernel/net/caif/Makefile                      |   1 +
 kernel/net/can/Makefile                       |   1 +
 kernel/net/ceph/Makefile                      |   1 +
 kernel/net/ceph/armor.c                       |   1 +
 kernel/net/ceph/auth.c                        |   1 +
 kernel/net/ceph/auth_none.c                   |   1 +
 kernel/net/ceph/auth_none.h                   |   1 +
 kernel/net/ceph/auth_x.c                      |   1 +
 kernel/net/ceph/auth_x.h                      |   1 +
 kernel/net/ceph/auth_x_protocol.h             |   1 +
 kernel/net/ceph/buffer.c                      |   1 +
 kernel/net/ceph/ceph_fs.c                     |   1 +
 kernel/net/ceph/ceph_strings.c                |   1 +
 kernel/net/ceph/cls_lock_client.c             |   1 +
 kernel/net/ceph/crush/crush.c                 |   1 +
 kernel/net/ceph/crush/hash.c                  |   1 +
 kernel/net/ceph/crypto.c                      |   1 +
 kernel/net/ceph/crypto.h                      |   1 +
 kernel/net/ceph/debugfs.c                     |   1 +
 kernel/net/ceph/messenger.c                   |   1 +
 kernel/net/ceph/mon_client.c                  |   1 +
 kernel/net/ceph/msgpool.c                     |   1 +
 kernel/net/ceph/osd_client.c                  |   1 +
 kernel/net/ceph/osdmap.c                      |   1 +
 kernel/net/ceph/pagelist.c                    |   1 +
 kernel/net/ceph/pagevec.c                     |   1 +
 kernel/net/ceph/string_table.c                |   1 +
 kernel/net/core/Makefile                      |   1 +
 kernel/net/core/datagram.c                    |   1 +
 kernel/net/core/dev_ioctl.c                   |   1 +
 kernel/net/core/gro_cells.c                   |   1 +
 kernel/net/core/net-procfs.c                  |   1 +
 kernel/net/core/net-sysfs.h                   |   1 +
 kernel/net/core/net-traces.c                  |   1 +
 kernel/net/core/sock_reuseport.c              |   1 +
 kernel/net/core/stream.c                      |   1 +
 kernel/net/core/sysctl_net_core.c             |   1 +
 kernel/net/core/tso.c                         |   1 +
 kernel/net/dccp/Makefile                      |   1 +
 kernel/net/dccp/ccids/lib/tfrc.c              |   1 +
 kernel/net/decnet/Makefile                    |   1 +
 kernel/net/decnet/dn_dev.c                    |   1 +
 kernel/net/decnet/dn_fib.c                    |   1 +
 kernel/net/decnet/dn_neigh.c                  |   1 +
 kernel/net/decnet/dn_rules.c                  |   1 +
 kernel/net/decnet/dn_table.c                  |   1 +
 kernel/net/decnet/dn_timer.c                  |   1 +
 kernel/net/decnet/sysctl_net_decnet.c         |   1 +
 kernel/net/dsa/Makefile                       |   1 +
 kernel/net/ieee802154/6lowpan/6lowpan_i.h     |   1 +
 kernel/net/ieee802154/Makefile                |   1 +
 kernel/net/ieee802154/core.h                  |   1 +
 kernel/net/ieee802154/nl802154.h              |   1 +
 kernel/net/ieee802154/rdev-ops.h              |   1 +
 kernel/net/ieee802154/sysfs.h                 |   1 +
 kernel/net/ieee802154/trace.h                 |   1 +
 kernel/net/ife/ife.c                          |   2 +-
 kernel/net/ipv4/Makefile                      |   1 +
 kernel/net/ipv4/fib_lookup.h                  |   1 +
 kernel/net/ipv4/fib_notifier.c                |   1 +
 kernel/net/ipv4/fib_semantics.c               |  16 ++-
 kernel/net/ipv4/ip_forward.c                  |   1 +
 kernel/net/ipv4/ip_fragment.c                 |   1 +
 kernel/net/ipv4/ip_options.c                  |   1 +
 kernel/net/ipv4/ip_sockglue.c                 |   1 +
 kernel/net/ipv4/ipconfig.c                    |   1 +
 kernel/net/ipv4/netfilter/Makefile            |   1 +
 kernel/net/ipv4/netfilter/nf_reject_ipv4.c    |   2 +
 kernel/net/ipv4/sysctl_net_ipv4.c             |   1 +
 kernel/net/ipv4/tcp_fastopen.c                |   1 +
 kernel/net/ipv4/tcp_input.c                   |   1 +
 kernel/net/ipv4/tcp_metrics.c                 |   1 +
 kernel/net/ipv4/tcp_nv.c                      |   2 +-
 kernel/net/ipv4/tcp_output.c                  |  12 +-
 kernel/net/ipv4/tcp_recovery.c                |   1 +
 kernel/net/ipv4/tcp_vegas.h                   |   1 +
 kernel/net/ipv4/udp_impl.h                    |   1 +
 kernel/net/ipv4/xfrm4_input.c                 |   1 +
 kernel/net/ipv4/xfrm4_policy.c                |   1 +
 kernel/net/ipv4/xfrm4_state.c                 |   1 +
 kernel/net/ipv6/Makefile                      |   1 +
 kernel/net/ipv6/addrconf.c                    |   1 +
 kernel/net/ipv6/addrlabel.c                   |   1 +
 kernel/net/ipv6/ila/ila_lwt.c                 |   1 +
 kernel/net/ipv6/ila/ila_xlat.c                |   1 +
 kernel/net/ipv6/ip6_checksum.c                |   1 +
 kernel/net/ipv6/ip6_icmp.c                    |   1 +
 kernel/net/ipv6/netfilter/Makefile            |   1 +
 kernel/net/ipv6/sysctl_net_ipv6.c             |   1 +
 kernel/net/ipv6/udp_impl.h                    |   1 +
 kernel/net/ipv6/xfrm6_input.c                 |   1 +
 kernel/net/ipv6/xfrm6_policy.c                |   1 +
 kernel/net/ipv6/xfrm6_state.c                 |   1 +
 kernel/net/ipx/ipx_proc.c                     |   1 +
 kernel/net/ipx/ipx_route.c                    |   1 +
 kernel/net/ipx/pe2.c                          |   1 +
 kernel/net/ipx/sysctl_net_ipx.c               |   1 +
 kernel/net/kcm/kcmproc.c                      |   1 +
 kernel/net/l2tp/Makefile                      |   1 +
 kernel/net/l2tp/l2tp_ppp.c                    |   7 +-
 kernel/net/llc/sysctl_net_llc.c               |   1 +
 kernel/net/mac80211/Makefile                  |   1 +
 kernel/net/mac80211/debug.h                   |   1 +
 kernel/net/mac80211/debugfs.h                 |   1 +
 kernel/net/mac80211/debugfs_key.h             |   1 +
 kernel/net/mac80211/debugfs_netdev.h          |   1 +
 kernel/net/mac80211/debugfs_sta.h             |   1 +
 kernel/net/mac80211/driver-ops.h              |   1 +
 kernel/net/mac80211/pm.c                      |   1 +
 kernel/net/mac80211/trace.c                   |   1 +
 kernel/net/mac80211/trace.h                   |   1 +
 kernel/net/mac80211/trace_msg.h               |   1 +
 kernel/net/mac802154/cfg.h                    |   1 +
 kernel/net/mac802154/driver-ops.h             |   1 +
 kernel/net/mac802154/trace.c                  |   1 +
 kernel/net/mac802154/trace.h                  |   1 +
 kernel/net/mpls/internal.h                    |   1 +
 kernel/net/netfilter/Makefile                 |   1 +
 kernel/net/netfilter/ipset/Makefile           |   1 +
 kernel/net/netfilter/ipvs/Makefile            |   1 +
 kernel/net/netfilter/ipvs/ip_vs_proto_sctp.c  |   1 +
 kernel/net/netfilter/ipvs/ip_vs_sync.c        |   1 +
 kernel/net/netfilter/nf_internals.h           |   1 +
 kernel/net/netfilter/nf_sockopt.c             |   1 +
 kernel/net/netfilter/nft_set_hash.c           |   1 -
 kernel/net/netfilter/xt_repldata.h            |   1 +
 kernel/net/netlabel/Makefile                  |   1 +
 kernel/net/netlink/af_netlink.h               |   1 +
 kernel/net/netlink/genetlink.c                |   1 +
 kernel/net/nfc/Makefile                       |   1 +
 kernel/net/nfc/nci/Makefile                   |   1 +
 kernel/net/openvswitch/Makefile               |   1 +
 kernel/net/packet/internal.h                  |   1 +
 kernel/net/phonet/Makefile                    |   1 +
 kernel/net/psample/psample.c                  |   2 +-
 kernel/net/qrtr/qrtr.h                        |   1 +
 kernel/net/rds/Makefile                       |   1 +
 kernel/net/rds/ib.h                           |   1 +
 kernel/net/rds/info.h                         |   1 +
 kernel/net/rds/loop.h                         |   1 +
 kernel/net/rds/rdma_transport.h               |   1 +
 kernel/net/rds/rds.h                          |   1 +
 kernel/net/rds/rds_single_path.h              |   1 +
 kernel/net/rds/tcp.h                          |   1 +
 kernel/net/rxrpc/Makefile                     |   1 +
 kernel/net/sched/Makefile                     |   1 +
 kernel/net/sched/act_api.c                    |   4 +
 kernel/net/sched/act_bpf.c                    |   2 +-
 kernel/net/sched/act_connmark.c               |   2 +-
 kernel/net/sched/act_csum.c                   |   2 +-
 kernel/net/sched/act_gact.c                   |   2 +-
 kernel/net/sched/act_ife.c                    |   2 +-
 kernel/net/sched/act_ipt.c                    |   4 +-
 kernel/net/sched/act_mirred.c                 |   2 +-
 kernel/net/sched/act_nat.c                    |   2 +-
 kernel/net/sched/act_pedit.c                  |   2 +-
 kernel/net/sched/act_police.c                 |   2 +-
 kernel/net/sched/act_sample.c                 |   4 +-
 kernel/net/sched/act_simple.c                 |   2 +-
 kernel/net/sched/act_skbedit.c                |   2 +-
 kernel/net/sched/act_skbmod.c                 |   2 +-
 kernel/net/sched/act_tunnel_key.c             |   2 +-
 kernel/net/sched/act_vlan.c                   |   2 +-
 kernel/net/sched/cls_api.c                    |  37 ++----
 kernel/net/sctp/Makefile                      |   1 +
 kernel/net/smc/smc.h                          |   1 +
 kernel/net/smc/smc_cdc.c                      |   1 +
 kernel/net/smc/smc_cdc.h                      |   1 +
 kernel/net/smc/smc_clc.c                      |   1 +
 kernel/net/smc/smc_clc.h                      |   1 +
 kernel/net/smc/smc_close.c                    |   1 +
 kernel/net/smc/smc_close.h                    |   1 +
 kernel/net/smc/smc_core.c                     |   1 +
 kernel/net/smc/smc_core.h                     |   1 +
 kernel/net/smc/smc_ib.c                       |   1 +
 kernel/net/smc/smc_ib.h                       |   1 +
 kernel/net/smc/smc_llc.c                      |   1 +
 kernel/net/smc/smc_llc.h                      |   1 +
 kernel/net/smc/smc_pnet.c                     |   1 +
 kernel/net/smc/smc_pnet.h                     |   1 +
 kernel/net/smc/smc_rx.c                       |   1 +
 kernel/net/smc/smc_rx.h                       |   1 +
 kernel/net/smc/smc_tx.c                       |   1 +
 kernel/net/smc/smc_tx.h                       |   1 +
 kernel/net/smc/smc_wr.c                       |   1 +
 kernel/net/smc/smc_wr.h                       |   1 +
 kernel/net/sunrpc/Makefile                    |   1 +
 kernel/net/sunrpc/auth_gss/Makefile           |   1 +
 kernel/net/sunrpc/auth_null.c                 |   1 +
 kernel/net/sunrpc/auth_unix.c                 |   1 +
 kernel/net/sunrpc/debugfs.c                   |   1 +
 kernel/net/sunrpc/netns.h                     |   1 +
 kernel/net/sunrpc/xprtmultipath.c             |   1 +
 kernel/net/sunrpc/xprtrdma/Makefile           |   1 +
 kernel/net/sunrpc/xprtrdma/backchannel.c      |   1 +
 kernel/net/sunrpc/xprtrdma/fmr_ops.c          |   1 +
 kernel/net/sunrpc/xprtrdma/frwr_ops.c         |   1 +
 .../sunrpc/xprtrdma/svc_rdma_backchannel.c    |   1 +
 kernel/net/sunrpc/xprtrdma/svc_rdma_rw.c      |   1 +
 kernel/net/sunrpc/xprtsock.c                  |   1 +
 kernel/net/tipc/Makefile                      |   1 +
 kernel/net/unix/Makefile                      |   1 +
 kernel/net/vmw_vsock/Makefile                 |   1 +
 kernel/net/wimax/Makefile                     |   1 +
 kernel/net/wireless/Makefile                  |   1 +
 kernel/net/wireless/ap.c                      |   1 +
 kernel/net/wireless/chan.c                    |   1 +
 kernel/net/wireless/core.h                    |   1 +
 kernel/net/wireless/debugfs.h                 |   1 +
 kernel/net/wireless/ethtool.c                 |   1 +
 kernel/net/wireless/ibss.c                    |   1 +
 kernel/net/wireless/mesh.c                    |   1 +
 kernel/net/wireless/mlme.c                    |   1 +
 kernel/net/wireless/nl80211.h                 |   1 +
 kernel/net/wireless/rdev-ops.h                |   1 +
 kernel/net/wireless/scan.c                    |   1 +
 kernel/net/wireless/sme.c                     |   1 +
 kernel/net/wireless/sysfs.h                   |   1 +
 kernel/net/wireless/trace.h                   |   1 +
 kernel/net/wireless/util.c                    |   1 +
 kernel/net/wireless/wext-compat.c             |   1 +
 kernel/net/wireless/wext-sme.c                |   1 +
 kernel/net/x25/Makefile                       |   1 +
 kernel/net/x25/sysctl_net_x25.c               |   1 +
 kernel/net/xfrm/Makefile                      |   1 +
 kernel/net/xfrm/xfrm_hash.c                   |   1 +
 kernel/net/xfrm/xfrm_hash.h                   |   1 +
 kernel/net/xfrm/xfrm_input.c                  |   1 +
 kernel/net/xfrm/xfrm_output.c                 |   4 +-
 kernel/net/xfrm/xfrm_policy.c                 |   1 -
 kernel/net/xfrm/xfrm_state.c                  |   1 +
 kernel/net/xfrm/xfrm_sysctl.c                 |   1 +
 kernel/samples/auxdisplay/Makefile            |   1 +
 kernel/samples/bpf/Makefile                   |   1 +
 kernel/samples/bpf/bpf_load.c                 |   1 +
 kernel/samples/bpf/bpf_load.h                 |   1 +
 kernel/samples/bpf/cgroup_helpers.c           |   1 +
 kernel/samples/bpf/cgroup_helpers.h           |   1 +
 kernel/samples/bpf/libbpf.h                   |   1 +
 kernel/samples/bpf/lwt_len_hist.sh            |   1 +
 kernel/samples/bpf/lwt_len_hist_user.c        |   1 +
 .../bpf/run_cookie_uid_helper_example.sh      |   1 +
 kernel/samples/bpf/sock_example.h             |   1 +
 kernel/samples/bpf/sockex1_user.c             |   1 +
 kernel/samples/bpf/sockex2_user.c             |   1 +
 kernel/samples/bpf/sockex3_user.c             |   1 +
 kernel/samples/bpf/spintest_user.c            |   1 +
 kernel/samples/bpf/syscall_nrs.c              |   1 +
 kernel/samples/bpf/tc_l2_redirect.sh          |   1 +
 kernel/samples/bpf/test_cgrp2_sock.sh         |   1 +
 kernel/samples/bpf/test_cgrp2_sock2.c         |   1 +
 kernel/samples/bpf/test_cgrp2_sock2.sh        |   1 +
 kernel/samples/bpf/test_cgrp2_tc.sh           |   1 +
 kernel/samples/bpf/test_cls_bpf.sh            |   1 +
 kernel/samples/bpf/test_ipip.sh               |   1 +
 kernel/samples/bpf/test_lwt_bpf.sh            |   1 +
 .../samples/bpf/test_probe_write_user_user.c  |   1 +
 kernel/samples/bpf/test_tunnel_bpf.sh         |   1 +
 kernel/samples/bpf/tracex1_user.c             |   1 +
 kernel/samples/bpf/tracex2_user.c             |   1 +
 kernel/samples/bpf/tracex5_user.c             |   1 +
 kernel/samples/bpf/tracex6_user.c             |   1 +
 kernel/samples/connector/Makefile             |   1 +
 kernel/samples/hidraw/Makefile                |   1 +
 kernel/samples/hidraw/hid-example.c           |   1 +
 kernel/samples/mei/Makefile                   |   1 +
 kernel/samples/mic/mpssd/Makefile             |   1 +
 kernel/samples/pktgen/parameters.sh           |   1 +
 kernel/samples/pktgen/pktgen.conf-1-1-ip6     |   1 +
 .../samples/pktgen/pktgen.conf-1-1-ip6-rdos   |   1 +
 kernel/samples/pktgen/pktgen.conf-1-2         |   1 +
 .../pktgen_bench_xmit_mode_netif_receive.sh   |   1 +
 .../pktgen_bench_xmit_mode_queue_xmit.sh      |   1 +
 .../samples/pktgen/pktgen_sample01_simple.sh  |   1 +
 .../pktgen/pktgen_sample02_multiqueue.sh      |   1 +
 .../pktgen_sample03_burst_single_flow.sh      |   1 +
 .../pktgen/pktgen_sample04_many_flows.sh      |   1 +
 .../pktgen/pktgen_sample05_flow_per_thread.sh |   1 +
 kernel/samples/seccomp/Makefile               |   1 +
 kernel/samples/seccomp/bpf-direct.c           |   1 +
 kernel/samples/seccomp/bpf-fancy.c            |   1 +
 kernel/samples/seccomp/bpf-helper.c           |   1 +
 kernel/samples/seccomp/bpf-helper.h           |   1 +
 kernel/samples/seccomp/dropper.c              |   1 +
 kernel/samples/timers/Makefile                |   1 +
 kernel/samples/timers/hpet_example.c          |   1 +
 .../trace_events/trace-events-sample.h        |   1 +
 kernel/samples/uhid/uhid-example.c            |   1 +
 kernel/samples/watchdog/Makefile              |   1 +
 kernel/samples/watchdog/watchdog-simple.c     |   1 +
 kernel/scripts/Lindent                        |   1 +
 kernel/scripts/Makefile                       |   1 +
 kernel/scripts/Makefile.asm-generic           |   1 +
 kernel/scripts/Makefile.build                 |   3 +-
 kernel/scripts/Makefile.clean                 |   1 +
 kernel/scripts/Makefile.dtbinst               |   1 +
 kernel/scripts/Makefile.extrawarn             |   1 +
 kernel/scripts/Makefile.gcc-plugins           |   1 +
 kernel/scripts/Makefile.headersinst           |   1 +
 kernel/scripts/Makefile.host                  |   1 +
 kernel/scripts/Makefile.kasan                 |   1 +
 kernel/scripts/Makefile.lib                   |   1 +
 kernel/scripts/Makefile.modbuiltin            |   1 +
 kernel/scripts/Makefile.modinst               |   1 +
 kernel/scripts/Makefile.modpost               |   1 +
 kernel/scripts/Makefile.modsign               |   1 +
 kernel/scripts/Makefile.ubsan                 |   1 +
 kernel/scripts/check_00index.sh               |   1 +
 kernel/scripts/check_extable.sh               |   1 +
 kernel/scripts/checkincludes.pl               |   1 +
 kernel/scripts/checkstack.pl                  |   1 +
 kernel/scripts/checksyscalls.sh               |   1 +
 kernel/scripts/checkversion.pl                |   1 +
 kernel/scripts/cleanfile                      |   1 +
 kernel/scripts/cleanpatch                     |   1 +
 kernel/scripts/coccicheck                     |   1 +
 .../scripts/coccinelle/api/d_find_alias.cocci |   1 +
 .../api/debugfs/debugfs_simple_attr.cocci     |   1 +
 .../scripts/coccinelle/api/drm-get-put.cocci  |   1 +
 .../scripts/coccinelle/api/simple_open.cocci  |   1 +
 kernel/scripts/coccinelle/api/vma_pages.cocci |   1 +
 .../scripts/coccinelle/misc/boolreturn.cocci  |   1 +
 .../coccinelle/misc/irqf_oneshot.cocci        |   1 +
 kernel/scripts/coccinelle/misc/of_table.cocci |   1 +
 kernel/scripts/config                         |   1 +
 kernel/scripts/decode_stacktrace.sh           |   1 +
 kernel/scripts/decodecode                     |   1 +
 kernel/scripts/depmod.sh                      |   1 +
 kernel/scripts/diffconfig                     |   1 +
 kernel/scripts/dtc/Makefile                   |   1 +
 kernel/scripts/dtc/fdtdump.c                  |   1 +
 kernel/scripts/dtc/update-dtc-source.sh       |   1 +
 kernel/scripts/extract-module-sig.pl          |   1 +
 kernel/scripts/extract-sys-certs.pl           |   1 +
 kernel/scripts/faddr2line                     |   1 +
 kernel/scripts/gcc-goto.sh                    |   1 +
 kernel/scripts/gcc-ld                         |   1 +
 kernel/scripts/gcc-plugin.sh                  |   1 +
 kernel/scripts/gcc-plugins/Makefile           |   1 +
 kernel/scripts/gcc-plugins/gcc-common.h       |   1 +
 .../gcc-plugins/gcc-generate-gimple-pass.h    |   1 +
 .../gcc-plugins/gcc-generate-ipa-pass.h       |   1 +
 .../gcc-plugins/gcc-generate-rtl-pass.h       |   1 +
 .../gcc-generate-simple_ipa-pass.h            |   1 +
 kernel/scripts/gcc-plugins/gen-random-seed.sh |   1 +
 kernel/scripts/gcc-version.sh                 |   1 +
 .../scripts/gcc-x86_32-has-stack-protector.sh |   1 +
 .../scripts/gcc-x86_64-has-stack-protector.sh |   1 +
 kernel/scripts/gdb/linux/Makefile             |   1 +
 kernel/scripts/genksyms/Makefile              |   1 +
 kernel/scripts/headerdep.pl                   |   1 +
 kernel/scripts/headers.sh                     |   1 +
 kernel/scripts/headers_check.pl               |   1 +
 kernel/scripts/headers_install.sh             |   1 +
 kernel/scripts/kconfig/Makefile               |   1 +
 kernel/scripts/kconfig/check.sh               |   1 +
 kernel/scripts/kconfig/list.h                 |   1 +
 kernel/scripts/kconfig/lkc_proto.h            |   1 +
 .../kconfig/lxdialog/check-lxdialog.sh        |   1 +
 kernel/scripts/ld-version.sh                  |   1 +
 kernel/scripts/link-vmlinux.sh                |   1 +
 kernel/scripts/makelst                        |   1 +
 kernel/scripts/mkcompile_h                    |   1 +
 kernel/scripts/mkmakefile                     |   1 +
 kernel/scripts/mkuboot.sh                     |   1 +
 kernel/scripts/mod/Makefile                   |   1 +
 kernel/scripts/mod/devicetable-offsets.c      |   1 +
 kernel/scripts/mod/mk_elfconfig.c             |   1 +
 kernel/scripts/mod/modpost.h                  |   1 +
 kernel/scripts/package/buildtar               |   1 +
 kernel/scripts/parse-maintainers.pl           |   1 +
 kernel/scripts/patch-kernel                   |   1 +
 kernel/scripts/profile2linkerlist.pl          |   1 +
 kernel/scripts/prune-kernel                   |   1 +
 kernel/scripts/selinux/genheaders/Makefile    |   1 +
 .../scripts/selinux/genheaders/genheaders.c   |   1 +
 kernel/scripts/selinux/install_policy.sh      |   1 +
 kernel/scripts/selinux/mdp/Makefile           |   1 +
 kernel/scripts/setlocalversion                |   1 +
 kernel/scripts/stackdelta                     |   1 +
 kernel/scripts/stackusage                     |   1 +
 kernel/scripts/tracing/ftrace-bisect.sh       |   1 +
 kernel/scripts/ver_linux                      |   1 +
 kernel/scripts/xen-hypercalls.sh              |   1 +
 kernel/security/Makefile                      |   1 +
 kernel/security/apparmor/Makefile             |   1 +
 kernel/security/device_cgroup.c               |   1 +
 kernel/security/integrity/Makefile            |   1 +
 kernel/security/integrity/ima/Makefile        |   1 +
 kernel/security/keys/Makefile                 |   1 +
 kernel/security/keys/encrypted-keys/Makefile  |   1 +
 .../security/keys/encrypted-keys/encrypted.h  |   1 +
 kernel/security/keys/keyring.c                |  39 +++---
 kernel/security/keys/trusted.c                |  23 ++--
 kernel/security/keys/trusted.h                |   1 +
 kernel/security/min_addr.c                    |   1 +
 kernel/security/selinux/Makefile              |   1 +
 kernel/security/selinux/include/avc.h         |   1 +
 kernel/security/selinux/include/avc_ss.h      |   1 +
 kernel/security/selinux/include/classmap.h    |   1 +
 .../selinux/include/initial_sid_to_string.h   |   1 +
 kernel/security/selinux/include/security.h    |   1 +
 kernel/security/selinux/include/xfrm.h        |   1 +
 kernel/security/selinux/ss/constraint.h       |   1 +
 kernel/security/selinux/ss/context.h          |   1 +
 kernel/security/selinux/ss/ebitmap.c          |   1 +
 kernel/security/selinux/ss/ebitmap.h          |   1 +
 kernel/security/selinux/ss/hashtab.c          |   1 +
 kernel/security/selinux/ss/hashtab.h          |   1 +
 kernel/security/selinux/ss/mls.c              |   1 +
 kernel/security/selinux/ss/mls.h              |   1 +
 kernel/security/selinux/ss/mls_types.h        |   1 +
 kernel/security/selinux/ss/services.h         |   1 +
 kernel/security/selinux/ss/sidtab.c           |   1 +
 kernel/security/selinux/ss/sidtab.h           |   1 +
 kernel/security/selinux/ss/symtab.c           |   1 +
 kernel/security/selinux/ss/symtab.h           |   1 +
 kernel/security/tomoyo/Makefile               |   1 +
 kernel/security/tomoyo/audit.c                |   1 +
 kernel/security/tomoyo/common.c               |   1 +
 kernel/security/tomoyo/common.h               |   1 +
 kernel/security/tomoyo/condition.c            |   1 +
 kernel/security/tomoyo/domain.c               |   1 +
 kernel/security/tomoyo/environ.c              |   1 +
 kernel/security/tomoyo/file.c                 |   1 +
 kernel/security/tomoyo/gc.c                   |   1 +
 kernel/security/tomoyo/group.c                |   1 +
 kernel/security/tomoyo/load_policy.c          |   1 +
 kernel/security/tomoyo/memory.c               |   1 +
 kernel/security/tomoyo/mount.c                |   1 +
 kernel/security/tomoyo/network.c              |   1 +
 kernel/security/tomoyo/realpath.c             |   1 +
 kernel/security/tomoyo/securityfs_if.c        |   1 +
 kernel/security/tomoyo/tomoyo.c               |   1 +
 kernel/security/tomoyo/util.c                 |   1 +
 kernel/sound/Makefile                         |   1 +
 kernel/sound/aoa/codecs/Makefile              |   1 +
 kernel/sound/aoa/codecs/tas-basstreble.h      |   1 +
 kernel/sound/aoa/codecs/tas-gain-table.h      |   1 +
 kernel/sound/aoa/core/Makefile                |   1 +
 kernel/sound/aoa/soundbus/sysfs.c             |   1 +
 kernel/sound/arm/Makefile                     |   1 +
 kernel/sound/core/Makefile                    |   1 +
 kernel/sound/core/oss/Makefile                |   1 +
 kernel/sound/core/pcm_param_trace.h           |   1 +
 kernel/sound/core/pcm_trace.h                 |   1 +
 kernel/sound/core/seq/Makefile                |   1 +
 kernel/sound/core/seq/seq_clientmgr.c         |   2 +-
 kernel/sound/core/seq/seq_lock.h              |   1 +
 kernel/sound/core/timer_compat.c              |  17 ++-
 kernel/sound/drivers/Makefile                 |   1 +
 kernel/sound/drivers/opl3/Makefile            |   1 +
 kernel/sound/drivers/opl4/Makefile            |   1 +
 kernel/sound/drivers/pcsp/pcsp.h              |   1 +
 kernel/sound/drivers/pcsp/pcsp_input.h        |   1 +
 kernel/sound/drivers/pcsp/pcsp_lib.c          |   1 +
 kernel/sound/drivers/pcsp/pcsp_mixer.c        |   1 +
 kernel/sound/firewire/Makefile                |   1 +
 kernel/sound/firewire/amdtp-am824.h           |   1 +
 kernel/sound/firewire/amdtp-stream.h          |   1 +
 kernel/sound/firewire/bebob/Makefile          |   1 +
 kernel/sound/firewire/cmp.h                   |   1 +
 kernel/sound/firewire/dice/dice-interface.h   |   1 +
 kernel/sound/firewire/fcp.h                   |   1 +
 kernel/sound/firewire/iso-resources.h         |   1 +
 kernel/sound/firewire/lib.h                   |   1 +
 kernel/sound/firewire/motu/Makefile           |   1 +
 kernel/sound/firewire/packets-buffer.h        |   1 +
 kernel/sound/hda/Makefile                     |   1 +
 kernel/sound/hda/hdac_sysfs.c                 |   1 +
 kernel/sound/hda/local.h                      |   1 +
 kernel/sound/hda/trace.h                      |   1 +
 kernel/sound/i2c/Makefile                     |   1 +
 kernel/sound/i2c/other/Makefile               |   1 +
 kernel/sound/isa/Makefile                     |   1 +
 kernel/sound/isa/gus/Makefile                 |   1 +
 kernel/sound/isa/msnd/Makefile                |   1 +
 kernel/sound/isa/opti9xx/Makefile             |   1 +
 kernel/sound/isa/sb/Makefile                  |   1 +
 kernel/sound/oss/Makefile                     |   1 +
 kernel/sound/oss/ad1848.h                     |   1 +
 kernel/sound/oss/bin2hex.c                    |   1 +
 kernel/sound/oss/dmasound/dmasound.h          |   1 +
 kernel/sound/oss/hex2hex.c                    |   1 +
 kernel/sound/oss/midi_ctrl.h                  |   1 +
 kernel/sound/oss/midi_synth.h                 |   1 +
 kernel/sound/oss/mpu401.h                     |   1 +
 kernel/sound/oss/os.h                         |   1 +
 kernel/sound/oss/pas2.h                       |   1 +
 kernel/sound/oss/sb.h                         |   1 +
 kernel/sound/oss/sb_ess.c                     |   1 +
 kernel/sound/oss/sb_ess.h                     |   1 +
 kernel/sound/oss/sleep.h                      |   1 +
 kernel/sound/oss/sound_calls.h                |   1 +
 kernel/sound/oss/sound_firmware.h             |   1 +
 kernel/sound/oss/tuning.h                     |   1 +
 kernel/sound/oss/ulaw.h                       |   1 +
 kernel/sound/oss/v_midi.h                     |   1 +
 kernel/sound/oss/waveartist.h                 |   1 +
 kernel/sound/parisc/harmony.h                 |   1 +
 kernel/sound/pci/Makefile                     |   1 +
 kernel/sound/pci/ad1889.h                     |   1 +
 kernel/sound/pci/asihpi/hpi_version.h         |   1 +
 kernel/sound/pci/asihpi/hpifunc.c             |   1 +
 kernel/sound/pci/au88x0/Makefile              |   1 +
 kernel/sound/pci/au88x0/au8810.c              |   1 +
 kernel/sound/pci/au88x0/au8810.h              |   1 +
 kernel/sound/pci/au88x0/au8820.c              |   1 +
 kernel/sound/pci/au88x0/au8820.h              |   1 +
 kernel/sound/pci/au88x0/au8830.c              |   1 +
 kernel/sound/pci/au88x0/au8830.h              |   1 +
 kernel/sound/pci/au88x0/au88x0_eq.h           |   1 +
 kernel/sound/pci/au88x0/au88x0_eqdata.c       |   1 +
 kernel/sound/pci/au88x0/au88x0_mixer.c        |   1 +
 kernel/sound/pci/au88x0/au88x0_wt.h           |   1 +
 kernel/sound/pci/azt3328.h                    |   1 +
 kernel/sound/pci/cs5535audio/cs5535audio.h    |   1 +
 kernel/sound/pci/ctxfi/cttimer.h              |   1 +
 kernel/sound/pci/echoaudio/Makefile           |   1 +
 kernel/sound/pci/emu10k1/Makefile             |   1 +
 kernel/sound/pci/hda/Makefile                 |   1 +
 kernel/sound/pci/hda/dell_wmi_helper.c        |   1 +
 kernel/sound/pci/hda/hda_controller_trace.h   |   1 +
 kernel/sound/pci/hda/hda_intel_trace.h        |   1 +
 kernel/sound/pci/hda/local.h                  |   1 +
 kernel/sound/pci/hda/thinkpad_helper.c        |   1 +
 kernel/sound/pci/ice1712/Makefile             |   1 +
 kernel/sound/pci/ice1712/juli.h               |   1 +
 kernel/sound/pci/ice1712/maya44.h             |   1 +
 kernel/sound/pci/ice1712/prodigy192.h         |   1 +
 kernel/sound/pci/ice1712/psc724.h             |   1 +
 kernel/sound/pci/ice1712/quartet.h            |   1 +
 kernel/sound/pci/ice1712/se.h                 |   1 +
 kernel/sound/pci/ice1712/stac946x.h           |   1 +
 kernel/sound/pci/ice1712/wtm.h                |   1 +
 kernel/sound/pci/nm256/nm256_coef.c           |   1 +
 kernel/sound/pci/oxygen/Makefile              |   1 +
 kernel/sound/pci/oxygen/ak4396.h              |   1 +
 kernel/sound/pci/oxygen/cm9780.h              |   1 +
 kernel/sound/pci/oxygen/cs2000.h              |   1 +
 kernel/sound/pci/oxygen/cs4245.h              |   1 +
 kernel/sound/pci/oxygen/cs4362a.h             |   1 +
 kernel/sound/pci/oxygen/cs4398.h              |   1 +
 kernel/sound/pci/oxygen/oxygen.h              |   1 +
 kernel/sound/pci/oxygen/oxygen_regs.h         |   1 +
 kernel/sound/pci/oxygen/pcm1796.h             |   1 +
 kernel/sound/pci/oxygen/wm8766.h              |   1 +
 kernel/sound/pci/oxygen/wm8785.h              |   1 +
 kernel/sound/pci/oxygen/xonar.h               |   1 +
 kernel/sound/pci/oxygen/xonar_dg.h            |   1 +
 kernel/sound/pci/rme9652/Makefile             |   1 +
 kernel/sound/ppc/tumbler_volume.h             |   1 +
 kernel/sound/soc/Makefile                     |   1 +
 kernel/sound/soc/amd/acp.h                    |   1 +
 kernel/sound/soc/atmel/Makefile               |   1 +
 kernel/sound/soc/atmel/atmel-classd.h         |   1 +
 kernel/sound/soc/atmel/atmel-pdmic.h          |   1 +
 kernel/sound/soc/au1x/Makefile                |   1 +
 kernel/sound/soc/blackfin/Makefile            |   1 +
 kernel/sound/soc/cirrus/Makefile              |   1 +
 kernel/sound/soc/codecs/Makefile              |   1 +
 kernel/sound/soc/codecs/adau-utils.h          |   1 +
 kernel/sound/soc/codecs/adau1373.h            |   1 +
 kernel/sound/soc/codecs/adau17x1.c            |  24 +++-
 kernel/sound/soc/codecs/adau17x1.h            |   3 +
 kernel/sound/soc/codecs/cs4271.h              |   1 +
 kernel/sound/soc/codecs/es8328.h              |   1 +
 kernel/sound/soc/codecs/hdac_hdmi.h           |   1 +
 kernel/sound/soc/codecs/inno_rk3036.h         |   1 +
 kernel/sound/soc/codecs/rt5514-spi.c          |  17 ++-
 kernel/sound/soc/codecs/rt5514-spi.h          |   3 +
 kernel/sound/soc/codecs/rt5514.c              |  63 ---------
 kernel/sound/soc/codecs/rt5514.h              |   3 -
 kernel/sound/soc/codecs/rt5616.c              |   2 +-
 kernel/sound/soc/codecs/rt5631.h              |   1 +
 kernel/sound/soc/codecs/rt5659.c              |   4 +-
 kernel/sound/soc/codecs/rt5663.c              |   3 +-
 kernel/sound/soc/codecs/tlv320aic26.h         |   1 +
 kernel/sound/soc/codecs/uda134x.h             |   1 +
 kernel/sound/soc/codecs/wm8993.h              |   1 +
 kernel/sound/soc/codecs/wm9713.h              |   1 +
 kernel/sound/soc/davinci/Makefile             |   1 +
 kernel/sound/soc/fsl/Makefile                 |   1 +
 kernel/sound/soc/fsl/imx-audmux.h             |   1 +
 kernel/sound/soc/fsl/mpc5200_dma.h            |   1 +
 kernel/sound/soc/generic/Makefile             |   1 +
 kernel/sound/soc/img/Makefile                 |   1 +
 kernel/sound/soc/intel/Makefile               |   1 +
 kernel/sound/soc/intel/atom/Makefile          |   1 +
 kernel/sound/soc/intel/atom/sst/Makefile      |   1 +
 kernel/sound/soc/intel/boards/Makefile        |   1 +
 kernel/sound/soc/intel/common/Makefile        |   1 +
 kernel/sound/soc/intel/skylake/Makefile       |   1 +
 kernel/sound/soc/mediatek/mt8173/Makefile     |   1 +
 kernel/sound/soc/mxs/Makefile                 |   1 +
 kernel/sound/soc/nuc900/Makefile              |   1 +
 kernel/sound/soc/omap/Makefile                |   1 +
 kernel/sound/soc/pxa/Makefile                 |   1 +
 kernel/sound/soc/qcom/Makefile                |   1 +
 kernel/sound/soc/rockchip/Makefile            |   1 +
 kernel/sound/soc/samsung/Makefile             |   1 +
 kernel/sound/soc/sh/Makefile                  |   1 +
 kernel/sound/soc/sirf/Makefile                |   1 +
 kernel/sound/soc/soc-topology.c               |   5 +-
 kernel/sound/soc/spear/Makefile               |   1 +
 kernel/sound/soc/stm/Makefile                 |   1 +
 kernel/sound/soc/sunxi/Makefile               |   1 +
 kernel/sound/soc/tegra/Makefile               |   1 +
 kernel/sound/soc/txx9/Makefile                |   1 +
 kernel/sound/soc/ux500/Makefile               |   1 +
 kernel/sound/sparc/Makefile                   |   1 +
 kernel/sound/spi/Makefile                     |   1 +
 kernel/sound/synth/Makefile                   |   1 +
 kernel/sound/synth/emux/Makefile              |   1 +
 kernel/sound/usb/Makefile                     |   1 +
 kernel/sound/usb/caiaq/audio.h                |   1 +
 kernel/sound/usb/caiaq/control.h              |   1 +
 kernel/sound/usb/caiaq/device.h               |   1 +
 kernel/sound/usb/caiaq/input.h                |   1 +
 kernel/sound/usb/caiaq/midi.h                 |   1 +
 kernel/sound/usb/card.h                       |   1 +
 kernel/sound/usb/clock.h                      |   1 +
 kernel/sound/usb/debug.h                      |   1 +
 kernel/sound/usb/endpoint.h                   |   1 +
 kernel/sound/usb/format.h                     |   1 +
 kernel/sound/usb/helper.h                     |   1 +
 kernel/sound/usb/line6/Makefile               |   1 +
 kernel/sound/usb/midi.h                       |   1 +
 kernel/sound/usb/mixer.h                      |   1 +
 kernel/sound/usb/mixer_quirks.h               |   1 +
 kernel/sound/usb/mixer_scarlett.h             |   1 +
 kernel/sound/usb/mixer_us16x08.h              |   1 +
 kernel/sound/usb/pcm.h                        |   1 +
 kernel/sound/usb/power.h                      |   1 +
 kernel/sound/usb/proc.h                       |   1 +
 kernel/sound/usb/quirks.h                     |   1 +
 kernel/sound/usb/stream.h                     |   1 +
 kernel/sound/usb/usx2y/Makefile               |   1 +
 kernel/sound/usb/usx2y/us122l.h               |   1 +
 kernel/sound/usb/usx2y/usX2Yhwdep.h           |   1 +
 kernel/sound/usb/usx2y/usb_stream.h           |   1 +
 kernel/sound/usb/usx2y/usbusx2y.h             |   1 +
 kernel/sound/usb/usx2y/usx2yhwdeppcm.h        |   1 +
 kernel/tools/Makefile                         |   1 +
 kernel/tools/accounting/Makefile              |   1 +
 kernel/tools/accounting/getdelays.c           |   1 +
 kernel/tools/arch/alpha/include/asm/barrier.h |   1 +
 .../arch/alpha/include/uapi/asm/bitsperlong.h |   1 +
 .../tools/arch/alpha/include/uapi/asm/mman.h  |   1 +
 kernel/tools/arch/arc/include/uapi/asm/mman.h |   1 +
 kernel/tools/arch/arm/include/uapi/asm/kvm.h  |   1 +
 kernel/tools/arch/arm/include/uapi/asm/mman.h |   1 +
 .../arch/arm/include/uapi/asm/perf_regs.h     |   1 +
 kernel/tools/arch/arm64/include/asm/barrier.h |   1 +
 .../arch/arm64/include/uapi/asm/bitsperlong.h |   1 +
 .../tools/arch/arm64/include/uapi/asm/kvm.h   |   1 +
 .../tools/arch/arm64/include/uapi/asm/mman.h  |   1 +
 .../arch/arm64/include/uapi/asm/perf_regs.h   |   1 +
 .../arch/frv/include/uapi/asm/bitsperlong.h   |   1 +
 kernel/tools/arch/frv/include/uapi/asm/mman.h |   1 +
 .../arch/h8300/include/asm/bitsperlong.h      |   1 +
 .../tools/arch/h8300/include/uapi/asm/mman.h  |   1 +
 .../hexagon/include/uapi/asm/bitsperlong.h    |   1 +
 .../arch/hexagon/include/uapi/asm/mman.h      |   1 +
 kernel/tools/arch/ia64/include/asm/barrier.h  |   1 +
 .../arch/ia64/include/uapi/asm/bitsperlong.h  |   1 +
 .../tools/arch/ia64/include/uapi/asm/mman.h   |   1 +
 .../arch/m32r/include/uapi/asm/bitsperlong.h  |   1 +
 .../tools/arch/m32r/include/uapi/asm/mman.h   |   1 +
 .../microblaze/include/uapi/asm/bitsperlong.h |   1 +
 .../arch/microblaze/include/uapi/asm/mman.h   |   1 +
 kernel/tools/arch/mips/include/asm/barrier.h  |   1 +
 .../arch/mips/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/tools/arch/mips/include/uapi/asm/kvm.h |   1 +
 .../tools/arch/mips/include/uapi/asm/mman.h   |   1 +
 .../arch/mn10300/include/uapi/asm/mman.h      |   1 +
 .../parisc/include/uapi/asm/bitsperlong.h     |   1 +
 .../tools/arch/parisc/include/uapi/asm/mman.h |   1 +
 .../tools/arch/powerpc/include/asm/barrier.h  |   1 +
 .../powerpc/include/uapi/asm/bitsperlong.h    |   1 +
 .../tools/arch/powerpc/include/uapi/asm/kvm.h |   1 +
 .../arch/powerpc/include/uapi/asm/mman.h      |   1 +
 .../arch/powerpc/include/uapi/asm/perf_regs.h |   1 +
 kernel/tools/arch/s390/include/asm/barrier.h  |   1 +
 .../arch/s390/include/uapi/asm/bitsperlong.h  |   1 +
 kernel/tools/arch/s390/include/uapi/asm/kvm.h |   1 +
 .../arch/s390/include/uapi/asm/kvm_perf.h     |   1 +
 .../tools/arch/s390/include/uapi/asm/mman.h   |   1 +
 kernel/tools/arch/s390/include/uapi/asm/sie.h |   1 +
 .../arch/score/include/uapi/asm/bitsperlong.h |   1 +
 .../tools/arch/score/include/uapi/asm/mman.h  |   1 +
 kernel/tools/arch/sh/include/asm/barrier.h    |   1 +
 kernel/tools/arch/sh/include/uapi/asm/mman.h  |   1 +
 kernel/tools/arch/sparc/include/asm/barrier.h |   1 +
 .../tools/arch/sparc/include/asm/barrier_32.h |   1 +
 .../tools/arch/sparc/include/asm/barrier_64.h |   1 +
 .../arch/sparc/include/uapi/asm/bitsperlong.h |   1 +
 .../tools/arch/sparc/include/uapi/asm/mman.h  |   1 +
 kernel/tools/arch/tile/include/asm/barrier.h  |   1 +
 .../arch/tile/include/uapi/asm/bitsperlong.h  |   1 +
 .../tools/arch/tile/include/uapi/asm/mman.h   |   1 +
 kernel/tools/arch/x86/include/asm/atomic.h    |   1 +
 kernel/tools/arch/x86/include/asm/barrier.h   |   1 +
 kernel/tools/arch/x86/include/asm/cmpxchg.h   |   1 +
 .../tools/arch/x86/include/asm/cpufeatures.h  |   1 +
 kernel/tools/arch/x86/include/asm/rmwcc.h     |   1 +
 kernel/tools/arch/x86/include/asm/unistd_32.h |   1 +
 kernel/tools/arch/x86/include/asm/unistd_64.h |   1 +
 .../arch/x86/include/uapi/asm/bitsperlong.h   |   1 +
 kernel/tools/arch/x86/include/uapi/asm/kvm.h  |   1 +
 .../arch/x86/include/uapi/asm/kvm_perf.h      |   1 +
 kernel/tools/arch/x86/include/uapi/asm/mman.h |   1 +
 .../arch/x86/include/uapi/asm/perf_regs.h     |   1 +
 kernel/tools/arch/x86/include/uapi/asm/svm.h  |   1 +
 .../tools/arch/x86/include/uapi/asm/unistd.h  |   1 +
 kernel/tools/arch/x86/include/uapi/asm/vmx.h  |   1 +
 kernel/tools/arch/x86/lib/memcpy_64.S         |   4 +
 kernel/tools/arch/x86/lib/memset_64.S         |   1 +
 .../tools/arch/xtensa/include/uapi/asm/mman.h |   1 +
 kernel/tools/build/Makefile                   |   1 +
 kernel/tools/build/Makefile.build             |   1 +
 kernel/tools/build/feature/Makefile           |   1 +
 kernel/tools/build/feature/test-all.c         |   1 +
 kernel/tools/build/feature/test-backtrace.c   |   1 +
 kernel/tools/build/feature/test-bionic.c      |   1 +
 kernel/tools/build/feature/test-bpf.c         |   1 +
 kernel/tools/build/feature/test-clang.cpp     |   1 +
 kernel/tools/build/feature/test-compile.c     |   1 +
 .../tools/build/feature/test-cplus-demangle.c |   1 +
 kernel/tools/build/feature/test-cxx.cpp       |   1 +
 kernel/tools/build/feature/test-dwarf.c       |   1 +
 .../build/feature/test-dwarf_getlocations.c   |   1 +
 kernel/tools/build/feature/test-get_cpuid.c   |   1 +
 kernel/tools/build/feature/test-glibc.c       |   1 +
 .../tools/build/feature/test-gtk2-infobar.c   |   1 +
 kernel/tools/build/feature/test-gtk2.c        |   1 +
 kernel/tools/build/feature/test-jvmti.c       |   1 +
 kernel/tools/build/feature/test-libaudit.c    |   1 +
 .../tools/build/feature/test-libbabeltrace.c  |   1 +
 kernel/tools/build/feature/test-libbfd.c      |   1 +
 kernel/tools/build/feature/test-libcrypto.c   |   1 +
 .../build/feature/test-libdw-dwarf-unwind.c   |   1 +
 .../build/feature/test-libelf-gelf_getnote.c  |   1 +
 .../build/feature/test-libelf-getphdrnum.c    |   1 +
 .../build/feature/test-libelf-getshdrstrndx.c |   1 +
 kernel/tools/build/feature/test-libelf-mmap.c |   1 +
 kernel/tools/build/feature/test-libelf.c      |   1 +
 kernel/tools/build/feature/test-libnuma.c     |   1 +
 kernel/tools/build/feature/test-libperl.c     |   1 +
 .../build/feature/test-libpython-version.c    |   1 +
 kernel/tools/build/feature/test-libpython.c   |   1 +
 kernel/tools/build/feature/test-libslang.c    |   1 +
 .../build/feature/test-libunwind-aarch64.c    |   1 +
 .../tools/build/feature/test-libunwind-arm.c  |   1 +
 .../test-libunwind-debug-frame-aarch64.c      |   1 +
 .../feature/test-libunwind-debug-frame-arm.c  |   1 +
 .../feature/test-libunwind-debug-frame.c      |   1 +
 .../tools/build/feature/test-libunwind-x86.c  |   1 +
 .../build/feature/test-libunwind-x86_64.c     |   1 +
 kernel/tools/build/feature/test-libunwind.c   |   1 +
 .../tools/build/feature/test-llvm-version.cpp |   1 +
 kernel/tools/build/feature/test-llvm.cpp      |   1 +
 kernel/tools/build/feature/test-lzma.c        |   1 +
 .../feature/test-numa_num_possible_cpus.c     |   1 +
 .../test-pthread-attr-setaffinity-np.c        |   1 +
 .../tools/build/feature/test-sched_getcpu.c   |   1 +
 kernel/tools/build/feature/test-sdt.c         |   1 +
 .../build/feature/test-stackprotector-all.c   |   1 +
 .../feature/test-sync-compare-and-swap.c      |   1 +
 kernel/tools/build/feature/test-timerfd.c     |   1 +
 kernel/tools/build/feature/test-zlib.c        |   1 +
 kernel/tools/build/fixdep.c                   |   1 +
 kernel/tools/build/tests/ex/Makefile          |   1 +
 kernel/tools/build/tests/ex/a.c               |   1 +
 kernel/tools/build/tests/ex/arch/e.c          |   1 +
 kernel/tools/build/tests/ex/arch/f.c          |   1 +
 kernel/tools/build/tests/ex/b.c               |   1 +
 kernel/tools/build/tests/ex/c.c               |   1 +
 kernel/tools/build/tests/ex/d.c               |   1 +
 kernel/tools/build/tests/ex/ex.c              |   1 +
 kernel/tools/build/tests/ex/inc.c             |   1 +
 kernel/tools/build/tests/run.sh               |   1 +
 kernel/tools/cgroup/Makefile                  |   1 +
 kernel/tools/cgroup/cgroup_event_listener.c   |   1 +
 kernel/tools/firewire/Makefile                |   1 +
 kernel/tools/firewire/decode-fcp.c            |   1 +
 kernel/tools/firewire/list.h                  |   1 +
 kernel/tools/firewire/nosy-dump.h             |   1 +
 kernel/tools/gpio/Makefile                    |   1 +
 kernel/tools/hv/Makefile                      |   1 +
 kernel/tools/hv/hv_get_dhcp_info.sh           |   1 +
 kernel/tools/hv/hv_set_ifconfig.sh            |   1 +
 kernel/tools/hv/lsvmbus                       |   1 +
 kernel/tools/iio/Makefile                     |   1 +
 kernel/tools/include/asm-generic/atomic-gcc.h |   1 +
 kernel/tools/include/asm-generic/bitops.h     |   1 +
 .../tools/include/asm-generic/bitops/__ffs.h  |   1 +
 .../tools/include/asm-generic/bitops/__fls.h  |   1 +
 .../include/asm-generic/bitops/arch_hweight.h |   1 +
 .../tools/include/asm-generic/bitops/atomic.h |   1 +
 .../asm-generic/bitops/const_hweight.h        |   1 +
 .../tools/include/asm-generic/bitops/find.h   |   1 +
 kernel/tools/include/asm-generic/bitops/fls.h |   1 +
 .../tools/include/asm-generic/bitops/fls64.h  |   1 +
 .../include/asm-generic/bitops/hweight.h      |   1 +
 .../tools/include/asm-generic/bitsperlong.h   |   1 +
 kernel/tools/include/asm/alternative-asm.h    |   1 +
 kernel/tools/include/asm/atomic.h             |   1 +
 kernel/tools/include/asm/barrier.h            |   1 +
 kernel/tools/include/asm/bug.h                |   1 +
 kernel/tools/include/asm/export.h             |   7 +
 kernel/tools/include/linux/atomic.h           |   1 +
 kernel/tools/include/linux/bitmap.h           |   1 +
 kernel/tools/include/linux/bitops.h           |   1 +
 kernel/tools/include/linux/bug.h              |   1 +
 kernel/tools/include/linux/compiler-gcc.h     |   1 +
 kernel/tools/include/linux/compiler.h         |   1 +
 kernel/tools/include/linux/debug_locks.h      |   1 +
 kernel/tools/include/linux/err.h              |   1 +
 kernel/tools/include/linux/filter.h           |   1 +
 kernel/tools/include/linux/hardirq.h          |   1 +
 kernel/tools/include/linux/hashtable.h        |   1 +
 kernel/tools/include/linux/irqflags.h         |   1 +
 kernel/tools/include/linux/kallsyms.h         |   1 +
 kernel/tools/include/linux/kern_levels.h      |   1 +
 kernel/tools/include/linux/kernel.h           |   1 +
 kernel/tools/include/linux/kmemcheck.h        |   1 +
 kernel/tools/include/linux/list.h             |   1 +
 kernel/tools/include/linux/lockdep.h          |   1 +
 kernel/tools/include/linux/module.h           |   1 +
 kernel/tools/include/linux/poison.h           |   1 +
 kernel/tools/include/linux/rcu.h              |   1 +
 kernel/tools/include/linux/refcount.h         |   1 +
 kernel/tools/include/linux/spinlock.h         |   1 +
 kernel/tools/include/linux/stacktrace.h       |   1 +
 kernel/tools/include/linux/string.h           |   1 +
 kernel/tools/include/linux/stringify.h        |   1 +
 kernel/tools/include/linux/time64.h           |   1 +
 kernel/tools/include/linux/types.h            |   1 +
 .../include/linux/unaligned/packed_struct.h   |   1 +
 kernel/tools/include/tools/be_byteshift.h     |   1 +
 kernel/tools/include/tools/endian.h           |   1 +
 kernel/tools/include/tools/le_byteshift.h     |   1 +
 .../tools/include/uapi/asm-generic/ioctls.h   |   1 +
 .../include/uapi/asm-generic/mman-common.h    |   1 +
 kernel/tools/include/uapi/asm-generic/mman.h  |   3 +-
 kernel/tools/include/uapi/linux/bpf.h         |   7 +-
 kernel/tools/include/uapi/linux/bpf_common.h  |   1 +
 kernel/tools/include/uapi/linux/fcntl.h       |   1 +
 .../tools/include/uapi/linux/hw_breakpoint.h  |   1 +
 kernel/tools/include/uapi/linux/kvm.h         |   1 +
 kernel/tools/include/uapi/linux/mman.h        |   1 +
 kernel/tools/include/uapi/linux/perf_event.h  |   1 +
 kernel/tools/include/uapi/linux/sched.h       |   1 +
 kernel/tools/include/uapi/linux/stat.h        |   1 +
 kernel/tools/include/uapi/linux/vhost.h       |   1 +
 kernel/tools/include/uapi/sound/asound.h      |   1 +
 kernel/tools/kvm/kvm_stat/Makefile            |   1 +
 kernel/tools/laptop/dslm/Makefile             |   1 +
 kernel/tools/laptop/freefall/Makefile         |   1 +
 kernel/tools/leds/Makefile                    |   1 +
 kernel/tools/leds/led_hw_brightness_mon.c     |   1 +
 kernel/tools/leds/uledmon.c                   |   1 +
 kernel/tools/lib/api/Makefile                 |   1 +
 kernel/tools/lib/api/cpu.c                    |   1 +
 kernel/tools/lib/api/cpu.h                    |   1 +
 kernel/tools/lib/api/debug-internal.h         |   1 +
 kernel/tools/lib/api/debug.c                  |   1 +
 kernel/tools/lib/api/debug.h                  |   1 +
 kernel/tools/lib/api/fd/array.h               |   1 +
 kernel/tools/lib/api/fs/fs.c                  |   1 +
 kernel/tools/lib/api/fs/fs.h                  |   1 +
 kernel/tools/lib/api/fs/tracing_path.c        |   1 +
 kernel/tools/lib/api/fs/tracing_path.h        |   1 +
 kernel/tools/lib/bpf/Makefile                 |   1 +
 kernel/tools/lib/hweight.c                    |   1 +
 kernel/tools/lib/lockdep/Makefile             |   1 +
 kernel/tools/lib/lockdep/common.c             |   1 +
 .../lib/lockdep/include/liblockdep/common.h   |   1 +
 .../lib/lockdep/include/liblockdep/mutex.h    |   1 +
 .../lib/lockdep/include/liblockdep/rwlock.h   |   1 +
 kernel/tools/lib/lockdep/lockdep.c            |   1 +
 kernel/tools/lib/lockdep/preload.c            |   1 +
 kernel/tools/lib/lockdep/run_tests.sh         |   1 +
 kernel/tools/lib/lockdep/tests/AA.c           |   1 +
 kernel/tools/lib/lockdep/tests/ABA.c          |   1 +
 kernel/tools/lib/lockdep/tests/ABBA.c         |   1 +
 .../tools/lib/lockdep/tests/ABBA_2threads.c   |   1 +
 kernel/tools/lib/lockdep/tests/ABBCCA.c       |   1 +
 kernel/tools/lib/lockdep/tests/ABBCCDDA.c     |   1 +
 kernel/tools/lib/lockdep/tests/ABCABC.c       |   1 +
 kernel/tools/lib/lockdep/tests/ABCDBCDA.c     |   1 +
 kernel/tools/lib/lockdep/tests/ABCDBDDA.c     |   1 +
 kernel/tools/lib/lockdep/tests/WW.c           |   1 +
 kernel/tools/lib/lockdep/tests/common.h       |   1 +
 .../tools/lib/lockdep/tests/unlock_balance.c  |   1 +
 kernel/tools/lib/str_error_r.c                |   1 +
 kernel/tools/lib/string.c                     |   1 +
 kernel/tools/lib/subcmd/Makefile              |   1 +
 kernel/tools/lib/subcmd/exec-cmd.c            |   1 +
 kernel/tools/lib/subcmd/exec-cmd.h            |   1 +
 kernel/tools/lib/subcmd/help.c                |   1 +
 kernel/tools/lib/subcmd/help.h                |   1 +
 kernel/tools/lib/subcmd/pager.c               |   1 +
 kernel/tools/lib/subcmd/pager.h               |   1 +
 kernel/tools/lib/subcmd/parse-options.c       |   1 +
 kernel/tools/lib/subcmd/parse-options.h       |   1 +
 kernel/tools/lib/subcmd/run-command.c         |   1 +
 kernel/tools/lib/subcmd/run-command.h         |   1 +
 kernel/tools/lib/subcmd/sigchain.c            |   1 +
 kernel/tools/lib/subcmd/sigchain.h            |   1 +
 kernel/tools/lib/subcmd/subcmd-config.c       |   1 +
 kernel/tools/lib/subcmd/subcmd-config.h       |   1 +
 kernel/tools/lib/subcmd/subcmd-util.h         |   1 +
 kernel/tools/lib/symbol/kallsyms.c            |   1 +
 kernel/tools/lib/symbol/kallsyms.h            |   1 +
 kernel/tools/lib/traceevent/Makefile          |   1 +
 kernel/tools/lib/traceevent/plugin_cfg80211.c |   1 +
 kernel/tools/lib/traceevent/plugin_scsi.c     |   1 +
 kernel/tools/lib/traceevent/plugin_xen.c      |   1 +
 kernel/tools/lib/vsprintf.c                   |   1 +
 kernel/tools/net/Makefile                     |   1 +
 kernel/tools/nfsd/inject_fault.sh             |   1 +
 kernel/tools/objtool/Makefile                 |   1 +
 .../arch/x86/insn/gen-insn-attr-x86.awk       |   1 +
 kernel/tools/pci/pcitest.sh                   |   1 +
 kernel/tools/pcmcia/Makefile                  |   1 +
 kernel/tools/perf/Makefile                    |   1 +
 .../perf/arch/arm/annotate/instructions.c     |   1 +
 .../perf/arch/arm/include/dwarf-regs-table.h  |   1 +
 .../tools/perf/arch/arm/include/perf_regs.h   |   1 +
 .../tools/perf/arch/arm/tests/dwarf-unwind.c  |   1 +
 kernel/tools/perf/arch/arm/tests/regs_load.S  |   1 +
 .../tools/perf/arch/arm/util/unwind-libdw.c   |   1 +
 .../perf/arch/arm/util/unwind-libunwind.c     |   1 +
 kernel/tools/perf/arch/arm64/Makefile         |   1 +
 .../perf/arch/arm64/annotate/instructions.c   |   1 +
 .../arch/arm64/include/dwarf-regs-table.h     |   1 +
 .../tools/perf/arch/arm64/include/perf_regs.h |   1 +
 .../perf/arch/arm64/tests/dwarf-unwind.c      |   1 +
 .../tools/perf/arch/arm64/tests/regs_load.S   |   1 +
 .../perf/arch/arm64/util/unwind-libunwind.c   |   1 +
 kernel/tools/perf/arch/common.c               |   1 +
 kernel/tools/perf/arch/common.h               |   1 +
 kernel/tools/perf/arch/powerpc/Makefile       |   1 +
 .../perf/arch/powerpc/annotate/instructions.c |   1 +
 .../perf/arch/powerpc/include/arch-tests.h    |   1 +
 .../arch/powerpc/include/dwarf-regs-table.h   |   1 +
 .../perf/arch/powerpc/include/perf_regs.h     |   1 +
 .../perf/arch/powerpc/tests/arch-tests.c      |   1 +
 .../perf/arch/powerpc/tests/dwarf-unwind.c    |   1 +
 .../tools/perf/arch/powerpc/tests/regs_load.S |   1 +
 .../perf/arch/powerpc/util/book3s_hcalls.h    |   1 +
 .../perf/arch/powerpc/util/book3s_hv_exits.h  |   1 +
 kernel/tools/perf/arch/powerpc/util/header.c  |   1 +
 .../tools/perf/arch/powerpc/util/kvm-stat.c   |   1 +
 .../tools/perf/arch/powerpc/util/perf_regs.c  |   1 +
 .../perf/arch/powerpc/util/unwind-libdw.c     |   1 +
 .../perf/arch/s390/annotate/instructions.c    |   1 +
 .../perf/arch/s390/include/dwarf-regs-table.h |   1 +
 kernel/tools/perf/arch/s390/util/dwarf-regs.c |   1 +
 kernel/tools/perf/arch/s390/util/machine.c    |   1 +
 .../perf/arch/sh/include/dwarf-regs-table.h   |   1 +
 .../arch/sparc/include/dwarf-regs-table.h     |   1 +
 kernel/tools/perf/arch/x86/Makefile           |   1 +
 .../perf/arch/x86/annotate/instructions.c     |   1 +
 .../arch/x86/entry/syscalls/syscalltbl.sh     |   1 +
 .../tools/perf/arch/x86/include/arch-tests.h  |   1 +
 .../perf/arch/x86/include/dwarf-regs-table.h  |   1 +
 .../tools/perf/arch/x86/include/perf_regs.h   |   1 +
 kernel/tools/perf/arch/x86/tests/arch-tests.c |   1 +
 .../tools/perf/arch/x86/tests/dwarf-unwind.c  |   1 +
 .../perf/arch/x86/tests/insn-x86-dat-32.c     |   1 +
 .../perf/arch/x86/tests/insn-x86-dat-64.c     |   1 +
 .../perf/arch/x86/tests/insn-x86-dat-src.c    |   1 +
 kernel/tools/perf/arch/x86/tests/insn-x86.c   |   1 +
 kernel/tools/perf/arch/x86/tests/intel-cqm.c  |   1 +
 .../perf/arch/x86/tests/perf-time-to-tsc.c    |   1 +
 kernel/tools/perf/arch/x86/tests/rdpmc.c      |   1 +
 kernel/tools/perf/arch/x86/tests/regs_load.S  |   1 +
 kernel/tools/perf/arch/x86/util/group.c       |   1 +
 kernel/tools/perf/arch/x86/util/header.c      |   1 +
 kernel/tools/perf/arch/x86/util/kvm-stat.c    |   1 +
 kernel/tools/perf/arch/x86/util/perf_regs.c   |   1 +
 kernel/tools/perf/arch/x86/util/pmu.c         |   1 +
 kernel/tools/perf/arch/x86/util/tsc.c         |   1 +
 .../tools/perf/arch/x86/util/unwind-libdw.c   |   1 +
 .../perf/arch/x86/util/unwind-libunwind.c     |   1 +
 .../arch/xtensa/include/dwarf-regs-table.h    |   1 +
 kernel/tools/perf/bench/bench.h               |   1 +
 kernel/tools/perf/bench/futex-hash.c          |   1 +
 kernel/tools/perf/bench/futex-lock-pi.c       |   1 +
 kernel/tools/perf/bench/futex-requeue.c       |   1 +
 kernel/tools/perf/bench/futex-wake-parallel.c |   1 +
 kernel/tools/perf/bench/futex-wake.c          |   1 +
 kernel/tools/perf/bench/futex.h               |   1 +
 kernel/tools/perf/bench/mem-functions.c       |   1 +
 kernel/tools/perf/bench/mem-memcpy-arch.h     |   1 +
 .../perf/bench/mem-memcpy-x86-64-asm-def.h    |   1 +
 .../tools/perf/bench/mem-memcpy-x86-64-asm.S  |   1 +
 kernel/tools/perf/bench/mem-memset-arch.h     |   1 +
 .../perf/bench/mem-memset-x86-64-asm-def.h    |   1 +
 .../tools/perf/bench/mem-memset-x86-64-asm.S  |   1 +
 kernel/tools/perf/bench/numa.c                |   1 +
 kernel/tools/perf/bench/sched-messaging.c     |   1 +
 kernel/tools/perf/bench/sched-pipe.c          |   1 +
 kernel/tools/perf/builtin-annotate.c          |   1 +
 kernel/tools/perf/builtin-bench.c             |   1 +
 kernel/tools/perf/builtin-buildid-cache.c     |   1 +
 kernel/tools/perf/builtin-buildid-list.c      |   1 +
 kernel/tools/perf/builtin-c2c.c               |   1 +
 kernel/tools/perf/builtin-config.c            |   1 +
 kernel/tools/perf/builtin-data.c              |   1 +
 kernel/tools/perf/builtin-diff.c              |   1 +
 kernel/tools/perf/builtin-evlist.c            |   1 +
 kernel/tools/perf/builtin-help.c              |   1 +
 kernel/tools/perf/builtin-inject.c            |   1 +
 kernel/tools/perf/builtin-kmem.c              |   1 +
 kernel/tools/perf/builtin-kvm.c               |   1 +
 kernel/tools/perf/builtin-list.c              |   1 +
 kernel/tools/perf/builtin-lock.c              |   1 +
 kernel/tools/perf/builtin-mem.c               |   1 +
 kernel/tools/perf/builtin-record.c            |   1 +
 kernel/tools/perf/builtin-report.c            |   1 +
 kernel/tools/perf/builtin-sched.c             |   1 +
 kernel/tools/perf/builtin-script.c            |   1 +
 kernel/tools/perf/builtin-version.c           |   1 +
 kernel/tools/perf/builtin.h                   |   1 +
 kernel/tools/perf/check-headers.sh            |   1 +
 kernel/tools/perf/jvmti/jvmti_agent.h         |   1 +
 kernel/tools/perf/jvmti/libjvmti.c            |   1 +
 kernel/tools/perf/perf-archive.sh             |   1 +
 kernel/tools/perf/perf-completion.sh          |   1 +
 kernel/tools/perf/perf-read-vdso.c            |   1 +
 kernel/tools/perf/perf-sys.h                  |   1 +
 kernel/tools/perf/perf.c                      |   1 +
 kernel/tools/perf/perf.h                      |   1 +
 kernel/tools/perf/pmu-events/jevents.h        |   1 +
 kernel/tools/perf/pmu-events/jsmn.h           |   1 +
 kernel/tools/perf/pmu-events/json.h           |   1 +
 kernel/tools/perf/pmu-events/pmu-events.h     |   1 +
 kernel/tools/perf/python/tracepoint.py        |   1 +
 .../scripts/perl/Perf-Trace-Util/Makefile.PL  |   1 +
 .../lib/Perf/Trace/EventClass.py              |   1 +
 .../scripts/python/event_analyzing_sample.py  |   1 +
 .../perf/scripts/python/net_dropmonitor.py    |   1 +
 .../tools/perf/scripts/python/netdev-times.py |   1 +
 .../perf/scripts/python/stackcollapse.py      |   1 +
 kernel/tools/perf/scripts/python/stat-cpi.py  |   1 +
 kernel/tools/perf/tests/attr.c                |   1 +
 kernel/tools/perf/tests/attr.py               |   1 +
 .../tools/perf/tests/backward-ring-buffer.c   |   1 +
 kernel/tools/perf/tests/bitmap.c              |   1 +
 kernel/tools/perf/tests/bp_signal.c           |   1 +
 kernel/tools/perf/tests/bp_signal_overflow.c  |   1 +
 kernel/tools/perf/tests/builtin-test.c        |   1 +
 kernel/tools/perf/tests/clang.c               |   1 +
 kernel/tools/perf/tests/code-reading.c        |   1 +
 kernel/tools/perf/tests/cpumap.c              |   1 +
 kernel/tools/perf/tests/dso-data.c            |   1 +
 kernel/tools/perf/tests/dwarf-unwind.c        |   1 +
 kernel/tools/perf/tests/event-times.c         |   1 +
 kernel/tools/perf/tests/event_update.c        |   1 +
 .../tools/perf/tests/evsel-roundtrip-name.c   |   1 +
 kernel/tools/perf/tests/evsel-tp-sched.c      |   1 +
 kernel/tools/perf/tests/expr.c                |   1 +
 kernel/tools/perf/tests/fdarray.c             |   1 +
 kernel/tools/perf/tests/hists_common.c        |   1 +
 kernel/tools/perf/tests/hists_common.h        |   1 +
 kernel/tools/perf/tests/hists_cumulate.c      |   1 +
 kernel/tools/perf/tests/hists_filter.c        |   1 +
 kernel/tools/perf/tests/hists_link.c          |   1 +
 kernel/tools/perf/tests/hists_output.c        |   1 +
 kernel/tools/perf/tests/is_printable_array.c  |   1 +
 kernel/tools/perf/tests/keep-tracking.c       |   1 +
 kernel/tools/perf/tests/kmod-path.c           |   1 +
 kernel/tools/perf/tests/llvm.c                |   1 +
 kernel/tools/perf/tests/llvm.h                |   1 +
 kernel/tools/perf/tests/mmap-basic.c          |   1 +
 kernel/tools/perf/tests/mmap-thread-lookup.c  |   1 +
 .../perf/tests/openat-syscall-all-cpus.c      |   1 +
 .../perf/tests/openat-syscall-tp-fields.c     |   1 +
 kernel/tools/perf/tests/openat-syscall.c      |   1 +
 kernel/tools/perf/tests/parse-events.c        |   1 +
 .../tools/perf/tests/parse-no-sample-id-all.c |   1 +
 kernel/tools/perf/tests/perf-hooks.c          |   1 +
 kernel/tools/perf/tests/perf-record.c         |   1 +
 kernel/tools/perf/tests/perf-targz-src-pkg    |   1 +
 kernel/tools/perf/tests/pmu.c                 |   1 +
 kernel/tools/perf/tests/python-use.c          |   1 +
 kernel/tools/perf/tests/sample-parsing.c      |   1 +
 kernel/tools/perf/tests/sdt.c                 |   1 +
 kernel/tools/perf/tests/stat.c                |   1 +
 kernel/tools/perf/tests/sw-clock.c            |   1 +
 kernel/tools/perf/tests/switch-tracking.c     |   1 +
 kernel/tools/perf/tests/task-exit.c           |   1 +
 kernel/tools/perf/tests/tests.h               |   1 +
 kernel/tools/perf/tests/thread-map.c          |   1 +
 kernel/tools/perf/tests/thread-mg-share.c     |   1 +
 kernel/tools/perf/tests/topology.c            |   1 +
 .../tools/perf/tests/unit_number__scnprintf.c |   1 +
 kernel/tools/perf/tests/vmlinux-kallsyms.c    |   1 +
 kernel/tools/perf/trace/beauty/beauty.h       |   1 +
 kernel/tools/perf/trace/beauty/eventfd.c      |   1 +
 kernel/tools/perf/trace/beauty/flock.c        |   1 +
 kernel/tools/perf/trace/beauty/futex_op.c     |   1 +
 kernel/tools/perf/trace/beauty/mmap.c         |   1 +
 kernel/tools/perf/trace/beauty/mode_t.c       |   1 +
 kernel/tools/perf/trace/beauty/msg_flags.c    |   1 +
 kernel/tools/perf/trace/beauty/open_flags.c   |   1 +
 .../tools/perf/trace/beauty/perf_event_open.c |   1 +
 kernel/tools/perf/trace/beauty/pid.c          |   1 +
 kernel/tools/perf/trace/beauty/sched_policy.c |   1 +
 kernel/tools/perf/trace/beauty/seccomp.c      |   1 +
 kernel/tools/perf/trace/beauty/signum.c       |   1 +
 kernel/tools/perf/trace/beauty/socket_type.c  |   1 +
 .../tools/perf/trace/beauty/waitid_options.c  |   1 +
 kernel/tools/perf/ui/browser.c                |   1 +
 kernel/tools/perf/ui/browser.h                |   1 +
 kernel/tools/perf/ui/browsers/annotate.c      |   1 +
 kernel/tools/perf/ui/browsers/header.c        |   1 +
 kernel/tools/perf/ui/browsers/hists.c         |   1 +
 kernel/tools/perf/ui/browsers/hists.h         |   1 +
 kernel/tools/perf/ui/browsers/map.c           |   1 +
 kernel/tools/perf/ui/browsers/map.h           |   1 +
 kernel/tools/perf/ui/browsers/scripts.c       |   1 +
 kernel/tools/perf/ui/gtk/annotate.c           |   1 +
 kernel/tools/perf/ui/gtk/browser.c            |   1 +
 kernel/tools/perf/ui/gtk/gtk.h                |   1 +
 kernel/tools/perf/ui/gtk/helpline.c           |   1 +
 kernel/tools/perf/ui/gtk/hists.c              |   1 +
 kernel/tools/perf/ui/gtk/progress.c           |   1 +
 kernel/tools/perf/ui/gtk/setup.c              |   1 +
 kernel/tools/perf/ui/gtk/util.c               |   1 +
 kernel/tools/perf/ui/helpline.c               |   1 +
 kernel/tools/perf/ui/helpline.h               |   1 +
 kernel/tools/perf/ui/hist.c                   |   1 +
 kernel/tools/perf/ui/keysyms.h                |   1 +
 kernel/tools/perf/ui/libslang.h               |   1 +
 kernel/tools/perf/ui/progress.c               |   1 +
 kernel/tools/perf/ui/progress.h               |   1 +
 kernel/tools/perf/ui/setup.c                  |   1 +
 kernel/tools/perf/ui/stdio/hist.c             |   1 +
 kernel/tools/perf/ui/tui/helpline.c           |   1 +
 kernel/tools/perf/ui/tui/progress.c           |   1 +
 kernel/tools/perf/ui/tui/setup.c              |   1 +
 kernel/tools/perf/ui/tui/tui.h                |   1 +
 kernel/tools/perf/ui/tui/util.c               |   1 +
 kernel/tools/perf/ui/ui.h                     |   1 +
 kernel/tools/perf/ui/util.c                   |   1 +
 kernel/tools/perf/ui/util.h                   |   1 +
 kernel/tools/perf/util/PERF-VERSION-GEN       |   1 +
 kernel/tools/perf/util/annotate.c             |  12 +-
 kernel/tools/perf/util/annotate.h             |   1 +
 kernel/tools/perf/util/block-range.c          |   1 +
 kernel/tools/perf/util/block-range.h          |   1 +
 kernel/tools/perf/util/bpf-loader.c           |   1 +
 kernel/tools/perf/util/bpf-loader.h           |   1 +
 kernel/tools/perf/util/bpf-prologue.c         |   1 +
 kernel/tools/perf/util/bpf-prologue.h         |   1 +
 kernel/tools/perf/util/build-id.c             |   1 +
 kernel/tools/perf/util/build-id.h             |   1 +
 kernel/tools/perf/util/c++/clang-c.h          |   1 +
 kernel/tools/perf/util/c++/clang-test.cpp     |   1 +
 kernel/tools/perf/util/c++/clang.cpp          |   1 +
 kernel/tools/perf/util/c++/clang.h            |   1 +
 kernel/tools/perf/util/cache.h                |   1 +
 kernel/tools/perf/util/callchain.c            |   1 +
 kernel/tools/perf/util/callchain.h            |   1 +
 kernel/tools/perf/util/cgroup.c               |   1 +
 kernel/tools/perf/util/cgroup.h               |   1 +
 kernel/tools/perf/util/cloexec.c              |   1 +
 kernel/tools/perf/util/cloexec.h              |   1 +
 kernel/tools/perf/util/color.c                |   1 +
 kernel/tools/perf/util/color.h                |   1 +
 kernel/tools/perf/util/comm.c                 |   1 +
 kernel/tools/perf/util/comm.h                 |   1 +
 kernel/tools/perf/util/compress.h             |   1 +
 kernel/tools/perf/util/config.c               |   1 +
 kernel/tools/perf/util/config.h               |   1 +
 kernel/tools/perf/util/counts.c               |   1 +
 kernel/tools/perf/util/counts.h               |   1 +
 kernel/tools/perf/util/cpumap.c               |   1 +
 kernel/tools/perf/util/cpumap.h               |   1 +
 kernel/tools/perf/util/ctype.c                |   1 +
 kernel/tools/perf/util/data-convert-bt.h      |   1 +
 kernel/tools/perf/util/data-convert.h         |   1 +
 kernel/tools/perf/util/data.c                 |   1 +
 kernel/tools/perf/util/data.h                 |   1 +
 kernel/tools/perf/util/debug.c                |   1 +
 kernel/tools/perf/util/debug.h                |   1 +
 kernel/tools/perf/util/demangle-java.c        |   1 +
 kernel/tools/perf/util/demangle-java.h        |   1 +
 kernel/tools/perf/util/demangle-rust.c        |   1 +
 kernel/tools/perf/util/demangle-rust.h        |   1 +
 kernel/tools/perf/util/dso.c                  |   1 +
 kernel/tools/perf/util/dso.h                  |   1 +
 kernel/tools/perf/util/dump-insn.c            |   1 +
 kernel/tools/perf/util/dump-insn.h            |   1 +
 kernel/tools/perf/util/dwarf-regs.c           |   1 +
 kernel/tools/perf/util/env.c                  |   1 +
 kernel/tools/perf/util/env.h                  |   1 +
 kernel/tools/perf/util/event.c                |   1 +
 kernel/tools/perf/util/event.h                |   1 +
 kernel/tools/perf/util/evlist.h               |   1 +
 kernel/tools/perf/util/evsel.h                |   1 +
 kernel/tools/perf/util/evsel_fprintf.c        |   1 +
 kernel/tools/perf/util/expr.h                 |   1 +
 kernel/tools/perf/util/find-vdso-map.c        |   1 +
 kernel/tools/perf/util/genelf.h               |   1 +
 kernel/tools/perf/util/generate-cmdlist.sh    |   1 +
 kernel/tools/perf/util/group.h                |   1 +
 kernel/tools/perf/util/header.c               |   1 +
 kernel/tools/perf/util/header.h               |   1 +
 kernel/tools/perf/util/help-unknown-cmd.c     |   1 +
 kernel/tools/perf/util/hist.c                 |   1 +
 kernel/tools/perf/util/hist.h                 |   1 +
 .../tools/perf/util/include/asm/asm-offsets.h |   1 +
 .../tools/perf/util/include/asm/cpufeature.h  |   1 +
 kernel/tools/perf/util/include/asm/dwarf2.h   |   1 +
 kernel/tools/perf/util/include/asm/uaccess.h  |   1 +
 kernel/tools/perf/util/include/dwarf-regs.h   |   1 +
 .../tools/perf/util/include/linux/linkage.h   |   1 +
 .../intel-pt-decoder/gen-insn-attr-x86.awk    |   1 +
 kernel/tools/perf/util/intlist.h              |   1 +
 kernel/tools/perf/util/jit.h                  |   1 +
 kernel/tools/perf/util/jitdump.c              |   1 +
 kernel/tools/perf/util/kvm-stat.h             |   1 +
 kernel/tools/perf/util/levenshtein.c          |   1 +
 kernel/tools/perf/util/levenshtein.h          |   1 +
 kernel/tools/perf/util/libunwind/arm64.c      |   1 +
 kernel/tools/perf/util/libunwind/x86_32.c     |   1 +
 kernel/tools/perf/util/llvm-utils.c           |   1 +
 kernel/tools/perf/util/llvm-utils.h           |   1 +
 kernel/tools/perf/util/lzma.c                 |   1 +
 kernel/tools/perf/util/machine.c              |   1 +
 kernel/tools/perf/util/machine.h              |   1 +
 kernel/tools/perf/util/map.c                  |   1 +
 kernel/tools/perf/util/map.h                  |   1 +
 kernel/tools/perf/util/mem-events.c           |   1 +
 kernel/tools/perf/util/mem-events.h           |   1 +
 kernel/tools/perf/util/memswap.c              |   1 +
 kernel/tools/perf/util/memswap.h              |   1 +
 kernel/tools/perf/util/ordered-events.c       |   1 +
 kernel/tools/perf/util/ordered-events.h       |   1 +
 kernel/tools/perf/util/parse-branch-options.c |   1 +
 kernel/tools/perf/util/parse-branch-options.h |   1 +
 kernel/tools/perf/util/parse-events.c         |   1 +
 kernel/tools/perf/util/parse-events.h         |   1 +
 kernel/tools/perf/util/parse-events.l         |   8 +-
 kernel/tools/perf/util/parse-regs-options.c   |   1 +
 kernel/tools/perf/util/parse-regs-options.h   |   1 +
 kernel/tools/perf/util/path.c                 |   1 +
 kernel/tools/perf/util/path.h                 |   1 +
 kernel/tools/perf/util/perf-hooks.c           |   1 +
 kernel/tools/perf/util/perf-hooks.h           |   1 +
 kernel/tools/perf/util/perf_regs.c            |   1 +
 kernel/tools/perf/util/perf_regs.h            |   1 +
 kernel/tools/perf/util/pmu.c                  |   1 +
 kernel/tools/perf/util/pmu.h                  |   1 +
 kernel/tools/perf/util/print_binary.c         |   1 +
 kernel/tools/perf/util/print_binary.h         |   1 +
 kernel/tools/perf/util/probe-event.h          |   1 +
 kernel/tools/perf/util/probe-file.h           |   1 +
 kernel/tools/perf/util/probe-finder.h         |   1 +
 kernel/tools/perf/util/pstack.c               |   1 +
 kernel/tools/perf/util/pstack.h               |   1 +
 kernel/tools/perf/util/python.c               |   1 +
 kernel/tools/perf/util/quote.c                |   1 +
 kernel/tools/perf/util/quote.h                |   1 +
 kernel/tools/perf/util/rb_resort.h            |   1 +
 kernel/tools/perf/util/rblist.h               |   1 +
 kernel/tools/perf/util/record.c               |   1 +
 kernel/tools/perf/util/sane_ctype.h           |   1 +
 kernel/tools/perf/util/session.c              |   1 +
 kernel/tools/perf/util/session.h              |   1 +
 kernel/tools/perf/util/sort.c                 |   1 +
 kernel/tools/perf/util/sort.h                 |   1 +
 kernel/tools/perf/util/srcline.c              |   1 +
 kernel/tools/perf/util/srcline.h              |   1 +
 kernel/tools/perf/util/stat-shadow.c          |   1 +
 kernel/tools/perf/util/stat.c                 |   1 +
 kernel/tools/perf/util/stat.h                 |   1 +
 kernel/tools/perf/util/strbuf.c               |   1 +
 kernel/tools/perf/util/strbuf.h               |   1 +
 kernel/tools/perf/util/strfilter.c            |   1 +
 kernel/tools/perf/util/strfilter.h            |   1 +
 kernel/tools/perf/util/string.c               |   1 +
 kernel/tools/perf/util/string2.h              |   1 +
 kernel/tools/perf/util/strlist.h              |   1 +
 kernel/tools/perf/util/svghelper.h            |   1 +
 kernel/tools/perf/util/symbol-elf.c           |   1 +
 kernel/tools/perf/util/symbol-minimal.c       |   1 +
 kernel/tools/perf/util/symbol.c               |   1 +
 kernel/tools/perf/util/symbol.h               |   1 +
 kernel/tools/perf/util/symbol_fprintf.c       |   1 +
 kernel/tools/perf/util/syscalltbl.h           |   1 +
 kernel/tools/perf/util/target.h               |   1 +
 kernel/tools/perf/util/term.c                 |   1 +
 kernel/tools/perf/util/term.h                 |   1 +
 kernel/tools/perf/util/thread.c               |   1 +
 kernel/tools/perf/util/thread.h               |   1 +
 kernel/tools/perf/util/thread_map.c           |   1 +
 kernel/tools/perf/util/thread_map.h           |   1 +
 kernel/tools/perf/util/time-utils.c           |   1 +
 kernel/tools/perf/util/time-utils.h           |   1 +
 kernel/tools/perf/util/tool.h                 |   1 +
 kernel/tools/perf/util/top.h                  |   1 +
 kernel/tools/perf/util/trace-event.c          |   1 +
 kernel/tools/perf/util/trace-event.h          |   1 +
 kernel/tools/perf/util/trigger.h              |   1 +
 kernel/tools/perf/util/tsc.c                  |   1 +
 kernel/tools/perf/util/tsc.h                  |   1 +
 kernel/tools/perf/util/units.c                |   1 +
 kernel/tools/perf/util/units.h                |   1 +
 kernel/tools/perf/util/unwind-libdw.c         |   1 +
 kernel/tools/perf/util/unwind-libdw.h         |   1 +
 .../tools/perf/util/unwind-libunwind-local.c  |   1 +
 kernel/tools/perf/util/unwind-libunwind.c     |   1 +
 kernel/tools/perf/util/unwind.h               |   1 +
 kernel/tools/perf/util/usage.c                |   1 +
 kernel/tools/perf/util/util-cxx.h             |   1 +
 kernel/tools/perf/util/util.c                 |   1 +
 kernel/tools/perf/util/util.h                 |   1 +
 kernel/tools/perf/util/values.c               |   1 +
 kernel/tools/perf/util/values.h               |   1 +
 kernel/tools/perf/util/vdso.c                 |   1 +
 kernel/tools/perf/util/vdso.h                 |   1 +
 kernel/tools/perf/util/xyarray.c              |   1 +
 kernel/tools/perf/util/xyarray.h              |   1 +
 kernel/tools/perf/util/zlib.c                 |   1 +
 kernel/tools/power/cpupower/bench/Makefile    |   1 +
 .../tools/power/cpupower/debug/i386/Makefile  |   1 +
 .../power/cpupower/debug/kernel/Makefile      |   1 +
 .../power/cpupower/debug/x86_64/Makefile      |   1 +
 kernel/tools/power/cpupower/lib/cpuidle.h     |   1 +
 kernel/tools/power/cpupower/lib/cpupower.h    |   1 +
 .../power/cpupower/lib/cpupower_intern.h      |   1 +
 kernel/tools/power/cpupower/utils/builtin.h   |   1 +
 .../tools/power/cpupower/utils/cpuidle-set.c  |   1 +
 .../tools/power/cpupower/utils/helpers/amd.c  |   1 +
 .../power/cpupower/utils/helpers/bitmask.c    |   1 +
 .../power/cpupower/utils/helpers/bitmask.h    |   1 +
 .../power/cpupower/utils/helpers/cpuid.c      |   1 +
 .../tools/power/cpupower/utils/helpers/misc.c |   1 +
 .../tools/power/cpupower/utils/helpers/msr.c  |   1 +
 .../tools/power/cpupower/utils/helpers/pci.c  |   1 +
 .../power/cpupower/utils/helpers/sysfs.h      |   1 +
 .../tools/power/cpupower/utils/version-gen.sh |   1 +
 kernel/tools/power/pm-graph/Makefile          |   1 +
 kernel/tools/power/x86/turbostat/Makefile     |   1 +
 .../power/x86/x86_energy_perf_policy/Makefile |   1 +
 kernel/tools/scripts/Makefile.arch            |   1 +
 kernel/tools/scripts/Makefile.include         |   1 +
 kernel/tools/spi/spidev_fdx.c                 |   1 +
 .../tools/testing/fault-injection/failcmd.sh  |   1 +
 .../testing/ktest/compare-ktest-sample.pl     |   1 +
 kernel/tools/testing/nvdimm/Kbuild            |   1 +
 kernel/tools/testing/nvdimm/Makefile          |   1 +
 kernel/tools/testing/nvdimm/config_check.c    |   1 +
 kernel/tools/testing/nvdimm/test/Kbuild       |   1 +
 kernel/tools/testing/radix-tree/Makefile      |   1 +
 kernel/tools/testing/radix-tree/linux.c       |   1 +
 kernel/tools/testing/radix-tree/linux/gfp.h   |   1 +
 .../tools/testing/radix-tree/linux/kernel.h   |   1 +
 .../tools/testing/radix-tree/linux/percpu.h   |   1 +
 .../tools/testing/radix-tree/linux/preempt.h  |   1 +
 .../testing/radix-tree/linux/radix-tree.h     |   1 +
 .../tools/testing/radix-tree/linux/rcupdate.h |   1 +
 kernel/tools/testing/radix-tree/linux/slab.h  |   1 +
 kernel/tools/testing/radix-tree/main.c        |   1 +
 kernel/tools/testing/radix-tree/regression.h  |   1 +
 kernel/tools/testing/radix-tree/regression1.c |   1 +
 kernel/tools/testing/radix-tree/regression2.c |   1 +
 kernel/tools/testing/radix-tree/regression3.c |   1 +
 kernel/tools/testing/radix-tree/tag_check.c   |   1 +
 kernel/tools/testing/radix-tree/test.c        |   1 +
 kernel/tools/testing/radix-tree/test.h        |   1 +
 kernel/tools/testing/selftests/Makefile       |   1 +
 kernel/tools/testing/selftests/bpf/Makefile   |   1 +
 .../tools/testing/selftests/bpf/bpf_endian.h  |   1 +
 .../tools/testing/selftests/bpf/bpf_helpers.h |   1 +
 kernel/tools/testing/selftests/bpf/bpf_util.h |   1 +
 .../selftests/bpf/include/uapi/linux/types.h  |   1 +
 .../tools/testing/selftests/bpf/test_kmod.sh  |   1 +
 .../testing/selftests/bpf/test_lpm_map.c      |   1 +
 kernel/tools/testing/selftests/bpf/test_tag.c |   1 +
 .../testing/selftests/breakpoints/Makefile    |   1 +
 .../testing/selftests/capabilities/Makefile   |   1 +
 .../selftests/capabilities/test_execve.c      |   1 +
 .../selftests/capabilities/validate_cap.c     |   1 +
 .../testing/selftests/cpu-hotplug/Makefile    |   1 +
 .../selftests/cpu-hotplug/cpu-on-off-test.sh  |   1 +
 .../tools/testing/selftests/cpufreq/Makefile  |   1 +
 kernel/tools/testing/selftests/cpufreq/cpu.sh |   1 +
 .../testing/selftests/cpufreq/cpufreq.sh      |   1 +
 .../testing/selftests/cpufreq/governor.sh     |   1 +
 .../tools/testing/selftests/cpufreq/main.sh   |   1 +
 .../tools/testing/selftests/cpufreq/module.sh |   1 +
 .../selftests/cpufreq/special-tests.sh        |   1 +
 .../testing/selftests/drivers/gpu/drm_mm.sh   |   1 +
 .../testing/selftests/drivers/gpu/i915.sh     |   1 +
 .../testing/selftests/efivarfs/create-read.c  |   1 +
 .../testing/selftests/efivarfs/efivarfs.sh    |   1 +
 .../testing/selftests/efivarfs/open-unlink.c  |   1 +
 kernel/tools/testing/selftests/exec/Makefile  |   1 +
 .../testing/selftests/filesystems/Makefile    |   1 +
 .../selftests/filesystems/dnotify_test.c      |   1 +
 .../testing/selftests/firmware/fw_fallback.sh |   1 +
 .../selftests/firmware/fw_filesystem.sh       |   1 +
 .../tools/testing/selftests/ftrace/Makefile   |   1 +
 .../selftests/ftrace/test.d/00basic/basic2.tc |   1 +
 .../selftests/ftrace/test.d/00basic/basic3.tc |   1 +
 .../ftrace/test.d/event/event-enable.tc       |   1 +
 .../ftrace/test.d/event/event-pid.tc          |   1 +
 .../ftrace/test.d/event/subsystem-enable.tc   |   1 +
 .../ftrace/test.d/event/toplevel-enable.tc    |   1 +
 .../test.d/ftrace/fgraph-filter-stack.tc      |   1 +
 .../ftrace/test.d/ftrace/fgraph-filter.tc     |   1 +
 .../ftrace/test.d/ftrace/func-filter-glob.tc  |   1 +
 .../ftrace/test.d/ftrace/func-filter-pid.tc   |   1 +
 .../test.d/ftrace/func_event_triggers.tc      |   1 +
 .../ftrace/test.d/ftrace/func_profiler.tc     |   1 +
 .../test.d/ftrace/func_set_ftrace_file.tc     |   1 +
 .../test.d/ftrace/func_traceonoff_triggers.tc |   1 +
 .../ftrace/test.d/instances/instance-event.tc |   1 +
 .../ftrace/test.d/instances/instance.tc       |   1 +
 .../ftrace/test.d/kprobe/add_and_remove.tc    |   1 +
 .../ftrace/test.d/kprobe/busy_check.tc        |   1 +
 .../ftrace/test.d/kprobe/kprobe_args.tc       |   1 +
 .../ftrace/test.d/kprobe/kprobe_args_type.tc  |   1 +
 .../ftrace/test.d/kprobe/kprobe_eventname.tc  |   1 +
 .../ftrace/test.d/kprobe/kprobe_ftrace.tc     |   1 +
 .../ftrace/test.d/kprobe/kprobe_module.tc     |   1 +
 .../ftrace/test.d/kprobe/kretprobe_args.tc    |   1 +
 .../test.d/kprobe/kretprobe_maxactive.tc      |   1 +
 .../ftrace/test.d/kprobe/multiple_kprobes.tc  |   1 +
 .../test.d/trigger/trigger-eventonoff.tc      |   1 +
 .../ftrace/test.d/trigger/trigger-filter.tc   |   1 +
 .../ftrace/test.d/trigger/trigger-hist-mod.tc |   1 +
 .../ftrace/test.d/trigger/trigger-hist.tc     |   1 +
 .../test.d/trigger/trigger-multihist.tc       |   1 +
 .../ftrace/test.d/trigger/trigger-snapshot.tc |   1 +
 .../test.d/trigger/trigger-stacktrace.tc      |   1 +
 .../test.d/trigger/trigger-traceonoff.tc      |   1 +
 kernel/tools/testing/selftests/futex/Makefile |   1 +
 .../selftests/futex/functional/Makefile       |   1 +
 kernel/tools/testing/selftests/gpio/Makefile  |   1 +
 .../selftests/gpio/gpio-mockup-sysfs.sh       |   1 +
 .../testing/selftests/gpio/gpio-mockup.sh     |   1 +
 kernel/tools/testing/selftests/ia64/Makefile  |   1 +
 .../testing/selftests/intel_pstate/Makefile   |   1 +
 .../testing/selftests/intel_pstate/aperf.c    |   1 +
 .../testing/selftests/intel_pstate/msr.c      |   1 +
 .../testing/selftests/intel_pstate/run.sh     |   1 +
 kernel/tools/testing/selftests/ipc/Makefile   |   1 +
 kernel/tools/testing/selftests/ipc/msgque.c   |   1 +
 .../tools/testing/selftests/kcmp/kcmp_test.c  |   1 +
 kernel/tools/testing/selftests/lib.mk         |   6 +-
 kernel/tools/testing/selftests/lib/bitmap.sh  |   1 +
 .../testing/selftests/lib/prime_numbers.sh    |   1 +
 kernel/tools/testing/selftests/lib/printf.sh  |   1 +
 .../testing/selftests/locking/ww_mutex.sh     |   1 +
 .../testing/selftests/media_tests/Makefile    |   1 +
 .../media_tests/bind_unbind_sample.sh         |   1 +
 .../selftests/media_tests/open_loop_test.sh   |   1 +
 .../selftests/membarrier/membarrier_test.c    |   1 +
 kernel/tools/testing/selftests/memfd/Makefile |   1 +
 .../tools/testing/selftests/memfd/fuse_mnt.c  |   1 +
 .../tools/testing/selftests/memfd/fuse_test.c |   1 +
 .../testing/selftests/memfd/memfd_test.c      |   1 +
 .../testing/selftests/memfd/run_fuse_test.sh  |   1 +
 .../testing/selftests/memory-hotplug/Makefile |   1 +
 .../memory-hotplug/mem-on-off-test.sh         |   1 +
 kernel/tools/testing/selftests/mount/Makefile |   1 +
 .../mount/unprivileged-remount-test.c         |   1 +
 .../tools/testing/selftests/mqueue/Makefile   |   1 +
 kernel/tools/testing/selftests/net/Makefile   |   1 +
 .../tools/testing/selftests/net/netdevice.sh  |   1 +
 .../testing/selftests/net/reuseport_bpf_cpu.c |   1 +
 .../selftests/net/reuseport_bpf_numa.c        |   1 +
 .../selftests/net/reuseport_dualstack.c       |   1 +
 .../testing/selftests/net/run_afpackettests   |   1 +
 .../testing/selftests/net/run_netsocktests    |   1 +
 kernel/tools/testing/selftests/net/socket.c   |   1 +
 .../tools/testing/selftests/net/test_bpf.sh   |   1 +
 .../networking/timestamping/Makefile          |   1 +
 .../networking/timestamping/hwtstamp_config.c |   1 +
 kernel/tools/testing/selftests/nsfs/owner.c   |   1 +
 kernel/tools/testing/selftests/nsfs/pidns.c   |   1 +
 .../tools/testing/selftests/powerpc/Makefile  |   1 +
 .../selftests/powerpc/benchmarks/Makefile     |   1 +
 .../selftests/powerpc/cache_shape/Makefile    |   1 +
 .../selftests/powerpc/copyloops/Makefile      |   1 +
 .../selftests/powerpc/copyloops/asm/export.h  |   1 +
 .../selftests/powerpc/copyloops/asm/ppc_asm.h |   1 +
 .../selftests/powerpc/copyloops/validate.c    |   1 +
 .../testing/selftests/powerpc/dscr/Makefile   |   1 +
 .../selftests/powerpc/include/basic_asm.h     |   1 +
 .../selftests/powerpc/include/instructions.h  |   1 +
 .../testing/selftests/powerpc/math/Makefile   |   1 +
 .../testing/selftests/powerpc/mm/Makefile     |   1 +
 .../powerpc/mm/hugetlb_vs_thp_test.c          |   1 +
 .../testing/selftests/powerpc/pmu/Makefile    |   1 +
 .../selftests/powerpc/pmu/ebb/Makefile        |   1 +
 .../testing/selftests/powerpc/ptrace/Makefile |   1 +
 .../testing/selftests/powerpc/signal/Makefile |   1 +
 .../selftests/powerpc/stringloops/Makefile    |   1 +
 .../powerpc/stringloops/asm/ppc_asm.h         |   1 +
 .../selftests/powerpc/stringloops/memcmp.c    |   1 +
 .../selftests/powerpc/switch_endian/Makefile  |   1 +
 .../selftests/powerpc/switch_endian/check.S   |   1 +
 .../selftests/powerpc/switch_endian/common.h  |   1 +
 .../switch_endian/switch_endian_test.S        |   1 +
 .../testing/selftests/powerpc/syscalls/ipc.h  |   1 +
 .../testing/selftests/powerpc/tm/Makefile     |   1 +
 .../selftests/powerpc/tm/tm-resched-dscr.c    |   1 +
 .../selftests/powerpc/tm/tm-syscall-asm.S     |   1 +
 .../selftests/powerpc/vphn/test-vphn.c        |   1 +
 kernel/tools/testing/selftests/prctl/Makefile |   1 +
 .../prctl/disable-tsc-ctxt-sw-stress-test.c   |   1 +
 .../prctl/disable-tsc-on-off-stress-test.c    |   1 +
 .../selftests/prctl/disable-tsc-test.c        |   1 +
 .../tools/testing/selftests/pstore/Makefile   |   1 +
 kernel/tools/testing/selftests/ptp/Makefile   |   1 +
 .../testing/selftests/ptrace/peeksiginfo.c    |   1 +
 .../rcutorture/formal/srcu-cbmc/Makefile      |   1 +
 .../formal/srcu-cbmc/include/linux/types.h    |   1 +
 .../formal/srcu-cbmc/modify_srcu.awk          |   1 +
 .../rcutorture/formal/srcu-cbmc/src/assume.h  |   1 +
 .../formal/srcu-cbmc/src/barriers.h           |   1 +
 .../rcutorture/formal/srcu-cbmc/src/bug_on.h  |   1 +
 .../formal/srcu-cbmc/src/combined_source.c    |   1 +
 .../rcutorture/formal/srcu-cbmc/src/config.h  |   1 +
 .../formal/srcu-cbmc/src/include_srcu.c       |   1 +
 .../formal/srcu-cbmc/src/int_typedefs.h       |   1 +
 .../rcutorture/formal/srcu-cbmc/src/locks.h   |   1 +
 .../rcutorture/formal/srcu-cbmc/src/misc.c    |   1 +
 .../rcutorture/formal/srcu-cbmc/src/percpu.h  |   1 +
 .../rcutorture/formal/srcu-cbmc/src/preempt.c |   1 +
 .../rcutorture/formal/srcu-cbmc/src/preempt.h |   1 +
 .../formal/srcu-cbmc/src/simple_sync_srcu.c   |   1 +
 .../formal/srcu-cbmc/src/workqueues.h         |   1 +
 .../srcu-cbmc/tests/store_buffering/Makefile  |   1 +
 .../srcu-cbmc/tests/store_buffering/test.c    |   1 +
 .../formal/srcu-cbmc/tests/test_script.sh     |   1 +
 .../tools/testing/selftests/seccomp/Makefile  |   1 +
 .../tools/testing/selftests/sigaltstack/sas.c |   1 +
 .../tools/testing/selftests/splice/Makefile   |   1 +
 .../splice/default_file_splice_read.c         |   1 +
 .../splice/default_file_splice_read.sh        |   1 +
 .../selftests/static_keys/test_static_keys.sh |   1 +
 kernel/tools/testing/selftests/sync/Makefile  |   1 +
 .../tools/testing/selftests/tc-testing/tdc.py |   5 +-
 .../selftests/tc-testing/tdc_config.py        |   1 +
 .../selftests/tc-testing/tdc_helper.py        |   1 +
 .../tools/testing/selftests/timers/Makefile   |   1 +
 .../testing/selftests/user/test_user_copy.sh  |   1 +
 kernel/tools/testing/selftests/vDSO/Makefile  |   1 +
 kernel/tools/testing/selftests/vm/Makefile    |   1 +
 .../testing/selftests/vm/compaction_test.c    |   1 +
 .../testing/selftests/vm/hugepage-mmap.c      |   1 +
 .../tools/testing/selftests/vm/hugepage-shm.c |   1 +
 .../tools/testing/selftests/vm/map_hugetlb.c  |   1 +
 .../testing/selftests/vm/mlock-random-test.c  |   1 +
 .../tools/testing/selftests/vm/mlock2-tests.c |   1 +
 kernel/tools/testing/selftests/vm/mlock2.h    |   1 +
 .../testing/selftests/vm/on-fault-limit.c     |   1 +
 kernel/tools/testing/selftests/vm/run_vmtests |   1 +
 kernel/tools/testing/selftests/vm/thuge-gen.c |   1 +
 .../tools/testing/selftests/watchdog/Makefile |   1 +
 .../selftests/watchdog/watchdog-test.c        |   1 +
 kernel/tools/testing/selftests/x86/Makefile   |   1 +
 kernel/tools/testing/selftests/x86/ioperm.c   |   1 +
 kernel/tools/testing/selftests/x86/iopl.c     |   1 +
 kernel/tools/testing/selftests/x86/ldt_gdt.c  |   1 +
 .../tools/testing/selftests/x86/mpx-debug.h   |   1 +
 kernel/tools/testing/selftests/x86/mpx-dig.c  |   1 +
 kernel/tools/testing/selftests/x86/mpx-hw.h   |   1 +
 kernel/tools/testing/selftests/x86/mpx-mm.h   |   1 +
 .../testing/selftests/x86/pkey-helpers.h      |   1 +
 .../testing/selftests/x86/protection_keys.c   |   1 +
 .../testing/selftests/x86/ptrace_syscall.c    |   1 +
 .../selftests/x86/raw_syscall_helper_32.S     |   1 +
 .../tools/testing/selftests/x86/test_FCMOV.c  |   1 +
 .../tools/testing/selftests/x86/test_FCOMI.c  |   1 +
 .../tools/testing/selftests/x86/test_FISTTP.c |   1 +
 .../tools/testing/selftests/x86/test_vdso.c   |   1 +
 kernel/tools/testing/selftests/zram/Makefile  |   1 +
 kernel/tools/testing/selftests/zram/zram.sh   |   1 +
 kernel/tools/thermal/tmon/Makefile            |   1 +
 kernel/tools/thermal/tmon/tmon.8              |   1 +
 kernel/tools/usb/Makefile                     |   1 +
 .../multibuff/host_app/Makefile               |   1 +
 kernel/tools/usb/hcd-tests.sh                 |   1 +
 kernel/tools/usb/usbip/Makefile.am            |   1 +
 kernel/tools/usb/usbip/cleanup.sh             |   1 +
 kernel/tools/usb/usbip/libsrc/Makefile.am     |   1 +
 kernel/tools/usb/usbip/libsrc/list.h          |   1 +
 kernel/tools/usb/usbip/libsrc/sysfs_utils.c   |   1 +
 kernel/tools/usb/usbip/libsrc/sysfs_utils.h   |   1 +
 kernel/tools/usb/usbip/libsrc/usbip_common.c  |   1 +
 kernel/tools/usb/usbip/libsrc/usbip_common.h  |   1 +
 kernel/tools/usb/usbip/libsrc/vhci_driver.c   |   1 +
 kernel/tools/usb/usbip/libsrc/vhci_driver.h   |   1 +
 kernel/tools/usb/usbip/src/Makefile.am        |   1 +
 kernel/tools/usb/usbip/src/usbip_network.h    |   1 +
 kernel/tools/virtio/Makefile                  |   1 +
 kernel/tools/virtio/asm/barrier.h             |   1 +
 kernel/tools/virtio/linux/bug.h               |   1 +
 kernel/tools/virtio/linux/compiler.h          |   1 +
 kernel/tools/virtio/linux/dma-mapping.h       |   1 +
 kernel/tools/virtio/linux/err.h               |   1 +
 kernel/tools/virtio/linux/kernel.h            |   1 +
 kernel/tools/virtio/linux/module.h            |   1 +
 kernel/tools/virtio/linux/scatterlist.h       |   1 +
 kernel/tools/virtio/linux/slab.h              |   1 +
 kernel/tools/virtio/linux/uaccess.h           |   1 +
 kernel/tools/virtio/linux/virtio.h            |   1 +
 kernel/tools/virtio/linux/virtio_byteorder.h  |   1 +
 kernel/tools/virtio/linux/virtio_config.h     |   1 +
 kernel/tools/virtio/ringtest/Makefile         |   1 +
 kernel/tools/virtio/ringtest/noring.c         |   1 +
 kernel/tools/virtio/ringtest/ptr_ring.c       |   1 +
 kernel/tools/virtio/ringtest/run-on-all.sh    |   1 +
 kernel/tools/virtio/uapi/linux/virtio_ring.h  |   1 +
 kernel/tools/virtio/virtio-trace/Makefile     |   1 +
 .../tools/virtio/virtio-trace/trace-agent.h   |   1 +
 kernel/tools/virtio/virtio_test.c             |   1 +
 kernel/tools/virtio/vringh_test.c             |   1 +
 kernel/tools/vm/Makefile                      |   1 +
 kernel/tools/vm/page_owner_sort.c             |   1 +
 kernel/tools/vm/slabinfo.c                    |   1 +
 kernel/usr/Kconfig                            |   1 +
 kernel/usr/Makefile                           |  10 +-
 kernel/usr/gen_init_cpio.c                    |   1 +
 kernel/usr/initramfs_data.S                   |   1 +
 kernel/virt/kvm/Kconfig                       |   1 +
 kernel/virt/kvm/arm/arm.c                     |  31 ++---
 kernel/virt/kvm/arm/trace.h                   |   1 +
 kernel/virt/kvm/arm/vgic/trace.h              |   1 +
 kernel/virt/kvm/arm/vgic/vgic-its.c           |  73 +++++++----
 kernel/virt/kvm/coalesced_mmio.c              |   1 +
 kernel/virt/kvm/coalesced_mmio.h              |   1 +
 kernel/virt/kvm/vfio.h                        |   1 +
 12798 files changed, 13772 insertions(+), 712 deletions(-)
 create mode 100644 kernel/arch/arm/include/asm/unaligned.h
 create mode 100644 kernel/tools/include/asm/export.h

diff --git a/kernel/.mailmap b/kernel/.mailmap
index c7b10caec..4757d361f 100644
--- a/kernel/.mailmap
+++ b/kernel/.mailmap
@@ -15,6 +15,7 @@ Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
 Alan Cox <alan@lxorguk.ukuu.org.uk>
 Alan Cox <root@hraefn.swansea.linux.org.uk>
 Aleksey Gorelov <aleksey_gorelov@phoenix.com>
+Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
 Al Viro <viro@ftp.linux.org.uk>
 Al Viro <viro@zenIV.linux.org.uk>
 Andreas Herrmann <aherrman@de.ibm.com>
@@ -43,6 +44,7 @@ Corey Minyard <minyard@acm.org>
 Damian Hobson-Garcia <dhobsong@igel.co.jp>
 David Brownell <david-b@pacbell.net>
 David Woodhouse <dwmw2@shinybook.infradead.org>
+Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 Domen Puncer <domen@coderock.org>
 Douglas Gilbert <dougg@torque.net>
@@ -100,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Linas Vepstas <linas@austin.ibm.com>
 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
+Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
 Mark Brown <broonie@sirena.org.uk>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
@@ -114,9 +117,11 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
 Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
 Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
 Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
+Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
+Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
 Mitesh shah <mshah@teja.com>
 Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
 Morten Welinder <terra@gnome.org>
@@ -127,6 +132,7 @@ Mythri P K <mythripk@ti.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
 Patrick Mochel <mochel@digitalimplant.org>
+Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
 Peter A Jonsson <pj@ludd.ltu.se>
 Peter Oruba <peter@oruba.de>
 Peter Oruba <peter.oruba@amd.com>
diff --git a/kernel/Documentation/ABI/testing/sysfs-class-remoteproc b/kernel/Documentation/ABI/testing/sysfs-class-remoteproc
index d188afebc..c3afe9fab 100644
--- a/kernel/Documentation/ABI/testing/sysfs-class-remoteproc
+++ b/kernel/Documentation/ABI/testing/sysfs-class-remoteproc
@@ -1,6 +1,6 @@
 What:		/sys/class/remoteproc/.../firmware
 Date:		October 2016
-Contact:	Matt Redfearn <matt.redfearn@imgtec.com>
+Contact:	Matt Redfearn <matt.redfearn@mips.com>
 Description:	Remote processor firmware
 
 		Reports the name of the firmware currently loaded to the
@@ -11,7 +11,7 @@ Description:	Remote processor firmware
 
 What:		/sys/class/remoteproc/.../state
 Date:		October 2016
-Contact:	Matt Redfearn <matt.redfearn@imgtec.com>
+Contact:	Matt Redfearn <matt.redfearn@mips.com>
 Description:	Remote processor state
 
 		Reports the state of the remote processor, which will be one of:
diff --git a/kernel/Documentation/ABI/testing/sysfs-devices-power b/kernel/Documentation/ABI/testing/sysfs-devices-power
index 5cbb6f038..676fdf5f2 100644
--- a/kernel/Documentation/ABI/testing/sysfs-devices-power
+++ b/kernel/Documentation/ABI/testing/sysfs-devices-power
@@ -211,9 +211,7 @@ Description:
 		device, after it has been suspended at run time, from a resume
 		request to the moment the device will be ready to process I/O,
 		in microseconds.  If it is equal to 0, however, this means that
-		the PM QoS resume latency may be arbitrary and the special value
-		"n/a" means that user space cannot accept any resume latency at
-		all for the given device.
+		the PM QoS resume latency may be arbitrary.
 
 		Not all drivers support this attribute.  If it isn't supported,
 		it is not present.
diff --git a/kernel/Documentation/process/kernel-enforcement-statement.rst b/kernel/Documentation/process/kernel-enforcement-statement.rst
index 1e23d4227..b3170671a 100644
--- a/kernel/Documentation/process/kernel-enforcement-statement.rst
+++ b/kernel/Documentation/process/kernel-enforcement-statement.rst
@@ -50,8 +50,9 @@ be stronger.
 Except where noted below, we speak only for ourselves, and not for any company
 we might work for today, have in the past, or will in the future.
 
+  - Laura Abbott
   - Bjorn Andersson (Linaro)
-  - Andrea Arcangeli (Red Hat)
+  - Andrea Arcangeli
   - Neil Armstrong
   - Jens Axboe
   - Pablo Neira Ayuso
@@ -60,15 +61,17 @@ we might work for today, have in the past, or will in the future.
   - Felipe Balbi
   - Arnd Bergmann
   - Ard Biesheuvel
-  - Paolo Bonzini (Red Hat)
+  - Tim Bird
+  - Paolo Bonzini
   - Christian Borntraeger
   - Mark Brown (Linaro)
   - Paul Burton
   - Javier Martinez Canillas
   - Rob Clark
   - Jonathan Corbet
+  - Dennis Dalessandro
   - Vivien Didelot (Savoir-faire Linux)
-  - Hans de Goede (Red Hat)
+  - Hans de Goede
   - Mel Gorman (SUSE)
   - Sven Eckelmann
   - Alex Elder (Linaro)
@@ -79,6 +82,7 @@ we might work for today, have in the past, or will in the future.
   - Juergen Gross
   - Shawn Guo
   - Ulf Hansson
+  - Stephen Hemminger (Microsoft)
   - Tejun Heo
   - Rob Herring
   - Masami Hiramatsu
@@ -104,18 +108,21 @@ we might work for today, have in the past, or will in the future.
   - Viresh Kumar
   - Aneesh Kumar K.V
   - Julia Lawall
-  - Doug Ledford (Red Hat)
+  - Doug Ledford
   - Chuck Lever (Oracle)
   - Daniel Lezcano
   - Shaohua Li
-  - Xin Long (Red Hat)
+  - Xin Long
   - Tony Luck
+  - Catalin Marinas (Arm Ltd)
   - Mike Marshall
   - Chris Mason
   - Paul E. McKenney
   - David S. Miller
   - Ingo Molnar
   - Kuninori Morimoto
+  - Trond Myklebust
+  - Martin K. Petersen (Oracle)
   - Borislav Petkov
   - Jiri Pirko
   - Josh Poimboeuf
@@ -124,18 +131,20 @@ we might work for today, have in the past, or will in the future.
   - Joerg Roedel
   - Leon Romanovsky
   - Steven Rostedt (VMware)
-  - Ivan Safonov
+  - Frank Rowand
   - Ivan Safonov
   - Anna Schumaker
   - Jes Sorensen
   - K.Y. Srinivasan
   - Heiko Stuebner
   - Jiri Kosina (SUSE)
+  - Willy Tarreau
   - Dmitry Torokhov
   - Linus Torvalds
   - Thierry Reding
   - Rik van Riel
   - Geert Uytterhoeven (Glider bvba)
+  - Eduardo Valentin (Amazon.com)
   - Daniel Vetter
   - Linus Walleij
   - Richard Weinberger
@@ -145,3 +154,4 @@ we might work for today, have in the past, or will in the future.
   - Masahiro Yamada
   - Wei Yongjun
   - Lv Zheng
+  - Marc Zyngier (Arm Ltd)
diff --git a/kernel/Kbuild b/kernel/Kbuild
index 94c752762..af161aa1f 100644
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Kbuild for top-level directory of the kernel
 # This file takes care of the following:
diff --git a/kernel/Kconfig b/kernel/Kconfig
index c13f48d65..8c4c1cb0f 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
diff --git a/kernel/MAINTAINERS b/kernel/MAINTAINERS
index af0cb69f6..2f4e462aa 100644
--- a/kernel/MAINTAINERS
+++ b/kernel/MAINTAINERS
@@ -873,7 +873,7 @@ F:	drivers/android/
 F:	drivers/staging/android/
 
 ANDROID GOLDFISH RTC DRIVER
-M:	Miodrag Dinic <miodrag.dinic@imgtec.com>
+M:	Miodrag Dinic <miodrag.dinic@mips.com>
 S:	Supported
 F:	Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt
 F:	drivers/rtc/rtc-goldfish.c
@@ -6671,7 +6671,7 @@ F:	include/net/ieee802154_netdev.h
 F:	Documentation/networking/ieee802154.txt
 
 IFE PROTOCOL
-M:	Yotam Gigi <yotamg@mellanox.com>
+M:	Yotam Gigi <yotam.gi@gmail.com>
 M:	Jamal Hadi Salim <jhs@mojatatu.com>
 F:	net/ife
 F:	include/net/ife.h
@@ -6733,7 +6733,7 @@ S:	Maintained
 F:	drivers/usb/atm/ueagle-atm.c
 
 IMGTEC ASCII LCD DRIVER
-M:	Paul Burton <paul.burton@imgtec.com>
+M:	Paul Burton <paul.burton@mips.com>
 S:	Maintained
 F:	Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
 F:	drivers/auxdisplay/img-ascii-lcd.c
@@ -8743,7 +8743,7 @@ Q:	http://patchwork.ozlabs.org/project/netdev/list/
 F:	drivers/net/ethernet/mellanox/mlxsw/
 
 MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
-M:	Yotam Gigi <yotamg@mellanox.com>
+M:	mlxsw@mellanox.com
 L:	netdev@vger.kernel.org
 S:	Supported
 W:	http://www.mellanox.com
@@ -8993,7 +8993,7 @@ F:	Documentation/mips/
 F:	arch/mips/
 
 MIPS BOSTON DEVELOPMENT BOARD
-M:	Paul Burton <paul.burton@imgtec.com>
+M:	Paul Burton <paul.burton@mips.com>
 L:	linux-mips@linux-mips.org
 S:	Maintained
 F:	Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@ -9003,7 +9003,7 @@ F:	drivers/clk/imgtec/clk-boston.c
 F:	include/dt-bindings/clock/boston-clock.h
 
 MIPS GENERIC PLATFORM
-M:	Paul Burton <paul.burton@imgtec.com>
+M:	Paul Burton <paul.burton@mips.com>
 L:	linux-mips@linux-mips.org
 S:	Supported
 F:	arch/mips/generic/
@@ -9019,7 +9019,7 @@ F:	drivers/*/*loongson1*
 F:	drivers/*/*/*loongson1*
 
 MIPS RINT INSTRUCTION EMULATION
-M:	Aleksandar Markovic <aleksandar.markovic@imgtec.com>
+M:	Aleksandar Markovic <aleksandar.markovic@mips.com>
 L:	linux-mips@linux-mips.org
 S:	Supported
 F:	arch/mips/math-emu/sp_rint.c
@@ -10683,10 +10683,9 @@ S:	Maintained
 F:	drivers/pinctrl/spear/
 
 PISTACHIO SOC SUPPORT
-M:	James Hartley <james.hartley@imgtec.com>
-M:	Ionela Voinescu <ionela.voinescu@imgtec.com>
+M:	James Hartley <james.hartley@sondrel.com>
 L:	linux-mips@linux-mips.org
-S:	Maintained
+S:	Odd Fixes
 F:	arch/mips/pistachio/
 F:	arch/mips/include/asm/mach-pistachio/
 F:	arch/mips/boot/dts/img/pistachio*
@@ -10890,7 +10889,7 @@ S:	Maintained
 F:	drivers/block/ps3vram.c
 
 PSAMPLE PACKET SAMPLING SUPPORT:
-M:	Yotam Gigi <yotamg@mellanox.com>
+M:	Yotam Gigi <yotam.gi@gmail.com>
 S:	Maintained
 F:	net/psample
 F:	include/net/psample.h
diff --git a/kernel/Makefile b/kernel/Makefile
index 5f91a28a3..bee2033e7 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,7 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
 SUBLEVEL = 0
-EXTRAVERSION = -rc7
+EXTRAVERSION = -rc8
 NAME = Fearless Coyote
 
 # *DOCUMENTATION*
diff --git a/kernel/arch/Kconfig b/kernel/arch/Kconfig
index d789a89cb..057370a0a 100644
--- a/kernel/arch/Kconfig
+++ b/kernel/arch/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # General architecture dependent options
 #
diff --git a/kernel/arch/alpha/Kconfig b/kernel/arch/alpha/Kconfig
index 0e49d39ea..69b875880 100644
--- a/kernel/arch/alpha/Kconfig
+++ b/kernel/arch/alpha/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ALPHA
 	bool
 	default y
diff --git a/kernel/arch/alpha/Kconfig.debug b/kernel/arch/alpha/Kconfig.debug
index 3f6265f2d..5e93dffb8 100644
--- a/kernel/arch/alpha/Kconfig.debug
+++ b/kernel/arch/alpha/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/alpha/boot/bootloader.lds b/kernel/arch/alpha/boot/bootloader.lds
index 31c081ce1..8cdff54c6 100644
--- a/kernel/arch/alpha/boot/bootloader.lds
+++ b/kernel/arch/alpha/boot/bootloader.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 OUTPUT_FORMAT("elf64-alpha")
 ENTRY(__start)
 printk = srm_printk;
diff --git a/kernel/arch/alpha/boot/bootp.c b/kernel/arch/alpha/boot/bootp.c
index 2a542a506..95c0359f4 100644
--- a/kernel/arch/alpha/boot/bootp.c
+++ b/kernel/arch/alpha/boot/bootp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/boot/bootp.c
  *
diff --git a/kernel/arch/alpha/boot/bootpz.c b/kernel/arch/alpha/boot/bootpz.c
index d6ad19169..99b8d7dc3 100644
--- a/kernel/arch/alpha/boot/bootpz.c
+++ b/kernel/arch/alpha/boot/bootpz.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/boot/bootpz.c
  *
diff --git a/kernel/arch/alpha/boot/head.S b/kernel/arch/alpha/boot/head.S
index 8efb26686..06a7c95fe 100644
--- a/kernel/arch/alpha/boot/head.S
+++ b/kernel/arch/alpha/boot/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/boot/head.S
  *
diff --git a/kernel/arch/alpha/boot/main.c b/kernel/arch/alpha/boot/main.c
index dd6eb4a33..8f5ed8610 100644
--- a/kernel/arch/alpha/boot/main.c
+++ b/kernel/arch/alpha/boot/main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/boot/main.c
  *
diff --git a/kernel/arch/alpha/boot/misc.c b/kernel/arch/alpha/boot/misc.c
index 1b568ed74..d65192202 100644
--- a/kernel/arch/alpha/boot/misc.c
+++ b/kernel/arch/alpha/boot/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c
  * 
diff --git a/kernel/arch/alpha/boot/tools/mkbb.c b/kernel/arch/alpha/boot/tools/mkbb.c
index 1185778e6..fc47f33f8 100644
--- a/kernel/arch/alpha/boot/tools/mkbb.c
+++ b/kernel/arch/alpha/boot/tools/mkbb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* This utility makes a bootblock suitable for the SRM console/miniloader */
 
 /* Usage:
diff --git a/kernel/arch/alpha/boot/tools/objstrip.c b/kernel/arch/alpha/boot/tools/objstrip.c
index dee82695f..825a16f5f 100644
--- a/kernel/arch/alpha/boot/tools/objstrip.c
+++ b/kernel/arch/alpha/boot/tools/objstrip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/boot/tools/objstrip.c
  *
diff --git a/kernel/arch/alpha/include/asm/Kbuild b/kernel/arch/alpha/include/asm/Kbuild
index 5b974ab84..47f3fba3e 100644
--- a/kernel/arch/alpha/include/asm/Kbuild
+++ b/kernel/arch/alpha/include/asm/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 
 generic-y += clkdev.h
diff --git a/kernel/arch/alpha/include/asm/a.out.h b/kernel/arch/alpha/include/asm/a.out.h
index 9abbd2455..d2346b7ca 100644
--- a/kernel/arch/alpha/include/asm/a.out.h
+++ b/kernel/arch/alpha/include/asm/a.out.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_A_OUT_H__
 #define __ALPHA_A_OUT_H__
 
diff --git a/kernel/arch/alpha/include/asm/agp.h b/kernel/arch/alpha/include/asm/agp.h
index a94d48b86..7173eada1 100644
--- a/kernel/arch/alpha/include/asm/agp.h
+++ b/kernel/arch/alpha/include/asm/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AGP_H
 #define AGP_H 1
 
diff --git a/kernel/arch/alpha/include/asm/agp_backend.h b/kernel/arch/alpha/include/asm/agp_backend.h
index 55dd44a2c..271880240 100644
--- a/kernel/arch/alpha/include/asm/agp_backend.h
+++ b/kernel/arch/alpha/include/asm/agp_backend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_AGP_BACKEND_H
 #define _ALPHA_AGP_BACKEND_H 1
 
diff --git a/kernel/arch/alpha/include/asm/atomic.h b/kernel/arch/alpha/include/asm/atomic.h
index 498933a7d..85867d3ce 100644
--- a/kernel/arch/alpha/include/asm/atomic.h
+++ b/kernel/arch/alpha/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_ATOMIC_H
 #define _ALPHA_ATOMIC_H
 
diff --git a/kernel/arch/alpha/include/asm/barrier.h b/kernel/arch/alpha/include/asm/barrier.h
index 77516c872..92ec486a4 100644
--- a/kernel/arch/alpha/include/asm/barrier.h
+++ b/kernel/arch/alpha/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BARRIER_H
 #define __BARRIER_H
 
diff --git a/kernel/arch/alpha/include/asm/bitops.h b/kernel/arch/alpha/include/asm/bitops.h
index 4bdfbd444..ca43f4d0b 100644
--- a/kernel/arch/alpha/include/asm/bitops.h
+++ b/kernel/arch/alpha/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_BITOPS_H
 #define _ALPHA_BITOPS_H
 
diff --git a/kernel/arch/alpha/include/asm/bug.h b/kernel/arch/alpha/include/asm/bug.h
index f091682e3..b88ebdfed 100644
--- a/kernel/arch/alpha/include/asm/bug.h
+++ b/kernel/arch/alpha/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_BUG_H
 #define _ALPHA_BUG_H
 
diff --git a/kernel/arch/alpha/include/asm/cache.h b/kernel/arch/alpha/include/asm/cache.h
index ad368a93a..6ce508c68 100644
--- a/kernel/arch/alpha/include/asm/cache.h
+++ b/kernel/arch/alpha/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-alpha/cache.h
  */
diff --git a/kernel/arch/alpha/include/asm/cacheflush.h b/kernel/arch/alpha/include/asm/cacheflush.h
index a9cb6aa44..89128489c 100644
--- a/kernel/arch/alpha/include/asm/cacheflush.h
+++ b/kernel/arch/alpha/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_CACHEFLUSH_H
 #define _ALPHA_CACHEFLUSH_H
 
diff --git a/kernel/arch/alpha/include/asm/checksum.h b/kernel/arch/alpha/include/asm/checksum.h
index f2bbdd2ac..473e6ccb6 100644
--- a/kernel/arch/alpha/include/asm/checksum.h
+++ b/kernel/arch/alpha/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_CHECKSUM_H
 #define _ALPHA_CHECKSUM_H
 
diff --git a/kernel/arch/alpha/include/asm/cmpxchg.h b/kernel/arch/alpha/include/asm/cmpxchg.h
index e51177665..46ebf14ae 100644
--- a/kernel/arch/alpha/include/asm/cmpxchg.h
+++ b/kernel/arch/alpha/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_CMPXCHG_H
 #define _ALPHA_CMPXCHG_H
 
diff --git a/kernel/arch/alpha/include/asm/compiler.h b/kernel/arch/alpha/include/asm/compiler.h
index a7720b96b..5159ba259 100644
--- a/kernel/arch/alpha/include/asm/compiler.h
+++ b/kernel/arch/alpha/include/asm/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_COMPILER_H
 #define __ALPHA_COMPILER_H
 
diff --git a/kernel/arch/alpha/include/asm/console.h b/kernel/arch/alpha/include/asm/console.h
index f2b584fe0..088b7b9eb 100644
--- a/kernel/arch/alpha/include/asm/console.h
+++ b/kernel/arch/alpha/include/asm/console.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AXP_CONSOLE_H
 #define __AXP_CONSOLE_H
 
diff --git a/kernel/arch/alpha/include/asm/core_apecs.h b/kernel/arch/alpha/include/asm/core_apecs.h
index 6785ff7e0..0a07055bc 100644
--- a/kernel/arch/alpha/include/asm/core_apecs.h
+++ b/kernel/arch/alpha/include/asm/core_apecs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_APECS__H__
 #define __ALPHA_APECS__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_cia.h b/kernel/arch/alpha/include/asm/core_cia.h
index 9e0516c0c..c706a7f2b 100644
--- a/kernel/arch/alpha/include/asm/core_cia.h
+++ b/kernel/arch/alpha/include/asm/core_cia.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_CIA__H__
 #define __ALPHA_CIA__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_irongate.h b/kernel/arch/alpha/include/asm/core_irongate.h
index 24b2db541..1c8906bf7 100644
--- a/kernel/arch/alpha/include/asm/core_irongate.h
+++ b/kernel/arch/alpha/include/asm/core_irongate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_IRONGATE__H__
 #define __ALPHA_IRONGATE__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_lca.h b/kernel/arch/alpha/include/asm/core_lca.h
index 8ee6c5162..84d5e5b84 100644
--- a/kernel/arch/alpha/include/asm/core_lca.h
+++ b/kernel/arch/alpha/include/asm/core_lca.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_LCA__H__
 #define __ALPHA_LCA__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_marvel.h b/kernel/arch/alpha/include/asm/core_marvel.h
index 8dcf9dbda..cc6fd92d5 100644
--- a/kernel/arch/alpha/include/asm/core_marvel.h
+++ b/kernel/arch/alpha/include/asm/core_marvel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Marvel systems use the IO7 I/O chip provides PCI/PCIX/AGP access
  *
diff --git a/kernel/arch/alpha/include/asm/core_mcpcia.h b/kernel/arch/alpha/include/asm/core_mcpcia.h
index ad44bef29..b30dc1282 100644
--- a/kernel/arch/alpha/include/asm/core_mcpcia.h
+++ b/kernel/arch/alpha/include/asm/core_mcpcia.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_MCPCIA__H__
 #define __ALPHA_MCPCIA__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_polaris.h b/kernel/arch/alpha/include/asm/core_polaris.h
index 2f966b646..1c56dea64 100644
--- a/kernel/arch/alpha/include/asm/core_polaris.h
+++ b/kernel/arch/alpha/include/asm/core_polaris.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_POLARIS__H__
 #define __ALPHA_POLARIS__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_t2.h b/kernel/arch/alpha/include/asm/core_t2.h
index ade9d92e6..e0b33d09e 100644
--- a/kernel/arch/alpha/include/asm/core_t2.h
+++ b/kernel/arch/alpha/include/asm/core_t2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_T2__H__
 #define __ALPHA_T2__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_titan.h b/kernel/arch/alpha/include/asm/core_titan.h
index 8cf79d121..dcc02682c 100644
--- a/kernel/arch/alpha/include/asm/core_titan.h
+++ b/kernel/arch/alpha/include/asm/core_titan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_TITAN__H__
 #define __ALPHA_TITAN__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_tsunami.h b/kernel/arch/alpha/include/asm/core_tsunami.h
index 8e39ecf09..3391e9575 100644
--- a/kernel/arch/alpha/include/asm/core_tsunami.h
+++ b/kernel/arch/alpha/include/asm/core_tsunami.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_TSUNAMI__H__
 #define __ALPHA_TSUNAMI__H__
 
diff --git a/kernel/arch/alpha/include/asm/core_wildfire.h b/kernel/arch/alpha/include/asm/core_wildfire.h
index cd562f544..5d1b37f41 100644
--- a/kernel/arch/alpha/include/asm/core_wildfire.h
+++ b/kernel/arch/alpha/include/asm/core_wildfire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_WILDFIRE__H__
 #define __ALPHA_WILDFIRE__H__
 
diff --git a/kernel/arch/alpha/include/asm/delay.h b/kernel/arch/alpha/include/asm/delay.h
index 2aa3f410f..868aa61ab 100644
--- a/kernel/arch/alpha/include/asm/delay.h
+++ b/kernel/arch/alpha/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_DELAY_H
 #define __ALPHA_DELAY_H
 
diff --git a/kernel/arch/alpha/include/asm/dma-mapping.h b/kernel/arch/alpha/include/asm/dma-mapping.h
index 5d5366693..e542cb272 100644
--- a/kernel/arch/alpha/include/asm/dma-mapping.h
+++ b/kernel/arch/alpha/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_DMA_MAPPING_H
 #define _ALPHA_DMA_MAPPING_H
 
diff --git a/kernel/arch/alpha/include/asm/dma.h b/kernel/arch/alpha/include/asm/dma.h
index 87cfdbdf0..28610ea77 100644
--- a/kernel/arch/alpha/include/asm/dma.h
+++ b/kernel/arch/alpha/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-alpha/dma.h
  *
diff --git a/kernel/arch/alpha/include/asm/elf.h b/kernel/arch/alpha/include/asm/elf.h
index 968d9991f..8049997fa 100644
--- a/kernel/arch/alpha/include/asm/elf.h
+++ b/kernel/arch/alpha/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ALPHA_ELF_H
 #define __ASM_ALPHA_ELF_H
 
diff --git a/kernel/arch/alpha/include/asm/err_common.h b/kernel/arch/alpha/include/asm/err_common.h
index c25095942..610e01fe7 100644
--- a/kernel/arch/alpha/include/asm/err_common.h
+++ b/kernel/arch/alpha/include/asm/err_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	linux/include/asm-alpha/err_common.h
  *
diff --git a/kernel/arch/alpha/include/asm/err_ev7.h b/kernel/arch/alpha/include/asm/err_ev7.h
index 87f99777c..ab17e6333 100644
--- a/kernel/arch/alpha/include/asm/err_ev7.h
+++ b/kernel/arch/alpha/include/asm/err_ev7.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_ERR_EV7_H
 #define __ALPHA_ERR_EV7_H 1
 
diff --git a/kernel/arch/alpha/include/asm/extable.h b/kernel/arch/alpha/include/asm/extable.h
index 048e209e5..e42592390 100644
--- a/kernel/arch/alpha/include/asm/extable.h
+++ b/kernel/arch/alpha/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_EXTABLE_H
 #define _ASM_EXTABLE_H
 
diff --git a/kernel/arch/alpha/include/asm/fpu.h b/kernel/arch/alpha/include/asm/fpu.h
index 71c20956b..b9691405e 100644
--- a/kernel/arch/alpha/include/asm/fpu.h
+++ b/kernel/arch/alpha/include/asm/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ALPHA_FPU_H
 #define __ASM_ALPHA_FPU_H
 
diff --git a/kernel/arch/alpha/include/asm/futex.h b/kernel/arch/alpha/include/asm/futex.h
index 05a70edd5..d2e4da93e 100644
--- a/kernel/arch/alpha/include/asm/futex.h
+++ b/kernel/arch/alpha/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ALPHA_FUTEX_H
 #define _ASM_ALPHA_FUTEX_H
 
diff --git a/kernel/arch/alpha/include/asm/gct.h b/kernel/arch/alpha/include/asm/gct.h
index 3504c7049..2847449fb 100644
--- a/kernel/arch/alpha/include/asm/gct.h
+++ b/kernel/arch/alpha/include/asm/gct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_GCT_H
 #define __ALPHA_GCT_H
 
diff --git a/kernel/arch/alpha/include/asm/hardirq.h b/kernel/arch/alpha/include/asm/hardirq.h
index 242c09ba9..5ce5b34e8 100644
--- a/kernel/arch/alpha/include/asm/hardirq.h
+++ b/kernel/arch/alpha/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_HARDIRQ_H
 #define _ALPHA_HARDIRQ_H
 
diff --git a/kernel/arch/alpha/include/asm/hw_irq.h b/kernel/arch/alpha/include/asm/hw_irq.h
index 5050ac81c..e2d81ac0d 100644
--- a/kernel/arch/alpha/include/asm/hw_irq.h
+++ b/kernel/arch/alpha/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_HW_IRQ_H
 #define _ALPHA_HW_IRQ_H
 
diff --git a/kernel/arch/alpha/include/asm/hwrpb.h b/kernel/arch/alpha/include/asm/hwrpb.h
index 8e8f871af..d8180e527 100644
--- a/kernel/arch/alpha/include/asm/hwrpb.h
+++ b/kernel/arch/alpha/include/asm/hwrpb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_HWRPB_H
 #define __ALPHA_HWRPB_H
 
diff --git a/kernel/arch/alpha/include/asm/io.h b/kernel/arch/alpha/include/asm/io.h
index 4d61d2a50..d123ff90f 100644
--- a/kernel/arch/alpha/include/asm/io.h
+++ b/kernel/arch/alpha/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_IO_H
 #define __ALPHA_IO_H
 
diff --git a/kernel/arch/alpha/include/asm/io_trivial.h b/kernel/arch/alpha/include/asm/io_trivial.h
index 1c77f10b4..ba3d8f0cf 100644
--- a/kernel/arch/alpha/include/asm/io_trivial.h
+++ b/kernel/arch/alpha/include/asm/io_trivial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Trivial implementations of basic i/o routines.  Assumes that all
    of the hard work has been done by ioremap and ioportmap, and that
    access to i/o space is linear.  */
diff --git a/kernel/arch/alpha/include/asm/irq.h b/kernel/arch/alpha/include/asm/irq.h
index 06377400d..4d17cacd1 100644
--- a/kernel/arch/alpha/include/asm/irq.h
+++ b/kernel/arch/alpha/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_IRQ_H
 #define _ALPHA_IRQ_H
 
diff --git a/kernel/arch/alpha/include/asm/irqflags.h b/kernel/arch/alpha/include/asm/irqflags.h
index ffb172648..9f25d4e0d 100644
--- a/kernel/arch/alpha/include/asm/irqflags.h
+++ b/kernel/arch/alpha/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_IRQFLAGS_H
 #define __ALPHA_IRQFLAGS_H
 
diff --git a/kernel/arch/alpha/include/asm/jensen.h b/kernel/arch/alpha/include/asm/jensen.h
index 964b06ead..436dc905b 100644
--- a/kernel/arch/alpha/include/asm/jensen.h
+++ b/kernel/arch/alpha/include/asm/jensen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_JENSEN_H
 #define __ALPHA_JENSEN_H
 
diff --git a/kernel/arch/alpha/include/asm/kmap_types.h b/kernel/arch/alpha/include/asm/kmap_types.h
index a8d4ec8ea..651714b45 100644
--- a/kernel/arch/alpha/include/asm/kmap_types.h
+++ b/kernel/arch/alpha/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
diff --git a/kernel/arch/alpha/include/asm/linkage.h b/kernel/arch/alpha/include/asm/linkage.h
index 7cfd06e8c..aa8661fa6 100644
--- a/kernel/arch/alpha/include/asm/linkage.h
+++ b/kernel/arch/alpha/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/alpha/include/asm/local.h b/kernel/arch/alpha/include/asm/local.h
index 9c94b8456..fab26a1c9 100644
--- a/kernel/arch/alpha/include/asm/local.h
+++ b/kernel/arch/alpha/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_LOCAL_H
 #define _ALPHA_LOCAL_H
 
diff --git a/kernel/arch/alpha/include/asm/machvec.h b/kernel/arch/alpha/include/asm/machvec.h
index 75cb3641e..a6b73c6d1 100644
--- a/kernel/arch/alpha/include/asm/machvec.h
+++ b/kernel/arch/alpha/include/asm/machvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_MACHVEC_H
 #define __ALPHA_MACHVEC_H 1
 
diff --git a/kernel/arch/alpha/include/asm/mc146818rtc.h b/kernel/arch/alpha/include/asm/mc146818rtc.h
index 097703f1c..2154fd4f7 100644
--- a/kernel/arch/alpha/include/asm/mc146818rtc.h
+++ b/kernel/arch/alpha/include/asm/mc146818rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/alpha/include/asm/mce.h b/kernel/arch/alpha/include/asm/mce.h
index 660285b9a..200e04e98 100644
--- a/kernel/arch/alpha/include/asm/mce.h
+++ b/kernel/arch/alpha/include/asm/mce.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_MCE_H
 #define __ALPHA_MCE_H
 
diff --git a/kernel/arch/alpha/include/asm/mmu.h b/kernel/arch/alpha/include/asm/mmu.h
index 3dc127779..dadfc1b6e 100644
--- a/kernel/arch/alpha/include/asm/mmu.h
+++ b/kernel/arch/alpha/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_MMU_H
 #define __ALPHA_MMU_H
 
diff --git a/kernel/arch/alpha/include/asm/mmu_context.h b/kernel/arch/alpha/include/asm/mmu_context.h
index 45c020a0f..6d7d9bc1b 100644
--- a/kernel/arch/alpha/include/asm/mmu_context.h
+++ b/kernel/arch/alpha/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_MMU_CONTEXT_H
 #define __ALPHA_MMU_CONTEXT_H
 
diff --git a/kernel/arch/alpha/include/asm/mmzone.h b/kernel/arch/alpha/include/asm/mmzone.h
index 14ce27bcc..889b5d3ad 100644
--- a/kernel/arch/alpha/include/asm/mmzone.h
+++ b/kernel/arch/alpha/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Written by Kanoj Sarcar (kanoj@sgi.com) Aug 99
  * Adapted for the alpha wildfire architecture Jan 2001.
diff --git a/kernel/arch/alpha/include/asm/module.h b/kernel/arch/alpha/include/asm/module.h
index 9cd13b551..1e96e42f5 100644
--- a/kernel/arch/alpha/include/asm/module.h
+++ b/kernel/arch/alpha/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_MODULE_H
 #define _ALPHA_MODULE_H
 
diff --git a/kernel/arch/alpha/include/asm/page.h b/kernel/arch/alpha/include/asm/page.h
index 07af06254..f3fb28484 100644
--- a/kernel/arch/alpha/include/asm/page.h
+++ b/kernel/arch/alpha/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_PAGE_H
 #define _ALPHA_PAGE_H
 
diff --git a/kernel/arch/alpha/include/asm/pal.h b/kernel/arch/alpha/include/asm/pal.h
index 5422a4764..db2b3b18b 100644
--- a/kernel/arch/alpha/include/asm/pal.h
+++ b/kernel/arch/alpha/include/asm/pal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_PAL_H
 #define __ALPHA_PAL_H
 
diff --git a/kernel/arch/alpha/include/asm/param.h b/kernel/arch/alpha/include/asm/param.h
index a5b68b268..cfe947ce9 100644
--- a/kernel/arch/alpha/include/asm/param.h
+++ b/kernel/arch/alpha/include/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ALPHA_PARAM_H
 #define _ASM_ALPHA_PARAM_H
 
diff --git a/kernel/arch/alpha/include/asm/parport.h b/kernel/arch/alpha/include/asm/parport.h
index 6abd0af11..0519a51e6 100644
--- a/kernel/arch/alpha/include/asm/parport.h
+++ b/kernel/arch/alpha/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * parport.h: platform-specific PC-style parport initialisation
  *
diff --git a/kernel/arch/alpha/include/asm/pci.h b/kernel/arch/alpha/include/asm/pci.h
index a06c24b3a..fc988c16e 100644
--- a/kernel/arch/alpha/include/asm/pci.h
+++ b/kernel/arch/alpha/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_PCI_H
 #define __ALPHA_PCI_H
 
diff --git a/kernel/arch/alpha/include/asm/percpu.h b/kernel/arch/alpha/include/asm/percpu.h
index 2c12378e3..6923249f2 100644
--- a/kernel/arch/alpha/include/asm/percpu.h
+++ b/kernel/arch/alpha/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_PERCPU_H
 #define __ALPHA_PERCPU_H
 
diff --git a/kernel/arch/alpha/include/asm/pgalloc.h b/kernel/arch/alpha/include/asm/pgalloc.h
index c2ebb6f36..ab3e3a863 100644
--- a/kernel/arch/alpha/include/asm/pgalloc.h
+++ b/kernel/arch/alpha/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_PGALLOC_H
 #define _ALPHA_PGALLOC_H
 
diff --git a/kernel/arch/alpha/include/asm/pgtable.h b/kernel/arch/alpha/include/asm/pgtable.h
index a9a119592..89c2032f9 100644
--- a/kernel/arch/alpha/include/asm/pgtable.h
+++ b/kernel/arch/alpha/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_PGTABLE_H
 #define _ALPHA_PGTABLE_H
 
diff --git a/kernel/arch/alpha/include/asm/processor.h b/kernel/arch/alpha/include/asm/processor.h
index 2fec2dee3..bfe784f2d 100644
--- a/kernel/arch/alpha/include/asm/processor.h
+++ b/kernel/arch/alpha/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-alpha/processor.h
  *
diff --git a/kernel/arch/alpha/include/asm/ptrace.h b/kernel/arch/alpha/include/asm/ptrace.h
index 9047c2fe8..df5f317ab 100644
--- a/kernel/arch/alpha/include/asm/ptrace.h
+++ b/kernel/arch/alpha/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMAXP_PTRACE_H
 #define _ASMAXP_PTRACE_H
 
diff --git a/kernel/arch/alpha/include/asm/rwsem.h b/kernel/arch/alpha/include/asm/rwsem.h
index 77873d0ad..3925f06af 100644
--- a/kernel/arch/alpha/include/asm/rwsem.h
+++ b/kernel/arch/alpha/include/asm/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_RWSEM_H
 #define _ALPHA_RWSEM_H
 
diff --git a/kernel/arch/alpha/include/asm/serial.h b/kernel/arch/alpha/include/asm/serial.h
index e31557fc0..911154473 100644
--- a/kernel/arch/alpha/include/asm/serial.h
+++ b/kernel/arch/alpha/include/asm/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-alpha/serial.h
  */
diff --git a/kernel/arch/alpha/include/asm/shmparam.h b/kernel/arch/alpha/include/asm/shmparam.h
index cc901d58a..0c04fde1a 100644
--- a/kernel/arch/alpha/include/asm/shmparam.h
+++ b/kernel/arch/alpha/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMAXP_SHMPARAM_H
 #define _ASMAXP_SHMPARAM_H
 
diff --git a/kernel/arch/alpha/include/asm/signal.h b/kernel/arch/alpha/include/asm/signal.h
index 963f0494d..a40f02011 100644
--- a/kernel/arch/alpha/include/asm/signal.h
+++ b/kernel/arch/alpha/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMAXP_SIGNAL_H
 #define _ASMAXP_SIGNAL_H
 
diff --git a/kernel/arch/alpha/include/asm/smp.h b/kernel/arch/alpha/include/asm/smp.h
index c46e714aa..2264ae726 100644
--- a/kernel/arch/alpha/include/asm/smp.h
+++ b/kernel/arch/alpha/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
 
diff --git a/kernel/arch/alpha/include/asm/socket.h b/kernel/arch/alpha/include/asm/socket.h
index 8d806d80e..76a32817e 100644
--- a/kernel/arch/alpha/include/asm/socket.h
+++ b/kernel/arch/alpha/include/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
 
diff --git a/kernel/arch/alpha/include/asm/special_insns.h b/kernel/arch/alpha/include/asm/special_insns.h
index 88d3452b2..ca2c5c30b 100644
--- a/kernel/arch/alpha/include/asm/special_insns.h
+++ b/kernel/arch/alpha/include/asm/special_insns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_SPECIAL_INSNS_H
 #define __ALPHA_SPECIAL_INSNS_H
 
diff --git a/kernel/arch/alpha/include/asm/spinlock.h b/kernel/arch/alpha/include/asm/spinlock.h
index 718ac0b64..aa4304afb 100644
--- a/kernel/arch/alpha/include/asm/spinlock.h
+++ b/kernel/arch/alpha/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_SPINLOCK_H
 #define _ALPHA_SPINLOCK_H
 
diff --git a/kernel/arch/alpha/include/asm/spinlock_types.h b/kernel/arch/alpha/include/asm/spinlock_types.h
index 54c2afce0..1d5716bc0 100644
--- a/kernel/arch/alpha/include/asm/spinlock_types.h
+++ b/kernel/arch/alpha/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_SPINLOCK_TYPES_H
 #define _ALPHA_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/alpha/include/asm/string.h b/kernel/arch/alpha/include/asm/string.h
index 9eb9933d8..f043f91ff 100644
--- a/kernel/arch/alpha/include/asm/string.h
+++ b/kernel/arch/alpha/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_STRING_H__
 #define __ALPHA_STRING_H__
 
diff --git a/kernel/arch/alpha/include/asm/switch_to.h b/kernel/arch/alpha/include/asm/switch_to.h
index 44c0d4f2c..762b7f975 100644
--- a/kernel/arch/alpha/include/asm/switch_to.h
+++ b/kernel/arch/alpha/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_SWITCH_TO_H
 #define __ALPHA_SWITCH_TO_H
 
diff --git a/kernel/arch/alpha/include/asm/syscall.h b/kernel/arch/alpha/include/asm/syscall.h
index 88d28eb2a..d73a6fcb5 100644
--- a/kernel/arch/alpha/include/asm/syscall.h
+++ b/kernel/arch/alpha/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ALPHA_SYSCALL_H
 #define _ASM_ALPHA_SYSCALL_H
 
diff --git a/kernel/arch/alpha/include/asm/termios.h b/kernel/arch/alpha/include/asm/termios.h
index 7fde0f88d..6a8c53dec 100644
--- a/kernel/arch/alpha/include/asm/termios.h
+++ b/kernel/arch/alpha/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_TERMIOS_H
 #define _ALPHA_TERMIOS_H
 
diff --git a/kernel/arch/alpha/include/asm/thread_info.h b/kernel/arch/alpha/include/asm/thread_info.h
index e9e90bfa2..8c20c5e35 100644
--- a/kernel/arch/alpha/include/asm/thread_info.h
+++ b/kernel/arch/alpha/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_THREAD_INFO_H
 #define _ALPHA_THREAD_INFO_H
 
diff --git a/kernel/arch/alpha/include/asm/timex.h b/kernel/arch/alpha/include/asm/timex.h
index afa0c45e3..b565cc6f4 100644
--- a/kernel/arch/alpha/include/asm/timex.h
+++ b/kernel/arch/alpha/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-alpha/timex.h
  *
diff --git a/kernel/arch/alpha/include/asm/tlb.h b/kernel/arch/alpha/include/asm/tlb.h
index 42866759f..8f5042b61 100644
--- a/kernel/arch/alpha/include/asm/tlb.h
+++ b/kernel/arch/alpha/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_TLB_H
 #define _ALPHA_TLB_H
 
diff --git a/kernel/arch/alpha/include/asm/tlbflush.h b/kernel/arch/alpha/include/asm/tlbflush.h
index e89e0c2e1..f8b492408 100644
--- a/kernel/arch/alpha/include/asm/tlbflush.h
+++ b/kernel/arch/alpha/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_TLBFLUSH_H
 #define _ALPHA_TLBFLUSH_H
 
diff --git a/kernel/arch/alpha/include/asm/topology.h b/kernel/arch/alpha/include/asm/topology.h
index 9251e13e1..e6e13a857 100644
--- a/kernel/arch/alpha/include/asm/topology.h
+++ b/kernel/arch/alpha/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ALPHA_TOPOLOGY_H
 #define _ASM_ALPHA_TOPOLOGY_H
 
diff --git a/kernel/arch/alpha/include/asm/types.h b/kernel/arch/alpha/include/asm/types.h
index 0bc66e1d3..b60b60276 100644
--- a/kernel/arch/alpha/include/asm/types.h
+++ b/kernel/arch/alpha/include/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_TYPES_H
 #define _ALPHA_TYPES_H
 
diff --git a/kernel/arch/alpha/include/asm/uaccess.h b/kernel/arch/alpha/include/asm/uaccess.h
index 133a4884e..87d8c4f03 100644
--- a/kernel/arch/alpha/include/asm/uaccess.h
+++ b/kernel/arch/alpha/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ALPHA_UACCESS_H
 #define __ALPHA_UACCESS_H
 
diff --git a/kernel/arch/alpha/include/asm/ucontext.h b/kernel/arch/alpha/include/asm/ucontext.h
index 47578ab42..af1f3465b 100644
--- a/kernel/arch/alpha/include/asm/ucontext.h
+++ b/kernel/arch/alpha/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMAXP_UCONTEXT_H
 #define _ASMAXP_UCONTEXT_H
 
diff --git a/kernel/arch/alpha/include/asm/unaligned.h b/kernel/arch/alpha/include/asm/unaligned.h
index 3787c60ae..863c807b6 100644
--- a/kernel/arch/alpha/include/asm/unaligned.h
+++ b/kernel/arch/alpha/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ALPHA_UNALIGNED_H
 #define _ASM_ALPHA_UNALIGNED_H
 
diff --git a/kernel/arch/alpha/include/asm/unistd.h b/kernel/arch/alpha/include/asm/unistd.h
index db7fc0f51..d6e29a1de 100644
--- a/kernel/arch/alpha/include/asm/unistd.h
+++ b/kernel/arch/alpha/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_UNISTD_H
 #define _ALPHA_UNISTD_H
 
diff --git a/kernel/arch/alpha/include/asm/user.h b/kernel/arch/alpha/include/asm/user.h
index a4eb6a4ca..3df37492c 100644
--- a/kernel/arch/alpha/include/asm/user.h
+++ b/kernel/arch/alpha/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_USER_H
 #define _ALPHA_USER_H
 
diff --git a/kernel/arch/alpha/include/asm/vga.h b/kernel/arch/alpha/include/asm/vga.h
index 3c1c2b612..4c347a845 100644
--- a/kernel/arch/alpha/include/asm/vga.h
+++ b/kernel/arch/alpha/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Access to VGA videoram
  *
diff --git a/kernel/arch/alpha/include/asm/word-at-a-time.h b/kernel/arch/alpha/include/asm/word-at-a-time.h
index 902e6ab00..4035265f1 100644
--- a/kernel/arch/alpha/include/asm/word-at-a-time.h
+++ b/kernel/arch/alpha/include/asm/word-at-a-time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_WORD_AT_A_TIME_H
 #define _ASM_WORD_AT_A_TIME_H
 
diff --git a/kernel/arch/alpha/include/asm/wrperfmon.h b/kernel/arch/alpha/include/asm/wrperfmon.h
index 319bf6788..c97b82a1f 100644
--- a/kernel/arch/alpha/include/asm/wrperfmon.h
+++ b/kernel/arch/alpha/include/asm/wrperfmon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for use with the Alpha wrperfmon PAL call.
  */
diff --git a/kernel/arch/alpha/include/asm/xchg.h b/kernel/arch/alpha/include/asm/xchg.h
index 0ca972459..68dfb3cb7 100644
--- a/kernel/arch/alpha/include/asm/xchg.h
+++ b/kernel/arch/alpha/include/asm/xchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ALPHA_CMPXCHG_H
 #error Do not include xchg.h directly!
 #else
diff --git a/kernel/arch/alpha/include/uapi/asm/a.out.h b/kernel/arch/alpha/include/uapi/asm/a.out.h
index 547707246..7d692df04 100644
--- a/kernel/arch/alpha/include/uapi/asm/a.out.h
+++ b/kernel/arch/alpha/include/uapi/asm/a.out.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ALPHA_A_OUT_H__
 #define _UAPI__ALPHA_A_OUT_H__
 
diff --git a/kernel/arch/alpha/include/uapi/asm/auxvec.h b/kernel/arch/alpha/include/uapi/asm/auxvec.h
index a3a579dfd..57cae8780 100644
--- a/kernel/arch/alpha/include/uapi/asm/auxvec.h
+++ b/kernel/arch/alpha/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_ALPHA_AUXVEC_H
 #define __ASM_ALPHA_AUXVEC_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/bitsperlong.h b/kernel/arch/alpha/include/uapi/asm/bitsperlong.h
index ad57f7868..6c5bf7d03 100644
--- a/kernel/arch/alpha/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/alpha/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_ALPHA_BITSPERLONG_H
 #define __ASM_ALPHA_BITSPERLONG_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/byteorder.h b/kernel/arch/alpha/include/uapi/asm/byteorder.h
index 736830932..efa9b51b4 100644
--- a/kernel/arch/alpha/include/uapi/asm/byteorder.h
+++ b/kernel/arch/alpha/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_BYTEORDER_H
 #define _ALPHA_BYTEORDER_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/compiler.h b/kernel/arch/alpha/include/uapi/asm/compiler.h
index 32cc7833f..0e00c0e13 100644
--- a/kernel/arch/alpha/include/uapi/asm/compiler.h
+++ b/kernel/arch/alpha/include/uapi/asm/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ALPHA_COMPILER_H
 #define _UAPI__ALPHA_COMPILER_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/console.h b/kernel/arch/alpha/include/uapi/asm/console.h
index fd08a191f..5fcb65300 100644
--- a/kernel/arch/alpha/include/uapi/asm/console.h
+++ b/kernel/arch/alpha/include/uapi/asm/console.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__AXP_CONSOLE_H
 #define _UAPI__AXP_CONSOLE_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/errno.h b/kernel/arch/alpha/include/uapi/asm/errno.h
index 17f92aa76..3d265f6ba 100644
--- a/kernel/arch/alpha/include/uapi/asm/errno.h
+++ b/kernel/arch/alpha/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_ERRNO_H
 #define _ALPHA_ERRNO_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/fcntl.h b/kernel/arch/alpha/include/uapi/asm/fcntl.h
index 09f49a6b8..50bdc8e8a 100644
--- a/kernel/arch/alpha/include/uapi/asm/fcntl.h
+++ b/kernel/arch/alpha/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_FCNTL_H
 #define _ALPHA_FCNTL_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/fpu.h b/kernel/arch/alpha/include/uapi/asm/fpu.h
index 21a053ca2..cea9eafa0 100644
--- a/kernel/arch/alpha/include/uapi/asm/fpu.h
+++ b/kernel/arch/alpha/include/uapi/asm/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_ALPHA_FPU_H
 #define _UAPI__ASM_ALPHA_FPU_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/gentrap.h b/kernel/arch/alpha/include/uapi/asm/gentrap.h
index ae50cc319..c02ccc5ec 100644
--- a/kernel/arch/alpha/include/uapi/asm/gentrap.h
+++ b/kernel/arch/alpha/include/uapi/asm/gentrap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMAXP_GENTRAP_H
 #define _ASMAXP_GENTRAP_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/ioctl.h b/kernel/arch/alpha/include/uapi/asm/ioctl.h
index fc63727f4..a9d68a08e 100644
--- a/kernel/arch/alpha/include/uapi/asm/ioctl.h
+++ b/kernel/arch/alpha/include/uapi/asm/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_IOCTL_H
 #define _ALPHA_IOCTL_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/ioctls.h b/kernel/arch/alpha/include/uapi/asm/ioctls.h
index 1cd7dc7d4..3729d92d3 100644
--- a/kernel/arch/alpha/include/uapi/asm/ioctls.h
+++ b/kernel/arch/alpha/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ALPHA_IOCTLS_H
 #define _ASM_ALPHA_IOCTLS_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/ipcbuf.h b/kernel/arch/alpha/include/uapi/asm/ipcbuf.h
index 84c7e51cb..90d6445a1 100644
--- a/kernel/arch/alpha/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/alpha/include/uapi/asm/ipcbuf.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ipcbuf.h>
diff --git a/kernel/arch/alpha/include/uapi/asm/kvm_para.h b/kernel/arch/alpha/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/alpha/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/alpha/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/alpha/include/uapi/asm/mman.h b/kernel/arch/alpha/include/uapi/asm/mman.h
index 3b26cc62d..6bf730063 100644
--- a/kernel/arch/alpha/include/uapi/asm/mman.h
+++ b/kernel/arch/alpha/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ALPHA_MMAN_H__
 #define __ALPHA_MMAN_H__
 
diff --git a/kernel/arch/alpha/include/uapi/asm/msgbuf.h b/kernel/arch/alpha/include/uapi/asm/msgbuf.h
index 98496501a..8c5d4d8c1 100644
--- a/kernel/arch/alpha/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/alpha/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_MSGBUF_H
 #define _ALPHA_MSGBUF_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/pal.h b/kernel/arch/alpha/include/uapi/asm/pal.h
index dfc8140b9..7427e028d 100644
--- a/kernel/arch/alpha/include/uapi/asm/pal.h
+++ b/kernel/arch/alpha/include/uapi/asm/pal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ALPHA_PAL_H
 #define _UAPI__ALPHA_PAL_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/param.h b/kernel/arch/alpha/include/uapi/asm/param.h
index dbcd9834a..49c711993 100644
--- a/kernel/arch/alpha/include/uapi/asm/param.h
+++ b/kernel/arch/alpha/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_ALPHA_PARAM_H
 #define _UAPI_ASM_ALPHA_PARAM_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/poll.h b/kernel/arch/alpha/include/uapi/asm/poll.h
index c98509d31..b7132a305 100644
--- a/kernel/arch/alpha/include/uapi/asm/poll.h
+++ b/kernel/arch/alpha/include/uapi/asm/poll.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/poll.h>
diff --git a/kernel/arch/alpha/include/uapi/asm/posix_types.h b/kernel/arch/alpha/include/uapi/asm/posix_types.h
index 5a8a48320..04f1ea575 100644
--- a/kernel/arch/alpha/include/uapi/asm/posix_types.h
+++ b/kernel/arch/alpha/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_POSIX_TYPES_H
 #define _ALPHA_POSIX_TYPES_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/ptrace.h b/kernel/arch/alpha/include/uapi/asm/ptrace.h
index 5ce83fa9a..1dfd065e4 100644
--- a/kernel/arch/alpha/include/uapi/asm/ptrace.h
+++ b/kernel/arch/alpha/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASMAXP_PTRACE_H
 #define _UAPI_ASMAXP_PTRACE_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/reg.h b/kernel/arch/alpha/include/uapi/asm/reg.h
index 86ff916fb..2652f3a38 100644
--- a/kernel/arch/alpha/include/uapi/asm/reg.h
+++ b/kernel/arch/alpha/include/uapi/asm/reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __reg_h__
 #define __reg_h__
 
diff --git a/kernel/arch/alpha/include/uapi/asm/regdef.h b/kernel/arch/alpha/include/uapi/asm/regdef.h
index 142df9c4f..cc99df0c6 100644
--- a/kernel/arch/alpha/include/uapi/asm/regdef.h
+++ b/kernel/arch/alpha/include/uapi/asm/regdef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __alpha_regdef_h__
 #define __alpha_regdef_h__
 
diff --git a/kernel/arch/alpha/include/uapi/asm/resource.h b/kernel/arch/alpha/include/uapi/asm/resource.h
index c10874ff5..362423ffe 100644
--- a/kernel/arch/alpha/include/uapi/asm/resource.h
+++ b/kernel/arch/alpha/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_RESOURCE_H
 #define _ALPHA_RESOURCE_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/sembuf.h b/kernel/arch/alpha/include/uapi/asm/sembuf.h
index 7b38b1534..f28ffa668 100644
--- a/kernel/arch/alpha/include/uapi/asm/sembuf.h
+++ b/kernel/arch/alpha/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_SEMBUF_H
 #define _ALPHA_SEMBUF_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/setup.h b/kernel/arch/alpha/include/uapi/asm/setup.h
index b50014b30..13b7ee465 100644
--- a/kernel/arch/alpha/include/uapi/asm/setup.h
+++ b/kernel/arch/alpha/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ALPHA_SETUP_H
 #define __ALPHA_SETUP_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/shmbuf.h b/kernel/arch/alpha/include/uapi/asm/shmbuf.h
index 37ee84f05..7e041ca2e 100644
--- a/kernel/arch/alpha/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/alpha/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_SHMBUF_H
 #define _ALPHA_SHMBUF_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/sigcontext.h b/kernel/arch/alpha/include/uapi/asm/sigcontext.h
index 323cdb026..5428c4256 100644
--- a/kernel/arch/alpha/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/alpha/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMAXP_SIGCONTEXT_H
 #define _ASMAXP_SIGCONTEXT_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/siginfo.h b/kernel/arch/alpha/include/uapi/asm/siginfo.h
index 70494d1d8..0cf3b527b 100644
--- a/kernel/arch/alpha/include/uapi/asm/siginfo.h
+++ b/kernel/arch/alpha/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_SIGINFO_H
 #define _ALPHA_SIGINFO_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/signal.h b/kernel/arch/alpha/include/uapi/asm/signal.h
index dd4ca4bcb..74c750bf1 100644
--- a/kernel/arch/alpha/include/uapi/asm/signal.h
+++ b/kernel/arch/alpha/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASMAXP_SIGNAL_H
 #define _UAPI_ASMAXP_SIGNAL_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/socket.h b/kernel/arch/alpha/include/uapi/asm/socket.h
index c6133a045..be14f1614 100644
--- a/kernel/arch/alpha/include/uapi/asm/socket.h
+++ b/kernel/arch/alpha/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_SOCKET_H
 #define _UAPI_ASM_SOCKET_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/sockios.h b/kernel/arch/alpha/include/uapi/asm/sockios.h
index 7932c7ab4..ba287e4b0 100644
--- a/kernel/arch/alpha/include/uapi/asm/sockios.h
+++ b/kernel/arch/alpha/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ALPHA_SOCKIOS_H
 #define _ASM_ALPHA_SOCKIOS_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/stat.h b/kernel/arch/alpha/include/uapi/asm/stat.h
index 07ad3e6b3..3f454fbd3 100644
--- a/kernel/arch/alpha/include/uapi/asm/stat.h
+++ b/kernel/arch/alpha/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_STAT_H
 #define _ALPHA_STAT_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/statfs.h b/kernel/arch/alpha/include/uapi/asm/statfs.h
index ccd2e186b..95852a4f5 100644
--- a/kernel/arch/alpha/include/uapi/asm/statfs.h
+++ b/kernel/arch/alpha/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_STATFS_H
 #define _ALPHA_STATFS_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/swab.h b/kernel/arch/alpha/include/uapi/asm/swab.h
index 4d682b16c..1cc70d272 100644
--- a/kernel/arch/alpha/include/uapi/asm/swab.h
+++ b/kernel/arch/alpha/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_SWAB_H
 #define _ALPHA_SWAB_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/sysinfo.h b/kernel/arch/alpha/include/uapi/asm/sysinfo.h
index 0b80e79d7..188ea76c7 100644
--- a/kernel/arch/alpha/include/uapi/asm/sysinfo.h
+++ b/kernel/arch/alpha/include/uapi/asm/sysinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-alpha/sysinfo.h
  */
diff --git a/kernel/arch/alpha/include/uapi/asm/termbits.h b/kernel/arch/alpha/include/uapi/asm/termbits.h
index 879dd3589..05e0398a8 100644
--- a/kernel/arch/alpha/include/uapi/asm/termbits.h
+++ b/kernel/arch/alpha/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ALPHA_TERMBITS_H
 #define _ALPHA_TERMBITS_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/termios.h b/kernel/arch/alpha/include/uapi/asm/termios.h
index 580ed1e48..e1b981222 100644
--- a/kernel/arch/alpha/include/uapi/asm/termios.h
+++ b/kernel/arch/alpha/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ALPHA_TERMIOS_H
 #define _UAPI_ALPHA_TERMIOS_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/types.h b/kernel/arch/alpha/include/uapi/asm/types.h
index 8d1024d7b..6c3d49938 100644
--- a/kernel/arch/alpha/include/uapi/asm/types.h
+++ b/kernel/arch/alpha/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ALPHA_TYPES_H
 #define _UAPI_ALPHA_TYPES_H
 
diff --git a/kernel/arch/alpha/include/uapi/asm/unistd.h b/kernel/arch/alpha/include/uapi/asm/unistd.h
index 53de540e3..e153ca6e1 100644
--- a/kernel/arch/alpha/include/uapi/asm/unistd.h
+++ b/kernel/arch/alpha/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ALPHA_UNISTD_H
 #define _UAPI_ALPHA_UNISTD_H
 
diff --git a/kernel/arch/alpha/kernel/Makefile b/kernel/arch/alpha/kernel/Makefile
index 8ce13d7a2..bf7b41fa7 100644
--- a/kernel/arch/alpha/kernel/Makefile
+++ b/kernel/arch/alpha/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/alpha/kernel/asm-offsets.c b/kernel/arch/alpha/kernel/asm-offsets.c
index 6ff8886e7..2e125e5c1 100644
--- a/kernel/arch/alpha/kernel/asm-offsets.c
+++ b/kernel/arch/alpha/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed to extract
diff --git a/kernel/arch/alpha/kernel/binfmt_loader.c b/kernel/arch/alpha/kernel/binfmt_loader.c
index 9525660c9..a8d0d6e06 100644
--- a/kernel/arch/alpha/kernel/binfmt_loader.c
+++ b/kernel/arch/alpha/kernel/binfmt_loader.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/file.h>
diff --git a/kernel/arch/alpha/kernel/console.c b/kernel/arch/alpha/kernel/console.c
index 6a61deed4..8e9a41966 100644
--- a/kernel/arch/alpha/kernel/console.c
+++ b/kernel/arch/alpha/kernel/console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/console.c
  *
diff --git a/kernel/arch/alpha/kernel/core_apecs.c b/kernel/arch/alpha/kernel/core_apecs.c
index 708c831ef..1bf3eef34 100644
--- a/kernel/arch/alpha/kernel/core_apecs.c
+++ b/kernel/arch/alpha/kernel/core_apecs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_apecs.c
  *
diff --git a/kernel/arch/alpha/kernel/core_cia.c b/kernel/arch/alpha/kernel/core_cia.c
index c44339e17..4b38386f6 100644
--- a/kernel/arch/alpha/kernel/core_cia.c
+++ b/kernel/arch/alpha/kernel/core_cia.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_cia.c
  *
diff --git a/kernel/arch/alpha/kernel/core_irongate.c b/kernel/arch/alpha/kernel/core_irongate.c
index 83d0a359a..aec757250 100644
--- a/kernel/arch/alpha/kernel/core_irongate.c
+++ b/kernel/arch/alpha/kernel/core_irongate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_irongate.c
  *
diff --git a/kernel/arch/alpha/kernel/core_lca.c b/kernel/arch/alpha/kernel/core_lca.c
index cb2801cfd..81c0c4363 100644
--- a/kernel/arch/alpha/kernel/core_lca.c
+++ b/kernel/arch/alpha/kernel/core_lca.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_lca.c
  *
diff --git a/kernel/arch/alpha/kernel/core_marvel.c b/kernel/arch/alpha/kernel/core_marvel.c
index b10c31647..bdebb8c20 100644
--- a/kernel/arch/alpha/kernel/core_marvel.c
+++ b/kernel/arch/alpha/kernel/core_marvel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_marvel.c
  *
diff --git a/kernel/arch/alpha/kernel/core_mcpcia.c b/kernel/arch/alpha/kernel/core_mcpcia.c
index da7bcc372..b1549db54 100644
--- a/kernel/arch/alpha/kernel/core_mcpcia.c
+++ b/kernel/arch/alpha/kernel/core_mcpcia.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_mcpcia.c
  *
diff --git a/kernel/arch/alpha/kernel/core_polaris.c b/kernel/arch/alpha/kernel/core_polaris.c
index c5a271d37..75d622d96 100644
--- a/kernel/arch/alpha/kernel/core_polaris.c
+++ b/kernel/arch/alpha/kernel/core_polaris.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *      linux/arch/alpha/kernel/core_polaris.c
  *
diff --git a/kernel/arch/alpha/kernel/core_t2.c b/kernel/arch/alpha/kernel/core_t2.c
index 3ada4f7b0..2c00b61ca 100644
--- a/kernel/arch/alpha/kernel/core_t2.c
+++ b/kernel/arch/alpha/kernel/core_t2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_t2.c
  *
diff --git a/kernel/arch/alpha/kernel/core_titan.c b/kernel/arch/alpha/kernel/core_titan.c
index b532d9254..132b06bdf 100644
--- a/kernel/arch/alpha/kernel/core_titan.c
+++ b/kernel/arch/alpha/kernel/core_titan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_titan.c
  *
diff --git a/kernel/arch/alpha/kernel/core_tsunami.c b/kernel/arch/alpha/kernel/core_tsunami.c
index 61893d7bd..e7c956ea4 100644
--- a/kernel/arch/alpha/kernel/core_tsunami.c
+++ b/kernel/arch/alpha/kernel/core_tsunami.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/core_tsunami.c
  *
diff --git a/kernel/arch/alpha/kernel/core_wildfire.c b/kernel/arch/alpha/kernel/core_wildfire.c
index 7e072443d..cad36fc6e 100644
--- a/kernel/arch/alpha/kernel/core_wildfire.c
+++ b/kernel/arch/alpha/kernel/core_wildfire.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/core_wildfire.c
  *
diff --git a/kernel/arch/alpha/kernel/entry.S b/kernel/arch/alpha/kernel/entry.S
index 98703d99b..d92abb01c 100644
--- a/kernel/arch/alpha/kernel/entry.S
+++ b/kernel/arch/alpha/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/kernel/entry.S
  *
diff --git a/kernel/arch/alpha/kernel/err_common.c b/kernel/arch/alpha/kernel/err_common.c
index 13d53b1c9..94e1b3dcf 100644
--- a/kernel/arch/alpha/kernel/err_common.c
+++ b/kernel/arch/alpha/kernel/err_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/err_common.c
  *
diff --git a/kernel/arch/alpha/kernel/err_ev6.c b/kernel/arch/alpha/kernel/err_ev6.c
index 51267ac57..8144f2045 100644
--- a/kernel/arch/alpha/kernel/err_ev6.c
+++ b/kernel/arch/alpha/kernel/err_ev6.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/err_ev6.c
  *
diff --git a/kernel/arch/alpha/kernel/err_ev7.c b/kernel/arch/alpha/kernel/err_ev7.c
index d738a6711..565de1acf 100644
--- a/kernel/arch/alpha/kernel/err_ev7.c
+++ b/kernel/arch/alpha/kernel/err_ev7.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/err_ev7.c
  *
diff --git a/kernel/arch/alpha/kernel/err_impl.h b/kernel/arch/alpha/kernel/err_impl.h
index ae529c416..737b958a5 100644
--- a/kernel/arch/alpha/kernel/err_impl.h
+++ b/kernel/arch/alpha/kernel/err_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	linux/arch/alpha/kernel/err_impl.h
  *
diff --git a/kernel/arch/alpha/kernel/err_marvel.c b/kernel/arch/alpha/kernel/err_marvel.c
index ae54ad91e..c0c0ccefc 100644
--- a/kernel/arch/alpha/kernel/err_marvel.c
+++ b/kernel/arch/alpha/kernel/err_marvel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/err_marvel.c
  *
diff --git a/kernel/arch/alpha/kernel/err_titan.c b/kernel/arch/alpha/kernel/err_titan.c
index 14b26c466..0ffb2feea 100644
--- a/kernel/arch/alpha/kernel/err_titan.c
+++ b/kernel/arch/alpha/kernel/err_titan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/err_titan.c
  *
diff --git a/kernel/arch/alpha/kernel/es1888.c b/kernel/arch/alpha/kernel/es1888.c
index d584c85fe..297476bb0 100644
--- a/kernel/arch/alpha/kernel/es1888.c
+++ b/kernel/arch/alpha/kernel/es1888.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/es1888.c
  *
diff --git a/kernel/arch/alpha/kernel/gct.c b/kernel/arch/alpha/kernel/gct.c
index c0c715544..8ac0088dc 100644
--- a/kernel/arch/alpha/kernel/gct.c
+++ b/kernel/arch/alpha/kernel/gct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/gct.c
  */
diff --git a/kernel/arch/alpha/kernel/head.S b/kernel/arch/alpha/kernel/head.S
index c352499ab..bb48a8ae4 100644
--- a/kernel/arch/alpha/kernel/head.S
+++ b/kernel/arch/alpha/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/kernel/head.S
  *
diff --git a/kernel/arch/alpha/kernel/io.c b/kernel/arch/alpha/kernel/io.c
index 19c5875ab..3e3d49c25 100644
--- a/kernel/arch/alpha/kernel/io.c
+++ b/kernel/arch/alpha/kernel/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alpha IO and memory functions.
  */
diff --git a/kernel/arch/alpha/kernel/irq.c b/kernel/arch/alpha/kernel/irq.c
index 2f26ae74b..f6d2946ed 100644
--- a/kernel/arch/alpha/kernel/irq.c
+++ b/kernel/arch/alpha/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/irq.c
  *
diff --git a/kernel/arch/alpha/kernel/irq_alpha.c b/kernel/arch/alpha/kernel/irq_alpha.c
index 1c8625cb0..da3e10d5f 100644
--- a/kernel/arch/alpha/kernel/irq_alpha.c
+++ b/kernel/arch/alpha/kernel/irq_alpha.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alpha specific irq code.
  */
diff --git a/kernel/arch/alpha/kernel/irq_i8259.c b/kernel/arch/alpha/kernel/irq_i8259.c
index e1861c77d..5d54c076a 100644
--- a/kernel/arch/alpha/kernel/irq_i8259.c
+++ b/kernel/arch/alpha/kernel/irq_i8259.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *      linux/arch/alpha/kernel/irq_i8259.c
  *
diff --git a/kernel/arch/alpha/kernel/irq_impl.h b/kernel/arch/alpha/kernel/irq_impl.h
index d507a234b..16f2b0276 100644
--- a/kernel/arch/alpha/kernel/irq_impl.h
+++ b/kernel/arch/alpha/kernel/irq_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	linux/arch/alpha/kernel/irq_impl.h
  *
diff --git a/kernel/arch/alpha/kernel/irq_pyxis.c b/kernel/arch/alpha/kernel/irq_pyxis.c
index 13c97a5b3..a968b10e6 100644
--- a/kernel/arch/alpha/kernel/irq_pyxis.c
+++ b/kernel/arch/alpha/kernel/irq_pyxis.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/irq_pyxis.c
  *
diff --git a/kernel/arch/alpha/kernel/irq_srm.c b/kernel/arch/alpha/kernel/irq_srm.c
index a79fa30e7..bfacd6a06 100644
--- a/kernel/arch/alpha/kernel/irq_srm.c
+++ b/kernel/arch/alpha/kernel/irq_srm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Handle interrupts from the SRM, assuming no additional weirdness.
  */
diff --git a/kernel/arch/alpha/kernel/machvec_impl.h b/kernel/arch/alpha/kernel/machvec_impl.h
index b7d69604b..38f045ec5 100644
--- a/kernel/arch/alpha/kernel/machvec_impl.h
+++ b/kernel/arch/alpha/kernel/machvec_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	linux/arch/alpha/kernel/machvec_impl.h
  *
diff --git a/kernel/arch/alpha/kernel/osf_sys.c b/kernel/arch/alpha/kernel/osf_sys.c
index df0d0a5e9..ce3a675c0 100644
--- a/kernel/arch/alpha/kernel/osf_sys.c
+++ b/kernel/arch/alpha/kernel/osf_sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/osf_sys.c
  *
diff --git a/kernel/arch/alpha/kernel/pc873xx.c b/kernel/arch/alpha/kernel/pc873xx.c
index 27dcbff85..63aee5d86 100644
--- a/kernel/arch/alpha/kernel/pc873xx.c
+++ b/kernel/arch/alpha/kernel/pc873xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ioport.h>
 #include <asm/io.h>
 
diff --git a/kernel/arch/alpha/kernel/pc873xx.h b/kernel/arch/alpha/kernel/pc873xx.h
index 25e16956f..043533027 100644
--- a/kernel/arch/alpha/kernel/pc873xx.h
+++ b/kernel/arch/alpha/kernel/pc873xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _PC873xx_H_
 #define _PC873xx_H_
diff --git a/kernel/arch/alpha/kernel/pci-noop.c b/kernel/arch/alpha/kernel/pci-noop.c
index 676bab6e3..b995987b1 100644
--- a/kernel/arch/alpha/kernel/pci-noop.c
+++ b/kernel/arch/alpha/kernel/pci-noop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/pci-noop.c
  *
diff --git a/kernel/arch/alpha/kernel/pci-sysfs.c b/kernel/arch/alpha/kernel/pci-sysfs.c
index cbecd527c..f94c732fe 100644
--- a/kernel/arch/alpha/kernel/pci-sysfs.c
+++ b/kernel/arch/alpha/kernel/pci-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/kernel/pci-sysfs.c
  *
diff --git a/kernel/arch/alpha/kernel/pci.c b/kernel/arch/alpha/kernel/pci.c
index 564114eb8..08235bb1f 100644
--- a/kernel/arch/alpha/kernel/pci.c
+++ b/kernel/arch/alpha/kernel/pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/pci.c
  *
diff --git a/kernel/arch/alpha/kernel/pci_impl.h b/kernel/arch/alpha/kernel/pci_impl.h
index 2b0ac429f..262316016 100644
--- a/kernel/arch/alpha/kernel/pci_impl.h
+++ b/kernel/arch/alpha/kernel/pci_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	linux/arch/alpha/kernel/pci_impl.h
  *
diff --git a/kernel/arch/alpha/kernel/pci_iommu.c b/kernel/arch/alpha/kernel/pci_iommu.c
index 7fd232903..83b34b918 100644
--- a/kernel/arch/alpha/kernel/pci_iommu.c
+++ b/kernel/arch/alpha/kernel/pci_iommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/pci_iommu.c
  */
diff --git a/kernel/arch/alpha/kernel/perf_event.c b/kernel/arch/alpha/kernel/perf_event.c
index 5c218aa3f..a1f6bc7f1 100644
--- a/kernel/arch/alpha/kernel/perf_event.c
+++ b/kernel/arch/alpha/kernel/perf_event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Hardware performance events for the Alpha.
  *
diff --git a/kernel/arch/alpha/kernel/process.c b/kernel/arch/alpha/kernel/process.c
index 0b9635040..74bfb1f2d 100644
--- a/kernel/arch/alpha/kernel/process.c
+++ b/kernel/arch/alpha/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/process.c
  *
diff --git a/kernel/arch/alpha/kernel/proto.h b/kernel/arch/alpha/kernel/proto.h
index da2d6ec9c..f1fce942f 100644
--- a/kernel/arch/alpha/kernel/proto.h
+++ b/kernel/arch/alpha/kernel/proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/interrupt.h>
 #include <linux/io.h>
 
diff --git a/kernel/arch/alpha/kernel/ptrace.c b/kernel/arch/alpha/kernel/ptrace.c
index 285a82d49..cb8d599e7 100644
--- a/kernel/arch/alpha/kernel/ptrace.c
+++ b/kernel/arch/alpha/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ptrace.c */
 /* By Ross Biro 1/23/92 */
 /* edited by Linus Torvalds */
diff --git a/kernel/arch/alpha/kernel/rtc.c b/kernel/arch/alpha/kernel/rtc.c
index ceed68c75..b3da0dcda 100644
--- a/kernel/arch/alpha/kernel/rtc.c
+++ b/kernel/arch/alpha/kernel/rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/rtc.c
  *
diff --git a/kernel/arch/alpha/kernel/setup.c b/kernel/arch/alpha/kernel/setup.c
index 249229ab4..5576f7646 100644
--- a/kernel/arch/alpha/kernel/setup.c
+++ b/kernel/arch/alpha/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/setup.c
  *
diff --git a/kernel/arch/alpha/kernel/signal.c b/kernel/arch/alpha/kernel/signal.c
index 8129dd92c..9ebb3bcbc 100644
--- a/kernel/arch/alpha/kernel/signal.c
+++ b/kernel/arch/alpha/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/signal.c
  *
diff --git a/kernel/arch/alpha/kernel/smc37c93x.c b/kernel/arch/alpha/kernel/smc37c93x.c
index 6886b834f..733f08966 100644
--- a/kernel/arch/alpha/kernel/smc37c93x.c
+++ b/kernel/arch/alpha/kernel/smc37c93x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SMC 37C93X initialization code
  */
diff --git a/kernel/arch/alpha/kernel/smp.c b/kernel/arch/alpha/kernel/smp.c
index f6726a746..d0dccae53 100644
--- a/kernel/arch/alpha/kernel/smp.c
+++ b/kernel/arch/alpha/kernel/smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/smp.c
  *
diff --git a/kernel/arch/alpha/kernel/srmcons.c b/kernel/arch/alpha/kernel/srmcons.c
index e9c45b65a..5da0aec8c 100644
--- a/kernel/arch/alpha/kernel/srmcons.c
+++ b/kernel/arch/alpha/kernel/srmcons.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/srmcons.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_alcor.c b/kernel/arch/alpha/kernel/sys_alcor.c
index 7ad074fd5..e56efd5b8 100644
--- a/kernel/arch/alpha/kernel/sys_alcor.c
+++ b/kernel/arch/alpha/kernel/sys_alcor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_alcor.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_cabriolet.c b/kernel/arch/alpha/kernel/sys_cabriolet.c
index c0fa1fe5c..10bc46a4e 100644
--- a/kernel/arch/alpha/kernel/sys_cabriolet.c
+++ b/kernel/arch/alpha/kernel/sys_cabriolet.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_cabriolet.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_dp264.c b/kernel/arch/alpha/kernel/sys_dp264.c
index 9e1e40ea1..d33508621 100644
--- a/kernel/arch/alpha/kernel/sys_dp264.c
+++ b/kernel/arch/alpha/kernel/sys_dp264.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_dp264.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_eb64p.c b/kernel/arch/alpha/kernel/sys_eb64p.c
index 372661c56..5251937ec 100644
--- a/kernel/arch/alpha/kernel/sys_eb64p.c
+++ b/kernel/arch/alpha/kernel/sys_eb64p.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_eb64p.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_eiger.c b/kernel/arch/alpha/kernel/sys_eiger.c
index 2731738b5..016f79251 100644
--- a/kernel/arch/alpha/kernel/sys_eiger.c
+++ b/kernel/arch/alpha/kernel/sys_eiger.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_eiger.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_jensen.c b/kernel/arch/alpha/kernel/sys_jensen.c
index 608f2a7fa..d0d44f543 100644
--- a/kernel/arch/alpha/kernel/sys_jensen.c
+++ b/kernel/arch/alpha/kernel/sys_jensen.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_jensen.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_marvel.c b/kernel/arch/alpha/kernel/sys_marvel.c
index 3e5339203..8d34cf6e0 100644
--- a/kernel/arch/alpha/kernel/sys_marvel.c
+++ b/kernel/arch/alpha/kernel/sys_marvel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/alpha/kernel/sys_marvel.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_miata.c b/kernel/arch/alpha/kernel/sys_miata.c
index 731d693fa..6fa07dc53 100644
--- a/kernel/arch/alpha/kernel/sys_miata.c
+++ b/kernel/arch/alpha/kernel/sys_miata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_miata.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_mikasa.c b/kernel/arch/alpha/kernel/sys_mikasa.c
index 350ec9c83..3af4f9411 100644
--- a/kernel/arch/alpha/kernel/sys_mikasa.c
+++ b/kernel/arch/alpha/kernel/sys_mikasa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_mikasa.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_nautilus.c b/kernel/arch/alpha/kernel/sys_nautilus.c
index d019e4ce0..239dc0e60 100644
--- a/kernel/arch/alpha/kernel/sys_nautilus.c
+++ b/kernel/arch/alpha/kernel/sys_nautilus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_nautilus.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_noritake.c b/kernel/arch/alpha/kernel/sys_noritake.c
index 2301678d9..b106f327f 100644
--- a/kernel/arch/alpha/kernel/sys_noritake.c
+++ b/kernel/arch/alpha/kernel/sys_noritake.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_noritake.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_rawhide.c b/kernel/arch/alpha/kernel/sys_rawhide.c
index 546822d07..b76f65d0e 100644
--- a/kernel/arch/alpha/kernel/sys_rawhide.c
+++ b/kernel/arch/alpha/kernel/sys_rawhide.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_rawhide.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_ruffian.c b/kernel/arch/alpha/kernel/sys_ruffian.c
index 3b35e1913..07830ccca 100644
--- a/kernel/arch/alpha/kernel/sys_ruffian.c
+++ b/kernel/arch/alpha/kernel/sys_ruffian.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_ruffian.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_rx164.c b/kernel/arch/alpha/kernel/sys_rx164.c
index e17800710..a3db719d3 100644
--- a/kernel/arch/alpha/kernel/sys_rx164.c
+++ b/kernel/arch/alpha/kernel/sys_rx164.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_rx164.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_sable.c b/kernel/arch/alpha/kernel/sys_sable.c
index 86d259c26..3cf0d32da 100644
--- a/kernel/arch/alpha/kernel/sys_sable.c
+++ b/kernel/arch/alpha/kernel/sys_sable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_sable.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_sio.c b/kernel/arch/alpha/kernel/sys_sio.c
index 9fd289563..37bd6d9b8 100644
--- a/kernel/arch/alpha/kernel/sys_sio.c
+++ b/kernel/arch/alpha/kernel/sys_sio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_sio.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_sx164.c b/kernel/arch/alpha/kernel/sys_sx164.c
index 23eee54d7..1ec638a27 100644
--- a/kernel/arch/alpha/kernel/sys_sx164.c
+++ b/kernel/arch/alpha/kernel/sys_sx164.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_sx164.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_takara.c b/kernel/arch/alpha/kernel/sys_takara.c
index 9101f2bb6..e230c6864 100644
--- a/kernel/arch/alpha/kernel/sys_takara.c
+++ b/kernel/arch/alpha/kernel/sys_takara.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_takara.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_titan.c b/kernel/arch/alpha/kernel/sys_titan.c
index a53cf03f4..c8390d8de 100644
--- a/kernel/arch/alpha/kernel/sys_titan.c
+++ b/kernel/arch/alpha/kernel/sys_titan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/alpha/kernel/sys_titan.c
  *
diff --git a/kernel/arch/alpha/kernel/sys_wildfire.c b/kernel/arch/alpha/kernel/sys_wildfire.c
index c3f8b79fe..8e6405281 100644
--- a/kernel/arch/alpha/kernel/sys_wildfire.c
+++ b/kernel/arch/alpha/kernel/sys_wildfire.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/sys_wildfire.c
  *
diff --git a/kernel/arch/alpha/kernel/systbls.S b/kernel/arch/alpha/kernel/systbls.S
index 5b4514abb..1374e5915 100644
--- a/kernel/arch/alpha/kernel/systbls.S
+++ b/kernel/arch/alpha/kernel/systbls.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/kernel/systbls.S
  *
diff --git a/kernel/arch/alpha/kernel/time.c b/kernel/arch/alpha/kernel/time.c
index 3bfe058d7..006936069 100644
--- a/kernel/arch/alpha/kernel/time.c
+++ b/kernel/arch/alpha/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/kernel/time.c
  *
diff --git a/kernel/arch/alpha/kernel/traps.c b/kernel/arch/alpha/kernel/traps.c
index 49d3b1e63..4bd99a7b1 100644
--- a/kernel/arch/alpha/kernel/traps.c
+++ b/kernel/arch/alpha/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/kernel/traps.c
  *
diff --git a/kernel/arch/alpha/kernel/vmlinux.lds.S b/kernel/arch/alpha/kernel/vmlinux.lds.S
index cebecfb76..c4b5cecea 100644
--- a/kernel/arch/alpha/kernel/vmlinux.lds.S
+++ b/kernel/arch/alpha/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
 #include <asm/cache.h>
diff --git a/kernel/arch/alpha/lib/Makefile b/kernel/arch/alpha/lib/Makefile
index a80815960..04f9729de 100644
--- a/kernel/arch/alpha/lib/Makefile
+++ b/kernel/arch/alpha/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for alpha-specific library files..
 #
diff --git a/kernel/arch/alpha/lib/callback_srm.S b/kernel/arch/alpha/lib/callback_srm.S
index 6093addc9..b13c4a231 100644
--- a/kernel/arch/alpha/lib/callback_srm.S
+++ b/kernel/arch/alpha/lib/callback_srm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	arch/alpha/lib/callback_srm.S
  */
diff --git a/kernel/arch/alpha/lib/checksum.c b/kernel/arch/alpha/lib/checksum.c
index b57f8007d..3f35c3ed6 100644
--- a/kernel/arch/alpha/lib/checksum.c
+++ b/kernel/arch/alpha/lib/checksum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/lib/checksum.c
  *
diff --git a/kernel/arch/alpha/lib/clear_page.S b/kernel/arch/alpha/lib/clear_page.S
index 263d7393c..ce02de7b0 100644
--- a/kernel/arch/alpha/lib/clear_page.S
+++ b/kernel/arch/alpha/lib/clear_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/clear_page.S
  *
diff --git a/kernel/arch/alpha/lib/clear_user.S b/kernel/arch/alpha/lib/clear_user.S
index 006f469fe..db6c6ca45 100644
--- a/kernel/arch/alpha/lib/clear_user.S
+++ b/kernel/arch/alpha/lib/clear_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/clear_user.S
  * Contributed by Richard Henderson <rth@tamu.edu>
diff --git a/kernel/arch/alpha/lib/copy_page.S b/kernel/arch/alpha/lib/copy_page.S
index 2ee0bd050..5439a30c7 100644
--- a/kernel/arch/alpha/lib/copy_page.S
+++ b/kernel/arch/alpha/lib/copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/copy_page.S
  *
diff --git a/kernel/arch/alpha/lib/copy_user.S b/kernel/arch/alpha/lib/copy_user.S
index c277a1a43..32ab0344b 100644
--- a/kernel/arch/alpha/lib/copy_user.S
+++ b/kernel/arch/alpha/lib/copy_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/copy_user.S
  *
diff --git a/kernel/arch/alpha/lib/csum_ipv6_magic.S b/kernel/arch/alpha/lib/csum_ipv6_magic.S
index e74b4544b..c7b213ab0 100644
--- a/kernel/arch/alpha/lib/csum_ipv6_magic.S
+++ b/kernel/arch/alpha/lib/csum_ipv6_magic.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/csum_ipv6_magic.S
  * Contributed by Richard Henderson <rth@tamu.edu>
diff --git a/kernel/arch/alpha/lib/csum_partial_copy.c b/kernel/arch/alpha/lib/csum_partial_copy.c
index ab42afba1..ddb9c2f37 100644
--- a/kernel/arch/alpha/lib/csum_partial_copy.c
+++ b/kernel/arch/alpha/lib/csum_partial_copy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * csum_partial_copy - do IP checksumming and copy
  *
diff --git a/kernel/arch/alpha/lib/dbg_current.S b/kernel/arch/alpha/lib/dbg_current.S
index e6d071015..be6612131 100644
--- a/kernel/arch/alpha/lib/dbg_current.S
+++ b/kernel/arch/alpha/lib/dbg_current.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/dbg_current.S
  * Contributed by Richard Henderson (rth@cygnus.com)
diff --git a/kernel/arch/alpha/lib/dbg_stackcheck.S b/kernel/arch/alpha/lib/dbg_stackcheck.S
index 78f6b924a..b3b6fc94f 100644
--- a/kernel/arch/alpha/lib/dbg_stackcheck.S
+++ b/kernel/arch/alpha/lib/dbg_stackcheck.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/dbg_stackcheck.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/dbg_stackkill.S b/kernel/arch/alpha/lib/dbg_stackkill.S
index c1e40a1a4..6d9197e52 100644
--- a/kernel/arch/alpha/lib/dbg_stackkill.S
+++ b/kernel/arch/alpha/lib/dbg_stackkill.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/dbg_stackkill.S
  * Contributed by Richard Henderson (rth@cygnus.com)
diff --git a/kernel/arch/alpha/lib/dec_and_lock.c b/kernel/arch/alpha/lib/dec_and_lock.c
index 4221b4016..a117707f5 100644
--- a/kernel/arch/alpha/lib/dec_and_lock.c
+++ b/kernel/arch/alpha/lib/dec_and_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/lib/dec_and_lock.c
  *
diff --git a/kernel/arch/alpha/lib/divide.S b/kernel/arch/alpha/lib/divide.S
index 1e33bd127..2b60eb45e 100644
--- a/kernel/arch/alpha/lib/divide.S
+++ b/kernel/arch/alpha/lib/divide.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/divide.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-clear_page.S b/kernel/arch/alpha/lib/ev6-clear_page.S
index abe99e69a..325864c81 100644
--- a/kernel/arch/alpha/lib/ev6-clear_page.S
+++ b/kernel/arch/alpha/lib/ev6-clear_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-clear_page.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-clear_user.S b/kernel/arch/alpha/lib/ev6-clear_user.S
index e179e4757..7e644f83c 100644
--- a/kernel/arch/alpha/lib/ev6-clear_user.S
+++ b/kernel/arch/alpha/lib/ev6-clear_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-clear_user.S
  * 21264 version contributed by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev6-copy_page.S b/kernel/arch/alpha/lib/ev6-copy_page.S
index 77935061b..fd7212c8d 100644
--- a/kernel/arch/alpha/lib/ev6-copy_page.S
+++ b/kernel/arch/alpha/lib/ev6-copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-copy_page.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-copy_user.S b/kernel/arch/alpha/lib/ev6-copy_user.S
index 954ca03eb..f3e433754 100644
--- a/kernel/arch/alpha/lib/ev6-copy_user.S
+++ b/kernel/arch/alpha/lib/ev6-copy_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-copy_user.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-csum_ipv6_magic.S b/kernel/arch/alpha/lib/ev6-csum_ipv6_magic.S
index de62627ac..9a73f9070 100644
--- a/kernel/arch/alpha/lib/ev6-csum_ipv6_magic.S
+++ b/kernel/arch/alpha/lib/ev6-csum_ipv6_magic.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-csum_ipv6_magic.S
  * 21264 version contributed by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev6-divide.S b/kernel/arch/alpha/lib/ev6-divide.S
index d18dc0e96..137ff1a07 100644
--- a/kernel/arch/alpha/lib/ev6-divide.S
+++ b/kernel/arch/alpha/lib/ev6-divide.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-divide.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-memchr.S b/kernel/arch/alpha/lib/ev6-memchr.S
index 419adc53c..56bf9e14e 100644
--- a/kernel/arch/alpha/lib/ev6-memchr.S
+++ b/kernel/arch/alpha/lib/ev6-memchr.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-memchr.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-memcpy.S b/kernel/arch/alpha/lib/ev6-memcpy.S
index b19798b2e..ffbd056b6 100644
--- a/kernel/arch/alpha/lib/ev6-memcpy.S
+++ b/kernel/arch/alpha/lib/ev6-memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-memcpy.S
  * 21264 version by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev6-memset.S b/kernel/arch/alpha/lib/ev6-memset.S
index fed21c689..316a99aa9 100644
--- a/kernel/arch/alpha/lib/ev6-memset.S
+++ b/kernel/arch/alpha/lib/ev6-memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-memset.S
  *
diff --git a/kernel/arch/alpha/lib/ev6-stxcpy.S b/kernel/arch/alpha/lib/ev6-stxcpy.S
index 4643ff2ff..65f5f7310 100644
--- a/kernel/arch/alpha/lib/ev6-stxcpy.S
+++ b/kernel/arch/alpha/lib/ev6-stxcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-stxcpy.S
  * 21264 version contributed by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev6-stxncpy.S b/kernel/arch/alpha/lib/ev6-stxncpy.S
index 1aa6e97e0..76da20528 100644
--- a/kernel/arch/alpha/lib/ev6-stxncpy.S
+++ b/kernel/arch/alpha/lib/ev6-stxncpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev6-stxncpy.S
  * 21264 version contributed by Rick Gorton <rick.gorton@api-networks.com>
diff --git a/kernel/arch/alpha/lib/ev67-strcat.S b/kernel/arch/alpha/lib/ev67-strcat.S
index b69f60419..ec3096a9e 100644
--- a/kernel/arch/alpha/lib/ev67-strcat.S
+++ b/kernel/arch/alpha/lib/ev67-strcat.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev67-strcat.S
  * 21264 version contributed by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev67-strchr.S b/kernel/arch/alpha/lib/ev67-strchr.S
index ea8f2f35d..fbf89e0b6 100644
--- a/kernel/arch/alpha/lib/ev67-strchr.S
+++ b/kernel/arch/alpha/lib/ev67-strchr.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev67-strchr.S
  * 21264 version contributed by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev67-strlen.S b/kernel/arch/alpha/lib/ev67-strlen.S
index 736fd4188..b73106ffb 100644
--- a/kernel/arch/alpha/lib/ev67-strlen.S
+++ b/kernel/arch/alpha/lib/ev67-strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev67-strlen.S
  * 21264 version by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/ev67-strncat.S b/kernel/arch/alpha/lib/ev67-strncat.S
index cd35cbade..ceb0ca528 100644
--- a/kernel/arch/alpha/lib/ev67-strncat.S
+++ b/kernel/arch/alpha/lib/ev67-strncat.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev67-strncat.S
  * 21264 version contributed by Rick Gorton <rick.gorton@api-networks.com>
diff --git a/kernel/arch/alpha/lib/ev67-strrchr.S b/kernel/arch/alpha/lib/ev67-strrchr.S
index 747455f03..7f80e3985 100644
--- a/kernel/arch/alpha/lib/ev67-strrchr.S
+++ b/kernel/arch/alpha/lib/ev67-strrchr.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/ev67-strrchr.S
  * 21264 version by Rick Gorton <rick.gorton@alpha-processor.com>
diff --git a/kernel/arch/alpha/lib/fls.c b/kernel/arch/alpha/lib/fls.c
index ddd048c0d..02e156776 100644
--- a/kernel/arch/alpha/lib/fls.c
+++ b/kernel/arch/alpha/lib/fls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* 
  * arch/alpha/lib/fls.c
  */
diff --git a/kernel/arch/alpha/lib/fpreg.c b/kernel/arch/alpha/lib/fpreg.c
index 4aa6dbfa1..34fea4656 100644
--- a/kernel/arch/alpha/lib/fpreg.c
+++ b/kernel/arch/alpha/lib/fpreg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/alpha/lib/fpreg.c
  *
diff --git a/kernel/arch/alpha/lib/memcpy.c b/kernel/arch/alpha/lib/memcpy.c
index 57d9291ad..cbac3dc6d 100644
--- a/kernel/arch/alpha/lib/memcpy.c
+++ b/kernel/arch/alpha/lib/memcpy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/lib/memcpy.c
  *
diff --git a/kernel/arch/alpha/lib/memmove.S b/kernel/arch/alpha/lib/memmove.S
index 6872c85cb..42d1922d0 100644
--- a/kernel/arch/alpha/lib/memmove.S
+++ b/kernel/arch/alpha/lib/memmove.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/memmove.S
  *
diff --git a/kernel/arch/alpha/lib/memset.S b/kernel/arch/alpha/lib/memset.S
index f824969e9..00393e30d 100644
--- a/kernel/arch/alpha/lib/memset.S
+++ b/kernel/arch/alpha/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/arch/alpha/lib/memset.S
  *
diff --git a/kernel/arch/alpha/lib/srm_printk.c b/kernel/arch/alpha/lib/srm_printk.c
index 31b53c494..6276eed76 100644
--- a/kernel/arch/alpha/lib/srm_printk.c
+++ b/kernel/arch/alpha/lib/srm_printk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	arch/alpha/lib/srm_printk.c
  */
diff --git a/kernel/arch/alpha/lib/srm_puts.c b/kernel/arch/alpha/lib/srm_puts.c
index 7b60a6f75..df7991f6f 100644
--- a/kernel/arch/alpha/lib/srm_puts.c
+++ b/kernel/arch/alpha/lib/srm_puts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	arch/alpha/lib/srm_puts.c
  */
diff --git a/kernel/arch/alpha/lib/stacktrace.c b/kernel/arch/alpha/lib/stacktrace.c
index 5e832161e..62454a781 100644
--- a/kernel/arch/alpha/lib/stacktrace.c
+++ b/kernel/arch/alpha/lib/stacktrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 
 typedef unsigned int instr;
diff --git a/kernel/arch/alpha/lib/strcat.S b/kernel/arch/alpha/lib/strcat.S
index 249837b03..055877dcc 100644
--- a/kernel/arch/alpha/lib/strcat.S
+++ b/kernel/arch/alpha/lib/strcat.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/strcat.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/strchr.S b/kernel/arch/alpha/lib/strchr.S
index 7412a173e..17871dd00 100644
--- a/kernel/arch/alpha/lib/strchr.S
+++ b/kernel/arch/alpha/lib/strchr.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/strchr.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/strcpy.S b/kernel/arch/alpha/lib/strcpy.S
index 98deae1e4..cb74ad23a 100644
--- a/kernel/arch/alpha/lib/strcpy.S
+++ b/kernel/arch/alpha/lib/strcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/strcpy.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/strlen.S b/kernel/arch/alpha/lib/strlen.S
index 79c416f71..dd882fe4d 100644
--- a/kernel/arch/alpha/lib/strlen.S
+++ b/kernel/arch/alpha/lib/strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * strlen.S (c) 1995 David Mosberger (davidm@cs.arizona.edu)
  *
diff --git a/kernel/arch/alpha/lib/strncat.S b/kernel/arch/alpha/lib/strncat.S
index 6c29ea608..522fee3e2 100644
--- a/kernel/arch/alpha/lib/strncat.S
+++ b/kernel/arch/alpha/lib/strncat.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/strncat.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/strncpy.S b/kernel/arch/alpha/lib/strncpy.S
index e102cf156..cc57fad8b 100644
--- a/kernel/arch/alpha/lib/strncpy.S
+++ b/kernel/arch/alpha/lib/strncpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/strncpy.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/strrchr.S b/kernel/arch/alpha/lib/strrchr.S
index 4bc6cb4b9..7650ba99b 100644
--- a/kernel/arch/alpha/lib/strrchr.S
+++ b/kernel/arch/alpha/lib/strrchr.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/strrchr.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/stxcpy.S b/kernel/arch/alpha/lib/stxcpy.S
index 2a8d51bfc..58723b0a3 100644
--- a/kernel/arch/alpha/lib/stxcpy.S
+++ b/kernel/arch/alpha/lib/stxcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/stxcpy.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/stxncpy.S b/kernel/arch/alpha/lib/stxncpy.S
index 3dece2528..011d9091c 100644
--- a/kernel/arch/alpha/lib/stxncpy.S
+++ b/kernel/arch/alpha/lib/stxncpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/alpha/lib/stxncpy.S
  * Contributed by Richard Henderson (rth@tamu.edu)
diff --git a/kernel/arch/alpha/lib/udelay.c b/kernel/arch/alpha/lib/udelay.c
index f2d81ff38..873648263 100644
--- a/kernel/arch/alpha/lib/udelay.c
+++ b/kernel/arch/alpha/lib/udelay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1993, 2000 Linus Torvalds
  *
diff --git a/kernel/arch/alpha/math-emu/sfp-util.h b/kernel/arch/alpha/math-emu/sfp-util.h
index f53707f77..ae30f3417 100644
--- a/kernel/arch/alpha/math-emu/sfp-util.h
+++ b/kernel/arch/alpha/math-emu/sfp-util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
diff --git a/kernel/arch/alpha/mm/fault.c b/kernel/arch/alpha/mm/fault.c
index c25e8827e..cd3c572ee 100644
--- a/kernel/arch/alpha/mm/fault.c
+++ b/kernel/arch/alpha/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/mm/fault.c
  *
diff --git a/kernel/arch/alpha/mm/init.c b/kernel/arch/alpha/mm/init.c
index 0542e973c..9d7452029 100644
--- a/kernel/arch/alpha/mm/init.c
+++ b/kernel/arch/alpha/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/mm/init.c
  *
diff --git a/kernel/arch/alpha/mm/numa.c b/kernel/arch/alpha/mm/numa.c
index d543d71c2..a9e86475f 100644
--- a/kernel/arch/alpha/mm/numa.c
+++ b/kernel/arch/alpha/mm/numa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/alpha/mm/numa.c
  *
diff --git a/kernel/arch/alpha/oprofile/Makefile b/kernel/arch/alpha/oprofile/Makefile
index 3473de751..79f32820a 100644
--- a/kernel/arch/alpha/oprofile/Makefile
+++ b/kernel/arch/alpha/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Werror -Wno-sign-compare
 
 obj-$(CONFIG_OPROFILE) += oprofile.o
diff --git a/kernel/arch/arc/Kconfig.debug b/kernel/arch/arc/Kconfig.debug
index ff6a4b5ce..03da1a6b3 100644
--- a/kernel/arch/arc/Kconfig.debug
+++ b/kernel/arch/arc/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/arc/boot/Makefile b/kernel/arch/arc/boot/Makefile
index f94cf151e..538b92f4d 100644
--- a/kernel/arch/arc/boot/Makefile
+++ b/kernel/arch/arc/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 targets := vmlinux.bin vmlinux.bin.gz uImage
 
 # uImage build relies on mkimage being availble on your host for ARC target
diff --git a/kernel/arch/arc/boot/dts/Makefile b/kernel/arch/arc/boot/dts/Makefile
index a09f11b71..83c9e076e 100644
--- a/kernel/arch/arc/boot/dts/Makefile
+++ b/kernel/arch/arc/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Built-in dtb
 builtindtb-y		:= nsim_700
 
diff --git a/kernel/arch/arc/include/asm/Kbuild b/kernel/arch/arc/include/asm/Kbuild
index 353dae386..cd8398dac 100644
--- a/kernel/arch/arc/include/asm/Kbuild
+++ b/kernel/arch/arc/include/asm/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 generic-y += bugs.h
 generic-y += clkdev.h
 generic-y += device.h
diff --git a/kernel/arch/arc/include/asm/entry-arcv2.h b/kernel/arch/arc/include/asm/entry-arcv2.h
index ac85380d1..257a68f3c 100644
--- a/kernel/arch/arc/include/asm/entry-arcv2.h
+++ b/kernel/arch/arc/include/asm/entry-arcv2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __ASM_ARC_ENTRY_ARCV2_H
 #define __ASM_ARC_ENTRY_ARCV2_H
diff --git a/kernel/arch/arc/include/asm/fb.h b/kernel/arch/arc/include/asm/fb.h
index bd3f68c9d..dc2e303cd 100644
--- a/kernel/arch/arc/include/asm/fb.h
+++ b/kernel/arch/arc/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
diff --git a/kernel/arch/arc/include/uapi/asm/byteorder.h b/kernel/arch/arc/include/uapi/asm/byteorder.h
index ea5ca444c..554011153 100644
--- a/kernel/arch/arc/include/uapi/asm/byteorder.h
+++ b/kernel/arch/arc/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/cachectl.h b/kernel/arch/arc/include/uapi/asm/cachectl.h
index 51c73f025..0e4f2affc 100644
--- a/kernel/arch/arc/include/uapi/asm/cachectl.h
+++ b/kernel/arch/arc/include/uapi/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/elf.h b/kernel/arch/arc/include/uapi/asm/elf.h
index 06d95e611..3c1dae4e5 100644
--- a/kernel/arch/arc/include/uapi/asm/elf.h
+++ b/kernel/arch/arc/include/uapi/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/page.h b/kernel/arch/arc/include/uapi/asm/page.h
index 059aff38f..2a97e2718 100644
--- a/kernel/arch/arc/include/uapi/asm/page.h
+++ b/kernel/arch/arc/include/uapi/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/ptrace.h b/kernel/arch/arc/include/uapi/asm/ptrace.h
index dd206e6b4..2a6eff57f 100644
--- a/kernel/arch/arc/include/uapi/asm/ptrace.h
+++ b/kernel/arch/arc/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/sigcontext.h b/kernel/arch/arc/include/uapi/asm/sigcontext.h
index 9678a11fc..95f8a4380 100644
--- a/kernel/arch/arc/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/arc/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/signal.h b/kernel/arch/arc/include/uapi/asm/signal.h
index fad62f7f4..ba3143a1b 100644
--- a/kernel/arch/arc/include/uapi/asm/signal.h
+++ b/kernel/arch/arc/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/swab.h b/kernel/arch/arc/include/uapi/asm/swab.h
index 71f3918b0..02109cd48 100644
--- a/kernel/arch/arc/include/uapi/asm/swab.h
+++ b/kernel/arch/arc/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/include/uapi/asm/unistd.h b/kernel/arch/arc/include/uapi/asm/unistd.h
index 9a34136d8..517178b1d 100644
--- a/kernel/arch/arc/include/uapi/asm/unistd.h
+++ b/kernel/arch/arc/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/arch/arc/kernel/sys.c b/kernel/arch/arc/kernel/sys.c
index 9d6c1ca26..fddecc76e 100644
--- a/kernel/arch/arc/kernel/sys.c
+++ b/kernel/arch/arc/kernel/sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/syscalls.h>
 #include <linux/signal.h>
diff --git a/kernel/arch/arc/oprofile/Makefile b/kernel/arch/arc/oprofile/Makefile
index ce417a6e7..698367bb4 100644
--- a/kernel/arch/arc/oprofile/Makefile
+++ b/kernel/arch/arc/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/arc/plat-eznps/Kconfig b/kernel/arch/arc/plat-eznps/Kconfig
index e151e2067..8eff057ef 100644
--- a/kernel/arch/arc/plat-eznps/Kconfig
+++ b/kernel/arch/arc/plat-eznps/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
diff --git a/kernel/arch/arm/Kconfig b/kernel/arch/arm/Kconfig
index 7888c9803..d1346a160 100644
--- a/kernel/arch/arm/Kconfig
+++ b/kernel/arch/arm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARM
 	bool
 	default y
diff --git a/kernel/arch/arm/Kconfig-nommu b/kernel/arch/arm/Kconfig-nommu
index b75763495..22f34c423 100644
--- a/kernel/arch/arm/Kconfig-nommu
+++ b/kernel/arch/arm/Kconfig-nommu
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Kconfig for uClinux(non-paged MM) depend configurations
 # Hyok S. Choi <hyok.choi@samsung.com>
diff --git a/kernel/arch/arm/Kconfig.debug b/kernel/arch/arm/Kconfig.debug
index 6dcea8e8e..954ba8b81 100644
--- a/kernel/arch/arm/Kconfig.debug
+++ b/kernel/arch/arm/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/arm/Makefile b/kernel/arch/arm/Makefile
index 817e5cfef..36ae44545 100644
--- a/kernel/arch/arm/Makefile
+++ b/kernel/arch/arm/Makefile
@@ -44,10 +44,12 @@ endif
 
 ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
 KBUILD_CPPFLAGS	+= -mbig-endian
+CHECKFLAGS	+= -D__ARMEB__
 AS		+= -EB
 LD		+= -EB
 else
 KBUILD_CPPFLAGS	+= -mlittle-endian
+CHECKFLAGS	+= -D__ARMEL__
 AS		+= -EL
 LD		+= -EL
 endif
diff --git a/kernel/arch/arm/boot/bootp/Makefile b/kernel/arch/arm/boot/bootp/Makefile
index 5e4acd253..83e1a076a 100644
--- a/kernel/arch/arm/boot/bootp/Makefile
+++ b/kernel/arch/arm/boot/bootp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/arm/boot/bootp/Makefile
 #
diff --git a/kernel/arch/arm/boot/bootp/initrd.S b/kernel/arch/arm/boot/bootp/initrd.S
index d81ea1837..dd3d04971 100644
--- a/kernel/arch/arm/boot/bootp/initrd.S
+++ b/kernel/arch/arm/boot/bootp/initrd.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.type	initrd_start,#object
 	.globl	initrd_start
 initrd_start:
diff --git a/kernel/arch/arm/boot/bootp/kernel.S b/kernel/arch/arm/boot/bootp/kernel.S
index b87a25c7e..dc6236c17 100644
--- a/kernel/arch/arm/boot/bootp/kernel.S
+++ b/kernel/arch/arm/boot/bootp/kernel.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.globl	kernel_start
 kernel_start:
 	.incbin	"arch/arm/boot/zImage"
diff --git a/kernel/arch/arm/boot/compressed/Makefile b/kernel/arch/arm/boot/compressed/Makefile
index d50430c40..a5889238f 100644
--- a/kernel/arch/arm/boot/compressed/Makefile
+++ b/kernel/arch/arm/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/arm/boot/compressed/Makefile
 #
diff --git a/kernel/arch/arm/boot/compressed/atags_to_fdt.c b/kernel/arch/arm/boot/compressed/atags_to_fdt.c
index 9448aa0c6..41fa7316c 100644
--- a/kernel/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/kernel/arch/arm/boot/compressed/atags_to_fdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/setup.h>
 #include <libfdt.h>
 
diff --git a/kernel/arch/arm/boot/compressed/big-endian.S b/kernel/arch/arm/boot/compressed/big-endian.S
index 25ab26f1c..88e2a88d3 100644
--- a/kernel/arch/arm/boot/compressed/big-endian.S
+++ b/kernel/arch/arm/boot/compressed/big-endian.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/arm/boot/compressed/big-endian.S
  *
diff --git a/kernel/arch/arm/boot/compressed/debug.S b/kernel/arch/arm/boot/compressed/debug.S
index 8f6e37177..6bf2917a4 100644
--- a/kernel/arch/arm/boot/compressed/debug.S
+++ b/kernel/arch/arm/boot/compressed/debug.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
diff --git a/kernel/arch/arm/boot/compressed/decompress.c b/kernel/arch/arm/boot/compressed/decompress.c
index f3a4bedd1..a2ac3fe7d 100644
--- a/kernel/arch/arm/boot/compressed/decompress.c
+++ b/kernel/arch/arm/boot/compressed/decompress.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _LINUX_STRING_H_
 
 #include <linux/compiler.h>	/* for inline */
diff --git a/kernel/arch/arm/boot/compressed/head-sa1100.S b/kernel/arch/arm/boot/compressed/head-sa1100.S
index 3115e313d..95abdd850 100644
--- a/kernel/arch/arm/boot/compressed/head-sa1100.S
+++ b/kernel/arch/arm/boot/compressed/head-sa1100.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  * linux/arch/arm/boot/compressed/head-sa1100.S
  * 
diff --git a/kernel/arch/arm/boot/compressed/head-sharpsl.S b/kernel/arch/arm/boot/compressed/head-sharpsl.S
index eb0084ea1..992e78450 100644
--- a/kernel/arch/arm/boot/compressed/head-sharpsl.S
+++ b/kernel/arch/arm/boot/compressed/head-sharpsl.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/arch/arm/boot/compressed/head-sharpsl.S
  *
diff --git a/kernel/arch/arm/boot/compressed/head-xscale.S b/kernel/arch/arm/boot/compressed/head-xscale.S
index 6ab0599c0..20fa44d59 100644
--- a/kernel/arch/arm/boot/compressed/head-xscale.S
+++ b/kernel/arch/arm/boot/compressed/head-xscale.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/arch/arm/boot/compressed/head-xscale.S
  *
diff --git a/kernel/arch/arm/boot/compressed/libfdt_env.h b/kernel/arch/arm/boot/compressed/libfdt_env.h
index 17ae0f3ef..07437816e 100644
--- a/kernel/arch/arm/boot/compressed/libfdt_env.h
+++ b/kernel/arch/arm/boot/compressed/libfdt_env.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARM_LIBFDT_ENV_H
 #define _ARM_LIBFDT_ENV_H
 
diff --git a/kernel/arch/arm/boot/compressed/misc.c b/kernel/arch/arm/boot/compressed/misc.c
index d4f891f56..16a8a804e 100644
--- a/kernel/arch/arm/boot/compressed/misc.c
+++ b/kernel/arch/arm/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c
  * 
diff --git a/kernel/arch/arm/boot/compressed/piggy.S b/kernel/arch/arm/boot/compressed/piggy.S
index f72088495..0284f84dc 100644
--- a/kernel/arch/arm/boot/compressed/piggy.S
+++ b/kernel/arch/arm/boot/compressed/piggy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.section .piggydata,#alloc
 	.globl	input_data
 input_data:
diff --git a/kernel/arch/arm/boot/compressed/string.c b/kernel/arch/arm/boot/compressed/string.c
index 689467448..309e1bbad 100644
--- a/kernel/arch/arm/boot/compressed/string.c
+++ b/kernel/arch/arm/boot/compressed/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/boot/compressed/string.c
  *
diff --git a/kernel/arch/arm/boot/compressed/vmlinux.lds.S b/kernel/arch/arm/boot/compressed/vmlinux.lds.S
index 7a4c59154..7d06aa19c 100644
--- a/kernel/arch/arm/boot/compressed/vmlinux.lds.S
+++ b/kernel/arch/arm/boot/compressed/vmlinux.lds.S
@@ -85,6 +85,15 @@ SECTIONS
 
   _edata = .;
 
+  /*
+   * The image_end section appears after any additional loadable sections
+   * that the linker may decide to insert in the binary image.  Having
+   * this symbol allows further debug in the near future.
+   */
+  .image_end (NOLOAD) : {
+    _edata_real = .;
+  }
+
   _magic_sig = ZIMAGE_MAGIC(0x016f2818);
   _magic_start = ZIMAGE_MAGIC(_start);
   _magic_end = ZIMAGE_MAGIC(_edata);
diff --git a/kernel/arch/arm/boot/dts/Makefile b/kernel/arch/arm/boot/dts/Makefile
index faf46abaa..eff87a344 100644
--- a/kernel/arch/arm/boot/dts/Makefile
+++ b/kernel/arch/arm/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifeq ($(CONFIG_OF),y)
 
 dtb-$(CONFIG_ARCH_ALPINE) += \
diff --git a/kernel/arch/arm/boot/dts/am57xx-commercial-grade.dtsi b/kernel/arch/arm/boot/dts/am57xx-commercial-grade.dtsi
index c18365446..3eed6e09c 100644
--- a/kernel/arch/arm/boot/dts/am57xx-commercial-grade.dtsi
+++ b/kernel/arch/arm/boot/dts/am57xx-commercial-grade.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 &cpu_alert0 {
 	temperature = <80000>; /* milliCelsius */
 };
diff --git a/kernel/arch/arm/boot/dts/am57xx-industrial-grade.dtsi b/kernel/arch/arm/boot/dts/am57xx-industrial-grade.dtsi
index 70c8c4ba1..422f953fc 100644
--- a/kernel/arch/arm/boot/dts/am57xx-industrial-grade.dtsi
+++ b/kernel/arch/arm/boot/dts/am57xx-industrial-grade.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 &cpu_alert0 {
 	temperature = <90000>; /* milliCelsius */
 };
diff --git a/kernel/arch/arm/boot/dts/armada-375.dtsi b/kernel/arch/arm/boot/dts/armada-375.dtsi
index 7225c7ce9..2cb1bcd30 100644
--- a/kernel/arch/arm/boot/dts/armada-375.dtsi
+++ b/kernel/arch/arm/boot/dts/armada-375.dtsi
@@ -178,9 +178,9 @@
 				reg = <0x8000 0x1000>;
 				cache-unified;
 				cache-level = <2>;
-				arm,double-linefill-incr = <1>;
+				arm,double-linefill-incr = <0>;
 				arm,double-linefill-wrap = <0>;
-				arm,double-linefill = <1>;
+				arm,double-linefill = <0>;
 				prefetch-data = <1>;
 			};
 
diff --git a/kernel/arch/arm/boot/dts/armada-38x.dtsi b/kernel/arch/arm/boot/dts/armada-38x.dtsi
index 4960722aa..00ff549d4 100644
--- a/kernel/arch/arm/boot/dts/armada-38x.dtsi
+++ b/kernel/arch/arm/boot/dts/armada-38x.dtsi
@@ -143,9 +143,9 @@
 				reg = <0x8000 0x1000>;
 				cache-unified;
 				cache-level = <2>;
-				arm,double-linefill-incr = <1>;
+				arm,double-linefill-incr = <0>;
 				arm,double-linefill-wrap = <0>;
-				arm,double-linefill = <1>;
+				arm,double-linefill = <0>;
 				prefetch-data = <1>;
 			};
 
diff --git a/kernel/arch/arm/boot/dts/armada-39x.dtsi b/kernel/arch/arm/boot/dts/armada-39x.dtsi
index ea657071e..5218bd2a2 100644
--- a/kernel/arch/arm/boot/dts/armada-39x.dtsi
+++ b/kernel/arch/arm/boot/dts/armada-39x.dtsi
@@ -111,9 +111,9 @@
 				reg = <0x8000 0x1000>;
 				cache-unified;
 				cache-level = <2>;
-				arm,double-linefill-incr = <1>;
+				arm,double-linefill-incr = <0>;
 				arm,double-linefill-wrap = <0>;
-				arm,double-linefill = <1>;
+				arm,double-linefill = <0>;
 				prefetch-data = <1>;
 			};
 
diff --git a/kernel/arch/arm/boot/dts/armv7-m.dtsi b/kernel/arch/arm/boot/dts/armv7-m.dtsi
index ba332e399..26f5443d8 100644
--- a/kernel/arch/arm/boot/dts/armv7-m.dtsi
+++ b/kernel/arch/arm/boot/dts/armv7-m.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	nvic: interrupt-controller@e000e100  {
 		compatible = "arm,armv7m-nvic";
diff --git a/kernel/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/kernel/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index 7c90dac99..f53e89d63 100644
--- a/kernel/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/kernel/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "aspeed-g5.dtsi"
diff --git a/kernel/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/kernel/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index 112551766..e1b523bd5 100644
--- a/kernel/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/kernel/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "aspeed-g4.dtsi"
diff --git a/kernel/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/kernel/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
index 1190fec1b..6dd77cba1 100644
--- a/kernel/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
+++ b/kernel/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "aspeed-g5.dtsi"
diff --git a/kernel/arch/arm/boot/dts/aspeed-g4.dtsi b/kernel/arch/arm/boot/dts/aspeed-g4.dtsi
index 22b958537..fcc5efbd0 100644
--- a/kernel/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/kernel/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "skeleton.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/aspeed-g5.dtsi b/kernel/arch/arm/boot/dts/aspeed-g5.dtsi
index 9cffe347b..eab8f549a 100644
--- a/kernel/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/kernel/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "skeleton.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/at91-ariettag25.dts b/kernel/arch/arm/boot/dts/at91-ariettag25.dts
index c51450208..21c5b56c9 100644
--- a/kernel/arch/arm/boot/dts/at91-ariettag25.dts
+++ b/kernel/arch/arm/boot/dts/at91-ariettag25.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Arietta G25
  * This device tree is minimal, to activate more peripherals, see:
diff --git a/kernel/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/kernel/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index 9f866491e..f81ae0a10 100644
--- a/kernel/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/kernel/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm2835-rpi-a.dts b/kernel/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 4b1af06c8..7a960a048 100644
--- a/kernel/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/kernel/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/kernel/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index a846f1e78..0161a8483 100644
--- a/kernel/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/kernel/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/kernel/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index e860964e3..4bc70efe4 100644
--- a/kernel/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/kernel/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm2835-rpi-b.dts b/kernel/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 5d77f3f8c..cca4a75a5 100644
--- a/kernel/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/kernel/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2835.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm2835.dtsi b/kernel/arch/arm/boot/dts/bcm2835.dtsi
index 659b6e951..0e3d2a5ff 100644
--- a/kernel/arch/arm/boot/dts/bcm2835.dtsi
+++ b/kernel/arch/arm/boot/dts/bcm2835.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcm283x.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/kernel/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index e8de41444..6669355fd 100644
--- a/kernel/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/kernel/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2836.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm2836.dtsi b/kernel/arch/arm/boot/dts/bcm2836.dtsi
index 2c26d0be8..61e158003 100644
--- a/kernel/arch/arm/boot/dts/bcm2836.dtsi
+++ b/kernel/arch/arm/boot/dts/bcm2836.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcm283x.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/kernel/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index c71a0d73d..eb1a28da5 100644
--- a/kernel/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/kernel/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm2837.dtsi"
 #include "bcm2835-rpi.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi b/kernel/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
index 9a0599f71..967e081cb 100644
--- a/kernel/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
+++ b/kernel/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	aliases {
 		ethernet0 = &ethernet;
diff --git a/kernel/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi b/kernel/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
index e7d217c96..e2fd9610e 100644
--- a/kernel/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
+++ b/kernel/arch/arm/boot/dts/bcm283x-rpi-usb-otg.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 &usb {
 	dr_mode = "otg";
 	g-rx-fifo-size = <256>;
diff --git a/kernel/arch/arm/boot/dts/bcm63138.dtsi b/kernel/arch/arm/boot/dts/bcm63138.dtsi
index d0560e8cd..43ee992cc 100644
--- a/kernel/arch/arm/boot/dts/bcm63138.dtsi
+++ b/kernel/arch/arm/boot/dts/bcm63138.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Broadcom BCM63138 DSL SoCs Device Tree
  */
diff --git a/kernel/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/kernel/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
index 0bb8d17e4..8006c69a3 100644
--- a/kernel/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
+++ b/kernel/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "bcm7445.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/bcm7445.dtsi b/kernel/arch/arm/boot/dts/bcm7445.dtsi
index 479132196..c859aa6f3 100644
--- a/kernel/arch/arm/boot/dts/bcm7445.dtsi
+++ b/kernel/arch/arm/boot/dts/bcm7445.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
 #include "skeleton.dtsi"
diff --git a/kernel/arch/arm/boot/dts/bcm963138dvt.dts b/kernel/arch/arm/boot/dts/bcm963138dvt.dts
index 370aa2cfd..c61673638 100644
--- a/kernel/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/kernel/arch/arm/boot/dts/bcm963138dvt.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Broadcom BCM63138 Reference Board DTS
  */
diff --git a/kernel/arch/arm/boot/dts/dove-cubox-es.dts b/kernel/arch/arm/boot/dts/dove-cubox-es.dts
index e28ef056d..ad361ec13 100644
--- a/kernel/arch/arm/boot/dts/dove-cubox-es.dts
+++ b/kernel/arch/arm/boot/dts/dove-cubox-es.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "dove-cubox.dts"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/dove-cubox.dts b/kernel/arch/arm/boot/dts/dove-cubox.dts
index af3cb6331..580e3cbcf 100644
--- a/kernel/arch/arm/boot/dts/dove-cubox.dts
+++ b/kernel/arch/arm/boot/dts/dove-cubox.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "dove.dtsi"
diff --git a/kernel/arch/arm/boot/dts/dove-d2plug.dts b/kernel/arch/arm/boot/dts/dove-d2plug.dts
index c11d3636c..273f12ca2 100644
--- a/kernel/arch/arm/boot/dts/dove-d2plug.dts
+++ b/kernel/arch/arm/boot/dts/dove-d2plug.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "dove.dtsi"
diff --git a/kernel/arch/arm/boot/dts/dove-d3plug.dts b/kernel/arch/arm/boot/dts/dove-d3plug.dts
index e88ff83f1..826026c28 100644
--- a/kernel/arch/arm/boot/dts/dove-d3plug.dts
+++ b/kernel/arch/arm/boot/dts/dove-d3plug.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "dove.dtsi"
diff --git a/kernel/arch/arm/boot/dts/dove-dove-db.dts b/kernel/arch/arm/boot/dts/dove-dove-db.dts
index bb725dca3..1754a62e0 100644
--- a/kernel/arch/arm/boot/dts/dove-dove-db.dts
+++ b/kernel/arch/arm/boot/dts/dove-dove-db.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "dove.dtsi"
diff --git a/kernel/arch/arm/boot/dts/dove.dtsi b/kernel/arch/arm/boot/dts/dove.dtsi
index 1475d3672..f4a07bb7c 100644
--- a/kernel/arch/arm/boot/dts/dove.dtsi
+++ b/kernel/arch/arm/boot/dts/dove.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /include/ "skeleton.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/arm/boot/dts/efm32gg-dk3750.dts b/kernel/arch/arm/boot/dts/efm32gg-dk3750.dts
index 98fc667d2..c9f3ea29c 100644
--- a/kernel/arch/arm/boot/dts/efm32gg-dk3750.dts
+++ b/kernel/arch/arm/boot/dts/efm32gg-dk3750.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device tree for EFM32GG-DK3750 development board.
  *
diff --git a/kernel/arch/arm/boot/dts/efm32gg.dtsi b/kernel/arch/arm/boot/dts/efm32gg.dtsi
index b78c57e51..8a58e4914 100644
--- a/kernel/arch/arm/boot/dts/efm32gg.dtsi
+++ b/kernel/arch/arm/boot/dts/efm32gg.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device tree for Energy Micro EFM32 Giant Gecko SoC.
  *
diff --git a/kernel/arch/arm/boot/dts/elpida_ecb240abacn.dtsi b/kernel/arch/arm/boot/dts/elpida_ecb240abacn.dtsi
index f97f70f83..d87ee4794 100644
--- a/kernel/arch/arm/boot/dts/elpida_ecb240abacn.dtsi
+++ b/kernel/arch/arm/boot/dts/elpida_ecb240abacn.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common devices used in different OMAP boards
  */
diff --git a/kernel/arch/arm/boot/dts/gemini-nas4220b.dts b/kernel/arch/arm/boot/dts/gemini-nas4220b.dts
index b4fc58c8c..d6a22e677 100644
--- a/kernel/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/kernel/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for the Gemini-based Raidsonic NAS IB-4220-B
  */
diff --git a/kernel/arch/arm/boot/dts/gemini-rut1xx.dts b/kernel/arch/arm/boot/dts/gemini-rut1xx.dts
index 3613b264f..500057b65 100644
--- a/kernel/arch/arm/boot/dts/gemini-rut1xx.dts
+++ b/kernel/arch/arm/boot/dts/gemini-rut1xx.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Teltonika RUT1xx
  */
diff --git a/kernel/arch/arm/boot/dts/gemini-sq201.dts b/kernel/arch/arm/boot/dts/gemini-sq201.dts
index 7cfa9caf4..63c02ca95 100644
--- a/kernel/arch/arm/boot/dts/gemini-sq201.dts
+++ b/kernel/arch/arm/boot/dts/gemini-sq201.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for ITian Square One SQ201 NAS
  */
diff --git a/kernel/arch/arm/boot/dts/gemini-wbd111.dts b/kernel/arch/arm/boot/dts/gemini-wbd111.dts
index 38a49e750..b413fd12c 100644
--- a/kernel/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/kernel/arch/arm/boot/dts/gemini-wbd111.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Wiliboard WBD-111
  */
diff --git a/kernel/arch/arm/boot/dts/gemini-wbd222.dts b/kernel/arch/arm/boot/dts/gemini-wbd222.dts
index f77e34e0d..3ba710538 100644
--- a/kernel/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/kernel/arch/arm/boot/dts/gemini-wbd222.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Wiliboard WBD-222
  */
diff --git a/kernel/arch/arm/boot/dts/gemini.dtsi b/kernel/arch/arm/boot/dts/gemini.dtsi
index f0d178c77..b9b07d089 100644
--- a/kernel/arch/arm/boot/dts/gemini.dtsi
+++ b/kernel/arch/arm/boot/dts/gemini.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree file for Cortina systems Gemini SoC
  */
diff --git a/kernel/arch/arm/boot/dts/imx28-apx4devkit.dts b/kernel/arch/arm/boot/dts/imx28-apx4devkit.dts
index 1092b761d..d2a91976e 100644
--- a/kernel/arch/arm/boot/dts/imx28-apx4devkit.dts
+++ b/kernel/arch/arm/boot/dts/imx28-apx4devkit.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 #include "imx28.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/kernel/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
index d78312c63..ebe7a8bdd 100644
--- a/kernel/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
+++ b/kernel/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/gpio/gpio.h>
 
 / {
diff --git a/kernel/arch/arm/boot/dts/integrator.dtsi b/kernel/arch/arm/boot/dts/integrator.dtsi
index 6fe0dd1d3..380f9ae60 100644
--- a/kernel/arch/arm/boot/dts/integrator.dtsi
+++ b/kernel/arch/arm/boot/dts/integrator.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SoC core Device Tree for the ARM Integrator platforms
  */
diff --git a/kernel/arch/arm/boot/dts/integratorap.dts b/kernel/arch/arm/boot/dts/integratorap.dts
index e8b249f92..a5d88a213 100644
--- a/kernel/arch/arm/boot/dts/integratorap.dts
+++ b/kernel/arch/arm/boot/dts/integratorap.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree for the ARM Integrator/AP platform
  */
diff --git a/kernel/arch/arm/boot/dts/integratorcp.dts b/kernel/arch/arm/boot/dts/integratorcp.dts
index 97f38b57a..a185ab875 100644
--- a/kernel/arch/arm/boot/dts/integratorcp.dts
+++ b/kernel/arch/arm/boot/dts/integratorcp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree for the ARM Integrator/CP platform
  */
diff --git a/kernel/arch/arm/boot/dts/kirkwood-6192.dtsi b/kernel/arch/arm/boot/dts/kirkwood-6192.dtsi
index f003f3f1b..396bcba08 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-6192.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-6192.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	mbus@f1000000 {
 		pciec: pcie@82000000 {
diff --git a/kernel/arch/arm/boot/dts/kirkwood-6281.dtsi b/kernel/arch/arm/boot/dts/kirkwood-6281.dtsi
index 47d4b3d3d..faa05849a 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	mbus@f1000000 {
 		pciec: pcie@82000000 {
diff --git a/kernel/arch/arm/boot/dts/kirkwood-6282.dtsi b/kernel/arch/arm/boot/dts/kirkwood-6282.dtsi
index a13dad0a7..e84c54b77 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	mbus@f1000000 {
 		pciec: pcie@82000000 {
diff --git a/kernel/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/kernel/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
index 90d4d71b6..299c14729 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-98dx4122.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	mbus@f1000000 {
 		pciec: pcie@82000000 {
diff --git a/kernel/arch/arm/boot/dts/kirkwood-cloudbox.dts b/kernel/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 555b7e4c5..448b0cd23 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-dns320.dts b/kernel/arch/arm/boot/dts/kirkwood-dns320.dts
index d85ef0a91..d6b0f418f 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-dnskw.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-dns325.dts b/kernel/arch/arm/boot/dts/kirkwood-dns325.dts
index 5e586ed04..94d9c06cb 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-dnskw.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/kernel/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index d8fca9db4..cbaf06f2f 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "kirkwood.dtsi"
 #include "kirkwood-6281.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/kirkwood-dockstar.dts b/kernel/arch/arm/boot/dts/kirkwood-dockstar.dts
index 849736349..6a3f1bf6d 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-dreamplug.dts b/kernel/arch/arm/boot/dts/kirkwood-dreamplug.dts
index e2abc8246..7f326e267 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-goflexnet.dts b/kernel/arch/arm/boot/dts/kirkwood-goflexnet.dts
index aa60a0b04..02d87e0a1 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/kernel/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index b2d9834bf..ff1260ee3 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ib62x0.dts b/kernel/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 5bf628970..962a910a6 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-iconnect.dts b/kernel/arch/arm/boot/dts/kirkwood-iconnect.dts
index d25184ae4..4a512d809 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/kernel/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 8474bffec..62272d586 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-is2.dts b/kernel/arch/arm/boot/dts/kirkwood-is2.dts
index 4121674ab..1bc16a5cd 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-is2.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-is2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/leds/leds-ns2.h>
diff --git a/kernel/arch/arm/boot/dts/kirkwood-km_common.dtsi b/kernel/arch/arm/boot/dts/kirkwood-km_common.dtsi
index 7962bdefd..75dc83914 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-km_common.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-km_common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	chosen {
 		bootargs = "console=ttyS0,115200n8 earlyprintk";
diff --git a/kernel/arch/arm/boot/dts/kirkwood-km_fixedeth.dts b/kernel/arch/arm/boot/dts/kirkwood-km_fixedeth.dts
index 9895f2b10..515be7bcc 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-km_fixedeth.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-km_fixedeth.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/kernel/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 235bf382f..f035eff1c 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-lschlv2.dts b/kernel/arch/arm/boot/dts/kirkwood-lschlv2.dts
index e2fa368ae..1d737d903 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-lschlv2.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-lschlv2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-lsxl.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-lsxhl.dts b/kernel/arch/arm/boot/dts/kirkwood-lsxhl.dts
index 8d89cdf8d..a56e0d797 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-lsxhl.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-lsxhl.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-lsxl.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/kernel/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 8b7c6ce79..7b151acb9 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "kirkwood.dtsi"
 #include "kirkwood-6281.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/kirkwood-mplcec4.dts b/kernel/arch/arm/boot/dts/kirkwood-mplcec4.dts
index aa413b0bc..b80d12f6a 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/kernel/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 282605f4c..51530ea86 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "kirkwood.dtsi"
 #include "kirkwood-6281.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ns2.dts b/kernel/arch/arm/boot/dts/kirkwood-ns2.dts
index 190189d23..7b67083e1 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ns2.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ns2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/leds/leds-ns2.h>
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ns2lite.dts b/kernel/arch/arm/boot/dts/kirkwood-ns2lite.dts
index 2c661add0..b0cb5907e 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ns2lite.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ns2lite.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-ns2-common.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ns2max.dts b/kernel/arch/arm/boot/dts/kirkwood-ns2max.dts
index 55cc41d9c..c0a087e77 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ns2max.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ns2max.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/leds/leds-ns2.h>
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ns2mini.dts b/kernel/arch/arm/boot/dts/kirkwood-ns2mini.dts
index 9935f3ec2..5b9fa14b6 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ns2mini.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ns2mini.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/leds/leds-ns2.h>
diff --git a/kernel/arch/arm/boot/dts/kirkwood-nsa310.dts b/kernel/arch/arm/boot/dts/kirkwood-nsa310.dts
index 0b69ee493..9b861c2e7 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-nsa3x0-common.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-nsa310a.dts b/kernel/arch/arm/boot/dts/kirkwood-nsa310a.dts
index 3d2b3d494..b85e314f0 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood-nsa3x0-common.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi b/kernel/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index e09b79ac7..2c4037b07 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "kirkwood.dtsi"
 #include "kirkwood-6281.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/kernel/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index c75da5f0c..8ea430168 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts b/kernel/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
index b2f26239d..5ce220ac9 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kirkwood-pogoplug-series-4.dts - Device tree file for PogoPlug Series 4
  * inspired by the board files made by Kevin Mihelich for ArchLinux,
diff --git a/kernel/arch/arm/boot/dts/kirkwood-topkick.dts b/kernel/arch/arm/boot/dts/kirkwood-topkick.dts
index 330aada6d..a5b51e29f 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/kernel/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index ee62204e4..30892c19a 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/kernel/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index 3437bb396..aba120598 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/kernel/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "kirkwood.dtsi"
diff --git a/kernel/arch/arm/boot/dts/kirkwood-ts219.dtsi b/kernel/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 62e5e2d5c..4faea1d9f 100644
--- a/kernel/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	model = "QNAP TS219 family";
 	compatible = "qnap,ts219", "marvell,kirkwood";
diff --git a/kernel/arch/arm/boot/dts/kirkwood.dtsi b/kernel/arch/arm/boot/dts/kirkwood.dtsi
index 29b8bd7e0..a70fc7f01 100644
--- a/kernel/arch/arm/boot/dts/kirkwood.dtsi
+++ b/kernel/arch/arm/boot/dts/kirkwood.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /include/ "skeleton.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi b/kernel/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
index 445fafc73..ded7e8fec 100644
--- a/kernel/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
+++ b/kernel/arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common file for GPMC connected smsc911x on omaps
  *
diff --git a/kernel/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi b/kernel/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
index 73e272fad..7f6aefd13 100644
--- a/kernel/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
+++ b/kernel/arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common file for GPMC connected smsc9221 on omaps
  *
diff --git a/kernel/arch/arm/boot/dts/omap-zoom-common.dtsi b/kernel/arch/arm/boot/dts/omap-zoom-common.dtsi
index 46ef3e443..d4ad9e58b 100644
--- a/kernel/arch/arm/boot/dts/omap-zoom-common.dtsi
+++ b/kernel/arch/arm/boot/dts/omap-zoom-common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common features on the Zoom debug board
  */
diff --git a/kernel/arch/arm/boot/dts/omap2420-n800.dts b/kernel/arch/arm/boot/dts/omap2420-n800.dts
index d8c1b4236..f06d767e8 100644
--- a/kernel/arch/arm/boot/dts/omap2420-n800.dts
+++ b/kernel/arch/arm/boot/dts/omap2420-n800.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "omap2420-n8x0-common.dtsi"
diff --git a/kernel/arch/arm/boot/dts/omap2420-n810-wimax.dts b/kernel/arch/arm/boot/dts/omap2420-n810-wimax.dts
index 6b25b0359..ac9acbd60 100644
--- a/kernel/arch/arm/boot/dts/omap2420-n810-wimax.dts
+++ b/kernel/arch/arm/boot/dts/omap2420-n810-wimax.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "omap2420-n8x0-common.dtsi"
diff --git a/kernel/arch/arm/boot/dts/omap2420-n810.dts b/kernel/arch/arm/boot/dts/omap2420-n810.dts
index b604d26bd..7c485fbfa 100644
--- a/kernel/arch/arm/boot/dts/omap2420-n810.dts
+++ b/kernel/arch/arm/boot/dts/omap2420-n810.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "omap2420-n8x0-common.dtsi"
diff --git a/kernel/arch/arm/boot/dts/omap2420-n8x0-common.dtsi b/kernel/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
index 91886231e..1de80c788 100644
--- a/kernel/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
+++ b/kernel/arch/arm/boot/dts/omap2420-n8x0-common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "omap2420.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/omap3-cm-t3517.dts b/kernel/arch/arm/boot/dts/omap3-cm-t3517.dts
index 3d293b345..4994e33bf 100644
--- a/kernel/arch/arm/boot/dts/omap3-cm-t3517.dts
+++ b/kernel/arch/arm/boot/dts/omap3-cm-t3517.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for CompuLab CM-T3517
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-cm-t3530.dts b/kernel/arch/arm/boot/dts/omap3-cm-t3530.dts
index 8dd14fcf6..76e52c78c 100644
--- a/kernel/arch/arm/boot/dts/omap3-cm-t3530.dts
+++ b/kernel/arch/arm/boot/dts/omap3-cm-t3530.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for CompuLab CM-T3530
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-cm-t3730.dts b/kernel/arch/arm/boot/dts/omap3-cm-t3730.dts
index bdf4b7fdd..8c63ac5bb 100644
--- a/kernel/arch/arm/boot/dts/omap3-cm-t3730.dts
+++ b/kernel/arch/arm/boot/dts/omap3-cm-t3730.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for CompuLab CM-T3730
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/kernel/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index fccd53832..31d5ebf38 100644
--- a/kernel/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/kernel/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common support for CompuLab CM-T3x CoMs
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-cm-t3x30.dtsi b/kernel/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
index 046cd7733..5e8943539 100644
--- a/kernel/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
+++ b/kernel/arch/arm/boot/dts/omap3-cm-t3x30.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common support for CompuLab CM-T3x30 CoMs
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-evm-common.dtsi b/kernel/arch/arm/boot/dts/omap3-evm-common.dtsi
index ff3580308..dbc3f030a 100644
--- a/kernel/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/kernel/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common support for omap3 EVM boards
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi b/kernel/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
index 157345bb8..25e100db7 100644
--- a/kernel/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
+++ b/kernel/arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common file for omap dpi panels with QVGA and reset pins
  *
diff --git a/kernel/arch/arm/boot/dts/omap3-sb-t35.dtsi b/kernel/arch/arm/boot/dts/omap3-sb-t35.dtsi
index 4476fb685..22b4c8bdc 100644
--- a/kernel/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/kernel/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-sbc-t3517.dts b/kernel/arch/arm/boot/dts/omap3-sbc-t3517.dts
index c2d5c28a1..a69d32860 100644
--- a/kernel/arch/arm/boot/dts/omap3-sbc-t3517.dts
+++ b/kernel/arch/arm/boot/dts/omap3-sbc-t3517.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Suppport for CompuLab SBC-T3517 with CM-T3517
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-sbc-t3530.dts b/kernel/arch/arm/boot/dts/omap3-sbc-t3530.dts
index 834bc786c..ae96002ab 100644
--- a/kernel/arch/arm/boot/dts/omap3-sbc-t3530.dts
+++ b/kernel/arch/arm/boot/dts/omap3-sbc-t3530.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Suppport for CompuLab SBC-T3530 with CM-T3530
  */
diff --git a/kernel/arch/arm/boot/dts/omap3-sbc-t3730.dts b/kernel/arch/arm/boot/dts/omap3-sbc-t3730.dts
index 73c7bf4a4..7de6df16f 100644
--- a/kernel/arch/arm/boot/dts/omap3-sbc-t3730.dts
+++ b/kernel/arch/arm/boot/dts/omap3-sbc-t3730.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Suppport for CompuLab SBC-T3730 with CM-T3730
  */
diff --git a/kernel/arch/arm/boot/dts/omap5-cm-t54.dts b/kernel/arch/arm/boot/dts/omap5-cm-t54.dts
index 552a5c4c5..5b172a04b 100644
--- a/kernel/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/kernel/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for CompuLab CM-T54
  */
diff --git a/kernel/arch/arm/boot/dts/omap5-sbc-t54.dts b/kernel/arch/arm/boot/dts/omap5-sbc-t54.dts
index 7b8810d13..657df4625 100644
--- a/kernel/arch/arm/boot/dts/omap5-sbc-t54.dts
+++ b/kernel/arch/arm/boot/dts/omap5-sbc-t54.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Suppport for CompuLab CM-T54 on SB-T54 baseboard
  */
diff --git a/kernel/arch/arm/boot/dts/pxa27x.dtsi b/kernel/arch/arm/boot/dts/pxa27x.dtsi
index 5f1d6da02..747f750f6 100644
--- a/kernel/arch/arm/boot/dts/pxa27x.dtsi
+++ b/kernel/arch/arm/boot/dts/pxa27x.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* The pxa3xx skeleton simply augments the 2xx version */
 #include "pxa2xx.dtsi"
 #include "dt-bindings/clock/pxa-clock.h"
diff --git a/kernel/arch/arm/boot/dts/pxa3xx.dtsi b/kernel/arch/arm/boot/dts/pxa3xx.dtsi
index 7a0cc4ea8..55c75b673 100644
--- a/kernel/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/kernel/arch/arm/boot/dts/pxa3xx.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* The pxa3xx skeleton simply augments the 2xx version */
 #include "pxa2xx.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi b/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
index a3efb9704..8df73156b 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 &tlmm_pinmux {
 	card_detect: card-detect {
 		mux {
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts b/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
index f245064f3..76b56eafa 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8064-v2.0.dtsi"
 #include "qcom-apq8064-arrow-sd-600eval-pins.dtsi"
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/kernel/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index 3483a66e4..a701d4bac 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8064-v2.0.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/kernel/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
index 5b151e425..b818ebce0 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8064-v2.0.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/kernel/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 053b5bdd7..83aaf4a74 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8064-v2.0.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-pins.dtsi b/kernel/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
index 173ab7c29..cbe42c415 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-pins.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 &tlmm_pinmux {
 	sdc4_gpios: sdc4-gpios {
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts b/kernel/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
index 88a9aff41..8bf488fb8 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8064-v2.0.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi b/kernel/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi
index 935c3945f..46ed48f02 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi
@@ -1 +1,2 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8064.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8064.dtsi b/kernel/arch/arm/boot/dts/qcom-apq8064.dtsi
index f3db185a6..6089c8d56 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "skeleton.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/kernel/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index 32f3b81f6..244f04e19 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-msm8974.dtsi"
 #include "qcom-pm8841.dtsi"
 #include "qcom-pm8941.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts b/kernel/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
index 2052b84a7..44cd72f1b 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8084-ifc6540.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8084.dtsi"
 #include "qcom-pma8084.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8084-mtp.dts b/kernel/arch/arm/boot/dts/qcom-apq8084-mtp.dts
index d174d15bc..c6b668024 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8084-mtp.dts
+++ b/kernel/arch/arm/boot/dts/qcom-apq8084-mtp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-apq8084.dtsi"
 #include "qcom-pma8084.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/qcom-apq8084.dtsi b/kernel/arch/arm/boot/dts/qcom-apq8084.dtsi
index 80d488671..0e1e98707 100644
--- a/kernel/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "skeleton.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/kernel/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 348503d1a..bcf53e37e 100644
--- a/kernel/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/kernel/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-ipq8064-v1.0.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/kernel/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
index 7093b075e..e1181194e 100644
--- a/kernel/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
@@ -1 +1,2 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-ipq8064.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-ipq8064.dtsi b/kernel/arch/arm/boot/dts/qcom-ipq8064.dtsi
index f1fbffe59..1e0a3b446 100644
--- a/kernel/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "skeleton.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8660-surf.dts b/kernel/arch/arm/boot/dts/qcom-msm8660-surf.dts
index 1adc04978..f01a11b18 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8660-surf.dts
+++ b/kernel/arch/arm/boot/dts/qcom-msm8660-surf.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
 
 #include "qcom-msm8660.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi b/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi
index 1b5d31b33..221c45845 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-msm8660.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "skeleton.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/kernel/arch/arm/boot/dts/qcom-msm8960-cdp.dts
index b72a55462..82d5d8267 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8960-cdp.dts
+++ b/kernel/arch/arm/boot/dts/qcom-msm8960-cdp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
 
 #include "qcom-msm8960.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8960.dtsi b/kernel/arch/arm/boot/dts/qcom-msm8960.dtsi
index 288f56e0c..1733d8f40 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "skeleton.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/kernel/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index 382bcc323..4dc0b347b 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/kernel/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-msm8974.dtsi"
 #include "qcom-pm8841.dtsi"
 #include "qcom-pm8941.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts b/kernel/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
index 50966378f..450b8321e 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
+++ b/kernel/arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qcom-msm8974.dtsi"
 #include "qcom-pm8841.dtsi"
 #include "qcom-pm8941.dtsi"
diff --git a/kernel/arch/arm/boot/dts/qcom-msm8974.dtsi b/kernel/arch/arm/boot/dts/qcom-msm8974.dtsi
index a39207625..33002fed8 100644
--- a/kernel/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-pm8841.dtsi b/kernel/arch/arm/boot/dts/qcom-pm8841.dtsi
index 0512f6459..2fd59c440 100644
--- a/kernel/arch/arm/boot/dts/qcom-pm8841.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-pm8841.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
diff --git a/kernel/arch/arm/boot/dts/qcom-pm8941.dtsi b/kernel/arch/arm/boot/dts/qcom-pm8941.dtsi
index 3fc9f34f4..1d5ef55c7 100644
--- a/kernel/arch/arm/boot/dts/qcom-pm8941.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-pm8941.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
diff --git a/kernel/arch/arm/boot/dts/qcom-pma8084.dtsi b/kernel/arch/arm/boot/dts/qcom-pma8084.dtsi
index 82d258094..aac7e73b6 100644
--- a/kernel/arch/arm/boot/dts/qcom-pma8084.dtsi
+++ b/kernel/arch/arm/boot/dts/qcom-pma8084.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
diff --git a/kernel/arch/arm/boot/dts/sama5d2-pinfunc.h b/kernel/arch/arm/boot/dts/sama5d2-pinfunc.h
index 8a394f336..e57191fb8 100644
--- a/kernel/arch/arm/boot/dts/sama5d2-pinfunc.h
+++ b/kernel/arch/arm/boot/dts/sama5d2-pinfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define PINMUX_PIN(no, func, ioset) \
 (((no) & 0xffff) | (((func) & 0xf) << 16) | (((ioset) & 0xff) << 20))
 
diff --git a/kernel/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi b/kernel/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
index 9657a5cbc..dbdda3617 100644
--- a/kernel/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
+++ b/kernel/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Timings and Geometry for Samsung K3PE0E000B memory part
  */
diff --git a/kernel/arch/arm/boot/dts/skeleton.dtsi b/kernel/arch/arm/boot/dts/skeleton.dtsi
index 28b81d60b..34eda68d9 100644
--- a/kernel/arch/arm/boot/dts/skeleton.dtsi
+++ b/kernel/arch/arm/boot/dts/skeleton.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file is deprecated, and will be removed once existing users have been
  * updated. New dts{,i} files should *not* include skeleton.dtsi, and should
diff --git a/kernel/arch/arm/boot/dts/skeleton64.dtsi b/kernel/arch/arm/boot/dts/skeleton64.dtsi
index b5d7f36f3..54e637752 100644
--- a/kernel/arch/arm/boot/dts/skeleton64.dtsi
+++ b/kernel/arch/arm/boot/dts/skeleton64.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Skeleton device tree in the 64 bits version; the bare minimum
  * needed to boot; just include and add a compatible value.  The
diff --git a/kernel/arch/arm/boot/dts/st-pincfg.h b/kernel/arch/arm/boot/dts/st-pincfg.h
index 4851c387d..d80551202 100644
--- a/kernel/arch/arm/boot/dts/st-pincfg.h
+++ b/kernel/arch/arm/boot/dts/st-pincfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ST_PINCFG_H_
 #define _ST_PINCFG_H_
 
diff --git a/kernel/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/kernel/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 1ec46a794..12afdc746 100644
--- a/kernel/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/kernel/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree for the ST-Ericsson Nomadik S8815 board
  * Produced by Calao Systems
diff --git a/kernel/arch/arm/boot/dts/ste-nomadik-s8815.dts b/kernel/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 789329030..4445446fa 100644
--- a/kernel/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/kernel/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree for the ST-Ericsson Nomadik S8815 board
  * Produced by Calao Systems
diff --git a/kernel/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/kernel/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index adb1c0998..68aab50a7 100644
--- a/kernel/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/kernel/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree for the ST-Ericsson Nomadik 8815 STn8815 SoC
  */
diff --git a/kernel/arch/arm/boot/dts/ste-u300.dts b/kernel/arch/arm/boot/dts/ste-u300.dts
index 2f5107ffe..62ecb6a2f 100644
--- a/kernel/arch/arm/boot/dts/ste-u300.dts
+++ b/kernel/arch/arm/boot/dts/ste-u300.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device Tree for the ST-Ericsson U300 Machine and SoC
  */
diff --git a/kernel/arch/arm/boot/dts/tango4-common.dtsi b/kernel/arch/arm/boot/dts/tango4-common.dtsi
index 0c8cad4d6..12ab6e0c0 100644
--- a/kernel/arch/arm/boot/dts/tango4-common.dtsi
+++ b/kernel/arch/arm/boot/dts/tango4-common.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Based on Mans Rullgard's Tango3 DT
  * https://github.com/mansr/linux-tangox
diff --git a/kernel/arch/arm/boot/dts/tango4-smp8758.dtsi b/kernel/arch/arm/boot/dts/tango4-smp8758.dtsi
index eca33d568..1c6a5bf1a 100644
--- a/kernel/arch/arm/boot/dts/tango4-smp8758.dtsi
+++ b/kernel/arch/arm/boot/dts/tango4-smp8758.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tango4-common.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/tango4-vantage-1172.dts b/kernel/arch/arm/boot/dts/tango4-vantage-1172.dts
index 13bcc460b..d237d7f02 100644
--- a/kernel/arch/arm/boot/dts/tango4-vantage-1172.dts
+++ b/kernel/arch/arm/boot/dts/tango4-vantage-1172.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tango4-smp8758.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra114-dalmore.dts b/kernel/arch/arm/boot/dts/tegra114-dalmore.dts
index 5af4dd321..acd6cf51b 100644
--- a/kernel/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/kernel/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This dts file supports Dalmore A04.
  * Other board revisions are not supported
diff --git a/kernel/arch/arm/boot/dts/tegra114-roth.dts b/kernel/arch/arm/boot/dts/tegra114-roth.dts
index 966a7fc04..7ed7370ee 100644
--- a/kernel/arch/arm/boot/dts/tegra114-roth.dts
+++ b/kernel/arch/arm/boot/dts/tegra114-roth.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra114-tn7.dts b/kernel/arch/arm/boot/dts/tegra114-tn7.dts
index a161fa1df..7fc4a8b31 100644
--- a/kernel/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/kernel/arch/arm/boot/dts/tegra114-tn7.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra114.dtsi b/kernel/arch/arm/boot/dts/tegra114.dtsi
index 8932ea3af..0e4a13295 100644
--- a/kernel/arch/arm/boot/dts/tegra114.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra114.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra114-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/memory/tegra114-mc.h>
diff --git a/kernel/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi b/kernel/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
index accb70551..784a529e1 100644
--- a/kernel/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	clock@60006000 {
 		emc-timings-3 {
diff --git a/kernel/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/kernel/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 61873d642..e8e777b8e 100644
--- a/kernel/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/kernel/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi b/kernel/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
index 4458e86b2..9af21fe93 100644
--- a/kernel/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	clock@60006000 {
 		emc-timings-1 {
diff --git a/kernel/arch/arm/boot/dts/tegra124-nyan-big.dts b/kernel/arch/arm/boot/dts/tegra124-nyan-big.dts
index 12eb7809d..d97791b98 100644
--- a/kernel/arch/arm/boot/dts/tegra124-nyan-big.dts
+++ b/kernel/arch/arm/boot/dts/tegra124-nyan-big.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra124-nyan.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi b/kernel/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
index 4e7b59e25..c7c31d4c1 100644
--- a/kernel/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	clock@60006000 {
 		emc-timings-1 {
diff --git a/kernel/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/kernel/arch/arm/boot/dts/tegra124-nyan-blaze.dts
index 1078a73d5..2a029ee86 100644
--- a/kernel/arch/arm/boot/dts/tegra124-nyan-blaze.dts
+++ b/kernel/arch/arm/boot/dts/tegra124-nyan-blaze.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra124-nyan.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra124-nyan.dtsi b/kernel/arch/arm/boot/dts/tegra124-nyan.dtsi
index 5cf987b54..360936703 100644
--- a/kernel/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
 #include "tegra124.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/tegra124-venice2.dts b/kernel/arch/arm/boot/dts/tegra124-venice2.dts
index 6e59cec09..32d9079f0 100644
--- a/kernel/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/kernel/arch/arm/boot/dts/tegra124-venice2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra124.dtsi b/kernel/arch/arm/boot/dts/tegra124.dtsi
index 8baf00b89..a7e43dcbf 100644
--- a/kernel/arch/arm/boot/dts/tegra124.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra124.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra124-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/memory/tegra124-mc.h>
diff --git a/kernel/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/kernel/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index 1242b841f..813ae34ed 100644
--- a/kernel/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tegra20.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/tegra20-harmony.dts b/kernel/arch/arm/boot/dts/tegra20-harmony.dts
index 41749693e..628a55a93 100644
--- a/kernel/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-harmony.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra20-iris-512.dts b/kernel/arch/arm/boot/dts/tegra20-iris-512.dts
index bb56dfe9e..401263889 100644
--- a/kernel/arch/arm/boot/dts/tegra20-iris-512.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-iris-512.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra20-colibri-512.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra20-medcom-wide.dts b/kernel/arch/arm/boot/dts/tegra20-medcom-wide.dts
index 34c6588e9..cda5448c2 100644
--- a/kernel/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra20-tamonten.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra20-paz00.dts b/kernel/arch/arm/boot/dts/tegra20-paz00.dts
index bfa9421fc..30436969a 100644
--- a/kernel/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-paz00.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra20-plutux.dts b/kernel/arch/arm/boot/dts/tegra20-plutux.dts
index a10b415bb..429e4605f 100644
--- a/kernel/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-plutux.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra20-tamonten.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra20-seaboard.dts b/kernel/arch/arm/boot/dts/tegra20-seaboard.dts
index 2017acacc..284aae351 100644
--- a/kernel/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra20-tamonten.dtsi b/kernel/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 7361f4a82..872046d48 100644
--- a/kernel/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tegra20.dtsi"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/tegra20-tec.dts b/kernel/arch/arm/boot/dts/tegra20-tec.dts
index 9cb534f44..4dec27737 100644
--- a/kernel/arch/arm/boot/dts/tegra20-tec.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-tec.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra20-tamonten.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra20-trimslice.dts b/kernel/arch/arm/boot/dts/tegra20-trimslice.dts
index b902ab594..d55c6b240 100644
--- a/kernel/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra20-ventana.dts b/kernel/arch/arm/boot/dts/tegra20-ventana.dts
index 8f0aaabf7..ee3fbf941 100644
--- a/kernel/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/kernel/arch/arm/boot/dts/tegra20-ventana.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra20.dtsi b/kernel/arch/arm/boot/dts/tegra20.dtsi
index 7c85f97f7..914f59166 100644
--- a/kernel/arch/arm/boot/dts/tegra20.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra20.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra20-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/pinctrl/pinctrl-tegra.h>
diff --git a/kernel/arch/arm/boot/dts/tegra30-apalis-eval.dts b/kernel/arch/arm/boot/dts/tegra30-apalis-eval.dts
index fc530e4a9..07b945b03 100644
--- a/kernel/arch/arm/boot/dts/tegra30-apalis-eval.dts
+++ b/kernel/arch/arm/boot/dts/tegra30-apalis-eval.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm/boot/dts/tegra30-apalis.dtsi b/kernel/arch/arm/boot/dts/tegra30-apalis.dtsi
index 7a6a1a014..faa8cd291 100644
--- a/kernel/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tegra30.dtsi"
 
 /*
diff --git a/kernel/arch/arm/boot/dts/tegra30-beaver.dts b/kernel/arch/arm/boot/dts/tegra30-beaver.dts
index 3e104ddeb..5331a8f7d 100644
--- a/kernel/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/kernel/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra30.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/kernel/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index c9bfedcca..a02ec5082 100644
--- a/kernel/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/kernel/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra30-cardhu.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/kernel/arch/arm/boot/dts/tegra30-cardhu-a04.dts
index fadf55e46..4dbd4af67 100644
--- a/kernel/arch/arm/boot/dts/tegra30-cardhu-a04.dts
+++ b/kernel/arch/arm/boot/dts/tegra30-cardhu-a04.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra30-cardhu.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra30-cardhu.dtsi b/kernel/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 83dc14a9b..92a9740c5 100644
--- a/kernel/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
 #include "tegra30.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/kernel/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
index a8c031874..3c5fb2430 100644
--- a/kernel/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+++ b/kernel/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra30-colibri.dtsi"
diff --git a/kernel/arch/arm/boot/dts/tegra30-colibri.dtsi b/kernel/arch/arm/boot/dts/tegra30-colibri.dtsi
index 5360d638e..139bfa028 100644
--- a/kernel/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
 #include "tegra30.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/tegra30.dtsi b/kernel/arch/arm/boot/dts/tegra30.dtsi
index 13960fda7..c3e9f1e84 100644
--- a/kernel/arch/arm/boot/dts/tegra30.dtsi
+++ b/kernel/arch/arm/boot/dts/tegra30.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra30-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/memory/tegra30-mc.h>
diff --git a/kernel/arch/arm/boot/dts/uniphier-ld4.dtsi b/kernel/arch/arm/boot/dts/uniphier-ld4.dtsi
index 79183db5b..93586faf9 100644
--- a/kernel/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/kernel/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -209,7 +209,8 @@
 			interrupts = <0 80 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb0>;
-			clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
+				 <&mio_clk 12>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
 				 <&mio_rst 12>;
 		};
@@ -221,7 +222,8 @@
 			interrupts = <0 81 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb1>;
-			clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
+				 <&mio_clk 13>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
 				 <&mio_rst 13>;
 		};
@@ -233,7 +235,8 @@
 			interrupts = <0 82 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb2>;
-			clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
+				 <&mio_clk 14>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
 				 <&mio_rst 14>;
 		};
diff --git a/kernel/arch/arm/boot/dts/uniphier-pro4.dtsi b/kernel/arch/arm/boot/dts/uniphier-pro4.dtsi
index b3dbbd9b6..2a9bd7f9f 100644
--- a/kernel/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/kernel/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -241,7 +241,8 @@
 			interrupts = <0 80 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb2>;
-			clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
+				 <&mio_clk 12>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
 				 <&mio_rst 12>;
 		};
@@ -253,7 +254,8 @@
 			interrupts = <0 81 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb3>;
-			clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
+				 <&mio_clk 13>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
 				 <&mio_rst 13>;
 		};
diff --git a/kernel/arch/arm/boot/dts/uniphier-sld8.dtsi b/kernel/arch/arm/boot/dts/uniphier-sld8.dtsi
index b08390332..ebd0c3f63 100644
--- a/kernel/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/kernel/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -209,7 +209,8 @@
 			interrupts = <0 80 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb0>;
-			clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
+				 <&mio_clk 12>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
 				 <&mio_rst 12>;
 		};
@@ -221,7 +222,8 @@
 			interrupts = <0 81 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb1>;
-			clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
+				 <&mio_clk 13>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
 				 <&mio_rst 13>;
 		};
@@ -233,7 +235,8 @@
 			interrupts = <0 82 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb2>;
-			clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
+				 <&mio_clk 14>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
 				 <&mio_rst 14>;
 		};
diff --git a/kernel/arch/arm/boot/dts/versatile-ab.dts b/kernel/arch/arm/boot/dts/versatile-ab.dts
index 409e069b3..4a5161299 100644
--- a/kernel/arch/arm/boot/dts/versatile-ab.dts
+++ b/kernel/arch/arm/boot/dts/versatile-ab.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /include/ "skeleton.dtsi"
 
diff --git a/kernel/arch/arm/boot/dts/versatile-pb.dts b/kernel/arch/arm/boot/dts/versatile-pb.dts
index 9abe26028..06a0fdf24 100644
--- a/kernel/arch/arm/boot/dts/versatile-pb.dts
+++ b/kernel/arch/arm/boot/dts/versatile-pb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "versatile-ab.dts"
 
 / {
diff --git a/kernel/arch/arm/boot/dts/vexpress-v2m.dtsi b/kernel/arch/arm/boot/dts/vexpress-v2m.dtsi
index 1b6f6393b..b0021a816 100644
--- a/kernel/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/kernel/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Versatile Express
  *
diff --git a/kernel/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/kernel/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
index 0c8de0ca7..a8ac4e2ed 100644
--- a/kernel/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
+++ b/kernel/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Versatile Express
  *
diff --git a/kernel/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/kernel/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index 65ecf2063..a4c7713ed 100644
--- a/kernel/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/kernel/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Versatile Express
  *
diff --git a/kernel/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/kernel/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
index 6e69b8e6c..32f1906ff 100644
--- a/kernel/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
+++ b/kernel/arch/arm/boot/dts/vexpress-v2p-ca5s.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Versatile Express
  *
diff --git a/kernel/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/kernel/arch/arm/boot/dts/vexpress-v2p-ca9.dts
index c9305b58a..5814460e0 100644
--- a/kernel/arch/arm/boot/dts/vexpress-v2p-ca9.dts
+++ b/kernel/arch/arm/boot/dts/vexpress-v2p-ca9.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Versatile Express
  *
diff --git a/kernel/arch/arm/boot/dts/xenvm-4.2.dts b/kernel/arch/arm/boot/dts/xenvm-4.2.dts
index 336915151..384cd92f1 100644
--- a/kernel/arch/arm/boot/dts/xenvm-4.2.dts
+++ b/kernel/arch/arm/boot/dts/xenvm-4.2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xen Virtual Machine for unprivileged guests
  *
diff --git a/kernel/arch/arm/boot/dts/zx296702-ad1.dts b/kernel/arch/arm/boot/dts/zx296702-ad1.dts
index b0183c3a1..eedd3fcbc 100644
--- a/kernel/arch/arm/boot/dts/zx296702-ad1.dts
+++ b/kernel/arch/arm/boot/dts/zx296702-ad1.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /dts-v1/;
 
diff --git a/kernel/arch/arm/boot/dts/zx296702.dtsi b/kernel/arch/arm/boot/dts/zx296702.dtsi
index d45c8fcd7..752d28e0f 100644
--- a/kernel/arch/arm/boot/dts/zx296702.dtsi
+++ b/kernel/arch/arm/boot/dts/zx296702.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include "skeleton.dtsi"
 #include <dt-bindings/clock/zx296702-clock.h>
diff --git a/kernel/arch/arm/common/Kconfig b/kernel/arch/arm/common/Kconfig
index 1181053e3..e5ad07088 100644
--- a/kernel/arch/arm/common/Kconfig
+++ b/kernel/arch/arm/common/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config SA1111
 	bool
 	select DMABOUNCE if !ARCH_PXA
diff --git a/kernel/arch/arm/common/Makefile b/kernel/arch/arm/common/Makefile
index 29fdf6a36..70b4a14ed 100644
--- a/kernel/arch/arm/common/Makefile
+++ b/kernel/arch/arm/common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/crypto/Kconfig b/kernel/arch/arm/crypto/Kconfig
index ec72752d5..b8e69fe28 100644
--- a/kernel/arch/arm/crypto/Kconfig
+++ b/kernel/arch/arm/crypto/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 menuconfig ARM_CRYPTO
 	bool "ARM Accelerated Cryptographic Algorithms"
diff --git a/kernel/arch/arm/crypto/Makefile b/kernel/arch/arm/crypto/Makefile
index f2215fbee..30ef8e291 100644
--- a/kernel/arch/arm/crypto/Makefile
+++ b/kernel/arch/arm/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific CryptoAPI modules.
 #
diff --git a/kernel/arch/arm/crypto/sha1.h b/kernel/arch/arm/crypto/sha1.h
index ffd8bd08b..758db3e9f 100644
--- a/kernel/arch/arm/crypto/sha1.h
+++ b/kernel/arch/arm/crypto/sha1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_ARM_CRYPTO_SHA1_H
 #define ASM_ARM_CRYPTO_SHA1_H
 
diff --git a/kernel/arch/arm/crypto/sha256_glue.h b/kernel/arch/arm/crypto/sha256_glue.h
index 7cf0bf786..9f0d578ba 100644
--- a/kernel/arch/arm/crypto/sha256_glue.h
+++ b/kernel/arch/arm/crypto/sha256_glue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_SHA256_GLUE_H
 #define _CRYPTO_SHA256_GLUE_H
 
diff --git a/kernel/arch/arm/crypto/sha512.h b/kernel/arch/arm/crypto/sha512.h
index a75d9a829..e14572be7 100644
--- a/kernel/arch/arm/crypto/sha512.h
+++ b/kernel/arch/arm/crypto/sha512.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 int sha512_arm_update(struct shash_desc *desc, const u8 *data,
 		      unsigned int len);
diff --git a/kernel/arch/arm/include/asm/Kbuild b/kernel/arch/arm/include/asm/Kbuild
index 721ab5ecf..0f2c8a2a8 100644
--- a/kernel/arch/arm/include/asm/Kbuild
+++ b/kernel/arch/arm/include/asm/Kbuild
@@ -20,7 +20,6 @@ generic-y += simd.h
 generic-y += sizes.h
 generic-y += timex.h
 generic-y += trace_clock.h
-generic-y += unaligned.h
 
 generated-y += mach-types.h
 generated-y += unistd-nr.h
diff --git a/kernel/arch/arm/include/asm/arch_timer.h b/kernel/arch/arm/include/asm/arch_timer.h
index d4ebf5679..9327e3a10 100644
--- a/kernel/arch/arm/include/asm/arch_timer.h
+++ b/kernel/arch/arm/include/asm/arch_timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_ARCH_TIMER_H
 #define __ASMARM_ARCH_TIMER_H
 
diff --git a/kernel/arch/arm/include/asm/barrier.h b/kernel/arch/arm/include/asm/barrier.h
index f5d698182..40f5c410f 100644
--- a/kernel/arch/arm/include/asm/barrier.h
+++ b/kernel/arch/arm/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_BARRIER_H
 #define __ASM_BARRIER_H
 
diff --git a/kernel/arch/arm/include/asm/bitops.h b/kernel/arch/arm/include/asm/bitops.h
index f308c8c40..ce5ee762e 100644
--- a/kernel/arch/arm/include/asm/bitops.h
+++ b/kernel/arch/arm/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 1995, Russell King.
  * Various bits and pieces copyrights include:
diff --git a/kernel/arch/arm/include/asm/bitrev.h b/kernel/arch/arm/include/asm/bitrev.h
index ec291c350..84ad8dde6 100644
--- a/kernel/arch/arm/include/asm/bitrev.h
+++ b/kernel/arch/arm/include/asm/bitrev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_BITREV_H
 #define __ASM_BITREV_H
 
diff --git a/kernel/arch/arm/include/asm/bug.h b/kernel/arch/arm/include/asm/bug.h
index 2244a94ed..237aa52d8 100644
--- a/kernel/arch/arm/include/asm/bug.h
+++ b/kernel/arch/arm/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMARM_BUG_H
 #define _ASMARM_BUG_H
 
diff --git a/kernel/arch/arm/include/asm/cache.h b/kernel/arch/arm/include/asm/cache.h
index 75fe66bc0..1d65ed3a2 100644
--- a/kernel/arch/arm/include/asm/cache.h
+++ b/kernel/arch/arm/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/arm/include/asm/cache.h
  */
diff --git a/kernel/arch/arm/include/asm/cachetype.h b/kernel/arch/arm/include/asm/cachetype.h
index 01509ae0b..e8c30430b 100644
--- a/kernel/arch/arm/include/asm/cachetype.h
+++ b/kernel/arch/arm/include/asm/cachetype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_CACHETYPE_H
 #define __ASM_ARM_CACHETYPE_H
 
diff --git a/kernel/arch/arm/include/asm/checksum.h b/kernel/arch/arm/include/asm/checksum.h
index 524692f4a..20043e0eb 100644
--- a/kernel/arch/arm/include/asm/checksum.h
+++ b/kernel/arch/arm/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/arm/include/asm/checksum.h
  *
diff --git a/kernel/arch/arm/include/asm/cmpxchg.h b/kernel/arch/arm/include/asm/cmpxchg.h
index 97882f9ba..8b701f8e1 100644
--- a/kernel/arch/arm/include/asm/cmpxchg.h
+++ b/kernel/arch/arm/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_CMPXCHG_H
 #define __ASM_ARM_CMPXCHG_H
 
diff --git a/kernel/arch/arm/include/asm/compiler.h b/kernel/arch/arm/include/asm/compiler.h
index 29fe85e59..5e94e67d1 100644
--- a/kernel/arch/arm/include/asm/compiler.h
+++ b/kernel/arch/arm/include/asm/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_COMPILER_H
 #define __ASM_ARM_COMPILER_H
 
diff --git a/kernel/arch/arm/include/asm/cp15.h b/kernel/arch/arm/include/asm/cp15.h
index dbdbce1b3..4c9fa72b5 100644
--- a/kernel/arch/arm/include/asm/cp15.h
+++ b/kernel/arch/arm/include/asm/cp15.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_CP15_H
 #define __ASM_ARM_CP15_H
 
diff --git a/kernel/arch/arm/include/asm/cpuidle.h b/kernel/arch/arm/include/asm/cpuidle.h
index baefe1d51..6b2ff7243 100644
--- a/kernel/arch/arm/include/asm/cpuidle.h
+++ b/kernel/arch/arm/include/asm/cpuidle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_CPUIDLE_H
 #define __ASM_ARM_CPUIDLE_H
 
diff --git a/kernel/arch/arm/include/asm/cputype.h b/kernel/arch/arm/include/asm/cputype.h
index b62eaeb14..441933311 100644
--- a/kernel/arch/arm/include/asm/cputype.h
+++ b/kernel/arch/arm/include/asm/cputype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_CPUTYPE_H
 #define __ASM_ARM_CPUTYPE_H
 
diff --git a/kernel/arch/arm/include/asm/cti.h b/kernel/arch/arm/include/asm/cti.h
index 2381199ac..f8500e5d6 100644
--- a/kernel/arch/arm/include/asm/cti.h
+++ b/kernel/arch/arm/include/asm/cti.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_CTI_H
 #define __ASMARM_CTI_H
 
diff --git a/kernel/arch/arm/include/asm/delay.h b/kernel/arch/arm/include/asm/delay.h
index e986b7f71..4f80b7237 100644
--- a/kernel/arch/arm/include/asm/delay.h
+++ b/kernel/arch/arm/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1995-2004 Russell King
  *
diff --git a/kernel/arch/arm/include/asm/div64.h b/kernel/arch/arm/include/asm/div64.h
index 7d919a9b3..898e9c78a 100644
--- a/kernel/arch/arm/include/asm/div64.h
+++ b/kernel/arch/arm/include/asm/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_DIV64
 #define __ASM_ARM_DIV64
 
diff --git a/kernel/arch/arm/include/asm/dma-contiguous.h b/kernel/arch/arm/include/asm/dma-contiguous.h
index 4f8e9e551..d785187a6 100644
--- a/kernel/arch/arm/include/asm/dma-contiguous.h
+++ b/kernel/arch/arm/include/asm/dma-contiguous.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_DMA_CONTIGUOUS_H
 #define ASMARM_DMA_CONTIGUOUS_H
 
diff --git a/kernel/arch/arm/include/asm/dma-iommu.h b/kernel/arch/arm/include/asm/dma-iommu.h
index c090ec675..0722ec6be 100644
--- a/kernel/arch/arm/include/asm/dma-iommu.h
+++ b/kernel/arch/arm/include/asm/dma-iommu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_DMA_IOMMU_H
 #define ASMARM_DMA_IOMMU_H
 
diff --git a/kernel/arch/arm/include/asm/dma-mapping.h b/kernel/arch/arm/include/asm/dma-mapping.h
index 4e0285a66..3ca119997 100644
--- a/kernel/arch/arm/include/asm/dma-mapping.h
+++ b/kernel/arch/arm/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_DMA_MAPPING_H
 #define ASMARM_DMA_MAPPING_H
 
diff --git a/kernel/arch/arm/include/asm/dma.h b/kernel/arch/arm/include/asm/dma.h
index bb4fa67da..a81dda65c 100644
--- a/kernel/arch/arm/include/asm/dma.h
+++ b/kernel/arch/arm/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_DMA_H
 #define __ASM_ARM_DMA_H
 
diff --git a/kernel/arch/arm/include/asm/ecard.h b/kernel/arch/arm/include/asm/ecard.h
index eaea14676..4befe8d2a 100644
--- a/kernel/arch/arm/include/asm/ecard.h
+++ b/kernel/arch/arm/include/asm/ecard.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/include/asm/ecard.h
  *
diff --git a/kernel/arch/arm/include/asm/elf.h b/kernel/arch/arm/include/asm/elf.h
index f13ae153f..8c5ca92a8 100644
--- a/kernel/arch/arm/include/asm/elf.h
+++ b/kernel/arch/arm/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_ELF_H
 #define __ASMARM_ELF_H
 
diff --git a/kernel/arch/arm/include/asm/entry-macro-multi.S b/kernel/arch/arm/include/asm/entry-macro-multi.S
index 609184f52..dfc6bfa43 100644
--- a/kernel/arch/arm/include/asm/entry-macro-multi.S
+++ b/kernel/arch/arm/include/asm/entry-macro-multi.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/assembler.h>
 
 /*
diff --git a/kernel/arch/arm/include/asm/exception.h b/kernel/arch/arm/include/asm/exception.h
index bf1991263..a7273ad95 100644
--- a/kernel/arch/arm/include/asm/exception.h
+++ b/kernel/arch/arm/include/asm/exception.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Annotations for marking C functions as exception handlers.
  *
diff --git a/kernel/arch/arm/include/asm/fiq.h b/kernel/arch/arm/include/asm/fiq.h
index d493d0b74..6bdfb4a47 100644
--- a/kernel/arch/arm/include/asm/fiq.h
+++ b/kernel/arch/arm/include/asm/fiq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/arm/include/asm/fiq.h
  *
diff --git a/kernel/arch/arm/include/asm/fixmap.h b/kernel/arch/arm/include/asm/fixmap.h
index 8f967d137..472c93db5 100644
--- a/kernel/arch/arm/include/asm/fixmap.h
+++ b/kernel/arch/arm/include/asm/fixmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FIXMAP_H
 #define _ASM_FIXMAP_H
 
diff --git a/kernel/arch/arm/include/asm/flat.h b/kernel/arch/arm/include/asm/flat.h
index 29d3a1524..f0c75ddee 100644
--- a/kernel/arch/arm/include/asm/flat.h
+++ b/kernel/arch/arm/include/asm/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/include/asm/flat.h -- uClinux flat-format executables
  */
diff --git a/kernel/arch/arm/include/asm/ftrace.h b/kernel/arch/arm/include/asm/ftrace.h
index f379881d5..9e842ff41 100644
--- a/kernel/arch/arm/include/asm/ftrace.h
+++ b/kernel/arch/arm/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_FTRACE
 #define _ASM_ARM_FTRACE
 
diff --git a/kernel/arch/arm/include/asm/futex.h b/kernel/arch/arm/include/asm/futex.h
index cc414382d..ffebe7b7a 100644
--- a/kernel/arch/arm/include/asm/futex.h
+++ b/kernel/arch/arm/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_FUTEX_H
 #define _ASM_ARM_FUTEX_H
 
diff --git a/kernel/arch/arm/include/asm/gpio.h b/kernel/arch/arm/include/asm/gpio.h
index 504dcddeb..c50e38335 100644
--- a/kernel/arch/arm/include/asm/gpio.h
+++ b/kernel/arch/arm/include/asm/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_ARM_GPIO_H
 #define _ARCH_ARM_GPIO_H
 
diff --git a/kernel/arch/arm/include/asm/hardirq.h b/kernel/arch/arm/include/asm/hardirq.h
index 3d7351c84..cba23eaa6 100644
--- a/kernel/arch/arm/include/asm/hardirq.h
+++ b/kernel/arch/arm/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
diff --git a/kernel/arch/arm/include/asm/hardware/it8152.h b/kernel/arch/arm/include/asm/hardware/it8152.h
index 076777ff3..e175c2384 100644
--- a/kernel/arch/arm/include/asm/hardware/it8152.h
+++ b/kernel/arch/arm/include/asm/hardware/it8152.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/arm/hardware/it8152.h
  *
diff --git a/kernel/arch/arm/include/asm/hardware/sa1111.h b/kernel/arch/arm/include/asm/hardware/sa1111.h
index 8979fa3bb..0bbf163d1 100644
--- a/kernel/arch/arm/include/asm/hardware/sa1111.h
+++ b/kernel/arch/arm/include/asm/hardware/sa1111.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/include/asm/hardware/sa1111.h
  *
diff --git a/kernel/arch/arm/include/asm/highmem.h b/kernel/arch/arm/include/asm/highmem.h
index 0a0e2d178..b03d3fa2e 100644
--- a/kernel/arch/arm/include/asm/highmem.h
+++ b/kernel/arch/arm/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HIGHMEM_H
 #define _ASM_HIGHMEM_H
 
diff --git a/kernel/arch/arm/include/asm/hw_breakpoint.h b/kernel/arch/arm/include/asm/hw_breakpoint.h
index afcaf8bf9..e46e4e7bd 100644
--- a/kernel/arch/arm/include/asm/hw_breakpoint.h
+++ b/kernel/arch/arm/include/asm/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARM_HW_BREAKPOINT_H
 #define _ARM_HW_BREAKPOINT_H
 
diff --git a/kernel/arch/arm/include/asm/hw_irq.h b/kernel/arch/arm/include/asm/hw_irq.h
index 9beb92914..cecc13214 100644
--- a/kernel/arch/arm/include/asm/hw_irq.h
+++ b/kernel/arch/arm/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Nothing to see here yet
  */
diff --git a/kernel/arch/arm/include/asm/hwcap.h b/kernel/arch/arm/include/asm/hwcap.h
index 6e183fd26..e31d9f1b8 100644
--- a/kernel/arch/arm/include/asm/hwcap.h
+++ b/kernel/arch/arm/include/asm/hwcap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_HWCAP_H
 #define __ASMARM_HWCAP_H
 
diff --git a/kernel/arch/arm/include/asm/hypervisor.h b/kernel/arch/arm/include/asm/hypervisor.h
index b90d9e523..df8524365 100644
--- a/kernel/arch/arm/include/asm/hypervisor.h
+++ b/kernel/arch/arm/include/asm/hypervisor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_HYPERVISOR_H
 #define _ASM_ARM_HYPERVISOR_H
 
diff --git a/kernel/arch/arm/include/asm/ide.h b/kernel/arch/arm/include/asm/ide.h
index b507ce8e5..a81e0b0d6 100644
--- a/kernel/arch/arm/include/asm/ide.h
+++ b/kernel/arch/arm/include/asm/ide.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/arm/include/asm/ide.h
  *
diff --git a/kernel/arch/arm/include/asm/idmap.h b/kernel/arch/arm/include/asm/idmap.h
index bf863edb5..73ba956e3 100644
--- a/kernel/arch/arm/include/asm/idmap.h
+++ b/kernel/arch/arm/include/asm/idmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IDMAP_H
 #define __ASM_IDMAP_H
 
diff --git a/kernel/arch/arm/include/asm/insn.h b/kernel/arch/arm/include/asm/insn.h
index e96065da4..f20e08ac8 100644
--- a/kernel/arch/arm/include/asm/insn.h
+++ b/kernel/arch/arm/include/asm/insn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_INSN_H
 #define __ASM_ARM_INSN_H
 
diff --git a/kernel/arch/arm/include/asm/irq.h b/kernel/arch/arm/include/asm/irq.h
index e53638c8e..b6f319606 100644
--- a/kernel/arch/arm/include/asm/irq.h
+++ b/kernel/arch/arm/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_IRQ_H
 #define __ASM_ARM_IRQ_H
 
diff --git a/kernel/arch/arm/include/asm/irq_work.h b/kernel/arch/arm/include/asm/irq_work.h
index 712d03e59..889599983 100644
--- a/kernel/arch/arm/include/asm/irq_work.h
+++ b/kernel/arch/arm/include/asm/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_IRQ_WORK_H
 #define __ASM_ARM_IRQ_WORK_H
 
diff --git a/kernel/arch/arm/include/asm/irqflags.h b/kernel/arch/arm/include/asm/irqflags.h
index e6b70d9d0..aeec7f24e 100644
--- a/kernel/arch/arm/include/asm/irqflags.h
+++ b/kernel/arch/arm/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_IRQFLAGS_H
 #define __ASM_ARM_IRQFLAGS_H
 
diff --git a/kernel/arch/arm/include/asm/jump_label.h b/kernel/arch/arm/include/asm/jump_label.h
index 34f7b6980..e12d7d096 100644
--- a/kernel/arch/arm/include/asm/jump_label.h
+++ b/kernel/arch/arm/include/asm/jump_label.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_JUMP_LABEL_H
 #define _ASM_ARM_JUMP_LABEL_H
 
diff --git a/kernel/arch/arm/include/asm/kexec.h b/kernel/arch/arm/include/asm/kexec.h
index 25021b798..22751b5b5 100644
--- a/kernel/arch/arm/include/asm/kexec.h
+++ b/kernel/arch/arm/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARM_KEXEC_H
 #define _ARM_KEXEC_H
 
diff --git a/kernel/arch/arm/include/asm/kgdb.h b/kernel/arch/arm/include/asm/kgdb.h
index 0a9d5dd93..3b73fdcf3 100644
--- a/kernel/arch/arm/include/asm/kgdb.h
+++ b/kernel/arch/arm/include/asm/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ARM KGDB support
  *
diff --git a/kernel/arch/arm/include/asm/kmap_types.h b/kernel/arch/arm/include/asm/kmap_types.h
index 83eb2f772..5590940ee 100644
--- a/kernel/arch/arm/include/asm/kmap_types.h
+++ b/kernel/arch/arm/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARM_KMAP_TYPES_H
 #define __ARM_KMAP_TYPES_H
 
diff --git a/kernel/arch/arm/include/asm/limits.h b/kernel/arch/arm/include/asm/limits.h
index 08d8c6600..ab159371d 100644
--- a/kernel/arch/arm/include/asm/limits.h
+++ b/kernel/arch/arm/include/asm/limits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PIPE_H
 #define __ASM_PIPE_H
 
diff --git a/kernel/arch/arm/include/asm/linkage.h b/kernel/arch/arm/include/asm/linkage.h
index 5a25632b1..c4670694a 100644
--- a/kernel/arch/arm/include/asm/linkage.h
+++ b/kernel/arch/arm/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/arm/include/asm/mc146818rtc.h b/kernel/arch/arm/include/asm/mc146818rtc.h
index e8567bb99..58922879a 100644
--- a/kernel/arch/arm/include/asm/mc146818rtc.h
+++ b/kernel/arch/arm/include/asm/mc146818rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/arm/include/asm/mcs_spinlock.h b/kernel/arch/arm/include/asm/mcs_spinlock.h
index f652ad658..529d2cf4d 100644
--- a/kernel/arch/arm/include/asm/mcs_spinlock.h
+++ b/kernel/arch/arm/include/asm/mcs_spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MCS_LOCK_H
 #define __ASM_MCS_LOCK_H
 
diff --git a/kernel/arch/arm/include/asm/memblock.h b/kernel/arch/arm/include/asm/memblock.h
index bf47a6c11..b10fd358c 100644
--- a/kernel/arch/arm/include/asm/memblock.h
+++ b/kernel/arch/arm/include/asm/memblock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_MEMBLOCK_H
 #define _ASM_ARM_MEMBLOCK_H
 
diff --git a/kernel/arch/arm/include/asm/mmu.h b/kernel/arch/arm/include/asm/mmu.h
index a5b474210..65669b9ce 100644
--- a/kernel/arch/arm/include/asm/mmu.h
+++ b/kernel/arch/arm/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARM_MMU_H
 #define __ARM_MMU_H
 
diff --git a/kernel/arch/arm/include/asm/module.h b/kernel/arch/arm/include/asm/module.h
index ed2319663..89ad05960 100644
--- a/kernel/arch/arm/include/asm/module.h
+++ b/kernel/arch/arm/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_MODULE_H
 #define _ASM_ARM_MODULE_H
 
diff --git a/kernel/arch/arm/include/asm/mpu.h b/kernel/arch/arm/include/asm/mpu.h
index c3247cc2f..0c3f774fa 100644
--- a/kernel/arch/arm/include/asm/mpu.h
+++ b/kernel/arch/arm/include/asm/mpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARM_MPU_H
 #define __ARM_MPU_H
 
diff --git a/kernel/arch/arm/include/asm/nwflash.h b/kernel/arch/arm/include/asm/nwflash.h
index 04e5a557a..0ec6f07c2 100644
--- a/kernel/arch/arm/include/asm/nwflash.h
+++ b/kernel/arch/arm/include/asm/nwflash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FLASH_H
 #define _FLASH_H
 
diff --git a/kernel/arch/arm/include/asm/paravirt.h b/kernel/arch/arm/include/asm/paravirt.h
index 8435ff591..d51e5cd31 100644
--- a/kernel/arch/arm/include/asm/paravirt.h
+++ b/kernel/arch/arm/include/asm/paravirt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_PARAVIRT_H
 #define _ASM_ARM_PARAVIRT_H
 
diff --git a/kernel/arch/arm/include/asm/patch.h b/kernel/arch/arm/include/asm/patch.h
index 77e054c2f..0b48247c4 100644
--- a/kernel/arch/arm/include/asm/patch.h
+++ b/kernel/arch/arm/include/asm/patch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARM_KERNEL_PATCH_H
 #define _ARM_KERNEL_PATCH_H
 
diff --git a/kernel/arch/arm/include/asm/pci.h b/kernel/arch/arm/include/asm/pci.h
index 396c92bcc..960d9dc4f 100644
--- a/kernel/arch/arm/include/asm/pci.h
+++ b/kernel/arch/arm/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_PCI_H
 #define ASMARM_PCI_H
 
diff --git a/kernel/arch/arm/include/asm/sections.h b/kernel/arch/arm/include/asm/sections.h
index 803bbf2b2..63dfe1f10 100644
--- a/kernel/arch/arm/include/asm/sections.h
+++ b/kernel/arch/arm/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_SECTIONS_H
 #define _ASM_ARM_SECTIONS_H
 
diff --git a/kernel/arch/arm/include/asm/shmparam.h b/kernel/arch/arm/include/asm/shmparam.h
index a5223b3a9..367a9dac6 100644
--- a/kernel/arch/arm/include/asm/shmparam.h
+++ b/kernel/arch/arm/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMARM_SHMPARAM_H
 #define _ASMARM_SHMPARAM_H
 
diff --git a/kernel/arch/arm/include/asm/signal.h b/kernel/arch/arm/include/asm/signal.h
index c0eb412af..65530a042 100644
--- a/kernel/arch/arm/include/asm/signal.h
+++ b/kernel/arch/arm/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMARM_SIGNAL_H
 #define _ASMARM_SIGNAL_H
 
diff --git a/kernel/arch/arm/include/asm/smp_plat.h b/kernel/arch/arm/include/asm/smp_plat.h
index f9080717f..f2c36acf9 100644
--- a/kernel/arch/arm/include/asm/smp_plat.h
+++ b/kernel/arch/arm/include/asm/smp_plat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ARM specific SMP header, this contains our implementation
  * details.
diff --git a/kernel/arch/arm/include/asm/smp_scu.h b/kernel/arch/arm/include/asm/smp_scu.h
index 5983f6bc6..800f52289 100644
--- a/kernel/arch/arm/include/asm/smp_scu.h
+++ b/kernel/arch/arm/include/asm/smp_scu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_ARCH_SCU_H
 #define __ASMARM_ARCH_SCU_H
 
diff --git a/kernel/arch/arm/include/asm/smp_twd.h b/kernel/arch/arm/include/asm/smp_twd.h
index 7b2899c2f..312784ee9 100644
--- a/kernel/arch/arm/include/asm/smp_twd.h
+++ b/kernel/arch/arm/include/asm/smp_twd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_SMP_TWD_H
 #define __ASMARM_SMP_TWD_H
 
diff --git a/kernel/arch/arm/include/asm/sparsemem.h b/kernel/arch/arm/include/asm/sparsemem.h
index 73e5e8513..d36223385 100644
--- a/kernel/arch/arm/include/asm/sparsemem.h
+++ b/kernel/arch/arm/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_SPARSEMEM_H
 #define ASMARM_SPARSEMEM_H
 
diff --git a/kernel/arch/arm/include/asm/spinlock.h b/kernel/arch/arm/include/asm/spinlock.h
index c030143c1..25cb465c8 100644
--- a/kernel/arch/arm/include/asm/spinlock.h
+++ b/kernel/arch/arm/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_H
 #define __ASM_SPINLOCK_H
 
diff --git a/kernel/arch/arm/include/asm/spinlock_types.h b/kernel/arch/arm/include/asm/spinlock_types.h
index 47663fcb1..597695864 100644
--- a/kernel/arch/arm/include/asm/spinlock_types.h
+++ b/kernel/arch/arm/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_TYPES_H
 #define __ASM_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/arm/include/asm/stackprotector.h b/kernel/arch/arm/include/asm/stackprotector.h
index de003327b..ef5f7b694 100644
--- a/kernel/arch/arm/include/asm/stackprotector.h
+++ b/kernel/arch/arm/include/asm/stackprotector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * GCC stack protector support.
  *
diff --git a/kernel/arch/arm/include/asm/stacktrace.h b/kernel/arch/arm/include/asm/stacktrace.h
index 7722201ea..2d76a2e29 100644
--- a/kernel/arch/arm/include/asm/stacktrace.h
+++ b/kernel/arch/arm/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_STACKTRACE_H
 #define __ASM_STACKTRACE_H
 
diff --git a/kernel/arch/arm/include/asm/string.h b/kernel/arch/arm/include/asm/string.h
index fe1c6af3a..f54a3136a 100644
--- a/kernel/arch/arm/include/asm/string.h
+++ b/kernel/arch/arm/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_STRING_H
 #define __ASM_ARM_STRING_H
 
diff --git a/kernel/arch/arm/include/asm/suspend.h b/kernel/arch/arm/include/asm/suspend.h
index a61905c86..452bbdcbc 100644
--- a/kernel/arch/arm/include/asm/suspend.h
+++ b/kernel/arch/arm/include/asm/suspend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_SUSPEND_H
 #define __ASM_ARM_SUSPEND_H
 
diff --git a/kernel/arch/arm/include/asm/swab.h b/kernel/arch/arm/include/asm/swab.h
index 537fc9b91..c60518230 100644
--- a/kernel/arch/arm/include/asm/swab.h
+++ b/kernel/arch/arm/include/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/arm/include/asm/byteorder.h
  *
diff --git a/kernel/arch/arm/include/asm/switch_to.h b/kernel/arch/arm/include/asm/switch_to.h
index 12ebfcc1d..d3e937dce 100644
--- a/kernel/arch/arm/include/asm/switch_to.h
+++ b/kernel/arch/arm/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_SWITCH_TO_H
 #define __ASM_ARM_SWITCH_TO_H
 
diff --git a/kernel/arch/arm/include/asm/sync_bitops.h b/kernel/arch/arm/include/asm/sync_bitops.h
index 9732b8e11..39ff21713 100644
--- a/kernel/arch/arm/include/asm/sync_bitops.h
+++ b/kernel/arch/arm/include/asm/sync_bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SYNC_BITOPS_H__
 #define __ASM_SYNC_BITOPS_H__
 
diff --git a/kernel/arch/arm/include/asm/syscall.h b/kernel/arch/arm/include/asm/syscall.h
index e86c985b8..06dea6bce 100644
--- a/kernel/arch/arm/include/asm/syscall.h
+++ b/kernel/arch/arm/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Access to user system call parameters and results
  *
diff --git a/kernel/arch/arm/include/asm/system_info.h b/kernel/arch/arm/include/asm/system_info.h
index 3860cbd40..ef7fdb588 100644
--- a/kernel/arch/arm/include/asm/system_info.h
+++ b/kernel/arch/arm/include/asm/system_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_SYSTEM_INFO_H
 #define __ASM_ARM_SYSTEM_INFO_H
 
diff --git a/kernel/arch/arm/include/asm/system_misc.h b/kernel/arch/arm/include/asm/system_misc.h
index 8c4a89f5c..78f6db114 100644
--- a/kernel/arch/arm/include/asm/system_misc.h
+++ b/kernel/arch/arm/include/asm/system_misc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_SYSTEM_MISC_H
 #define __ASM_ARM_SYSTEM_MISC_H
 
diff --git a/kernel/arch/arm/include/asm/therm.h b/kernel/arch/arm/include/asm/therm.h
index f002f0197..17b0bc9b5 100644
--- a/kernel/arch/arm/include/asm/therm.h
+++ b/kernel/arch/arm/include/asm/therm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/include/asm/therm.h: Definitions for Dallas Semiconductor
  *  DS1620 thermometer driver (as used in the Rebel.com NetWinder)
diff --git a/kernel/arch/arm/include/asm/tls.h b/kernel/arch/arm/include/asm/tls.h
index 5f833f7ad..5a66c3b13 100644
--- a/kernel/arch/arm/include/asm/tls.h
+++ b/kernel/arch/arm/include/asm/tls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMARM_TLS_H
 #define __ASMARM_TLS_H
 
diff --git a/kernel/arch/arm/include/asm/topology.h b/kernel/arch/arm/include/asm/topology.h
index 370f7a732..f59ab9bcb 100644
--- a/kernel/arch/arm/include/asm/topology.h
+++ b/kernel/arch/arm/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_TOPOLOGY_H
 #define _ASM_ARM_TOPOLOGY_H
 
diff --git a/kernel/arch/arm/include/asm/traps.h b/kernel/arch/arm/include/asm/traps.h
index 683d92309..f9a6c5fc3 100644
--- a/kernel/arch/arm/include/asm/traps.h
+++ b/kernel/arch/arm/include/asm/traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMARM_TRAP_H
 #define _ASMARM_TRAP_H
 
diff --git a/kernel/arch/arm/include/asm/ucontext.h b/kernel/arch/arm/include/asm/ucontext.h
index 921d82748..3f0d95ab1 100644
--- a/kernel/arch/arm/include/asm/ucontext.h
+++ b/kernel/arch/arm/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMARM_UCONTEXT_H
 #define _ASMARM_UCONTEXT_H
 
diff --git a/kernel/arch/arm/include/asm/unaligned.h b/kernel/arch/arm/include/asm/unaligned.h
new file mode 100644
index 000000000..ab905ffcf
--- /dev/null
+++ b/kernel/arch/arm/include/asm/unaligned.h
@@ -0,0 +1,27 @@
+#ifndef __ASM_ARM_UNALIGNED_H
+#define __ASM_ARM_UNALIGNED_H
+
+/*
+ * We generally want to set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS on ARMv6+,
+ * but we don't want to use linux/unaligned/access_ok.h since that can lead
+ * to traps on unaligned stm/ldm or strd/ldrd.
+ */
+#include <asm/byteorder.h>
+
+#if defined(__LITTLE_ENDIAN)
+# include <linux/unaligned/le_struct.h>
+# include <linux/unaligned/be_byteshift.h>
+# include <linux/unaligned/generic.h>
+# define get_unaligned	__get_unaligned_le
+# define put_unaligned	__put_unaligned_le
+#elif defined(__BIG_ENDIAN)
+# include <linux/unaligned/be_struct.h>
+# include <linux/unaligned/le_byteshift.h>
+# include <linux/unaligned/generic.h>
+# define get_unaligned	__get_unaligned_be
+# define put_unaligned	__put_unaligned_be
+#else
+# error need to define endianess
+#endif
+
+#endif /* __ASM_ARM_UNALIGNED_H */
diff --git a/kernel/arch/arm/include/asm/user.h b/kernel/arch/arm/include/asm/user.h
index 35917b3a9..c799a3c49 100644
--- a/kernel/arch/arm/include/asm/user.h
+++ b/kernel/arch/arm/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARM_USER_H
 #define _ARM_USER_H
 
diff --git a/kernel/arch/arm/include/asm/v7m.h b/kernel/arch/arm/include/asm/v7m.h
index 1fd775c1b..e6d9e29fc 100644
--- a/kernel/arch/arm/include/asm/v7m.h
+++ b/kernel/arch/arm/include/asm/v7m.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common defines for v7m cpus
  */
diff --git a/kernel/arch/arm/include/asm/vdso.h b/kernel/arch/arm/include/asm/vdso.h
index d0295f1dd..9c99e8175 100644
--- a/kernel/arch/arm/include/asm/vdso.h
+++ b/kernel/arch/arm/include/asm/vdso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_VDSO_H
 #define __ASM_VDSO_H
 
diff --git a/kernel/arch/arm/include/asm/vfp.h b/kernel/arch/arm/include/asm/vfp.h
index 22e414056..7157d2a30 100644
--- a/kernel/arch/arm/include/asm/vfp.h
+++ b/kernel/arch/arm/include/asm/vfp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/include/asm/vfp.h
  *
diff --git a/kernel/arch/arm/include/asm/vfpmacros.h b/kernel/arch/arm/include/asm/vfpmacros.h
index 301c1db3e..ef5dfedac 100644
--- a/kernel/arch/arm/include/asm/vfpmacros.h
+++ b/kernel/arch/arm/include/asm/vfpmacros.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/include/asm/vfpmacros.h
  *
diff --git a/kernel/arch/arm/include/asm/vga.h b/kernel/arch/arm/include/asm/vga.h
index 91f40217b..7c0bee578 100644
--- a/kernel/arch/arm/include/asm/vga.h
+++ b/kernel/arch/arm/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_VGA_H
 #define ASMARM_VGA_H
 
diff --git a/kernel/arch/arm/include/asm/word-at-a-time.h b/kernel/arch/arm/include/asm/word-at-a-time.h
index 5831dce4b..352ab2135 100644
--- a/kernel/arch/arm/include/asm/word-at-a-time.h
+++ b/kernel/arch/arm/include/asm/word-at-a-time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARM_WORD_AT_A_TIME_H
 #define __ASM_ARM_WORD_AT_A_TIME_H
 
diff --git a/kernel/arch/arm/include/asm/xen/events.h b/kernel/arch/arm/include/asm/xen/events.h
index 620dc7536..c83086f74 100644
--- a/kernel/arch/arm/include/asm/xen/events.h
+++ b/kernel/arch/arm/include/asm/xen/events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_XEN_EVENTS_H
 #define _ASM_ARM_XEN_EVENTS_H
 
diff --git a/kernel/arch/arm/include/debug/palmchip.S b/kernel/arch/arm/include/debug/palmchip.S
index 6824b2d1c..aed59332e 100644
--- a/kernel/arch/arm/include/debug/palmchip.S
+++ b/kernel/arch/arm/include/debug/palmchip.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/serial_reg.h>
 
 #undef UART_TX
diff --git a/kernel/arch/arm/include/debug/uncompress.h b/kernel/arch/arm/include/debug/uncompress.h
index 0e2949b0f..ff0b22729 100644
--- a/kernel/arch/arm/include/debug/uncompress.h
+++ b/kernel/arch/arm/include/debug/uncompress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_DEBUG_UNCOMPRESS
 extern void putc(int c);
 #else
diff --git a/kernel/arch/arm/include/uapi/asm/Kbuild b/kernel/arch/arm/include/uapi/asm/Kbuild
index 8e17fe80b..4d53de308 100644
--- a/kernel/arch/arm/include/uapi/asm/Kbuild
+++ b/kernel/arch/arm/include/uapi/asm/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
diff --git a/kernel/arch/arm/include/uapi/asm/auxvec.h b/kernel/arch/arm/include/uapi/asm/auxvec.h
index cb02a767a..5c09da596 100644
--- a/kernel/arch/arm/include/uapi/asm/auxvec.h
+++ b/kernel/arch/arm/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_AUXVEC_H
 #define __ASM_AUXVEC_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/byteorder.h b/kernel/arch/arm/include/uapi/asm/byteorder.h
index 77379748b..cb8406afe 100644
--- a/kernel/arch/arm/include/uapi/asm/byteorder.h
+++ b/kernel/arch/arm/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  arch/arm/include/asm/byteorder.h
  *
diff --git a/kernel/arch/arm/include/uapi/asm/fcntl.h b/kernel/arch/arm/include/uapi/asm/fcntl.h
index a80b6607b..e6b5d7141 100644
--- a/kernel/arch/arm/include/uapi/asm/fcntl.h
+++ b/kernel/arch/arm/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ARM_FCNTL_H
 #define _ARM_FCNTL_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/hwcap.h b/kernel/arch/arm/include/uapi/asm/hwcap.h
index 20d12f230..b5971dfa4 100644
--- a/kernel/arch/arm/include/uapi/asm/hwcap.h
+++ b/kernel/arch/arm/include/uapi/asm/hwcap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASMARM_HWCAP_H
 #define _UAPI__ASMARM_HWCAP_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/ioctls.h b/kernel/arch/arm/include/uapi/asm/ioctls.h
index 9c9629816..1bfe2854f 100644
--- a/kernel/arch/arm/include/uapi/asm/ioctls.h
+++ b/kernel/arch/arm/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_ARM_IOCTLS_H
 #define __ASM_ARM_IOCTLS_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/kvm.h b/kernel/arch/arm/include/uapi/asm/kvm.h
index 5db2d4c6a..1f57bbe82 100644
--- a/kernel/arch/arm/include/uapi/asm/kvm.h
+++ b/kernel/arch/arm/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 - Virtual Open Systems and Columbia University
  * Author: Christoffer Dall <c.dall@virtualopensystems.com>
diff --git a/kernel/arch/arm/include/uapi/asm/kvm_para.h b/kernel/arch/arm/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/arm/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/arm/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/arm/include/uapi/asm/perf_regs.h b/kernel/arch/arm/include/uapi/asm/perf_regs.h
index ce5944845..a3c046174 100644
--- a/kernel/arch/arm/include/uapi/asm/perf_regs.h
+++ b/kernel/arch/arm/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ARM_PERF_REGS_H
 #define _ASM_ARM_PERF_REGS_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/posix_types.h b/kernel/arch/arm/include/uapi/asm/posix_types.h
index d2de9cbbc..6bf11ad5d 100644
--- a/kernel/arch/arm/include/uapi/asm/posix_types.h
+++ b/kernel/arch/arm/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  arch/arm/include/asm/posix_types.h
  *
diff --git a/kernel/arch/arm/include/uapi/asm/ptrace.h b/kernel/arch/arm/include/uapi/asm/ptrace.h
index 5af0ed1b8..b67cda536 100644
--- a/kernel/arch/arm/include/uapi/asm/ptrace.h
+++ b/kernel/arch/arm/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  arch/arm/include/asm/ptrace.h
  *
diff --git a/kernel/arch/arm/include/uapi/asm/setup.h b/kernel/arch/arm/include/uapi/asm/setup.h
index 979ff4016..6b335a9ff 100644
--- a/kernel/arch/arm/include/uapi/asm/setup.h
+++ b/kernel/arch/arm/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  linux/include/asm/setup.h
  *
diff --git a/kernel/arch/arm/include/uapi/asm/sigcontext.h b/kernel/arch/arm/include/uapi/asm/sigcontext.h
index fc0b80b6a..e223c65ad 100644
--- a/kernel/arch/arm/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/arm/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMARM_SIGCONTEXT_H
 #define _ASMARM_SIGCONTEXT_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/signal.h b/kernel/arch/arm/include/uapi/asm/signal.h
index 33073bdcf..9b4185ba4 100644
--- a/kernel/arch/arm/include/uapi/asm/signal.h
+++ b/kernel/arch/arm/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASMARM_SIGNAL_H
 #define _UAPI_ASMARM_SIGNAL_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/stat.h b/kernel/arch/arm/include/uapi/asm/stat.h
index 42c0c1399..9c6580bfc 100644
--- a/kernel/arch/arm/include/uapi/asm/stat.h
+++ b/kernel/arch/arm/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMARM_STAT_H
 #define _ASMARM_STAT_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/statfs.h b/kernel/arch/arm/include/uapi/asm/statfs.h
index 079447c05..177f08540 100644
--- a/kernel/arch/arm/include/uapi/asm/statfs.h
+++ b/kernel/arch/arm/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMARM_STATFS_H
 #define _ASMARM_STATFS_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/swab.h b/kernel/arch/arm/include/uapi/asm/swab.h
index 6fcb32a5c..301aa8d8e 100644
--- a/kernel/arch/arm/include/uapi/asm/swab.h
+++ b/kernel/arch/arm/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  arch/arm/include/asm/byteorder.h
  *
diff --git a/kernel/arch/arm/include/uapi/asm/types.h b/kernel/arch/arm/include/uapi/asm/types.h
index 9435a42f5..1a667bc26 100644
--- a/kernel/arch/arm/include/uapi/asm/types.h
+++ b/kernel/arch/arm/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_TYPES_H
 #define _UAPI_ASM_TYPES_H
 
diff --git a/kernel/arch/arm/include/uapi/asm/unistd.h b/kernel/arch/arm/include/uapi/asm/unistd.h
index 28bd45649..39b2ad997 100644
--- a/kernel/arch/arm/include/uapi/asm/unistd.h
+++ b/kernel/arch/arm/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  arch/arm/include/asm/unistd.h
  *
diff --git a/kernel/arch/arm/kernel/Makefile b/kernel/arch/arm/kernel/Makefile
index ad325a8c7..499f978fb 100644
--- a/kernel/arch/arm/kernel/Makefile
+++ b/kernel/arch/arm/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/kernel/atags.h b/kernel/arch/arm/kernel/atags.h
index edfa2268c..201100226 100644
--- a/kernel/arch/arm/kernel/atags.h
+++ b/kernel/arch/arm/kernel/atags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 void convert_to_tag_list(struct tag *tags);
 
 #ifdef CONFIG_ATAGS
diff --git a/kernel/arch/arm/kernel/atags_proc.c b/kernel/arch/arm/kernel/atags_proc.c
index 5a3379055..312cb89ec 100644
--- a/kernel/arch/arm/kernel/atags_proc.c
+++ b/kernel/arch/arm/kernel/atags_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <asm/setup.h>
diff --git a/kernel/arch/arm/kernel/bios32.c b/kernel/arch/arm/kernel/bios32.c
index c1809fb54..0cd0aefb3 100644
--- a/kernel/arch/arm/kernel/bios32.c
+++ b/kernel/arch/arm/kernel/bios32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/kernel/bios32.c
  *
diff --git a/kernel/arch/arm/kernel/elf.c b/kernel/arch/arm/kernel/elf.c
index d0d1e8315..846dda2f3 100644
--- a/kernel/arch/arm/kernel/elf.c
+++ b/kernel/arch/arm/kernel/elf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/sched.h>
 #include <linux/personality.h>
diff --git a/kernel/arch/arm/kernel/entry-header.S b/kernel/arch/arm/kernel/entry-header.S
index 6391728c8..d523cd843 100644
--- a/kernel/arch/arm/kernel/entry-header.S
+++ b/kernel/arch/arm/kernel/entry-header.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 #include <linux/linkage.h>
 
diff --git a/kernel/arch/arm/kernel/fiq.c b/kernel/arch/arm/kernel/fiq.c
index 059c3da0f..cd1234c10 100644
--- a/kernel/arch/arm/kernel/fiq.c
+++ b/kernel/arch/arm/kernel/fiq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/kernel/fiq.c
  *
diff --git a/kernel/arch/arm/kernel/insn.c b/kernel/arch/arm/kernel/insn.c
index b760340b7..2e844b703 100644
--- a/kernel/arch/arm/kernel/insn.c
+++ b/kernel/arch/arm/kernel/insn.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/kernel.h>
 #include <asm/opcodes.h>
diff --git a/kernel/arch/arm/kernel/io.c b/kernel/arch/arm/kernel/io.c
index eedefe050..60b621295 100644
--- a/kernel/arch/arm/kernel/io.c
+++ b/kernel/arch/arm/kernel/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/types.h>
 #include <linux/io.h>
diff --git a/kernel/arch/arm/kernel/jump_label.c b/kernel/arch/arm/kernel/jump_label.c
index 845a5dd9c..90bce3d99 100644
--- a/kernel/arch/arm/kernel/jump_label.c
+++ b/kernel/arch/arm/kernel/jump_label.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/jump_label.h>
 #include <asm/patch.h>
diff --git a/kernel/arch/arm/kernel/kgdb.c b/kernel/arch/arm/kernel/kgdb.c
index 1bb4c40a3..caa0dbe3d 100644
--- a/kernel/arch/arm/kernel/kgdb.c
+++ b/kernel/arch/arm/kernel/kgdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/kernel/kgdb.c
  *
diff --git a/kernel/arch/arm/kernel/machine_kexec.c b/kernel/arch/arm/kernel/machine_kexec.c
index fe1419eeb..6b38d7a63 100644
--- a/kernel/arch/arm/kernel/machine_kexec.c
+++ b/kernel/arch/arm/kernel/machine_kexec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * machine_kexec.c - handle transition of Linux booting another kernel
  */
diff --git a/kernel/arch/arm/kernel/module.lds b/kernel/arch/arm/kernel/module.lds
index eacb5c67f..79cb6af56 100644
--- a/kernel/arch/arm/kernel/module.lds
+++ b/kernel/arch/arm/kernel/module.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 SECTIONS {
 	.plt : { BYTE(0) }
 	.init.plt : { BYTE(0) }
diff --git a/kernel/arch/arm/kernel/patch.c b/kernel/arch/arm/kernel/patch.c
index a1a34722c..a50dc00d7 100644
--- a/kernel/arch/arm/kernel/patch.c
+++ b/kernel/arch/arm/kernel/patch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/kprobes.h>
diff --git a/kernel/arch/arm/kernel/perf_callchain.c b/kernel/arch/arm/kernel/perf_callchain.c
index 22bf1f64d..08e43a32a 100644
--- a/kernel/arch/arm/kernel/perf_callchain.c
+++ b/kernel/arch/arm/kernel/perf_callchain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM callchain support
  *
diff --git a/kernel/arch/arm/kernel/perf_event_v6.c b/kernel/arch/arm/kernel/perf_event_v6.c
index 8226d0b71..1d7061a38 100644
--- a/kernel/arch/arm/kernel/perf_event_v6.c
+++ b/kernel/arch/arm/kernel/perf_event_v6.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARMv6 Performance counter handling code.
  *
diff --git a/kernel/arch/arm/kernel/perf_event_v7.c b/kernel/arch/arm/kernel/perf_event_v7.c
index ab6522b43..870b66c1e 100644
--- a/kernel/arch/arm/kernel/perf_event_v7.c
+++ b/kernel/arch/arm/kernel/perf_event_v7.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARMv7 Cortex-A8 and Cortex-A9 Performance Events handling code.
  *
diff --git a/kernel/arch/arm/kernel/perf_event_xscale.c b/kernel/arch/arm/kernel/perf_event_xscale.c
index 0e51f5e4f..fcf218da6 100644
--- a/kernel/arch/arm/kernel/perf_event_xscale.c
+++ b/kernel/arch/arm/kernel/perf_event_xscale.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARMv5 [xscale] Performance counter handling code.
  *
diff --git a/kernel/arch/arm/kernel/perf_regs.c b/kernel/arch/arm/kernel/perf_regs.c
index c366b83bf..05fe92aa7 100644
--- a/kernel/arch/arm/kernel/perf_regs.c
+++ b/kernel/arch/arm/kernel/perf_regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/arm/kernel/reboot.h b/kernel/arch/arm/kernel/reboot.h
index bf7a0b1f0..189ab81b7 100644
--- a/kernel/arch/arm/kernel/reboot.h
+++ b/kernel/arch/arm/kernel/reboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef REBOOT_H
 #define REBOOT_H
 
diff --git a/kernel/arch/arm/kernel/relocate_kernel.S b/kernel/arch/arm/kernel/relocate_kernel.S
index 35e72585e..7eaa2ae7a 100644
--- a/kernel/arch/arm/kernel/relocate_kernel.S
+++ b/kernel/arch/arm/kernel/relocate_kernel.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * relocate_kernel.S - put the kernel image in place to boot
  */
diff --git a/kernel/arch/arm/kernel/sleep.S b/kernel/arch/arm/kernel/sleep.S
index 9f08d214d..a8257fc9c 100644
--- a/kernel/arch/arm/kernel/sleep.S
+++ b/kernel/arch/arm/kernel/sleep.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <linux/threads.h>
 #include <asm/asm-offsets.h>
diff --git a/kernel/arch/arm/kernel/suspend.c b/kernel/arch/arm/kernel/suspend.c
index ef794c799..a40ebb7c0 100644
--- a/kernel/arch/arm/kernel/suspend.c
+++ b/kernel/arch/arm/kernel/suspend.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/mm_types.h>
diff --git a/kernel/arch/arm/kernel/vmlinux-xip.lds.S b/kernel/arch/arm/kernel/vmlinux-xip.lds.S
index 8265b1162..0951df916 100644
--- a/kernel/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/kernel/arch/arm/kernel/vmlinux-xip.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make ARM Linux kernel
  * taken from the i386 version by Russell King
  * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
diff --git a/kernel/arch/arm/kernel/vmlinux.lds.S b/kernel/arch/arm/kernel/vmlinux.lds.S
index c83a7ba73..1845a5aff 100644
--- a/kernel/arch/arm/kernel/vmlinux.lds.S
+++ b/kernel/arch/arm/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make ARM Linux kernel
  * taken from the i386 version by Russell King
  * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
diff --git a/kernel/arch/arm/kvm/Kconfig b/kernel/arch/arm/kvm/Kconfig
index 90d0176fb..f24628db5 100644
--- a/kernel/arch/arm/kvm/Kconfig
+++ b/kernel/arch/arm/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/arm/kvm/Makefile b/kernel/arch/arm/kvm/Makefile
index d9beee652..f550abd64 100644
--- a/kernel/arch/arm/kvm/Makefile
+++ b/kernel/arch/arm/kvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Kernel-based Virtual Machine module
 #
diff --git a/kernel/arch/arm/kvm/emulate.c b/kernel/arch/arm/kvm/emulate.c
index 0064b86a2..30a13647c 100644
--- a/kernel/arch/arm/kvm/emulate.c
+++ b/kernel/arch/arm/kvm/emulate.c
@@ -227,7 +227,7 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu)
 	u32 return_offset = (is_thumb) ? 2 : 4;
 
 	kvm_update_psr(vcpu, UND_MODE);
-	*vcpu_reg(vcpu, 14) = *vcpu_pc(vcpu) - return_offset;
+	*vcpu_reg(vcpu, 14) = *vcpu_pc(vcpu) + return_offset;
 
 	/* Branch to exception vector */
 	*vcpu_pc(vcpu) = exc_vector_base(vcpu) + vect_offset;
@@ -239,10 +239,8 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu)
  */
 static void inject_abt(struct kvm_vcpu *vcpu, bool is_pabt, unsigned long addr)
 {
-	unsigned long cpsr = *vcpu_cpsr(vcpu);
-	bool is_thumb = (cpsr & PSR_T_BIT);
 	u32 vect_offset;
-	u32 return_offset = (is_thumb) ? 4 : 0;
+	u32 return_offset = (is_pabt) ? 4 : 8;
 	bool is_lpae;
 
 	kvm_update_psr(vcpu, ABT_MODE);
diff --git a/kernel/arch/arm/kvm/hyp/Makefile b/kernel/arch/arm/kvm/hyp/Makefile
index 8679405b0..5638ce0c9 100644
--- a/kernel/arch/arm/kvm/hyp/Makefile
+++ b/kernel/arch/arm/kvm/hyp/Makefile
@@ -1,8 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Kernel-based Virtual Machine module, HYP part
 #
 
-ccflags-y += -fno-stack-protector
+ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING
 
 KVM=../../../../virt/kvm
 
diff --git a/kernel/arch/arm/kvm/trace.h b/kernel/arch/arm/kvm/trace.h
index b0d10648c..69a9d62a0 100644
--- a/kernel/arch/arm/kvm/trace.h
+++ b/kernel/arch/arm/kvm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_ARM_KVM_H
 
diff --git a/kernel/arch/arm/lib/Makefile b/kernel/arch/arm/lib/Makefile
index 27f4d9625..4cb0b9624 100644
--- a/kernel/arch/arm/lib/Makefile
+++ b/kernel/arch/arm/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/arm/lib/Makefile
 #
diff --git a/kernel/arch/arm/lib/bitops.h b/kernel/arch/arm/lib/bitops.h
index 7d807cfd8..93cddab73 100644
--- a/kernel/arch/arm/lib/bitops.h
+++ b/kernel/arch/arm/lib/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/assembler.h>
 #include <asm/unwind.h>
 
diff --git a/kernel/arch/arm/lib/bswapsdi2.S b/kernel/arch/arm/lib/bswapsdi2.S
index 07cda737b..591ba077e 100644
--- a/kernel/arch/arm/lib/bswapsdi2.S
+++ b/kernel/arch/arm/lib/bswapsdi2.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
diff --git a/kernel/arch/arm/mach-actions/Kconfig b/kernel/arch/arm/mach-actions/Kconfig
index ad9c5c89c..b5e0ac965 100644
--- a/kernel/arch/arm/mach-actions/Kconfig
+++ b/kernel/arch/arm/mach-actions/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_ACTIONS
 	bool "Actions Semi SoCs"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-alpine/Kconfig b/kernel/arch/arm/mach-alpine/Kconfig
index b41838a58..e3cbb07fe 100644
--- a/kernel/arch/arm/mach-alpine/Kconfig
+++ b/kernel/arch/arm/mach-alpine/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_ALPINE
 	bool "Annapurna Labs Alpine platform"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-at91/Makefile b/kernel/arch/arm/mach-at91/Makefile
index ee34aa34c..4ea93c9df 100644
--- a/kernel/arch/arm/mach-at91/Makefile
+++ b/kernel/arch/arm/mach-at91/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-at91/pm_data-offsets.c b/kernel/arch/arm/mach-at91/pm_data-offsets.c
index c0a73e62b..f2d893c03 100644
--- a/kernel/arch/arm/mach-at91/pm_data-offsets.c
+++ b/kernel/arch/arm/mach-at91/pm_data-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/stddef.h>
 #include <linux/kbuild.h>
 #include "pm.h"
diff --git a/kernel/arch/arm/mach-axxia/Kconfig b/kernel/arch/arm/mach-axxia/Kconfig
index fe627cbcf..bb2ce1c63 100644
--- a/kernel/arch/arm/mach-axxia/Kconfig
+++ b/kernel/arch/arm/mach-axxia/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_AXXIA
 	bool "LSI Axxia platforms"
 	depends on ARCH_MULTI_V7 && ARM_LPAE
diff --git a/kernel/arch/arm/mach-axxia/Makefile b/kernel/arch/arm/mach-axxia/Makefile
index ec4f68b46..8df8fe76a 100644
--- a/kernel/arch/arm/mach-axxia/Makefile
+++ b/kernel/arch/arm/mach-axxia/Makefile
@@ -1,2 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				+= axxia.o
 obj-$(CONFIG_SMP)		+= platsmp.o
diff --git a/kernel/arch/arm/mach-bcm/Kconfig b/kernel/arch/arm/mach-bcm/Kconfig
index 73be3d578..5d2925e2c 100644
--- a/kernel/arch/arm/mach-bcm/Kconfig
+++ b/kernel/arch/arm/mach-bcm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_BCM
 	bool "Broadcom SoC Support"
 	depends on ARCH_MULTI_V6_V7
diff --git a/kernel/arch/arm/mach-bcm/bcm63xx_smp.h b/kernel/arch/arm/mach-bcm/bcm63xx_smp.h
index 9c6d50e2b..4e742604a 100644
--- a/kernel/arch/arm/mach-bcm/bcm63xx_smp.h
+++ b/kernel/arch/arm/mach-bcm/bcm63xx_smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM63XX_SMP_H
 #define __BCM63XX_SMP_H
 
diff --git a/kernel/arch/arm/mach-clps711x/Kconfig b/kernel/arch/arm/mach-clps711x/Kconfig
index f385b1fca..fc9188b54 100644
--- a/kernel/arch/arm/mach-clps711x/Kconfig
+++ b/kernel/arch/arm/mach-clps711x/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_CLPS711X
 	bool "Cirrus Logic EP721x/EP731x-based"
 	depends on ARCH_MULTI_V4T
diff --git a/kernel/arch/arm/mach-clps711x/Makefile b/kernel/arch/arm/mach-clps711x/Makefile
index bd0b7b5d6..f18f330f5 100644
--- a/kernel/arch/arm/mach-clps711x/Makefile
+++ b/kernel/arch/arm/mach-clps711x/Makefile
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += board-dt.o
diff --git a/kernel/arch/arm/mach-cns3xxx/Kconfig b/kernel/arch/arm/mach-cns3xxx/Kconfig
index 5fd836be2..1ecf54669 100644
--- a/kernel/arch/arm/mach-cns3xxx/Kconfig
+++ b/kernel/arch/arm/mach-cns3xxx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_CNS3XXX
 	bool "Cavium Networks CNS3XXX family"
 	depends on ARCH_MULTI_V6
diff --git a/kernel/arch/arm/mach-cns3xxx/Makefile b/kernel/arch/arm/mach-cns3xxx/Makefile
index a1ff10848..52ca6ed62 100644
--- a/kernel/arch/arm/mach-cns3xxx/Makefile
+++ b/kernel/arch/arm/mach-cns3xxx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ARCH_CNS3XXX)		+= cns3xxx.o
 cns3xxx-y				+= core.o pm.o
 cns3xxx-$(CONFIG_ATAGS)			+= devices.o
diff --git a/kernel/arch/arm/mach-davinci/Kconfig b/kernel/arch/arm/mach-davinci/Kconfig
index 36c8f5324..05c3eecf4 100644
--- a/kernel/arch/arm/mach-davinci/Kconfig
+++ b/kernel/arch/arm/mach-davinci/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ARCH_DAVINCI
 
 config AINTC
diff --git a/kernel/arch/arm/mach-davinci/Makefile b/kernel/arch/arm/mach-davinci/Makefile
index df96ca9ea..4e8178050 100644
--- a/kernel/arch/arm/mach-davinci/Makefile
+++ b/kernel/arch/arm/mach-davinci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-davinci/Makefile.boot b/kernel/arch/arm/mach-davinci/Makefile.boot
index 4b8160175..d36b251f3 100644
--- a/kernel/arch/arm/mach-davinci/Makefile.boot
+++ b/kernel/arch/arm/mach-davinci/Makefile.boot
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX)		+= 0xc0008000
 params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)	:= 0xc0000100
 initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)	:= 0xc0800000
diff --git a/kernel/arch/arm/mach-davinci/asp.h b/kernel/arch/arm/mach-davinci/asp.h
index 1128e1d8e..495aa6907 100644
--- a/kernel/arch/arm/mach-davinci/asp.h
+++ b/kernel/arch/arm/mach-davinci/asp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * TI DaVinci Audio definitions
  */
diff --git a/kernel/arch/arm/mach-davinci/ddr2.h b/kernel/arch/arm/mach-davinci/ddr2.h
index c19e047d0..4f7d7824b 100644
--- a/kernel/arch/arm/mach-davinci/ddr2.h
+++ b/kernel/arch/arm/mach-davinci/ddr2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define DDR2_SDRCR_OFFSET	0xc
 #define DDR2_SRPD_BIT		(1 << 23)
 #define DDR2_MCLKSTOPEN_BIT	(1 << 30)
diff --git a/kernel/arch/arm/mach-davinci/usb-da8xx.c b/kernel/arch/arm/mach-davinci/usb-da8xx.c
index 9a6af0bd5..d480a02e1 100644
--- a/kernel/arch/arm/mach-davinci/usb-da8xx.c
+++ b/kernel/arch/arm/mach-davinci/usb-da8xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DA8xx USB
  */
diff --git a/kernel/arch/arm/mach-davinci/usb.c b/kernel/arch/arm/mach-davinci/usb.c
index 0e7e89c1f..31ed7aa47 100644
--- a/kernel/arch/arm/mach-davinci/usb.c
+++ b/kernel/arch/arm/mach-davinci/usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * USB
  */
diff --git a/kernel/arch/arm/mach-digicolor/Kconfig b/kernel/arch/arm/mach-digicolor/Kconfig
index 9d05c6c41..90394433c 100644
--- a/kernel/arch/arm/mach-digicolor/Kconfig
+++ b/kernel/arch/arm/mach-digicolor/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_DIGICOLOR
 	bool "Conexant Digicolor SoC Support"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-dove/Kconfig b/kernel/arch/arm/mach-dove/Kconfig
index 0bd6d894c..7747fe644 100644
--- a/kernel/arch/arm/mach-dove/Kconfig
+++ b/kernel/arch/arm/mach-dove/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ARCH_DOVE
 
 menu "Marvell Dove Implementations"
diff --git a/kernel/arch/arm/mach-dove/Makefile b/kernel/arch/arm/mach-dove/Makefile
index b608a2191..cdf163cab 100644
--- a/kernel/arch/arm/mach-dove/Makefile
+++ b/kernel/arch/arm/mach-dove/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				+= common.o
 obj-$(CONFIG_DOVE_LEGACY)	+= irq.o mpp.o
 obj-$(CONFIG_PCI)		+= pcie.o
diff --git a/kernel/arch/arm/mach-dove/mpp.h b/kernel/arch/arm/mach-dove/mpp.h
index fbec7c52b..2e4b89c86 100644
--- a/kernel/arch/arm/mach-dove/mpp.h
+++ b/kernel/arch/arm/mach-dove/mpp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_DOVE_MPP_CODED_H
 #define __ARCH_DOVE_MPP_CODED_H
 
diff --git a/kernel/arch/arm/mach-ebsa110/io.c b/kernel/arch/arm/mach-ebsa110/io.c
index b57980b43..3c44dd359 100644
--- a/kernel/arch/arm/mach-ebsa110/io.c
+++ b/kernel/arch/arm/mach-ebsa110/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mach-ebsa110/isamem.c
  *
diff --git a/kernel/arch/arm/mach-efm32/dtmachine.c b/kernel/arch/arm/mach-efm32/dtmachine.c
index 236749519..e9364b843 100644
--- a/kernel/arch/arm/mach-efm32/dtmachine.c
+++ b/kernel/arch/arm/mach-efm32/dtmachine.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 
 #include <asm/v7m.h>
diff --git a/kernel/arch/arm/mach-ep93xx/Makefile b/kernel/arch/arm/mach-ep93xx/Makefile
index b7ae4345a..86768495f 100644
--- a/kernel/arch/arm/mach-ep93xx/Makefile
+++ b/kernel/arch/arm/mach-ep93xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/kernel/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
index c64d74246..6839ea032 100644
--- a/kernel/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
+++ b/kernel/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
  */
diff --git a/kernel/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h b/kernel/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h
index 6d7c571a5..242af4a40 100644
--- a/kernel/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h
+++ b/kernel/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Include file for the EP93XX GPIO controller machine specifics */
 
 #ifndef __GPIO_EP93XX_H
diff --git a/kernel/arch/arm/mach-ep93xx/include/mach/hardware.h b/kernel/arch/arm/mach-ep93xx/include/mach/hardware.h
index efcd47815..8938906e7 100644
--- a/kernel/arch/arm/mach-ep93xx/include/mach/hardware.h
+++ b/kernel/arch/arm/mach-ep93xx/include/mach/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-ep93xx/include/mach/hardware.h
  */
diff --git a/kernel/arch/arm/mach-ep93xx/include/mach/irqs.h b/kernel/arch/arm/mach-ep93xx/include/mach/irqs.h
index ff98390bb..244daf83c 100644
--- a/kernel/arch/arm/mach-ep93xx/include/mach/irqs.h
+++ b/kernel/arch/arm/mach-ep93xx/include/mach/irqs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-ep93xx/include/mach/irqs.h
  */
diff --git a/kernel/arch/arm/mach-ep93xx/include/mach/platform.h b/kernel/arch/arm/mach-ep93xx/include/mach/platform.h
index db0839691..3bbe15910 100644
--- a/kernel/arch/arm/mach-ep93xx/include/mach/platform.h
+++ b/kernel/arch/arm/mach-ep93xx/include/mach/platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-ep93xx/include/mach/platform.h
  */
diff --git a/kernel/arch/arm/mach-ep93xx/timer-ep93xx.c b/kernel/arch/arm/mach-ep93xx/timer-ep93xx.c
index 874cbc91b..de998830f 100644
--- a/kernel/arch/arm/mach-ep93xx/timer-ep93xx.c
+++ b/kernel/arch/arm/mach-ep93xx/timer-ep93xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/clocksource.h>
diff --git a/kernel/arch/arm/mach-ep93xx/ts72xx.h b/kernel/arch/arm/mach-ep93xx/ts72xx.h
index 2255ba29f..b89850f1a 100644
--- a/kernel/arch/arm/mach-ep93xx/ts72xx.h
+++ b/kernel/arch/arm/mach-ep93xx/ts72xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-ep93xx/include/mach/ts72xx.h
  */
diff --git a/kernel/arch/arm/mach-footbridge/Makefile b/kernel/arch/arm/mach-footbridge/Makefile
index e83d5c839..a09f1041f 100644
--- a/kernel/arch/arm/mach-footbridge/Makefile
+++ b/kernel/arch/arm/mach-footbridge/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-footbridge/cats-hw.c b/kernel/arch/arm/mach-footbridge/cats-hw.c
index 8f0548967..e575dc069 100644
--- a/kernel/arch/arm/mach-footbridge/cats-hw.c
+++ b/kernel/arch/arm/mach-footbridge/cats-hw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/cats-hw.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/cats-pci.c b/kernel/arch/arm/mach-footbridge/cats-pci.c
index 5cec2567c..0b2fd7e2e 100644
--- a/kernel/arch/arm/mach-footbridge/cats-pci.c
+++ b/kernel/arch/arm/mach-footbridge/cats-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/cats-pci.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/common.h b/kernel/arch/arm/mach-footbridge/common.h
index b911e5587..e12587db5 100644
--- a/kernel/arch/arm/mach-footbridge/common.h
+++ b/kernel/arch/arm/mach-footbridge/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/reboot.h>
 
 extern void footbridge_timer_init(void);
diff --git a/kernel/arch/arm/mach-footbridge/dc21285-timer.c b/kernel/arch/arm/mach-footbridge/dc21285-timer.c
index 75395a720..f76212d2d 100644
--- a/kernel/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/kernel/arch/arm/mach-footbridge/dc21285-timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mach-footbridge/dc21285-timer.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/dma.c b/kernel/arch/arm/mach-footbridge/dma.c
index 22536b85a..86618074a 100644
--- a/kernel/arch/arm/mach-footbridge/dma.c
+++ b/kernel/arch/arm/mach-footbridge/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/kernel/dma-ebsa285.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/ebsa285-pci.c b/kernel/arch/arm/mach-footbridge/ebsa285-pci.c
index fd12d8a36..6f28aaa9c 100644
--- a/kernel/arch/arm/mach-footbridge/ebsa285-pci.c
+++ b/kernel/arch/arm/mach-footbridge/ebsa285-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/ebsa285-pci.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/ebsa285.c b/kernel/arch/arm/mach-footbridge/ebsa285.c
index aee8300f3..21cf9a358 100644
--- a/kernel/arch/arm/mach-footbridge/ebsa285.c
+++ b/kernel/arch/arm/mach-footbridge/ebsa285.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/ebsa285.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/include/mach/irqs.h b/kernel/arch/arm/mach-footbridge/include/mach/irqs.h
index 61c714c49..a5f41846a 100644
--- a/kernel/arch/arm/mach-footbridge/include/mach/irqs.h
+++ b/kernel/arch/arm/mach-footbridge/include/mach/irqs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-footbridge/include/mach/irqs.h
  *
diff --git a/kernel/arch/arm/mach-footbridge/include/mach/isa-dma.h b/kernel/arch/arm/mach-footbridge/include/mach/isa-dma.h
index 5bd4a0d33..8a1b99107 100644
--- a/kernel/arch/arm/mach-footbridge/include/mach/isa-dma.h
+++ b/kernel/arch/arm/mach-footbridge/include/mach/isa-dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/arm/mach-footbridge/include/mach/isa-dma.h
  *
diff --git a/kernel/arch/arm/mach-footbridge/isa-rtc.c b/kernel/arch/arm/mach-footbridge/isa-rtc.c
index 07fde4051..b8f741a3a 100644
--- a/kernel/arch/arm/mach-footbridge/isa-rtc.c
+++ b/kernel/arch/arm/mach-footbridge/isa-rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/arm/mach-footbridge/isa-rtc.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/isa-timer.c b/kernel/arch/arm/mach-footbridge/isa-timer.c
index b73f52e19..82f45591f 100644
--- a/kernel/arch/arm/mach-footbridge/isa-timer.c
+++ b/kernel/arch/arm/mach-footbridge/isa-timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mach-footbridge/isa-timer.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/netwinder-hw.c b/kernel/arch/arm/mach-footbridge/netwinder-hw.c
index cdee08c6d..5f7265b1b 100644
--- a/kernel/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/kernel/arch/arm/mach-footbridge/netwinder-hw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/netwinder-hw.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/netwinder-pci.c b/kernel/arch/arm/mach-footbridge/netwinder-pci.c
index 0fba5134e..9473aa030 100644
--- a/kernel/arch/arm/mach-footbridge/netwinder-pci.c
+++ b/kernel/arch/arm/mach-footbridge/netwinder-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/netwinder-pci.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/personal-pci.c b/kernel/arch/arm/mach-footbridge/personal-pci.c
index 5c9ee5461..4391e433a 100644
--- a/kernel/arch/arm/mach-footbridge/personal-pci.c
+++ b/kernel/arch/arm/mach-footbridge/personal-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/personal-pci.c
  *
diff --git a/kernel/arch/arm/mach-footbridge/personal.c b/kernel/arch/arm/mach-footbridge/personal.c
index 7bdeabdcd..ca715754f 100644
--- a/kernel/arch/arm/mach-footbridge/personal.c
+++ b/kernel/arch/arm/mach-footbridge/personal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-footbridge/personal.c
  *
diff --git a/kernel/arch/arm/mach-gemini/board-dt.c b/kernel/arch/arm/mach-gemini/board-dt.c
index c0c0ebdd5..de0afcc8d 100644
--- a/kernel/arch/arm/mach-gemini/board-dt.c
+++ b/kernel/arch/arm/mach-gemini/board-dt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Gemini Device Tree boot support
  */
diff --git a/kernel/arch/arm/mach-highbank/core.h b/kernel/arch/arm/mach-highbank/core.h
index 7ec5edcd1..3991a6594 100644
--- a/kernel/arch/arm/mach-highbank/core.h
+++ b/kernel/arch/arm/mach-highbank/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HIGHBANK_CORE_H
 #define __HIGHBANK_CORE_H
 
diff --git a/kernel/arch/arm/mach-hisi/core.h b/kernel/arch/arm/mach-hisi/core.h
index c58b68ab0..61245274f 100644
--- a/kernel/arch/arm/mach-hisi/core.h
+++ b/kernel/arch/arm/mach-hisi/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HISILICON_CORE_H
 #define __HISILICON_CORE_H
 
diff --git a/kernel/arch/arm/mach-imx/Makefile b/kernel/arch/arm/mach-imx/Makefile
index cab128913..8ff710582 100644
--- a/kernel/arch/arm/mach-imx/Makefile
+++ b/kernel/arch/arm/mach-imx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y := cpu.o system.o irq-common.o
 
 obj-$(CONFIG_SOC_IMX21) += mm-imx21.o
diff --git a/kernel/arch/arm/mach-imx/cpu.c b/kernel/arch/arm/mach-imx/cpu.c
index 94906ed49..d4e55f2a8 100644
--- a/kernel/arch/arm/mach-imx/cpu.c
+++ b/kernel/arch/arm/mach-imx/cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/io.h>
diff --git a/kernel/arch/arm/mach-imx/devices/Makefile b/kernel/arch/arm/mach-imx/devices/Makefile
index aa6cee870..e44758aaa 100644
--- a/kernel/arch/arm/mach-imx/devices/Makefile
+++ b/kernel/arch/arm/mach-imx/devices/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y := devices.o
 
 obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o
diff --git a/kernel/arch/arm/mach-imx/ehci.h b/kernel/arch/arm/mach-imx/ehci.h
index 0e060023d..b7ad6175f 100644
--- a/kernel/arch/arm/mach-imx/ehci.h
+++ b/kernel/arch/arm/mach-imx/ehci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_IMX_EHCI_H
 #define __MACH_IMX_EHCI_H
 
diff --git a/kernel/arch/arm/mach-imx/mx31.h b/kernel/arch/arm/mach-imx/mx31.h
index ee9b1f921..d9574671c 100644
--- a/kernel/arch/arm/mach-imx/mx31.h
+++ b/kernel/arch/arm/mach-imx/mx31.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_MX31_H__
 #define __MACH_MX31_H__
 
diff --git a/kernel/arch/arm/mach-imx/mx35.h b/kernel/arch/arm/mach-imx/mx35.h
index 2af5d3a69..760de6a0a 100644
--- a/kernel/arch/arm/mach-imx/mx35.h
+++ b/kernel/arch/arm/mach-imx/mx35.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_MX35_H__
 #define __MACH_MX35_H__
 
diff --git a/kernel/arch/arm/mach-imx/pcm037.h b/kernel/arch/arm/mach-imx/pcm037.h
index 7d167690e..470d3c887 100644
--- a/kernel/arch/arm/mach-imx/pcm037.h
+++ b/kernel/arch/arm/mach-imx/pcm037.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PCM037_H__
 #define __PCM037_H__
 
diff --git a/kernel/arch/arm/mach-imx/ulpi.h b/kernel/arch/arm/mach-imx/ulpi.h
index 23f5c0349..b367902c9 100644
--- a/kernel/arch/arm/mach-imx/ulpi.h
+++ b/kernel/arch/arm/mach-imx/ulpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_ULPI_H
 #define __MACH_ULPI_H
 
diff --git a/kernel/arch/arm/mach-integrator/Makefile b/kernel/arch/arm/mach-integrator/Makefile
index 1ebe45356..a5a4470db 100644
--- a/kernel/arch/arm/mach-integrator/Makefile
+++ b/kernel/arch/arm/mach-integrator/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-integrator/cm.h b/kernel/arch/arm/mach-integrator/cm.h
index 5b8ba8247..f09ea18a5 100644
--- a/kernel/arch/arm/mach-integrator/cm.h
+++ b/kernel/arch/arm/mach-integrator/cm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * access the core module control register.
  */
diff --git a/kernel/arch/arm/mach-integrator/common.h b/kernel/arch/arm/mach-integrator/common.h
index 96c9dc56c..f053aeebe 100644
--- a/kernel/arch/arm/mach-integrator/common.h
+++ b/kernel/arch/arm/mach-integrator/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/reboot.h>
 #include <linux/amba/serial.h>
 extern struct amba_pl010_data ap_uart_data;
diff --git a/kernel/arch/arm/mach-integrator/impd1.h b/kernel/arch/arm/mach-integrator/impd1.h
index 76de4dc9b..36124d34c 100644
--- a/kernel/arch/arm/mach-integrator/impd1.h
+++ b/kernel/arch/arm/mach-integrator/impd1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define IMPD1_LEDS	0x0c
 #define IMPD1_INT	0x10
 #define IMPD1_SW	0x14
diff --git a/kernel/arch/arm/mach-integrator/lm.h b/kernel/arch/arm/mach-integrator/lm.h
index 28186b6f2..172966a69 100644
--- a/kernel/arch/arm/mach-integrator/lm.h
+++ b/kernel/arch/arm/mach-integrator/lm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 struct lm_device {
 	struct device		dev;
diff --git a/kernel/arch/arm/mach-integrator/pci_v3.h b/kernel/arch/arm/mach-integrator/pci_v3.h
index 06a9e2e7d..cafc7174b 100644
--- a/kernel/arch/arm/mach-integrator/pci_v3.h
+++ b/kernel/arch/arm/mach-integrator/pci_v3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Simple oneliner include to the PCIv3 early init */
 #ifdef CONFIG_PCI
 extern int pci_v3_early_init(void);
diff --git a/kernel/arch/arm/mach-iop13xx/Kconfig b/kernel/arch/arm/mach-iop13xx/Kconfig
index 40c2d689f..c4f04070b 100644
--- a/kernel/arch/arm/mach-iop13xx/Kconfig
+++ b/kernel/arch/arm/mach-iop13xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ARCH_IOP13XX
 
 menu "IOP13XX Implementation Options"
diff --git a/kernel/arch/arm/mach-iop13xx/Makefile b/kernel/arch/arm/mach-iop13xx/Makefile
index a3d9260e3..5757c8f6e 100644
--- a/kernel/arch/arm/mach-iop13xx/Makefile
+++ b/kernel/arch/arm/mach-iop13xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ARCH_IOP13XX) += setup.o
 obj-$(CONFIG_ARCH_IOP13XX) += irq.o
 obj-$(CONFIG_ARCH_IOP13XX) += pci.o
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/hardware.h b/kernel/arch/arm/mach-iop13xx/include/mach/hardware.h
index 786fa266f..8c943fa6b 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/hardware.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 #include <asm/types.h>
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/kernel/arch/arm/mach-iop13xx/include/mach/iop13xx.h
index 9311ee212..04bb6aca1 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/iop13xx.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/iop13xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP13XX_HW_H_
 #define _IOP13XX_HW_H_
 
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/iq81340.h b/kernel/arch/arm/mach-iop13xx/include/mach/iq81340.h
index ba2cf931e..d7ad27a95 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/iq81340.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/iq81340.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IQ81340_H_
 #define _IQ81340_H_
 
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/irqs.h b/kernel/arch/arm/mach-iop13xx/include/mach/irqs.h
index e8d24d321..cd6b6375c 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/irqs.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/irqs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP13XX_IRQS_H_
 #define _IOP13XX_IRQS_H_
 
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/memory.h b/kernel/arch/arm/mach-iop13xx/include/mach/memory.h
index 59307e787..32da0e09c 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/memory.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/time.h b/kernel/arch/arm/mach-iop13xx/include/mach/time.h
index c871e6874..2c2d7532d 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/time.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP13XX_TIME_H_
 #define _IOP13XX_TIME_H_
 
diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/uncompress.h b/kernel/arch/arm/mach-iop13xx/include/mach/uncompress.h
index d3791ece2..c62903041 100644
--- a/kernel/arch/arm/mach-iop13xx/include/mach/uncompress.h
+++ b/kernel/arch/arm/mach-iop13xx/include/mach/uncompress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/types.h>
 #include <linux/serial_reg.h>
 #include <mach/hardware.h>
diff --git a/kernel/arch/arm/mach-iop13xx/msi.h b/kernel/arch/arm/mach-iop13xx/msi.h
index b80c5ae17..766dcfaaa 100644
--- a/kernel/arch/arm/mach-iop13xx/msi.h
+++ b/kernel/arch/arm/mach-iop13xx/msi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP13XX_MSI_H_
 #define _IOP13XX_MSI_H_
 #ifdef CONFIG_PCI_MSI
diff --git a/kernel/arch/arm/mach-iop13xx/pci.h b/kernel/arch/arm/mach-iop13xx/pci.h
index 8dc343cb8..736168d8c 100644
--- a/kernel/arch/arm/mach-iop13xx/pci.h
+++ b/kernel/arch/arm/mach-iop13xx/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP13XX_PCI_H_
 #define _IOP13XX_PCI_H_
 #include <linux/io.h>
diff --git a/kernel/arch/arm/mach-iop32x/Kconfig b/kernel/arch/arm/mach-iop32x/Kconfig
index 5e8c6f7df..f1f342cb0 100644
--- a/kernel/arch/arm/mach-iop32x/Kconfig
+++ b/kernel/arch/arm/mach-iop32x/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ARCH_IOP32X
 
 menu "IOP32x Implementation Options"
diff --git a/kernel/arch/arm/mach-iop32x/Makefile b/kernel/arch/arm/mach-iop32x/Makefile
index 2d4010abb..71d62447d 100644
--- a/kernel/arch/arm/mach-iop32x/Makefile
+++ b/kernel/arch/arm/mach-iop32x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-iop32x/gpio-iop32x.h b/kernel/arch/arm/mach-iop32x/gpio-iop32x.h
index 3c7309c02..20af87e4c 100644
--- a/kernel/arch/arm/mach-iop32x/gpio-iop32x.h
+++ b/kernel/arch/arm/mach-iop32x/gpio-iop32x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static struct resource iop32x_gpio_res[] = {
 	DEFINE_RES_MEM((IOP3XX_PERIPHERAL_PHYS_BASE + 0x07c4), 0x10),
 };
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/adma.h b/kernel/arch/arm/mach-iop32x/include/mach/adma.h
index 5ed92037d..2b2006312 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/adma.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/adma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef IOP32X_ADMA_H
 #define IOP32X_ADMA_H
 #include <asm/hardware/iop3xx-adma.h>
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/glantank.h b/kernel/arch/arm/mach-iop32x/include/mach/glantank.h
index 958eb91c0..b9df2e461 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/glantank.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/glantank.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop32x/include/mach/glantank.h
  *
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/hardware.h b/kernel/arch/arm/mach-iop32x/include/mach/hardware.h
index 48cb1b20b..6e5303e60 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/hardware.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop32x/include/mach/hardware.h
  */
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/iq31244.h b/kernel/arch/arm/mach-iop32x/include/mach/iq31244.h
index 6b6b369e7..e62da5da6 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/iq31244.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/iq31244.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop32x/include/mach/iq31244.h
  *
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/iq80321.h b/kernel/arch/arm/mach-iop32x/include/mach/iq80321.h
index 498819b73..faf62c26f 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/iq80321.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/iq80321.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop32x/include/mach/iq80321.h
  *
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/n2100.h b/kernel/arch/arm/mach-iop32x/include/mach/n2100.h
index 40b8a532b..70bb660b6 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/n2100.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/n2100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop32x/include/mach/n2100.h
  *
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/time.h b/kernel/arch/arm/mach-iop32x/include/mach/time.h
index 0f28c9949..d08950cce 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/time.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP32X_TIME_H_
 #define _IOP32X_TIME_H_
 #define IRQ_IOP_TIMER0 IRQ_IOP32X_TIMER0
diff --git a/kernel/arch/arm/mach-iop32x/include/mach/uncompress.h b/kernel/arch/arm/mach-iop32x/include/mach/uncompress.h
index b3d45fd36..ed4ac3e28 100644
--- a/kernel/arch/arm/mach-iop32x/include/mach/uncompress.h
+++ b/kernel/arch/arm/mach-iop32x/include/mach/uncompress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop32x/include/mach/uncompress.h
  */
diff --git a/kernel/arch/arm/mach-iop33x/include/mach/adma.h b/kernel/arch/arm/mach-iop33x/include/mach/adma.h
index 4b92f795f..8aa7159ab 100644
--- a/kernel/arch/arm/mach-iop33x/include/mach/adma.h
+++ b/kernel/arch/arm/mach-iop33x/include/mach/adma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef IOP33X_ADMA_H
 #define IOP33X_ADMA_H
 #include <asm/hardware/iop3xx-adma.h>
diff --git a/kernel/arch/arm/mach-iop33x/include/mach/hardware.h b/kernel/arch/arm/mach-iop33x/include/mach/hardware.h
index 839285315..020bafbc3 100644
--- a/kernel/arch/arm/mach-iop33x/include/mach/hardware.h
+++ b/kernel/arch/arm/mach-iop33x/include/mach/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop33x/include/mach/hardware.h
  */
diff --git a/kernel/arch/arm/mach-iop33x/include/mach/iq80331.h b/kernel/arch/arm/mach-iop33x/include/mach/iq80331.h
index fe406b012..c7e68d863 100644
--- a/kernel/arch/arm/mach-iop33x/include/mach/iq80331.h
+++ b/kernel/arch/arm/mach-iop33x/include/mach/iq80331.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop33x/include/mach/iq80331.h
  *
diff --git a/kernel/arch/arm/mach-iop33x/include/mach/iq80332.h b/kernel/arch/arm/mach-iop33x/include/mach/iq80332.h
index 8325d71f2..749b44bf7 100644
--- a/kernel/arch/arm/mach-iop33x/include/mach/iq80332.h
+++ b/kernel/arch/arm/mach-iop33x/include/mach/iq80332.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop33x/include/mach/iq80332.h
  *
diff --git a/kernel/arch/arm/mach-iop33x/include/mach/time.h b/kernel/arch/arm/mach-iop33x/include/mach/time.h
index 4ac4d7664..801f8fd64 100644
--- a/kernel/arch/arm/mach-iop33x/include/mach/time.h
+++ b/kernel/arch/arm/mach-iop33x/include/mach/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IOP33X_TIME_H_
 #define _IOP33X_TIME_H_
 #define IRQ_IOP_TIMER0 IRQ_IOP33X_TIMER0
diff --git a/kernel/arch/arm/mach-iop33x/include/mach/uncompress.h b/kernel/arch/arm/mach-iop33x/include/mach/uncompress.h
index ed282e141..62b71cde1 100644
--- a/kernel/arch/arm/mach-iop33x/include/mach/uncompress.h
+++ b/kernel/arch/arm/mach-iop33x/include/mach/uncompress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-iop33x/include/mach/uncompress.h
  */
diff --git a/kernel/arch/arm/mach-ixp4xx/Makefile b/kernel/arch/arm/mach-ixp4xx/Makefile
index eded94c96..f09994500 100644
--- a/kernel/arch/arm/mach-ixp4xx/Makefile
+++ b/kernel/arch/arm/mach-ixp4xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-ixp4xx/avila-setup.c b/kernel/arch/arm/mach-ixp4xx/avila-setup.c
index 6beec150c..186df64ce 100644
--- a/kernel/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/avila-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/avila-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/coyote-setup.c b/kernel/arch/arm/mach-ixp4xx/coyote-setup.c
index 820cae860..7e40fe709 100644
--- a/kernel/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/coyote-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/dsmg600-setup.c b/kernel/arch/arm/mach-ixp4xx/dsmg600-setup.c
index b3bd0e137..db488ecc9 100644
--- a/kernel/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DSM-G600 board-setup
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/fsg-setup.c b/kernel/arch/arm/mach-ixp4xx/fsg-setup.c
index 5c4b0c4a1..6e32cbc4f 100644
--- a/kernel/arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/fsg-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/gateway7001-setup.c b/kernel/arch/arm/mach-ixp4xx/gateway7001-setup.c
index 3d24b3fce..1be6faf6d 100644
--- a/kernel/arch/arm/mach-ixp4xx/gateway7001-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/gateway7001-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/goramo_mlr.c b/kernel/arch/arm/mach-ixp4xx/goramo_mlr.c
index 80bd9d6d0..145ec5c1b 100644
--- a/kernel/arch/arm/mach-ixp4xx/goramo_mlr.c
+++ b/kernel/arch/arm/mach-ixp4xx/goramo_mlr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Goramo MultiLink router platform code
  * Copyright (C) 2006-2009 Krzysztof Halasa <khc@pm.waw.pl>
diff --git a/kernel/arch/arm/mach-ixp4xx/include/mach/npe.h b/kernel/arch/arm/mach-ixp4xx/include/mach/npe.h
index e320db245..3a980845e 100644
--- a/kernel/arch/arm/mach-ixp4xx/include/mach/npe.h
+++ b/kernel/arch/arm/mach-ixp4xx/include/mach/npe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IXP4XX_NPE_H
 #define __IXP4XX_NPE_H
 
diff --git a/kernel/arch/arm/mach-ixp4xx/include/mach/platform.h b/kernel/arch/arm/mach-ixp4xx/include/mach/platform.h
index 34b3d3f3f..342acbe20 100644
--- a/kernel/arch/arm/mach-ixp4xx/include/mach/platform.h
+++ b/kernel/arch/arm/mach-ixp4xx/include/mach/platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-ixp4xx/include/mach/platform.h
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/ixdp425-setup.c b/kernel/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 93b89291c..8f5e01527 100644
--- a/kernel/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/ixdp425-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/nas100d-setup.c b/kernel/arch/arm/mach-ixp4xx/nas100d-setup.c
index 4e0f762bc..1b8170d65 100644
--- a/kernel/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/nas100d-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/nslu2-setup.c b/kernel/arch/arm/mach-ixp4xx/nslu2-setup.c
index 88c025f52..bd8dc65b4 100644
--- a/kernel/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/nslu2-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/vulcan-setup.c b/kernel/arch/arm/mach-ixp4xx/vulcan-setup.c
index d599e354c..731fb2019 100644
--- a/kernel/arch/arm/mach-ixp4xx/vulcan-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/vulcan-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/vulcan-setup.c
  *
diff --git a/kernel/arch/arm/mach-ixp4xx/wg302v2-setup.c b/kernel/arch/arm/mach-ixp4xx/wg302v2-setup.c
index 8f9ea2f3a..90b3c604e 100644
--- a/kernel/arch/arm/mach-ixp4xx/wg302v2-setup.c
+++ b/kernel/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/arm/mach-ixp4xx/wg302-setup.c
  *
diff --git a/kernel/arch/arm/mach-keystone/Makefile b/kernel/arch/arm/mach-keystone/Makefile
index 25d92396f..f8b0dccac 100644
--- a/kernel/arch/arm/mach-keystone/Makefile
+++ b/kernel/arch/arm/mach-keystone/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y					:= keystone.o smc.o
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
diff --git a/kernel/arch/arm/mach-ks8695/Makefile b/kernel/arch/arm/mach-ks8695/Makefile
index 8ecb7973a..439b22255 100644
--- a/kernel/arch/arm/mach-ks8695/Makefile
+++ b/kernel/arch/arm/mach-ks8695/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # arch/arm/mach-ks8695/Makefile
 #
 # Makefile for KS8695 architecture support
diff --git a/kernel/arch/arm/mach-mmp/Makefile b/kernel/arch/arm/mach-mmp/Makefile
index 7677ad541..8f267c7bc 100644
--- a/kernel/arch/arm/mach-mmp/Makefile
+++ b/kernel/arch/arm/mach-mmp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Marvell's PXA168 processors line
 #
diff --git a/kernel/arch/arm/mach-mmp/clock-mmp2.c b/kernel/arch/arm/mach-mmp/clock-mmp2.c
index 835c3e7cc..7536398bf 100644
--- a/kernel/arch/arm/mach-mmp/clock-mmp2.c
+++ b/kernel/arch/arm/mach-mmp/clock-mmp2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/kernel/arch/arm/mach-mmp/clock-pxa168.c b/kernel/arch/arm/mach-mmp/clock-pxa168.c
index f726a3692..2d4a5d96a 100644
--- a/kernel/arch/arm/mach-mmp/clock-pxa168.c
+++ b/kernel/arch/arm/mach-mmp/clock-pxa168.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/kernel/arch/arm/mach-mmp/clock-pxa910.c b/kernel/arch/arm/mach-mmp/clock-pxa910.c
index bca60a224..3cd83ff91 100644
--- a/kernel/arch/arm/mach-mmp/clock-pxa910.c
+++ b/kernel/arch/arm/mach-mmp/clock-pxa910.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/kernel/arch/arm/mach-mmp/common.h b/kernel/arch/arm/mach-mmp/common.h
index 7453a90c3..7e284d9c4 100644
--- a/kernel/arch/arm/mach-mmp/common.h
+++ b/kernel/arch/arm/mach-mmp/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/reboot.h>
 #define ARRAY_AND_SIZE(x)	(x), ARRAY_SIZE(x)
 
diff --git a/kernel/arch/arm/mach-mmp/cputype.h b/kernel/arch/arm/mach-mmp/cputype.h
index 8a3b56dfd..446edaeb7 100644
--- a/kernel/arch/arm/mach-mmp/cputype.h
+++ b/kernel/arch/arm/mach-mmp/cputype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_CPUTYPE_H
 #define __ASM_MACH_CPUTYPE_H
 
diff --git a/kernel/arch/arm/mach-mmp/devices.h b/kernel/arch/arm/mach-mmp/devices.h
index 21217ef11..4df596c5c 100644
--- a/kernel/arch/arm/mach-mmp/devices.h
+++ b/kernel/arch/arm/mach-mmp/devices.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_DEVICE_H
 #define __MACH_DEVICE_H
 
diff --git a/kernel/arch/arm/mach-mmp/irqs.h b/kernel/arch/arm/mach-mmp/irqs.h
index fb492a50a..5acc4d532 100644
--- a/kernel/arch/arm/mach-mmp/irqs.h
+++ b/kernel/arch/arm/mach-mmp/irqs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_IRQS_H
 #define __ASM_MACH_IRQS_H
 
diff --git a/kernel/arch/arm/mach-mmp/mfp-mmp2.h b/kernel/arch/arm/mach-mmp/mfp-mmp2.h
index b27443497..162022298 100644
--- a/kernel/arch/arm/mach-mmp/mfp-mmp2.h
+++ b/kernel/arch/arm/mach-mmp/mfp-mmp2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_MFP_MMP2_H
 #define __ASM_MACH_MFP_MMP2_H
 
diff --git a/kernel/arch/arm/mach-mmp/mfp-pxa168.h b/kernel/arch/arm/mach-mmp/mfp-pxa168.h
index 9050d0323..90d16d341 100644
--- a/kernel/arch/arm/mach-mmp/mfp-pxa168.h
+++ b/kernel/arch/arm/mach-mmp/mfp-pxa168.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_MFP_PXA168_H
 #define __ASM_MACH_MFP_PXA168_H
 
diff --git a/kernel/arch/arm/mach-mmp/mfp-pxa910.h b/kernel/arch/arm/mach-mmp/mfp-pxa910.h
index f06db5cd3..6f900cade 100644
--- a/kernel/arch/arm/mach-mmp/mfp-pxa910.h
+++ b/kernel/arch/arm/mach-mmp/mfp-pxa910.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_MFP_PXA910_H
 #define __ASM_MACH_MFP_PXA910_H
 
diff --git a/kernel/arch/arm/mach-mmp/mfp.h b/kernel/arch/arm/mach-mmp/mfp.h
index 62e510e80..75a4acb33 100644
--- a/kernel/arch/arm/mach-mmp/mfp.h
+++ b/kernel/arch/arm/mach-mmp/mfp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_MFP_H
 #define __ASM_MACH_MFP_H
 
diff --git a/kernel/arch/arm/mach-mmp/mmp2.h b/kernel/arch/arm/mach-mmp/mmp2.h
index 9b5e75ee9..a4b82f719 100644
--- a/kernel/arch/arm/mach-mmp/mmp2.h
+++ b/kernel/arch/arm/mach-mmp/mmp2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_MMP2_H
 #define __ASM_MACH_MMP2_H
 
diff --git a/kernel/arch/arm/mach-mmp/pxa168.h b/kernel/arch/arm/mach-mmp/pxa168.h
index 75841e9cc..b39bff37f 100644
--- a/kernel/arch/arm/mach-mmp/pxa168.h
+++ b/kernel/arch/arm/mach-mmp/pxa168.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_PXA168_H
 #define __ASM_MACH_PXA168_H
 
diff --git a/kernel/arch/arm/mach-mmp/pxa910.h b/kernel/arch/arm/mach-mmp/pxa910.h
index a211e81e5..cb3923dcf 100644
--- a/kernel/arch/arm/mach-mmp/pxa910.h
+++ b/kernel/arch/arm/mach-mmp/pxa910.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_PXA910_H
 #define __ASM_MACH_PXA910_H
 
diff --git a/kernel/arch/arm/mach-mv78xx0/Makefile b/kernel/arch/arm/mach-mv78xx0/Makefile
index ddb3aa98a..a839e960b 100644
--- a/kernel/arch/arm/mach-mv78xx0/Makefile
+++ b/kernel/arch/arm/mach-mv78xx0/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
 
 obj-y				+= common.o mpp.o irq.o pcie.o
diff --git a/kernel/arch/arm/mach-mvebu/Makefile b/kernel/arch/arm/mach-mvebu/Makefile
index 6c6497e80..cb106899d 100644
--- a/kernel/arch/arm/mach-mvebu/Makefile
+++ b/kernel/arch/arm/mach-mvebu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
 
 AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
diff --git a/kernel/arch/arm/mach-omap1/Makefile b/kernel/arch/arm/mach-omap1/Makefile
index 0e8ea95ea..e8ccf51c6 100644
--- a/kernel/arch/arm/mach-omap1/Makefile
+++ b/kernel/arch/arm/mach-omap1/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-omap1/camera.h b/kernel/arch/arm/mach-omap1/camera.h
index caa6c0d6f..8018f410d 100644
--- a/kernel/arch/arm/mach-omap1/camera.h
+++ b/kernel/arch/arm/mach-omap1/camera.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_CAMERA_H_
 #define __ASM_ARCH_CAMERA_H_
 
diff --git a/kernel/arch/arm/mach-omap1/include/mach/memory.h b/kernel/arch/arm/mach-omap1/include/mach/memory.h
index d43ff0f1c..1142560e0 100644
--- a/kernel/arch/arm/mach-omap1/include/mach/memory.h
+++ b/kernel/arch/arm/mach-omap1/include/mach/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-omap1/include/mach/memory.h
  */
diff --git a/kernel/arch/arm/mach-omap1/include/mach/usb.h b/kernel/arch/arm/mach-omap1/include/mach/usb.h
index eb76628ff..77867778d 100644
--- a/kernel/arch/arm/mach-omap1/include/mach/usb.h
+++ b/kernel/arch/arm/mach-omap1/include/mach/usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * FIXME correct answer depends on hmc_mode,
  * as does (on omap1) any nonzero value for config->otg port number
diff --git a/kernel/arch/arm/mach-omap1/mmc.h b/kernel/arch/arm/mach-omap1/mmc.h
index d7b46880e..043bd02f3 100644
--- a/kernel/arch/arm/mach-omap1/mmc.h
+++ b/kernel/arch/arm/mach-omap1/mmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/mmc/host.h>
 #include <linux/platform_data/mmc-omap.h>
 
diff --git a/kernel/arch/arm/mach-omap1/reset.c b/kernel/arch/arm/mach-omap1/reset.c
index 72bf4bf4a..af2c120b0 100644
--- a/kernel/arch/arm/mach-omap1/reset.c
+++ b/kernel/arch/arm/mach-omap1/reset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP1 reset support
  */
diff --git a/kernel/arch/arm/mach-omap1/sram.h b/kernel/arch/arm/mach-omap1/sram.h
index d5a6c8362..73efabd11 100644
--- a/kernel/arch/arm/mach-omap1/sram.h
+++ b/kernel/arch/arm/mach-omap1/sram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <plat/sram.h>
 
 extern void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl);
diff --git a/kernel/arch/arm/mach-omap2/Makefile b/kernel/arch/arm/mach-omap2/Makefile
index b3b3b3a19..38f1748a4 100644
--- a/kernel/arch/arm/mach-omap2/Makefile
+++ b/kernel/arch/arm/mach-omap2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-omap2/clock2xxx.h b/kernel/arch/arm/mach-omap2/clock2xxx.h
index 125c37614..a8408f9d0 100644
--- a/kernel/arch/arm/mach-omap2/clock2xxx.h
+++ b/kernel/arch/arm/mach-omap2/clock2xxx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * OMAP2 clock function prototypes and macros
  *
diff --git a/kernel/arch/arm/mach-omap2/clock3xxx.h b/kernel/arch/arm/mach-omap2/clock3xxx.h
index 78d9f562e..10a9f577d 100644
--- a/kernel/arch/arm/mach-omap2/clock3xxx.h
+++ b/kernel/arch/arm/mach-omap2/clock3xxx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * OMAP3-common clock function prototypes and macros
  *
diff --git a/kernel/arch/arm/mach-omap2/clockdomains2420_data.c b/kernel/arch/arm/mach-omap2/clockdomains2420_data.c
index 7e76becf3..ac4ffb5d2 100644
--- a/kernel/arch/arm/mach-omap2/clockdomains2420_data.c
+++ b/kernel/arch/arm/mach-omap2/clockdomains2420_data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP2420 clockdomains
  *
diff --git a/kernel/arch/arm/mach-omap2/clockdomains2430_data.c b/kernel/arch/arm/mach-omap2/clockdomains2430_data.c
index b923007e4..0e97e178a 100644
--- a/kernel/arch/arm/mach-omap2/clockdomains2430_data.c
+++ b/kernel/arch/arm/mach-omap2/clockdomains2430_data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP2xxx clockdomains
  *
diff --git a/kernel/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c b/kernel/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
index 497221965..220c22f5e 100644
--- a/kernel/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
+++ b/kernel/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP2/3 clockdomain common data
  *
diff --git a/kernel/arch/arm/mach-omap2/clockdomains3xxx_data.c b/kernel/arch/arm/mach-omap2/clockdomains3xxx_data.c
index f03dc9792..94bbd3831 100644
--- a/kernel/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/kernel/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP3xxx clockdomains
  *
diff --git a/kernel/arch/arm/mach-omap2/common-board-devices.h b/kernel/arch/arm/mach-omap2/common-board-devices.h
index 335c7822f..b23962c38 100644
--- a/kernel/arch/arm/mach-omap2/common-board-devices.h
+++ b/kernel/arch/arm/mach-omap2/common-board-devices.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OMAP_COMMON_BOARD_DEVICES__
 #define __OMAP_COMMON_BOARD_DEVICES__
 
diff --git a/kernel/arch/arm/mach-omap2/mmc.h b/kernel/arch/arm/mach-omap2/mmc.h
index 30d39b97e..9145a6f72 100644
--- a/kernel/arch/arm/mach-omap2/mmc.h
+++ b/kernel/arch/arm/mach-omap2/mmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #define OMAP24XX_NR_MMC		2
 #define OMAP2420_MMC_SIZE	OMAP1_MMC_SIZE
diff --git a/kernel/arch/arm/mach-omap2/omap-pm-noop.c b/kernel/arch/arm/mach-omap2/omap-pm-noop.c
index a1ee80669..4ead077ea 100644
--- a/kernel/arch/arm/mach-omap2/omap-pm-noop.c
+++ b/kernel/arch/arm/mach-omap2/omap-pm-noop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * omap-pm-noop.c - OMAP power management interface - dummy version
  *
diff --git a/kernel/arch/arm/mach-omap2/omap-pm.h b/kernel/arch/arm/mach-omap2/omap-pm.h
index 109bef553..5ba5df47f 100644
--- a/kernel/arch/arm/mach-omap2/omap-pm.h
+++ b/kernel/arch/arm/mach-omap2/omap-pm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap-pm.h - OMAP power management interface
  *
diff --git a/kernel/arch/arm/mach-omap2/opp2420_data.c b/kernel/arch/arm/mach-omap2/opp2420_data.c
index a9e8cf217..18a448f93 100644
--- a/kernel/arch/arm/mach-omap2/opp2420_data.c
+++ b/kernel/arch/arm/mach-omap2/opp2420_data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * opp2420_data.c - old-style "OPP" table for OMAP2420
  *
diff --git a/kernel/arch/arm/mach-omap2/opp2430_data.c b/kernel/arch/arm/mach-omap2/opp2430_data.c
index b2233b72b..ded8b566a 100644
--- a/kernel/arch/arm/mach-omap2/opp2430_data.c
+++ b/kernel/arch/arm/mach-omap2/opp2430_data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * opp2430_data.c - old-style "OPP" table for OMAP2430
  *
diff --git a/kernel/arch/arm/mach-omap2/opp2xxx.h b/kernel/arch/arm/mach-omap2/opp2xxx.h
index 8fae534eb..a451182cd 100644
--- a/kernel/arch/arm/mach-omap2/opp2xxx.h
+++ b/kernel/arch/arm/mach-omap2/opp2xxx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * opp2xxx.h - macros for old-style OMAP2xxx "OPP" definitions
  *
diff --git a/kernel/arch/arm/mach-omap2/usb.h b/kernel/arch/arm/mach-omap2/usb.h
index 3395365ef..740a499be 100644
--- a/kernel/arch/arm/mach-omap2/usb.h
+++ b/kernel/arch/arm/mach-omap2/usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/platform_data/usb-omap.h>
 
 /* AM35x */
diff --git a/kernel/arch/arm/mach-omap2/vp.c b/kernel/arch/arm/mach-omap2/vp.c
index a3c30655a..a709655b9 100644
--- a/kernel/arch/arm/mach-omap2/vp.c
+++ b/kernel/arch/arm/mach-omap2/vp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 
diff --git a/kernel/arch/arm/mach-orion5x/Makefile b/kernel/arch/arm/mach-orion5x/Makefile
index ae91872ee..1a585a62d 100644
--- a/kernel/arch/arm/mach-orion5x/Makefile
+++ b/kernel/arch/arm/mach-orion5x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
 
 obj-y				+= common.o pci.o irq.o mpp.o
diff --git a/kernel/arch/arm/mach-orion5x/common.h b/kernel/arch/arm/mach-orion5x/common.h
index 4c0c7de66..eb96009e2 100644
--- a/kernel/arch/arm/mach-orion5x/common.h
+++ b/kernel/arch/arm/mach-orion5x/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_ORION5X_COMMON_H
 #define __ARCH_ORION5X_COMMON_H
 
diff --git a/kernel/arch/arm/mach-orion5x/mpp.h b/kernel/arch/arm/mach-orion5x/mpp.h
index db70e79a1..be1c78663 100644
--- a/kernel/arch/arm/mach-orion5x/mpp.h
+++ b/kernel/arch/arm/mach-orion5x/mpp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_ORION5X_MPP_H
 #define __ARCH_ORION5X_MPP_H
 
diff --git a/kernel/arch/arm/mach-orion5x/ts78xx-fpga.h b/kernel/arch/arm/mach-orion5x/ts78xx-fpga.h
index 97c393d39..2f4fe3ca5 100644
--- a/kernel/arch/arm/mach-orion5x/ts78xx-fpga.h
+++ b/kernel/arch/arm/mach-orion5x/ts78xx-fpga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define TS7800_FPGA_MAGIC 0x00b480
 #define FPGAID(_magic, _rev) ((_magic << 8) + _rev)
 
diff --git a/kernel/arch/arm/mach-orion5x/tsx09-common.h b/kernel/arch/arm/mach-orion5x/tsx09-common.h
index 098426461..72bedc6b8 100644
--- a/kernel/arch/arm/mach-orion5x/tsx09-common.h
+++ b/kernel/arch/arm/mach-orion5x/tsx09-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_ORION5X_TSX09_COMMON_H
 #define __ARCH_ORION5X_TSX09_COMMON_H
 
diff --git a/kernel/arch/arm/mach-prima2/Makefile b/kernel/arch/arm/mach-prima2/Makefile
index d7d02b043..0fd276303 100644
--- a/kernel/arch/arm/mach-prima2/Makefile
+++ b/kernel/arch/arm/mach-prima2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += rstc.o
 obj-y += common.o
 obj-y += rtciobrg.o
diff --git a/kernel/arch/arm/mach-pxa/Makefile b/kernel/arch/arm/mach-pxa/Makefile
index ef25dc597..0a8e96110 100644
--- a/kernel/arch/arm/mach-pxa/Makefile
+++ b/kernel/arch/arm/mach-pxa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-pxa/cm-x2xx-pci.h b/kernel/arch/arm/mach-pxa/cm-x2xx-pci.h
index e24aad2e3..93ffaaee7 100644
--- a/kernel/arch/arm/mach-pxa/cm-x2xx-pci.h
+++ b/kernel/arch/arm/mach-pxa/cm-x2xx-pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern void __cmx2xx_pci_init_irq(int irq_gpio);
 extern void __cmx2xx_pci_suspend(void);
 extern void __cmx2xx_pci_resume(void);
diff --git a/kernel/arch/arm/mach-pxa/colibri.h b/kernel/arch/arm/mach-pxa/colibri.h
index cb4236e98..673a131da 100644
--- a/kernel/arch/arm/mach-pxa/colibri.h
+++ b/kernel/arch/arm/mach-pxa/colibri.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _COLIBRI_H_
 #define _COLIBRI_H_
 
diff --git a/kernel/arch/arm/mach-pxa/csb701.c b/kernel/arch/arm/mach-pxa/csb701.c
index 5a221a49e..527c9fdf9 100644
--- a/kernel/arch/arm/mach-pxa/csb701.c
+++ b/kernel/arch/arm/mach-pxa/csb701.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
diff --git a/kernel/arch/arm/mach-pxa/devices.c b/kernel/arch/arm/mach-pxa/devices.c
index fffb697bb..5a72456a1 100644
--- a/kernel/arch/arm/mach-pxa/devices.c
+++ b/kernel/arch/arm/mach-pxa/devices.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/kernel/arch/arm/mach-pxa/devices.h b/kernel/arch/arm/mach-pxa/devices.h
index 04580c407..905628dfb 100644
--- a/kernel/arch/arm/mach-pxa/devices.h
+++ b/kernel/arch/arm/mach-pxa/devices.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern struct platform_device pxa_device_pmu;
 extern struct platform_device pxa_device_mci;
 extern struct platform_device pxa3xx_device_mci2;
diff --git a/kernel/arch/arm/mach-pxa/include/mach/addr-map.h b/kernel/arch/arm/mach-pxa/include/mach/addr-map.h
index 07b93fd24..93cfe7dbf 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/addr-map.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/addr-map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_ADDR_MAP_H
 #define __ASM_MACH_ADDR_MAP_H
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/audio.h b/kernel/arch/arm/mach-pxa/include/mach/audio.h
index a3449e35a..7beebf729 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/audio.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/audio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_AUDIO_H__
 #define __ASM_ARCH_AUDIO_H__
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/bitfield.h b/kernel/arch/arm/mach-pxa/include/mach/bitfield.h
index f1f0e3387..fe2ca441b 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/bitfield.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/bitfield.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	FILE    	bitfield.h
  *
diff --git a/kernel/arch/arm/mach-pxa/include/mach/io.h b/kernel/arch/arm/mach-pxa/include/mach/io.h
index cd78b7fe3..d54031c4f 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/io.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-pxa/include/mach/io.h
  *
diff --git a/kernel/arch/arm/mach-pxa/include/mach/regs-ac97.h b/kernel/arch/arm/mach-pxa/include/mach/regs-ac97.h
index b8d14bd9a..1db96fd4d 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/regs-ac97.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/regs-ac97.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_REGS_AC97_H
 #define __ASM_ARCH_REGS_AC97_H
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/regs-lcd.h b/kernel/arch/arm/mach-pxa/include/mach/regs-lcd.h
index f82dcea79..e2b6e3d1f 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/regs-lcd.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/regs-lcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_REGS_LCD_H
 #define __ASM_ARCH_REGS_LCD_H
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/regs-ost.h b/kernel/arch/arm/mach-pxa/include/mach/regs-ost.h
index 628819995..deb564ed8 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/regs-ost.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/regs-ost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_REGS_OST_H
 #define __ASM_MACH_REGS_OST_H
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/regs-uart.h b/kernel/arch/arm/mach-pxa/include/mach/regs-uart.h
index 55aeb7fb7..9a168f83a 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/regs-uart.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/regs-uart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_REGS_UART_H
 #define __ASM_ARCH_REGS_UART_H
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/reset.h b/kernel/arch/arm/mach-pxa/include/mach/reset.h
index b6c10556f..e1c4d100f 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/reset.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_RESET_H
 #define __ASM_ARCH_RESET_H
 
diff --git a/kernel/arch/arm/mach-pxa/include/mach/trizeps4.h b/kernel/arch/arm/mach-pxa/include/mach/trizeps4.h
index ae3ca013a..3cddb1428 100644
--- a/kernel/arch/arm/mach-pxa/include/mach/trizeps4.h
+++ b/kernel/arch/arm/mach-pxa/include/mach/trizeps4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /************************************************************************
  * Include file for TRIZEPS4 SoM and ConXS eval-board
  * Copyright (c) Jürgen Schindele
diff --git a/kernel/arch/arm/mach-pxa/littleton.h b/kernel/arch/arm/mach-pxa/littleton.h
index 8066be54e..a0a8d2bf9 100644
--- a/kernel/arch/arm/mach-pxa/littleton.h
+++ b/kernel/arch/arm/mach-pxa/littleton.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_LITTLETON_H
 #define __ASM_ARCH_LITTLETON_H
 
diff --git a/kernel/arch/arm/mach-pxa/mfp-pxa25x.h b/kernel/arch/arm/mach-pxa/mfp-pxa25x.h
index 1c59d4b3b..d0ebb2154 100644
--- a/kernel/arch/arm/mach-pxa/mfp-pxa25x.h
+++ b/kernel/arch/arm/mach-pxa/mfp-pxa25x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_MFP_PXA25X_H
 #define __ASM_ARCH_MFP_PXA25X_H
 
diff --git a/kernel/arch/arm/mach-pxa/mfp-pxa27x.h b/kernel/arch/arm/mach-pxa/mfp-pxa27x.h
index 9fe5601ce..9f5ffb785 100644
--- a/kernel/arch/arm/mach-pxa/mfp-pxa27x.h
+++ b/kernel/arch/arm/mach-pxa/mfp-pxa27x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_MFP_PXA27X_H
 #define __ASM_ARCH_MFP_PXA27X_H
 
diff --git a/kernel/arch/arm/mach-pxa/mfp-pxa2xx.h b/kernel/arch/arm/mach-pxa/mfp-pxa2xx.h
index cbf51ae81..980145e7e 100644
--- a/kernel/arch/arm/mach-pxa/mfp-pxa2xx.h
+++ b/kernel/arch/arm/mach-pxa/mfp-pxa2xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_MFP_PXA2XX_H
 #define __ASM_ARCH_MFP_PXA2XX_H
 
diff --git a/kernel/arch/arm/mach-pxa/mfp-pxa3xx.h b/kernel/arch/arm/mach-pxa/mfp-pxa3xx.h
index d375195d9..cdd830926 100644
--- a/kernel/arch/arm/mach-pxa/mfp-pxa3xx.h
+++ b/kernel/arch/arm/mach-pxa/mfp-pxa3xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_MFP_PXA3XX_H
 #define __ASM_ARCH_MFP_PXA3XX_H
 
diff --git a/kernel/arch/arm/mach-pxa/mioa701.h b/kernel/arch/arm/mach-pxa/mioa701.h
index e57f5c724..d94295c67 100644
--- a/kernel/arch/arm/mach-pxa/mioa701.h
+++ b/kernel/arch/arm/mach-pxa/mioa701.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MIOA701_H_
 #define _MIOA701_H_
 
diff --git a/kernel/arch/arm/mach-pxa/mxm8x10.h b/kernel/arch/arm/mach-pxa/mxm8x10.h
index ffa15665a..dcd32321c 100644
--- a/kernel/arch/arm/mach-pxa/mxm8x10.h
+++ b/kernel/arch/arm/mach-pxa/mxm8x10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_MXM_8X10_H
 #define __MACH_MXM_8X10_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa25x.h b/kernel/arch/arm/mach-pxa/pxa25x.h
index 2011e8da0..b58d0fbdb 100644
--- a/kernel/arch/arm/mach-pxa/pxa25x.h
+++ b/kernel/arch/arm/mach-pxa/pxa25x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_PXA25x_H
 #define __MACH_PXA25x_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa27x-udc.h b/kernel/arch/arm/mach-pxa/pxa27x-udc.h
index 4cf28f670..faf738046 100644
--- a/kernel/arch/arm/mach-pxa/pxa27x-udc.h
+++ b/kernel/arch/arm/mach-pxa/pxa27x-udc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_PXA27X_UDC_H
 #define _ASM_ARCH_PXA27X_UDC_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa27x.h b/kernel/arch/arm/mach-pxa/pxa27x.h
index 075131d83..abdc02fb4 100644
--- a/kernel/arch/arm/mach-pxa/pxa27x.h
+++ b/kernel/arch/arm/mach-pxa/pxa27x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_PXA27x_H
 #define __MACH_PXA27x_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa300.h b/kernel/arch/arm/mach-pxa/pxa300.h
index 59fa41025..d02a8d15c 100644
--- a/kernel/arch/arm/mach-pxa/pxa300.h
+++ b/kernel/arch/arm/mach-pxa/pxa300.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_PXA300_H
 #define __MACH_PXA300_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa320.h b/kernel/arch/arm/mach-pxa/pxa320.h
index b9e5115a1..c701e3f66 100644
--- a/kernel/arch/arm/mach-pxa/pxa320.h
+++ b/kernel/arch/arm/mach-pxa/pxa320.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_PXA320_H
 #define __MACH_PXA320_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa3xx.h b/kernel/arch/arm/mach-pxa/pxa3xx.h
index b4143fb66..6d4502aa9 100644
--- a/kernel/arch/arm/mach-pxa/pxa3xx.h
+++ b/kernel/arch/arm/mach-pxa/pxa3xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_PXA3XX_H	
 #define __MACH_PXA3XX_H
 
diff --git a/kernel/arch/arm/mach-pxa/pxa930.h b/kernel/arch/arm/mach-pxa/pxa930.h
index 4eceb0297..bbf25c044 100644
--- a/kernel/arch/arm/mach-pxa/pxa930.h
+++ b/kernel/arch/arm/mach-pxa/pxa930.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_PXA930_H
 #define __MACH_PXA930_H
 
diff --git a/kernel/arch/arm/mach-pxa/regs-rtc.h b/kernel/arch/arm/mach-pxa/regs-rtc.h
index f0e4a589b..b1f9ff14e 100644
--- a/kernel/arch/arm/mach-pxa/regs-rtc.h
+++ b/kernel/arch/arm/mach-pxa/regs-rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_REGS_RTC_H
 #define __ASM_MACH_REGS_RTC_H
 
diff --git a/kernel/arch/arm/mach-pxa/regs-u2d.h b/kernel/arch/arm/mach-pxa/regs-u2d.h
index c15c0c57d..fe4c80ad8 100644
--- a/kernel/arch/arm/mach-pxa/regs-u2d.h
+++ b/kernel/arch/arm/mach-pxa/regs-u2d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_PXA3xx_U2D_H
 #define __ASM_ARCH_PXA3xx_U2D_H
 
diff --git a/kernel/arch/arm/mach-pxa/smemc.c b/kernel/arch/arm/mach-pxa/smemc.c
index f38aa890b..32e82cc92 100644
--- a/kernel/arch/arm/mach-pxa/smemc.c
+++ b/kernel/arch/arm/mach-pxa/smemc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Static Memory Controller
  */
diff --git a/kernel/arch/arm/mach-pxa/zylonite.h b/kernel/arch/arm/mach-pxa/zylonite.h
index ecca976f0..7300ec2aa 100644
--- a/kernel/arch/arm/mach-pxa/zylonite.h
+++ b/kernel/arch/arm/mach-pxa/zylonite.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_ZYLONITE_H
 #define __ASM_ARCH_ZYLONITE_H
 
diff --git a/kernel/arch/arm/mach-rpc/fiq.S b/kernel/arch/arm/mach-rpc/fiq.S
index 48ddd57db..0de83e9b0 100644
--- a/kernel/arch/arm/mach-rpc/fiq.S
+++ b/kernel/arch/arm/mach-rpc/fiq.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <mach/hardware.h>
diff --git a/kernel/arch/arm/mach-rpc/include/mach/entry-macro.S b/kernel/arch/arm/mach-rpc/include/mach/entry-macro.S
index 7178368d7..a6d1a9f4b 100644
--- a/kernel/arch/arm/mach-rpc/include/mach/entry-macro.S
+++ b/kernel/arch/arm/mach-rpc/include/mach/entry-macro.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <mach/hardware.h>
 #include <asm/hardware/entry-macro-iomd.S>
 
diff --git a/kernel/arch/arm/mach-rpc/irq.c b/kernel/arch/arm/mach-rpc/irq.c
index 66502e620..b8a61cb11 100644
--- a/kernel/arch/arm/mach-rpc/irq.c
+++ b/kernel/arch/arm/mach-rpc/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/io.h>
diff --git a/kernel/arch/arm/mach-s3c24xx/include/mach/io.h b/kernel/arch/arm/mach-s3c24xx/include/mach/io.h
index 235c53647..f960e6d10 100644
--- a/kernel/arch/arm/mach-s3c24xx/include/mach/io.h
+++ b/kernel/arch/arm/mach-s3c24xx/include/mach/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-s3c2410/include/mach/io.h
  *  from arch/arm/mach-rpc/include/mach/io.h
diff --git a/kernel/arch/arm/mach-s3c64xx/include/mach/dma.h b/kernel/arch/arm/mach-s3c64xx/include/mach/dma.h
index 9c739eafe..40ca8de21 100644
--- a/kernel/arch/arm/mach-s3c64xx/include/mach/dma.h
+++ b/kernel/arch/arm/mach-s3c64xx/include/mach/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/arch/arm/mach-s3c6400/include/mach/dma.h
  *
  * Copyright 2008 Openmoko, Inc.
diff --git a/kernel/arch/arm/mach-s3c64xx/include/mach/irqs.h b/kernel/arch/arm/mach-s3c64xx/include/mach/irqs.h
index 3ceb00b5d..c244e480e 100644
--- a/kernel/arch/arm/mach-s3c64xx/include/mach/irqs.h
+++ b/kernel/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/arch/arm/mach-s3c64xx/include/mach/irqs.h
  *
  * Copyright 2008 Openmoko, Inc.
diff --git a/kernel/arch/arm/mach-s3c64xx/include/mach/regs-gpio.h b/kernel/arch/arm/mach-s3c64xx/include/mach/regs-gpio.h
index 81f7f6e68..592a2be3d 100644
--- a/kernel/arch/arm/mach-s3c64xx/include/mach/regs-gpio.h
+++ b/kernel/arch/arm/mach-s3c64xx/include/mach/regs-gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/arch/arm/plat-s3c64xx/include/mach/regs-gpio.h
  *
  * Copyright 2008 Openmoko, Inc.
diff --git a/kernel/arch/arm/mach-s3c64xx/regs-gpio-memport.h b/kernel/arch/arm/mach-s3c64xx/regs-gpio-memport.h
index b92759301..589afe113 100644
--- a/kernel/arch/arm/mach-s3c64xx/regs-gpio-memport.h
+++ b/kernel/arch/arm/mach-s3c64xx/regs-gpio-memport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2008 Openmoko, Inc.
  * Copyright 2008 Simtec Electronics
diff --git a/kernel/arch/arm/mach-sa1100/Makefile b/kernel/arch/arm/mach-sa1100/Makefile
index ebc4d58e1..28c1cae00 100644
--- a/kernel/arch/arm/mach-sa1100/Makefile
+++ b/kernel/arch/arm/mach-sa1100/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-sa1100/clock.c b/kernel/arch/arm/mach-sa1100/clock.c
index 7d52cd97d..b2eb3d232 100644
--- a/kernel/arch/arm/mach-sa1100/clock.c
+++ b/kernel/arch/arm/mach-sa1100/clock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mach-sa1100/clock.c
  */
diff --git a/kernel/arch/arm/mach-sa1100/generic.h b/kernel/arch/arm/mach-sa1100/generic.h
index 68199b603..97502922a 100644
--- a/kernel/arch/arm/mach-sa1100/generic.h
+++ b/kernel/arch/arm/mach-sa1100/generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/arch/arm/mach-sa1100/generic.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/SA-1100.h b/kernel/arch/arm/mach-sa1100/include/mach/SA-1100.h
index 7972617cc..6e6ff3e18 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/SA-1100.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/SA-1100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	FILE    	SA-1100.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/assabet.h b/kernel/arch/arm/mach-sa1100/include/mach/assabet.h
index c23fcdb04..558b45323 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/assabet.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/assabet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/assabet.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/collie.h b/kernel/arch/arm/mach-sa1100/include/mach/collie.h
index b478ca180..b7bc23ffd 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/collie.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/collie.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/collie.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/hardware.h b/kernel/arch/arm/mach-sa1100/include/mach/hardware.h
index cc43f95f3..6f2dbdc28 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/hardware.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/hardware.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/irqs.h b/kernel/arch/arm/mach-sa1100/include/mach/irqs.h
index 734e30e40..f4a41e665 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/irqs.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/irqs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/irqs.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/memory.h b/kernel/arch/arm/mach-sa1100/include/mach/memory.h
index 2054051eb..fa5cf4744 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/memory.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/memory.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/neponset.h b/kernel/arch/arm/mach-sa1100/include/mach/neponset.h
index 5516a52a3..18411cfdf 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/neponset.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/neponset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/neponset.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/reset.h b/kernel/arch/arm/mach-sa1100/include/mach/reset.h
index f61957e68..27695650a 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/reset.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_RESET_H
 #define __ASM_ARCH_RESET_H
 
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/shannon.h b/kernel/arch/arm/mach-sa1100/include/mach/shannon.h
index fff39e02b..d830375f3 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/shannon.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/shannon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INCLUDE_SHANNON_H
 #define _INCLUDE_SHANNON_H
 
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/simpad.h b/kernel/arch/arm/mach-sa1100/include/mach/simpad.h
index ac2ea7672..d53d680de 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/simpad.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/simpad.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/simpad.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/include/mach/uncompress.h b/kernel/arch/arm/mach-sa1100/include/mach/uncompress.h
index a1a041b97..f5eaa90a4 100644
--- a/kernel/arch/arm/mach-sa1100/include/mach/uncompress.h
+++ b/kernel/arch/arm/mach-sa1100/include/mach/uncompress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/arm/mach-sa1100/include/mach/uncompress.h
  *
diff --git a/kernel/arch/arm/mach-sa1100/lart.c b/kernel/arch/arm/mach-sa1100/lart.c
index 51b0eb52c..e3a027975 100644
--- a/kernel/arch/arm/mach-sa1100/lart.c
+++ b/kernel/arch/arm/mach-sa1100/lart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-sa1100/lart.c
  */
diff --git a/kernel/arch/arm/mach-sa1100/neponset.c b/kernel/arch/arm/mach-sa1100/neponset.c
index 8411985af..a61a24327 100644
--- a/kernel/arch/arm/mach-sa1100/neponset.c
+++ b/kernel/arch/arm/mach-sa1100/neponset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-sa1100/neponset.c
  */
diff --git a/kernel/arch/arm/mach-sa1100/pleb.c b/kernel/arch/arm/mach-sa1100/pleb.c
index 88149f85b..b2b0c9fc1 100644
--- a/kernel/arch/arm/mach-sa1100/pleb.c
+++ b/kernel/arch/arm/mach-sa1100/pleb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-sa1100/pleb.c
  */
diff --git a/kernel/arch/arm/mach-sa1100/shannon.c b/kernel/arch/arm/mach-sa1100/shannon.c
index c8866bce7..856664c78 100644
--- a/kernel/arch/arm/mach-sa1100/shannon.c
+++ b/kernel/arch/arm/mach-sa1100/shannon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-sa1100/shannon.c
  */
diff --git a/kernel/arch/arm/mach-sa1100/simpad.c b/kernel/arch/arm/mach-sa1100/simpad.c
index bb3ca9c76..e8d25a7bb 100644
--- a/kernel/arch/arm/mach-sa1100/simpad.c
+++ b/kernel/arch/arm/mach-sa1100/simpad.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/arm/mach-sa1100/simpad.c
  */
diff --git a/kernel/arch/arm/mach-shmobile/Makefile b/kernel/arch/arm/mach-shmobile/Makefile
index 64611a1b4..e16b81ec4 100644
--- a/kernel/arch/arm/mach-shmobile/Makefile
+++ b/kernel/arch/arm/mach-shmobile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-shmobile/common.h b/kernel/arch/arm/mach-shmobile/common.h
index 1a8f7b3ab..f8fcd799d 100644
--- a/kernel/arch/arm/mach-shmobile/common.h
+++ b/kernel/arch/arm/mach-shmobile/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_MACH_COMMON_H
 #define __ARCH_MACH_COMMON_H
 
diff --git a/kernel/arch/arm/mach-shmobile/emev2.h b/kernel/arch/arm/mach-shmobile/emev2.h
index 916d25f67..39f6cd8e6 100644
--- a/kernel/arch/arm/mach-shmobile/emev2.h
+++ b/kernel/arch/arm/mach-shmobile/emev2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_EMEV2_H__
 #define __ASM_EMEV2_H__
 
diff --git a/kernel/arch/arm/mach-shmobile/r8a7779.h b/kernel/arch/arm/mach-shmobile/r8a7779.h
index 2a5f7730a..30668aa6a 100644
--- a/kernel/arch/arm/mach-shmobile/r8a7779.h
+++ b/kernel/arch/arm/mach-shmobile/r8a7779.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_R8A7779_H__
 #define __ASM_R8A7779_H__
 
diff --git a/kernel/arch/arm/mach-shmobile/r8a7790.h b/kernel/arch/arm/mach-shmobile/r8a7790.h
index 136f3455e..669c8cd09 100644
--- a/kernel/arch/arm/mach-shmobile/r8a7790.h
+++ b/kernel/arch/arm/mach-shmobile/r8a7790.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_R8A7790_H__
 #define __ASM_R8A7790_H__
 
diff --git a/kernel/arch/arm/mach-shmobile/r8a7791.h b/kernel/arch/arm/mach-shmobile/r8a7791.h
index cf7a8405b..8c794aace 100644
--- a/kernel/arch/arm/mach-shmobile/r8a7791.h
+++ b/kernel/arch/arm/mach-shmobile/r8a7791.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_R8A7791_H__
 #define __ASM_R8A7791_H__
 
diff --git a/kernel/arch/arm/mach-shmobile/rcar-gen2.h b/kernel/arch/arm/mach-shmobile/rcar-gen2.h
index 6792e249c..4777fff2d 100644
--- a/kernel/arch/arm/mach-shmobile/rcar-gen2.h
+++ b/kernel/arch/arm/mach-shmobile/rcar-gen2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_RCAR_GEN2_H__
 #define __ASM_RCAR_GEN2_H__
 
diff --git a/kernel/arch/arm/mach-shmobile/sh73a0.h b/kernel/arch/arm/mach-shmobile/sh73a0.h
index 50ef24f78..85c7c7c60 100644
--- a/kernel/arch/arm/mach-shmobile/sh73a0.h
+++ b/kernel/arch/arm/mach-shmobile/sh73a0.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH73A0_H__
 #define __ASM_SH73A0_H__
 
diff --git a/kernel/arch/arm/mach-socfpga/Makefile b/kernel/arch/arm/mach-socfpga/Makefile
index ed15db19e..9ec31fad7 100644
--- a/kernel/arch/arm/mach-socfpga/Makefile
+++ b/kernel/arch/arm/mach-socfpga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-spear/Makefile b/kernel/arch/arm/mach-spear/Makefile
index a946c19ab..176b14f83 100644
--- a/kernel/arch/arm/mach-spear/Makefile
+++ b/kernel/arch/arm/mach-spear/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # SPEAr Platform specific Makefile
 #
diff --git a/kernel/arch/arm/mach-tango/Kconfig b/kernel/arch/arm/mach-tango/Kconfig
index ebe15b93b..25b2fd434 100644
--- a/kernel/arch/arm/mach-tango/Kconfig
+++ b/kernel/arch/arm/mach-tango/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_TANGO
 	bool "Sigma Designs Tango4 (SMP87xx)"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-tango/Makefile b/kernel/arch/arm/mach-tango/Makefile
index 204fcd9fe..da6c633d3 100644
--- a/kernel/arch/arm/mach-tango/Makefile
+++ b/kernel/arch/arm/mach-tango/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)
 
diff --git a/kernel/arch/arm/mach-tango/platsmp.c b/kernel/arch/arm/mach-tango/platsmp.c
index 2f0c6c050..65012afbc 100644
--- a/kernel/arch/arm/mach-tango/platsmp.c
+++ b/kernel/arch/arm/mach-tango/platsmp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/smp.h>
diff --git a/kernel/arch/arm/mach-tango/pm.c b/kernel/arch/arm/mach-tango/pm.c
index 406c0814e..028e50c63 100644
--- a/kernel/arch/arm/mach-tango/pm.c
+++ b/kernel/arch/arm/mach-tango/pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/suspend.h>
 #include <asm/suspend.h>
diff --git a/kernel/arch/arm/mach-tango/setup.c b/kernel/arch/arm/mach-tango/setup.c
index f14b6c7d2..677dd7b5e 100644
--- a/kernel/arch/arm/mach-tango/setup.c
+++ b/kernel/arch/arm/mach-tango/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 #include "smc.h"
diff --git a/kernel/arch/arm/mach-tango/smc.S b/kernel/arch/arm/mach-tango/smc.S
index 5d932ce3c..361a8dc89 100644
--- a/kernel/arch/arm/mach-tango/smc.S
+++ b/kernel/arch/arm/mach-tango/smc.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 ENTRY(tango_smc)
diff --git a/kernel/arch/arm/mach-tango/smc.h b/kernel/arch/arm/mach-tango/smc.h
index 57919539d..455ce3e06 100644
--- a/kernel/arch/arm/mach-tango/smc.h
+++ b/kernel/arch/arm/mach-tango/smc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern int tango_smc(unsigned int val, unsigned int service);
 
 #define tango_set_l2_control(val)	tango_smc(val, 0x102)
diff --git a/kernel/arch/arm/mach-tegra/Kconfig b/kernel/arch/arm/mach-tegra/Kconfig
index c8368d647..1e0aeb47b 100644
--- a/kernel/arch/arm/mach-tegra/Kconfig
+++ b/kernel/arch/arm/mach-tegra/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_TEGRA
 	bool "NVIDIA Tegra"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-tegra/Makefile b/kernel/arch/arm/mach-tegra/Makefile
index 3b33f0bb7..6c1dff2ec 100644
--- a/kernel/arch/arm/mach-tegra/Makefile
+++ b/kernel/arch/arm/mach-tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 asflags-y				+= -march=armv7-a
 
 obj-y                                   += io.o
diff --git a/kernel/arch/arm/mach-u300/Kconfig b/kernel/arch/arm/mach-u300/Kconfig
index 22dcbf5b7..4f43c1cd5 100644
--- a/kernel/arch/arm/mach-u300/Kconfig
+++ b/kernel/arch/arm/mach-u300/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_U300
 	bool "ST-Ericsson U300 Series"
 	depends on ARCH_MULTI_V5 && MMU
diff --git a/kernel/arch/arm/mach-uniphier/Kconfig b/kernel/arch/arm/mach-uniphier/Kconfig
index 3930fbba3..779235a91 100644
--- a/kernel/arch/arm/mach-uniphier/Kconfig
+++ b/kernel/arch/arm/mach-uniphier/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_UNIPHIER
 	bool "Socionext UniPhier SoCs"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-ux500/Kconfig b/kernel/arch/arm/mach-ux500/Kconfig
index 4740ac393..f98332ea2 100644
--- a/kernel/arch/arm/mach-ux500/Kconfig
+++ b/kernel/arch/arm/mach-ux500/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_U8500
 	bool "ST-Ericsson U8500 Series"
 	depends on ARCH_MULTI_V7 && MMU
diff --git a/kernel/arch/arm/mach-versatile/Kconfig b/kernel/arch/arm/mach-versatile/Kconfig
index c257d40ca..f5c275434 100644
--- a/kernel/arch/arm/mach-versatile/Kconfig
+++ b/kernel/arch/arm/mach-versatile/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_VERSATILE
 	bool "ARM Ltd. Versatile family"
 	depends on ARCH_MULTI_V5
diff --git a/kernel/arch/arm/mach-vexpress/Kconfig b/kernel/arch/arm/mach-vexpress/Kconfig
index 7c728ebc0..726a68085 100644
--- a/kernel/arch/arm/mach-vexpress/Kconfig
+++ b/kernel/arch/arm/mach-vexpress/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_VEXPRESS
 	bool "ARM Ltd. Versatile Express family"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-vexpress/Makefile b/kernel/arch/arm/mach-vexpress/Makefile
index 73caae71f..51c35e2b7 100644
--- a/kernel/arch/arm/mach-vexpress/Makefile
+++ b/kernel/arch/arm/mach-vexpress/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-vexpress/v2m.c b/kernel/arch/arm/mach-vexpress/v2m.c
index a0400f4cc..95886b3bb 100644
--- a/kernel/arch/arm/mach-vexpress/v2m.c
+++ b/kernel/arch/arm/mach-vexpress/v2m.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/mach/arch.h>
 
 #include "core.h"
diff --git a/kernel/arch/arm/mach-vt8500/Kconfig b/kernel/arch/arm/mach-vt8500/Kconfig
index c4f1dba7b..1156a585d 100644
--- a/kernel/arch/arm/mach-vt8500/Kconfig
+++ b/kernel/arch/arm/mach-vt8500/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_VT8500
 	bool
 	select GPIOLIB
diff --git a/kernel/arch/arm/mach-w90x900/Kconfig b/kernel/arch/arm/mach-w90x900/Kconfig
index 69bab32a8..b16ffc03b 100644
--- a/kernel/arch/arm/mach-w90x900/Kconfig
+++ b/kernel/arch/arm/mach-w90x900/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ARCH_W90X900
 
 config CPU_W90P910
diff --git a/kernel/arch/arm/mach-w90x900/Makefile b/kernel/arch/arm/mach-w90x900/Makefile
index 828c03264..33b5bf539 100644
--- a/kernel/arch/arm/mach-w90x900/Makefile
+++ b/kernel/arch/arm/mach-w90x900/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/mach-zx/Kconfig b/kernel/arch/arm/mach-zx/Kconfig
index 209c97944..ea29c84a7 100644
--- a/kernel/arch/arm/mach-zx/Kconfig
+++ b/kernel/arch/arm/mach-zx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ARCH_ZX
 	bool "ZTE ZX family"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mach-zynq/Kconfig b/kernel/arch/arm/mach-zynq/Kconfig
index fd0aeeb09..1ca633e3d 100644
--- a/kernel/arch/arm/mach-zynq/Kconfig
+++ b/kernel/arch/arm/mach-zynq/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_ZYNQ
 	bool "Xilinx Zynq ARM Cortex A9 Platform"
 	depends on ARCH_MULTI_V7
diff --git a/kernel/arch/arm/mm/Kconfig b/kernel/arch/arm/mm/Kconfig
index 60cdfdc15..fd9077a74 100644
--- a/kernel/arch/arm/mm/Kconfig
+++ b/kernel/arch/arm/mm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 comment "Processor Type"
 
 # Select CPU types depending on the architecture selected.  This selects
diff --git a/kernel/arch/arm/mm/Makefile b/kernel/arch/arm/mm/Makefile
index 950d19bab..f353ee569 100644
--- a/kernel/arch/arm/mm/Makefile
+++ b/kernel/arch/arm/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux arm-specific parts of the memory manager.
 #
diff --git a/kernel/arch/arm/mm/abort-ev4.S b/kernel/arch/arm/mm/abort-ev4.S
index b3b31e30c..a10bcb895 100644
--- a/kernel/arch/arm/mm/abort-ev4.S
+++ b/kernel/arch/arm/mm/abort-ev4.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 /*
diff --git a/kernel/arch/arm/mm/abort-ev4t.S b/kernel/arch/arm/mm/abort-ev4t.S
index 9da704e7b..14743a2f6 100644
--- a/kernel/arch/arm/mm/abort-ev4t.S
+++ b/kernel/arch/arm/mm/abort-ev4t.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include "abort-macro.S"
diff --git a/kernel/arch/arm/mm/abort-ev5t.S b/kernel/arch/arm/mm/abort-ev5t.S
index a6a381a6c..98c523118 100644
--- a/kernel/arch/arm/mm/abort-ev5t.S
+++ b/kernel/arch/arm/mm/abort-ev5t.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include "abort-macro.S"
diff --git a/kernel/arch/arm/mm/abort-ev5tj.S b/kernel/arch/arm/mm/abort-ev5tj.S
index 00ab011be..fec72f4fb 100644
--- a/kernel/arch/arm/mm/abort-ev5tj.S
+++ b/kernel/arch/arm/mm/abort-ev5tj.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include "abort-macro.S"
diff --git a/kernel/arch/arm/mm/abort-ev6.S b/kernel/arch/arm/mm/abort-ev6.S
index 8801a15aa..c58bf8b43 100644
--- a/kernel/arch/arm/mm/abort-ev6.S
+++ b/kernel/arch/arm/mm/abort-ev6.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include "abort-macro.S"
diff --git a/kernel/arch/arm/mm/abort-ev7.S b/kernel/arch/arm/mm/abort-ev7.S
index e8d0e08c2..f7cc5d684 100644
--- a/kernel/arch/arm/mm/abort-ev7.S
+++ b/kernel/arch/arm/mm/abort-ev7.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 /*
diff --git a/kernel/arch/arm/mm/abort-lv4t.S b/kernel/arch/arm/mm/abort-lv4t.S
index 4cdfab31a..fbd60a120 100644
--- a/kernel/arch/arm/mm/abort-lv4t.S
+++ b/kernel/arch/arm/mm/abort-lv4t.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 /*
diff --git a/kernel/arch/arm/mm/abort-macro.S b/kernel/arch/arm/mm/abort-macro.S
index 4509bee4e..bacf53fd0 100644
--- a/kernel/arch/arm/mm/abort-macro.S
+++ b/kernel/arch/arm/mm/abort-macro.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The ARM LDRD and Thumb LDRSB instructions use bit 20/11 (ARM/Thumb)
  * differently than every other instruction, so it is set to 0 (write)
diff --git a/kernel/arch/arm/mm/abort-nommu.S b/kernel/arch/arm/mm/abort-nommu.S
index 119cb479c..6e2366a26 100644
--- a/kernel/arch/arm/mm/abort-nommu.S
+++ b/kernel/arch/arm/mm/abort-nommu.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 /*
diff --git a/kernel/arch/arm/mm/dma.h b/kernel/arch/arm/mm/dma.h
index 70ea6852f..aaef64b7f 100644
--- a/kernel/arch/arm/mm/dma.h
+++ b/kernel/arch/arm/mm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DMA_H
 #define DMA_H
 
diff --git a/kernel/arch/arm/mm/extable.c b/kernel/arch/arm/mm/extable.c
index f436f7439..fc3356459 100644
--- a/kernel/arch/arm/mm/extable.c
+++ b/kernel/arch/arm/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mm/extable.c
  */
diff --git a/kernel/arch/arm/mm/fault.h b/kernel/arch/arm/mm/fault.h
index afc1f84e7..c063708fa 100644
--- a/kernel/arch/arm/mm/fault.h
+++ b/kernel/arch/arm/mm/fault.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_ARM_FAULT_H
 #define __ARCH_ARM_FAULT_H
 
diff --git a/kernel/arch/arm/mm/fsr-2level.c b/kernel/arch/arm/mm/fsr-2level.c
index 18ca74c0f..f2be95197 100644
--- a/kernel/arch/arm/mm/fsr-2level.c
+++ b/kernel/arch/arm/mm/fsr-2level.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static struct fsr_info fsr_info[] = {
 	/*
 	 * The following are the standard ARMv3 and ARMv4 aborts.  ARMv5
diff --git a/kernel/arch/arm/mm/fsr-3level.c b/kernel/arch/arm/mm/fsr-3level.c
index ab4409a23..d0ae29636 100644
--- a/kernel/arch/arm/mm/fsr-3level.c
+++ b/kernel/arch/arm/mm/fsr-3level.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static struct fsr_info fsr_info[] = {
 	{ do_bad,		SIGBUS,  0,		"unknown 0"			},
 	{ do_bad,		SIGBUS,  0,		"unknown 1"			},
diff --git a/kernel/arch/arm/mm/idmap.c b/kernel/arch/arm/mm/idmap.c
index 3e511bec6..10bfba85e 100644
--- a/kernel/arch/arm/mm/idmap.c
+++ b/kernel/arch/arm/mm/idmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/arm/mm/iomap.c b/kernel/arch/arm/mm/iomap.c
index 461420836..091ddc568 100644
--- a/kernel/arch/arm/mm/iomap.c
+++ b/kernel/arch/arm/mm/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mm/iomap.c
  *
diff --git a/kernel/arch/arm/mm/l2c-l2x0-resume.S b/kernel/arch/arm/mm/l2c-l2x0-resume.S
index fda415e4c..fc01f1b18 100644
--- a/kernel/arch/arm/mm/l2c-l2x0-resume.S
+++ b/kernel/arch/arm/mm/l2c-l2x0-resume.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * L2C-310 early resume code.  This can be used by platforms to restore
  * the settings of their L2 cache controller before restoring the
diff --git a/kernel/arch/arm/mm/mm.h b/kernel/arch/arm/mm/mm.h
index ce727d472..6b045c665 100644
--- a/kernel/arch/arm/mm/mm.h
+++ b/kernel/arch/arm/mm/mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_MMU
 #include <linux/list.h>
 #include <linux/vmalloc.h>
diff --git a/kernel/arch/arm/mm/mmap.c b/kernel/arch/arm/mm/mmap.c
index f0701d8d2..eb1de6651 100644
--- a/kernel/arch/arm/mm/mmap.c
+++ b/kernel/arch/arm/mm/mmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/arm/mm/mmap.c
  */
diff --git a/kernel/arch/arm/mm/pabort-legacy.S b/kernel/arch/arm/mm/pabort-legacy.S
index 8bbff0252..b2ffce420 100644
--- a/kernel/arch/arm/mm/pabort-legacy.S
+++ b/kernel/arch/arm/mm/pabort-legacy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
diff --git a/kernel/arch/arm/mm/pabort-v6.S b/kernel/arch/arm/mm/pabort-v6.S
index 9627646ce..8686265dc 100644
--- a/kernel/arch/arm/mm/pabort-v6.S
+++ b/kernel/arch/arm/mm/pabort-v6.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
diff --git a/kernel/arch/arm/mm/pabort-v7.S b/kernel/arch/arm/mm/pabort-v7.S
index 875761f44..9c70b1a21 100644
--- a/kernel/arch/arm/mm/pabort-v7.S
+++ b/kernel/arch/arm/mm/pabort-v7.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 
diff --git a/kernel/arch/arm/mm/physaddr.c b/kernel/arch/arm/mm/physaddr.c
index 02e60f495..cf75819e4 100644
--- a/kernel/arch/arm/mm/physaddr.c
+++ b/kernel/arch/arm/mm/physaddr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/export.h>
 #include <linux/types.h>
diff --git a/kernel/arch/arm/mm/proc-macros.S b/kernel/arch/arm/mm/proc-macros.S
index f944836da..f10e31d07 100644
--- a/kernel/arch/arm/mm/proc-macros.S
+++ b/kernel/arch/arm/mm/proc-macros.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * We need constants.h for:
  *  VMA_VM_MM
diff --git a/kernel/arch/arm/nwfpe/ARM-gcc.h b/kernel/arch/arm/nwfpe/ARM-gcc.h
index 436e54aa0..74389f5b0 100644
--- a/kernel/arch/arm/nwfpe/ARM-gcc.h
+++ b/kernel/arch/arm/nwfpe/ARM-gcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 -------------------------------------------------------------------------------
 The macro `BITS64' can be defined to indicate that 64-bit integer types are
diff --git a/kernel/arch/arm/nwfpe/Makefile b/kernel/arch/arm/nwfpe/Makefile
index deb3a82dd..303400fa2 100644
--- a/kernel/arch/arm/nwfpe/Makefile
+++ b/kernel/arch/arm/nwfpe/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (C) 1998, 1999, 2001 Philip Blundell
 #
diff --git a/kernel/arch/arm/oprofile/Makefile b/kernel/arch/arm/oprofile/Makefile
index b2215c61c..39688dc9f 100644
--- a/kernel/arch/arm/oprofile/Makefile
+++ b/kernel/arch/arm/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/arm/plat-iop/Makefile b/kernel/arch/arm/plat-iop/Makefile
index f2af203d6..4d839a3cf 100644
--- a/kernel/arch/arm/plat-iop/Makefile
+++ b/kernel/arch/arm/plat-iop/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm/plat-omap/Kconfig b/kernel/arch/arm/plat-omap/Kconfig
index 3e27bffb3..7276afee3 100644
--- a/kernel/arch/arm/plat-omap/Kconfig
+++ b/kernel/arch/arm/plat-omap/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARCH_OMAP
 	bool
 
diff --git a/kernel/arch/arm/plat-omap/include/plat/sram.h b/kernel/arch/arm/plat-omap/include/plat/sram.h
index ba4525059..fb061cf0d 100644
--- a/kernel/arch/arm/plat-omap/include/plat/sram.h
+++ b/kernel/arch/arm/plat-omap/include/plat/sram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 int omap_sram_init(void);
 
 void omap_map_sram(unsigned long start, unsigned long size,
diff --git a/kernel/arch/arm/plat-versatile/include/plat/sched_clock.h b/kernel/arch/arm/plat-versatile/include/plat/sched_clock.h
index 5c3e4fc9f..83fdaef23 100644
--- a/kernel/arch/arm/plat-versatile/include/plat/sched_clock.h
+++ b/kernel/arch/arm/plat-versatile/include/plat/sched_clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARM_PLAT_SCHED_CLOCK_H
 #define ARM_PLAT_SCHED_CLOCK_H
 
diff --git a/kernel/arch/arm/probes/Makefile b/kernel/arch/arm/probes/Makefile
index aa1f8590d..8b0ea5ace 100644
--- a/kernel/arch/arm/probes/Makefile
+++ b/kernel/arch/arm/probes/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_UPROBES)		+= decode.o decode-arm.o uprobes/
 obj-$(CONFIG_KPROBES)		+= decode.o kprobes/
 ifdef CONFIG_THUMB2_KERNEL
diff --git a/kernel/arch/arm/probes/kprobes/Makefile b/kernel/arch/arm/probes/kprobes/Makefile
index 76a36bf10..14db56f49 100644
--- a/kernel/arch/arm/probes/kprobes/Makefile
+++ b/kernel/arch/arm/probes/kprobes/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_KPROBES)		+= core.o actions-common.o checkers-common.o
 obj-$(CONFIG_ARM_KPROBES_TEST)	+= test-kprobes.o
 test-kprobes-objs		:= test-core.o
diff --git a/kernel/arch/arm/tools/Makefile b/kernel/arch/arm/tools/Makefile
index 92eb5c3b4..ddb89a7db 100644
--- a/kernel/arch/arm/tools/Makefile
+++ b/kernel/arch/arm/tools/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/arm/tools/Makefile
 #
diff --git a/kernel/arch/arm/tools/gen-mach-types b/kernel/arch/arm/tools/gen-mach-types
index 04fef71d7..cbe1c33bb 100644
--- a/kernel/arch/arm/tools/gen-mach-types
+++ b/kernel/arch/arm/tools/gen-mach-types
@@ -1,4 +1,5 @@
 #!/bin/awk
+# SPDX-License-Identifier: GPL-2.0
 #
 # Awk script to generate include/generated/mach-types.h
 #
diff --git a/kernel/arch/arm/tools/syscallhdr.sh b/kernel/arch/arm/tools/syscallhdr.sh
index 72d4b2e3b..6b2f25cdd 100644
--- a/kernel/arch/arm/tools/syscallhdr.sh
+++ b/kernel/arch/arm/tools/syscallhdr.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 in="$1"
 out="$2"
diff --git a/kernel/arch/arm/tools/syscallnr.sh b/kernel/arch/arm/tools/syscallnr.sh
index d29712964..df3ccd0ca 100644
--- a/kernel/arch/arm/tools/syscallnr.sh
+++ b/kernel/arch/arm/tools/syscallnr.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 in="$1"
 out="$2"
 my_abis=`echo "($3)" | tr ',' '|'`
diff --git a/kernel/arch/arm/tools/syscalltbl.sh b/kernel/arch/arm/tools/syscalltbl.sh
index 5ca834545..ae7e93cfb 100644
--- a/kernel/arch/arm/tools/syscalltbl.sh
+++ b/kernel/arch/arm/tools/syscalltbl.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 in="$1"
 out="$2"
 my_abis=`echo "($3)" | tr ',' '|'`
diff --git a/kernel/arch/arm/vdso/Makefile b/kernel/arch/arm/vdso/Makefile
index 59a8fa7b8..bb4118213 100644
--- a/kernel/arch/arm/vdso/Makefile
+++ b/kernel/arch/arm/vdso/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 hostprogs-y := vdsomunge
 
 obj-vdso := vgettimeofday.o datapage.o
diff --git a/kernel/arch/arm/vdso/datapage.S b/kernel/arch/arm/vdso/datapage.S
index a2e603679..9cd73b725 100644
--- a/kernel/arch/arm/vdso/datapage.S
+++ b/kernel/arch/arm/vdso/datapage.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 
diff --git a/kernel/arch/arm64/boot/dts/Makefile b/kernel/arch/arm64/boot/dts/Makefile
index 8e1951273..c6684ab8e 100644
--- a/kernel/arch/arm64/boot/dts/Makefile
+++ b/kernel/arch/arm64/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dts-dirs += actions
 dts-dirs += al
 dts-dirs += allwinner
diff --git a/kernel/arch/arm64/boot/dts/allwinner/Makefile b/kernel/arch/arm64/boot/dts/allwinner/Makefile
index 19c3fbd75..ff35e184e 100644
--- a/kernel/arch/arm64/boot/dts/allwinner/Makefile
+++ b/kernel/arch/arm64/boot/dts/allwinner/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-nanopi-a64.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-olinuxino.dtb
diff --git a/kernel/arch/arm64/boot/dts/amd/Makefile b/kernel/arch/arm64/boot/dts/amd/Makefile
index ba84770f7..f9963d630 100644
--- a/kernel/arch/arm64/boot/dts/amd/Makefile
+++ b/kernel/arch/arm64/boot/dts/amd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive.dtb \
 			amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb \
 			husky.dtb
diff --git a/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts b/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
index 8e3074a49..8e341be9a 100644
--- a/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
+++ b/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD Seattle Overdrive Development Board
  * Note: For Seattle Rev.B0
diff --git a/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts b/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
index ed5e043f3..92cef05c6 100644
--- a/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
+++ b/kernel/arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD Seattle Overdrive Development Board
  * Note: For Seattle Rev.B1
diff --git a/kernel/arch/arm64/boot/dts/amd/amd-overdrive.dts b/kernel/arch/arm64/boot/dts/amd/amd-overdrive.dts
index 128fa942f..41b3a6c09 100644
--- a/kernel/arch/arm64/boot/dts/amd/amd-overdrive.dts
+++ b/kernel/arch/arm64/boot/dts/amd/amd-overdrive.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD Seattle Overdrive Development Board
  *
diff --git a/kernel/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi b/kernel/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
index f623c4652..2dd2c2817 100644
--- a/kernel/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
+++ b/kernel/arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD Seattle Clocks
  *
diff --git a/kernel/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi b/kernel/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
index bd3adeac3..125f4deb5 100644
--- a/kernel/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
+++ b/kernel/arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD Seattle SoC
  *
diff --git a/kernel/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi b/kernel/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
index 8e8631952..d97498361 100644
--- a/kernel/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
+++ b/kernel/arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD Seattle XGBE (RevB)
  *
diff --git a/kernel/arch/arm64/boot/dts/amd/husky.dts b/kernel/arch/arm64/boot/dts/amd/husky.dts
index 1381d4b2b..7acde3477 100644
--- a/kernel/arch/arm64/boot/dts/amd/husky.dts
+++ b/kernel/arch/arm64/boot/dts/amd/husky.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DTS file for AMD/Linaro 96Boards Enterprise Edition Server (Husky) Board
  * Note: Based-on AMD Seattle Rev.B0
diff --git a/kernel/arch/arm64/boot/dts/amlogic/Makefile b/kernel/arch/arm64/boot/dts/amlogic/Makefile
index 7a9f48c27..543416b8d 100644
--- a/kernel/arch/arm64/boot/dts/amlogic/Makefile
+++ b/kernel/arch/arm64/boot/dts/amlogic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
diff --git a/kernel/arch/arm64/boot/dts/apm/Makefile b/kernel/arch/arm64/boot/dts/apm/Makefile
index c75f17a49..a10fbdb34 100644
--- a/kernel/arch/arm64/boot/dts/apm/Makefile
+++ b/kernel/arch/arm64/boot/dts/apm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-merlin.dtb
 
diff --git a/kernel/arch/arm64/boot/dts/arm/Makefile b/kernel/arch/arm64/boot/dts/arm/Makefile
index 75cc2aa10..470378add 100644
--- a/kernel/arch/arm64/boot/dts/arm/Makefile
+++ b/kernel/arch/arm64/boot/dts/arm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb foundation-v8-gicv3.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb
diff --git a/kernel/arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts b/kernel/arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
index 35588dfa0..4825cdbdc 100644
--- a/kernel/arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
+++ b/kernel/arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd.
  *
diff --git a/kernel/arch/arm64/boot/dts/arm/foundation-v8.dts b/kernel/arch/arm64/boot/dts/arm/foundation-v8.dts
index 711680773..8a9136f4a 100644
--- a/kernel/arch/arm64/boot/dts/arm/foundation-v8.dts
+++ b/kernel/arch/arm64/boot/dts/arm/foundation-v8.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd.
  *
diff --git a/kernel/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/kernel/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 8ecdd4331..f0b67e439 100644
--- a/kernel/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/kernel/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd.
  *
diff --git a/kernel/arch/arm64/boot/dts/arm/juno-base.dtsi b/kernel/arch/arm64/boot/dts/arm/juno-base.dtsi
index fbafe62d6..f165f04db 100644
--- a/kernel/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/kernel/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "juno-clocks.dtsi"
 
 / {
diff --git a/kernel/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/kernel/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
index aa03050dd..0c43fb352 100644
--- a/kernel/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
+++ b/kernel/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	funnel@20130000 { /* cssys1 */
 		compatible = "arm,coresight-funnel", "arm,primecell";
diff --git a/kernel/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/kernel/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
index a83ed2c6b..7810632d3 100644
--- a/kernel/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
+++ b/kernel/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Fast Models
  *
diff --git a/kernel/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/kernel/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 528875c75..e18fe006c 100644
--- a/kernel/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/kernel/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Fast Models
  *
diff --git a/kernel/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts b/kernel/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
index e3a171162..2cb604957 100644
--- a/kernel/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
+++ b/kernel/arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ARM Ltd. Versatile Express
  *
diff --git a/kernel/arch/arm64/boot/dts/broadcom/Makefile b/kernel/arch/arm64/boot/dts/broadcom/Makefile
index 3eaef3895..3df2db7f8 100644
--- a/kernel/arch/arm64/boot/dts/broadcom/Makefile
+++ b/kernel/arch/arm64/boot/dts/broadcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
 
 dts-dirs	+= northstar2
diff --git a/kernel/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/kernel/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
index 699d340a3..89b78d6c1 100644
--- a/kernel/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
+++ b/kernel/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
@@ -1 +1,2 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "arm/bcm2837-rpi-3-b.dts"
diff --git a/kernel/arch/arm64/boot/dts/broadcom/stingray/Makefile b/kernel/arch/arm64/boot/dts/broadcom/stingray/Makefile
index f70028eda..04bb302f3 100644
--- a/kernel/arch/arm64/boot/dts/broadcom/stingray/Makefile
+++ b/kernel/arch/arm64/boot/dts/broadcom/stingray/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742k.dtb
 dtb-$(CONFIG_ARCH_BCM_IPROC) += bcm958742t.dtb
 
diff --git a/kernel/arch/arm64/boot/dts/cavium/Makefile b/kernel/arch/arm64/boot/dts/cavium/Makefile
index 581b2c1c4..9f68c2773 100644
--- a/kernel/arch/arm64/boot/dts/cavium/Makefile
+++ b/kernel/arch/arm64/boot/dts/cavium/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
 dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb
 
diff --git a/kernel/arch/arm64/boot/dts/exynos/Makefile b/kernel/arch/arm64/boot/dts/exynos/Makefile
index 7ddea5376..6914b2cbd 100644
--- a/kernel/arch/arm64/boot/dts/exynos/Makefile
+++ b/kernel/arch/arm64/boot/dts/exynos/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_EXYNOS) += \
 	exynos5433-tm2.dtb	\
 	exynos5433-tm2e.dtb	\
diff --git a/kernel/arch/arm64/boot/dts/freescale/Makefile b/kernel/arch/arm64/boot/dts/freescale/Makefile
index 72c4b5257..dc02e82ab 100644
--- a/kernel/arch/arm64/boot/dts/freescale/Makefile
+++ b/kernel/arch/arm64/boot/dts/freescale/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb
 dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/Makefile b/kernel/arch/arm64/boot/dts/hisilicon/Makefile
index 8960ecafd..521ed484a 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/Makefile
+++ b/kernel/arch/arm64/boot/dts/hisilicon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_HISI) += hi3660-hikey960.dtb
 dtb-$(CONFIG_ARCH_HISI) += hi3798cv200-poplar.dtb
 dtb-$(CONFIG_ARCH_HISI) += hi6220-hikey.dtb
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/kernel/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index fd4705c45..e9f87cb61 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/kernel/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for Hisilicon HiKey960 Development Board
  *
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/kernel/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index b7a90d632..13ae69f5a 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/kernel/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for Hisilicon Hi3660 SoC
  *
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/kernel/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 2b526304e..3aee6123d 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/kernel/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for Hisilicon HiKey Development Board
  *
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/kernel/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 02a3aa4b2..ff1dc89f5 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/kernel/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for Hisilicon Hi6220 SoC
  *
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi b/kernel/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
index 0916e8459..e7d22619a 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
+++ b/kernel/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * pinctrl dts fils for Hislicon HiKey development board
  *
diff --git a/kernel/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi b/kernel/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
index 7e542d28d..d11efc819 100644
--- a/kernel/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
+++ b/kernel/arch/arm64/boot/dts/hisilicon/hikey960-pinctrl.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * pinctrl dts fils for Hislicon HiKey960 development board
  *
diff --git a/kernel/arch/arm64/boot/dts/lg/Makefile b/kernel/arch/arm64/boot/dts/lg/Makefile
index 5c7b54c12..e345b8e58 100644
--- a/kernel/arch/arm64/boot/dts/lg/Makefile
+++ b/kernel/arch/arm64/boot/dts/lg/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_LG1K) += lg1312-ref.dtb
 dtb-$(CONFIG_ARCH_LG1K) += lg1313-ref.dtb
 
diff --git a/kernel/arch/arm64/boot/dts/lg/lg1312-ref.dts b/kernel/arch/arm64/boot/dts/lg/lg1312-ref.dts
index 6d78d6bc7..260a2c5b1 100644
--- a/kernel/arch/arm64/boot/dts/lg/lg1312-ref.dts
+++ b/kernel/arch/arm64/boot/dts/lg/lg1312-ref.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for lg1312 Reference Board.
  *
diff --git a/kernel/arch/arm64/boot/dts/lg/lg1312.dtsi b/kernel/arch/arm64/boot/dts/lg/lg1312.dtsi
index fbafa24cd..860c8fb10 100644
--- a/kernel/arch/arm64/boot/dts/lg/lg1312.dtsi
+++ b/kernel/arch/arm64/boot/dts/lg/lg1312.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for lg1312 SoC
  *
diff --git a/kernel/arch/arm64/boot/dts/lg/lg1313-ref.dts b/kernel/arch/arm64/boot/dts/lg/lg1313-ref.dts
index df0ece43c..e89ae8537 100644
--- a/kernel/arch/arm64/boot/dts/lg/lg1313-ref.dts
+++ b/kernel/arch/arm64/boot/dts/lg/lg1313-ref.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for lg1313 Reference Board.
  *
diff --git a/kernel/arch/arm64/boot/dts/lg/lg1313.dtsi b/kernel/arch/arm64/boot/dts/lg/lg1313.dtsi
index e703e1149..1887af654 100644
--- a/kernel/arch/arm64/boot/dts/lg/lg1313.dtsi
+++ b/kernel/arch/arm64/boot/dts/lg/lg1313.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dts file for lg1313 SoC
  *
diff --git a/kernel/arch/arm64/boot/dts/marvell/Makefile b/kernel/arch/arm64/boot/dts/marvell/Makefile
index 6cff81eea..5633676fa 100644
--- a/kernel/arch/arm64/boot/dts/marvell/Makefile
+++ b/kernel/arch/arm64/boot/dts/marvell/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Berlin SoC Family
 dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-dmp.dtb
 dtb-$(CONFIG_ARCH_BERLIN) += berlin4ct-stb.dtb
diff --git a/kernel/arch/arm64/boot/dts/mediatek/Makefile b/kernel/arch/arm64/boot/dts/mediatek/Makefile
index 151723b5c..1d05d1824 100644
--- a/kernel/arch/arm64/boot/dts/mediatek/Makefile
+++ b/kernel/arch/arm64/boot/dts/mediatek/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt2712-evb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt6755-evb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt6795-evb.dtb
diff --git a/kernel/arch/arm64/boot/dts/nvidia/Makefile b/kernel/arch/arm64/boot/dts/nvidia/Makefile
index 18941458c..6bc0c6ab4 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/Makefile
+++ b/kernel/arch/arm64/boot/dts/nvidia/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_TEGRA_132_SOC) += tegra132-norrin.dtb
 dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-0000.dtb
 dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2371-2180.dtb
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/kernel/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
index 759af96a6..a0385a386 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra132.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra132.dtsi
index c2f0f2743..fa5a7c4bc 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra132.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra132.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra124-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/memory/tegra124-mc.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/kernel/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 8daadadec..c71d762bf 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/linux-event-codes.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
index cf84d7046..54f418d05 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tegra186.dtsi"
 
 #include <dt-bindings/mfd/max77620.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra186.dtsi
index 0b0552c9f..a9c3eef6c 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra186.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra186.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra186-clock.h>
 #include <dt-bindings/gpio/tegra186-gpio.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
index 906fb836d..d10d44305 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/mfd/max77620.h>
 
 #include "tegra210.dtsi"
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts
index 1ddd8512e..21c6d3749 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra210-p2530.dtsi"
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
index 7cb95e042..37e3c46e7 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "tegra210-p2180.dtsi"
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
index 0ec92578c..be6066ff9 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tegra210.dtsi"
 
 / {
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2571.dts b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2571.dts
index 576957a55..e2a347e57 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2571.dts
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2571.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi
index e008e3364..6ae292da7 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	model = "NVIDIA Tegra210 P2595 I/O board";
 	compatible = "nvidia,p2595", "nvidia,tegra210";
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index e5fc67bf4..d67ef4319 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/input/input.h>
 
 / {
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/kernel/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
index 7703227f5..43cae4798 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/input/input.h>
diff --git a/kernel/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/kernel/arch/arm64/boot/dts/nvidia/tegra210.dtsi
index 29f471e0f..9bdf19f2c 100644
--- a/kernel/arch/arm64/boot/dts/nvidia/tegra210.dtsi
+++ b/kernel/arch/arm64/boot/dts/nvidia/tegra210.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/tegra210-car.h>
 #include <dt-bindings/gpio/tegra-gpio.h>
 #include <dt-bindings/memory/tegra210-mc.h>
diff --git a/kernel/arch/arm64/boot/dts/qcom/Makefile b/kernel/arch/arm64/boot/dts/qcom/Makefile
index ff81d7e58..e7b25bee3 100644
--- a/kernel/arch/arm64/boot/dts/qcom/Makefile
+++ b/kernel/arch/arm64/boot/dts/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb
diff --git a/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
index 790b7775b..ec2f0de67 100644
--- a/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 #include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
 
diff --git a/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
index 185388de9..21d0822f1 100644
--- a/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <dt-bindings/gpio/gpio.h>
 
diff --git a/kernel/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi b/kernel/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
index 8e3797825..59b29ddfb 100644
--- a/kernel/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 &pm8994_gpios {
diff --git a/kernel/arch/arm64/boot/dts/qcom/pm8004.dtsi b/kernel/arch/arm64/boot/dts/qcom/pm8004.dtsi
index ef2207afa..297b57bfa 100644
--- a/kernel/arch/arm64/boot/dts/qcom/pm8004.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/pm8004.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
diff --git a/kernel/arch/arm64/boot/dts/qcom/pm8916.dtsi b/kernel/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 53deebf9f..0223e60d8 100644
--- a/kernel/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/iio/qcom,spmi-vadc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
diff --git a/kernel/arch/arm64/boot/dts/qcom/pm8994.dtsi b/kernel/arch/arm64/boot/dts/qcom/pm8994.dtsi
index b413e44fd..80024c0b1 100644
--- a/kernel/arch/arm64/boot/dts/qcom/pm8994.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/pm8994.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
diff --git a/kernel/arch/arm64/boot/dts/qcom/pmi8994.dtsi b/kernel/arch/arm64/boot/dts/qcom/pmi8994.dtsi
index 57673f928..dae1cdc23 100644
--- a/kernel/arch/arm64/boot/dts/qcom/pmi8994.dtsi
+++ b/kernel/arch/arm64/boot/dts/qcom/pmi8994.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/spmi/spmi.h>
 
diff --git a/kernel/arch/arm64/boot/dts/renesas/Makefile b/kernel/arch/arm64/boot/dts/renesas/Makefile
index 381928bc1..d41770164 100644
--- a/kernel/arch/arm64/boot/dts/renesas/Makefile
+++ b/kernel/arch/arm64/boot/dts/renesas/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
diff --git a/kernel/arch/arm64/boot/dts/rockchip/Makefile b/kernel/arch/arm64/boot/dts/rockchip/Makefile
index f1c9b13ce..84801892e 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/Makefile
+++ b/kernel/arch/arm64/boot/dts/rockchip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
diff --git a/kernel/arch/arm64/boot/dts/socionext/Makefile b/kernel/arch/arm64/boot/dts/socionext/Makefile
index 4bc091b36..72dbe8acd 100644
--- a/kernel/arch/arm64/boot/dts/socionext/Makefile
+++ b/kernel/arch/arm64/boot/dts/socionext/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_UNIPHIER) += \
 	uniphier-ld11-global.dtb \
 	uniphier-ld11-ref.dtb \
diff --git a/kernel/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/kernel/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index ee4aff53a..09c429cb6 100644
--- a/kernel/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/kernel/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -299,7 +299,8 @@
 			interrupts = <0 243 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb0>;
-			clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 8>,
+				 <&mio_clk 12>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
 				 <&mio_rst 12>;
 		};
@@ -311,7 +312,8 @@
 			interrupts = <0 244 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb1>;
-			clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 9>,
+				 <&mio_clk 13>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
 				 <&mio_rst 13>;
 		};
@@ -323,7 +325,8 @@
 			interrupts = <0 245 4>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&pinctrl_usb2>;
-			clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
+			clocks = <&sys_clk 8>, <&mio_clk 7>, <&mio_clk 10>,
+				 <&mio_clk 14>;
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
 				 <&mio_rst 14>;
 		};
diff --git a/kernel/arch/arm64/boot/dts/sprd/Makefile b/kernel/arch/arm64/boot/dts/sprd/Makefile
index f0535e6ea..d7188be10 100644
--- a/kernel/arch/arm64/boot/dts/sprd/Makefile
+++ b/kernel/arch/arm64/boot/dts/sprd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_ARCH_SPRD) += sc9836-openphone.dtb \
 			sp9860g-1h10.dtb
 
diff --git a/kernel/arch/arm64/crypto/Kconfig b/kernel/arch/arm64/crypto/Kconfig
index 7ca54a76f..70c517aa4 100644
--- a/kernel/arch/arm64/crypto/Kconfig
+++ b/kernel/arch/arm64/crypto/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 menuconfig ARM64_CRYPTO
 	bool "ARM64 Accelerated Cryptographic Algorithms"
diff --git a/kernel/arch/arm64/crypto/aes-ce-setkey.h b/kernel/arch/arm64/crypto/aes-ce-setkey.h
index f08a6471d..fd9ecf07d 100644
--- a/kernel/arch/arm64/crypto/aes-ce-setkey.h
+++ b/kernel/arch/arm64/crypto/aes-ce-setkey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 int ce_aes_setkey(struct crypto_tfm *tfm, const u8 *in_key,
 		  unsigned int key_len);
diff --git a/kernel/arch/arm64/include/asm/alternative.h b/kernel/arch/arm64/include/asm/alternative.h
index 6e1cb8c5a..4a85c6952 100644
--- a/kernel/arch/arm64/include/asm/alternative.h
+++ b/kernel/arch/arm64/include/asm/alternative.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ALTERNATIVE_H
 #define __ASM_ALTERNATIVE_H
 
diff --git a/kernel/arch/arm64/include/asm/asm-uaccess.h b/kernel/arch/arm64/include/asm/asm-uaccess.h
index ecd9788cd..b3da6c886 100644
--- a/kernel/arch/arm64/include/asm/asm-uaccess.h
+++ b/kernel/arch/arm64/include/asm/asm-uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ASM_UACCESS_H
 #define __ASM_ASM_UACCESS_H
 
diff --git a/kernel/arch/arm64/include/asm/bitrev.h b/kernel/arch/arm64/include/asm/bitrev.h
index a5a0c3660..6faf9fba8 100644
--- a/kernel/arch/arm64/include/asm/bitrev.h
+++ b/kernel/arch/arm64/include/asm/bitrev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_BITREV_H
 #define __ASM_BITREV_H
 static __always_inline __attribute_const__ u32 __arch_bitrev32(u32 x)
diff --git a/kernel/arch/arm64/include/asm/boot.h b/kernel/arch/arm64/include/asm/boot.h
index ebf248188..355e552a9 100644
--- a/kernel/arch/arm64/include/asm/boot.h
+++ b/kernel/arch/arm64/include/asm/boot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __ASM_BOOT_H
 #define __ASM_BOOT_H
diff --git a/kernel/arch/arm64/include/asm/clocksource.h b/kernel/arch/arm64/include/asm/clocksource.h
index 0b350a7e2..0ece64a26 100644
--- a/kernel/arch/arm64/include/asm/clocksource.h
+++ b/kernel/arch/arm64/include/asm/clocksource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CLOCKSOURCE_H
 #define _ASM_CLOCKSOURCE_H
 
diff --git a/kernel/arch/arm64/include/asm/cpuidle.h b/kernel/arch/arm64/include/asm/cpuidle.h
index 0f74f05d6..3c5ddb429 100644
--- a/kernel/arch/arm64/include/asm/cpuidle.h
+++ b/kernel/arch/arm64/include/asm/cpuidle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPUIDLE_H
 #define __ASM_CPUIDLE_H
 
diff --git a/kernel/arch/arm64/include/asm/current.h b/kernel/arch/arm64/include/asm/current.h
index f6580d4af..54ceae087 100644
--- a/kernel/arch/arm64/include/asm/current.h
+++ b/kernel/arch/arm64/include/asm/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CURRENT_H
 #define __ASM_CURRENT_H
 
diff --git a/kernel/arch/arm64/include/asm/efi.h b/kernel/arch/arm64/include/asm/efi.h
index b93904b16..650344d01 100644
--- a/kernel/arch/arm64/include/asm/efi.h
+++ b/kernel/arch/arm64/include/asm/efi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_EFI_H
 #define _ASM_EFI_H
 
diff --git a/kernel/arch/arm64/include/asm/extable.h b/kernel/arch/arm64/include/asm/extable.h
index 42f50f15a..56a4f68b2 100644
--- a/kernel/arch/arm64/include/asm/extable.h
+++ b/kernel/arch/arm64/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_EXTABLE_H
 #define __ASM_EXTABLE_H
 
diff --git a/kernel/arch/arm64/include/asm/hypervisor.h b/kernel/arch/arm64/include/asm/hypervisor.h
index d2c79049f..f9cc1d021 100644
--- a/kernel/arch/arm64/include/asm/hypervisor.h
+++ b/kernel/arch/arm64/include/asm/hypervisor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM64_HYPERVISOR_H
 #define _ASM_ARM64_HYPERVISOR_H
 
diff --git a/kernel/arch/arm64/include/asm/irq.h b/kernel/arch/arm64/include/asm/irq.h
index 5e6f77239..a0fee6985 100644
--- a/kernel/arch/arm64/include/asm/irq.h
+++ b/kernel/arch/arm64/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IRQ_H
 #define __ASM_IRQ_H
 
diff --git a/kernel/arch/arm64/include/asm/irq_work.h b/kernel/arch/arm64/include/asm/irq_work.h
index 8e24ef3f7..8a1ef1907 100644
--- a/kernel/arch/arm64/include/asm/irq_work.h
+++ b/kernel/arch/arm64/include/asm/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IRQ_WORK_H
 #define __ASM_IRQ_WORK_H
 
diff --git a/kernel/arch/arm64/include/asm/kasan.h b/kernel/arch/arm64/include/asm/kasan.h
index 71ad0f93e..e266f80e4 100644
--- a/kernel/arch/arm64/include/asm/kasan.h
+++ b/kernel/arch/arm64/include/asm/kasan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_KASAN_H
 #define __ASM_KASAN_H
 
diff --git a/kernel/arch/arm64/include/asm/lse.h b/kernel/arch/arm64/include/asm/lse.h
index 606b20910..eec95768e 100644
--- a/kernel/arch/arm64/include/asm/lse.h
+++ b/kernel/arch/arm64/include/asm/lse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LSE_H
 #define __ASM_LSE_H
 
diff --git a/kernel/arch/arm64/include/asm/mmzone.h b/kernel/arch/arm64/include/asm/mmzone.h
index a0de9e6ba..fa17e01d9 100644
--- a/kernel/arch/arm64/include/asm/mmzone.h
+++ b/kernel/arch/arm64/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MMZONE_H
 #define __ASM_MMZONE_H
 
diff --git a/kernel/arch/arm64/include/asm/numa.h b/kernel/arch/arm64/include/asm/numa.h
index ef7b23863..01bc46d5b 100644
--- a/kernel/arch/arm64/include/asm/numa.h
+++ b/kernel/arch/arm64/include/asm/numa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_NUMA_H
 #define __ASM_NUMA_H
 
diff --git a/kernel/arch/arm64/include/asm/paravirt.h b/kernel/arch/arm64/include/asm/paravirt.h
index fd5f42886..bb5dcea42 100644
--- a/kernel/arch/arm64/include/asm/paravirt.h
+++ b/kernel/arch/arm64/include/asm/paravirt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM64_PARAVIRT_H
 #define _ASM_ARM64_PARAVIRT_H
 
diff --git a/kernel/arch/arm64/include/asm/pci.h b/kernel/arch/arm64/include/asm/pci.h
index 1fc19744f..8747f7c5e 100644
--- a/kernel/arch/arm64/include/asm/pci.h
+++ b/kernel/arch/arm64/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PCI_H
 #define __ASM_PCI_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/arm64/include/asm/stack_pointer.h b/kernel/arch/arm64/include/asm/stack_pointer.h
index ffcdf742c..8e57c96ad 100644
--- a/kernel/arch/arm64/include/asm/stack_pointer.h
+++ b/kernel/arch/arm64/include/asm/stack_pointer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_STACK_POINTER_H
 #define __ASM_STACK_POINTER_H
 
diff --git a/kernel/arch/arm64/include/asm/stackprotector.h b/kernel/arch/arm64/include/asm/stackprotector.h
index b86a0865d..58d15be11 100644
--- a/kernel/arch/arm64/include/asm/stackprotector.h
+++ b/kernel/arch/arm64/include/asm/stackprotector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * GCC stack protector support.
  *
diff --git a/kernel/arch/arm64/include/asm/suspend.h b/kernel/arch/arm64/include/asm/suspend.h
index de5600f40..8939c87c4 100644
--- a/kernel/arch/arm64/include/asm/suspend.h
+++ b/kernel/arch/arm64/include/asm/suspend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SUSPEND_H
 #define __ASM_SUSPEND_H
 
diff --git a/kernel/arch/arm64/include/asm/sync_bitops.h b/kernel/arch/arm64/include/asm/sync_bitops.h
index 8da0bf4f7..eee31a9f7 100644
--- a/kernel/arch/arm64/include/asm/sync_bitops.h
+++ b/kernel/arch/arm64/include/asm/sync_bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SYNC_BITOPS_H__
 #define __ASM_SYNC_BITOPS_H__
 
diff --git a/kernel/arch/arm64/include/asm/topology.h b/kernel/arch/arm64/include/asm/topology.h
index 8b5733982..b32022845 100644
--- a/kernel/arch/arm64/include/asm/topology.h
+++ b/kernel/arch/arm64/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TOPOLOGY_H
 #define __ASM_TOPOLOGY_H
 
diff --git a/kernel/arch/arm64/include/asm/xen/events.h b/kernel/arch/arm64/include/asm/xen/events.h
index 4318866d0..4e22b7a8c 100644
--- a/kernel/arch/arm64/include/asm/xen/events.h
+++ b/kernel/arch/arm64/include/asm/xen/events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM64_XEN_EVENTS_H
 #define _ASM_ARM64_XEN_EVENTS_H
 
diff --git a/kernel/arch/arm64/include/asm/xen/xen-ops.h b/kernel/arch/arm64/include/asm/xen/xen-ops.h
index ec154e719..e6e784051 100644
--- a/kernel/arch/arm64/include/asm/xen/xen-ops.h
+++ b/kernel/arch/arm64/include/asm/xen/xen-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_XEN_OPS_H
 #define _ASM_XEN_OPS_H
 
diff --git a/kernel/arch/arm64/include/uapi/asm/Kbuild b/kernel/arch/arm64/include/uapi/asm/Kbuild
index fc28bd95c..198afbf06 100644
--- a/kernel/arch/arm64/include/uapi/asm/Kbuild
+++ b/kernel/arch/arm64/include/uapi/asm/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
diff --git a/kernel/arch/arm64/include/uapi/asm/auxvec.h b/kernel/arch/arm64/include/uapi/asm/auxvec.h
index 4cf0c1778..ec0a86d48 100644
--- a/kernel/arch/arm64/include/uapi/asm/auxvec.h
+++ b/kernel/arch/arm64/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/bitsperlong.h b/kernel/arch/arm64/include/uapi/asm/bitsperlong.h
index fce9c2924..485d60bee 100644
--- a/kernel/arch/arm64/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/arm64/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/byteorder.h b/kernel/arch/arm64/include/uapi/asm/byteorder.h
index dc19e9537..ca9cfdab3 100644
--- a/kernel/arch/arm64/include/uapi/asm/byteorder.h
+++ b/kernel/arch/arm64/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/fcntl.h b/kernel/arch/arm64/include/uapi/asm/fcntl.h
index cd2e630c2..f8db34f26 100644
--- a/kernel/arch/arm64/include/uapi/asm/fcntl.h
+++ b/kernel/arch/arm64/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/hwcap.h b/kernel/arch/arm64/include/uapi/asm/hwcap.h
index 4b9344cba..b3fdeee73 100644
--- a/kernel/arch/arm64/include/uapi/asm/hwcap.h
+++ b/kernel/arch/arm64/include/uapi/asm/hwcap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/kvm.h b/kernel/arch/arm64/include/uapi/asm/kvm.h
index 9f3ca24bb..51149ec75 100644
--- a/kernel/arch/arm64/include/uapi/asm/kvm.h
+++ b/kernel/arch/arm64/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012,2013 - ARM Ltd
  * Author: Marc Zyngier <marc.zyngier@arm.com>
diff --git a/kernel/arch/arm64/include/uapi/asm/param.h b/kernel/arch/arm64/include/uapi/asm/param.h
index 8e3a281d4..b115c5557 100644
--- a/kernel/arch/arm64/include/uapi/asm/param.h
+++ b/kernel/arch/arm64/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/perf_regs.h b/kernel/arch/arm64/include/uapi/asm/perf_regs.h
index 172b8317e..d54daafa8 100644
--- a/kernel/arch/arm64/include/uapi/asm/perf_regs.h
+++ b/kernel/arch/arm64/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ARM64_PERF_REGS_H
 #define _ASM_ARM64_PERF_REGS_H
 
diff --git a/kernel/arch/arm64/include/uapi/asm/posix_types.h b/kernel/arch/arm64/include/uapi/asm/posix_types.h
index 7985ff60c..b1c2e0df9 100644
--- a/kernel/arch/arm64/include/uapi/asm/posix_types.h
+++ b/kernel/arch/arm64/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_POSIX_TYPES_H
 #define __ASM_POSIX_TYPES_H
 
diff --git a/kernel/arch/arm64/include/uapi/asm/ptrace.h b/kernel/arch/arm64/include/uapi/asm/ptrace.h
index d1ff83dfe..67d4c3397 100644
--- a/kernel/arch/arm64/include/uapi/asm/ptrace.h
+++ b/kernel/arch/arm64/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Based on arch/arm/include/asm/ptrace.h
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/setup.h b/kernel/arch/arm64/include/uapi/asm/setup.h
index 9cf2e46fb..5d703888f 100644
--- a/kernel/arch/arm64/include/uapi/asm/setup.h
+++ b/kernel/arch/arm64/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Based on arch/arm/include/asm/setup.h
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/sigcontext.h b/kernel/arch/arm64/include/uapi/asm/sigcontext.h
index f0a76b9fc..f6cc3061b 100644
--- a/kernel/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/arm64/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/siginfo.h b/kernel/arch/arm64/include/uapi/asm/siginfo.h
index 5a74a0853..574d12f86 100644
--- a/kernel/arch/arm64/include/uapi/asm/siginfo.h
+++ b/kernel/arch/arm64/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/signal.h b/kernel/arch/arm64/include/uapi/asm/signal.h
index 991bf5db2..bdf0cfb04 100644
--- a/kernel/arch/arm64/include/uapi/asm/signal.h
+++ b/kernel/arch/arm64/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/stat.h b/kernel/arch/arm64/include/uapi/asm/stat.h
index eeb702e50..313325fa2 100644
--- a/kernel/arch/arm64/include/uapi/asm/stat.h
+++ b/kernel/arch/arm64/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/statfs.h b/kernel/arch/arm64/include/uapi/asm/statfs.h
index 6f6219050..615357b6b 100644
--- a/kernel/arch/arm64/include/uapi/asm/statfs.h
+++ b/kernel/arch/arm64/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/ucontext.h b/kernel/arch/arm64/include/uapi/asm/ucontext.h
index 791de8e89..ee02721a7 100644
--- a/kernel/arch/arm64/include/uapi/asm/ucontext.h
+++ b/kernel/arch/arm64/include/uapi/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/include/uapi/asm/unistd.h b/kernel/arch/arm64/include/uapi/asm/unistd.h
index 043d17a21..5072cbd15 100644
--- a/kernel/arch/arm64/include/uapi/asm/unistd.h
+++ b/kernel/arch/arm64/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/arch/arm64/kernel/Makefile b/kernel/arch/arm64/kernel/Makefile
index f2b4e816b..0029e13ad 100644
--- a/kernel/arch/arm64/kernel/Makefile
+++ b/kernel/arch/arm64/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/arm64/kernel/acpi_numa.c b/kernel/arch/arm64/kernel/acpi_numa.c
index f01fab637..d190a7b23 100644
--- a/kernel/arch/arm64/kernel/acpi_numa.c
+++ b/kernel/arch/arm64/kernel/acpi_numa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ACPI 5.1 based NUMA setup for ARM64
  * Lots of code was borrowed from arch/x86/mm/srat.c
diff --git a/kernel/arch/arm64/kernel/perf_regs.c b/kernel/arch/arm64/kernel/perf_regs.c
index bd1b74c24..1d091d048 100644
--- a/kernel/arch/arm64/kernel/perf_regs.c
+++ b/kernel/arch/arm64/kernel/perf_regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/perf_event.h>
diff --git a/kernel/arch/arm64/kernel/probes/Makefile b/kernel/arch/arm64/kernel/probes/Makefile
index 89b6df613..8e4be92e2 100644
--- a/kernel/arch/arm64/kernel/probes/Makefile
+++ b/kernel/arch/arm64/kernel/probes/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_KPROBES)		+= kprobes.o decode-insn.o	\
 				   kprobes_trampoline.o		\
 				   simulate-insn.o
diff --git a/kernel/arch/arm64/kernel/probes/kprobes_trampoline.S b/kernel/arch/arm64/kernel/probes/kprobes_trampoline.S
index 5d6e7f146..45dce03aa 100644
--- a/kernel/arch/arm64/kernel/probes/kprobes_trampoline.S
+++ b/kernel/arch/arm64/kernel/probes/kprobes_trampoline.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * trampoline entry and return code for kretprobes.
  */
diff --git a/kernel/arch/arm64/kernel/sleep.S b/kernel/arch/arm64/kernel/sleep.S
index df67652e4..10dd16d79 100644
--- a/kernel/arch/arm64/kernel/sleep.S
+++ b/kernel/arch/arm64/kernel/sleep.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/errno.h>
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
diff --git a/kernel/arch/arm64/kernel/suspend.c b/kernel/arch/arm64/kernel/suspend.c
index 1e3be9064..77cd655e6 100644
--- a/kernel/arch/arm64/kernel/suspend.c
+++ b/kernel/arch/arm64/kernel/suspend.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ftrace.h>
 #include <linux/percpu.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/arm64/kernel/trace-events-emulation.h b/kernel/arch/arm64/kernel/trace-events-emulation.h
index ae1dd598e..6c40f58b8 100644
--- a/kernel/arch/arm64/kernel/trace-events-emulation.h
+++ b/kernel/arch/arm64/kernel/trace-events-emulation.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM emulation
 
diff --git a/kernel/arch/arm64/kernel/traps.c b/kernel/arch/arm64/kernel/traps.c
index 5ea4b85ae..8383af15a 100644
--- a/kernel/arch/arm64/kernel/traps.c
+++ b/kernel/arch/arm64/kernel/traps.c
@@ -118,7 +118,7 @@ static void __dump_instr(const char *lvl, struct pt_regs *regs)
 	for (i = -4; i < 1; i++) {
 		unsigned int val, bad;
 
-		bad = __get_user(val, &((u32 *)addr)[i]);
+		bad = get_user(val, &((u32 *)addr)[i]);
 
 		if (!bad)
 			p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val);
diff --git a/kernel/arch/arm64/kernel/vdso/Makefile b/kernel/arch/arm64/kernel/vdso/Makefile
index 62c84f7cb..b215c712d 100644
--- a/kernel/arch/arm64/kernel/vdso/Makefile
+++ b/kernel/arch/arm64/kernel/vdso/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Building a vDSO image for AArch64.
 #
diff --git a/kernel/arch/arm64/kernel/vdso/gen_vdso_offsets.sh b/kernel/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
index 01924ff07..0664acaf6 100755
--- a/kernel/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
+++ b/kernel/arch/arm64/kernel/vdso/gen_vdso_offsets.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 #
 # Match symbols in the DSO that look like VDSO_*; produce a header file
diff --git a/kernel/arch/arm64/kernel/vmlinux.lds.S b/kernel/arch/arm64/kernel/vmlinux.lds.S
index fe56c268a..7da3e5c36 100644
--- a/kernel/arch/arm64/kernel/vmlinux.lds.S
+++ b/kernel/arch/arm64/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ld script to make ARM Linux kernel
  * taken from the i386 version by Russell King
diff --git a/kernel/arch/arm64/kvm/Kconfig b/kernel/arch/arm64/kvm/Kconfig
index 52cb7ad9b..13f81f971 100644
--- a/kernel/arch/arm64/kvm/Kconfig
+++ b/kernel/arch/arm64/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/arm64/kvm/Makefile b/kernel/arch/arm64/kvm/Makefile
index 5d9810086..861acbbac 100644
--- a/kernel/arch/arm64/kvm/Makefile
+++ b/kernel/arch/arm64/kvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Kernel-based Virtual Machine module
 #
diff --git a/kernel/arch/arm64/kvm/hyp/Makefile b/kernel/arch/arm64/kvm/hyp/Makefile
index 14c4e3b14..f04400d49 100644
--- a/kernel/arch/arm64/kvm/hyp/Makefile
+++ b/kernel/arch/arm64/kvm/hyp/Makefile
@@ -1,8 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Kernel-based Virtual Machine module, HYP part
 #
 
-ccflags-y += -fno-stack-protector
+ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING
 
 KVM=../../../../virt/kvm
 
diff --git a/kernel/arch/arm64/kvm/inject_fault.c b/kernel/arch/arm64/kvm/inject_fault.c
index da6a8cfa5..3556715a7 100644
--- a/kernel/arch/arm64/kvm/inject_fault.c
+++ b/kernel/arch/arm64/kvm/inject_fault.c
@@ -33,12 +33,26 @@
 #define LOWER_EL_AArch64_VECTOR		0x400
 #define LOWER_EL_AArch32_VECTOR		0x600
 
+/*
+ * Table taken from ARMv8 ARM DDI0487B-B, table G1-10.
+ */
+static const u8 return_offsets[8][2] = {
+	[0] = { 0, 0 },		/* Reset, unused */
+	[1] = { 4, 2 },		/* Undefined */
+	[2] = { 0, 0 },		/* SVC, unused */
+	[3] = { 4, 4 },		/* Prefetch abort */
+	[4] = { 8, 8 },		/* Data abort */
+	[5] = { 0, 0 },		/* HVC, unused */
+	[6] = { 4, 4 },		/* IRQ, unused */
+	[7] = { 4, 4 },		/* FIQ, unused */
+};
+
 static void prepare_fault32(struct kvm_vcpu *vcpu, u32 mode, u32 vect_offset)
 {
 	unsigned long cpsr;
 	unsigned long new_spsr_value = *vcpu_cpsr(vcpu);
 	bool is_thumb = (new_spsr_value & COMPAT_PSR_T_BIT);
-	u32 return_offset = (is_thumb) ? 4 : 0;
+	u32 return_offset = return_offsets[vect_offset >> 2][is_thumb];
 	u32 sctlr = vcpu_cp15(vcpu, c1_SCTLR);
 
 	cpsr = mode | COMPAT_PSR_I_BIT;
diff --git a/kernel/arch/arm64/kvm/trace.h b/kernel/arch/arm64/kvm/trace.h
index 5188c7007..3b82fb1dd 100644
--- a/kernel/arch/arm64/kvm/trace.h
+++ b/kernel/arch/arm64/kvm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_ARM64_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_ARM64_KVM_H
 
diff --git a/kernel/arch/arm64/lib/Makefile b/kernel/arch/arm64/lib/Makefile
index a0abc142c..9a8cb9655 100644
--- a/kernel/arch/arm64/lib/Makefile
+++ b/kernel/arch/arm64/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 lib-y		:= bitops.o clear_user.o delay.o copy_from_user.o	\
 		   copy_to_user.o copy_in_user.o copy_page.o		\
 		   clear_page.o memchr.o memcpy.o memmove.o memset.o	\
diff --git a/kernel/arch/arm64/mm/Makefile b/kernel/arch/arm64/mm/Makefile
index 9b0ba191e..849c1df3d 100644
--- a/kernel/arch/arm64/mm/Makefile
+++ b/kernel/arch/arm64/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				:= dma-mapping.o extable.o fault.o init.o \
 				   cache.o copypage.o flush.o \
 				   ioremap.o mmap.o pgd.o mmu.o \
diff --git a/kernel/arch/arm64/mm/extable.c b/kernel/arch/arm64/mm/extable.c
index c9f118cd8..81e694af5 100644
--- a/kernel/arch/arm64/mm/extable.c
+++ b/kernel/arch/arm64/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Based on arch/arm/mm/extable.c
  */
diff --git a/kernel/arch/arm64/mm/physaddr.c b/kernel/arch/arm64/mm/physaddr.c
index 91371daf3..67a9ba9ea 100644
--- a/kernel/arch/arm64/mm/physaddr.c
+++ b/kernel/arch/arm64/mm/physaddr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/export.h>
 #include <linux/types.h>
diff --git a/kernel/arch/arm64/mm/ptdump_debugfs.c b/kernel/arch/arm64/mm/ptdump_debugfs.c
index eee4d8643..02b18f8b2 100644
--- a/kernel/arch/arm64/mm/ptdump_debugfs.c
+++ b/kernel/arch/arm64/mm/ptdump_debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
diff --git a/kernel/arch/blackfin/Kconfig b/kernel/arch/blackfin/Kconfig
index 89bdb8264..af5369422 100644
--- a/kernel/arch/blackfin/Kconfig
+++ b/kernel/arch/blackfin/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MMU
 	def_bool n
 
diff --git a/kernel/arch/blackfin/Kconfig.debug b/kernel/arch/blackfin/Kconfig.debug
index f3337ee03..4ddd1b73e 100644
--- a/kernel/arch/blackfin/Kconfig.debug
+++ b/kernel/arch/blackfin/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/blackfin/include/asm/clkdev.h b/kernel/arch/blackfin/include/asm/clkdev.h
index 7ac243685..ded020934 100644
--- a/kernel/arch/blackfin/include/asm/clkdev.h
+++ b/kernel/arch/blackfin/include/asm/clkdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CLKDEV__H_
 #define __ASM_CLKDEV__H_
 
diff --git a/kernel/arch/blackfin/include/asm/pci.h b/kernel/arch/blackfin/include/asm/pci.h
index 11ea1cb35..e6458ddba 100644
--- a/kernel/arch/blackfin/include/asm/pci.h
+++ b/kernel/arch/blackfin/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Changed from asm-m68k version, Lineo Inc. 	May 2001	*/
 
 #ifndef _ASM_BFIN_PCI_H
diff --git a/kernel/arch/blackfin/include/asm/rwlock.h b/kernel/arch/blackfin/include/asm/rwlock.h
index 4a724b378..98ebc07cb 100644
--- a/kernel/arch/blackfin/include/asm/rwlock.h
+++ b/kernel/arch/blackfin/include/asm/rwlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_BLACKFIN_RWLOCK_H
 #define _ASM_BLACKFIN_RWLOCK_H
 
diff --git a/kernel/arch/blackfin/include/mach-common/ports-a.h b/kernel/arch/blackfin/include/mach-common/ports-a.h
index 9f78a761c..71bcd74f8 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-a.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-a.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port A Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-b.h b/kernel/arch/blackfin/include/mach-common/ports-b.h
index b81702f09..8013cc8e8 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-b.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-b.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port B Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-c.h b/kernel/arch/blackfin/include/mach-common/ports-c.h
index 3cc665e0b..94e71010f 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-c.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port C Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-d.h b/kernel/arch/blackfin/include/mach-common/ports-d.h
index 868c6a01f..ba84a9fb3 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-d.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port D Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-e.h b/kernel/arch/blackfin/include/mach-common/ports-e.h
index c88b0d0dd..2264fb58b 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-e.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port E Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-f.h b/kernel/arch/blackfin/include/mach-common/ports-f.h
index d6af20633..2b8ca3ae2 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-f.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-f.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port F Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-g.h b/kernel/arch/blackfin/include/mach-common/ports-g.h
index 09355d333..11ad917fc 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-g.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-g.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port G Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-h.h b/kernel/arch/blackfin/include/mach-common/ports-h.h
index fa3910c6f..511d088b8 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-h.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-h.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port H Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-i.h b/kernel/arch/blackfin/include/mach-common/ports-i.h
index f176f08af..21bbab166 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-i.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port I Masks
  */
diff --git a/kernel/arch/blackfin/include/mach-common/ports-j.h b/kernel/arch/blackfin/include/mach-common/ports-j.h
index 924123ece..96a252b0b 100644
--- a/kernel/arch/blackfin/include/mach-common/ports-j.h
+++ b/kernel/arch/blackfin/include/mach-common/ports-j.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Port J Masks
  */
diff --git a/kernel/arch/blackfin/include/uapi/asm/bfin_sport.h b/kernel/arch/blackfin/include/uapi/asm/bfin_sport.h
index c086de87e..86c36a208 100644
--- a/kernel/arch/blackfin/include/uapi/asm/bfin_sport.h
+++ b/kernel/arch/blackfin/include/uapi/asm/bfin_sport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * bfin_sport.h - interface to Blackfin SPORTs
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/byteorder.h b/kernel/arch/blackfin/include/uapi/asm/byteorder.h
index 3b125da5d..bcab6670c 100644
--- a/kernel/arch/blackfin/include/uapi/asm/byteorder.h
+++ b/kernel/arch/blackfin/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__BFIN_ASM_BYTEORDER_H
 #define _UAPI__BFIN_ASM_BYTEORDER_H
 
diff --git a/kernel/arch/blackfin/include/uapi/asm/cachectl.h b/kernel/arch/blackfin/include/uapi/asm/cachectl.h
index 4fdab75de..b5c86fbbc 100644
--- a/kernel/arch/blackfin/include/uapi/asm/cachectl.h
+++ b/kernel/arch/blackfin/include/uapi/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * based on the mips/cachectl.h
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/fcntl.h b/kernel/arch/blackfin/include/uapi/asm/fcntl.h
index f51ad9a4f..0b02954f0 100644
--- a/kernel/arch/blackfin/include/uapi/asm/fcntl.h
+++ b/kernel/arch/blackfin/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2008 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/fixed_code.h b/kernel/arch/blackfin/include/uapi/asm/fixed_code.h
index 3bef1dca3..707b9214b 100644
--- a/kernel/arch/blackfin/include/uapi/asm/fixed_code.h
+++ b/kernel/arch/blackfin/include/uapi/asm/fixed_code.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * This file defines the fixed addresses where userspace programs
  * can find atomic code sequences.
diff --git a/kernel/arch/blackfin/include/uapi/asm/ioctls.h b/kernel/arch/blackfin/include/uapi/asm/ioctls.h
index 9a41c20fc..422fee3e4 100644
--- a/kernel/arch/blackfin/include/uapi/asm/ioctls.h
+++ b/kernel/arch/blackfin/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ARCH_BFIN_IOCTLS_H__
 #define _UAPI__ARCH_BFIN_IOCTLS_H__
 
diff --git a/kernel/arch/blackfin/include/uapi/asm/poll.h b/kernel/arch/blackfin/include/uapi/asm/poll.h
index 99c7d6816..8b094d43e 100644
--- a/kernel/arch/blackfin/include/uapi/asm/poll.h
+++ b/kernel/arch/blackfin/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2009 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/posix_types.h b/kernel/arch/blackfin/include/uapi/asm/posix_types.h
index 9608ef64d..8947c75cf 100644
--- a/kernel/arch/blackfin/include/uapi/asm/posix_types.h
+++ b/kernel/arch/blackfin/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2009 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/ptrace.h b/kernel/arch/blackfin/include/uapi/asm/ptrace.h
index fd48bd073..e4423d556 100644
--- a/kernel/arch/blackfin/include/uapi/asm/ptrace.h
+++ b/kernel/arch/blackfin/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2008 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/sigcontext.h b/kernel/arch/blackfin/include/uapi/asm/sigcontext.h
index b58f12dc2..66b4d32af 100644
--- a/kernel/arch/blackfin/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/blackfin/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2008 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/siginfo.h b/kernel/arch/blackfin/include/uapi/asm/siginfo.h
index 79dfe3979..b1db506c8 100644
--- a/kernel/arch/blackfin/include/uapi/asm/siginfo.h
+++ b/kernel/arch/blackfin/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2008 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/signal.h b/kernel/arch/blackfin/include/uapi/asm/signal.h
index f0a0d8b66..f8e3b99ba 100644
--- a/kernel/arch/blackfin/include/uapi/asm/signal.h
+++ b/kernel/arch/blackfin/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_BLACKFIN_SIGNAL_H
 #define _UAPI_BLACKFIN_SIGNAL_H
 
diff --git a/kernel/arch/blackfin/include/uapi/asm/stat.h b/kernel/arch/blackfin/include/uapi/asm/stat.h
index d3068a750..458959d1a 100644
--- a/kernel/arch/blackfin/include/uapi/asm/stat.h
+++ b/kernel/arch/blackfin/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2004-2006 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/swab.h b/kernel/arch/blackfin/include/uapi/asm/swab.h
index f5626b776..d3437933b 100644
--- a/kernel/arch/blackfin/include/uapi/asm/swab.h
+++ b/kernel/arch/blackfin/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2009 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/include/uapi/asm/unistd.h b/kernel/arch/blackfin/include/uapi/asm/unistd.h
index 0cb9078ef..2d392c093 100644
--- a/kernel/arch/blackfin/include/uapi/asm/unistd.h
+++ b/kernel/arch/blackfin/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2004-2009 Analog Devices Inc.
  *
diff --git a/kernel/arch/blackfin/kernel/Makefile b/kernel/arch/blackfin/kernel/Makefile
index 703dc7cf2..1580791f0 100644
--- a/kernel/arch/blackfin/kernel/Makefile
+++ b/kernel/arch/blackfin/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/kernel/Makefile
 #
diff --git a/kernel/arch/blackfin/kernel/cplb-nompu/Makefile b/kernel/arch/blackfin/kernel/cplb-nompu/Makefile
index 394d0b1b2..81baa27bc 100644
--- a/kernel/arch/blackfin/kernel/cplb-nompu/Makefile
+++ b/kernel/arch/blackfin/kernel/cplb-nompu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/kernel/cplb-nompu/Makefile
 #
diff --git a/kernel/arch/blackfin/lib/Makefile b/kernel/arch/blackfin/lib/Makefile
index 42c47dc9e..74ddde0eb 100644
--- a/kernel/arch/blackfin/lib/Makefile
+++ b/kernel/arch/blackfin/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/lib/Makefile
 #
diff --git a/kernel/arch/blackfin/mach-bf518/Kconfig b/kernel/arch/blackfin/mach-bf518/Kconfig
index bde92a199..4731f6b27 100644
--- a/kernel/arch/blackfin/mach-bf518/Kconfig
+++ b/kernel/arch/blackfin/mach-bf518/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config BF51x
 	def_bool y
 	depends on (BF512 || BF514 || BF516 || BF518)
diff --git a/kernel/arch/blackfin/mach-bf518/boards/Kconfig b/kernel/arch/blackfin/mach-bf518/boards/Kconfig
index 252261ec0..f7b93b950 100644
--- a/kernel/arch/blackfin/mach-bf518/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf518/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN518F_EZBRD
diff --git a/kernel/arch/blackfin/mach-bf527/Kconfig b/kernel/arch/blackfin/mach-bf527/Kconfig
index 0ba54701a..6df20f9c7 100644
--- a/kernel/arch/blackfin/mach-bf527/Kconfig
+++ b/kernel/arch/blackfin/mach-bf527/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config BF52x
 	def_bool y
 	depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
diff --git a/kernel/arch/blackfin/mach-bf527/boards/Kconfig b/kernel/arch/blackfin/mach-bf527/boards/Kconfig
index 1cc2667c1..a76f02fae 100644
--- a/kernel/arch/blackfin/mach-bf527/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf527/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN527_EZKIT
diff --git a/kernel/arch/blackfin/mach-bf527/boards/Makefile b/kernel/arch/blackfin/mach-bf527/boards/Makefile
index 1d67da9f0..6ada1537e 100644
--- a/kernel/arch/blackfin/mach-bf527/boards/Makefile
+++ b/kernel/arch/blackfin/mach-bf527/boards/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/mach-bf527/boards/Makefile
 #
diff --git a/kernel/arch/blackfin/mach-bf533/Kconfig b/kernel/arch/blackfin/mach-bf533/Kconfig
index 4c5724431..4e1a05be7 100644
--- a/kernel/arch/blackfin/mach-bf533/Kconfig
+++ b/kernel/arch/blackfin/mach-bf533/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if (BF533 || BF532 || BF531)
 
 source "arch/blackfin/mach-bf533/boards/Kconfig"
diff --git a/kernel/arch/blackfin/mach-bf533/boards/Kconfig b/kernel/arch/blackfin/mach-bf533/boards/Kconfig
index 8d8b3e732..3fde0df1b 100644
--- a/kernel/arch/blackfin/mach-bf533/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf533/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN533_STAMP
diff --git a/kernel/arch/blackfin/mach-bf533/boards/Makefile b/kernel/arch/blackfin/mach-bf533/boards/Makefile
index ff1e832f8..35256d2fc 100644
--- a/kernel/arch/blackfin/mach-bf533/boards/Makefile
+++ b/kernel/arch/blackfin/mach-bf533/boards/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/mach-bf533/boards/Makefile
 #
diff --git a/kernel/arch/blackfin/mach-bf537/Kconfig b/kernel/arch/blackfin/mach-bf537/Kconfig
index 08b2b343c..1d69b043a 100644
--- a/kernel/arch/blackfin/mach-bf537/Kconfig
+++ b/kernel/arch/blackfin/mach-bf537/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if (BF537 || BF534 || BF536)
 
 source "arch/blackfin/mach-bf537/boards/Kconfig"
diff --git a/kernel/arch/blackfin/mach-bf537/boards/Kconfig b/kernel/arch/blackfin/mach-bf537/boards/Kconfig
index a44bf3a18..60b7b29e5 100644
--- a/kernel/arch/blackfin/mach-bf537/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf537/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN537_STAMP
diff --git a/kernel/arch/blackfin/mach-bf537/boards/Makefile b/kernel/arch/blackfin/mach-bf537/boards/Makefile
index fe42258fe..47a1acc5f 100644
--- a/kernel/arch/blackfin/mach-bf537/boards/Makefile
+++ b/kernel/arch/blackfin/mach-bf537/boards/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/mach-bf537/boards/Makefile
 #
diff --git a/kernel/arch/blackfin/mach-bf538/Kconfig b/kernel/arch/blackfin/mach-bf538/Kconfig
index 2d280f504..4aea85e4e 100644
--- a/kernel/arch/blackfin/mach-bf538/Kconfig
+++ b/kernel/arch/blackfin/mach-bf538/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if (BF538 || BF539)
 
 source "arch/blackfin/mach-bf538/boards/Kconfig"
diff --git a/kernel/arch/blackfin/mach-bf538/boards/Kconfig b/kernel/arch/blackfin/mach-bf538/boards/Kconfig
index 215249ba5..114cff440 100644
--- a/kernel/arch/blackfin/mach-bf538/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf538/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN538_EZKIT
diff --git a/kernel/arch/blackfin/mach-bf548/Kconfig b/kernel/arch/blackfin/mach-bf548/Kconfig
index 334ec7b12..71c2a765a 100644
--- a/kernel/arch/blackfin/mach-bf548/Kconfig
+++ b/kernel/arch/blackfin/mach-bf548/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config BF542
 	def_bool y
 	depends on BF542_std || BF542M
diff --git a/kernel/arch/blackfin/mach-bf548/boards/Kconfig b/kernel/arch/blackfin/mach-bf548/boards/Kconfig
index d38e52671..e8ce579ae 100644
--- a/kernel/arch/blackfin/mach-bf548/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf548/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN548_EZKIT
diff --git a/kernel/arch/blackfin/mach-bf561/Kconfig b/kernel/arch/blackfin/mach-bf561/Kconfig
index cb9743641..059c3cbdb 100644
--- a/kernel/arch/blackfin/mach-bf561/Kconfig
+++ b/kernel/arch/blackfin/mach-bf561/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if (BF561)
 
 source "arch/blackfin/mach-bf561/boards/Kconfig"
diff --git a/kernel/arch/blackfin/mach-bf561/boards/Kconfig b/kernel/arch/blackfin/mach-bf561/boards/Kconfig
index 1aa529b9f..10e977b56 100644
--- a/kernel/arch/blackfin/mach-bf561/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf561/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN561_EZKIT
diff --git a/kernel/arch/blackfin/mach-bf609/Kconfig b/kernel/arch/blackfin/mach-bf609/Kconfig
index 6584190fa..7d6a8b892 100644
--- a/kernel/arch/blackfin/mach-bf609/Kconfig
+++ b/kernel/arch/blackfin/mach-bf609/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config BF60x
 	def_bool y
 	depends on (BF609)
diff --git a/kernel/arch/blackfin/mach-bf609/boards/Kconfig b/kernel/arch/blackfin/mach-bf609/boards/Kconfig
index 30e8b6b0d..350154b2a 100644
--- a/kernel/arch/blackfin/mach-bf609/boards/Kconfig
+++ b/kernel/arch/blackfin/mach-bf609/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "System type"
 	default BFIN609_EZKIT
diff --git a/kernel/arch/blackfin/mach-bf609/clock.c b/kernel/arch/blackfin/mach-bf609/clock.c
index 392a59b9a..16e0b09e2 100644
--- a/kernel/arch/blackfin/mach-bf609/clock.c
+++ b/kernel/arch/blackfin/mach-bf609/clock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
diff --git a/kernel/arch/blackfin/mach-bf609/dpm.S b/kernel/arch/blackfin/mach-bf609/dpm.S
index 54d50c689..fcb8f688a 100644
--- a/kernel/arch/blackfin/mach-bf609/dpm.S
+++ b/kernel/arch/blackfin/mach-bf609/dpm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/blackfin.h>
 #include <asm/dpmc.h>
diff --git a/kernel/arch/blackfin/mach-common/Makefile b/kernel/arch/blackfin/mach-common/Makefile
index f09979204..fcef1c8e1 100644
--- a/kernel/arch/blackfin/mach-common/Makefile
+++ b/kernel/arch/blackfin/mach-common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/mach-common/Makefile
 #
diff --git a/kernel/arch/blackfin/mach-common/clock.h b/kernel/arch/blackfin/mach-common/clock.h
index 645ff460a..fed851a51 100644
--- a/kernel/arch/blackfin/mach-common/clock.h
+++ b/kernel/arch/blackfin/mach-common/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_COMMON_CLKDEV_H
 #define __MACH_COMMON_CLKDEV_H
 
diff --git a/kernel/arch/blackfin/oprofile/Makefile b/kernel/arch/blackfin/oprofile/Makefile
index c70af3a01..e89e1c9f3 100644
--- a/kernel/arch/blackfin/oprofile/Makefile
+++ b/kernel/arch/blackfin/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/blackfin/oprofile/Makefile
 #
diff --git a/kernel/arch/c6x/Kconfig b/kernel/arch/c6x/Kconfig
index 5aa8ea8ba..c6b4dd141 100644
--- a/kernel/arch/c6x/Kconfig
+++ b/kernel/arch/c6x/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
diff --git a/kernel/arch/c6x/boot/Makefile b/kernel/arch/c6x/boot/Makefile
index 8734abee5..842b7b0bf 100644
--- a/kernel/arch/c6x/boot/Makefile
+++ b/kernel/arch/c6x/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for bootable kernel images
 #
diff --git a/kernel/arch/c6x/boot/dts/Makefile b/kernel/arch/c6x/boot/dts/Makefile
index c7528b02d..7368838c6 100644
--- a/kernel/arch/c6x/boot/dts/Makefile
+++ b/kernel/arch/c6x/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for device trees
 #
diff --git a/kernel/arch/c6x/boot/dts/tms320c6455.dtsi b/kernel/arch/c6x/boot/dts/tms320c6455.dtsi
index a804ec1e0..0b21cb303 100644
--- a/kernel/arch/c6x/boot/dts/tms320c6455.dtsi
+++ b/kernel/arch/c6x/boot/dts/tms320c6455.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	#address-cells = <1>;
diff --git a/kernel/arch/c6x/boot/dts/tms320c6457.dtsi b/kernel/arch/c6x/boot/dts/tms320c6457.dtsi
index 35f40709a..e49f7ae19 100644
--- a/kernel/arch/c6x/boot/dts/tms320c6457.dtsi
+++ b/kernel/arch/c6x/boot/dts/tms320c6457.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	#address-cells = <1>;
diff --git a/kernel/arch/c6x/boot/dts/tms320c6472.dtsi b/kernel/arch/c6x/boot/dts/tms320c6472.dtsi
index b488aaec6..9dd4b04e7 100644
--- a/kernel/arch/c6x/boot/dts/tms320c6472.dtsi
+++ b/kernel/arch/c6x/boot/dts/tms320c6472.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	#address-cells = <1>;
diff --git a/kernel/arch/c6x/boot/dts/tms320c6474.dtsi b/kernel/arch/c6x/boot/dts/tms320c6474.dtsi
index cc601bf34..0ef533362 100644
--- a/kernel/arch/c6x/boot/dts/tms320c6474.dtsi
+++ b/kernel/arch/c6x/boot/dts/tms320c6474.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	#address-cells = <1>;
diff --git a/kernel/arch/c6x/boot/dts/tms320c6678.dtsi b/kernel/arch/c6x/boot/dts/tms320c6678.dtsi
index 386196e5e..da1e3f2bf 100644
--- a/kernel/arch/c6x/boot/dts/tms320c6678.dtsi
+++ b/kernel/arch/c6x/boot/dts/tms320c6678.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	#address-cells = <1>;
diff --git a/kernel/arch/c6x/include/asm/flat.h b/kernel/arch/c6x/include/asm/flat.h
index 6f1feb00b..76fd0bb96 100644
--- a/kernel/arch/c6x/include/asm/flat.h
+++ b/kernel/arch/c6x/include/asm/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_C6X_FLAT_H
 #define __ASM_C6X_FLAT_H
 
diff --git a/kernel/arch/c6x/include/asm/linkage.h b/kernel/arch/c6x/include/asm/linkage.h
index 376925c47..1ad615da6 100644
--- a/kernel/arch/c6x/include/asm/linkage.h
+++ b/kernel/arch/c6x/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_C6X_LINKAGE_H
 #define _ASM_C6X_LINKAGE_H
 
diff --git a/kernel/arch/c6x/include/asm/megamod-pic.h b/kernel/arch/c6x/include/asm/megamod-pic.h
index eca0a8678..a0a6d596b 100644
--- a/kernel/arch/c6x/include/asm/megamod-pic.h
+++ b/kernel/arch/c6x/include/asm/megamod-pic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _C6X_MEGAMOD_PIC_H
 #define _C6X_MEGAMOD_PIC_H
 
diff --git a/kernel/arch/c6x/include/asm/page.h b/kernel/arch/c6x/include/asm/page.h
index d18e2b0c7..70db1e763 100644
--- a/kernel/arch/c6x/include/asm/page.h
+++ b/kernel/arch/c6x/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_C6X_PAGE_H
 #define _ASM_C6X_PAGE_H
 
diff --git a/kernel/arch/c6x/include/asm/sections.h b/kernel/arch/c6x/include/asm/sections.h
index f703989d8..d6c591ab5 100644
--- a/kernel/arch/c6x/include/asm/sections.h
+++ b/kernel/arch/c6x/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_C6X_SECTIONS_H
 #define _ASM_C6X_SECTIONS_H
 
diff --git a/kernel/arch/c6x/include/asm/timer64.h b/kernel/arch/c6x/include/asm/timer64.h
index bbe27bb98..b850dfef1 100644
--- a/kernel/arch/c6x/include/asm/timer64.h
+++ b/kernel/arch/c6x/include/asm/timer64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _C6X_TIMER64_H
 #define _C6X_TIMER64_H
 
diff --git a/kernel/arch/c6x/include/asm/tlb.h b/kernel/arch/c6x/include/asm/tlb.h
index 8709e5e29..34525dea1 100644
--- a/kernel/arch/c6x/include/asm/tlb.h
+++ b/kernel/arch/c6x/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_C6X_TLB_H
 #define _ASM_C6X_TLB_H
 
diff --git a/kernel/arch/c6x/include/uapi/asm/byteorder.h b/kernel/arch/c6x/include/uapi/asm/byteorder.h
index 166038db3..ab61f8673 100644
--- a/kernel/arch/c6x/include/uapi/asm/byteorder.h
+++ b/kernel/arch/c6x/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_C6X_BYTEORDER_H
 #define _ASM_C6X_BYTEORDER_H
 
diff --git a/kernel/arch/c6x/include/uapi/asm/ptrace.h b/kernel/arch/c6x/include/uapi/asm/ptrace.h
index cc0a4d991..9b51110a0 100644
--- a/kernel/arch/c6x/include/uapi/asm/ptrace.h
+++ b/kernel/arch/c6x/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Copyright (C) 2004, 2006, 2009, 2010 Texas Instruments Incorporated
  *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)
diff --git a/kernel/arch/c6x/include/uapi/asm/setup.h b/kernel/arch/c6x/include/uapi/asm/setup.h
index ad9ac97a8..e90548ceb 100644
--- a/kernel/arch/c6x/include/uapi/asm/setup.h
+++ b/kernel/arch/c6x/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_C6X_SETUP_H
 #define _UAPI_ASM_C6X_SETUP_H
 
diff --git a/kernel/arch/c6x/include/uapi/asm/sigcontext.h b/kernel/arch/c6x/include/uapi/asm/sigcontext.h
index eb702f39c..4e5a9a260 100644
--- a/kernel/arch/c6x/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/c6x/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Port on Texas Instruments TMS320C6x architecture
  *
diff --git a/kernel/arch/c6x/include/uapi/asm/swab.h b/kernel/arch/c6x/include/uapi/asm/swab.h
index fd4bb0520..c407c0497 100644
--- a/kernel/arch/c6x/include/uapi/asm/swab.h
+++ b/kernel/arch/c6x/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Copyright (C) 2011 Texas Instruments Incorporated
  *  Author: Mark Salter <msalter@redhat.com>
diff --git a/kernel/arch/c6x/include/uapi/asm/unistd.h b/kernel/arch/c6x/include/uapi/asm/unistd.h
index 12d73d9d8..0d2daf7f9 100644
--- a/kernel/arch/c6x/include/uapi/asm/unistd.h
+++ b/kernel/arch/c6x/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2011 Texas Instruments Incorporated
  *
diff --git a/kernel/arch/c6x/kernel/Makefile b/kernel/arch/c6x/kernel/Makefile
index 580a515a9..02f340d7b 100644
--- a/kernel/arch/c6x/kernel/Makefile
+++ b/kernel/arch/c6x/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for arch/c6x/kernel/
 #
diff --git a/kernel/arch/c6x/kernel/asm-offsets.c b/kernel/arch/c6x/kernel/asm-offsets.c
index 60f1e4377..cff57764f 100644
--- a/kernel/arch/c6x/kernel/asm-offsets.c
+++ b/kernel/arch/c6x/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed
diff --git a/kernel/arch/c6x/kernel/vmlinux.lds.S b/kernel/arch/c6x/kernel/vmlinux.lds.S
index 29ebea49d..1fba5b421 100644
--- a/kernel/arch/c6x/kernel/vmlinux.lds.S
+++ b/kernel/arch/c6x/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ld script for the c6x kernel
  *
diff --git a/kernel/arch/c6x/platforms/Kconfig b/kernel/arch/c6x/platforms/Kconfig
index c4a0fad89..f3a9ae6e0 100644
--- a/kernel/arch/c6x/platforms/Kconfig
+++ b/kernel/arch/c6x/platforms/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 config SOC_TMS320C6455
 	bool "TMS320C6455"
diff --git a/kernel/arch/cris/Kconfig b/kernel/arch/cris/Kconfig
index 71b758dc3..54d3f4267 100644
--- a/kernel/arch/cris/Kconfig
+++ b/kernel/arch/cris/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MMU
 	bool
 	default y
diff --git a/kernel/arch/cris/Kconfig.debug b/kernel/arch/cris/Kconfig.debug
index 14881e81e..6084d5e0c 100644
--- a/kernel/arch/cris/Kconfig.debug
+++ b/kernel/arch/cris/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config PROFILING
diff --git a/kernel/arch/cris/arch-v10/Kconfig b/kernel/arch/cris/arch-v10/Kconfig
index df9a38b4f..d4015a931 100644
--- a/kernel/arch/cris/arch-v10/Kconfig
+++ b/kernel/arch/cris/arch-v10/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ETRAX_ARCH_V10
 
 menu "CRIS v10 options"
diff --git a/kernel/arch/cris/arch-v10/drivers/Kconfig b/kernel/arch/cris/arch-v10/drivers/Kconfig
index 239dab0b9..8792af63c 100644
--- a/kernel/arch/cris/arch-v10/drivers/Kconfig
+++ b/kernel/arch/cris/arch-v10/drivers/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ETRAX_ARCH_V10
 
 config ETRAX_ETHERNET
diff --git a/kernel/arch/cris/arch-v10/drivers/Makefile b/kernel/arch/cris/arch-v10/drivers/Makefile
index e5c13183b..d5549dca8 100644
--- a/kernel/arch/cris/arch-v10/drivers/Makefile
+++ b/kernel/arch/cris/arch-v10/drivers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Etrax-specific drivers
 #
diff --git a/kernel/arch/cris/arch-v10/drivers/eeprom.c b/kernel/arch/cris/arch-v10/drivers/eeprom.c
index 33558d270..2d312c8a4 100644
--- a/kernel/arch/cris/arch-v10/drivers/eeprom.c
+++ b/kernel/arch/cris/arch-v10/drivers/eeprom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*!*****************************************************************************
 *!
 *!  Implements an interface for i2c compatible eeproms to run under Linux.
diff --git a/kernel/arch/cris/arch-v10/drivers/gpio.c b/kernel/arch/cris/arch-v10/drivers/gpio.c
index dfd3b3ba5..68dbe261d 100644
--- a/kernel/arch/cris/arch-v10/drivers/gpio.c
+++ b/kernel/arch/cris/arch-v10/drivers/gpio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Etrax general port I/O device
  *
diff --git a/kernel/arch/cris/arch-v10/drivers/i2c.c b/kernel/arch/cris/arch-v10/drivers/i2c.c
index b3d1f9ed1..ec35d62e8 100644
--- a/kernel/arch/cris/arch-v10/drivers/i2c.c
+++ b/kernel/arch/cris/arch-v10/drivers/i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*!***************************************************************************
 *!
 *! FILE NAME  : i2c.c
diff --git a/kernel/arch/cris/arch-v10/drivers/i2c.h b/kernel/arch/cris/arch-v10/drivers/i2c.h
index e36c96276..de45c1ffb 100644
--- a/kernel/arch/cris/arch-v10/drivers/i2c.h
+++ b/kernel/arch/cris/arch-v10/drivers/i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* i2c.h */
 int i2c_init(void);
 
diff --git a/kernel/arch/cris/arch-v10/drivers/sync_serial.c b/kernel/arch/cris/arch-v10/drivers/sync_serial.c
index cc62572c1..cfe9176f2 100644
--- a/kernel/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/kernel/arch/cris/arch-v10/drivers/sync_serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simple synchronous serial port driver for ETRAX 100LX.
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/Makefile b/kernel/arch/cris/arch-v10/kernel/Makefile
index 4841e822c..7ec04b4a2 100644
--- a/kernel/arch/cris/arch-v10/kernel/Makefile
+++ b/kernel/arch/cris/arch-v10/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/cris/arch-v10/kernel/crisksyms.c b/kernel/arch/cris/arch-v10/kernel/crisksyms.c
index 1ca6fc283..e1d897ed5 100644
--- a/kernel/arch/cris/arch-v10/kernel/crisksyms.c
+++ b/kernel/arch/cris/arch-v10/kernel/crisksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <asm/io.h>
 #include <arch/svinto.h>
diff --git a/kernel/arch/cris/arch-v10/kernel/debugport.c b/kernel/arch/cris/arch-v10/kernel/debugport.c
index b6549e54b..d30834d4d 100644
--- a/kernel/arch/cris/arch-v10/kernel/debugport.c
+++ b/kernel/arch/cris/arch-v10/kernel/debugport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Serialport functions for debugging
  *
  * Copyright (c) 2000-2007 Axis Communications AB
diff --git a/kernel/arch/cris/arch-v10/kernel/dma.c b/kernel/arch/cris/arch-v10/kernel/dma.c
index 579504735..c68e978de 100644
--- a/kernel/arch/cris/arch-v10/kernel/dma.c
+++ b/kernel/arch/cris/arch-v10/kernel/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Wrapper for DMA channel allocator that updates DMA client muxing.
  * Copyright 2004-2007, Axis Communications AB
  */
diff --git a/kernel/arch/cris/arch-v10/kernel/entry.S b/kernel/arch/cris/arch-v10/kernel/entry.S
index b5622521d..1f066eebb 100644
--- a/kernel/arch/cris/arch-v10/kernel/entry.S
+++ b/kernel/arch/cris/arch-v10/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/cris/entry.S
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/fasttimer.c b/kernel/arch/cris/arch-v10/kernel/fasttimer.c
index e9298739d..94abbff55 100644
--- a/kernel/arch/cris/arch-v10/kernel/fasttimer.c
+++ b/kernel/arch/cris/arch-v10/kernel/fasttimer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/cris/kernel/fasttimer.c
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/head.S b/kernel/arch/cris/arch-v10/kernel/head.S
index a74aa233b..b260a8833 100644
--- a/kernel/arch/cris/arch-v10/kernel/head.S
+++ b/kernel/arch/cris/arch-v10/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Head of the kernel - alter with care
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/io_interface_mux.c b/kernel/arch/cris/arch-v10/kernel/io_interface_mux.c
index ad64cd1c8..13a887ce1 100644
--- a/kernel/arch/cris/arch-v10/kernel/io_interface_mux.c
+++ b/kernel/arch/cris/arch-v10/kernel/io_interface_mux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* IO interface mux allocator for ETRAX100LX.
  * Copyright 2004-2007, Axis Communications AB
  */
diff --git a/kernel/arch/cris/arch-v10/kernel/irq.c b/kernel/arch/cris/arch-v10/kernel/irq.c
index 09cae80a8..df11e383a 100644
--- a/kernel/arch/cris/arch-v10/kernel/irq.c
+++ b/kernel/arch/cris/arch-v10/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/cris/kernel/irq.c
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/kgdb.c b/kernel/arch/cris/arch-v10/kernel/kgdb.c
index ed71ade93..79b13564d 100644
--- a/kernel/arch/cris/arch-v10/kernel/kgdb.c
+++ b/kernel/arch/cris/arch-v10/kernel/kgdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*!**************************************************************************
 *!
 *! FILE NAME  : kgdb.c
diff --git a/kernel/arch/cris/arch-v10/kernel/process.c b/kernel/arch/cris/arch-v10/kernel/process.c
index a2cdb1521..16848b2c6 100644
--- a/kernel/arch/cris/arch-v10/kernel/process.c
+++ b/kernel/arch/cris/arch-v10/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/kernel/process.c
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/ptrace.c b/kernel/arch/cris/arch-v10/kernel/ptrace.c
index c2f2b9b83..b89f57ae0 100644
--- a/kernel/arch/cris/arch-v10/kernel/ptrace.c
+++ b/kernel/arch/cris/arch-v10/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2000-2003, Axis Communications AB.
  */
diff --git a/kernel/arch/cris/arch-v10/kernel/setup.c b/kernel/arch/cris/arch-v10/kernel/setup.c
index 7ab31f1c7..8e4fc248f 100644
--- a/kernel/arch/cris/arch-v10/kernel/setup.c
+++ b/kernel/arch/cris/arch-v10/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  *  linux/arch/cris/arch-v10/kernel/setup.c
diff --git a/kernel/arch/cris/arch-v10/kernel/shadows.c b/kernel/arch/cris/arch-v10/kernel/shadows.c
index 2454a0b02..2e9565e86 100644
--- a/kernel/arch/cris/arch-v10/kernel/shadows.c
+++ b/kernel/arch/cris/arch-v10/kernel/shadows.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Various shadow registers. Defines for these are in include/asm-etrax100/io.h
  */
diff --git a/kernel/arch/cris/arch-v10/kernel/signal.c b/kernel/arch/cris/arch-v10/kernel/signal.c
index bab4a8dd6..2beffc37f 100644
--- a/kernel/arch/cris/arch-v10/kernel/signal.c
+++ b/kernel/arch/cris/arch-v10/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/kernel/signal.c
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/time.c b/kernel/arch/cris/arch-v10/kernel/time.c
index b5eb5cd2f..3d78373db 100644
--- a/kernel/arch/cris/arch-v10/kernel/time.c
+++ b/kernel/arch/cris/arch-v10/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/arch-v10/kernel/time.c
  *
diff --git a/kernel/arch/cris/arch-v10/kernel/traps.c b/kernel/arch/cris/arch-v10/kernel/traps.c
index c0a501f29..876d45b95 100644
--- a/kernel/arch/cris/arch-v10/kernel/traps.c
+++ b/kernel/arch/cris/arch-v10/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Helper functions for trap handlers
  *
diff --git a/kernel/arch/cris/arch-v10/lib/checksum.S b/kernel/arch/cris/arch-v10/lib/checksum.S
index 7d552f4bd..a3b963917 100644
--- a/kernel/arch/cris/arch-v10/lib/checksum.S
+++ b/kernel/arch/cris/arch-v10/lib/checksum.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A fast checksum routine using movem
  * Copyright (c) 1998-2001 Axis Communications AB
diff --git a/kernel/arch/cris/arch-v10/lib/checksumcopy.S b/kernel/arch/cris/arch-v10/lib/checksumcopy.S
index 540db8a5f..b21449cb1 100644
--- a/kernel/arch/cris/arch-v10/lib/checksumcopy.S
+++ b/kernel/arch/cris/arch-v10/lib/checksumcopy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A fast checksum+copy routine using movem
  * Copyright (c) 1998, 2001 Axis Communications AB
diff --git a/kernel/arch/cris/arch-v10/lib/csumcpfruser.S b/kernel/arch/cris/arch-v10/lib/csumcpfruser.S
index 5f41ccd62..beb8992ed 100644
--- a/kernel/arch/cris/arch-v10/lib/csumcpfruser.S
+++ b/kernel/arch/cris/arch-v10/lib/csumcpfruser.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Add-on to transform csum_partial_copy_nocheck in checksumcopy.S into
  * csum_partial_copy_from_user by adding exception records.
diff --git a/kernel/arch/cris/arch-v10/lib/dram_init.S b/kernel/arch/cris/arch-v10/lib/dram_init.S
index 933101243..fd7437577 100644
--- a/kernel/arch/cris/arch-v10/lib/dram_init.S
+++ b/kernel/arch/cris/arch-v10/lib/dram_init.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * DRAM/SDRAM initialization - alter with care
  * This file is intended to be included from other assembler files
diff --git a/kernel/arch/cris/arch-v10/lib/hw_settings.S b/kernel/arch/cris/arch-v10/lib/hw_settings.S
index c09f19f47..0d4498525 100644
--- a/kernel/arch/cris/arch-v10/lib/hw_settings.S
+++ b/kernel/arch/cris/arch-v10/lib/hw_settings.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This table is used by some tools to extract hardware parameters.
  * The table should be included in the kernel and the decompressor.
diff --git a/kernel/arch/cris/arch-v10/lib/usercopy.c b/kernel/arch/cris/arch-v10/lib/usercopy.c
index 48fa37fe0..3f1e2f468 100644
--- a/kernel/arch/cris/arch-v10/lib/usercopy.c
+++ b/kernel/arch/cris/arch-v10/lib/usercopy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * User address space access functions.
  * The non-inlined parts of asm-cris/uaccess.h are here.
diff --git a/kernel/arch/cris/arch-v10/mm/fault.c b/kernel/arch/cris/arch-v10/mm/fault.c
index 75210cbe6..e6c225169 100644
--- a/kernel/arch/cris/arch-v10/mm/fault.c
+++ b/kernel/arch/cris/arch-v10/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/mm/fault.c
  *
diff --git a/kernel/arch/cris/arch-v10/mm/init.c b/kernel/arch/cris/arch-v10/mm/init.c
index 85e3f1b1f..4da99a0e3 100644
--- a/kernel/arch/cris/arch-v10/mm/init.c
+++ b/kernel/arch/cris/arch-v10/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/arch-v10/mm/init.c
  *
diff --git a/kernel/arch/cris/arch-v10/mm/tlb.c b/kernel/arch/cris/arch-v10/mm/tlb.c
index 3225d38bd..7f1f752f2 100644
--- a/kernel/arch/cris/arch-v10/mm/tlb.c
+++ b/kernel/arch/cris/arch-v10/mm/tlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/arch-v10/mm/tlb.c
  *
diff --git a/kernel/arch/cris/arch-v32/Kconfig b/kernel/arch/cris/arch-v32/Kconfig
index 17dbe03af..958dabfca 100644
--- a/kernel/arch/cris/arch-v32/Kconfig
+++ b/kernel/arch/cris/arch-v32/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ETRAX_ARCH_V32
 
 source arch/cris/arch-v32/mach-fs/Kconfig
diff --git a/kernel/arch/cris/arch-v32/drivers/Kconfig b/kernel/arch/cris/arch-v32/drivers/Kconfig
index b7cd6b920..4d2d744bc 100644
--- a/kernel/arch/cris/arch-v32/drivers/Kconfig
+++ b/kernel/arch/cris/arch-v32/drivers/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ETRAX_ARCH_V32
 
 config ETRAX_ETHERNET
diff --git a/kernel/arch/cris/arch-v32/drivers/Makefile b/kernel/arch/cris/arch-v32/drivers/Makefile
index b5a75fdce..57c956870 100644
--- a/kernel/arch/cris/arch-v32/drivers/Makefile
+++ b/kernel/arch/cris/arch-v32/drivers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Etrax-specific drivers
 #
diff --git a/kernel/arch/cris/arch-v32/drivers/cryptocop.c b/kernel/arch/cris/arch-v32/drivers/cryptocop.c
index 14970f11b..d688fe117 100644
--- a/kernel/arch/cris/arch-v32/drivers/cryptocop.c
+++ b/kernel/arch/cris/arch-v32/drivers/cryptocop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Stream co-processor driver for the ETRAX FS
  *
diff --git a/kernel/arch/cris/arch-v32/drivers/pci/bios.c b/kernel/arch/cris/arch-v32/drivers/pci/bios.c
index 5cc622c02..6b9e6cfaa 100644
--- a/kernel/arch/cris/arch-v32/drivers/pci/bios.c
+++ b/kernel/arch/cris/arch-v32/drivers/pci/bios.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <hwregs/intr_vect.h>
diff --git a/kernel/arch/cris/arch-v32/drivers/pci/dma.c b/kernel/arch/cris/arch-v32/drivers/pci/dma.c
index 707234199..dbbd3816c 100644
--- a/kernel/arch/cris/arch-v32/drivers/pci/dma.c
+++ b/kernel/arch/cris/arch-v32/drivers/pci/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dynamic DMA mapping support.
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/Makefile b/kernel/arch/cris/arch-v32/kernel/Makefile
index d9fc617ea..2db7e4f7c 100644
--- a/kernel/arch/cris/arch-v32/kernel/Makefile
+++ b/kernel/arch/cris/arch-v32/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/cris/arch-v32/kernel/cache.c b/kernel/arch/cris/arch-v32/kernel/cache.c
index f38433b1f..a080d2fa4 100644
--- a/kernel/arch/cris/arch-v32/kernel/cache.c
+++ b/kernel/arch/cris/arch-v32/kernel/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <asm/io.h>
 #include <arch/cache.h>
diff --git a/kernel/arch/cris/arch-v32/kernel/cacheflush.S b/kernel/arch/cris/arch-v32/kernel/cacheflush.S
index 6fc3d95d7..2a54d793f 100644
--- a/kernel/arch/cris/arch-v32/kernel/cacheflush.S
+++ b/kernel/arch/cris/arch-v32/kernel/cacheflush.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.global cris_flush_cache_range
 	.type	cris_flush_cache_range, @function
 cris_flush_cache_range:
diff --git a/kernel/arch/cris/arch-v32/kernel/crisksyms.c b/kernel/arch/cris/arch-v32/kernel/crisksyms.c
index b0566350a..8cc8ad1cb 100644
--- a/kernel/arch/cris/arch-v32/kernel/crisksyms.c
+++ b/kernel/arch/cris/arch-v32/kernel/crisksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/irq.h>
 #include <arch/dma.h>
diff --git a/kernel/arch/cris/arch-v32/kernel/debugport.c b/kernel/arch/cris/arch-v32/kernel/debugport.c
index d2f3f9c37..69247fd20 100644
--- a/kernel/arch/cris/arch-v32/kernel/debugport.c
+++ b/kernel/arch/cris/arch-v32/kernel/debugport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2003, Axis Communications AB.
  */
diff --git a/kernel/arch/cris/arch-v32/kernel/entry.S b/kernel/arch/cris/arch-v32/kernel/entry.S
index b17a20999..0793a52b2 100644
--- a/kernel/arch/cris/arch-v32/kernel/entry.S
+++ b/kernel/arch/cris/arch-v32/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 2000-2003 Axis Communications AB
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/fasttimer.c b/kernel/arch/cris/arch-v32/kernel/fasttimer.c
index eb4e0ff36..7452c70f6 100644
--- a/kernel/arch/cris/arch-v32/kernel/fasttimer.c
+++ b/kernel/arch/cris/arch-v32/kernel/fasttimer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/cris/kernel/fasttimer.c
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/head.S b/kernel/arch/cris/arch-v32/kernel/head.S
index 5ce83eb54..92f9fb1f6 100644
--- a/kernel/arch/cris/arch-v32/kernel/head.S
+++ b/kernel/arch/cris/arch-v32/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CRISv32 kernel startup code.
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/irq.c b/kernel/arch/cris/arch-v32/kernel/irq.c
index b07da4b69..414afd543 100644
--- a/kernel/arch/cris/arch-v32/kernel/irq.c
+++ b/kernel/arch/cris/arch-v32/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2003, Axis Communications AB.
  */
diff --git a/kernel/arch/cris/arch-v32/kernel/kgdb.c b/kernel/arch/cris/arch-v32/kernel/kgdb.c
index e0fdea706..3d6f51676 100644
--- a/kernel/arch/cris/arch-v32/kernel/kgdb.c
+++ b/kernel/arch/cris/arch-v32/kernel/kgdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/cris/arch-v32/kernel/kgdb.c
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/kgdb_asm.S b/kernel/arch/cris/arch-v32/kernel/kgdb_asm.S
index f3a476059..c26ea6b0e 100644
--- a/kernel/arch/cris/arch-v32/kernel/kgdb_asm.S
+++ b/kernel/arch/cris/arch-v32/kernel/kgdb_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 2004 Axis Communications AB
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/process.c b/kernel/arch/cris/arch-v32/kernel/process.c
index fe87b383f..a02f276d0 100644
--- a/kernel/arch/cris/arch-v32/kernel/process.c
+++ b/kernel/arch/cris/arch-v32/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2000-2003  Axis Communications AB
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/ptrace.c b/kernel/arch/cris/arch-v32/kernel/ptrace.c
index 0461e95bb..ccac1aaad 100644
--- a/kernel/arch/cris/arch-v32/kernel/ptrace.c
+++ b/kernel/arch/cris/arch-v32/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2000-2007, Axis Communications AB.
  */
diff --git a/kernel/arch/cris/arch-v32/kernel/setup.c b/kernel/arch/cris/arch-v32/kernel/setup.c
index fe50287aa..a36372e35 100644
--- a/kernel/arch/cris/arch-v32/kernel/setup.c
+++ b/kernel/arch/cris/arch-v32/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Display CPU info in /proc/cpuinfo.
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/signal.c b/kernel/arch/cris/arch-v32/kernel/signal.c
index ea2e8e139..4f2e3ba3b 100644
--- a/kernel/arch/cris/arch-v32/kernel/signal.c
+++ b/kernel/arch/cris/arch-v32/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2003, Axis Communications AB.
  */
diff --git a/kernel/arch/cris/arch-v32/kernel/time.c b/kernel/arch/cris/arch-v32/kernel/time.c
index d2a844076..d07a39126 100644
--- a/kernel/arch/cris/arch-v32/kernel/time.c
+++ b/kernel/arch/cris/arch-v32/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/arch-v32/kernel/time.c
  *
diff --git a/kernel/arch/cris/arch-v32/kernel/traps.c b/kernel/arch/cris/arch-v32/kernel/traps.c
index a34256515..ba54c7ecc 100644
--- a/kernel/arch/cris/arch-v32/kernel/traps.c
+++ b/kernel/arch/cris/arch-v32/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2003-2006, Axis Communications AB.
  */
diff --git a/kernel/arch/cris/arch-v32/lib/checksum.S b/kernel/arch/cris/arch-v32/lib/checksum.S
index 4a72a94a4..f773d4d93 100644
--- a/kernel/arch/cris/arch-v32/lib/checksum.S
+++ b/kernel/arch/cris/arch-v32/lib/checksum.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A fast checksum routine using movem
  * Copyright (c) 1998-2007 Axis Communications AB
diff --git a/kernel/arch/cris/arch-v32/lib/checksumcopy.S b/kernel/arch/cris/arch-v32/lib/checksumcopy.S
index 54e209f18..a76e586d4 100644
--- a/kernel/arch/cris/arch-v32/lib/checksumcopy.S
+++ b/kernel/arch/cris/arch-v32/lib/checksumcopy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A fast checksum+copy routine using movem
  * Copyright (c) 1998-2007 Axis Communications AB
diff --git a/kernel/arch/cris/arch-v32/lib/csumcpfruser.S b/kernel/arch/cris/arch-v32/lib/csumcpfruser.S
index 600ec16b9..093cd757f 100644
--- a/kernel/arch/cris/arch-v32/lib/csumcpfruser.S
+++ b/kernel/arch/cris/arch-v32/lib/csumcpfruser.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Add-on to transform csum_partial_copy_nocheck in checksumcopy.S into
  * csum_partial_copy_from_user by adding exception records.
diff --git a/kernel/arch/cris/arch-v32/lib/delay.c b/kernel/arch/cris/arch-v32/lib/delay.c
index 39f1ac999..db06a94ef 100644
--- a/kernel/arch/cris/arch-v32/lib/delay.c
+++ b/kernel/arch/cris/arch-v32/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Precise Delay Loops for ETRAX FS
  *
diff --git a/kernel/arch/cris/arch-v32/lib/usercopy.c b/kernel/arch/cris/arch-v32/lib/usercopy.c
index 20b608026..04e78b6ff 100644
--- a/kernel/arch/cris/arch-v32/lib/usercopy.c
+++ b/kernel/arch/cris/arch-v32/lib/usercopy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * User address space access functions.
  * The non-inlined parts of asm-cris/uaccess.h are here.
diff --git a/kernel/arch/cris/arch-v32/mach-a3/Kconfig b/kernel/arch/cris/arch-v32/mach-a3/Kconfig
index 87547271a..7b6375554 100644
--- a/kernel/arch/cris/arch-v32/mach-a3/Kconfig
+++ b/kernel/arch/cris/arch-v32/mach-a3/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if CRIS_MACH_ARTPEC3
 
 menu "Artpec-3 options"
diff --git a/kernel/arch/cris/arch-v32/mach-a3/arbiter.c b/kernel/arch/cris/arch-v32/mach-a3/arbiter.c
index 735a9b0ab..076182cc6 100644
--- a/kernel/arch/cris/arch-v32/mach-a3/arbiter.c
+++ b/kernel/arch/cris/arch-v32/mach-a3/arbiter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Memory arbiter functions. Allocates bandwidth through the
  * arbiter and sets up arbiter breakpoints.
diff --git a/kernel/arch/cris/arch-v32/mach-a3/dma.c b/kernel/arch/cris/arch-v32/mach-a3/dma.c
index 11f417f4d..3f4e923b2 100644
--- a/kernel/arch/cris/arch-v32/mach-a3/dma.c
+++ b/kernel/arch/cris/arch-v32/mach-a3/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Wrapper for DMA channel allocator that starts clocks etc */
 
 #include <linux/kernel.h>
diff --git a/kernel/arch/cris/arch-v32/mach-a3/dram_init.S b/kernel/arch/cris/arch-v32/mach-a3/dram_init.S
index 7dc26bdb2..733c3564a 100644
--- a/kernel/arch/cris/arch-v32/mach-a3/dram_init.S
+++ b/kernel/arch/cris/arch-v32/mach-a3/dram_init.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * DDR SDRAM initialization - alter with care
  * This file is intended to be included from other assembler files
diff --git a/kernel/arch/cris/arch-v32/mach-a3/hw_settings.S b/kernel/arch/cris/arch-v32/mach-a3/hw_settings.S
index 0145725a1..7c325cc59 100644
--- a/kernel/arch/cris/arch-v32/mach-a3/hw_settings.S
+++ b/kernel/arch/cris/arch-v32/mach-a3/hw_settings.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This table is used by some tools to extract hardware parameters.
  * The table should be included in the kernel and the decompressor.
diff --git a/kernel/arch/cris/arch-v32/mach-a3/pinmux.c b/kernel/arch/cris/arch-v32/mach-a3/pinmux.c
index 591f77526..4875bf7aa 100644
--- a/kernel/arch/cris/arch-v32/mach-a3/pinmux.c
+++ b/kernel/arch/cris/arch-v32/mach-a3/pinmux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Allocator for I/O pins. All pins are allocated to GPIO at bootup.
  * Unassigned pins and GPIO pins can be allocated to a fixed interface
diff --git a/kernel/arch/cris/arch-v32/mach-fs/Kconfig b/kernel/arch/cris/arch-v32/mach-fs/Kconfig
index 7d1ab972b..743ba3bcb 100644
--- a/kernel/arch/cris/arch-v32/mach-fs/Kconfig
+++ b/kernel/arch/cris/arch-v32/mach-fs/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ETRAXFS
 
 menu "ETRAX FS options"
diff --git a/kernel/arch/cris/arch-v32/mach-fs/arbiter.c b/kernel/arch/cris/arch-v32/mach-fs/arbiter.c
index 047c70bdb..c4750d97e 100644
--- a/kernel/arch/cris/arch-v32/mach-fs/arbiter.c
+++ b/kernel/arch/cris/arch-v32/mach-fs/arbiter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Memory arbiter functions. Allocates bandwidth through the
  * arbiter and sets up arbiter breakpoints.
diff --git a/kernel/arch/cris/arch-v32/mach-fs/dma.c b/kernel/arch/cris/arch-v32/mach-fs/dma.c
index 7c93679c0..c0347a4f8 100644
--- a/kernel/arch/cris/arch-v32/mach-fs/dma.c
+++ b/kernel/arch/cris/arch-v32/mach-fs/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Wrapper for DMA channel allocator that starts clocks etc */
 
 #include <linux/kernel.h>
diff --git a/kernel/arch/cris/arch-v32/mach-fs/dram_init.S b/kernel/arch/cris/arch-v32/mach-fs/dram_init.S
index 2ed51e247..e1a01fa4c 100644
--- a/kernel/arch/cris/arch-v32/mach-fs/dram_init.S
+++ b/kernel/arch/cris/arch-v32/mach-fs/dram_init.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * DRAM/SDRAM initialization - alter with care
  * This file is intended to be included from other assembler files
diff --git a/kernel/arch/cris/arch-v32/mach-fs/hw_settings.S b/kernel/arch/cris/arch-v32/mach-fs/hw_settings.S
index 8bde93c36..7fbadcc48 100644
--- a/kernel/arch/cris/arch-v32/mach-fs/hw_settings.S
+++ b/kernel/arch/cris/arch-v32/mach-fs/hw_settings.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This table is used by some tools to extract hardware parameters.
  * The table should be included in the kernel and the decompressor.
diff --git a/kernel/arch/cris/arch-v32/mach-fs/pinmux.c b/kernel/arch/cris/arch-v32/mach-fs/pinmux.c
index d8a3a3c43..a0b2f1010 100644
--- a/kernel/arch/cris/arch-v32/mach-fs/pinmux.c
+++ b/kernel/arch/cris/arch-v32/mach-fs/pinmux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Allocator for I/O pins. All pins are allocated to GPIO at bootup.
  * Unassigned pins and GPIO pins can be allocated to a fixed interface
diff --git a/kernel/arch/cris/arch-v32/mm/init.c b/kernel/arch/cris/arch-v32/mm/init.c
index f5438ca81..784876afa 100644
--- a/kernel/arch/cris/arch-v32/mm/init.c
+++ b/kernel/arch/cris/arch-v32/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Set up paging and the MMU.
  *
diff --git a/kernel/arch/cris/arch-v32/mm/intmem.c b/kernel/arch/cris/arch-v32/mm/intmem.c
index c80728401..928b94d1d 100644
--- a/kernel/arch/cris/arch-v32/mm/intmem.c
+++ b/kernel/arch/cris/arch-v32/mm/intmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simple allocator for internal RAM in ETRAX FS
  *
diff --git a/kernel/arch/cris/arch-v32/mm/l2cache.c b/kernel/arch/cris/arch-v32/mm/l2cache.c
index 332ff10dc..4fef321d5 100644
--- a/kernel/arch/cris/arch-v32/mm/l2cache.c
+++ b/kernel/arch/cris/arch-v32/mm/l2cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/kernel/arch/cris/arch-v32/mm/mmu.S b/kernel/arch/cris/arch-v32/mm/mmu.S
index c0981044e..f24965703 100644
--- a/kernel/arch/cris/arch-v32/mm/mmu.S
+++ b/kernel/arch/cris/arch-v32/mm/mmu.S
@@ -1,3 +1,4 @@
+; SPDX-License-Identifier: GPL-2.0
 ; WARNING : The refill handler has been modified, see below !!!
 
 /*
diff --git a/kernel/arch/cris/arch-v32/mm/tlb.c b/kernel/arch/cris/arch-v32/mm/tlb.c
index bc3de5b5e..9e4b5ab49 100644
--- a/kernel/arch/cris/arch-v32/mm/tlb.c
+++ b/kernel/arch/cris/arch-v32/mm/tlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Low level TLB handling.
  *
diff --git a/kernel/arch/cris/boot/Makefile b/kernel/arch/cris/boot/Makefile
index 6e3b509fd..859d275f8 100644
--- a/kernel/arch/cris/boot/Makefile
+++ b/kernel/arch/cris/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/cris/boot/Makefile
 #
diff --git a/kernel/arch/cris/boot/compressed/Makefile b/kernel/arch/cris/boot/compressed/Makefile
index e4ba0be0e..e149c3467 100644
--- a/kernel/arch/cris/boot/compressed/Makefile
+++ b/kernel/arch/cris/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/cris/boot/compressed/Makefile
 #
diff --git a/kernel/arch/cris/boot/compressed/decompress_v10.lds b/kernel/arch/cris/boot/compressed/decompress_v10.lds
index e80f4594d..d8326779d 100644
--- a/kernel/arch/cris/boot/compressed/decompress_v10.lds
+++ b/kernel/arch/cris/boot/compressed/decompress_v10.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* OUTPUT_FORMAT(elf32-us-cris) */
 OUTPUT_FORMAT(elf32-cris)
 
diff --git a/kernel/arch/cris/boot/compressed/decompress_v32.lds b/kernel/arch/cris/boot/compressed/decompress_v32.lds
index 3c837feca..91d311c24 100644
--- a/kernel/arch/cris/boot/compressed/decompress_v32.lds
+++ b/kernel/arch/cris/boot/compressed/decompress_v32.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*#OUTPUT_FORMAT(elf32-us-cris) */
 OUTPUT_ARCH (crisv32)
 
diff --git a/kernel/arch/cris/boot/compressed/head_v10.S b/kernel/arch/cris/boot/compressed/head_v10.S
index 9edb8ade7..08198d8cd 100644
--- a/kernel/arch/cris/boot/compressed/head_v10.S
+++ b/kernel/arch/cris/boot/compressed/head_v10.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/cris/boot/compressed/head.S
  *
diff --git a/kernel/arch/cris/boot/compressed/head_v32.S b/kernel/arch/cris/boot/compressed/head_v32.S
index f483005f3..a997947d3 100644
--- a/kernel/arch/cris/boot/compressed/head_v32.S
+++ b/kernel/arch/cris/boot/compressed/head_v32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Code that sets up the DRAM registers, calls the
  *  decompressor to unpack the piggybacked kernel, and jumps.
diff --git a/kernel/arch/cris/boot/compressed/misc.c b/kernel/arch/cris/boot/compressed/misc.c
index 548d886b0..1ad464a11 100644
--- a/kernel/arch/cris/boot/compressed/misc.c
+++ b/kernel/arch/cris/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c
  *
diff --git a/kernel/arch/cris/boot/dts/Makefile b/kernel/arch/cris/boot/dts/Makefile
index faf69fb99..3318c630c 100644
--- a/kernel/arch/cris/boot/dts/Makefile
+++ b/kernel/arch/cris/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
 ifneq ($(CONFIG_BUILTIN_DTB),"")
 obj-$(CONFIG_OF) += $(BUILTIN_DTB)
diff --git a/kernel/arch/cris/boot/dts/artpec3.dtsi b/kernel/arch/cris/boot/dts/artpec3.dtsi
index be15be67b..f857300f4 100644
--- a/kernel/arch/cris/boot/dts/artpec3.dtsi
+++ b/kernel/arch/cris/boot/dts/artpec3.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/cris/boot/dts/dev88.dts b/kernel/arch/cris/boot/dts/dev88.dts
index b9a230d10..415270ea5 100644
--- a/kernel/arch/cris/boot/dts/dev88.dts
+++ b/kernel/arch/cris/boot/dts/dev88.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/cris/boot/dts/etraxfs.dtsi b/kernel/arch/cris/boot/dts/etraxfs.dtsi
index bf1b8582d..4513edf72 100644
--- a/kernel/arch/cris/boot/dts/etraxfs.dtsi
+++ b/kernel/arch/cris/boot/dts/etraxfs.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/cris/boot/dts/p1343.dts b/kernel/arch/cris/boot/dts/p1343.dts
index fab7bdbd0..6030561d4 100644
--- a/kernel/arch/cris/boot/dts/p1343.dts
+++ b/kernel/arch/cris/boot/dts/p1343.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/cris/boot/rescue/Makefile b/kernel/arch/cris/boot/rescue/Makefile
index a82025940..f73ac4c83 100644
--- a/kernel/arch/cris/boot/rescue/Makefile
+++ b/kernel/arch/cris/boot/rescue/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for rescue (bootstrap) code
 #
diff --git a/kernel/arch/cris/boot/rescue/head_v10.S b/kernel/arch/cris/boot/rescue/head_v10.S
index 1c05492f3..11eedb1bf 100644
--- a/kernel/arch/cris/boot/rescue/head_v10.S
+++ b/kernel/arch/cris/boot/rescue/head_v10.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Rescue code, made to reside at the beginning of the
  * flash-memory. when it starts, it checks a partition
diff --git a/kernel/arch/cris/boot/rescue/head_v32.S b/kernel/arch/cris/boot/rescue/head_v32.S
index 5f846b770..9eb04abaa 100644
--- a/kernel/arch/cris/boot/rescue/head_v32.S
+++ b/kernel/arch/cris/boot/rescue/head_v32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Just get started by jumping to CONFIG_ETRAX_PTABLE_SECTOR to start
  * kernel decompressor.
diff --git a/kernel/arch/cris/boot/rescue/kimagerescue.S b/kernel/arch/cris/boot/rescue/kimagerescue.S
index 655b511fe..3306098de 100644
--- a/kernel/arch/cris/boot/rescue/kimagerescue.S
+++ b/kernel/arch/cris/boot/rescue/kimagerescue.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Rescue code to be prepended on a kimage and copied to the
  * rescue serial port.
diff --git a/kernel/arch/cris/boot/rescue/rescue_v10.lds b/kernel/arch/cris/boot/rescue/rescue_v10.lds
index 0b52a9490..e58a53f91 100644
--- a/kernel/arch/cris/boot/rescue/rescue_v10.lds
+++ b/kernel/arch/cris/boot/rescue/rescue_v10.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 MEMORY 
 	{
 	flash : ORIGIN = 0x00000000,
diff --git a/kernel/arch/cris/boot/rescue/rescue_v32.lds b/kernel/arch/cris/boot/rescue/rescue_v32.lds
index 8ac646bc1..f1542183f 100644
--- a/kernel/arch/cris/boot/rescue/rescue_v32.lds
+++ b/kernel/arch/cris/boot/rescue/rescue_v32.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*#OUTPUT_FORMAT(elf32-us-cris) */
 OUTPUT_ARCH (crisv32)
 /* Now that NAND support has been stripped, this file could be simplified,
diff --git a/kernel/arch/cris/boot/rescue/testrescue.S b/kernel/arch/cris/boot/rescue/testrescue.S
index fc7ec674e..06f78a0b0 100644
--- a/kernel/arch/cris/boot/rescue/testrescue.S
+++ b/kernel/arch/cris/boot/rescue/testrescue.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Simple testcode to download by the rescue block.
  * Just lights some LEDs to show it was downloaded correctly.
diff --git a/kernel/arch/cris/boot/tools/build.c b/kernel/arch/cris/boot/tools/build.c
index c8adef364..3ae485049 100644
--- a/kernel/arch/cris/boot/tools/build.c
+++ b/kernel/arch/cris/boot/tools/build.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/tools/build.c
  *
diff --git a/kernel/arch/cris/include/arch-v10/arch/bitops.h b/kernel/arch/cris/include/arch-v10/arch/bitops.h
index 03d9cfd92..c18f81858 100644
--- a/kernel/arch/cris/include/arch-v10/arch/bitops.h
+++ b/kernel/arch/cris/include/arch-v10/arch/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* asm/arch/bitops.h for Linux/CRISv10 */
 
 #ifndef _CRIS_ARCH_BITOPS_H
diff --git a/kernel/arch/cris/include/arch-v10/arch/bug.h b/kernel/arch/cris/include/arch-v10/arch/bug.h
index 3485d6b34..905afeacf 100644
--- a/kernel/arch/cris/include/arch-v10/arch/bug.h
+++ b/kernel/arch/cris/include/arch-v10/arch/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRISv10_ARCH_BUG_H
 #define __ASM_CRISv10_ARCH_BUG_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/cache.h b/kernel/arch/cris/include/arch-v10/arch/cache.h
index aea27184d..d4049bcab 100644
--- a/kernel/arch/cris/include/arch-v10/arch/cache.h
+++ b/kernel/arch/cris/include/arch-v10/arch/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_CACHE_H
 #define _ASM_ARCH_CACHE_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/checksum.h b/kernel/arch/cris/include/arch-v10/arch/checksum.h
index d1d1bd9e1..eb186be4f 100644
--- a/kernel/arch/cris/include/arch-v10/arch/checksum.h
+++ b/kernel/arch/cris/include/arch-v10/arch/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_CHECKSUM_H
 #define _CRIS_ARCH_CHECKSUM_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/delay.h b/kernel/arch/cris/include/arch-v10/arch/delay.h
index 39481f6e0..a57d2cc0b 100644
--- a/kernel/arch/cris/include/arch-v10/arch/delay.h
+++ b/kernel/arch/cris/include/arch-v10/arch/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_DELAY_H
 #define _CRIS_ARCH_DELAY_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/dma.h b/kernel/arch/cris/include/arch-v10/arch/dma.h
index ecb9dba6f..ea794a32c 100644
--- a/kernel/arch/cris/include/arch-v10/arch/dma.h
+++ b/kernel/arch/cris/include/arch-v10/arch/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Defines for using and allocating dma channels. */
 
 #ifndef _ASM_ARCH_DMA_H
diff --git a/kernel/arch/cris/include/arch-v10/arch/io.h b/kernel/arch/cris/include/arch-v10/arch/io.h
index 4a7241728..bae5f77cf 100644
--- a/kernel/arch/cris/include/arch-v10/arch/io.h
+++ b/kernel/arch/cris/include/arch-v10/arch/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_CRIS_IO_H
 #define _ASM_ARCH_CRIS_IO_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/io_interface_mux.h b/kernel/arch/cris/include/arch-v10/arch/io_interface_mux.h
index d92500080..2d5617e67 100644
--- a/kernel/arch/cris/include/arch-v10/arch/io_interface_mux.h
+++ b/kernel/arch/cris/include/arch-v10/arch/io_interface_mux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* IO interface mux allocator for ETRAX100LX.
  * Copyright 2004, Axis Communications AB
  * $Id: io_interface_mux.h,v 1.1 2004/12/13 12:21:53 starvik Exp $
diff --git a/kernel/arch/cris/include/arch-v10/arch/irq.h b/kernel/arch/cris/include/arch-v10/arch/irq.h
index 6aecb8350..c4e8a78e3 100644
--- a/kernel/arch/cris/include/arch-v10/arch/irq.h
+++ b/kernel/arch/cris/include/arch-v10/arch/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Interrupt handling assembler and defines for Linux/CRISv10
  */
diff --git a/kernel/arch/cris/include/arch-v10/arch/irqflags.h b/kernel/arch/cris/include/arch-v10/arch/irqflags.h
index 75ef18991..9959b0a8a 100644
--- a/kernel/arch/cris/include/arch-v10/arch/irqflags.h
+++ b/kernel/arch/cris/include/arch-v10/arch/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_ARCH_IRQFLAGS_H
 #define __ASM_CRIS_ARCH_IRQFLAGS_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/memmap.h b/kernel/arch/cris/include/arch-v10/arch/memmap.h
index 13f3b9714..b6b171f48 100644
--- a/kernel/arch/cris/include/arch-v10/arch/memmap.h
+++ b/kernel/arch/cris/include/arch-v10/arch/memmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_MEMMAP_H
 #define _ASM_ARCH_MEMMAP_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/mmu.h b/kernel/arch/cris/include/arch-v10/arch/mmu.h
index 47a5dd217..74c53048b 100644
--- a/kernel/arch/cris/include/arch-v10/arch/mmu.h
+++ b/kernel/arch/cris/include/arch-v10/arch/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CRIS MMU constants and PTE layout
  */
diff --git a/kernel/arch/cris/include/arch-v10/arch/offset.h b/kernel/arch/cris/include/arch-v10/arch/offset.h
index 675b51d85..6f0f2b4a1 100644
--- a/kernel/arch/cris/include/arch-v10/arch/offset.h
+++ b/kernel/arch/cris/include/arch-v10/arch/offset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_OFFSETS_H__
 #define __ASM_OFFSETS_H__
 /*
diff --git a/kernel/arch/cris/include/arch-v10/arch/page.h b/kernel/arch/cris/include/arch-v10/arch/page.h
index ffafc99c3..a4bbff648 100644
--- a/kernel/arch/cris/include/arch-v10/arch/page.h
+++ b/kernel/arch/cris/include/arch-v10/arch/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_PAGE_H
 #define _CRIS_ARCH_PAGE_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/pgtable.h b/kernel/arch/cris/include/arch-v10/arch/pgtable.h
index 2a2576d1f..a61532d06 100644
--- a/kernel/arch/cris/include/arch-v10/arch/pgtable.h
+++ b/kernel/arch/cris/include/arch-v10/arch/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_PGTABLE_H
 #define _CRIS_ARCH_PGTABLE_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/processor.h b/kernel/arch/cris/include/arch-v10/arch/processor.h
index 93feb2a48..b2df646bc 100644
--- a/kernel/arch/cris/include/arch-v10/arch/processor.h
+++ b/kernel/arch/cris/include/arch-v10/arch/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_ARCH_PROCESSOR_H
 #define __ASM_CRIS_ARCH_PROCESSOR_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/swab.h b/kernel/arch/cris/include/arch-v10/arch/swab.h
index e4e847d8a..8cc27dfb9 100644
--- a/kernel/arch/cris/include/arch-v10/arch/swab.h
+++ b/kernel/arch/cris/include/arch-v10/arch/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_SWAB_H
 #define _CRIS_ARCH_SWAB_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/system.h b/kernel/arch/cris/include/arch-v10/arch/system.h
index 9b5580f58..4c63f7281 100644
--- a/kernel/arch/cris/include/arch-v10/arch/system.h
+++ b/kernel/arch/cris/include/arch-v10/arch/system.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_ARCH_SYSTEM_H
 #define __ASM_CRIS_ARCH_SYSTEM_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/thread_info.h b/kernel/arch/cris/include/arch-v10/arch/thread_info.h
index 218f4152d..0ef122399 100644
--- a/kernel/arch/cris/include/arch-v10/arch/thread_info.h
+++ b/kernel/arch/cris/include/arch-v10/arch/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_THREAD_INFO_H
 #define _ASM_ARCH_THREAD_INFO_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/timex.h b/kernel/arch/cris/include/arch-v10/arch/timex.h
index e48447d94..9c9583e5a 100644
--- a/kernel/arch/cris/include/arch-v10/arch/timex.h
+++ b/kernel/arch/cris/include/arch-v10/arch/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Use prescale timer at 25000 Hz instead of the baudrate timer at 
  * 19200 to get rid of the 64ppm to fast timer (and we get better 
diff --git a/kernel/arch/cris/include/arch-v10/arch/tlb.h b/kernel/arch/cris/include/arch-v10/arch/tlb.h
index 31525bbe7..9f039d83f 100644
--- a/kernel/arch/cris/include/arch-v10/arch/tlb.h
+++ b/kernel/arch/cris/include/arch-v10/arch/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_TLB_H
 #define _CRIS_ARCH_TLB_H
 
diff --git a/kernel/arch/cris/include/arch-v10/arch/uaccess.h b/kernel/arch/cris/include/arch-v10/arch/uaccess.h
index 5477c98c2..8d033c534 100644
--- a/kernel/arch/cris/include/arch-v10/arch/uaccess.h
+++ b/kernel/arch/cris/include/arch-v10/arch/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  * Authors:    Bjorn Wesen (bjornw@axis.com)
  *	       Hans-Peter Nilsson (hp@axis.com)
diff --git a/kernel/arch/cris/include/arch-v10/arch/unistd.h b/kernel/arch/cris/include/arch-v10/arch/unistd.h
index d1a38b9e6..03cd0b865 100644
--- a/kernel/arch/cris/include/arch-v10/arch/unistd.h
+++ b/kernel/arch/cris/include/arch-v10/arch/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_UNISTD_H_
 #define _ASM_CRIS_ARCH_UNISTD_H_
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/bitops.h b/kernel/arch/cris/include/arch-v32/arch/bitops.h
index 147689d6b..7df94798f 100644
--- a/kernel/arch/cris/include/arch-v32/arch/bitops.h
+++ b/kernel/arch/cris/include/arch-v32/arch/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_BITOPS_H
 #define _ASM_CRIS_ARCH_BITOPS_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/bug.h b/kernel/arch/cris/include/arch-v32/arch/bug.h
index fb59faaaa..982c6b08f 100644
--- a/kernel/arch/cris/include/arch-v32/arch/bug.h
+++ b/kernel/arch/cris/include/arch-v32/arch/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRISv32_ARCH_BUG_H
 #define __ASM_CRISv32_ARCH_BUG_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/cache.h b/kernel/arch/cris/include/arch-v32/arch/cache.h
index 7caf25d58..f61f3088c 100644
--- a/kernel/arch/cris/include/arch-v32/arch/cache.h
+++ b/kernel/arch/cris/include/arch-v32/arch/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_CACHE_H
 #define _ASM_CRIS_ARCH_CACHE_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/checksum.h b/kernel/arch/cris/include/arch-v32/arch/checksum.h
index 65cf205b1..fea1341ef 100644
--- a/kernel/arch/cris/include/arch-v32/arch/checksum.h
+++ b/kernel/arch/cris/include/arch-v32/arch/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_CHECKSUM_H
 #define _ASM_CRIS_ARCH_CHECKSUM_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/cryptocop.h b/kernel/arch/cris/include/arch-v32/arch/cryptocop.h
index a56ac61a9..f2f8eda1f 100644
--- a/kernel/arch/cris/include/arch-v32/arch/cryptocop.h
+++ b/kernel/arch/cris/include/arch-v32/arch/cryptocop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The device /dev/cryptocop is accessible using this driver using
  * CRYPTOCOP_MAJOR (254) and minor number 0.
diff --git a/kernel/arch/cris/include/arch-v32/arch/delay.h b/kernel/arch/cris/include/arch-v32/arch/delay.h
index e9fda0381..94307c1fb 100644
--- a/kernel/arch/cris/include/arch-v32/arch/delay.h
+++ b/kernel/arch/cris/include/arch-v32/arch/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_DELAY_H
 #define _ASM_CRIS_ARCH_DELAY_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/Makefile b/kernel/arch/cris/include/arch-v32/arch/hwregs/Makefile
index b8b3f8d66..bb5ffa7ff 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/Makefile
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile to generate or copy the latest register definitions
 # and related datastructures and helpermacros.
 # The official place for these files is at:
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h
index 866191418..6886ba3c2 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ata_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ata_defs_asm_h
 #define __ata_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h
index c686cb335..1d75d8c31 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_core_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_core_defs_asm_h
 #define __bif_core_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h
index 71532aa18..a07447fa7 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_dma_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_dma_defs_asm_h
 #define __bif_dma_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h
index 031f33a36..55697fec6 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/bif_slave_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_slave_defs_asm_h
 #define __bif_slave_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h
index e98476332..6455b4897 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/config_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __config_defs_asm_h
 #define __config_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h
index 7f768db27..bd048296d 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __cris_defs_asm_h
 #define __cris_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h
index 7d3689a6f..429fe0d4f 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/cris_supp_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define RW_GC_CFG	0
 #define RW_GC_CCS	1
 #define RW_GC_SRS	2
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h
index 0cb71bc12..fec451d2a 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/dma_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __dma_defs_asm_h
 #define __dma_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h
index c9f498648..97fe523d4 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/eth_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __eth_defs_asm_h
 #define __eth_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h
index 35356bc08..41bc2f837 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/gio_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __gio_defs_asm_h
 #define __gio_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h
index c8315905c..e371052fa 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Interrupt vector numbers autogenerated by /n/asic/design/tools/rdesc/src/rdes2intr version
  from ../../inst/intr_vect/rtl/guinness/ivmask.config.r
 version . */
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h
index 6df2a433b..8d0c788b2 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/intr_vect_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __intr_vect_defs_asm_h
 #define __intr_vect_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h
index 0c8084054..f62446834 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/irq_nmi_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __irq_nmi_defs_asm_h
 #define __irq_nmi_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h
index 45400eb8d..6a5ce2141 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/marb_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_defs_asm_h
 #define __marb_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h
index 505b7a16d..083174678 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __mmu_defs_asm_h
 #define __mmu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h
index 339500bf3..fd66daa79 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/mmu_supp_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define RW_MM_CFG	0
 #define RW_MM_KBASE_LO	1
 #define RW_MM_KBASE_HI	2
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h
index 10246f49f..72b3d231d 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/rt_trace_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __rt_trace_defs_asm_h
 #define __rt_trace_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h
index 4a2808bdf..944f4c766 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/ser_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ser_defs_asm_h
 #define __ser_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h
index 27d4d91b3..607b50510 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/sser_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __sser_defs_asm_h
 #define __sser_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h
index 55083e6ae..fab117b00 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strcop_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __strcop_defs_asm_h
 #define __strcop_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h
index 69b299920..73755fa8a 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/strmux_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __strmux_defs_asm_h
 #define __strmux_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h
index 43146021f..cc67986d7 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/asm/timer_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __timer_defs_asm_h
 #define __timer_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/ata_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/ata_defs.h
index 43b6643ff..2a8adbcf7 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/ata_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/ata_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ata_defs_h
 #define __ata_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h
index a56608b50..054841c45 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_core_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_core_defs_h
 #define __bif_core_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h
index b931c1aab..5c4abf5c0 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_dma_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_dma_defs_h
 #define __bif_dma_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h
index d18fc3c9f..80c740b3c 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/bif_slave_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_slave_defs_h
 #define __bif_slave_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/config_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/config_defs.h
index 45457a4e3..1c5da14f2 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/config_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/config_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __config_defs_h
 #define __config_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h
index 8370aee8a..913f918bb 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/cpu_vect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Interrupt vector numbers autogenerated by /n/asic/design/tools/rdesc/src/rdes2intr version
  from ../../inst/crisp/doc/cpu_vect.r
 version . */
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/dma.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/dma.h
index 52bf67907..dd24c6da0 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/dma.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * DMA C definitions and help macros
  *
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/dma_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/dma_defs.h
index 48ac8cef7..a67826f5f 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/dma_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/dma_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __dma_defs_h
 #define __dma_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h
index 90fe8a288..d8021b44e 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/eth_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __eth_defs_h
 #define __eth_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h
index c47b5ca48..5937ed7a5 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/extmem_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __extmem_defs_h
 #define __extmem_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
index 0747a22e3..1b9467ae6 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # $Id: Makefile,v 1.3 2004/01/07 20:34:55 johana Exp $
 # Makefile to generate or copy the latest register definitions
 # and related datastructures and helpermacros.
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h
index a4b58000c..10443d789 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_crc_par_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_crc_par_defs_asm_h
 #define __iop_crc_par_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h
index e7d539fec..fdee9bbe1 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_in_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_dmc_in_defs_asm_h
 #define __iop_dmc_in_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h
index 9fe1a8054..a97b741bd 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_dmc_out_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_dmc_out_defs_asm_h
 #define __iop_dmc_out_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h
index 974dee082..e2c099024 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_in_defs_asm_h
 #define __iop_fifo_in_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h
index e00fab0c9..50837b989 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_in_extra_defs_asm_h
 #define __iop_fifo_in_extra_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h
index 9ec5f4a82..9f06dddf3 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_out_defs_asm_h
 #define __iop_fifo_out_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h
index 0f84a50cf..e8c488c38 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_out_extra_defs_asm_h
 #define __iop_fifo_out_extra_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h
index 80490c82c..48869d445 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_mpu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_mpu_defs_asm_h
 #define __iop_mpu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h
index a20b8857b..615f869a6 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_reg_space_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Autogenerated Changes here will be lost!
  * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
  */
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h
index a4a10ff30..fe8c90e01 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_in_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_in_defs_asm_h
 #define __iop_sap_in_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h
index 0ec727f92..a5e46f0bb 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sap_out_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_out_defs_asm_h
 #define __iop_sap_out_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h
index 2cf572159..169aaf8d4 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_in_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_scrc_in_defs_asm_h
 #define __iop_scrc_in_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h
index 640a25725..0e9bca149 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_scrc_out_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_scrc_out_defs_asm_h
 #define __iop_scrc_out_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h
index bb402c1aa..cf2b64a9d 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_spu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_spu_defs_asm_h
 #define __iop_spu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
index 3be60f9b0..4f4c7340d 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cfg_defs_asm_h
 #define __iop_sw_cfg_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
index db347bcba..ef04a57a0 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cpu_defs_asm_h
 #define __iop_sw_cpu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
index ee7dc0435..22292069e 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_mpu_defs_asm_h
 #define __iop_sw_mpu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h
index 0929f144c..827292186 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_sw_spu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_spu_defs_asm_h
 #define __iop_sw_spu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h
index 7129a9a4b..4f1cf73d8 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_timer_grp_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_timer_grp_defs_asm_h
 #define __iop_timer_grp_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h
index 1005d9db8..7bc882c62 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_trigger_grp_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_trigger_grp_defs_asm_h
 #define __iop_trigger_grp_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h
index e13feb20a..2e239957e 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/asm/iop_version_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_version_defs_asm_h
 #define __iop_version_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h
index 90e4785b6..8690034d9 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_crc_par_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_crc_par_defs_h
 #define __iop_crc_par_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h
index 76aec6e37..3dd4e870a 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_in_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_dmc_in_defs_h
 #define __iop_dmc_in_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h
index 938a0d4c4..7ed17bc55 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_dmc_out_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_dmc_out_defs_h
 #define __iop_dmc_out_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h
index e0c982b26..dc1486868 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_in_defs_h
 #define __iop_fifo_in_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h
index 798ac9587..ee7dc07a7 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_in_extra_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_in_extra_defs_h
 #define __iop_fifo_in_extra_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h
index 833e10f02..ee8194fcf 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_out_defs_h
 #define __iop_fifo_out_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h
index 4a840aae8..b9721649f 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_fifo_out_extra_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_fifo_out_extra_defs_h
 #define __iop_fifo_out_extra_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h
index c2b0ba1be..28e1c5903 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_mpu_defs_h
 #define __iop_mpu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h
index 2ec897ced..41f5178a6 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_mpu_macros.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ************************************************************************* */
 /* This file is autogenerated by IOPASM Version 1.2                          */
 /* DO NOT EDIT THIS FILE - All changes will be lost!                         */
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h
index 756550f5d..95e9ce8c0 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_reg_space.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Autogenerated Changes here will be lost!
  * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
  */
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h
index 5548ac100..22a74eafb 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_in_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_in_defs_h
 #define __iop_sap_in_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h
index 273936996..380133910 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sap_out_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_out_defs_h
 #define __iop_sap_out_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h
index 4f0a9a81e..65d662046 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_in_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_scrc_in_defs_h
 #define __iop_scrc_in_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h
index fd1d6ea1d..ba39605b9 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_scrc_out_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_scrc_out_defs_h
 #define __iop_scrc_out_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h
index 0fda26e2f..7681fdab9 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_spu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_spu_defs_h
 #define __iop_spu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h
index d7b6d7588..86e5c9b3e 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cfg_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cfg_defs_h
 #define __iop_sw_cfg_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h
index 5fed844b1..31055d3fc 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_cpu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cpu_defs_h
 #define __iop_sw_cpu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h
index da718f2a8..5038c08e8 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_mpu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_mpu_defs_h
 #define __iop_sw_mpu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h
index b59dde4bd..aeebd57af 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_sw_spu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_spu_defs_h
 #define __iop_sw_spu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h
index c994114f3..b4095422a 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_timer_grp_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_timer_grp_defs_h
 #define __iop_timer_grp_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h
index 36e442823..aff694506 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_trigger_grp_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_trigger_grp_defs_h
 #define __iop_trigger_grp_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h
index b8d6a910c..53a4b8cda 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/iop/iop_version_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_version_defs_h
 #define __iop_version_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h
index 7b167e3c0..63b20dee2 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/irq_nmi_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __irq_nmi_defs_h
 #define __irq_nmi_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h
index a11fdd3cd..da29a8a22 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_bp_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_bp_defs_h
 #define __marb_bp_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_defs.h
index 71e8af0bb..2858de48a 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/marb_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_defs_h
 #define __marb_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h
index 236f91efe..8fabdd211 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/reg_rdwr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Read/write register macros used by *_defs.h
  */
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h
index d9f0e924f..ebb6bbc6e 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/rt_trace_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __rt_trace_defs_h
 #define __rt_trace_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/ser_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/ser_defs.h
index 01c2fab97..3b04cf901 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/ser_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/ser_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ser_defs_h
 #define __ser_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/sser_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/sser_defs.h
index 8d1dab218..02971f9b6 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/sser_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/sser_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __sser_defs_h
 #define __sser_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop.h
index 35131ba46..2c522b024 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 // $Id: strcop.h,v 1.3 2003/10/22 13:27:12 henriken Exp $
 
 // Streamcop meta-data configuration structs
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h
index bd145a49b..069b2ed9d 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/strcop_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __strcop_defs_h
 #define __strcop_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/hwregs/supp_reg.h b/kernel/arch/cris/include/arch-v32/arch/hwregs/supp_reg.h
index ffe49625a..c3fa0c06c 100644
--- a/kernel/arch/cris/include/arch-v32/arch/hwregs/supp_reg.h
+++ b/kernel/arch/cris/include/arch-v32/arch/hwregs/supp_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUPP_REG_H__
 #define __SUPP_REG_H__
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/intmem.h b/kernel/arch/cris/include/arch-v32/arch/intmem.h
index c0ada33bf..2bcb21c9b 100644
--- a/kernel/arch/cris/include/arch-v32/arch/intmem.h
+++ b/kernel/arch/cris/include/arch-v32/arch/intmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_INTMEM_H
 #define _ASM_CRIS_INTMEM_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/irq.h b/kernel/arch/cris/include/arch-v32/arch/irq.h
index 8270a1bbf..525908400 100644
--- a/kernel/arch/cris/include/arch-v32/arch/irq.h
+++ b/kernel/arch/cris/include/arch-v32/arch/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_IRQ_H
 #define _ASM_ARCH_IRQ_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/irqflags.h b/kernel/arch/cris/include/arch-v32/arch/irqflags.h
index 5f6fddf99..d55bf82de 100644
--- a/kernel/arch/cris/include/arch-v32/arch/irqflags.h
+++ b/kernel/arch/cris/include/arch-v32/arch/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_ARCH_IRQFLAGS_H
 #define __ASM_CRIS_ARCH_IRQFLAGS_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/mmu.h b/kernel/arch/cris/include/arch-v32/arch/mmu.h
index e6db1616d..a8eec1312 100644
--- a/kernel/arch/cris/include/arch-v32/arch/mmu.h
+++ b/kernel/arch/cris/include/arch-v32/arch/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_MMU_H
 #define _ASM_CRIS_ARCH_MMU_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/offset.h b/kernel/arch/cris/include/arch-v32/arch/offset.h
index 4442c4bd5..10a670443 100644
--- a/kernel/arch/cris/include/arch-v32/arch/offset.h
+++ b/kernel/arch/cris/include/arch-v32/arch/offset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_OFFSETS_H__
 #define __ASM_OFFSETS_H__
 /*
diff --git a/kernel/arch/cris/include/arch-v32/arch/page.h b/kernel/arch/cris/include/arch-v32/arch/page.h
index e5b5aab52..7ac04f615 100644
--- a/kernel/arch/cris/include/arch-v32/arch/page.h
+++ b/kernel/arch/cris/include/arch-v32/arch/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_PAGE_H
 #define _ASM_CRIS_ARCH_PAGE_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/pgtable.h b/kernel/arch/cris/include/arch-v32/arch/pgtable.h
index c1051a8da..e787b19b7 100644
--- a/kernel/arch/cris/include/arch-v32/arch/pgtable.h
+++ b/kernel/arch/cris/include/arch-v32/arch/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_PGTABLE_H
 #define _ASM_CRIS_ARCH_PGTABLE_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/processor.h b/kernel/arch/cris/include/arch-v32/arch/processor.h
index 568759271..554088ab5 100644
--- a/kernel/arch/cris/include/arch-v32/arch/processor.h
+++ b/kernel/arch/cris/include/arch-v32/arch/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_PROCESSOR_H
 #define _ASM_CRIS_ARCH_PROCESSOR_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/swab.h b/kernel/arch/cris/include/arch-v32/arch/swab.h
index 9a4ea5e20..280dd7093 100644
--- a/kernel/arch/cris/include/arch-v32/arch/swab.h
+++ b/kernel/arch/cris/include/arch-v32/arch/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_SWAB_H
 #define _ASM_CRIS_ARCH_SWAB_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/system.h b/kernel/arch/cris/include/arch-v32/arch/system.h
index db853fb3a..84f00e5d4 100644
--- a/kernel/arch/cris/include/arch-v32/arch/system.h
+++ b/kernel/arch/cris/include/arch-v32/arch/system.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_SYSTEM_H
 #define _ASM_CRIS_ARCH_SYSTEM_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/thread_info.h b/kernel/arch/cris/include/arch-v32/arch/thread_info.h
index d6936956a..8514669e5 100644
--- a/kernel/arch/cris/include/arch-v32/arch/thread_info.h
+++ b/kernel/arch/cris/include/arch-v32/arch/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_THREAD_INFO_H
 #define _ASM_CRIS_ARCH_THREAD_INFO_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/timex.h b/kernel/arch/cris/include/arch-v32/arch/timex.h
index 2591d3c5e..2cd8e704a 100644
--- a/kernel/arch/cris/include/arch-v32/arch/timex.h
+++ b/kernel/arch/cris/include/arch-v32/arch/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_TIMEX_H
 #define _ASM_CRIS_ARCH_TIMEX_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/tlb.h b/kernel/arch/cris/include/arch-v32/arch/tlb.h
index 4effb1253..504528027 100644
--- a/kernel/arch/cris/include/arch-v32/arch/tlb.h
+++ b/kernel/arch/cris/include/arch-v32/arch/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_ARCH_TLB_H
 #define _CRIS_ARCH_TLB_H
 
diff --git a/kernel/arch/cris/include/arch-v32/arch/uaccess.h b/kernel/arch/cris/include/arch-v32/arch/uaccess.h
index dc2ce090f..214bd26ef 100644
--- a/kernel/arch/cris/include/arch-v32/arch/uaccess.h
+++ b/kernel/arch/cris/include/arch-v32/arch/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Authors:    Hans-Peter Nilsson (hp@axis.com)
  *
diff --git a/kernel/arch/cris/include/arch-v32/arch/unistd.h b/kernel/arch/cris/include/arch-v32/arch/unistd.h
index 0051114c6..764435b3b 100644
--- a/kernel/arch/cris/include/arch-v32/arch/unistd.h
+++ b/kernel/arch/cris/include/arch-v32/arch/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_UNISTD_H_
 #define _ASM_CRIS_ARCH_UNISTD_H_
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h
index 65e9d6ff0..7fafc370d 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/arbiter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_ARBITER_H
 #define _ASM_CRIS_ARCH_ARBITER_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/dma.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/dma.h
index f01dca1ad..92a74eab4 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/dma.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_CRIS_DMA_H
 #define _ASM_ARCH_CRIS_DMA_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h
index 02855adf6..3d7f12ec1 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/clkgen_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __clkgen_defs_asm_h
 #define __clkgen_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h
index b12be03ed..df79e5a7f 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/ddr2_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ddr2_defs_asm_h
 #define __ddr2_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h
index df6714fda..04b7ff3f7 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/gio_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __gio_defs_asm_h
 #define __gio_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h
index c3dc9c666..a73168a8e 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pinmux_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __pinmux_defs_asm_h
 #define __pinmux_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h
index 3907ef492..463bb9e2c 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/pio_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __pio_defs_asm_h
 #define __pio_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h
index 89439e961..e3bf8e069 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/reg_map_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __reg_map_asm_h
 #define __reg_map_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h
index b129e826f..82da59c38 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/asm/timer_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __timer_defs_asm_h
 #define __timer_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h
index c1e9ba93b..32d58fed3 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/clkgen_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __clkgen_defs_h
 #define __clkgen_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h
index 0f30e8bf9..84684c335 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/ddr2_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ddr2_defs_h
 #define __ddr2_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h
index 5d88e0db2..83ab1f495 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/gio_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __gio_defs_h
 #define __gio_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h
index bea699aa4..55dab5bd7 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Interrupt vector numbers autogenerated by ../../../tools/rdesc/bin/rdes2intr 
    from intr_vect.r */
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h
index b820f6347..71a28d1ed 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/intr_vect_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __intr_vect_defs_h
 #define __intr_vect_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h
index d75a74e90..5e5f4d94a 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_reg_space_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Autogenerated Changes here will be lost!
  * generated by ./gen_sw.pl Wed Feb 14 09:27:48 2007 iop_sw.cfg 
  */
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h
index 7f90b5a04..ee0587ec4 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_in_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_in_defs_asm_h
 #define __iop_sap_in_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h
index 399bd6564..9bbe0b920 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sap_out_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_out_defs_asm_h
 #define __iop_sap_out_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
index 3b3949b51..c4b8bc386 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cfg_defs_asm_h
 #define __iop_sw_cfg_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
index 3f4fe1b31..89f36dc1f 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cpu_defs_asm_h
 #define __iop_sw_cpu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
index ffcc83b22..45e19d79d 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_mpu_defs_asm_h
 #define __iop_sw_mpu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h
index 67a745338..55afb6e32 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_sw_spu_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_spu_defs_asm_h
 #define __iop_sw_spu_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h
index 4ad671202..79ff8fafd 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/asm/iop_version_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_version_defs_asm_h
 #define __iop_version_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h
index af3196c60..23d731f36 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_reg_space.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Autogenerated Changes here will be lost!
  * generated by ./gen_sw.pl Wed Feb 14 09:27:48 2007 iop_sw.cfg 
  */
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h
index 51dde016c..1d6c09a32 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_in_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_in_defs_h
 #define __iop_sap_in_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h
index 5af88baa2..1cbd30efa 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sap_out_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sap_out_defs_h
 #define __iop_sap_out_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h
index 98ac95275..07050b053 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cfg_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cfg_defs_h
 #define __iop_sw_cfg_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h
index a16f55637..b4acdae4f 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_cpu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_cpu_defs_h
 #define __iop_sw_cpu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h
index a2e4e1a33..bc1abb5fb 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_mpu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_mpu_defs_h
 #define __iop_sw_mpu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h
index c8560b865..82b64360a 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_sw_spu_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_sw_spu_defs_h
 #define __iop_sw_spu_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h
index 20de425e6..d944c6ce5 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/iop/iop_version_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __iop_version_defs_h
 #define __iop_version_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h
index 243ac3c88..5c72116f1 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/l2cache_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __l2cache_defs_h
 #define __l2cache_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h
index c0e7628cb..84f68755a 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_bar_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_bar_defs_h
 #define __marb_bar_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h
index 2baa833f1..13539bc5d 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/marb_foo_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_foo_defs_h
 #define __marb_foo_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h
index 4b96cd2cb..d604042a5 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pinmux_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __pinmux_defs_h
 #define __pinmux_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h
index 2d8e4b4cc..348e39f41 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/pio_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __pio_defs_h
 #define __pio_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h
index 36e59d6e9..04ef87d42 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/reg_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __reg_map_h
 #define __reg_map_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h
index 14f718a4e..a19955fa8 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/strmux_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __strmux_defs_h
 #define __strmux_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h
index 2c33e097d..de849a636 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/hwregs/timer_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __timer_defs_h
 #define __timer_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/memmap.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/memmap.h
index 7e15c9eb4..7b9a9a569 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/memmap.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/memmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_MEMMAP_H
 #define _ASM_ARCH_MEMMAP_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-a3/mach/pinmux.h b/kernel/arch/cris/include/arch-v32/mach-a3/mach/pinmux.h
index db42a7254..35e3fc97d 100644
--- a/kernel/arch/cris/include/arch-v32/mach-a3/mach/pinmux.h
+++ b/kernel/arch/cris/include/arch-v32/mach-a3/mach/pinmux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_PINMUX_H
 #define _ASM_CRIS_ARCH_PINMUX_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/arbiter.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/arbiter.h
index a2e0ec8fa..f9401a3de 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/arbiter.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/arbiter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_ARBITER_H
 #define _ASM_CRIS_ARCH_ARBITER_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/dma.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/dma.h
index a8c592925..53a59944a 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/dma.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_CRIS_DMA_H
 #define _ASM_ARCH_CRIS_DMA_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h
index 0a409c928..092cad384 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/bif_core_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_core_defs_asm_h
 #define __bif_core_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h
index a9908dfc2..5b38835b4 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/config_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __config_defs_asm_h
 #define __config_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h
index be4c63936..3d2056892 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/gio_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __gio_defs_asm_h
 #define __gio_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h
index 30cf5a936..99968cfa4 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/pinmux_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __pinmux_defs_asm_h
 #define __pinmux_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h
index 87517aebd..412b8748e 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/reg_map_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __reg_map_h
 #define __reg_map_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h
index e1197194d..3eb17cfbd 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/asm/timer_defs_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __timer_defs_asm_h
 #define __timer_defs_asm_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h
index 44362a62b..a9ffb7eda 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_core_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_core_defs_h
 #define __bif_core_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h
index 3cb51a09d..d1fa172f5 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_dma_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_dma_defs_h
 #define __bif_dma_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h
index 0c434585a..a8d7cc528 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/bif_slave_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __bif_slave_defs_h
 #define __bif_slave_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h
index abc5f2070..cc8b20d17 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/config_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __config_defs_h
 #define __config_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h
index 26aa3efcf..da0b1103b 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/gio_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __gio_defs_h
 #define __gio_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h
index bacc2a895..ea752a2d8 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Interrupt vector numbers autogenerated by /n/asic/design/tools/rdesc/src/rdes2intr version
  from ../../inst/intr_vect/rtl/guinness/ivmask.config.r
 version . */
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h
index aa65128ae..11ebd6658 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/intr_vect_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __intr_vect_defs_h
 #define __intr_vect_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h
index dcaaec462..fb7e20d77 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_bp_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_bp_defs_h
 #define __marb_bp_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h
index 254da0854..872a79429 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/marb_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __marb_defs_h
 #define __marb_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h
index 751eab5f1..0a316dc36 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/pinmux_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __pinmux_defs_h
 #define __pinmux_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h
index 4146973a5..1bfca2666 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/reg_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __reg_map_h
 #define __reg_map_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h
index cbfaa8678..0ab49edb1 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/strmux_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __strmux_defs_h
 #define __strmux_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h
index 76bcc5919..59c70ba99 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/hwregs/timer_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __timer_defs_h
 #define __timer_defs_h
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/memmap.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/memmap.h
index d29df5644..94328936c 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/memmap.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/memmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARCH_MEMMAP_H
 #define _ASM_ARCH_MEMMAP_H
 
diff --git a/kernel/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h b/kernel/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h
index 09bf0c90d..1d87f1392 100644
--- a/kernel/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h
+++ b/kernel/arch/cris/include/arch-v32/mach-fs/mach/pinmux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_ARCH_PINMUX_H
 #define _ASM_CRIS_ARCH_PINMUX_H
 
diff --git a/kernel/arch/cris/include/asm/axisflashmap.h b/kernel/arch/cris/include/asm/axisflashmap.h
index 015ca5445..185596c2c 100644
--- a/kernel/arch/cris/include/asm/axisflashmap.h
+++ b/kernel/arch/cris/include/asm/axisflashmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_AXISFLASHMAP_H
 #define __ASM_AXISFLASHMAP_H
 
diff --git a/kernel/arch/cris/include/asm/bitops.h b/kernel/arch/cris/include/asm/bitops.h
index 8062cb52d..78f975ad4 100644
--- a/kernel/arch/cris/include/asm/bitops.h
+++ b/kernel/arch/cris/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* asm/bitops.h for Linux/CRIS
  *
  * TODO: asm versions if speed is needed
diff --git a/kernel/arch/cris/include/asm/bug.h b/kernel/arch/cris/include/asm/bug.h
index 3b3958963..f1fa72a42 100644
--- a/kernel/arch/cris/include/asm/bug.h
+++ b/kernel/arch/cris/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_BUG_H
 #define _CRIS_BUG_H
 #include <arch/bug.h>
diff --git a/kernel/arch/cris/include/asm/cache.h b/kernel/arch/cris/include/asm/cache.h
index a692b9fba..8dac09227 100644
--- a/kernel/arch/cris/include/asm/cache.h
+++ b/kernel/arch/cris/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CACHE_H
 #define _ASM_CACHE_H
 
diff --git a/kernel/arch/cris/include/asm/cacheflush.h b/kernel/arch/cris/include/asm/cacheflush.h
index 36795bca6..0da1c76a2 100644
--- a/kernel/arch/cris/include/asm/cacheflush.h
+++ b/kernel/arch/cris/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_CACHEFLUSH_H
 #define _CRIS_CACHEFLUSH_H
 
diff --git a/kernel/arch/cris/include/asm/checksum.h b/kernel/arch/cris/include/asm/checksum.h
index ea949c60b..61b6a4f6a 100644
--- a/kernel/arch/cris/include/asm/checksum.h
+++ b/kernel/arch/cris/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* TODO: csum_tcpudp_magic could be speeded up, and csum_fold as well */
 
 #ifndef _CRIS_CHECKSUM_H
diff --git a/kernel/arch/cris/include/asm/delay.h b/kernel/arch/cris/include/asm/delay.h
index 75ec581bf..2dfdb13e1 100644
--- a/kernel/arch/cris/include/asm/delay.h
+++ b/kernel/arch/cris/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_DELAY_H
 #define _CRIS_DELAY_H
 
diff --git a/kernel/arch/cris/include/asm/dma-mapping.h b/kernel/arch/cris/include/asm/dma-mapping.h
index 256169de3..1c9bf1480 100644
--- a/kernel/arch/cris/include/asm/dma-mapping.h
+++ b/kernel/arch/cris/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_DMA_MAPPING_H
 #define _ASM_CRIS_DMA_MAPPING_H
 
diff --git a/kernel/arch/cris/include/asm/dma.h b/kernel/arch/cris/include/asm/dma.h
index 30fd715fa..e1f7d6d9b 100644
--- a/kernel/arch/cris/include/asm/dma.h
+++ b/kernel/arch/cris/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: dma.h,v 1.2 2001/05/09 12:17:42 johana Exp $ */
 
 #ifndef _ASM_DMA_H
diff --git a/kernel/arch/cris/include/asm/eshlibld.h b/kernel/arch/cris/include/asm/eshlibld.h
index 70aa44825..88940556c 100644
--- a/kernel/arch/cris/include/asm/eshlibld.h
+++ b/kernel/arch/cris/include/asm/eshlibld.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*!**************************************************************************
 *!
 *! FILE NAME  : eshlibld.h
diff --git a/kernel/arch/cris/include/asm/etraxi2c.h b/kernel/arch/cris/include/asm/etraxi2c.h
index e369a7620..0fa6f03d9 100644
--- a/kernel/arch/cris/include/asm/etraxi2c.h
+++ b/kernel/arch/cris/include/asm/etraxi2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: etraxi2c.h,v 1.1 2001/01/18 15:49:57 bjornw Exp $ */
 
 #ifndef _LINUX_ETRAXI2C_H
diff --git a/kernel/arch/cris/include/asm/fasttimer.h b/kernel/arch/cris/include/asm/fasttimer.h
index 8f8a8d6c9..bc109f4a8 100644
--- a/kernel/arch/cris/include/asm/fasttimer.h
+++ b/kernel/arch/cris/include/asm/fasttimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-cris/fasttimer.h
  *
diff --git a/kernel/arch/cris/include/asm/fb.h b/kernel/arch/cris/include/asm/fb.h
index c7df38030..e10150073 100644
--- a/kernel/arch/cris/include/asm/fb.h
+++ b/kernel/arch/cris/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 #include <linux/fb.h>
diff --git a/kernel/arch/cris/include/asm/io.h b/kernel/arch/cris/include/asm/io.h
index fe0b2a0ae..c92712d30 100644
--- a/kernel/arch/cris/include/asm/io.h
+++ b/kernel/arch/cris/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_IO_H
 #define _ASM_CRIS_IO_H
 
diff --git a/kernel/arch/cris/include/asm/irq.h b/kernel/arch/cris/include/asm/irq.h
index ce0fcf540..6a932f7db 100644
--- a/kernel/arch/cris/include/asm/irq.h
+++ b/kernel/arch/cris/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
diff --git a/kernel/arch/cris/include/asm/mmu.h b/kernel/arch/cris/include/asm/mmu.h
index e06ea94ec..54da8f64b 100644
--- a/kernel/arch/cris/include/asm/mmu.h
+++ b/kernel/arch/cris/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CRIS MMU constants and PTE layout
  */
diff --git a/kernel/arch/cris/include/asm/mmu_context.h b/kernel/arch/cris/include/asm/mmu_context.h
index 349acfd25..178f3b72e 100644
--- a/kernel/arch/cris/include/asm/mmu_context.h
+++ b/kernel/arch/cris/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CRIS_MMU_CONTEXT_H
 #define __CRIS_MMU_CONTEXT_H
 
diff --git a/kernel/arch/cris/include/asm/page.h b/kernel/arch/cris/include/asm/page.h
index dfc53f9b8..5b5b3dad7 100644
--- a/kernel/arch/cris/include/asm/page.h
+++ b/kernel/arch/cris/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_PAGE_H
 #define _CRIS_PAGE_H
 
diff --git a/kernel/arch/cris/include/asm/pci.h b/kernel/arch/cris/include/asm/pci.h
index 6e505332b..6f8b366a2 100644
--- a/kernel/arch/cris/include/asm/pci.h
+++ b/kernel/arch/cris/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_PCI_H
 #define __ASM_CRIS_PCI_H
 
diff --git a/kernel/arch/cris/include/asm/pgalloc.h b/kernel/arch/cris/include/asm/pgalloc.h
index 42f1affb9..d8dc1b834 100644
--- a/kernel/arch/cris/include/asm/pgalloc.h
+++ b/kernel/arch/cris/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_PGALLOC_H
 #define _CRIS_PGALLOC_H
 
diff --git a/kernel/arch/cris/include/asm/pgtable.h b/kernel/arch/cris/include/asm/pgtable.h
index fa3a73004..03fca401e 100644
--- a/kernel/arch/cris/include/asm/pgtable.h
+++ b/kernel/arch/cris/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CRIS pgtable.h - macros and functions to manipulate page tables.
  */
diff --git a/kernel/arch/cris/include/asm/processor.h b/kernel/arch/cris/include/asm/processor.h
index bc2729e4b..124dd5ec7 100644
--- a/kernel/arch/cris/include/asm/processor.h
+++ b/kernel/arch/cris/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-cris/processor.h
  *
diff --git a/kernel/arch/cris/include/asm/ptrace.h b/kernel/arch/cris/include/asm/ptrace.h
index 9e788d04a..d69295f1a 100644
--- a/kernel/arch/cris/include/asm/ptrace.h
+++ b/kernel/arch/cris/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_PTRACE_H
 #define _CRIS_PTRACE_H
 
diff --git a/kernel/arch/cris/include/asm/segment.h b/kernel/arch/cris/include/asm/segment.h
index c067513be..6ac914b09 100644
--- a/kernel/arch/cris/include/asm/segment.h
+++ b/kernel/arch/cris/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SEGMENT_H
 #define _ASM_SEGMENT_H
 
diff --git a/kernel/arch/cris/include/asm/serial.h b/kernel/arch/cris/include/asm/serial.h
index af7535a95..f51e0e10f 100644
--- a/kernel/arch/cris/include/asm/serial.h
+++ b/kernel/arch/cris/include/asm/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SERIAL_H
 #define _ASM_SERIAL_H
 
diff --git a/kernel/arch/cris/include/asm/shmparam.h b/kernel/arch/cris/include/asm/shmparam.h
index d29d12270..704a7257c 100644
--- a/kernel/arch/cris/include/asm/shmparam.h
+++ b/kernel/arch/cris/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_SHMPARAM_H
 #define _ASM_CRIS_SHMPARAM_H
 
diff --git a/kernel/arch/cris/include/asm/signal.h b/kernel/arch/cris/include/asm/signal.h
index c11b8745c..64b0943c0 100644
--- a/kernel/arch/cris/include/asm/signal.h
+++ b/kernel/arch/cris/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_SIGNAL_H
 #define _ASM_CRIS_SIGNAL_H
 
diff --git a/kernel/arch/cris/include/asm/stacktrace.h b/kernel/arch/cris/include/asm/stacktrace.h
index 2d9085694..154f0c90d 100644
--- a/kernel/arch/cris/include/asm/stacktrace.h
+++ b/kernel/arch/cris/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CRIS_STACKTRACE_H
 #define __CRIS_STACKTRACE_H
 
diff --git a/kernel/arch/cris/include/asm/string.h b/kernel/arch/cris/include/asm/string.h
index d5db39f9e..bae5a0867 100644
--- a/kernel/arch/cris/include/asm/string.h
+++ b/kernel/arch/cris/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_STRING_H
 #define _ASM_CRIS_STRING_H
 
diff --git a/kernel/arch/cris/include/asm/swab.h b/kernel/arch/cris/include/asm/swab.h
index 991b6ace1..5e1d8cf27 100644
--- a/kernel/arch/cris/include/asm/swab.h
+++ b/kernel/arch/cris/include/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_SWAB_H
 #define _CRIS_SWAB_H
 
diff --git a/kernel/arch/cris/include/asm/switch_to.h b/kernel/arch/cris/include/asm/switch_to.h
index d842e1163..dde4acf6e 100644
--- a/kernel/arch/cris/include/asm/switch_to.h
+++ b/kernel/arch/cris/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_SWITCH_TO_H
 #define __ASM_CRIS_SWITCH_TO_H
 
diff --git a/kernel/arch/cris/include/asm/termios.h b/kernel/arch/cris/include/asm/termios.h
index 1991cd9e4..9832bf322 100644
--- a/kernel/arch/cris/include/asm/termios.h
+++ b/kernel/arch/cris/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_TERMIOS_H
 #define _CRIS_TERMIOS_H
 
diff --git a/kernel/arch/cris/include/asm/thread_info.h b/kernel/arch/cris/include/asm/thread_info.h
index 4ead1b40d..472830c90 100644
--- a/kernel/arch/cris/include/asm/thread_info.h
+++ b/kernel/arch/cris/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: CRIS low-level thread information
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)
diff --git a/kernel/arch/cris/include/asm/timex.h b/kernel/arch/cris/include/asm/timex.h
index 980924ae7..3840a5566 100644
--- a/kernel/arch/cris/include/asm/timex.h
+++ b/kernel/arch/cris/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-cris/timex.h
  *
diff --git a/kernel/arch/cris/include/asm/tlb.h b/kernel/arch/cris/include/asm/tlb.h
index 77384ea2f..1f6a8a67c 100644
--- a/kernel/arch/cris/include/asm/tlb.h
+++ b/kernel/arch/cris/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_TLB_H
 #define _CRIS_TLB_H
 
diff --git a/kernel/arch/cris/include/asm/tlbflush.h b/kernel/arch/cris/include/asm/tlbflush.h
index b424f43a9..e7cb96453 100644
--- a/kernel/arch/cris/include/asm/tlbflush.h
+++ b/kernel/arch/cris/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRIS_TLBFLUSH_H
 #define _CRIS_TLBFLUSH_H
 
diff --git a/kernel/arch/cris/include/asm/uaccess.h b/kernel/arch/cris/include/asm/uaccess.h
index b0c6b077b..3b42ab0ca 100644
--- a/kernel/arch/cris/include/asm/uaccess.h
+++ b/kernel/arch/cris/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Authors:    Bjorn Wesen (bjornw@axis.com)
  *	       Hans-Peter Nilsson (hp@axis.com)
diff --git a/kernel/arch/cris/include/asm/ucontext.h b/kernel/arch/cris/include/asm/ucontext.h
index eed6ad5eb..22f7e7cf5 100644
--- a/kernel/arch/cris/include/asm/ucontext.h
+++ b/kernel/arch/cris/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_UCONTEXT_H
 #define _ASM_CRIS_UCONTEXT_H
 
diff --git a/kernel/arch/cris/include/asm/unaligned.h b/kernel/arch/cris/include/asm/unaligned.h
index 7b3f3fec5..21772cf60 100644
--- a/kernel/arch/cris/include/asm/unaligned.h
+++ b/kernel/arch/cris/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_UNALIGNED_H
 #define _ASM_CRIS_UNALIGNED_H
 
diff --git a/kernel/arch/cris/include/asm/unistd.h b/kernel/arch/cris/include/asm/unistd.h
index 9c2353582..6a92c0505 100644
--- a/kernel/arch/cris/include/asm/unistd.h
+++ b/kernel/arch/cris/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CRIS_UNISTD_H_
 #define _ASM_CRIS_UNISTD_H_
 
diff --git a/kernel/arch/cris/include/asm/user.h b/kernel/arch/cris/include/asm/user.h
index 59147cf43..a19c39547 100644
--- a/kernel/arch/cris/include/asm/user.h
+++ b/kernel/arch/cris/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CRIS_USER_H
 #define __ASM_CRIS_USER_H
 
diff --git a/kernel/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h b/kernel/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h
index c4b6b0e9b..2644bcbe4 100644
--- a/kernel/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h
+++ b/kernel/arch/cris/include/uapi/arch-v10/arch/sv_addr_ag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*!**************************************************************************
 *!                                                            
 *! MACROS:
diff --git a/kernel/arch/cris/include/uapi/arch-v10/arch/svinto.h b/kernel/arch/cris/include/uapi/arch-v10/arch/svinto.h
index da5c15272..793a4275d 100644
--- a/kernel/arch/cris/include/uapi/arch-v10/arch/svinto.h
+++ b/kernel/arch/cris/include/uapi/arch-v10/arch/svinto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_CRIS_SVINTO_H
 #define _ASM_CRIS_SVINTO_H
 
diff --git a/kernel/arch/cris/include/uapi/arch-v10/arch/user.h b/kernel/arch/cris/include/uapi/arch-v10/arch/user.h
index 9303ea77c..5b9288527 100644
--- a/kernel/arch/cris/include/uapi/arch-v10/arch/user.h
+++ b/kernel/arch/cris/include/uapi/arch-v10/arch/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_CRIS_ARCH_USER_H
 #define __ASM_CRIS_ARCH_USER_H
 
diff --git a/kernel/arch/cris/include/uapi/arch-v32/arch/cryptocop.h b/kernel/arch/cris/include/uapi/arch-v32/arch/cryptocop.h
index 694fd13ce..1072d5bf7 100644
--- a/kernel/arch/cris/include/uapi/arch-v32/arch/cryptocop.h
+++ b/kernel/arch/cris/include/uapi/arch-v32/arch/cryptocop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * The device /dev/cryptocop is accessible using this driver using
  * CRYPTOCOP_MAJOR (254) and minor number 0.
diff --git a/kernel/arch/cris/include/uapi/arch-v32/arch/user.h b/kernel/arch/cris/include/uapi/arch-v32/arch/user.h
index 03fa1f3c3..3576b540b 100644
--- a/kernel/arch/cris/include/uapi/arch-v32/arch/user.h
+++ b/kernel/arch/cris/include/uapi/arch-v32/arch/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_CRIS_ARCH_USER_H
 #define _ASM_CRIS_ARCH_USER_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/byteorder.h b/kernel/arch/cris/include/uapi/asm/byteorder.h
index bcd189798..6e19891e0 100644
--- a/kernel/arch/cris/include/uapi/asm/byteorder.h
+++ b/kernel/arch/cris/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CRIS_BYTEORDER_H
 #define _CRIS_BYTEORDER_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/elf.h b/kernel/arch/cris/include/uapi/asm/elf.h
index a5df05bfe..ea4cbdafe 100644
--- a/kernel/arch/cris/include/uapi/asm/elf.h
+++ b/kernel/arch/cris/include/uapi/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASMCRIS_ELF_H
 #define __ASMCRIS_ELF_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/elf_v10.h b/kernel/arch/cris/include/uapi/asm/elf_v10.h
index 3ea65cef5..b1515f268 100644
--- a/kernel/arch/cris/include/uapi/asm/elf_v10.h
+++ b/kernel/arch/cris/include/uapi/asm/elf_v10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASMCRIS_ARCH_ELF_H
 #define __ASMCRIS_ARCH_ELF_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/elf_v32.h b/kernel/arch/cris/include/uapi/asm/elf_v32.h
index f09fe4900..cc00ffdb7 100644
--- a/kernel/arch/cris/include/uapi/asm/elf_v32.h
+++ b/kernel/arch/cris/include/uapi/asm/elf_v32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_CRIS_ELF_H
 #define _ASM_CRIS_ELF_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/ethernet.h b/kernel/arch/cris/include/uapi/asm/ethernet.h
index 4d58652c3..e0c1a6322 100644
--- a/kernel/arch/cris/include/uapi/asm/ethernet.h
+++ b/kernel/arch/cris/include/uapi/asm/ethernet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*  
  * ioctl defines for ethernet driver
  *
diff --git a/kernel/arch/cris/include/uapi/asm/etraxgpio.h b/kernel/arch/cris/include/uapi/asm/etraxgpio.h
index c6e7d57c8..10ab0dd45 100644
--- a/kernel/arch/cris/include/uapi/asm/etraxgpio.h
+++ b/kernel/arch/cris/include/uapi/asm/etraxgpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * The following devices are accessible using this driver using
  * GPIO_MAJOR (120) and a couple of minor numbers.
diff --git a/kernel/arch/cris/include/uapi/asm/ioctls.h b/kernel/arch/cris/include/uapi/asm/ioctls.h
index 488fbb3f5..92d654ce3 100644
--- a/kernel/arch/cris/include/uapi/asm/ioctls.h
+++ b/kernel/arch/cris/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_CRIS_IOCTLS_H__
 #define __ARCH_CRIS_IOCTLS_H__
 
diff --git a/kernel/arch/cris/include/uapi/asm/param.h b/kernel/arch/cris/include/uapi/asm/param.h
index 484fcf866..ae296115c 100644
--- a/kernel/arch/cris/include/uapi/asm/param.h
+++ b/kernel/arch/cris/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMCRIS_PARAM_H
 #define _ASMCRIS_PARAM_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/posix_types.h b/kernel/arch/cris/include/uapi/asm/posix_types.h
index 0f22e6a67..c75d8b0ac 100644
--- a/kernel/arch/cris/include/uapi/asm/posix_types.h
+++ b/kernel/arch/cris/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: posix_types.h,v 1.1 2000/07/10 16:32:31 bjornw Exp $ */
 
 /* We cheat a bit and use our C-coded bitops functions from asm/bitops.h */
diff --git a/kernel/arch/cris/include/uapi/asm/ptrace.h b/kernel/arch/cris/include/uapi/asm/ptrace.h
index bd8946f83..99de59e54 100644
--- a/kernel/arch/cris/include/uapi/asm/ptrace.h
+++ b/kernel/arch/cris/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifdef __arch_v32
 #include <asm/ptrace_v32.h>
 #else
diff --git a/kernel/arch/cris/include/uapi/asm/ptrace_v10.h b/kernel/arch/cris/include/uapi/asm/ptrace_v10.h
index 1a2327395..4ffffb7ab 100644
--- a/kernel/arch/cris/include/uapi/asm/ptrace_v10.h
+++ b/kernel/arch/cris/include/uapi/asm/ptrace_v10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CRIS_ARCH_PTRACE_H
 #define _CRIS_ARCH_PTRACE_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/ptrace_v32.h b/kernel/arch/cris/include/uapi/asm/ptrace_v32.h
index 19773d3bd..a91c4aacb 100644
--- a/kernel/arch/cris/include/uapi/asm/ptrace_v32.h
+++ b/kernel/arch/cris/include/uapi/asm/ptrace_v32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CRIS_ARCH_PTRACE_H
 #define _CRIS_ARCH_PTRACE_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/rs485.h b/kernel/arch/cris/include/uapi/asm/rs485.h
index ad40f9fbc..041d31fa3 100644
--- a/kernel/arch/cris/include/uapi/asm/rs485.h
+++ b/kernel/arch/cris/include/uapi/asm/rs485.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* RS-485 structures */
 
 /* Used with ioctl() TIOCSERSETRS485 for backward compatibility!
diff --git a/kernel/arch/cris/include/uapi/asm/setup.h b/kernel/arch/cris/include/uapi/asm/setup.h
index b90728652..4854ace9d 100644
--- a/kernel/arch/cris/include/uapi/asm/setup.h
+++ b/kernel/arch/cris/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CRIS_SETUP_H
 #define _CRIS_SETUP_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/sigcontext.h b/kernel/arch/cris/include/uapi/asm/sigcontext.h
index a1d634e12..97565ce3f 100644
--- a/kernel/arch/cris/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/cris/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: sigcontext.h,v 1.1 2000/07/10 16:32:31 bjornw Exp $ */
 
 #ifndef _ASM_CRIS_SIGCONTEXT_H
diff --git a/kernel/arch/cris/include/uapi/asm/signal.h b/kernel/arch/cris/include/uapi/asm/signal.h
index ce42fa7c3..e4ab00f00 100644
--- a/kernel/arch/cris/include/uapi/asm/signal.h
+++ b/kernel/arch/cris/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_CRIS_SIGNAL_H
 #define _UAPI_ASM_CRIS_SIGNAL_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/stat.h b/kernel/arch/cris/include/uapi/asm/stat.h
index 9e558cc3c..cdb74d586 100644
--- a/kernel/arch/cris/include/uapi/asm/stat.h
+++ b/kernel/arch/cris/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CRIS_STAT_H
 #define _CRIS_STAT_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/sync_serial.h b/kernel/arch/cris/include/uapi/asm/sync_serial.h
index 7f827fea3..f2d468889 100644
--- a/kernel/arch/cris/include/uapi/asm/sync_serial.h
+++ b/kernel/arch/cris/include/uapi/asm/sync_serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ioctl defines for synchronous serial port driver
  *
diff --git a/kernel/arch/cris/include/uapi/asm/termbits.h b/kernel/arch/cris/include/uapi/asm/termbits.h
index 1c43bc874..86925dc1f 100644
--- a/kernel/arch/cris/include/uapi/asm/termbits.h
+++ b/kernel/arch/cris/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: termbits.h,v 1.1 2000/07/10 16:32:31 bjornw Exp $ */
 
 #ifndef __ARCH_ETRAX100_TERMBITS_H__
diff --git a/kernel/arch/cris/include/uapi/asm/termios.h b/kernel/arch/cris/include/uapi/asm/termios.h
index 0a0386a55..d87800a6d 100644
--- a/kernel/arch/cris/include/uapi/asm/termios.h
+++ b/kernel/arch/cris/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_CRIS_TERMIOS_H
 #define _UAPI_CRIS_TERMIOS_H
 
diff --git a/kernel/arch/cris/include/uapi/asm/unistd.h b/kernel/arch/cris/include/uapi/asm/unistd.h
index 062b648b2..7aba513b0 100644
--- a/kernel/arch/cris/include/uapi/asm/unistd.h
+++ b/kernel/arch/cris/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_CRIS_UNISTD_H_
 #define _UAPI_ASM_CRIS_UNISTD_H_
 
diff --git a/kernel/arch/cris/kernel/Makefile b/kernel/arch/cris/kernel/Makefile
index 5fae398ca..af075a5fb 100644
--- a/kernel/arch/cris/kernel/Makefile
+++ b/kernel/arch/cris/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # $Id: Makefile,v 1.12 2004/10/19 13:07:43 starvik Exp $
 #
 # Makefile for the linux kernel.
diff --git a/kernel/arch/cris/kernel/asm-offsets.c b/kernel/arch/cris/kernel/asm-offsets.c
index a5fd88d81..0a5129941 100644
--- a/kernel/arch/cris/kernel/asm-offsets.c
+++ b/kernel/arch/cris/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kbuild.h>
 #include <linux/sched.h>
 #include <asm/thread_info.h>
diff --git a/kernel/arch/cris/kernel/crisksyms.c b/kernel/arch/cris/kernel/crisksyms.c
index 3166d1cf2..7024f7278 100644
--- a/kernel/arch/cris/kernel/crisksyms.c
+++ b/kernel/arch/cris/kernel/crisksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/user.h>
 #include <linux/elfcore.h>
diff --git a/kernel/arch/cris/kernel/devicetree.c b/kernel/arch/cris/kernel/devicetree.c
index 53ff8d73e..36e1c6582 100644
--- a/kernel/arch/cris/kernel/devicetree.c
+++ b/kernel/arch/cris/kernel/devicetree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/printk.h>
diff --git a/kernel/arch/cris/kernel/irq.c b/kernel/arch/cris/kernel/irq.c
index 09b864f46..726cdf4bf 100644
--- a/kernel/arch/cris/kernel/irq.c
+++ b/kernel/arch/cris/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  *	linux/arch/cris/kernel/irq.c
diff --git a/kernel/arch/cris/kernel/process.c b/kernel/arch/cris/kernel/process.c
index 0bbd3a0c3..50e5cf098 100644
--- a/kernel/arch/cris/kernel/process.c
+++ b/kernel/arch/cris/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/kernel/process.c
  *
diff --git a/kernel/arch/cris/kernel/profile.c b/kernel/arch/cris/kernel/profile.c
index ad56b37f8..d2f978ad1 100644
--- a/kernel/arch/cris/kernel/profile.c
+++ b/kernel/arch/cris/kernel/profile.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/cris/kernel/ptrace.c b/kernel/arch/cris/kernel/ptrace.c
index 806b76405..af42789a1 100644
--- a/kernel/arch/cris/kernel/ptrace.c
+++ b/kernel/arch/cris/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/kernel/ptrace.c
  *
diff --git a/kernel/arch/cris/kernel/setup.c b/kernel/arch/cris/kernel/setup.c
index 4b4853d91..524d47501 100644
--- a/kernel/arch/cris/kernel/setup.c
+++ b/kernel/arch/cris/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  *  linux/arch/cris/kernel/setup.c
diff --git a/kernel/arch/cris/kernel/sys_cris.c b/kernel/arch/cris/kernel/sys_cris.c
index 8febb032f..ecea13f1d 100644
--- a/kernel/arch/cris/kernel/sys_cris.c
+++ b/kernel/arch/cris/kernel/sys_cris.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Id: sys_cris.c,v 1.6 2004/03/11 11:38:40 starvik Exp $
  *
  * linux/arch/cris/kernel/sys_cris.c
diff --git a/kernel/arch/cris/kernel/time.c b/kernel/arch/cris/kernel/time.c
index bc562cf51..593239274 100644
--- a/kernel/arch/cris/kernel/time.c
+++ b/kernel/arch/cris/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/kernel/time.c
  *
diff --git a/kernel/arch/cris/kernel/traps.c b/kernel/arch/cris/kernel/traps.c
index d98131c45..d4bc80469 100644
--- a/kernel/arch/cris/kernel/traps.c
+++ b/kernel/arch/cris/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/traps.c
  *
diff --git a/kernel/arch/cris/kernel/vmlinux.lds.S b/kernel/arch/cris/kernel/vmlinux.lds.S
index 867f237d7..6d1dbc1ba 100644
--- a/kernel/arch/cris/kernel/vmlinux.lds.S
+++ b/kernel/arch/cris/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make the Linux/CRIS kernel
  * Authors: Bjorn Wesen (bjornw@axis.com)
  *
diff --git a/kernel/arch/cris/mm/fault.c b/kernel/arch/cris/mm/fault.c
index 1fca464f1..29cc58038 100644
--- a/kernel/arch/cris/mm/fault.c
+++ b/kernel/arch/cris/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/cris/mm/fault.c
  *
diff --git a/kernel/arch/cris/mm/init.c b/kernel/arch/cris/mm/init.c
index 1e7fd45b6..e41d9c833 100644
--- a/kernel/arch/cris/mm/init.c
+++ b/kernel/arch/cris/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/mm/init.c
  *
diff --git a/kernel/arch/cris/mm/ioremap.c b/kernel/arch/cris/mm/ioremap.c
index 80fdb995a..350bd2a86 100644
--- a/kernel/arch/cris/mm/ioremap.c
+++ b/kernel/arch/cris/mm/ioremap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/cris/mm/ioremap.c
  *
diff --git a/kernel/arch/cris/mm/tlb.c b/kernel/arch/cris/mm/tlb.c
index 8413741cf..e0dbea62c 100644
--- a/kernel/arch/cris/mm/tlb.c
+++ b/kernel/arch/cris/mm/tlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/cris/mm/tlb.c
  *
diff --git a/kernel/arch/frv/Kconfig b/kernel/arch/frv/Kconfig
index 1cce82434..af369b05f 100644
--- a/kernel/arch/frv/Kconfig
+++ b/kernel/arch/frv/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config FRV
 	bool
 	default y
diff --git a/kernel/arch/frv/Kconfig.debug b/kernel/arch/frv/Kconfig.debug
index 98c99a3ed..ecab6d8a7 100644
--- a/kernel/arch/frv/Kconfig.debug
+++ b/kernel/arch/frv/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/frv/include/asm/atomic_defs.h b/kernel/arch/frv/include/asm/atomic_defs.h
index d4912c88b..ce3b8a4ef 100644
--- a/kernel/arch/frv/include/asm/atomic_defs.h
+++ b/kernel/arch/frv/include/asm/atomic_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <asm/spr-regs.h>
 
diff --git a/kernel/arch/frv/include/asm/dma-mapping.h b/kernel/arch/frv/include/asm/dma-mapping.h
index 354900917..273defa02 100644
--- a/kernel/arch/frv/include/asm/dma-mapping.h
+++ b/kernel/arch/frv/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_DMA_MAPPING_H
 #define _ASM_DMA_MAPPING_H
 
diff --git a/kernel/arch/frv/include/asm/fpu.h b/kernel/arch/frv/include/asm/fpu.h
index d73c60b56..2f0929333 100644
--- a/kernel/arch/frv/include/asm/fpu.h
+++ b/kernel/arch/frv/include/asm/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_FPU_H
 #define __ASM_FPU_H
 
diff --git a/kernel/arch/frv/include/asm/futex.h b/kernel/arch/frv/include/asm/futex.h
index ab346f5f8..dfcc34842 100644
--- a/kernel/arch/frv/include/asm/futex.h
+++ b/kernel/arch/frv/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FUTEX_H
 #define _ASM_FUTEX_H
 
diff --git a/kernel/arch/frv/include/asm/kmap_types.h b/kernel/arch/frv/include/asm/kmap_types.h
index 43901f220..0849db136 100644
--- a/kernel/arch/frv/include/asm/kmap_types.h
+++ b/kernel/arch/frv/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
diff --git a/kernel/arch/frv/include/asm/local.h b/kernel/arch/frv/include/asm/local.h
index c27bdf046..259ae7b04 100644
--- a/kernel/arch/frv/include/asm/local.h
+++ b/kernel/arch/frv/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_LOCAL_H
 #define _ASM_LOCAL_H
 
diff --git a/kernel/arch/frv/include/asm/math-emu.h b/kernel/arch/frv/include/asm/math-emu.h
index 0c8f731b2..8af762dd6 100644
--- a/kernel/arch/frv/include/asm/math-emu.h
+++ b/kernel/arch/frv/include/asm/math-emu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MATH_EMU_H
 #define _ASM_MATH_EMU_H
 
diff --git a/kernel/arch/frv/include/asm/page.h b/kernel/arch/frv/include/asm/page.h
index ec5eebce4..0f76a0d58 100644
--- a/kernel/arch/frv/include/asm/page.h
+++ b/kernel/arch/frv/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PAGE_H
 #define _ASM_PAGE_H
 
diff --git a/kernel/arch/frv/include/asm/percpu.h b/kernel/arch/frv/include/asm/percpu.h
index 2cad3f874..4209fe5fe 100644
--- a/kernel/arch/frv/include/asm/percpu.h
+++ b/kernel/arch/frv/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PERCPU_H
 #define __ASM_PERCPU_H
 
diff --git a/kernel/arch/frv/include/asm/shmparam.h b/kernel/arch/frv/include/asm/shmparam.h
index ab711009c..50ea51f26 100644
--- a/kernel/arch/frv/include/asm/shmparam.h
+++ b/kernel/arch/frv/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SHMPARAM_H
 #define _ASM_SHMPARAM_H
 
diff --git a/kernel/arch/frv/include/asm/signal.h b/kernel/arch/frv/include/asm/signal.h
index eca0abcb7..796394113 100644
--- a/kernel/arch/frv/include/asm/signal.h
+++ b/kernel/arch/frv/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SIGNAL_H
 #define _ASM_SIGNAL_H
 
diff --git a/kernel/arch/frv/include/asm/smp.h b/kernel/arch/frv/include/asm/smp.h
index 38349ec8b..0d7fa4093 100644
--- a/kernel/arch/frv/include/asm/smp.h
+++ b/kernel/arch/frv/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
 
diff --git a/kernel/arch/frv/include/asm/termios.h b/kernel/arch/frv/include/asm/termios.h
index 9f753fc09..5a8c63554 100644
--- a/kernel/arch/frv/include/asm/termios.h
+++ b/kernel/arch/frv/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
 
diff --git a/kernel/arch/frv/include/asm/timex.h b/kernel/arch/frv/include/asm/timex.h
index 139093fab..bf53166f2 100644
--- a/kernel/arch/frv/include/asm/timex.h
+++ b/kernel/arch/frv/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* timex.h: FR-V architecture timex specifications
  */
 #ifndef _ASM_TIMEX_H
diff --git a/kernel/arch/frv/include/asm/tlb.h b/kernel/arch/frv/include/asm/tlb.h
index cd458eb6d..d3e361ad7 100644
--- a/kernel/arch/frv/include/asm/tlb.h
+++ b/kernel/arch/frv/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_TLB_H
 #define _ASM_TLB_H
 
diff --git a/kernel/arch/frv/include/asm/topology.h b/kernel/arch/frv/include/asm/topology.h
index 942724352..207603071 100644
--- a/kernel/arch/frv/include/asm/topology.h
+++ b/kernel/arch/frv/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_TOPOLOGY_H
 #define _ASM_TOPOLOGY_H
 
diff --git a/kernel/arch/frv/include/asm/ucontext.h b/kernel/arch/frv/include/asm/ucontext.h
index 8d8c0c948..0cc2d95dd 100644
--- a/kernel/arch/frv/include/asm/ucontext.h
+++ b/kernel/arch/frv/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UCONTEXT_H
 #define _ASM_UCONTEXT_H
 
diff --git a/kernel/arch/frv/include/asm/unistd.h b/kernel/arch/frv/include/asm/unistd.h
index 17b5df8fc..b4b3f9b26 100644
--- a/kernel/arch/frv/include/asm/unistd.h
+++ b/kernel/arch/frv/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UNISTD_H_
 #define _ASM_UNISTD_H_
 
diff --git a/kernel/arch/frv/include/uapi/asm/bitsperlong.h b/kernel/arch/frv/include/uapi/asm/bitsperlong.h
index 6dc0bb0c1..76da34b10 100644
--- a/kernel/arch/frv/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/frv/include/uapi/asm/bitsperlong.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/bitsperlong.h>
diff --git a/kernel/arch/frv/include/uapi/asm/byteorder.h b/kernel/arch/frv/include/uapi/asm/byteorder.h
index f29b7593e..a46f6472a 100644
--- a/kernel/arch/frv/include/uapi/asm/byteorder.h
+++ b/kernel/arch/frv/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_BYTEORDER_H
 #define _ASM_BYTEORDER_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/errno.h b/kernel/arch/frv/include/uapi/asm/errno.h
index d010795ce..c5b82f2f2 100644
--- a/kernel/arch/frv/include/uapi/asm/errno.h
+++ b/kernel/arch/frv/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ERRNO_H
 #define _ASM_ERRNO_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/fcntl.h b/kernel/arch/frv/include/uapi/asm/fcntl.h
index 46ab12db5..a77648c50 100644
--- a/kernel/arch/frv/include/uapi/asm/fcntl.h
+++ b/kernel/arch/frv/include/uapi/asm/fcntl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/fcntl.h>
diff --git a/kernel/arch/frv/include/uapi/asm/ioctl.h b/kernel/arch/frv/include/uapi/asm/ioctl.h
index b279fe06d..b809c4566 100644
--- a/kernel/arch/frv/include/uapi/asm/ioctl.h
+++ b/kernel/arch/frv/include/uapi/asm/ioctl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ioctl.h>
diff --git a/kernel/arch/frv/include/uapi/asm/ioctls.h b/kernel/arch/frv/include/uapi/asm/ioctls.h
index 2f9fb436e..dd9f5eb9f 100644
--- a/kernel/arch/frv/include/uapi/asm/ioctls.h
+++ b/kernel/arch/frv/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_IOCTLS_H__
 #define __ASM_IOCTLS_H__
 
diff --git a/kernel/arch/frv/include/uapi/asm/ipcbuf.h b/kernel/arch/frv/include/uapi/asm/ipcbuf.h
index 84c7e51cb..90d6445a1 100644
--- a/kernel/arch/frv/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/frv/include/uapi/asm/ipcbuf.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ipcbuf.h>
diff --git a/kernel/arch/frv/include/uapi/asm/kvm_para.h b/kernel/arch/frv/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/frv/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/frv/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/frv/include/uapi/asm/mman.h b/kernel/arch/frv/include/uapi/asm/mman.h
index 8eebf89f5..306fc0460 100644
--- a/kernel/arch/frv/include/uapi/asm/mman.h
+++ b/kernel/arch/frv/include/uapi/asm/mman.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/mman.h>
diff --git a/kernel/arch/frv/include/uapi/asm/msgbuf.h b/kernel/arch/frv/include/uapi/asm/msgbuf.h
index 97ceb55a0..156c81bb4 100644
--- a/kernel/arch/frv/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/frv/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_MSGBUF_H
 #define _ASM_MSGBUF_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/param.h b/kernel/arch/frv/include/uapi/asm/param.h
index a52dca9a9..d3e0168d8 100644
--- a/kernel/arch/frv/include/uapi/asm/param.h
+++ b/kernel/arch/frv/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_PARAM_H
 #define _ASM_PARAM_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/poll.h b/kernel/arch/frv/include/uapi/asm/poll.h
index 0d01479cc..887b67288 100644
--- a/kernel/arch/frv/include/uapi/asm/poll.h
+++ b/kernel/arch/frv/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POLL_H
 #define _ASM_POLL_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/posix_types.h b/kernel/arch/frv/include/uapi/asm/posix_types.h
index fe512af74..299577722 100644
--- a/kernel/arch/frv/include/uapi/asm/posix_types.h
+++ b/kernel/arch/frv/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POSIX_TYPES_H
 #define _ASM_POSIX_TYPES_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/ptrace.h b/kernel/arch/frv/include/uapi/asm/ptrace.h
index 3887e4934..f1d2f652d 100644
--- a/kernel/arch/frv/include/uapi/asm/ptrace.h
+++ b/kernel/arch/frv/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* ptrace.h: ptrace() relevant definitions
  *
  * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/frv/include/uapi/asm/registers.h b/kernel/arch/frv/include/uapi/asm/registers.h
index 9666119fc..4caf09b6c 100644
--- a/kernel/arch/frv/include/uapi/asm/registers.h
+++ b/kernel/arch/frv/include/uapi/asm/registers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* registers.h: register frame declarations
  *
  * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/frv/include/uapi/asm/resource.h b/kernel/arch/frv/include/uapi/asm/resource.h
index 5fc60548f..2100305f9 100644
--- a/kernel/arch/frv/include/uapi/asm/resource.h
+++ b/kernel/arch/frv/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_RESOURCE_H
 #define _ASM_RESOURCE_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/sembuf.h b/kernel/arch/frv/include/uapi/asm/sembuf.h
index 164b12786..d5477f958 100644
--- a/kernel/arch/frv/include/uapi/asm/sembuf.h
+++ b/kernel/arch/frv/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SEMBUF_H
 #define _ASM_SEMBUF_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/setup.h b/kernel/arch/frv/include/uapi/asm/setup.h
index fbf3fc96a..f54957047 100644
--- a/kernel/arch/frv/include/uapi/asm/setup.h
+++ b/kernel/arch/frv/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* setup.h: setup stuff
  *
  * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/frv/include/uapi/asm/shmbuf.h b/kernel/arch/frv/include/uapi/asm/shmbuf.h
index 4c6e711a4..1de8f892e 100644
--- a/kernel/arch/frv/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/frv/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SHMBUF_H
 #define _ASM_SHMBUF_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/sigcontext.h b/kernel/arch/frv/include/uapi/asm/sigcontext.h
index 3b263f3cc..8fbb0b00a 100644
--- a/kernel/arch/frv/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/frv/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* sigcontext.h: FRV signal context
  *
  * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/frv/include/uapi/asm/siginfo.h b/kernel/arch/frv/include/uapi/asm/siginfo.h
index f55d9e0e9..4c8c97574 100644
--- a/kernel/arch/frv/include/uapi/asm/siginfo.h
+++ b/kernel/arch/frv/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SIGINFO_H
 #define _ASM_SIGINFO_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/signal.h b/kernel/arch/frv/include/uapi/asm/signal.h
index bf3b162f9..603bb796c 100644
--- a/kernel/arch/frv/include/uapi/asm/signal.h
+++ b/kernel/arch/frv/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_SIGNAL_H
 #define _UAPI_ASM_SIGNAL_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/socket.h b/kernel/arch/frv/include/uapi/asm/socket.h
index 9abf02d68..9168e78fa 100644
--- a/kernel/arch/frv/include/uapi/asm/socket.h
+++ b/kernel/arch/frv/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/sockios.h b/kernel/arch/frv/include/uapi/asm/sockios.h
index 5dbdd13e6..2f62caf1c 100644
--- a/kernel/arch/frv/include/uapi/asm/sockios.h
+++ b/kernel/arch/frv/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SOCKIOS__
 #define _ASM_SOCKIOS__
 
diff --git a/kernel/arch/frv/include/uapi/asm/stat.h b/kernel/arch/frv/include/uapi/asm/stat.h
index ce56de9b3..0ff9fab91 100644
--- a/kernel/arch/frv/include/uapi/asm/stat.h
+++ b/kernel/arch/frv/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_STAT_H
 #define _ASM_STAT_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/statfs.h b/kernel/arch/frv/include/uapi/asm/statfs.h
index 741f58604..2a378cbff 100644
--- a/kernel/arch/frv/include/uapi/asm/statfs.h
+++ b/kernel/arch/frv/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_STATFS_H
 #define _ASM_STATFS_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/swab.h b/kernel/arch/frv/include/uapi/asm/swab.h
index f305834b4..c78257d17 100644
--- a/kernel/arch/frv/include/uapi/asm/swab.h
+++ b/kernel/arch/frv/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SWAB_H
 #define _ASM_SWAB_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/termbits.h b/kernel/arch/frv/include/uapi/asm/termbits.h
index 7722e19cc..b1dcd8d0f 100644
--- a/kernel/arch/frv/include/uapi/asm/termbits.h
+++ b/kernel/arch/frv/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_TERMBITS_H__
 #define _ASM_TERMBITS_H__
 
diff --git a/kernel/arch/frv/include/uapi/asm/termios.h b/kernel/arch/frv/include/uapi/asm/termios.h
index edcc08a22..ae35bedae 100644
--- a/kernel/arch/frv/include/uapi/asm/termios.h
+++ b/kernel/arch/frv/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_TERMIOS_H
 #define _UAPI_ASM_TERMIOS_H
 
diff --git a/kernel/arch/frv/include/uapi/asm/types.h b/kernel/arch/frv/include/uapi/asm/types.h
index cf2314994..db74ad9ba 100644
--- a/kernel/arch/frv/include/uapi/asm/types.h
+++ b/kernel/arch/frv/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* types.h: FRV types
  *
  * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/frv/include/uapi/asm/unistd.h b/kernel/arch/frv/include/uapi/asm/unistd.h
index 9e2612ff1..4b46acaf8 100644
--- a/kernel/arch/frv/include/uapi/asm/unistd.h
+++ b/kernel/arch/frv/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_UNISTD_H_
 #define _UAPI_ASM_UNISTD_H_
 
diff --git a/kernel/arch/frv/kernel/Makefile b/kernel/arch/frv/kernel/Makefile
index 3cbb3294b..216ddf30c 100644
--- a/kernel/arch/frv/kernel/Makefile
+++ b/kernel/arch/frv/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/frv/kernel/asm-offsets.c b/kernel/arch/frv/kernel/asm-offsets.c
index 20c5b79b5..0a468e9b5 100644
--- a/kernel/arch/frv/kernel/asm-offsets.c
+++ b/kernel/arch/frv/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed
diff --git a/kernel/arch/frv/kernel/frv_ksyms.c b/kernel/arch/frv/kernel/frv_ksyms.c
index cdb4ce996..6ea430d58 100644
--- a/kernel/arch/frv/kernel/frv_ksyms.c
+++ b/kernel/arch/frv/kernel/frv_ksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/linkage.h>
 #include <linux/sched.h>
diff --git a/kernel/arch/frv/kernel/vmlinux.lds.S b/kernel/arch/frv/kernel/vmlinux.lds.S
index 3f44dcbba..42806c512 100644
--- a/kernel/arch/frv/kernel/vmlinux.lds.S
+++ b/kernel/arch/frv/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make FRV Linux kernel
  * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
  */
diff --git a/kernel/arch/frv/lib/atomic-lib.c b/kernel/arch/frv/lib/atomic-lib.c
index 4d1b887c2..3027576f7 100644
--- a/kernel/arch/frv/lib/atomic-lib.c
+++ b/kernel/arch/frv/lib/atomic-lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/export.h>
 #include <asm/atomic.h>
diff --git a/kernel/arch/frv/mb93090-mb00/Makefile b/kernel/arch/frv/mb93090-mb00/Makefile
index 21f1df1b3..bcb03ebb3 100644
--- a/kernel/arch/frv/mb93090-mb00/Makefile
+++ b/kernel/arch/frv/mb93090-mb00/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the MB93090-MB00 motherboard stuff
 #
diff --git a/kernel/arch/frv/mb93090-mb00/pci-frv.h b/kernel/arch/frv/mb93090-mb00/pci-frv.h
index d51992ff5..41fbb6bae 100644
--- a/kernel/arch/frv/mb93090-mb00/pci-frv.h
+++ b/kernel/arch/frv/mb93090-mb00/pci-frv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Low-Level PCI Access for FRV machines.
  *
diff --git a/kernel/arch/frv/mb93090-mb00/pci-irq.c b/kernel/arch/frv/mb93090-mb00/pci-irq.c
index 1c35c93f9..a40aa8663 100644
--- a/kernel/arch/frv/mb93090-mb00/pci-irq.c
+++ b/kernel/arch/frv/mb93090-mb00/pci-irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci-irq.c: PCI IRQ routing on the FRV motherboard
  *
  * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/frv/mm/extable.c b/kernel/arch/frv/mm/extable.c
index 9198ddd16..77c0c5ba8 100644
--- a/kernel/arch/frv/mm/extable.c
+++ b/kernel/arch/frv/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/frv/mm/extable.c
  */
diff --git a/kernel/arch/frv/mm/fault.c b/kernel/arch/frv/mm/fault.c
index 179e79e22..cbe7aec86 100644
--- a/kernel/arch/frv/mm/fault.c
+++ b/kernel/arch/frv/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/frv/mm/fault.c
  *
diff --git a/kernel/arch/h8300/Kconfig b/kernel/arch/h8300/Kconfig
index 3089f7fe2..f8d3fde08 100644
--- a/kernel/arch/h8300/Kconfig
+++ b/kernel/arch/h8300/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config H8300
         def_bool y
 	select GENERIC_ATOMIC64
diff --git a/kernel/arch/h8300/Kconfig.cpu b/kernel/arch/h8300/Kconfig.cpu
index 8d0ff20c7..b5e14d513 100644
--- a/kernel/arch/h8300/Kconfig.cpu
+++ b/kernel/arch/h8300/Kconfig.cpu
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config CPU_H8300H
 	bool
 
diff --git a/kernel/arch/h8300/boot/Makefile b/kernel/arch/h8300/boot/Makefile
index 2f6393a5d..8e62df20e 100644
--- a/kernel/arch/h8300/boot/Makefile
+++ b/kernel/arch/h8300/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # arch/h8300/boot/Makefile
 
 targets := vmlinux.srec vmlinux.bin zImage
diff --git a/kernel/arch/h8300/boot/compressed/Makefile b/kernel/arch/h8300/boot/compressed/Makefile
index 613bfe6f5..9e2701069 100644
--- a/kernel/arch/h8300/boot/compressed/Makefile
+++ b/kernel/arch/h8300/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/sh/boot/compressed/Makefile
 #
diff --git a/kernel/arch/h8300/boot/compressed/head.S b/kernel/arch/h8300/boot/compressed/head.S
index 0436350c1..11ef50957 100644
--- a/kernel/arch/h8300/boot/compressed/head.S
+++ b/kernel/arch/h8300/boot/compressed/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/h8300/boot/compressed/head.S
  *
diff --git a/kernel/arch/h8300/boot/compressed/misc.c b/kernel/arch/h8300/boot/compressed/misc.c
index a947dbb4f..8915d8fe2 100644
--- a/kernel/arch/h8300/boot/compressed/misc.c
+++ b/kernel/arch/h8300/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/h8300/boot/compressed/misc.c
  *
diff --git a/kernel/arch/h8300/boot/compressed/vmlinux.lds b/kernel/arch/h8300/boot/compressed/vmlinux.lds
index ad848a72f..7f7bb419c 100644
--- a/kernel/arch/h8300/boot/compressed/vmlinux.lds
+++ b/kernel/arch/h8300/boot/compressed/vmlinux.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 SECTIONS
 {
         .text :
diff --git a/kernel/arch/h8300/boot/dts/Makefile b/kernel/arch/h8300/boot/dts/Makefile
index 6c08467c6..14593b51b 100644
--- a/kernel/arch/h8300/boot/dts/Makefile
+++ b/kernel/arch/h8300/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifneq '$(CONFIG_H8300_BUILTIN_DTB)' '""'
 BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_H8300_BUILTIN_DTB)).dtb.o
 endif
diff --git a/kernel/arch/h8300/boot/dts/edosk2674.dts b/kernel/arch/h8300/boot/dts/edosk2674.dts
index 6ae884bf6..d1733805e 100644
--- a/kernel/arch/h8300/boot/dts/edosk2674.dts
+++ b/kernel/arch/h8300/boot/dts/edosk2674.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 / {
 	compatible = "renesas,edosk2674";
diff --git a/kernel/arch/h8300/boot/dts/h8300h_sim.dts b/kernel/arch/h8300/boot/dts/h8300h_sim.dts
index 9c733d920..f1c31cecd 100644
--- a/kernel/arch/h8300/boot/dts/h8300h_sim.dts
+++ b/kernel/arch/h8300/boot/dts/h8300h_sim.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 / {
 	compatible = "gnu,gdbsim";
diff --git a/kernel/arch/h8300/boot/dts/h8s_sim.dts b/kernel/arch/h8300/boot/dts/h8s_sim.dts
index 97e1f4b17..932cc3c5a 100644
--- a/kernel/arch/h8300/boot/dts/h8s_sim.dts
+++ b/kernel/arch/h8300/boot/dts/h8s_sim.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 / {
 	compatible = "gnu,gdbsim";
diff --git a/kernel/arch/h8300/include/asm/atomic.h b/kernel/arch/h8300/include/asm/atomic.h
index 349a47a91..941e7554e 100644
--- a/kernel/arch/h8300/include/asm/atomic.h
+++ b/kernel/arch/h8300/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_H8300_ATOMIC__
 #define __ARCH_H8300_ATOMIC__
 
diff --git a/kernel/arch/h8300/include/asm/bitops.h b/kernel/arch/h8300/include/asm/bitops.h
index 05999aba1..ea0cb0cf6 100644
--- a/kernel/arch/h8300/include/asm/bitops.h
+++ b/kernel/arch/h8300/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_BITOPS_H
 #define _H8300_BITOPS_H
 
diff --git a/kernel/arch/h8300/include/asm/bug.h b/kernel/arch/h8300/include/asm/bug.h
index 1e1be8119..00fe5e966 100644
--- a/kernel/arch/h8300/include/asm/bug.h
+++ b/kernel/arch/h8300/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_BUG_H
 #define _H8300_BUG_H
 
diff --git a/kernel/arch/h8300/include/asm/byteorder.h b/kernel/arch/h8300/include/asm/byteorder.h
index 888478a38..ecff2d1ca 100644
--- a/kernel/arch/h8300/include/asm/byteorder.h
+++ b/kernel/arch/h8300/include/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __H8300_BYTEORDER_H__
 #define __H8300_BYTEORDER_H__
 
diff --git a/kernel/arch/h8300/include/asm/cache.h b/kernel/arch/h8300/include/asm/cache.h
index 0ef1edc5a..4243eb319 100644
--- a/kernel/arch/h8300/include/asm/cache.h
+++ b/kernel/arch/h8300/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_H8300_CACHE_H
 #define __ARCH_H8300_CACHE_H
 
diff --git a/kernel/arch/h8300/include/asm/cmpxchg.h b/kernel/arch/h8300/include/asm/cmpxchg.h
index 95fec4cd1..c64bb38ce 100644
--- a/kernel/arch/h8300/include/asm/cmpxchg.h
+++ b/kernel/arch/h8300/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_H8300_CMPXCHG__
 #define __ARCH_H8300_CMPXCHG__
 
diff --git a/kernel/arch/h8300/include/asm/dma-mapping.h b/kernel/arch/h8300/include/asm/dma-mapping.h
index 847c7562e..21bb1fc3a 100644
--- a/kernel/arch/h8300/include/asm/dma-mapping.h
+++ b/kernel/arch/h8300/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_DMA_MAPPING_H
 #define _H8300_DMA_MAPPING_H
 
diff --git a/kernel/arch/h8300/include/asm/elf.h b/kernel/arch/h8300/include/asm/elf.h
index 09031d012..029647cda 100644
--- a/kernel/arch/h8300/include/asm/elf.h
+++ b/kernel/arch/h8300/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_H8300_ELF_H
 #define __ASM_H8300_ELF_H
 
diff --git a/kernel/arch/h8300/include/asm/flat.h b/kernel/arch/h8300/include/asm/flat.h
index 7e0bd6fa1..f4cdfcbdd 100644
--- a/kernel/arch/h8300/include/asm/flat.h
+++ b/kernel/arch/h8300/include/asm/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/h8300/asm/include/flat.h -- uClinux flat-format executables
  */
diff --git a/kernel/arch/h8300/include/asm/hash.h b/kernel/arch/h8300/include/asm/hash.h
index 04cfbd2bd..2960b4c9e 100644
--- a/kernel/arch/h8300/include/asm/hash.h
+++ b/kernel/arch/h8300/include/asm/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HASH_H
 #define _ASM_HASH_H
 
diff --git a/kernel/arch/h8300/include/asm/io.h b/kernel/arch/h8300/include/asm/io.h
index f86918aed..096d99580 100644
--- a/kernel/arch/h8300/include/asm/io.h
+++ b/kernel/arch/h8300/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_IO_H
 #define _H8300_IO_H
 
diff --git a/kernel/arch/h8300/include/asm/irq.h b/kernel/arch/h8300/include/asm/irq.h
index 69f23f098..5fc5b436d 100644
--- a/kernel/arch/h8300/include/asm/irq.h
+++ b/kernel/arch/h8300/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_IRQ_H_
 #define _H8300_IRQ_H_
 
diff --git a/kernel/arch/h8300/include/asm/irqflags.h b/kernel/arch/h8300/include/asm/irqflags.h
index 5e1e3242e..48756b7f4 100644
--- a/kernel/arch/h8300/include/asm/irqflags.h
+++ b/kernel/arch/h8300/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_IRQFLAGS_H
 #define _H8300_IRQFLAGS_H
 
diff --git a/kernel/arch/h8300/include/asm/page.h b/kernel/arch/h8300/include/asm/page.h
index 3a987a567..8da5124ad 100644
--- a/kernel/arch/h8300/include/asm/page.h
+++ b/kernel/arch/h8300/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_PAGE_H
 #define _H8300_PAGE_H
 
diff --git a/kernel/arch/h8300/include/asm/pci.h b/kernel/arch/h8300/include/asm/pci.h
index 0b2acaa3d..7c9e55d62 100644
--- a/kernel/arch/h8300/include/asm/pci.h
+++ b/kernel/arch/h8300/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_H8300_PCI_H
 #define _ASM_H8300_PCI_H
 
diff --git a/kernel/arch/h8300/include/asm/pgtable.h b/kernel/arch/h8300/include/asm/pgtable.h
index 7d265d28b..a99caa49d 100644
--- a/kernel/arch/h8300/include/asm/pgtable.h
+++ b/kernel/arch/h8300/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_PGTABLE_H
 #define _H8300_PGTABLE_H
 #define __ARCH_USE_5LEVEL_HACK
diff --git a/kernel/arch/h8300/include/asm/processor.h b/kernel/arch/h8300/include/asm/processor.h
index afa53147e..985346393 100644
--- a/kernel/arch/h8300/include/asm/processor.h
+++ b/kernel/arch/h8300/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-h8300/processor.h
  *
diff --git a/kernel/arch/h8300/include/asm/ptrace.h b/kernel/arch/h8300/include/asm/ptrace.h
index e693fb463..313cafa85 100644
--- a/kernel/arch/h8300/include/asm/ptrace.h
+++ b/kernel/arch/h8300/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_PTRACE_H
 #define _H8300_PTRACE_H
 
diff --git a/kernel/arch/h8300/include/asm/segment.h b/kernel/arch/h8300/include/asm/segment.h
index 48424c6e1..9adbf7e1a 100644
--- a/kernel/arch/h8300/include/asm/segment.h
+++ b/kernel/arch/h8300/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_SEGMENT_H
 #define _H8300_SEGMENT_H
 
diff --git a/kernel/arch/h8300/include/asm/signal.h b/kernel/arch/h8300/include/asm/signal.h
index 5870835c0..a42f32ca5 100644
--- a/kernel/arch/h8300/include/asm/signal.h
+++ b/kernel/arch/h8300/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_SIGNAL_H
 #define _H8300_SIGNAL_H
 
diff --git a/kernel/arch/h8300/include/asm/string.h b/kernel/arch/h8300/include/asm/string.h
index 5dc5a8ac0..78e45bb2f 100644
--- a/kernel/arch/h8300/include/asm/string.h
+++ b/kernel/arch/h8300/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_STRING_H_
 #define _H8300_STRING_H_
 
diff --git a/kernel/arch/h8300/include/asm/switch_to.h b/kernel/arch/h8300/include/asm/switch_to.h
index 7ad1bf92d..2b7e9555b 100644
--- a/kernel/arch/h8300/include/asm/switch_to.h
+++ b/kernel/arch/h8300/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_SWITCH_TO_H
 #define _H8300_SWITCH_TO_H
 
diff --git a/kernel/arch/h8300/include/asm/syscall.h b/kernel/arch/h8300/include/asm/syscall.h
index b41f688d0..924990401 100644
--- a/kernel/arch/h8300/include/asm/syscall.h
+++ b/kernel/arch/h8300/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_H8300_SYSCALLS_32_H
 #define __ASM_H8300_SYSCALLS_32_H
 
diff --git a/kernel/arch/h8300/include/asm/thread_info.h b/kernel/arch/h8300/include/asm/thread_info.h
index 3cef06875..072b92c0d 100644
--- a/kernel/arch/h8300/include/asm/thread_info.h
+++ b/kernel/arch/h8300/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: h8300 low-level thread information
  * adapted from the i386 and PPC versions by Yoshinori Sato <ysato@users.sourceforge.jp>
  *
diff --git a/kernel/arch/h8300/include/asm/tlb.h b/kernel/arch/h8300/include/asm/tlb.h
index 2c6fa4eed..98f344279 100644
--- a/kernel/arch/h8300/include/asm/tlb.h
+++ b/kernel/arch/h8300/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __H8300_TLB_H__
 #define __H8300_TLB_H__
 
diff --git a/kernel/arch/h8300/include/asm/uaccess.h b/kernel/arch/h8300/include/asm/uaccess.h
index 6f6144a24..bc8031949 100644
--- a/kernel/arch/h8300/include/asm/uaccess.h
+++ b/kernel/arch/h8300/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UACCESS_H
 #define _ASM_UACCESS_H
 
diff --git a/kernel/arch/h8300/include/asm/user.h b/kernel/arch/h8300/include/asm/user.h
index 2e3555f45..2298909f2 100644
--- a/kernel/arch/h8300/include/asm/user.h
+++ b/kernel/arch/h8300/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _H8300_USER_H
 #define _H8300_USER_H
 
diff --git a/kernel/arch/h8300/include/uapi/asm/bitsperlong.h b/kernel/arch/h8300/include/uapi/asm/bitsperlong.h
index 342126083..a33e358f1 100644
--- a/kernel/arch/h8300/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/h8300/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_H8300_BITS_PER_LONG
 #define _UAPI__ASM_H8300_BITS_PER_LONG
 
diff --git a/kernel/arch/h8300/include/uapi/asm/byteorder.h b/kernel/arch/h8300/include/uapi/asm/byteorder.h
index 13539da99..1fe2f9344 100644
--- a/kernel/arch/h8300/include/uapi/asm/byteorder.h
+++ b/kernel/arch/h8300/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _H8300_BYTEORDER_H
 #define _H8300_BYTEORDER_H
 
diff --git a/kernel/arch/h8300/include/uapi/asm/ptrace.h b/kernel/arch/h8300/include/uapi/asm/ptrace.h
index e132670d7..78167f517 100644
--- a/kernel/arch/h8300/include/uapi/asm/ptrace.h
+++ b/kernel/arch/h8300/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_H8300_PTRACE_H
 #define _UAPI_H8300_PTRACE_H
 
diff --git a/kernel/arch/h8300/include/uapi/asm/sigcontext.h b/kernel/arch/h8300/include/uapi/asm/sigcontext.h
index c41fdaa04..f77273c85 100644
--- a/kernel/arch/h8300/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/h8300/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_H8300_SIGCONTEXT_H
 #define _ASM_H8300_SIGCONTEXT_H
 
diff --git a/kernel/arch/h8300/include/uapi/asm/signal.h b/kernel/arch/h8300/include/uapi/asm/signal.h
index af3a6c37f..e15521037 100644
--- a/kernel/arch/h8300/include/uapi/asm/signal.h
+++ b/kernel/arch/h8300/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_H8300_SIGNAL_H
 #define _UAPI_H8300_SIGNAL_H
 
diff --git a/kernel/arch/h8300/kernel/Makefile b/kernel/arch/h8300/kernel/Makefile
index 253f8e322..b62e83052 100644
--- a/kernel/arch/h8300/kernel/Makefile
+++ b/kernel/arch/h8300/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/h8300/kernel/asm-offsets.c b/kernel/arch/h8300/kernel/asm-offsets.c
index dc2d16ce8..85e60509f 100644
--- a/kernel/arch/h8300/kernel/asm-offsets.c
+++ b/kernel/arch/h8300/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This program is used to generate definitions needed by
  * assembly language modules.
diff --git a/kernel/arch/h8300/kernel/entry.S b/kernel/arch/h8300/kernel/entry.S
index 4f67d4b35..4ade5f829 100644
--- a/kernel/arch/h8300/kernel/entry.S
+++ b/kernel/arch/h8300/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *  linux/arch/h8300/kernel/entry.S
diff --git a/kernel/arch/h8300/kernel/h8300_ksyms.c b/kernel/arch/h8300/kernel/h8300_ksyms.c
index a9033c838..1c6f902e8 100644
--- a/kernel/arch/h8300/kernel/h8300_ksyms.c
+++ b/kernel/arch/h8300/kernel/h8300_ksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/linkage.h>
 
diff --git a/kernel/arch/h8300/kernel/head_ram.S b/kernel/arch/h8300/kernel/head_ram.S
index 84ac5c3ed..dbf8429f5 100644
--- a/kernel/arch/h8300/kernel/head_ram.S
+++ b/kernel/arch/h8300/kernel/head_ram.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/sys.h>
 #include <linux/init.h>
diff --git a/kernel/arch/h8300/kernel/head_rom.S b/kernel/arch/h8300/kernel/head_rom.S
index 9868a4121..ab55a9cb2 100644
--- a/kernel/arch/h8300/kernel/head_rom.S
+++ b/kernel/arch/h8300/kernel/head_rom.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 #include <asm/thread_info.h>
 
diff --git a/kernel/arch/h8300/kernel/irq.c b/kernel/arch/h8300/kernel/irq.c
index da79f9521..834e4d7b1 100644
--- a/kernel/arch/h8300/kernel/irq.c
+++ b/kernel/arch/h8300/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/h8300/kernel/irq.c
  *
diff --git a/kernel/arch/h8300/kernel/module.c b/kernel/arch/h8300/kernel/module.c
index 515f6c4e8..cd802cc78 100644
--- a/kernel/arch/h8300/kernel/module.c
+++ b/kernel/arch/h8300/kernel/module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/moduleloader.h>
 #include <linux/elf.h>
 #include <linux/vmalloc.h>
diff --git a/kernel/arch/h8300/kernel/process.c b/kernel/arch/h8300/kernel/process.c
index d1ddcabbb..e35cdf092 100644
--- a/kernel/arch/h8300/kernel/process.c
+++ b/kernel/arch/h8300/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/h8300/kernel/process.c
  *
diff --git a/kernel/arch/h8300/kernel/setup.c b/kernel/arch/h8300/kernel/setup.c
index 6be15d634..a4d0470c1 100644
--- a/kernel/arch/h8300/kernel/setup.c
+++ b/kernel/arch/h8300/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/h8300/kernel/setup.c
  *
diff --git a/kernel/arch/h8300/kernel/syscalls.c b/kernel/arch/h8300/kernel/syscalls.c
index 1f9123a01..9022036fb 100644
--- a/kernel/arch/h8300/kernel/syscalls.c
+++ b/kernel/arch/h8300/kernel/syscalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/syscalls.h>
 #include <linux/signal.h>
 #include <linux/unistd.h>
diff --git a/kernel/arch/h8300/kernel/vmlinux.lds.S b/kernel/arch/h8300/kernel/vmlinux.lds.S
index 7f11da1b8..35716a304 100644
--- a/kernel/arch/h8300/kernel/vmlinux.lds.S
+++ b/kernel/arch/h8300/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
diff --git a/kernel/arch/h8300/lib/abs.S b/kernel/arch/h8300/lib/abs.S
index efda749db..6e1a4ed3a 100644
--- a/kernel/arch/h8300/lib/abs.S
+++ b/kernel/arch/h8300/lib/abs.S
@@ -1,3 +1,4 @@
+;;; SPDX-License-Identifier: GPL-2.0
 ;;; abs.S
 
 #include <asm/linkage.h>
diff --git a/kernel/arch/h8300/lib/ashldi3.c b/kernel/arch/h8300/lib/ashldi3.c
index c6aa8ea5f..430720c0c 100644
--- a/kernel/arch/h8300/lib/ashldi3.c
+++ b/kernel/arch/h8300/lib/ashldi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "libgcc.h"
 
 DWtype
diff --git a/kernel/arch/h8300/lib/ashrdi3.c b/kernel/arch/h8300/lib/ashrdi3.c
index 070adf96d..2c6cd424e 100644
--- a/kernel/arch/h8300/lib/ashrdi3.c
+++ b/kernel/arch/h8300/lib/ashrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "libgcc.h"
 
 DWtype __ashrdi3(DWtype u, word_type b)
diff --git a/kernel/arch/h8300/lib/delay.c b/kernel/arch/h8300/lib/delay.c
index 463f6b3af..f4277529a 100644
--- a/kernel/arch/h8300/lib/delay.c
+++ b/kernel/arch/h8300/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * delay loops
  *
diff --git a/kernel/arch/h8300/lib/libgcc.h b/kernel/arch/h8300/lib/libgcc.h
index 468a8f781..b8bcf7035 100644
--- a/kernel/arch/h8300/lib/libgcc.h
+++ b/kernel/arch/h8300/lib/libgcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __H8300_LIBGCC_H__
 #define __H8300_LIBGCC_H__
 
diff --git a/kernel/arch/h8300/lib/lshrdi3.c b/kernel/arch/h8300/lib/lshrdi3.c
index a86bbe395..8dbc861ca 100644
--- a/kernel/arch/h8300/lib/lshrdi3.c
+++ b/kernel/arch/h8300/lib/lshrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "libgcc.h"
 
 DWtype __lshrdi3(DWtype u, word_type b)
diff --git a/kernel/arch/h8300/lib/memcpy.S b/kernel/arch/h8300/lib/memcpy.S
index 0c9a51fcd..f1cd67d5e 100644
--- a/kernel/arch/h8300/lib/memcpy.S
+++ b/kernel/arch/h8300/lib/memcpy.S
@@ -1,3 +1,4 @@
+;;; SPDX-License-Identifier: GPL-2.0
 ;;; memcpy.S
 
 #include <asm/linkage.h>
diff --git a/kernel/arch/h8300/lib/memset.S b/kernel/arch/h8300/lib/memset.S
index 18d4e709b..2d1abc37f 100644
--- a/kernel/arch/h8300/lib/memset.S
+++ b/kernel/arch/h8300/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* memset.S */
 
 #include <asm/linkage.h>
diff --git a/kernel/arch/h8300/lib/moddivsi3.S b/kernel/arch/h8300/lib/moddivsi3.S
index c803129e8..9e33ab045 100644
--- a/kernel/arch/h8300/lib/moddivsi3.S
+++ b/kernel/arch/h8300/lib/moddivsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "libgcc.h"
 
 ; numerator in A0/A1
diff --git a/kernel/arch/h8300/lib/modsi3.S b/kernel/arch/h8300/lib/modsi3.S
index 68b1dfc32..bdc8a0029 100644
--- a/kernel/arch/h8300/lib/modsi3.S
+++ b/kernel/arch/h8300/lib/modsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "libgcc.h"
 
 ; numerator in A0/A1
diff --git a/kernel/arch/h8300/lib/muldi3.c b/kernel/arch/h8300/lib/muldi3.c
index 790512243..9cb11b134 100644
--- a/kernel/arch/h8300/lib/muldi3.c
+++ b/kernel/arch/h8300/lib/muldi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "libgcc.h"
 
 #define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
diff --git a/kernel/arch/h8300/lib/mulsi3.S b/kernel/arch/h8300/lib/mulsi3.S
index 451f0e053..5a062fd29 100644
--- a/kernel/arch/h8300/lib/mulsi3.S
+++ b/kernel/arch/h8300/lib/mulsi3.S
@@ -1,3 +1,4 @@
+; SPDX-License-Identifier: GPL-2.0
 ;
 ; mulsi3 for H8/300H - based on Renesas SH implementation
 ;
diff --git a/kernel/arch/h8300/lib/strncpy.S b/kernel/arch/h8300/lib/strncpy.S
index d00396a37..8b65d7c47 100644
--- a/kernel/arch/h8300/lib/strncpy.S
+++ b/kernel/arch/h8300/lib/strncpy.S
@@ -1,3 +1,4 @@
+;;; SPDX-License-Identifier: GPL-2.0
 ;;; strncpy.S
 
 #include <asm/linkage.h>
diff --git a/kernel/arch/h8300/lib/ucmpdi2.c b/kernel/arch/h8300/lib/ucmpdi2.c
index 772399d70..9f646885f 100644
--- a/kernel/arch/h8300/lib/ucmpdi2.c
+++ b/kernel/arch/h8300/lib/ucmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "libgcc.h"
 
 word_type __ucmpdi2(DWtype a, DWtype b)
diff --git a/kernel/arch/h8300/lib/udivsi3.S b/kernel/arch/h8300/lib/udivsi3.S
index bbe65610f..b810aba8e 100644
--- a/kernel/arch/h8300/lib/udivsi3.S
+++ b/kernel/arch/h8300/lib/udivsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "libgcc.h"
 
 	;; This function also computes the remainder and stores it in er3.
diff --git a/kernel/arch/h8300/mm/fault.c b/kernel/arch/h8300/mm/fault.c
index 5924ff555..fabffb839 100644
--- a/kernel/arch/h8300/mm/fault.c
+++ b/kernel/arch/h8300/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/h8300/mm/fault.c
  *
diff --git a/kernel/arch/h8300/mm/init.c b/kernel/arch/h8300/mm/init.c
index 495a3d6b5..eeead51be 100644
--- a/kernel/arch/h8300/mm/init.c
+++ b/kernel/arch/h8300/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/h8300/mm/init.c
  *
diff --git a/kernel/arch/h8300/mm/memory.c b/kernel/arch/h8300/mm/memory.c
index 4974aa40b..3785f72bf 100644
--- a/kernel/arch/h8300/mm/memory.c
+++ b/kernel/arch/h8300/mm/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/h8300/mm/memory.c
  *
diff --git a/kernel/arch/hexagon/Kconfig b/kernel/arch/hexagon/Kconfig
index 1941e4baa..76d2f20d5 100644
--- a/kernel/arch/hexagon/Kconfig
+++ b/kernel/arch/hexagon/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Hexagon configuration
 comment "Linux Kernel Configuration for Hexagon"
 
diff --git a/kernel/arch/hexagon/Makefile b/kernel/arch/hexagon/Makefile
index 207711a0f..48fe08230 100644
--- a/kernel/arch/hexagon/Makefile
+++ b/kernel/arch/hexagon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #  Makefile for the Hexagon arch
 
 KBUILD_DEFCONFIG = comet_defconfig
diff --git a/kernel/arch/hexagon/include/asm/Kbuild b/kernel/arch/hexagon/include/asm/Kbuild
index 34013683d..4a23e527d 100644
--- a/kernel/arch/hexagon/include/asm/Kbuild
+++ b/kernel/arch/hexagon/include/asm/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 generic-y += barrier.h
 generic-y += bug.h
 generic-y += bugs.h
diff --git a/kernel/arch/hexagon/include/asm/futex.h b/kernel/arch/hexagon/include/asm/futex.h
index c607b77c8..c889f5993 100644
--- a/kernel/arch/hexagon/include/asm/futex.h
+++ b/kernel/arch/hexagon/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HEXAGON_FUTEX_H
 #define _ASM_HEXAGON_FUTEX_H
 
diff --git a/kernel/arch/hexagon/include/uapi/asm/bitsperlong.h b/kernel/arch/hexagon/include/uapi/asm/bitsperlong.h
index 4a6581513..5adca0d26 100644
--- a/kernel/arch/hexagon/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/hexagon/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/byteorder.h b/kernel/arch/hexagon/include/uapi/asm/byteorder.h
index e31f3f7d9..1364fa4b2 100644
--- a/kernel/arch/hexagon/include/uapi/asm/byteorder.h
+++ b/kernel/arch/hexagon/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/kvm_para.h b/kernel/arch/hexagon/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/hexagon/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/hexagon/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/hexagon/include/uapi/asm/param.h b/kernel/arch/hexagon/include/uapi/asm/param.h
index 5cec8c041..a1283866d 100644
--- a/kernel/arch/hexagon/include/uapi/asm/param.h
+++ b/kernel/arch/hexagon/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/ptrace.h b/kernel/arch/hexagon/include/uapi/asm/ptrace.h
index 065e5b323..f79de05b8 100644
--- a/kernel/arch/hexagon/include/uapi/asm/ptrace.h
+++ b/kernel/arch/hexagon/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Ptrace definitions for the Hexagon architecture
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/registers.h b/kernel/arch/hexagon/include/uapi/asm/registers.h
index e7be31840..d51270f3b 100644
--- a/kernel/arch/hexagon/include/uapi/asm/registers.h
+++ b/kernel/arch/hexagon/include/uapi/asm/registers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Register definitions for the Hexagon architecture
  */
diff --git a/kernel/arch/hexagon/include/uapi/asm/setup.h b/kernel/arch/hexagon/include/uapi/asm/setup.h
index 7e3952d62..8ce9428b1 100644
--- a/kernel/arch/hexagon/include/uapi/asm/setup.h
+++ b/kernel/arch/hexagon/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/sigcontext.h b/kernel/arch/hexagon/include/uapi/asm/sigcontext.h
index b6ba5369c..7171edb1b 100644
--- a/kernel/arch/hexagon/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/hexagon/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/signal.h b/kernel/arch/hexagon/include/uapi/asm/signal.h
index 24b998888..a08fc4253 100644
--- a/kernel/arch/hexagon/include/uapi/asm/signal.h
+++ b/kernel/arch/hexagon/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/swab.h b/kernel/arch/hexagon/include/uapi/asm/swab.h
index 9069e9247..b39f12104 100644
--- a/kernel/arch/hexagon/include/uapi/asm/swab.h
+++ b/kernel/arch/hexagon/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/unistd.h b/kernel/arch/hexagon/include/uapi/asm/unistd.h
index 215176004..ea181e791 100644
--- a/kernel/arch/hexagon/include/uapi/asm/unistd.h
+++ b/kernel/arch/hexagon/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Syscall support for Hexagon
  *
diff --git a/kernel/arch/hexagon/include/uapi/asm/user.h b/kernel/arch/hexagon/include/uapi/asm/user.h
index 3dae94d9c..7327ec59b 100644
--- a/kernel/arch/hexagon/include/uapi/asm/user.h
+++ b/kernel/arch/hexagon/include/uapi/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef HEXAGON_ASM_USER_H
 #define HEXAGON_ASM_USER_H
 
diff --git a/kernel/arch/hexagon/kernel/Makefile b/kernel/arch/hexagon/kernel/Makefile
index 009228b86..fae3dce32 100644
--- a/kernel/arch/hexagon/kernel/Makefile
+++ b/kernel/arch/hexagon/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 extra-y := head.o vmlinux.lds
 
 obj-$(CONFIG_SMP) += smp.o
diff --git a/kernel/arch/ia64/Kconfig b/kernel/arch/ia64/Kconfig
index 6a15083cc..1efc444f5 100644
--- a/kernel/arch/ia64/Kconfig
+++ b/kernel/arch/ia64/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PGTABLE_LEVELS
 	int "Page Table Levels" if !IA64_PAGE_SIZE_64KB
 	range 3 4 if !IA64_PAGE_SIZE_64KB
diff --git a/kernel/arch/ia64/Kconfig.debug b/kernel/arch/ia64/Kconfig.debug
index 4763887ba..677c40942 100644
--- a/kernel/arch/ia64/Kconfig.debug
+++ b/kernel/arch/ia64/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/ia64/dig/Makefile b/kernel/arch/ia64/dig/Makefile
index ae16ec4f6..e7f830825 100644
--- a/kernel/arch/ia64/dig/Makefile
+++ b/kernel/arch/ia64/dig/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # ia64/platform/dig/Makefile
 #
diff --git a/kernel/arch/ia64/dig/setup.c b/kernel/arch/ia64/dig/setup.c
index 98131e1db..cc14fdce6 100644
--- a/kernel/arch/ia64/dig/setup.c
+++ b/kernel/arch/ia64/dig/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Platform dependent support for DIG64 platforms.
  *
diff --git a/kernel/arch/ia64/hp/common/hwsw_iommu.c b/kernel/arch/ia64/hp/common/hwsw_iommu.c
index 0310078a9..63d8e1d24 100644
--- a/kernel/arch/ia64/hp/common/hwsw_iommu.c
+++ b/kernel/arch/ia64/hp/common/hwsw_iommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2004 Hewlett-Packard Development Company, L.P.
  *   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/hp/sim/Kconfig b/kernel/arch/ia64/hp/sim/Kconfig
index d84707d55..56fb4f1d4 100644
--- a/kernel/arch/ia64/hp/sim/Kconfig
+++ b/kernel/arch/ia64/hp/sim/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 menu "HP Simulator drivers"
 	depends on IA64_HP_SIM || IA64_GENERIC
diff --git a/kernel/arch/ia64/hp/sim/Makefile b/kernel/arch/ia64/hp/sim/Makefile
index d10da4793..0224a13d2 100644
--- a/kernel/arch/ia64/hp/sim/Makefile
+++ b/kernel/arch/ia64/hp/sim/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # ia64/platform/hp/sim/Makefile
 #
diff --git a/kernel/arch/ia64/hp/sim/boot/boot_head.S b/kernel/arch/ia64/hp/sim/boot/boot_head.S
index 880856549..a7d178fb4 100644
--- a/kernel/arch/ia64/hp/sim/boot/boot_head.S
+++ b/kernel/arch/ia64/hp/sim/boot/boot_head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1998-2003 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/hp/sim/boot/bootloader.c b/kernel/arch/ia64/hp/sim/boot/bootloader.c
index 28f4b230b..6d804608d 100644
--- a/kernel/arch/ia64/hp/sim/boot/bootloader.c
+++ b/kernel/arch/ia64/hp/sim/boot/bootloader.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/ia64/hp/sim/boot/bootloader.c
  *
diff --git a/kernel/arch/ia64/hp/sim/boot/bootloader.lds b/kernel/arch/ia64/hp/sim/boot/bootloader.lds
index 3977f25a1..f3f284d65 100644
--- a/kernel/arch/ia64/hp/sim/boot/bootloader.lds
+++ b/kernel/arch/ia64/hp/sim/boot/bootloader.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 OUTPUT_FORMAT("elf64-ia64-little")
 OUTPUT_ARCH(ia64)
 ENTRY(_start)
diff --git a/kernel/arch/ia64/hp/sim/boot/fw-emu.c b/kernel/arch/ia64/hp/sim/boot/fw-emu.c
index 87bf9ad8c..517fb2822 100644
--- a/kernel/arch/ia64/hp/sim/boot/fw-emu.c
+++ b/kernel/arch/ia64/hp/sim/boot/fw-emu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PAL & SAL emulation.
  *
diff --git a/kernel/arch/ia64/hp/sim/boot/ssc.h b/kernel/arch/ia64/hp/sim/boot/ssc.h
index 3b94c03e4..88752c750 100644
--- a/kernel/arch/ia64/hp/sim/boot/ssc.h
+++ b/kernel/arch/ia64/hp/sim/boot/ssc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1998-2003 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/hp/sim/hpsim.S b/kernel/arch/ia64/hp/sim/hpsim.S
index ff16e8a85..44b4d53e1 100644
--- a/kernel/arch/ia64/hp/sim/hpsim.S
+++ b/kernel/arch/ia64/hp/sim/hpsim.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/asmmacro.h>
 
 /*
diff --git a/kernel/arch/ia64/hp/sim/hpsim_console.c b/kernel/arch/ia64/hp/sim/hpsim_console.c
index 01663bc42..bffd9f67a 100644
--- a/kernel/arch/ia64/hp/sim/hpsim_console.c
+++ b/kernel/arch/ia64/hp/sim/hpsim_console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Platform dependent support for HP simulator.
  *
diff --git a/kernel/arch/ia64/hp/sim/hpsim_irq.c b/kernel/arch/ia64/hp/sim/hpsim_irq.c
index 0aa70ebda..2f1cc5965 100644
--- a/kernel/arch/ia64/hp/sim/hpsim_irq.c
+++ b/kernel/arch/ia64/hp/sim/hpsim_irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Platform dependent support for HP simulator.
  *
diff --git a/kernel/arch/ia64/hp/sim/hpsim_setup.c b/kernel/arch/ia64/hp/sim/hpsim_setup.c
index 664a5402a..41d21d51d 100644
--- a/kernel/arch/ia64/hp/sim/hpsim_setup.c
+++ b/kernel/arch/ia64/hp/sim/hpsim_setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Platform dependent support for HP simulator.
  *
diff --git a/kernel/arch/ia64/hp/sim/hpsim_ssc.h b/kernel/arch/ia64/hp/sim/hpsim_ssc.h
index bfa390627..6fd97a487 100644
--- a/kernel/arch/ia64/hp/sim/hpsim_ssc.h
+++ b/kernel/arch/ia64/hp/sim/hpsim_ssc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Platform dependent support for HP simulator.
  *
diff --git a/kernel/arch/ia64/hp/sim/simeth.c b/kernel/arch/ia64/hp/sim/simeth.c
index d1b04c4c9..f39ef2b4e 100644
--- a/kernel/arch/ia64/hp/sim/simeth.c
+++ b/kernel/arch/ia64/hp/sim/simeth.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simulated Ethernet Driver
  *
diff --git a/kernel/arch/ia64/hp/sim/simscsi.c b/kernel/arch/ia64/hp/sim/simscsi.c
index 085047f3a..7e1426e76 100644
--- a/kernel/arch/ia64/hp/sim/simscsi.c
+++ b/kernel/arch/ia64/hp/sim/simscsi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simulated SCSI driver.
  *
diff --git a/kernel/arch/ia64/hp/sim/simserial.c b/kernel/arch/ia64/hp/sim/simserial.c
index 70d52e9bb..a419ccf33 100644
--- a/kernel/arch/ia64/hp/sim/simserial.c
+++ b/kernel/arch/ia64/hp/sim/simserial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simulated Serial Driver (fake serial)
  *
diff --git a/kernel/arch/ia64/include/asm/acpi.h b/kernel/arch/ia64/include/asm/acpi.h
index c86a947f5..a3d021197 100644
--- a/kernel/arch/ia64/include/asm/acpi.h
+++ b/kernel/arch/ia64/include/asm/acpi.h
@@ -112,6 +112,8 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf)
 	buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
 }
 
+#define acpi_unlazy_tlb(x)
+
 #ifdef CONFIG_ACPI_NUMA
 extern cpumask_t early_cpu_possible_map;
 #define for_each_possible_early_cpu(cpu)  \
diff --git a/kernel/arch/ia64/include/asm/agp.h b/kernel/arch/ia64/include/asm/agp.h
index 01d09c401..2b451c449 100644
--- a/kernel/arch/ia64/include/asm/agp.h
+++ b/kernel/arch/ia64/include/asm/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_AGP_H
 #define _ASM_IA64_AGP_H
 
diff --git a/kernel/arch/ia64/include/asm/asm-prototypes.h b/kernel/arch/ia64/include/asm/asm-prototypes.h
index a2c139808..c71153667 100644
--- a/kernel/arch/ia64/include/asm/asm-prototypes.h
+++ b/kernel/arch/ia64/include/asm/asm-prototypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_ASM_PROTOTYPES_H
 #define _ASM_IA64_ASM_PROTOTYPES_H
 
diff --git a/kernel/arch/ia64/include/asm/asmmacro.h b/kernel/arch/ia64/include/asm/asmmacro.h
index 3ab6d75aa..52619c517 100644
--- a/kernel/arch/ia64/include/asm/asmmacro.h
+++ b/kernel/arch/ia64/include/asm/asmmacro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_ASMMACRO_H
 #define _ASM_IA64_ASMMACRO_H
 
diff --git a/kernel/arch/ia64/include/asm/atomic.h b/kernel/arch/ia64/include/asm/atomic.h
index 65d4bb2b6..28e02c99b 100644
--- a/kernel/arch/ia64/include/asm/atomic.h
+++ b/kernel/arch/ia64/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_ATOMIC_H
 #define _ASM_IA64_ATOMIC_H
 
diff --git a/kernel/arch/ia64/include/asm/barrier.h b/kernel/arch/ia64/include/asm/barrier.h
index 588f1614c..751cdd353 100644
--- a/kernel/arch/ia64/include/asm/barrier.h
+++ b/kernel/arch/ia64/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Memory barrier definitions.  This is based on information published
  * in the Processor Abstraction Layer and the System Abstraction Layer
diff --git a/kernel/arch/ia64/include/asm/bitops.h b/kernel/arch/ia64/include/asm/bitops.h
index 71e814524..56a774bf1 100644
--- a/kernel/arch/ia64/include/asm/bitops.h
+++ b/kernel/arch/ia64/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_BITOPS_H
 #define _ASM_IA64_BITOPS_H
 
diff --git a/kernel/arch/ia64/include/asm/bug.h b/kernel/arch/ia64/include/asm/bug.h
index 823616b50..bd3eeb8d1 100644
--- a/kernel/arch/ia64/include/asm/bug.h
+++ b/kernel/arch/ia64/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_BUG_H
 #define _ASM_IA64_BUG_H
 
diff --git a/kernel/arch/ia64/include/asm/bugs.h b/kernel/arch/ia64/include/asm/bugs.h
index 433523e3b..0d6b9bded 100644
--- a/kernel/arch/ia64/include/asm/bugs.h
+++ b/kernel/arch/ia64/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is included by init/main.c to check for architecture-dependent bugs.
  *
diff --git a/kernel/arch/ia64/include/asm/cache.h b/kernel/arch/ia64/include/asm/cache.h
index 988254a7d..4eb6f742d 100644
--- a/kernel/arch/ia64/include/asm/cache.h
+++ b/kernel/arch/ia64/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_CACHE_H
 #define _ASM_IA64_CACHE_H
 
diff --git a/kernel/arch/ia64/include/asm/cacheflush.h b/kernel/arch/ia64/include/asm/cacheflush.h
index 429eefc93..6d3478f8a 100644
--- a/kernel/arch/ia64/include/asm/cacheflush.h
+++ b/kernel/arch/ia64/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_CACHEFLUSH_H
 #define _ASM_IA64_CACHEFLUSH_H
 
diff --git a/kernel/arch/ia64/include/asm/checksum.h b/kernel/arch/ia64/include/asm/checksum.h
index 7accf5416..0ed18bc3f 100644
--- a/kernel/arch/ia64/include/asm/checksum.h
+++ b/kernel/arch/ia64/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_CHECKSUM_H
 #define _ASM_IA64_CHECKSUM_H
 
diff --git a/kernel/arch/ia64/include/asm/clocksource.h b/kernel/arch/ia64/include/asm/clocksource.h
index 5c8596e4c..71a517751 100644
--- a/kernel/arch/ia64/include/asm/clocksource.h
+++ b/kernel/arch/ia64/include/asm/clocksource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* IA64-specific clocksource additions */
 
 #ifndef _ASM_IA64_CLOCKSOURCE_H
diff --git a/kernel/arch/ia64/include/asm/cpu.h b/kernel/arch/ia64/include/asm/cpu.h
index fcca30b9f..db125df9e 100644
--- a/kernel/arch/ia64/include/asm/cpu.h
+++ b/kernel/arch/ia64/include/asm/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_CPU_H_
 #define _ASM_IA64_CPU_H_
 
diff --git a/kernel/arch/ia64/include/asm/current.h b/kernel/arch/ia64/include/asm/current.h
index c659f90fb..86fbcc88d 100644
--- a/kernel/arch/ia64/include/asm/current.h
+++ b/kernel/arch/ia64/include/asm/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_CURRENT_H
 #define _ASM_IA64_CURRENT_H
 
diff --git a/kernel/arch/ia64/include/asm/cyclone.h b/kernel/arch/ia64/include/asm/cyclone.h
index 88f6500e8..a48139364 100644
--- a/kernel/arch/ia64/include/asm/cyclone.h
+++ b/kernel/arch/ia64/include/asm/cyclone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_IA64_CYCLONE_H
 #define ASM_IA64_CYCLONE_H
 
diff --git a/kernel/arch/ia64/include/asm/delay.h b/kernel/arch/ia64/include/asm/delay.h
index a30a62f23..0227ac586 100644
--- a/kernel/arch/ia64/include/asm/delay.h
+++ b/kernel/arch/ia64/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_DELAY_H
 #define _ASM_IA64_DELAY_H
 
diff --git a/kernel/arch/ia64/include/asm/dma-mapping.h b/kernel/arch/ia64/include/asm/dma-mapping.h
index 3ce5ab433..5da9421fb 100644
--- a/kernel/arch/ia64/include/asm/dma-mapping.h
+++ b/kernel/arch/ia64/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_DMA_MAPPING_H
 #define _ASM_IA64_DMA_MAPPING_H
 
diff --git a/kernel/arch/ia64/include/asm/dma.h b/kernel/arch/ia64/include/asm/dma.h
index 4d97f60f1..186850eec 100644
--- a/kernel/arch/ia64/include/asm/dma.h
+++ b/kernel/arch/ia64/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_DMA_H
 #define _ASM_IA64_DMA_H
 
diff --git a/kernel/arch/ia64/include/asm/dmi.h b/kernel/arch/ia64/include/asm/dmi.h
index f365a61f5..ecd9e0a0f 100644
--- a/kernel/arch/ia64/include/asm/dmi.h
+++ b/kernel/arch/ia64/include/asm/dmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_DMI_H
 #define _ASM_DMI_H 1
 
diff --git a/kernel/arch/ia64/include/asm/early_ioremap.h b/kernel/arch/ia64/include/asm/early_ioremap.h
index eec9e1d1b..934191b1e 100644
--- a/kernel/arch/ia64/include/asm/early_ioremap.h
+++ b/kernel/arch/ia64/include/asm/early_ioremap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_EARLY_IOREMAP_H
 #define _ASM_IA64_EARLY_IOREMAP_H
 
diff --git a/kernel/arch/ia64/include/asm/elf.h b/kernel/arch/ia64/include/asm/elf.h
index 5a83c5cc3..c70bb9c11 100644
--- a/kernel/arch/ia64/include/asm/elf.h
+++ b/kernel/arch/ia64/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_ELF_H
 #define _ASM_IA64_ELF_H
 
diff --git a/kernel/arch/ia64/include/asm/esi.h b/kernel/arch/ia64/include/asm/esi.h
index 40991c6ba..56d1310af 100644
--- a/kernel/arch/ia64/include/asm/esi.h
+++ b/kernel/arch/ia64/include/asm/esi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ESI service calls.
  *
diff --git a/kernel/arch/ia64/include/asm/extable.h b/kernel/arch/ia64/include/asm/extable.h
index 20376e71e..83eac6aa0 100644
--- a/kernel/arch/ia64/include/asm/extable.h
+++ b/kernel/arch/ia64/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_EXTABLE_H
 #define _ASM_IA64_EXTABLE_H
 
diff --git a/kernel/arch/ia64/include/asm/fb.h b/kernel/arch/ia64/include/asm/fb.h
index 89a397cee..5f95782bf 100644
--- a/kernel/arch/ia64/include/asm/fb.h
+++ b/kernel/arch/ia64/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
diff --git a/kernel/arch/ia64/include/asm/fpswa.h b/kernel/arch/ia64/include/asm/fpswa.h
index 62edfcead..2a0c23728 100644
--- a/kernel/arch/ia64/include/asm/fpswa.h
+++ b/kernel/arch/ia64/include/asm/fpswa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_FPSWA_H
 #define _ASM_IA64_FPSWA_H
 
diff --git a/kernel/arch/ia64/include/asm/ftrace.h b/kernel/arch/ia64/include/asm/ftrace.h
index fbd1a2470..a07a8e575 100644
--- a/kernel/arch/ia64/include/asm/ftrace.h
+++ b/kernel/arch/ia64/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_FTRACE_H
 #define _ASM_IA64_FTRACE_H
 
diff --git a/kernel/arch/ia64/include/asm/futex.h b/kernel/arch/ia64/include/asm/futex.h
index 6d67dc1ea..db2dd8591 100644
--- a/kernel/arch/ia64/include/asm/futex.h
+++ b/kernel/arch/ia64/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FUTEX_H
 #define _ASM_FUTEX_H
 
diff --git a/kernel/arch/ia64/include/asm/gcc_intrin.h b/kernel/arch/ia64/include/asm/gcc_intrin.h
index f9495b175..83f230b23 100644
--- a/kernel/arch/ia64/include/asm/gcc_intrin.h
+++ b/kernel/arch/ia64/include/asm/gcc_intrin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Copyright (C) 2002,2003 Jun Nakajima <jun.nakajima@intel.com>
diff --git a/kernel/arch/ia64/include/asm/hardirq.h b/kernel/arch/ia64/include/asm/hardirq.h
index 8fb7d33a6..bdc4669c7 100644
--- a/kernel/arch/ia64/include/asm/hardirq.h
+++ b/kernel/arch/ia64/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_HARDIRQ_H
 #define _ASM_IA64_HARDIRQ_H
 
diff --git a/kernel/arch/ia64/include/asm/hpsim.h b/kernel/arch/ia64/include/asm/hpsim.h
index 0fe50225d..00fbd5cc8 100644
--- a/kernel/arch/ia64/include/asm/hpsim.h
+++ b/kernel/arch/ia64/include/asm/hpsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMIA64_HPSIM_H
 #define _ASMIA64_HPSIM_H
 
diff --git a/kernel/arch/ia64/include/asm/hugetlb.h b/kernel/arch/ia64/include/asm/hugetlb.h
index ef65f026b..74d2a5540 100644
--- a/kernel/arch/ia64/include/asm/hugetlb.h
+++ b/kernel/arch/ia64/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_HUGETLB_H
 #define _ASM_IA64_HUGETLB_H
 
diff --git a/kernel/arch/ia64/include/asm/hw_irq.h b/kernel/arch/ia64/include/asm/hw_irq.h
index 74347ebf7..5dd3c6485 100644
--- a/kernel/arch/ia64/include/asm/hw_irq.h
+++ b/kernel/arch/ia64/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_HW_IRQ_H
 #define _ASM_IA64_HW_IRQ_H
 
diff --git a/kernel/arch/ia64/include/asm/idle.h b/kernel/arch/ia64/include/asm/idle.h
index b7685015a..97c55b97e 100644
--- a/kernel/arch/ia64/include/asm/idle.h
+++ b/kernel/arch/ia64/include/asm/idle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_IDLE_H
 #define _ASM_IA64_IDLE_H
 
diff --git a/kernel/arch/ia64/include/asm/intrinsics.h b/kernel/arch/ia64/include/asm/intrinsics.h
index ec970a920..035b17fe1 100644
--- a/kernel/arch/ia64/include/asm/intrinsics.h
+++ b/kernel/arch/ia64/include/asm/intrinsics.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Compiler-dependent intrinsics.
  *
diff --git a/kernel/arch/ia64/include/asm/io.h b/kernel/arch/ia64/include/asm/io.h
index a2540e21f..fb0651961 100644
--- a/kernel/arch/ia64/include/asm/io.h
+++ b/kernel/arch/ia64/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_IO_H
 #define _ASM_IA64_IO_H
 
diff --git a/kernel/arch/ia64/include/asm/iommu.h b/kernel/arch/ia64/include/asm/iommu.h
index 1d1212901..156b9d8e1 100644
--- a/kernel/arch/ia64/include/asm/iommu.h
+++ b/kernel/arch/ia64/include/asm/iommu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_IOMMU_H
 #define _ASM_IA64_IOMMU_H 1
 
diff --git a/kernel/arch/ia64/include/asm/iommu_table.h b/kernel/arch/ia64/include/asm/iommu_table.h
index 92c8d36ae..cc96116ac 100644
--- a/kernel/arch/ia64/include/asm/iommu_table.h
+++ b/kernel/arch/ia64/include/asm/iommu_table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_IOMMU_TABLE_H
 #define _ASM_IA64_IOMMU_TABLE_H
 
diff --git a/kernel/arch/ia64/include/asm/iosapic.h b/kernel/arch/ia64/include/asm/iosapic.h
index 4ae1fbd7f..f48556cb8 100644
--- a/kernel/arch/ia64/include/asm/iosapic.h
+++ b/kernel/arch/ia64/include/asm/iosapic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IA64_IOSAPIC_H
 #define __ASM_IA64_IOSAPIC_H
 
diff --git a/kernel/arch/ia64/include/asm/irq.h b/kernel/arch/ia64/include/asm/irq.h
index 820667cbe..8b84a55ed 100644
--- a/kernel/arch/ia64/include/asm/irq.h
+++ b/kernel/arch/ia64/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_IRQ_H
 #define _ASM_IA64_IRQ_H
 
diff --git a/kernel/arch/ia64/include/asm/irq_remapping.h b/kernel/arch/ia64/include/asm/irq_remapping.h
index a8687b1d8..547a6e870 100644
--- a/kernel/arch/ia64/include/asm/irq_remapping.h
+++ b/kernel/arch/ia64/include/asm/irq_remapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IA64_INTR_REMAPPING_H
 #define __IA64_INTR_REMAPPING_H
 #define irq_remapping_enabled 0
diff --git a/kernel/arch/ia64/include/asm/irqflags.h b/kernel/arch/ia64/include/asm/irqflags.h
index cec6c06b5..d97f8435b 100644
--- a/kernel/arch/ia64/include/asm/irqflags.h
+++ b/kernel/arch/ia64/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IRQ flags defines.
  *
diff --git a/kernel/arch/ia64/include/asm/kexec.h b/kernel/arch/ia64/include/asm/kexec.h
index aea2b81b0..294b1e1eb 100644
--- a/kernel/arch/ia64/include/asm/kexec.h
+++ b/kernel/arch/ia64/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_KEXEC_H
 #define _ASM_IA64_KEXEC_H
 
diff --git a/kernel/arch/ia64/include/asm/kmap_types.h b/kernel/arch/ia64/include/asm/kmap_types.h
index 05d5f9996..5c268cf7c 100644
--- a/kernel/arch/ia64/include/asm/kmap_types.h
+++ b/kernel/arch/ia64/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_KMAP_TYPES_H
 #define _ASM_IA64_KMAP_TYPES_H
 
diff --git a/kernel/arch/ia64/include/asm/kregs.h b/kernel/arch/ia64/include/asm/kregs.h
index 39e65f663..44113b75e 100644
--- a/kernel/arch/ia64/include/asm/kregs.h
+++ b/kernel/arch/ia64/include/asm/kregs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_KREGS_H
 #define _ASM_IA64_KREGS_H
 
diff --git a/kernel/arch/ia64/include/asm/libata-portmap.h b/kernel/arch/ia64/include/asm/libata-portmap.h
index 7a1f83105..757f84e5d 100644
--- a/kernel/arch/ia64/include/asm/libata-portmap.h
+++ b/kernel/arch/ia64/include/asm/libata-portmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IA64_LIBATA_PORTMAP_H
 #define __ASM_IA64_LIBATA_PORTMAP_H
 
diff --git a/kernel/arch/ia64/include/asm/linkage.h b/kernel/arch/ia64/include/asm/linkage.h
index 787575701..5178af560 100644
--- a/kernel/arch/ia64/include/asm/linkage.h
+++ b/kernel/arch/ia64/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/ia64/include/asm/machvec.h b/kernel/arch/ia64/include/asm/machvec.h
index af285c423..267f4f170 100644
--- a/kernel/arch/ia64/include/asm/machvec.h
+++ b/kernel/arch/ia64/include/asm/machvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine vector for IA-64.
  *
diff --git a/kernel/arch/ia64/include/asm/machvec_dig.h b/kernel/arch/ia64/include/asm/machvec_dig.h
index 1f7403a2f..bc230f69f 100644
--- a/kernel/arch/ia64/include/asm/machvec_dig.h
+++ b/kernel/arch/ia64/include/asm/machvec_dig.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MACHVEC_DIG_h
 #define _ASM_IA64_MACHVEC_DIG_h
 
diff --git a/kernel/arch/ia64/include/asm/machvec_dig_vtd.h b/kernel/arch/ia64/include/asm/machvec_dig_vtd.h
index 44308b4c3..bb44eb903 100644
--- a/kernel/arch/ia64/include/asm/machvec_dig_vtd.h
+++ b/kernel/arch/ia64/include/asm/machvec_dig_vtd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MACHVEC_DIG_VTD_h
 #define _ASM_IA64_MACHVEC_DIG_VTD_h
 
diff --git a/kernel/arch/ia64/include/asm/machvec_hpsim.h b/kernel/arch/ia64/include/asm/machvec_hpsim.h
index e75711279..056f84058 100644
--- a/kernel/arch/ia64/include/asm/machvec_hpsim.h
+++ b/kernel/arch/ia64/include/asm/machvec_hpsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MACHVEC_HPSIM_h
 #define _ASM_IA64_MACHVEC_HPSIM_h
 
diff --git a/kernel/arch/ia64/include/asm/machvec_hpzx1.h b/kernel/arch/ia64/include/asm/machvec_hpzx1.h
index c74d3159e..5299ac38b 100644
--- a/kernel/arch/ia64/include/asm/machvec_hpzx1.h
+++ b/kernel/arch/ia64/include/asm/machvec_hpzx1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MACHVEC_HPZX1_h
 #define _ASM_IA64_MACHVEC_HPZX1_h
 
diff --git a/kernel/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h b/kernel/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
index 906ef6210..5aec6a008 100644
--- a/kernel/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
+++ b/kernel/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h
 #define _ASM_IA64_MACHVEC_HPZX1_SWIOTLB_h
 
diff --git a/kernel/arch/ia64/include/asm/machvec_init.h b/kernel/arch/ia64/include/asm/machvec_init.h
index 37a469849..2b32fd06b 100644
--- a/kernel/arch/ia64/include/asm/machvec_init.h
+++ b/kernel/arch/ia64/include/asm/machvec_init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/iommu.h>
 #include <asm/machvec.h>
 
diff --git a/kernel/arch/ia64/include/asm/mca.h b/kernel/arch/ia64/include/asm/mca.h
index 8c7096168..726df17f1 100644
--- a/kernel/arch/ia64/include/asm/mca.h
+++ b/kernel/arch/ia64/include/asm/mca.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	mca.h
  * Purpose:	Machine check handling specific defines
diff --git a/kernel/arch/ia64/include/asm/mca_asm.h b/kernel/arch/ia64/include/asm/mca_asm.h
index 13c1d4994..e3ab1f41f 100644
--- a/kernel/arch/ia64/include/asm/mca_asm.h
+++ b/kernel/arch/ia64/include/asm/mca_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	mca_asm.h
  * Purpose:	Machine check handling specific defines
diff --git a/kernel/arch/ia64/include/asm/mman.h b/kernel/arch/ia64/include/asm/mman.h
index fdd5f5229..15cf100ad 100644
--- a/kernel/arch/ia64/include/asm/mman.h
+++ b/kernel/arch/ia64/include/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Based on <asm-i386/mman.h>.
  *
diff --git a/kernel/arch/ia64/include/asm/mmu.h b/kernel/arch/ia64/include/asm/mmu.h
index 611432ba5..f75f44f53 100644
--- a/kernel/arch/ia64/include/asm/mmu.h
+++ b/kernel/arch/ia64/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/ia64/include/asm/mmu_context.h b/kernel/arch/ia64/include/asm/mmu_context.h
index 9b9936863..2da0e2eb0 100644
--- a/kernel/arch/ia64/include/asm/mmu_context.h
+++ b/kernel/arch/ia64/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MMU_CONTEXT_H
 #define _ASM_IA64_MMU_CONTEXT_H
 
diff --git a/kernel/arch/ia64/include/asm/module.h b/kernel/arch/ia64/include/asm/module.h
index f31894b2a..f31914426 100644
--- a/kernel/arch/ia64/include/asm/module.h
+++ b/kernel/arch/ia64/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_MODULE_H
 #define _ASM_IA64_MODULE_H
 
diff --git a/kernel/arch/ia64/include/asm/msidef.h b/kernel/arch/ia64/include/asm/msidef.h
index 592c1047a..18d0e4226 100644
--- a/kernel/arch/ia64/include/asm/msidef.h
+++ b/kernel/arch/ia64/include/asm/msidef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IA64_MSI_DEF_H
 #define _IA64_MSI_DEF_H
 
diff --git a/kernel/arch/ia64/include/asm/page.h b/kernel/arch/ia64/include/asm/page.h
index e8c486ef0..5798bd2b4 100644
--- a/kernel/arch/ia64/include/asm/page.h
+++ b/kernel/arch/ia64/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PAGE_H
 #define _ASM_IA64_PAGE_H
 /*
diff --git a/kernel/arch/ia64/include/asm/pal.h b/kernel/arch/ia64/include/asm/pal.h
index 2e69284df..f9d2b3b2d 100644
--- a/kernel/arch/ia64/include/asm/pal.h
+++ b/kernel/arch/ia64/include/asm/pal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PAL_H
 #define _ASM_IA64_PAL_H
 
diff --git a/kernel/arch/ia64/include/asm/param.h b/kernel/arch/ia64/include/asm/param.h
index 1295913d6..f0b786227 100644
--- a/kernel/arch/ia64/include/asm/param.h
+++ b/kernel/arch/ia64/include/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Fundamental kernel parameters.
  *
diff --git a/kernel/arch/ia64/include/asm/parport.h b/kernel/arch/ia64/include/asm/parport.h
index 638b4d271..360ca9bf2 100644
--- a/kernel/arch/ia64/include/asm/parport.h
+++ b/kernel/arch/ia64/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * parport.h: platform-specific PC-style parport initialisation
  *
diff --git a/kernel/arch/ia64/include/asm/patch.h b/kernel/arch/ia64/include/asm/patch.h
index 295fe6ab4..bd487ed22 100644
--- a/kernel/arch/ia64/include/asm/patch.h
+++ b/kernel/arch/ia64/include/asm/patch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PATCH_H
 #define _ASM_IA64_PATCH_H
 
diff --git a/kernel/arch/ia64/include/asm/pci.h b/kernel/arch/ia64/include/asm/pci.h
index 6459f2d46..e20d77f6a 100644
--- a/kernel/arch/ia64/include/asm/pci.h
+++ b/kernel/arch/ia64/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PCI_H
 #define _ASM_IA64_PCI_H
 
diff --git a/kernel/arch/ia64/include/asm/percpu.h b/kernel/arch/ia64/include/asm/percpu.h
index b9295793a..f357b9bb3 100644
--- a/kernel/arch/ia64/include/asm/percpu.h
+++ b/kernel/arch/ia64/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PERCPU_H
 #define _ASM_IA64_PERCPU_H
 
diff --git a/kernel/arch/ia64/include/asm/perfmon.h b/kernel/arch/ia64/include/asm/perfmon.h
index 15476dd3a..e0545869c 100644
--- a/kernel/arch/ia64/include/asm/perfmon.h
+++ b/kernel/arch/ia64/include/asm/perfmon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2001-2003 Hewlett-Packard Co
  *               Stephane Eranian <eranian@hpl.hp.com>
diff --git a/kernel/arch/ia64/include/asm/pgalloc.h b/kernel/arch/ia64/include/asm/pgalloc.h
index f5e70e961..3ee5362f2 100644
--- a/kernel/arch/ia64/include/asm/pgalloc.h
+++ b/kernel/arch/ia64/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PGALLOC_H
 #define _ASM_IA64_PGALLOC_H
 
diff --git a/kernel/arch/ia64/include/asm/pgtable.h b/kernel/arch/ia64/include/asm/pgtable.h
index 6cc22c8d8..165827774 100644
--- a/kernel/arch/ia64/include/asm/pgtable.h
+++ b/kernel/arch/ia64/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PGTABLE_H
 #define _ASM_IA64_PGTABLE_H
 
diff --git a/kernel/arch/ia64/include/asm/processor.h b/kernel/arch/ia64/include/asm/processor.h
index ab982f07e..10061ccf0 100644
--- a/kernel/arch/ia64/include/asm/processor.h
+++ b/kernel/arch/ia64/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_PROCESSOR_H
 #define _ASM_IA64_PROCESSOR_H
 
diff --git a/kernel/arch/ia64/include/asm/ptrace.h b/kernel/arch/ia64/include/asm/ptrace.h
index 845143990..7ff574d56 100644
--- a/kernel/arch/ia64/include/asm/ptrace.h
+++ b/kernel/arch/ia64/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1998-2004 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/include/asm/rwsem.h b/kernel/arch/ia64/include/asm/rwsem.h
index 8fa98dd30..7d6fceb3d 100644
--- a/kernel/arch/ia64/include/asm/rwsem.h
+++ b/kernel/arch/ia64/include/asm/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * R/W semaphores for ia64
  *
diff --git a/kernel/arch/ia64/include/asm/sal.h b/kernel/arch/ia64/include/asm/sal.h
index e504f3821..588f33156 100644
--- a/kernel/arch/ia64/include/asm/sal.h
+++ b/kernel/arch/ia64/include/asm/sal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_SAL_H
 #define _ASM_IA64_SAL_H
 
diff --git a/kernel/arch/ia64/include/asm/sections.h b/kernel/arch/ia64/include/asm/sections.h
index 2ab200369..f34814085 100644
--- a/kernel/arch/ia64/include/asm/sections.h
+++ b/kernel/arch/ia64/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_SECTIONS_H
 #define _ASM_IA64_SECTIONS_H
 
diff --git a/kernel/arch/ia64/include/asm/shmparam.h b/kernel/arch/ia64/include/asm/shmparam.h
index d07508dc5..43bd8324a 100644
--- a/kernel/arch/ia64/include/asm/shmparam.h
+++ b/kernel/arch/ia64/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_SHMPARAM_H
 #define _ASM_IA64_SHMPARAM_H
 
diff --git a/kernel/arch/ia64/include/asm/signal.h b/kernel/arch/ia64/include/asm/signal.h
index c62afa4a0..80f067f9b 100644
--- a/kernel/arch/ia64/include/asm/signal.h
+++ b/kernel/arch/ia64/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Modified 1998-2001, 2003
  *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
diff --git a/kernel/arch/ia64/include/asm/smp.h b/kernel/arch/ia64/include/asm/smp.h
index fea21e986..7847ae40a 100644
--- a/kernel/arch/ia64/include/asm/smp.h
+++ b/kernel/arch/ia64/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SMP Support
  *
diff --git a/kernel/arch/ia64/include/asm/sn/ioc3.h b/kernel/arch/ia64/include/asm/sn/ioc3.h
index 6eaa3cc1e..d4a524951 100644
--- a/kernel/arch/ia64/include/asm/sn/ioc3.h
+++ b/kernel/arch/ia64/include/asm/sn/ioc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2005 Silicon Graphics, Inc.
  */
diff --git a/kernel/arch/ia64/include/asm/sparsemem.h b/kernel/arch/ia64/include/asm/sparsemem.h
index 67a7c40ec..336d0570e 100644
--- a/kernel/arch/ia64/include/asm/sparsemem.h
+++ b/kernel/arch/ia64/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_SPARSEMEM_H
 #define _ASM_IA64_SPARSEMEM_H
 
diff --git a/kernel/arch/ia64/include/asm/spinlock.h b/kernel/arch/ia64/include/asm/spinlock.h
index df2c12116..aa057abd9 100644
--- a/kernel/arch/ia64/include/asm/spinlock.h
+++ b/kernel/arch/ia64/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_SPINLOCK_H
 #define _ASM_IA64_SPINLOCK_H
 
diff --git a/kernel/arch/ia64/include/asm/spinlock_types.h b/kernel/arch/ia64/include/asm/spinlock_types.h
index e2b42a52a..6e345fefc 100644
--- a/kernel/arch/ia64/include/asm/spinlock_types.h
+++ b/kernel/arch/ia64/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_SPINLOCK_TYPES_H
 #define _ASM_IA64_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/ia64/include/asm/string.h b/kernel/arch/ia64/include/asm/string.h
index 85fd65c52..8b84df0db 100644
--- a/kernel/arch/ia64/include/asm/string.h
+++ b/kernel/arch/ia64/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_STRING_H
 #define _ASM_IA64_STRING_H
 
diff --git a/kernel/arch/ia64/include/asm/swiotlb.h b/kernel/arch/ia64/include/asm/swiotlb.h
index f0acde68a..841e2c7d0 100644
--- a/kernel/arch/ia64/include/asm/swiotlb.h
+++ b/kernel/arch/ia64/include/asm/swiotlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_IA64__SWIOTLB_H
 #define ASM_IA64__SWIOTLB_H
 
diff --git a/kernel/arch/ia64/include/asm/switch_to.h b/kernel/arch/ia64/include/asm/switch_to.h
index e8f3585e7..b10f31ec5 100644
--- a/kernel/arch/ia64/include/asm/switch_to.h
+++ b/kernel/arch/ia64/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Low-level task switching. This is based on information published in
  * the Processor Abstraction Layer and the System Abstraction Layer
diff --git a/kernel/arch/ia64/include/asm/termios.h b/kernel/arch/ia64/include/asm/termios.h
index a42f870ca..589c02644 100644
--- a/kernel/arch/ia64/include/asm/termios.h
+++ b/kernel/arch/ia64/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Modified 1999
  *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
diff --git a/kernel/arch/ia64/include/asm/thread_info.h b/kernel/arch/ia64/include/asm/thread_info.h
index 8742d741d..1d172a411 100644
--- a/kernel/arch/ia64/include/asm/thread_info.h
+++ b/kernel/arch/ia64/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2002-2003 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/include/asm/timex.h b/kernel/arch/ia64/include/asm/timex.h
index 86c7db861..869a3ac6b 100644
--- a/kernel/arch/ia64/include/asm/timex.h
+++ b/kernel/arch/ia64/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_TIMEX_H
 #define _ASM_IA64_TIMEX_H
 
diff --git a/kernel/arch/ia64/include/asm/tlb.h b/kernel/arch/ia64/include/asm/tlb.h
index cbe5ac369..44f0ac0df 100644
--- a/kernel/arch/ia64/include/asm/tlb.h
+++ b/kernel/arch/ia64/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_TLB_H
 #define _ASM_IA64_TLB_H
 /*
diff --git a/kernel/arch/ia64/include/asm/tlbflush.h b/kernel/arch/ia64/include/asm/tlbflush.h
index 3be25dfed..25e280810 100644
--- a/kernel/arch/ia64/include/asm/tlbflush.h
+++ b/kernel/arch/ia64/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_TLBFLUSH_H
 #define _ASM_IA64_TLBFLUSH_H
 
diff --git a/kernel/arch/ia64/include/asm/types.h b/kernel/arch/ia64/include/asm/types.h
index 4c351b169..5ddc7703d 100644
--- a/kernel/arch/ia64/include/asm/types.h
+++ b/kernel/arch/ia64/include/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file is never included by application software unless explicitly
  * requested (e.g., via linux/types.h) in which case the application is
diff --git a/kernel/arch/ia64/include/asm/uaccess.h b/kernel/arch/ia64/include/asm/uaccess.h
index 0890ded63..a74524f2d 100644
--- a/kernel/arch/ia64/include/asm/uaccess.h
+++ b/kernel/arch/ia64/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_UACCESS_H
 #define _ASM_IA64_UACCESS_H
 
diff --git a/kernel/arch/ia64/include/asm/unaligned.h b/kernel/arch/ia64/include/asm/unaligned.h
index 7bddc7f58..328942e3c 100644
--- a/kernel/arch/ia64/include/asm/unaligned.h
+++ b/kernel/arch/ia64/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_UNALIGNED_H
 #define _ASM_IA64_UNALIGNED_H
 
diff --git a/kernel/arch/ia64/include/asm/unistd.h b/kernel/arch/ia64/include/asm/unistd.h
index 8c8520975..ffb705dc9 100644
--- a/kernel/arch/ia64/include/asm/unistd.h
+++ b/kernel/arch/ia64/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IA-64 Linux syscall numbers and inline-functions.
  *
diff --git a/kernel/arch/ia64/include/asm/unwind.h b/kernel/arch/ia64/include/asm/unwind.h
index 1af3875f1..c5bd4b3e3 100644
--- a/kernel/arch/ia64/include/asm/unwind.h
+++ b/kernel/arch/ia64/include/asm/unwind.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_UNWIND_H
 #define _ASM_IA64_UNWIND_H
 
diff --git a/kernel/arch/ia64/include/asm/user.h b/kernel/arch/ia64/include/asm/user.h
index 8b9821110..0ba486651 100644
--- a/kernel/arch/ia64/include/asm/user.h
+++ b/kernel/arch/ia64/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_USER_H
 #define _ASM_IA64_USER_H
 
diff --git a/kernel/arch/ia64/include/asm/ustack.h b/kernel/arch/ia64/include/asm/ustack.h
index b275401b9..112d40a0f 100644
--- a/kernel/arch/ia64/include/asm/ustack.h
+++ b/kernel/arch/ia64/include/asm/ustack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_USTACK_H
 #define _ASM_IA64_USTACK_H
 
diff --git a/kernel/arch/ia64/include/asm/uv/uv.h b/kernel/arch/ia64/include/asm/uv/uv.h
index 8f6cbaa74..71df93ee3 100644
--- a/kernel/arch/ia64/include/asm/uv/uv.h
+++ b/kernel/arch/ia64/include/asm/uv/uv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IA64_UV_UV_H
 #define _ASM_IA64_UV_UV_H
 
diff --git a/kernel/arch/ia64/include/asm/vga.h b/kernel/arch/ia64/include/asm/vga.h
index 02184ecd8..30cb373f3 100644
--- a/kernel/arch/ia64/include/asm/vga.h
+++ b/kernel/arch/ia64/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Access to VGA videoram
  *
diff --git a/kernel/arch/ia64/include/uapi/asm/auxvec.h b/kernel/arch/ia64/include/uapi/asm/auxvec.h
index 58277fc65..09969a5d2 100644
--- a/kernel/arch/ia64/include/uapi/asm/auxvec.h
+++ b/kernel/arch/ia64/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_AUXVEC_H
 #define _ASM_IA64_AUXVEC_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/bitsperlong.h b/kernel/arch/ia64/include/uapi/asm/bitsperlong.h
index ec4db3c97..1146d5556 100644
--- a/kernel/arch/ia64/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/ia64/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_IA64_BITSPERLONG_H
 #define __ASM_IA64_BITSPERLONG_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/break.h b/kernel/arch/ia64/include/uapi/asm/break.h
index f03402039..5d742bcb0 100644
--- a/kernel/arch/ia64/include/uapi/asm/break.h
+++ b/kernel/arch/ia64/include/uapi/asm/break.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_BREAK_H
 #define _ASM_IA64_BREAK_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/byteorder.h b/kernel/arch/ia64/include/uapi/asm/byteorder.h
index a8dd73558..f85d0faaa 100644
--- a/kernel/arch/ia64/include/uapi/asm/byteorder.h
+++ b/kernel/arch/ia64/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_BYTEORDER_H
 #define _ASM_IA64_BYTEORDER_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/cmpxchg.h b/kernel/arch/ia64/include/uapi/asm/cmpxchg.h
index a0e3620f8..d69c97993 100644
--- a/kernel/arch/ia64/include/uapi/asm/cmpxchg.h
+++ b/kernel/arch/ia64/include/uapi/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_CMPXCHG_H
 #define _ASM_IA64_CMPXCHG_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/errno.h b/kernel/arch/ia64/include/uapi/asm/errno.h
index 4c82b503d..9addba592 100644
--- a/kernel/arch/ia64/include/uapi/asm/errno.h
+++ b/kernel/arch/ia64/include/uapi/asm/errno.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/errno.h>
diff --git a/kernel/arch/ia64/include/uapi/asm/fcntl.h b/kernel/arch/ia64/include/uapi/asm/fcntl.h
index 7b485876c..7b95523ef 100644
--- a/kernel/arch/ia64/include/uapi/asm/fcntl.h
+++ b/kernel/arch/ia64/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_FCNTL_H
 #define _ASM_IA64_FCNTL_H
 /*
diff --git a/kernel/arch/ia64/include/uapi/asm/fpu.h b/kernel/arch/ia64/include/uapi/asm/fpu.h
index b6395ad15..0df392982 100644
--- a/kernel/arch/ia64/include/uapi/asm/fpu.h
+++ b/kernel/arch/ia64/include/uapi/asm/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_FPU_H
 #define _ASM_IA64_FPU_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/gcc_intrin.h b/kernel/arch/ia64/include/uapi/asm/gcc_intrin.h
index 61d0d0111..c60696fd1 100644
--- a/kernel/arch/ia64/include/uapi/asm/gcc_intrin.h
+++ b/kernel/arch/ia64/include/uapi/asm/gcc_intrin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
  * Copyright (C) 2002,2003 Jun Nakajima <jun.nakajima@intel.com>
diff --git a/kernel/arch/ia64/include/uapi/asm/ia64regs.h b/kernel/arch/ia64/include/uapi/asm/ia64regs.h
index 1757f1c11..d7d10cec8 100644
--- a/kernel/arch/ia64/include/uapi/asm/ia64regs.h
+++ b/kernel/arch/ia64/include/uapi/asm/ia64regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2002,2003 Intel Corp.
  *      Jun Nakajima <jun.nakajima@intel.com>
diff --git a/kernel/arch/ia64/include/uapi/asm/intel_intrin.h b/kernel/arch/ia64/include/uapi/asm/intel_intrin.h
index 53cec5775..ab6496915 100644
--- a/kernel/arch/ia64/include/uapi/asm/intel_intrin.h
+++ b/kernel/arch/ia64/include/uapi/asm/intel_intrin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_INTEL_INTRIN_H
 #define _ASM_IA64_INTEL_INTRIN_H
 /*
diff --git a/kernel/arch/ia64/include/uapi/asm/intrinsics.h b/kernel/arch/ia64/include/uapi/asm/intrinsics.h
index 5829978ff..aecc217ec 100644
--- a/kernel/arch/ia64/include/uapi/asm/intrinsics.h
+++ b/kernel/arch/ia64/include/uapi/asm/intrinsics.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Compiler-dependent intrinsics.
  *
diff --git a/kernel/arch/ia64/include/uapi/asm/ioctl.h b/kernel/arch/ia64/include/uapi/asm/ioctl.h
index b279fe06d..b809c4566 100644
--- a/kernel/arch/ia64/include/uapi/asm/ioctl.h
+++ b/kernel/arch/ia64/include/uapi/asm/ioctl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ioctl.h>
diff --git a/kernel/arch/ia64/include/uapi/asm/ioctls.h b/kernel/arch/ia64/include/uapi/asm/ioctls.h
index f3aab5512..b86001940 100644
--- a/kernel/arch/ia64/include/uapi/asm/ioctls.h
+++ b/kernel/arch/ia64/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_IOCTLS_H
 #define _ASM_IA64_IOCTLS_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/ipcbuf.h b/kernel/arch/ia64/include/uapi/asm/ipcbuf.h
index 84c7e51cb..90d6445a1 100644
--- a/kernel/arch/ia64/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/ia64/include/uapi/asm/ipcbuf.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ipcbuf.h>
diff --git a/kernel/arch/ia64/include/uapi/asm/mman.h b/kernel/arch/ia64/include/uapi/asm/mman.h
index 8740819ad..ce0cc3d75 100644
--- a/kernel/arch/ia64/include/uapi/asm/mman.h
+++ b/kernel/arch/ia64/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Based on <asm-i386/mman.h>.
  *
diff --git a/kernel/arch/ia64/include/uapi/asm/msgbuf.h b/kernel/arch/ia64/include/uapi/asm/msgbuf.h
index 6c64c0d2a..aa25df92d 100644
--- a/kernel/arch/ia64/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/ia64/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_MSGBUF_H
 #define _ASM_IA64_MSGBUF_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/param.h b/kernel/arch/ia64/include/uapi/asm/param.h
index d7da41d94..123ab4594 100644
--- a/kernel/arch/ia64/include/uapi/asm/param.h
+++ b/kernel/arch/ia64/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Fundamental kernel parameters.
  *
diff --git a/kernel/arch/ia64/include/uapi/asm/perfmon.h b/kernel/arch/ia64/include/uapi/asm/perfmon.h
index 1a10a2dd5..017548365 100644
--- a/kernel/arch/ia64/include/uapi/asm/perfmon.h
+++ b/kernel/arch/ia64/include/uapi/asm/perfmon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2001-2003 Hewlett-Packard Co
  *               Stephane Eranian <eranian@hpl.hp.com>
diff --git a/kernel/arch/ia64/include/uapi/asm/perfmon_default_smpl.h b/kernel/arch/ia64/include/uapi/asm/perfmon_default_smpl.h
index a2d560c67..d3f36aff0 100644
--- a/kernel/arch/ia64/include/uapi/asm/perfmon_default_smpl.h
+++ b/kernel/arch/ia64/include/uapi/asm/perfmon_default_smpl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2002-2003 Hewlett-Packard Co
  *               Stephane Eranian <eranian@hpl.hp.com>
diff --git a/kernel/arch/ia64/include/uapi/asm/poll.h b/kernel/arch/ia64/include/uapi/asm/poll.h
index c98509d31..b7132a305 100644
--- a/kernel/arch/ia64/include/uapi/asm/poll.h
+++ b/kernel/arch/ia64/include/uapi/asm/poll.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/poll.h>
diff --git a/kernel/arch/ia64/include/uapi/asm/posix_types.h b/kernel/arch/ia64/include/uapi/asm/posix_types.h
index 99ee1d651..bded40f7d 100644
--- a/kernel/arch/ia64/include/uapi/asm/posix_types.h
+++ b/kernel/arch/ia64/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_POSIX_TYPES_H
 #define _ASM_IA64_POSIX_TYPES_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/ptrace.h b/kernel/arch/ia64/include/uapi/asm/ptrace.h
index 0a02f634e..f52655b44 100644
--- a/kernel/arch/ia64/include/uapi/asm/ptrace.h
+++ b/kernel/arch/ia64/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 1998-2004 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/include/uapi/asm/ptrace_offsets.h b/kernel/arch/ia64/include/uapi/asm/ptrace_offsets.h
index b712773c7..2847c1813 100644
--- a/kernel/arch/ia64/include/uapi/asm/ptrace_offsets.h
+++ b/kernel/arch/ia64/include/uapi/asm/ptrace_offsets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_PTRACE_OFFSETS_H
 #define _ASM_IA64_PTRACE_OFFSETS_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/resource.h b/kernel/arch/ia64/include/uapi/asm/resource.h
index ba2272a87..d488d2b22 100644
--- a/kernel/arch/ia64/include/uapi/asm/resource.h
+++ b/kernel/arch/ia64/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_RESOURCE_H
 #define _ASM_IA64_RESOURCE_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/rse.h b/kernel/arch/ia64/include/uapi/asm/rse.h
index 02830a3b0..6d260af57 100644
--- a/kernel/arch/ia64/include/uapi/asm/rse.h
+++ b/kernel/arch/ia64/include/uapi/asm/rse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_RSE_H
 #define _ASM_IA64_RSE_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/sembuf.h b/kernel/arch/ia64/include/uapi/asm/sembuf.h
index 1340fbc04..6ed058760 100644
--- a/kernel/arch/ia64/include/uapi/asm/sembuf.h
+++ b/kernel/arch/ia64/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_SEMBUF_H
 #define _ASM_IA64_SEMBUF_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/setup.h b/kernel/arch/ia64/include/uapi/asm/setup.h
index 8d5645831..8d13ce8fb 100644
--- a/kernel/arch/ia64/include/uapi/asm/setup.h
+++ b/kernel/arch/ia64/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __IA64_SETUP_H
 #define __IA64_SETUP_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/shmbuf.h b/kernel/arch/ia64/include/uapi/asm/shmbuf.h
index 585002a77..6ef57cb70 100644
--- a/kernel/arch/ia64/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/ia64/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_SHMBUF_H
 #define _ASM_IA64_SHMBUF_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/sigcontext.h b/kernel/arch/ia64/include/uapi/asm/sigcontext.h
index 57ff777bc..1bb6f0f2b 100644
--- a/kernel/arch/ia64/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/ia64/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_SIGCONTEXT_H
 #define _ASM_IA64_SIGCONTEXT_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/siginfo.h b/kernel/arch/ia64/include/uapi/asm/siginfo.h
index 33389fc36..f3a02a10c 100644
--- a/kernel/arch/ia64/include/uapi/asm/siginfo.h
+++ b/kernel/arch/ia64/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Based on <asm-i386/siginfo.h>.
  *
diff --git a/kernel/arch/ia64/include/uapi/asm/signal.h b/kernel/arch/ia64/include/uapi/asm/signal.h
index c0ea2855e..aa98ff1b9 100644
--- a/kernel/arch/ia64/include/uapi/asm/signal.h
+++ b/kernel/arch/ia64/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Modified 1998-2001, 2003
  *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
diff --git a/kernel/arch/ia64/include/uapi/asm/socket.h b/kernel/arch/ia64/include/uapi/asm/socket.h
index 002eb85a6..3efba40ad 100644
--- a/kernel/arch/ia64/include/uapi/asm/socket.h
+++ b/kernel/arch/ia64/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_SOCKET_H
 #define _ASM_IA64_SOCKET_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/sockios.h b/kernel/arch/ia64/include/uapi/asm/sockios.h
index 15c92468a..f27a12f95 100644
--- a/kernel/arch/ia64/include/uapi/asm/sockios.h
+++ b/kernel/arch/ia64/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_SOCKIOS_H
 #define _ASM_IA64_SOCKIOS_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/stat.h b/kernel/arch/ia64/include/uapi/asm/stat.h
index 367bb90cd..3265ed5aa 100644
--- a/kernel/arch/ia64/include/uapi/asm/stat.h
+++ b/kernel/arch/ia64/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_STAT_H
 #define _ASM_IA64_STAT_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/statfs.h b/kernel/arch/ia64/include/uapi/asm/statfs.h
index 1e589669d..de3bae4f1 100644
--- a/kernel/arch/ia64/include/uapi/asm/statfs.h
+++ b/kernel/arch/ia64/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_STATFS_H
 #define _ASM_IA64_STATFS_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/swab.h b/kernel/arch/ia64/include/uapi/asm/swab.h
index c89a8cb5d..79f3fef1a 100644
--- a/kernel/arch/ia64/include/uapi/asm/swab.h
+++ b/kernel/arch/ia64/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_SWAB_H
 #define _ASM_IA64_SWAB_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/termbits.h b/kernel/arch/ia64/include/uapi/asm/termbits.h
index c009b94e5..000a1a297 100644
--- a/kernel/arch/ia64/include/uapi/asm/termbits.h
+++ b/kernel/arch/ia64/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_TERMBITS_H
 #define _ASM_IA64_TERMBITS_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/termios.h b/kernel/arch/ia64/include/uapi/asm/termios.h
index d59b48c30..199742d08 100644
--- a/kernel/arch/ia64/include/uapi/asm/termios.h
+++ b/kernel/arch/ia64/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Modified 1999
  *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
diff --git a/kernel/arch/ia64/include/uapi/asm/types.h b/kernel/arch/ia64/include/uapi/asm/types.h
index 321193b05..2000de474 100644
--- a/kernel/arch/ia64/include/uapi/asm/types.h
+++ b/kernel/arch/ia64/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is never included by application software unless explicitly
  * requested (e.g., via linux/types.h) in which case the application is
diff --git a/kernel/arch/ia64/include/uapi/asm/ucontext.h b/kernel/arch/ia64/include/uapi/asm/ucontext.h
index bf573dc8c..46f51e535 100644
--- a/kernel/arch/ia64/include/uapi/asm/ucontext.h
+++ b/kernel/arch/ia64/include/uapi/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IA64_UCONTEXT_H
 #define _ASM_IA64_UCONTEXT_H
 
diff --git a/kernel/arch/ia64/include/uapi/asm/unistd.h b/kernel/arch/ia64/include/uapi/asm/unistd.h
index ea5363daa..5fe71d4a4 100644
--- a/kernel/arch/ia64/include/uapi/asm/unistd.h
+++ b/kernel/arch/ia64/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * IA-64 Linux syscall numbers and inline-functions.
  *
diff --git a/kernel/arch/ia64/include/uapi/asm/ustack.h b/kernel/arch/ia64/include/uapi/asm/ustack.h
index 1dfebc622..703cc5f54 100644
--- a/kernel/arch/ia64/include/uapi/asm/ustack.h
+++ b/kernel/arch/ia64/include/uapi/asm/ustack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_IA64_USTACK_H
 #define _UAPI_ASM_IA64_USTACK_H
 
diff --git a/kernel/arch/ia64/kernel/Makefile b/kernel/arch/ia64/kernel/Makefile
index 9edda5466..14ad79f39 100644
--- a/kernel/arch/ia64/kernel/Makefile
+++ b/kernel/arch/ia64/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/ia64/kernel/Makefile.gate b/kernel/arch/ia64/kernel/Makefile.gate
index 7da7c65a9..f53faf48b 100644
--- a/kernel/arch/ia64/kernel/Makefile.gate
+++ b/kernel/arch/ia64/kernel/Makefile.gate
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # The gate DSO image is built using a special linker script.
 
 targets += gate.so gate.lds gate.o gate-dummy.o
diff --git a/kernel/arch/ia64/kernel/asm-offsets.c b/kernel/arch/ia64/kernel/asm-offsets.c
index 798bdb209..b385ff2bf 100644
--- a/kernel/arch/ia64/kernel/asm-offsets.c
+++ b/kernel/arch/ia64/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed
diff --git a/kernel/arch/ia64/kernel/audit.c b/kernel/arch/ia64/kernel/audit.c
index 96a9d18ff..5192ca899 100644
--- a/kernel/arch/ia64/kernel/audit.c
+++ b/kernel/arch/ia64/kernel/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/arch/ia64/kernel/brl_emu.c b/kernel/arch/ia64/kernel/brl_emu.c
index 987b11be0..9bcc908bc 100644
--- a/kernel/arch/ia64/kernel/brl_emu.c
+++ b/kernel/arch/ia64/kernel/brl_emu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Emulation of the "brl" instruction for IA64 processors that
  *  don't support it in hardware.
diff --git a/kernel/arch/ia64/kernel/crash.c b/kernel/arch/ia64/kernel/crash.c
index 75859a07d..39f4433a6 100644
--- a/kernel/arch/ia64/kernel/crash.c
+++ b/kernel/arch/ia64/kernel/crash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/ia64/kernel/crash.c
  *
diff --git a/kernel/arch/ia64/kernel/crash_dump.c b/kernel/arch/ia64/kernel/crash_dump.c
index 9c12b794e..0ed3c3dee 100644
--- a/kernel/arch/ia64/kernel/crash_dump.c
+++ b/kernel/arch/ia64/kernel/crash_dump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	kernel/crash_dump.c - Memory preserving reboot related code.
  *
diff --git a/kernel/arch/ia64/kernel/cyclone.c b/kernel/arch/ia64/kernel/cyclone.c
index ee1a4afbf..f80eb7fb5 100644
--- a/kernel/arch/ia64/kernel/cyclone.c
+++ b/kernel/arch/ia64/kernel/cyclone.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/time.h>
diff --git a/kernel/arch/ia64/kernel/dma-mapping.c b/kernel/arch/ia64/kernel/dma-mapping.c
index e0dd97f4e..7a82c9259 100644
--- a/kernel/arch/ia64/kernel/dma-mapping.c
+++ b/kernel/arch/ia64/kernel/dma-mapping.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/dma-mapping.h>
 #include <linux/export.h>
 
diff --git a/kernel/arch/ia64/kernel/efi.c b/kernel/arch/ia64/kernel/efi.c
index 81416000c..9c09bf390 100644
--- a/kernel/arch/ia64/kernel/efi.c
+++ b/kernel/arch/ia64/kernel/efi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Extensible Firmware Interface
  *
diff --git a/kernel/arch/ia64/kernel/efi_stub.S b/kernel/arch/ia64/kernel/efi_stub.S
index a56e161d7..58233bb79 100644
--- a/kernel/arch/ia64/kernel/efi_stub.S
+++ b/kernel/arch/ia64/kernel/efi_stub.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * EFI call stub.
  *
diff --git a/kernel/arch/ia64/kernel/elfcore.c b/kernel/arch/ia64/kernel/elfcore.c
index 04bc8fd5f..94680521f 100644
--- a/kernel/arch/ia64/kernel/elfcore.c
+++ b/kernel/arch/ia64/kernel/elfcore.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/elf.h>
 #include <linux/coredump.h>
 #include <linux/fs.h>
diff --git a/kernel/arch/ia64/kernel/entry.S b/kernel/arch/ia64/kernel/entry.S
index e7a716b09..68362b30e 100644
--- a/kernel/arch/ia64/kernel/entry.S
+++ b/kernel/arch/ia64/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/ia64/kernel/entry.S
  *
diff --git a/kernel/arch/ia64/kernel/entry.h b/kernel/arch/ia64/kernel/entry.h
index b83edac02..6463dc316 100644
--- a/kernel/arch/ia64/kernel/entry.h
+++ b/kernel/arch/ia64/kernel/entry.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  * Preserved registers that are shared between code in ivt.S and
diff --git a/kernel/arch/ia64/kernel/fsys.S b/kernel/arch/ia64/kernel/fsys.S
index edbf7af95..c0e7c9af2 100644
--- a/kernel/arch/ia64/kernel/fsys.S
+++ b/kernel/arch/ia64/kernel/fsys.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the light-weight system call handlers (fsyscall-handlers).
  *
diff --git a/kernel/arch/ia64/kernel/fsyscall_gtod_data.h b/kernel/arch/ia64/kernel/fsyscall_gtod_data.h
index dcc514917..0914c02a1 100644
--- a/kernel/arch/ia64/kernel/fsyscall_gtod_data.h
+++ b/kernel/arch/ia64/kernel/fsyscall_gtod_data.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (c) Copyright 2007 Hewlett-Packard Development Company, L.P.
  *        Contributed by Peter Keilty <peter.keilty@hp.com>
diff --git a/kernel/arch/ia64/kernel/gate.S b/kernel/arch/ia64/kernel/gate.S
index 0bd1b3bfa..9f235cd55 100644
--- a/kernel/arch/ia64/kernel/gate.S
+++ b/kernel/arch/ia64/kernel/gate.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the code that gets mapped at the upper end of each task's text
  * region.  For now, it contains the signal trampoline code only.
diff --git a/kernel/arch/ia64/kernel/gate.lds.S b/kernel/arch/ia64/kernel/gate.lds.S
index 3e8271e85..461c7e69d 100644
--- a/kernel/arch/ia64/kernel/gate.lds.S
+++ b/kernel/arch/ia64/kernel/gate.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for gate DSO.  The gate pages are an ELF shared object
  * prelinked to its virtual address, with only one read-only segment and
diff --git a/kernel/arch/ia64/kernel/head.S b/kernel/arch/ia64/kernel/head.S
index 3204fddc4..e6f45170a 100644
--- a/kernel/arch/ia64/kernel/head.S
+++ b/kernel/arch/ia64/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Here is where the ball gets rolling as far as the kernel is concerned.
  * When control is transferred to _start, the bootload has already
diff --git a/kernel/arch/ia64/kernel/ia64_ksyms.c b/kernel/arch/ia64/kernel/ia64_ksyms.c
index d111248af..6b51c88e3 100644
--- a/kernel/arch/ia64/kernel/ia64_ksyms.c
+++ b/kernel/arch/ia64/kernel/ia64_ksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture-specific kernel symbols
  */
diff --git a/kernel/arch/ia64/kernel/init_task.c b/kernel/arch/ia64/kernel/init_task.c
index fa8ee64ad..8df9245e2 100644
--- a/kernel/arch/ia64/kernel/init_task.c
+++ b/kernel/arch/ia64/kernel/init_task.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is where we statically allocate and initialize the initial
  * task.
diff --git a/kernel/arch/ia64/kernel/iosapic.c b/kernel/arch/ia64/kernel/iosapic.c
index 90fde5b86..550243a94 100644
--- a/kernel/arch/ia64/kernel/iosapic.c
+++ b/kernel/arch/ia64/kernel/iosapic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * I/O SAPIC support.
  *
diff --git a/kernel/arch/ia64/kernel/irq.c b/kernel/arch/ia64/kernel/irq.c
index 2ff1df7b1..8ed81b252 100644
--- a/kernel/arch/ia64/kernel/irq.c
+++ b/kernel/arch/ia64/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/arch/ia64/kernel/irq.c
  *
diff --git a/kernel/arch/ia64/kernel/irq_ia64.c b/kernel/arch/ia64/kernel/irq_ia64.c
index eaa3199f9..ab87d6c25 100644
--- a/kernel/arch/ia64/kernel/irq_ia64.c
+++ b/kernel/arch/ia64/kernel/irq_ia64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/ia64/kernel/irq_ia64.c
  *
diff --git a/kernel/arch/ia64/kernel/irq_lsapic.c b/kernel/arch/ia64/kernel/irq_lsapic.c
index 1b3a776e5..23bf4499a 100644
--- a/kernel/arch/ia64/kernel/irq_lsapic.c
+++ b/kernel/arch/ia64/kernel/irq_lsapic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * LSAPIC Interrupt Controller
  *
diff --git a/kernel/arch/ia64/kernel/ivt.S b/kernel/arch/ia64/kernel/ivt.S
index 44a103a5d..1efcbe5f0 100644
--- a/kernel/arch/ia64/kernel/ivt.S
+++ b/kernel/arch/ia64/kernel/ivt.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/ia64/kernel/ivt.S
  *
diff --git a/kernel/arch/ia64/kernel/machvec.c b/kernel/arch/ia64/kernel/machvec.c
index f5a1e5246..7bfe98859 100644
--- a/kernel/arch/ia64/kernel/machvec.c
+++ b/kernel/arch/ia64/kernel/machvec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <asm/machvec.h>
diff --git a/kernel/arch/ia64/kernel/mca_asm.S b/kernel/arch/ia64/kernel/mca_asm.S
index d5bdf9de3..086cfa499 100644
--- a/kernel/arch/ia64/kernel/mca_asm.S
+++ b/kernel/arch/ia64/kernel/mca_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	mca_asm.S
  * Purpose:	assembly portion of the IA64 MCA handling
diff --git a/kernel/arch/ia64/kernel/mca_drv.h b/kernel/arch/ia64/kernel/mca_drv.h
index 53b8ecb5b..45bc4e3ae 100644
--- a/kernel/arch/ia64/kernel/mca_drv.h
+++ b/kernel/arch/ia64/kernel/mca_drv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	mca_drv.h
  * Purpose:	Define helpers for Generic MCA handling
diff --git a/kernel/arch/ia64/kernel/mca_drv_asm.S b/kernel/arch/ia64/kernel/mca_drv_asm.S
index 767ac2c20..4428f57be 100644
--- a/kernel/arch/ia64/kernel/mca_drv_asm.S
+++ b/kernel/arch/ia64/kernel/mca_drv_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:        mca_drv_asm.S
  * Purpose:     Assembly portion of Generic MCA handling
diff --git a/kernel/arch/ia64/kernel/minstate.h b/kernel/arch/ia64/kernel/minstate.h
index 5704700fb..d6eab2a10 100644
--- a/kernel/arch/ia64/kernel/minstate.h
+++ b/kernel/arch/ia64/kernel/minstate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <asm/cache.h>
 
diff --git a/kernel/arch/ia64/kernel/module.c b/kernel/arch/ia64/kernel/module.c
index d1d945c6b..853b5611a 100644
--- a/kernel/arch/ia64/kernel/module.c
+++ b/kernel/arch/ia64/kernel/module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IA-64-specific support for kernel module loader.
  *
diff --git a/kernel/arch/ia64/kernel/msi_ia64.c b/kernel/arch/ia64/kernel/msi_ia64.c
index af4eaec0f..519d9432f 100644
--- a/kernel/arch/ia64/kernel/msi_ia64.c
+++ b/kernel/arch/ia64/kernel/msi_ia64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MSI hooks for standard x86 apic
  */
diff --git a/kernel/arch/ia64/kernel/nr-irqs.c b/kernel/arch/ia64/kernel/nr-irqs.c
index f6769cd54..f2633b22d 100644
--- a/kernel/arch/ia64/kernel/nr-irqs.c
+++ b/kernel/arch/ia64/kernel/nr-irqs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * calculate
  * NR_IRQS = max(IA64_NATIVE_NR_IRQS, XEN_NR_IRQS, FOO_NR_IRQS...)
diff --git a/kernel/arch/ia64/kernel/pal.S b/kernel/arch/ia64/kernel/pal.S
index 94fb2e395..d3e22c018 100644
--- a/kernel/arch/ia64/kernel/pal.S
+++ b/kernel/arch/ia64/kernel/pal.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PAL Firmware support
  * IA-64 Processor Programmers Reference Vol 2
diff --git a/kernel/arch/ia64/kernel/patch.c b/kernel/arch/ia64/kernel/patch.c
index 944a8e243..7f21a8c57 100644
--- a/kernel/arch/ia64/kernel/patch.c
+++ b/kernel/arch/ia64/kernel/patch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Instruction-patching support.
  *
diff --git a/kernel/arch/ia64/kernel/pci-dma.c b/kernel/arch/ia64/kernel/pci-dma.c
index 9094a73f9..3ba87c22d 100644
--- a/kernel/arch/ia64/kernel/pci-dma.c
+++ b/kernel/arch/ia64/kernel/pci-dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dynamic DMA mapping support.
  */
diff --git a/kernel/arch/ia64/kernel/pci-swiotlb.c b/kernel/arch/ia64/kernel/pci-swiotlb.c
index a14989dac..5e50939aa 100644
--- a/kernel/arch/ia64/kernel/pci-swiotlb.c
+++ b/kernel/arch/ia64/kernel/pci-swiotlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Glue code to lib/swiotlb.c */
 
 #include <linux/pci.h>
diff --git a/kernel/arch/ia64/kernel/perfmon_generic.h b/kernel/arch/ia64/kernel/perfmon_generic.h
index 674894780..96af4696c 100644
--- a/kernel/arch/ia64/kernel/perfmon_generic.h
+++ b/kernel/arch/ia64/kernel/perfmon_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the generic PMU register description tables
  * and pmc checker used by perfmon.c.
diff --git a/kernel/arch/ia64/kernel/perfmon_itanium.h b/kernel/arch/ia64/kernel/perfmon_itanium.h
index d1d508a0f..f2d348648 100644
--- a/kernel/arch/ia64/kernel/perfmon_itanium.h
+++ b/kernel/arch/ia64/kernel/perfmon_itanium.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the Itanium PMU register description tables
  * and pmc checker used by perfmon.c.
diff --git a/kernel/arch/ia64/kernel/perfmon_mckinley.h b/kernel/arch/ia64/kernel/perfmon_mckinley.h
index c4bec7a9d..a993249e5 100644
--- a/kernel/arch/ia64/kernel/perfmon_mckinley.h
+++ b/kernel/arch/ia64/kernel/perfmon_mckinley.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the McKinley PMU register description tables
  * and pmc checker used by perfmon.c.
diff --git a/kernel/arch/ia64/kernel/perfmon_montecito.h b/kernel/arch/ia64/kernel/perfmon_montecito.h
index 7f8da4c7c..c0b5b9110 100644
--- a/kernel/arch/ia64/kernel/perfmon_montecito.h
+++ b/kernel/arch/ia64/kernel/perfmon_montecito.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the Montecito PMU register description tables
  * and pmc checker used by perfmon.c.
diff --git a/kernel/arch/ia64/kernel/process.c b/kernel/arch/ia64/kernel/process.c
index d344d0d69..dda008205 100644
--- a/kernel/arch/ia64/kernel/process.c
+++ b/kernel/arch/ia64/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture-specific setup.
  *
diff --git a/kernel/arch/ia64/kernel/ptrace.c b/kernel/arch/ia64/kernel/ptrace.c
index 3f8293378..427cd565f 100644
--- a/kernel/arch/ia64/kernel/ptrace.c
+++ b/kernel/arch/ia64/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Kernel support for the ptrace() and syscall tracing interfaces.
  *
diff --git a/kernel/arch/ia64/kernel/setup.c b/kernel/arch/ia64/kernel/setup.c
index 23e3fd61e..dee56bcb9 100644
--- a/kernel/arch/ia64/kernel/setup.c
+++ b/kernel/arch/ia64/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture-specific setup.
  *
diff --git a/kernel/arch/ia64/kernel/sigframe.h b/kernel/arch/ia64/kernel/sigframe.h
index 9fd9a1933..58a36ce6c 100644
--- a/kernel/arch/ia64/kernel/sigframe.h
+++ b/kernel/arch/ia64/kernel/sigframe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 struct sigscratch {
 	unsigned long scratch_unat;	/* ar.unat for the general registers saved in pt */
 	unsigned long ar_pfs;		/* for syscalls, the user-level function-state  */
diff --git a/kernel/arch/ia64/kernel/signal.c b/kernel/arch/ia64/kernel/signal.c
index 6146d53b6..a254cc98f 100644
--- a/kernel/arch/ia64/kernel/signal.c
+++ b/kernel/arch/ia64/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture-specific signal handling support.
  *
diff --git a/kernel/arch/ia64/kernel/stacktrace.c b/kernel/arch/ia64/kernel/stacktrace.c
index 5af2783a8..6e583a6bd 100644
--- a/kernel/arch/ia64/kernel/stacktrace.c
+++ b/kernel/arch/ia64/kernel/stacktrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/ia64/kernel/stacktrace.c
  *
diff --git a/kernel/arch/ia64/kernel/sys_ia64.c b/kernel/arch/ia64/kernel/sys_ia64.c
index 5ce927c85..085adfcc7 100644
--- a/kernel/arch/ia64/kernel/sys_ia64.c
+++ b/kernel/arch/ia64/kernel/sys_ia64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains various system calls that have different calling
  * conventions on different platforms.
diff --git a/kernel/arch/ia64/kernel/traps.c b/kernel/arch/ia64/kernel/traps.c
index 3cb17cf9b..6d4e76a42 100644
--- a/kernel/arch/ia64/kernel/traps.c
+++ b/kernel/arch/ia64/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture-specific trap handling.
  *
diff --git a/kernel/arch/ia64/kernel/unaligned.c b/kernel/arch/ia64/kernel/unaligned.c
index a13680ca1..72e9b4242 100644
--- a/kernel/arch/ia64/kernel/unaligned.c
+++ b/kernel/arch/ia64/kernel/unaligned.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture-specific unaligned trap handling.
  *
diff --git a/kernel/arch/ia64/kernel/unwind.c b/kernel/arch/ia64/kernel/unwind.c
index 9704e2cd9..e04efa088 100644
--- a/kernel/arch/ia64/kernel/unwind.c
+++ b/kernel/arch/ia64/kernel/unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1999-2004 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/kernel/unwind_decoder.c b/kernel/arch/ia64/kernel/unwind_decoder.c
index 50ac2d82f..83f54f792 100644
--- a/kernel/arch/ia64/kernel/unwind_decoder.c
+++ b/kernel/arch/ia64/kernel/unwind_decoder.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2000 Hewlett-Packard Co
  * Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/kernel/unwind_i.h b/kernel/arch/ia64/kernel/unwind_i.h
index 96693a6ae..67994a7e5 100644
--- a/kernel/arch/ia64/kernel/unwind_i.h
+++ b/kernel/arch/ia64/kernel/unwind_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2000, 2002-2003 Hewlett-Packard Co
  *	David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/kernel/vmlinux.lds.S b/kernel/arch/ia64/kernel/vmlinux.lds.S
index 798026dde..58db59da0 100644
--- a/kernel/arch/ia64/kernel/vmlinux.lds.S
+++ b/kernel/arch/ia64/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <asm/cache.h>
 #include <asm/ptrace.h>
diff --git a/kernel/arch/ia64/lib/Makefile b/kernel/arch/ia64/lib/Makefile
index 1a36a3a39..82118b385 100644
--- a/kernel/arch/ia64/lib/Makefile
+++ b/kernel/arch/ia64/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ia64-specific library routines..
 #
diff --git a/kernel/arch/ia64/lib/carta_random.S b/kernel/arch/ia64/lib/carta_random.S
index d0674c360..1a4a639dc 100644
--- a/kernel/arch/ia64/lib/carta_random.S
+++ b/kernel/arch/ia64/lib/carta_random.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Fast, simple, yet decent quality random number generator based on
  * a paper by David G. Carta ("Two Fast Implementations of the
diff --git a/kernel/arch/ia64/lib/checksum.c b/kernel/arch/ia64/lib/checksum.c
index 2cb23cb0c..d26517fe3 100644
--- a/kernel/arch/ia64/lib/checksum.c
+++ b/kernel/arch/ia64/lib/checksum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Network checksum routines
  *
diff --git a/kernel/arch/ia64/lib/clear_page.S b/kernel/arch/ia64/lib/clear_page.S
index 3cf5b76e5..65b75085c 100644
--- a/kernel/arch/ia64/lib/clear_page.S
+++ b/kernel/arch/ia64/lib/clear_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999-2002 Hewlett-Packard Co
  *	Stephane Eranian <eranian@hpl.hp.com>
diff --git a/kernel/arch/ia64/lib/clear_user.S b/kernel/arch/ia64/lib/clear_user.S
index 7b40731ee..a28f39d34 100644
--- a/kernel/arch/ia64/lib/clear_user.S
+++ b/kernel/arch/ia64/lib/clear_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This routine clears to zero a linear memory buffer in user space.
  *
diff --git a/kernel/arch/ia64/lib/copy_page.S b/kernel/arch/ia64/lib/copy_page.S
index cbdb9e323..176f857c5 100644
--- a/kernel/arch/ia64/lib/copy_page.S
+++ b/kernel/arch/ia64/lib/copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Optimized version of the standard copy_page() function
diff --git a/kernel/arch/ia64/lib/copy_page_mck.S b/kernel/arch/ia64/lib/copy_page_mck.S
index c13f69036..d6fd56e4f 100644
--- a/kernel/arch/ia64/lib/copy_page_mck.S
+++ b/kernel/arch/ia64/lib/copy_page_mck.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * McKinley-optimized version of copy_page().
  *
diff --git a/kernel/arch/ia64/lib/copy_user.S b/kernel/arch/ia64/lib/copy_user.S
index 66facd52e..f681556c6 100644
--- a/kernel/arch/ia64/lib/copy_user.S
+++ b/kernel/arch/ia64/lib/copy_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Optimized version of the copy_user() routine.
diff --git a/kernel/arch/ia64/lib/csum_partial_copy.c b/kernel/arch/ia64/lib/csum_partial_copy.c
index 42f7678ef..bf9396b1e 100644
--- a/kernel/arch/ia64/lib/csum_partial_copy.c
+++ b/kernel/arch/ia64/lib/csum_partial_copy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Network Checksum & Copy routine
  *
diff --git a/kernel/arch/ia64/lib/do_csum.S b/kernel/arch/ia64/lib/do_csum.S
index 1a431a5cf..6004dad25 100644
--- a/kernel/arch/ia64/lib/do_csum.S
+++ b/kernel/arch/ia64/lib/do_csum.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Optmized version of the standard do_csum() function
diff --git a/kernel/arch/ia64/lib/idiv32.S b/kernel/arch/ia64/lib/idiv32.S
index 715aed79a..def92b708 100644
--- a/kernel/arch/ia64/lib/idiv32.S
+++ b/kernel/arch/ia64/lib/idiv32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2000 Hewlett-Packard Co
  * Copyright (C) 2000 David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/lib/idiv64.S b/kernel/arch/ia64/lib/idiv64.S
index 25840f697..a8ba3bd3d 100644
--- a/kernel/arch/ia64/lib/idiv64.S
+++ b/kernel/arch/ia64/lib/idiv64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999-2000 Hewlett-Packard Co
  * Copyright (C) 1999-2000 David Mosberger-Tang <davidm@hpl.hp.com>
diff --git a/kernel/arch/ia64/lib/io.c b/kernel/arch/ia64/lib/io.c
index bcd16f8ad..d107eaf37 100644
--- a/kernel/arch/ia64/lib/io.c
+++ b/kernel/arch/ia64/lib/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/types.h>
 
diff --git a/kernel/arch/ia64/lib/ip_fast_csum.S b/kernel/arch/ia64/lib/ip_fast_csum.S
index 648e0d4a4..dc9e6e6fe 100644
--- a/kernel/arch/ia64/lib/ip_fast_csum.S
+++ b/kernel/arch/ia64/lib/ip_fast_csum.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Optmized version of the ip_fast_csum() function
  * Used for calculating IP header checksum
diff --git a/kernel/arch/ia64/lib/memcpy.S b/kernel/arch/ia64/lib/memcpy.S
index ba172fd6a..91a625fdd 100644
--- a/kernel/arch/ia64/lib/memcpy.S
+++ b/kernel/arch/ia64/lib/memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Optimized version of the standard memcpy() function
diff --git a/kernel/arch/ia64/lib/memcpy_mck.S b/kernel/arch/ia64/lib/memcpy_mck.S
index bbbadc478..cc4e6ac91 100644
--- a/kernel/arch/ia64/lib/memcpy_mck.S
+++ b/kernel/arch/ia64/lib/memcpy_mck.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Itanium 2-optimized version of memcpy and copy_user function
  *
diff --git a/kernel/arch/ia64/lib/memset.S b/kernel/arch/ia64/lib/memset.S
index 87b974704..07a8b92c6 100644
--- a/kernel/arch/ia64/lib/memset.S
+++ b/kernel/arch/ia64/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Optimized version of the standard memset() function.
 
    Copyright (c) 2002 Hewlett-Packard Co/CERN
diff --git a/kernel/arch/ia64/lib/strlen.S b/kernel/arch/ia64/lib/strlen.S
index 1a6e17c65..d66de5966 100644
--- a/kernel/arch/ia64/lib/strlen.S
+++ b/kernel/arch/ia64/lib/strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Optimized version of the standard strlen() function
diff --git a/kernel/arch/ia64/lib/strncpy_from_user.S b/kernel/arch/ia64/lib/strncpy_from_user.S
index ca9ccf280..49eb81b69 100644
--- a/kernel/arch/ia64/lib/strncpy_from_user.S
+++ b/kernel/arch/ia64/lib/strncpy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Just like strncpy() except that if a fault occurs during copying,
  * -EFAULT is returned.
diff --git a/kernel/arch/ia64/lib/strnlen_user.S b/kernel/arch/ia64/lib/strnlen_user.S
index 80a5dfd1d..4b684d4da 100644
--- a/kernel/arch/ia64/lib/strnlen_user.S
+++ b/kernel/arch/ia64/lib/strnlen_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Returns 0 if exception before NUL or reaching the supplied limit (N),
  * a value greater than N if the string is longer than the limit, else
diff --git a/kernel/arch/ia64/mm/Makefile b/kernel/arch/ia64/mm/Makefile
index bb0a01a81..99a35039b 100644
--- a/kernel/arch/ia64/mm/Makefile
+++ b/kernel/arch/ia64/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ia64-specific parts of the memory manager.
 #
diff --git a/kernel/arch/ia64/mm/discontig.c b/kernel/arch/ia64/mm/discontig.c
index 878626805..9b2d994cd 100644
--- a/kernel/arch/ia64/mm/discontig.c
+++ b/kernel/arch/ia64/mm/discontig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2000, 2003 Silicon Graphics, Inc.  All rights reserved.
  * Copyright (c) 2001 Intel Corp.
diff --git a/kernel/arch/ia64/mm/extable.c b/kernel/arch/ia64/mm/extable.c
index 10dd4a66e..da477c117 100644
--- a/kernel/arch/ia64/mm/extable.c
+++ b/kernel/arch/ia64/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Kernel exception handling table support.  Derived from arch/alpha/mm/extable.c.
  *
diff --git a/kernel/arch/ia64/mm/fault.c b/kernel/arch/ia64/mm/fault.c
index 15f09cfff..dfdc152d6 100644
--- a/kernel/arch/ia64/mm/fault.c
+++ b/kernel/arch/ia64/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MMU fault handling support.
  *
diff --git a/kernel/arch/ia64/mm/hugetlbpage.c b/kernel/arch/ia64/mm/hugetlbpage.c
index ae3514033..d16e419fd 100644
--- a/kernel/arch/ia64/mm/hugetlbpage.c
+++ b/kernel/arch/ia64/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IA-64 Huge TLB Page Support for Kernel.
  *
diff --git a/kernel/arch/ia64/mm/init.c b/kernel/arch/ia64/mm/init.c
index a4e8d6bd9..7af4e05bb 100644
--- a/kernel/arch/ia64/mm/init.c
+++ b/kernel/arch/ia64/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Initialize MMU support.
  *
diff --git a/kernel/arch/ia64/module.lds b/kernel/arch/ia64/module.lds
index 6481f42fb..eff68f362 100644
--- a/kernel/arch/ia64/module.lds
+++ b/kernel/arch/ia64/module.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 SECTIONS {
 	/* Group unwind sections into a single section: */
 	.IA_64.unwind_info : { *(.IA_64.unwind_info*) }
diff --git a/kernel/arch/ia64/oprofile/Makefile b/kernel/arch/ia64/oprofile/Makefile
index aad27a718..cd134d664 100644
--- a/kernel/arch/ia64/oprofile/Makefile
+++ b/kernel/arch/ia64/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/ia64/pci/fixup.c b/kernel/arch/ia64/pci/fixup.c
index 41caa99ad..e1fa45b21 100644
--- a/kernel/arch/ia64/pci/fixup.c
+++ b/kernel/arch/ia64/pci/fixup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Exceptions for specific devices. Usually work-arounds for fatal design flaws.
  * Derived from fixup.c of i386 tree.
diff --git a/kernel/arch/ia64/scripts/check-gas b/kernel/arch/ia64/scripts/check-gas
index 2499e0b22..787cf9b6b 100755
--- a/kernel/arch/ia64/scripts/check-gas
+++ b/kernel/arch/ia64/scripts/check-gas
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 dir=$(dirname $0)
 CC=$1
 OBJDUMP=$2
diff --git a/kernel/arch/ia64/scripts/check-segrel.S b/kernel/arch/ia64/scripts/check-segrel.S
index 3be4e3dbe..65d6378ad 100644
--- a/kernel/arch/ia64/scripts/check-segrel.S
+++ b/kernel/arch/ia64/scripts/check-segrel.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.rodata
 	data4 @segrel(start)
 	.data
diff --git a/kernel/arch/ia64/scripts/check-segrel.lds b/kernel/arch/ia64/scripts/check-segrel.lds
index 85a0d54fb..c385d246e 100644
--- a/kernel/arch/ia64/scripts/check-segrel.lds
+++ b/kernel/arch/ia64/scripts/check-segrel.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 SECTIONS {
 	. = SIZEOF_HEADERS;
 	.rodata : { *(.rodata) } :ro
diff --git a/kernel/arch/ia64/scripts/check-text-align.S b/kernel/arch/ia64/scripts/check-text-align.S
index 03f586abb..107fa1c88 100644
--- a/kernel/arch/ia64/scripts/check-text-align.S
+++ b/kernel/arch/ia64/scripts/check-text-align.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.proc foo
 	.prologue
 foo:	.save rp, r2
diff --git a/kernel/arch/ia64/scripts/toolchain-flags b/kernel/arch/ia64/scripts/toolchain-flags
index 3f0c2adac..12dff5c98 100755
--- a/kernel/arch/ia64/scripts/toolchain-flags
+++ b/kernel/arch/ia64/scripts/toolchain-flags
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # Check whether linker can handle cross-segment @segrel():
 #
diff --git a/kernel/arch/ia64/scripts/unwcheck.py b/kernel/arch/ia64/scripts/unwcheck.py
index 2bfd941ff..89f3a1480 100644
--- a/kernel/arch/ia64/scripts/unwcheck.py
+++ b/kernel/arch/ia64/scripts/unwcheck.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# SPDX-License-Identifier: GPL-2.0
 #
 # Usage: unwcheck.py FILE
 #
diff --git a/kernel/arch/ia64/sn/kernel/sn2/timer.c b/kernel/arch/ia64/sn/kernel/sn2/timer.c
index 66edc3642..3009d9d86 100644
--- a/kernel/arch/ia64/sn/kernel/sn2/timer.c
+++ b/kernel/arch/ia64/sn/kernel/sn2/timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/ia64/sn/kernel/sn2/timer.c
  *
diff --git a/kernel/arch/m32r/Kconfig b/kernel/arch/m32r/Kconfig
index 0777f3a8a..0d9446c37 100644
--- a/kernel/arch/m32r/Kconfig
+++ b/kernel/arch/m32r/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config M32R
 	bool
 	default y
diff --git a/kernel/arch/m32r/Kconfig.debug b/kernel/arch/m32r/Kconfig.debug
index 6c612b769..ffca1e194 100644
--- a/kernel/arch/m32r/Kconfig.debug
+++ b/kernel/arch/m32r/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/m32r/Makefile b/kernel/arch/m32r/Makefile
index def8dd0b6..d73b58c84 100644
--- a/kernel/arch/m32r/Makefile
+++ b/kernel/arch/m32r/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # m32r/Makefile
 #
diff --git a/kernel/arch/m32r/boot/compressed/Makefile b/kernel/arch/m32r/boot/compressed/Makefile
index 0606a727a..abd3c75eb 100644
--- a/kernel/arch/m32r/boot/compressed/Makefile
+++ b/kernel/arch/m32r/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/m32r/boot/compressed/Makefile
 #
diff --git a/kernel/arch/m32r/boot/compressed/boot.h b/kernel/arch/m32r/boot/compressed/boot.h
index 9272e38d1..7fce713e8 100644
--- a/kernel/arch/m32r/boot/compressed/boot.h
+++ b/kernel/arch/m32r/boot/compressed/boot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * 1. load vmlinuz
  *
diff --git a/kernel/arch/m32r/boot/compressed/head.S b/kernel/arch/m32r/boot/compressed/head.S
index 95a0563ff..39b693640 100644
--- a/kernel/arch/m32r/boot/compressed/head.S
+++ b/kernel/arch/m32r/boot/compressed/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/boot/compressed/head.S
  *
diff --git a/kernel/arch/m32r/boot/compressed/m32r_sio.c b/kernel/arch/m32r/boot/compressed/m32r_sio.c
index cf3023dce..9d34bd063 100644
--- a/kernel/arch/m32r/boot/compressed/m32r_sio.c
+++ b/kernel/arch/m32r/boot/compressed/m32r_sio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/m32r/boot/compressed/m32r_sio.c
  *
diff --git a/kernel/arch/m32r/boot/compressed/misc.c b/kernel/arch/m32r/boot/compressed/misc.c
index 3a7692745..43e367055 100644
--- a/kernel/arch/m32r/boot/compressed/misc.c
+++ b/kernel/arch/m32r/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/m32r/boot/compressed/misc.c
  *
diff --git a/kernel/arch/m32r/boot/compressed/vmlinux.lds.S b/kernel/arch/m32r/boot/compressed/vmlinux.lds.S
index dd11963f6..c393eb559 100644
--- a/kernel/arch/m32r/boot/compressed/vmlinux.lds.S
+++ b/kernel/arch/m32r/boot/compressed/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 OUTPUT_ARCH(m32r)
 ENTRY(startup)
diff --git a/kernel/arch/m32r/boot/setup.S b/kernel/arch/m32r/boot/setup.S
index ef843d630..5909a825e 100644
--- a/kernel/arch/m32r/boot/setup.S
+++ b/kernel/arch/m32r/boot/setup.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/boot/setup.S -- A setup code.
  *
diff --git a/kernel/arch/m32r/include/asm/assembler.h b/kernel/arch/m32r/include/asm/assembler.h
index 728799fc7..ed90d894f 100644
--- a/kernel/arch/m32r/include/asm/assembler.h
+++ b/kernel/arch/m32r/include/asm/assembler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_ASSEMBLER_H
 #define _ASM_M32R_ASSEMBLER_H
 
diff --git a/kernel/arch/m32r/include/asm/atomic.h b/kernel/arch/m32r/include/asm/atomic.h
index 640cc1c70..8bf67e55f 100644
--- a/kernel/arch/m32r/include/asm/atomic.h
+++ b/kernel/arch/m32r/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_ATOMIC_H
 #define _ASM_M32R_ATOMIC_H
 
diff --git a/kernel/arch/m32r/include/asm/bitops.h b/kernel/arch/m32r/include/asm/bitops.h
index 86ba2b42a..64e70e57c 100644
--- a/kernel/arch/m32r/include/asm/bitops.h
+++ b/kernel/arch/m32r/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_BITOPS_H
 #define _ASM_M32R_BITOPS_H
 
diff --git a/kernel/arch/m32r/include/asm/bug.h b/kernel/arch/m32r/include/asm/bug.h
index 4cc0462c1..719768825 100644
--- a/kernel/arch/m32r/include/asm/bug.h
+++ b/kernel/arch/m32r/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M32R_BUG_H
 #define _M32R_BUG_H
 #include <asm-generic/bug.h>
diff --git a/kernel/arch/m32r/include/asm/bugs.h b/kernel/arch/m32r/include/asm/bugs.h
index f77214eff..74a6d428a 100644
--- a/kernel/arch/m32r/include/asm/bugs.h
+++ b/kernel/arch/m32r/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_BUGS_H
 #define _ASM_M32R_BUGS_H
 
diff --git a/kernel/arch/m32r/include/asm/cache.h b/kernel/arch/m32r/include/asm/cache.h
index 40b3ee981..47a766a25 100644
--- a/kernel/arch/m32r/include/asm/cache.h
+++ b/kernel/arch/m32r/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_CACHE_H
 #define _ASM_M32R_CACHE_H
 
diff --git a/kernel/arch/m32r/include/asm/cachectl.h b/kernel/arch/m32r/include/asm/cachectl.h
index 2aab8f6ff..12f73f6c1 100644
--- a/kernel/arch/m32r/include/asm/cachectl.h
+++ b/kernel/arch/m32r/include/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * cachectl.h -- defines for M32R cache control system calls
  *
diff --git a/kernel/arch/m32r/include/asm/cacheflush.h b/kernel/arch/m32r/include/asm/cacheflush.h
index 8e8e04516..5ad2a3045 100644
--- a/kernel/arch/m32r/include/asm/cacheflush.h
+++ b/kernel/arch/m32r/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_CACHEFLUSH_H
 #define _ASM_M32R_CACHEFLUSH_H
 
diff --git a/kernel/arch/m32r/include/asm/cmpxchg.h b/kernel/arch/m32r/include/asm/cmpxchg.h
index 23c9d0537..1ccdce5ff 100644
--- a/kernel/arch/m32r/include/asm/cmpxchg.h
+++ b/kernel/arch/m32r/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_CMPXCHG_H
 #define _ASM_M32R_CMPXCHG_H
 
diff --git a/kernel/arch/m32r/include/asm/dma-mapping.h b/kernel/arch/m32r/include/asm/dma-mapping.h
index aff3ae8b6..4abfc07f4 100644
--- a/kernel/arch/m32r/include/asm/dma-mapping.h
+++ b/kernel/arch/m32r/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_DMA_MAPPING_H
 #define _ASM_M32R_DMA_MAPPING_H
 
diff --git a/kernel/arch/m32r/include/asm/dma.h b/kernel/arch/m32r/include/asm/dma.h
index 52f6a22dd..661bc3b34 100644
--- a/kernel/arch/m32r/include/asm/dma.h
+++ b/kernel/arch/m32r/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_DMA_H
 #define _ASM_M32R_DMA_H
 
diff --git a/kernel/arch/m32r/include/asm/elf.h b/kernel/arch/m32r/include/asm/elf.h
index 8acc9da9a..576b2ff57 100644
--- a/kernel/arch/m32r/include/asm/elf.h
+++ b/kernel/arch/m32r/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R__ELF_H
 #define _ASM_M32R__ELF_H
 
diff --git a/kernel/arch/m32r/include/asm/emergency-restart.h b/kernel/arch/m32r/include/asm/emergency-restart.h
index 108d8c48e..cca44d5ae 100644
--- a/kernel/arch/m32r/include/asm/emergency-restart.h
+++ b/kernel/arch/m32r/include/asm/emergency-restart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_EMERGENCY_RESTART_H
 #define _ASM_EMERGENCY_RESTART_H
 
diff --git a/kernel/arch/m32r/include/asm/fb.h b/kernel/arch/m32r/include/asm/fb.h
index d92e99cd8..9a0bca268 100644
--- a/kernel/arch/m32r/include/asm/fb.h
+++ b/kernel/arch/m32r/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
diff --git a/kernel/arch/m32r/include/asm/hardirq.h b/kernel/arch/m32r/include/asm/hardirq.h
index 5f2ac4f64..10c23de02 100644
--- a/kernel/arch/m32r/include/asm/hardirq.h
+++ b/kernel/arch/m32r/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __KERNEL__
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
diff --git a/kernel/arch/m32r/include/asm/io.h b/kernel/arch/m32r/include/asm/io.h
index 4b0f5e001..1b653bb16 100644
--- a/kernel/arch/m32r/include/asm/io.h
+++ b/kernel/arch/m32r/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_IO_H
 #define _ASM_M32R_IO_H
 
diff --git a/kernel/arch/m32r/include/asm/irq.h b/kernel/arch/m32r/include/asm/irq.h
index 242028b4d..85b475fff 100644
--- a/kernel/arch/m32r/include/asm/irq.h
+++ b/kernel/arch/m32r/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __KERNEL__
 #ifndef _ASM_M32R_IRQ_H
 #define _ASM_M32R_IRQ_H
diff --git a/kernel/arch/m32r/include/asm/kmap_types.h b/kernel/arch/m32r/include/asm/kmap_types.h
index 4cdb5e3a0..3dcba0d17 100644
--- a/kernel/arch/m32r/include/asm/kmap_types.h
+++ b/kernel/arch/m32r/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M32R_KMAP_TYPES_H
 #define __M32R_KMAP_TYPES_H
 
diff --git a/kernel/arch/m32r/include/asm/linkage.h b/kernel/arch/m32r/include/asm/linkage.h
index a9fb151cf..f1aee6ec5 100644
--- a/kernel/arch/m32r/include/asm/linkage.h
+++ b/kernel/arch/m32r/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/m32r/include/asm/local.h b/kernel/arch/m32r/include/asm/local.h
index 4045db3e4..6780680c1 100644
--- a/kernel/arch/m32r/include/asm/local.h
+++ b/kernel/arch/m32r/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M32R_LOCAL_H
 #define __M32R_LOCAL_H
 
diff --git a/kernel/arch/m32r/include/asm/m32102.h b/kernel/arch/m32r/include/asm/m32102.h
index 52807f8db..f0a986fec 100644
--- a/kernel/arch/m32r/include/asm/m32102.h
+++ b/kernel/arch/m32r/include/asm/m32102.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M32102_H_
 #define _M32102_H_
 
diff --git a/kernel/arch/m32r/include/asm/m32r.h b/kernel/arch/m32r/include/asm/m32r.h
index 214b44b40..d27f056d9 100644
--- a/kernel/arch/m32r/include/asm/m32r.h
+++ b/kernel/arch/m32r/include/asm/m32r.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_M32R_H_
 #define _ASM_M32R_M32R_H_
 
diff --git a/kernel/arch/m32r/include/asm/m32r_mp_fpga.h b/kernel/arch/m32r/include/asm/m32r_mp_fpga.h
index 976d2b995..8eeaa9a42 100644
--- a/kernel/arch/m32r/include/asm/m32r_mp_fpga.h
+++ b/kernel/arch/m32r/include/asm/m32r_mp_fpga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_M32R_MP_FPGA_
 #define _ASM_M32R_M32R_MP_FPGA_
 
diff --git a/kernel/arch/m32r/include/asm/mc146818rtc.h b/kernel/arch/m32r/include/asm/mc146818rtc.h
index aa1b7bf84..4effa4704 100644
--- a/kernel/arch/m32r/include/asm/mc146818rtc.h
+++ b/kernel/arch/m32r/include/asm/mc146818rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/m32r/include/asm/mmu.h b/kernel/arch/m32r/include/asm/mmu.h
index 150cb92bb..34bcccd80 100644
--- a/kernel/arch/m32r/include/asm/mmu.h
+++ b/kernel/arch/m32r/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_MMU_H
 #define _ASM_M32R_MMU_H
 
diff --git a/kernel/arch/m32r/include/asm/mmu_context.h b/kernel/arch/m32r/include/asm/mmu_context.h
index 1230b7050..8a499d0fb 100644
--- a/kernel/arch/m32r/include/asm/mmu_context.h
+++ b/kernel/arch/m32r/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_MMU_CONTEXT_H
 #define _ASM_M32R_MMU_CONTEXT_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/m32r/include/asm/mmzone.h b/kernel/arch/m32r/include/asm/mmzone.h
index 115ced33f..568946c13 100644
--- a/kernel/arch/m32r/include/asm/mmzone.h
+++ b/kernel/arch/m32r/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Written by Pat Gaughen (gone@us.ibm.com) Mar 2002
  *
diff --git a/kernel/arch/m32r/include/asm/page.h b/kernel/arch/m32r/include/asm/page.h
index 725ede8f2..fe4e38b39 100644
--- a/kernel/arch/m32r/include/asm/page.h
+++ b/kernel/arch/m32r/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_PAGE_H
 #define _ASM_M32R_PAGE_H
 
diff --git a/kernel/arch/m32r/include/asm/pci.h b/kernel/arch/m32r/include/asm/pci.h
index 07d3834c6..cbcb28b5f 100644
--- a/kernel/arch/m32r/include/asm/pci.h
+++ b/kernel/arch/m32r/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_PCI_H
 #define _ASM_M32R_PCI_H
 
diff --git a/kernel/arch/m32r/include/asm/percpu.h b/kernel/arch/m32r/include/asm/percpu.h
index e3169301f..41e1680d1 100644
--- a/kernel/arch/m32r/include/asm/percpu.h
+++ b/kernel/arch/m32r/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_M32R_PERCPU__
 #define __ARCH_M32R_PERCPU__
 
diff --git a/kernel/arch/m32r/include/asm/pgalloc.h b/kernel/arch/m32r/include/asm/pgalloc.h
index 2d55a064c..eed2cad57 100644
--- a/kernel/arch/m32r/include/asm/pgalloc.h
+++ b/kernel/arch/m32r/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_PGALLOC_H
 #define _ASM_M32R_PGALLOC_H
 
diff --git a/kernel/arch/m32r/include/asm/pgtable-2level.h b/kernel/arch/m32r/include/asm/pgtable-2level.h
index 421e6ba3a..d7ab1e94e 100644
--- a/kernel/arch/m32r/include/asm/pgtable-2level.h
+++ b/kernel/arch/m32r/include/asm/pgtable-2level.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_PGTABLE_2LEVEL_H
 #define _ASM_M32R_PGTABLE_2LEVEL_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/m32r/include/asm/pgtable.h b/kernel/arch/m32r/include/asm/pgtable.h
index 8c1fb902a..eb7f9050c 100644
--- a/kernel/arch/m32r/include/asm/pgtable.h
+++ b/kernel/arch/m32r/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_PGTABLE_H
 #define _ASM_M32R_PGTABLE_H
 
diff --git a/kernel/arch/m32r/include/asm/rtc.h b/kernel/arch/m32r/include/asm/rtc.h
index 0340633f3..a94cf1edc 100644
--- a/kernel/arch/m32r/include/asm/rtc.h
+++ b/kernel/arch/m32r/include/asm/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RTC_H__
 #define __RTC_H__
 
diff --git a/kernel/arch/m32r/include/asm/s1d13806.h b/kernel/arch/m32r/include/asm/s1d13806.h
index 248d36a82..79e98a259 100644
--- a/kernel/arch/m32r/include/asm/s1d13806.h
+++ b/kernel/arch/m32r/include/asm/s1d13806.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 //----------------------------------------------------------------------------
 //
 //  File generated by S1D13806CFG.EXE
diff --git a/kernel/arch/m32r/include/asm/segment.h b/kernel/arch/m32r/include/asm/segment.h
index 42b11aeb3..4095f1472 100644
--- a/kernel/arch/m32r/include/asm/segment.h
+++ b/kernel/arch/m32r/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SEGMENT_H
 #define _ASM_M32R_SEGMENT_H
 
diff --git a/kernel/arch/m32r/include/asm/serial.h b/kernel/arch/m32r/include/asm/serial.h
index 5ac244c72..b1375c841 100644
--- a/kernel/arch/m32r/include/asm/serial.h
+++ b/kernel/arch/m32r/include/asm/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SERIAL_H
 #define _ASM_M32R_SERIAL_H
 
diff --git a/kernel/arch/m32r/include/asm/setup.h b/kernel/arch/m32r/include/asm/setup.h
index bbe59a9ce..71b4d6514 100644
--- a/kernel/arch/m32r/include/asm/setup.h
+++ b/kernel/arch/m32r/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SETUP_H
 #define _ASM_M32R_SETUP_H
 
diff --git a/kernel/arch/m32r/include/asm/shmparam.h b/kernel/arch/m32r/include/asm/shmparam.h
index 35986d81a..1af73d92c 100644
--- a/kernel/arch/m32r/include/asm/shmparam.h
+++ b/kernel/arch/m32r/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SHMPARAM_H
 #define _ASM_M32R_SHMPARAM_H
 
diff --git a/kernel/arch/m32r/include/asm/signal.h b/kernel/arch/m32r/include/asm/signal.h
index ed3ded660..8bf57950d 100644
--- a/kernel/arch/m32r/include/asm/signal.h
+++ b/kernel/arch/m32r/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SIGNAL_H
 #define _ASM_M32R_SIGNAL_H
 
diff --git a/kernel/arch/m32r/include/asm/smp.h b/kernel/arch/m32r/include/asm/smp.h
index c689b828d..763f22700 100644
--- a/kernel/arch/m32r/include/asm/smp.h
+++ b/kernel/arch/m32r/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SMP_H
 #define _ASM_M32R_SMP_H
 
diff --git a/kernel/arch/m32r/include/asm/spinlock.h b/kernel/arch/m32r/include/asm/spinlock.h
index a56825592..604af8442 100644
--- a/kernel/arch/m32r/include/asm/spinlock.h
+++ b/kernel/arch/m32r/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SPINLOCK_H
 #define _ASM_M32R_SPINLOCK_H
 
diff --git a/kernel/arch/m32r/include/asm/spinlock_types.h b/kernel/arch/m32r/include/asm/spinlock_types.h
index 92e276726..bb0d17b64 100644
--- a/kernel/arch/m32r/include/asm/spinlock_types.h
+++ b/kernel/arch/m32r/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SPINLOCK_TYPES_H
 #define _ASM_M32R_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/m32r/include/asm/string.h b/kernel/arch/m32r/include/asm/string.h
index e61e2b0bf..a9ea3b6c3 100644
--- a/kernel/arch/m32r/include/asm/string.h
+++ b/kernel/arch/m32r/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_STRING_H
 #define _ASM_M32R_STRING_H
 
diff --git a/kernel/arch/m32r/include/asm/syscall.h b/kernel/arch/m32r/include/asm/syscall.h
index 25f316f2b..22c8516d3 100644
--- a/kernel/arch/m32r/include/asm/syscall.h
+++ b/kernel/arch/m32r/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_SYSCALL_H
 #define _ASM_M32R_SYSCALL_H
 
diff --git a/kernel/arch/m32r/include/asm/termios.h b/kernel/arch/m32r/include/asm/termios.h
index 680898f0b..40274b89c 100644
--- a/kernel/arch/m32r/include/asm/termios.h
+++ b/kernel/arch/m32r/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M32R_TERMIOS_H
 #define _M32R_TERMIOS_H
 
diff --git a/kernel/arch/m32r/include/asm/thread_info.h b/kernel/arch/m32r/include/asm/thread_info.h
index f630d9c30..b3a215b0c 100644
--- a/kernel/arch/m32r/include/asm/thread_info.h
+++ b/kernel/arch/m32r/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_THREAD_INFO_H
 #define _ASM_M32R_THREAD_INFO_H
 
diff --git a/kernel/arch/m32r/include/asm/timex.h b/kernel/arch/m32r/include/asm/timex.h
index bb9fe4feb..a4f9f852d 100644
--- a/kernel/arch/m32r/include/asm/timex.h
+++ b/kernel/arch/m32r/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_TIMEX_H
 #define _ASM_M32R_TIMEX_H
 
diff --git a/kernel/arch/m32r/include/asm/tlb.h b/kernel/arch/m32r/include/asm/tlb.h
index c7ebd8d48..3576f88b6 100644
--- a/kernel/arch/m32r/include/asm/tlb.h
+++ b/kernel/arch/m32r/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M32R_TLB_H
 #define _M32R_TLB_H
 
diff --git a/kernel/arch/m32r/include/asm/tlbflush.h b/kernel/arch/m32r/include/asm/tlbflush.h
index 92614b0cc..f6c723731 100644
--- a/kernel/arch/m32r/include/asm/tlbflush.h
+++ b/kernel/arch/m32r/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_TLBFLUSH_H
 #define _ASM_M32R_TLBFLUSH_H
 
diff --git a/kernel/arch/m32r/include/asm/topology.h b/kernel/arch/m32r/include/asm/topology.h
index d607eb32b..ee79404e8 100644
--- a/kernel/arch/m32r/include/asm/topology.h
+++ b/kernel/arch/m32r/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_TOPOLOGY_H
 #define _ASM_M32R_TOPOLOGY_H
 
diff --git a/kernel/arch/m32r/include/asm/types.h b/kernel/arch/m32r/include/asm/types.h
index 04a44c6ee..fce0bf605 100644
--- a/kernel/arch/m32r/include/asm/types.h
+++ b/kernel/arch/m32r/include/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_TYPES_H
 #define _ASM_M32R_TYPES_H
 
diff --git a/kernel/arch/m32r/include/asm/uaccess.h b/kernel/arch/m32r/include/asm/uaccess.h
index 496c4716d..9d89bc3d8 100644
--- a/kernel/arch/m32r/include/asm/uaccess.h
+++ b/kernel/arch/m32r/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_UACCESS_H
 #define _ASM_M32R_UACCESS_H
 
diff --git a/kernel/arch/m32r/include/asm/ucontext.h b/kernel/arch/m32r/include/asm/ucontext.h
index 09324741e..5f9de3736 100644
--- a/kernel/arch/m32r/include/asm/ucontext.h
+++ b/kernel/arch/m32r/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_UCONTEXT_H
 #define _ASM_M32R_UCONTEXT_H
 
diff --git a/kernel/arch/m32r/include/asm/unaligned.h b/kernel/arch/m32r/include/asm/unaligned.h
index 377eb20d1..598136167 100644
--- a/kernel/arch/m32r/include/asm/unaligned.h
+++ b/kernel/arch/m32r/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_UNALIGNED_H
 #define _ASM_M32R_UNALIGNED_H
 
diff --git a/kernel/arch/m32r/include/asm/unistd.h b/kernel/arch/m32r/include/asm/unistd.h
index de602533a..dee4c1969 100644
--- a/kernel/arch/m32r/include/asm/unistd.h
+++ b/kernel/arch/m32r/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_UNISTD_H
 #define _ASM_M32R_UNISTD_H
 
diff --git a/kernel/arch/m32r/include/asm/user.h b/kernel/arch/m32r/include/asm/user.h
index 03b3c11c2..489b60d4a 100644
--- a/kernel/arch/m32r/include/asm/user.h
+++ b/kernel/arch/m32r/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_USER_H
 #define _ASM_M32R_USER_H
 
diff --git a/kernel/arch/m32r/include/asm/vga.h b/kernel/arch/m32r/include/asm/vga.h
index a1b63061c..783d5bf77 100644
--- a/kernel/arch/m32r/include/asm/vga.h
+++ b/kernel/arch/m32r/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_VGA_H
 #define _ASM_M32R_VGA_H
 
diff --git a/kernel/arch/m32r/include/asm/xor.h b/kernel/arch/m32r/include/asm/xor.h
index 6d525259d..a4d546752 100644
--- a/kernel/arch/m32r/include/asm/xor.h
+++ b/kernel/arch/m32r/include/asm/xor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M32R_XOR_H
 #define _ASM_M32R_XOR_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/bitsperlong.h b/kernel/arch/m32r/include/uapi/asm/bitsperlong.h
index 6dc0bb0c1..76da34b10 100644
--- a/kernel/arch/m32r/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/m32r/include/uapi/asm/bitsperlong.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/bitsperlong.h>
diff --git a/kernel/arch/m32r/include/uapi/asm/byteorder.h b/kernel/arch/m32r/include/uapi/asm/byteorder.h
index 21855d8b0..9b4a8ba48 100644
--- a/kernel/arch/m32r/include/uapi/asm/byteorder.h
+++ b/kernel/arch/m32r/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_BYTEORDER_H
 #define _ASM_M32R_BYTEORDER_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/errno.h b/kernel/arch/m32r/include/uapi/asm/errno.h
index 777149262..ab38ef607 100644
--- a/kernel/arch/m32r/include/uapi/asm/errno.h
+++ b/kernel/arch/m32r/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_ERRNO_H
 #define _ASM_M32R_ERRNO_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/fcntl.h b/kernel/arch/m32r/include/uapi/asm/fcntl.h
index 46ab12db5..a77648c50 100644
--- a/kernel/arch/m32r/include/uapi/asm/fcntl.h
+++ b/kernel/arch/m32r/include/uapi/asm/fcntl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/fcntl.h>
diff --git a/kernel/arch/m32r/include/uapi/asm/ioctl.h b/kernel/arch/m32r/include/uapi/asm/ioctl.h
index b279fe06d..b809c4566 100644
--- a/kernel/arch/m32r/include/uapi/asm/ioctl.h
+++ b/kernel/arch/m32r/include/uapi/asm/ioctl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ioctl.h>
diff --git a/kernel/arch/m32r/include/uapi/asm/ioctls.h b/kernel/arch/m32r/include/uapi/asm/ioctls.h
index 349bf87bf..31da4c3ba 100644
--- a/kernel/arch/m32r/include/uapi/asm/ioctls.h
+++ b/kernel/arch/m32r/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_M32R_IOCTLS_H__
 #define __ARCH_M32R_IOCTLS_H__
 
diff --git a/kernel/arch/m32r/include/uapi/asm/ipcbuf.h b/kernel/arch/m32r/include/uapi/asm/ipcbuf.h
index 84c7e51cb..90d6445a1 100644
--- a/kernel/arch/m32r/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/m32r/include/uapi/asm/ipcbuf.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ipcbuf.h>
diff --git a/kernel/arch/m32r/include/uapi/asm/msgbuf.h b/kernel/arch/m32r/include/uapi/asm/msgbuf.h
index 0d5a877b8..4386ff273 100644
--- a/kernel/arch/m32r/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/m32r/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_MSGBUF_H
 #define _ASM_M32R_MSGBUF_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/param.h b/kernel/arch/m32r/include/uapi/asm/param.h
index fa207bdf9..0bff6d613 100644
--- a/kernel/arch/m32r/include/uapi/asm/param.h
+++ b/kernel/arch/m32r/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_PARAM_H
 #define _ASM_M32R_PARAM_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/poll.h b/kernel/arch/m32r/include/uapi/asm/poll.h
index c98509d31..b7132a305 100644
--- a/kernel/arch/m32r/include/uapi/asm/poll.h
+++ b/kernel/arch/m32r/include/uapi/asm/poll.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/poll.h>
diff --git a/kernel/arch/m32r/include/uapi/asm/posix_types.h b/kernel/arch/m32r/include/uapi/asm/posix_types.h
index 236de26a4..63316fcb1 100644
--- a/kernel/arch/m32r/include/uapi/asm/posix_types.h
+++ b/kernel/arch/m32r/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_POSIX_TYPES_H
 #define _ASM_M32R_POSIX_TYPES_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/ptrace.h b/kernel/arch/m32r/include/uapi/asm/ptrace.h
index f6930a822..99aec86cf 100644
--- a/kernel/arch/m32r/include/uapi/asm/ptrace.h
+++ b/kernel/arch/m32r/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/asm-m32r/ptrace.h
  *
diff --git a/kernel/arch/m32r/include/uapi/asm/resource.h b/kernel/arch/m32r/include/uapi/asm/resource.h
index b1ce766e3..3282f3c4a 100644
--- a/kernel/arch/m32r/include/uapi/asm/resource.h
+++ b/kernel/arch/m32r/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_RESOURCE_H
 #define _ASM_M32R_RESOURCE_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/sembuf.h b/kernel/arch/m32r/include/uapi/asm/sembuf.h
index c9873d689..de34664d8 100644
--- a/kernel/arch/m32r/include/uapi/asm/sembuf.h
+++ b/kernel/arch/m32r/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_SEMBUF_H
 #define _ASM_M32R_SEMBUF_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/setup.h b/kernel/arch/m32r/include/uapi/asm/setup.h
index 96961a42e..d936a64bb 100644
--- a/kernel/arch/m32r/include/uapi/asm/setup.h
+++ b/kernel/arch/m32r/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_M32R_SETUP_H
 #define _UAPI_ASM_M32R_SETUP_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/shmbuf.h b/kernel/arch/m32r/include/uapi/asm/shmbuf.h
index b0cdf0aa7..44c2ea924 100644
--- a/kernel/arch/m32r/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/m32r/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_SHMBUF_H
 #define _ASM_M32R_SHMBUF_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/sigcontext.h b/kernel/arch/m32r/include/uapi/asm/sigcontext.h
index da4a9c36d..cc9ee7352 100644
--- a/kernel/arch/m32r/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/m32r/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_SIGCONTEXT_H
 #define _ASM_M32R_SIGCONTEXT_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/signal.h b/kernel/arch/m32r/include/uapi/asm/signal.h
index 54acacb1f..c2ac3417f 100644
--- a/kernel/arch/m32r/include/uapi/asm/signal.h
+++ b/kernel/arch/m32r/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_M32R_SIGNAL_H
 #define _UAPI_ASM_M32R_SIGNAL_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/socket.h b/kernel/arch/m32r/include/uapi/asm/socket.h
index e268e51a3..cf5018e82 100644
--- a/kernel/arch/m32r/include/uapi/asm/socket.h
+++ b/kernel/arch/m32r/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_SOCKET_H
 #define _ASM_M32R_SOCKET_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/sockios.h b/kernel/arch/m32r/include/uapi/asm/sockios.h
index 6c1fb9b43..948229e47 100644
--- a/kernel/arch/m32r/include/uapi/asm/sockios.h
+++ b/kernel/arch/m32r/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_SOCKIOS_H
 #define _ASM_M32R_SOCKIOS_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/stat.h b/kernel/arch/m32r/include/uapi/asm/stat.h
index 98470fe48..0fe9f96ce 100644
--- a/kernel/arch/m32r/include/uapi/asm/stat.h
+++ b/kernel/arch/m32r/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_STAT_H
 #define _ASM_M32R_STAT_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/statfs.h b/kernel/arch/m32r/include/uapi/asm/statfs.h
index 6eb4c6007..d42ae20db 100644
--- a/kernel/arch/m32r/include/uapi/asm/statfs.h
+++ b/kernel/arch/m32r/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_STATFS_H
 #define _ASM_M32R_STATFS_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/swab.h b/kernel/arch/m32r/include/uapi/asm/swab.h
index 54dab001d..18dce47d2 100644
--- a/kernel/arch/m32r/include/uapi/asm/swab.h
+++ b/kernel/arch/m32r/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_SWAB_H
 #define _ASM_M32R_SWAB_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/termbits.h b/kernel/arch/m32r/include/uapi/asm/termbits.h
index 957a3c688..6cbbae969 100644
--- a/kernel/arch/m32r/include/uapi/asm/termbits.h
+++ b/kernel/arch/m32r/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M32R_TERMBITS_H
 #define _ASM_M32R_TERMBITS_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/termios.h b/kernel/arch/m32r/include/uapi/asm/termios.h
index 07ad27b8f..9b80a85e8 100644
--- a/kernel/arch/m32r/include/uapi/asm/termios.h
+++ b/kernel/arch/m32r/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_M32R_TERMIOS_H
 #define _UAPI_M32R_TERMIOS_H
 
diff --git a/kernel/arch/m32r/include/uapi/asm/unistd.h b/kernel/arch/m32r/include/uapi/asm/unistd.h
index 5a54f2ae3..adf8666a6 100644
--- a/kernel/arch/m32r/include/uapi/asm/unistd.h
+++ b/kernel/arch/m32r/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_M32R_UNISTD_H
 #define _UAPI_ASM_M32R_UNISTD_H
 
diff --git a/kernel/arch/m32r/kernel/Makefile b/kernel/arch/m32r/kernel/Makefile
index 0c09dad8b..bd94dca51 100644
--- a/kernel/arch/m32r/kernel/Makefile
+++ b/kernel/arch/m32r/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/M32R kernel.
 #
diff --git a/kernel/arch/m32r/kernel/align.c b/kernel/arch/m32r/kernel/align.c
index ec51e5b34..2919a6647 100644
--- a/kernel/arch/m32r/kernel/align.c
+++ b/kernel/arch/m32r/kernel/align.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * align.c - address exception handler for M32R
  *
diff --git a/kernel/arch/m32r/kernel/asm-offsets.c b/kernel/arch/m32r/kernel/asm-offsets.c
index cd3d2fc9c..7cb90b459 100644
--- a/kernel/arch/m32r/kernel/asm-offsets.c
+++ b/kernel/arch/m32r/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/thread_info.h>
 #include <linux/kbuild.h>
 
diff --git a/kernel/arch/m32r/kernel/entry.S b/kernel/arch/m32r/kernel/entry.S
index c639bfa32..bbf48f2aa 100644
--- a/kernel/arch/m32r/kernel/entry.S
+++ b/kernel/arch/m32r/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/kernel/entry.S
  *
diff --git a/kernel/arch/m32r/kernel/head.S b/kernel/arch/m32r/kernel/head.S
index a46652dd8..1f040973d 100644
--- a/kernel/arch/m32r/kernel/head.S
+++ b/kernel/arch/m32r/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/kernel/head.S
  *
diff --git a/kernel/arch/m32r/kernel/irq.c b/kernel/arch/m32r/kernel/irq.c
index 5537f7397..83b5032f1 100644
--- a/kernel/arch/m32r/kernel/irq.c
+++ b/kernel/arch/m32r/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m32r/kernel/irq.c
  *
diff --git a/kernel/arch/m32r/kernel/m32r_ksyms.c b/kernel/arch/m32r/kernel/m32r_ksyms.c
index 68da6b800..46ebe071e 100644
--- a/kernel/arch/m32r/kernel/m32r_ksyms.c
+++ b/kernel/arch/m32r/kernel/m32r_ksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/smp.h>
 #include <linux/user.h>
diff --git a/kernel/arch/m32r/kernel/process.c b/kernel/arch/m32r/kernel/process.c
index 8cd7e03f4..a1a4cb136 100644
--- a/kernel/arch/m32r/kernel/process.c
+++ b/kernel/arch/m32r/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/kernel/process.c
  *
diff --git a/kernel/arch/m32r/kernel/ptrace.c b/kernel/arch/m32r/kernel/ptrace.c
index 2d887400e..d702a5ca0 100644
--- a/kernel/arch/m32r/kernel/ptrace.c
+++ b/kernel/arch/m32r/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m32r/kernel/ptrace.c
  *
diff --git a/kernel/arch/m32r/kernel/setup.c b/kernel/arch/m32r/kernel/setup.c
index 1a9e97728..b72d5db39 100644
--- a/kernel/arch/m32r/kernel/setup.c
+++ b/kernel/arch/m32r/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/kernel/setup.c
  *
diff --git a/kernel/arch/m32r/kernel/signal.c b/kernel/arch/m32r/kernel/signal.c
index 1ed597041..ba4d8d633 100644
--- a/kernel/arch/m32r/kernel/signal.c
+++ b/kernel/arch/m32r/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/kernel/signal.c
  *
diff --git a/kernel/arch/m32r/kernel/sys_m32r.c b/kernel/arch/m32r/kernel/sys_m32r.c
index f34957032..22a50fc49 100644
--- a/kernel/arch/m32r/kernel/sys_m32r.c
+++ b/kernel/arch/m32r/kernel/sys_m32r.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m32r/kernel/sys_m32r.c
  *
diff --git a/kernel/arch/m32r/kernel/syscall_table.S b/kernel/arch/m32r/kernel/syscall_table.S
index f365c1979..cf0bcf014 100644
--- a/kernel/arch/m32r/kernel/syscall_table.S
+++ b/kernel/arch/m32r/kernel/syscall_table.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 ENTRY(sys_call_table)
 	.long sys_restart_syscall	/* 0  -  old "setup()" system call*/
 	.long sys_exit
diff --git a/kernel/arch/m32r/kernel/time.c b/kernel/arch/m32r/kernel/time.c
index 093f2761a..521749fbb 100644
--- a/kernel/arch/m32r/kernel/time.c
+++ b/kernel/arch/m32r/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/kernel/time.c
  *
diff --git a/kernel/arch/m32r/kernel/traps.c b/kernel/arch/m32r/kernel/traps.c
index 72b96f282..cb79fba79 100644
--- a/kernel/arch/m32r/kernel/traps.c
+++ b/kernel/arch/m32r/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/kernel/traps.c
  *
diff --git a/kernel/arch/m32r/kernel/vmlinux.lds.S b/kernel/arch/m32r/kernel/vmlinux.lds.S
index ad1fe5645..7e4d957f7 100644
--- a/kernel/arch/m32r/kernel/vmlinux.lds.S
+++ b/kernel/arch/m32r/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make M32R Linux kernel
  */
 
diff --git a/kernel/arch/m32r/lib/ashxdi3.S b/kernel/arch/m32r/lib/ashxdi3.S
index 7fc0c1980..cd1acca53 100644
--- a/kernel/arch/m32r/lib/ashxdi3.S
+++ b/kernel/arch/m32r/lib/ashxdi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/arch/m32r/lib/ashxdi3.S
  *
diff --git a/kernel/arch/m32r/lib/delay.c b/kernel/arch/m32r/lib/delay.c
index 940f4837e..ae1fe9089 100644
--- a/kernel/arch/m32r/lib/delay.c
+++ b/kernel/arch/m32r/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m32r/lib/delay.c
  *
diff --git a/kernel/arch/m32r/lib/libgcc.h b/kernel/arch/m32r/lib/libgcc.h
index 267aa435b..4854690d9 100644
--- a/kernel/arch/m32r/lib/libgcc.h
+++ b/kernel/arch/m32r/lib/libgcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LIBGCC_H
 #define __ASM_LIBGCC_H
 
diff --git a/kernel/arch/m32r/lib/memcpy.S b/kernel/arch/m32r/lib/memcpy.S
index 05987cd63..249da3e33 100644
--- a/kernel/arch/m32r/lib/memcpy.S
+++ b/kernel/arch/m32r/lib/memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/lib/memcpy.S
  *
diff --git a/kernel/arch/m32r/lib/memset.S b/kernel/arch/m32r/lib/memset.S
index 2b2831a37..e7f45e6c7 100644
--- a/kernel/arch/m32r/lib/memset.S
+++ b/kernel/arch/m32r/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/lib/memset.S
  *
diff --git a/kernel/arch/m32r/lib/strlen.S b/kernel/arch/m32r/lib/strlen.S
index 916de9e8f..41c77e387 100644
--- a/kernel/arch/m32r/lib/strlen.S
+++ b/kernel/arch/m32r/lib/strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/strlen.S --  strlen code.
  *
diff --git a/kernel/arch/m32r/lib/ucmpdi2.c b/kernel/arch/m32r/lib/ucmpdi2.c
index 9d3c682c8..e20fa3484 100644
--- a/kernel/arch/m32r/lib/ucmpdi2.c
+++ b/kernel/arch/m32r/lib/ucmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "libgcc.h"
 
 int __ucmpdi2(unsigned long long a, unsigned long long b)
diff --git a/kernel/arch/m32r/lib/usercopy.c b/kernel/arch/m32r/lib/usercopy.c
index b723b1110..0892a4341 100644
--- a/kernel/arch/m32r/lib/usercopy.c
+++ b/kernel/arch/m32r/lib/usercopy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * User address space access functions.
  * The non inlined parts of asm-m32r/uaccess.h are here.
diff --git a/kernel/arch/m32r/mm/Makefile b/kernel/arch/m32r/mm/Makefile
index c51c1c3b4..cb20d90c5 100644
--- a/kernel/arch/m32r/mm/Makefile
+++ b/kernel/arch/m32r/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux M32R-specific parts of the memory manager.
 #
diff --git a/kernel/arch/m32r/mm/cache.c b/kernel/arch/m32r/mm/cache.c
index fac759584..0d1ae744e 100644
--- a/kernel/arch/m32r/mm/cache.c
+++ b/kernel/arch/m32r/mm/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/mm/cache.c
  *
diff --git a/kernel/arch/m32r/mm/discontig.c b/kernel/arch/m32r/mm/discontig.c
index 27196303c..eb8e7966d 100644
--- a/kernel/arch/m32r/mm/discontig.c
+++ b/kernel/arch/m32r/mm/discontig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/mm/discontig.c
  *
diff --git a/kernel/arch/m32r/mm/extable.c b/kernel/arch/m32r/mm/extable.c
index 8ac8ba6ef..066982756 100644
--- a/kernel/arch/m32r/mm/extable.c
+++ b/kernel/arch/m32r/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m32r/mm/extable.c
  */
diff --git a/kernel/arch/m32r/mm/fault-nommu.c b/kernel/arch/m32r/mm/fault-nommu.c
index e22d5ddae..240e00067 100644
--- a/kernel/arch/m32r/mm/fault-nommu.c
+++ b/kernel/arch/m32r/mm/fault-nommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/mm/fault.c
  *
diff --git a/kernel/arch/m32r/mm/fault.c b/kernel/arch/m32r/mm/fault.c
index a05dc3184..46d9a5ca0 100644
--- a/kernel/arch/m32r/mm/fault.c
+++ b/kernel/arch/m32r/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/mm/fault.c
  *
diff --git a/kernel/arch/m32r/mm/init.c b/kernel/arch/m32r/mm/init.c
index 11fa717d9..93abc8c3a 100644
--- a/kernel/arch/m32r/mm/init.c
+++ b/kernel/arch/m32r/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/mm/init.c
  *
diff --git a/kernel/arch/m32r/mm/mmu.S b/kernel/arch/m32r/mm/mmu.S
index e9491a5ae..fd8f9c9b7 100644
--- a/kernel/arch/m32r/mm/mmu.S
+++ b/kernel/arch/m32r/mm/mmu.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/mm/mmu.S
  *
diff --git a/kernel/arch/m32r/oprofile/Makefile b/kernel/arch/m32r/oprofile/Makefile
index 06e7c81ea..8e63a3a5a 100644
--- a/kernel/arch/m32r/oprofile/Makefile
+++ b/kernel/arch/m32r/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS := $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/m32r/platforms/Makefile b/kernel/arch/m32r/platforms/Makefile
index da03e1a8f..9e1a82529 100644
--- a/kernel/arch/m32r/platforms/Makefile
+++ b/kernel/arch/m32r/platforms/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # arch/m32r/platforms/Makefile
 obj-$(CONFIG_PLAT_M32104UT)	+= m32104ut/
 obj-$(CONFIG_PLAT_M32700UT)	+= m32700ut/
diff --git a/kernel/arch/m32r/platforms/m32104ut/io.c b/kernel/arch/m32r/platforms/m32104ut/io.c
index e5d8be6fb..ff2bb3b58 100644
--- a/kernel/arch/m32r/platforms/m32104ut/io.c
+++ b/kernel/arch/m32r/platforms/m32104ut/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/m32104ut/io.c
  *
diff --git a/kernel/arch/m32r/platforms/m32104ut/setup.c b/kernel/arch/m32r/platforms/m32104ut/setup.c
index e2dd778ae..297936003 100644
--- a/kernel/arch/m32r/platforms/m32104ut/setup.c
+++ b/kernel/arch/m32r/platforms/m32104ut/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/m32104ut/setup.c
  *
diff --git a/kernel/arch/m32r/platforms/mappi/io.c b/kernel/arch/m32r/platforms/mappi/io.c
index ac1c396d4..06ea6d9bc 100644
--- a/kernel/arch/m32r/platforms/mappi/io.c
+++ b/kernel/arch/m32r/platforms/mappi/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi/io.c
  *
diff --git a/kernel/arch/m32r/platforms/mappi/setup.c b/kernel/arch/m32r/platforms/mappi/setup.c
index 767d2f4d6..c8d642ec4 100644
--- a/kernel/arch/m32r/platforms/mappi/setup.c
+++ b/kernel/arch/m32r/platforms/mappi/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi/setup.c
  *
diff --git a/kernel/arch/m32r/platforms/mappi2/io.c b/kernel/arch/m32r/platforms/mappi2/io.c
index da58960b3..18a408ff3 100644
--- a/kernel/arch/m32r/platforms/mappi2/io.c
+++ b/kernel/arch/m32r/platforms/mappi2/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi2/io.c
  *
diff --git a/kernel/arch/m32r/platforms/mappi2/setup.c b/kernel/arch/m32r/platforms/mappi2/setup.c
index 76d665abf..7253258a7 100644
--- a/kernel/arch/m32r/platforms/mappi2/setup.c
+++ b/kernel/arch/m32r/platforms/mappi2/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi2/setup.c
  *
diff --git a/kernel/arch/m32r/platforms/mappi3/io.c b/kernel/arch/m32r/platforms/mappi3/io.c
index 1bc3f90fd..e7edcab72 100644
--- a/kernel/arch/m32r/platforms/mappi3/io.c
+++ b/kernel/arch/m32r/platforms/mappi3/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi3/io.c
  *
diff --git a/kernel/arch/m32r/platforms/mappi3/setup.c b/kernel/arch/m32r/platforms/mappi3/setup.c
index a3646d4b0..87d200008 100644
--- a/kernel/arch/m32r/platforms/mappi3/setup.c
+++ b/kernel/arch/m32r/platforms/mappi3/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/mappi3/setup.c
  *
diff --git a/kernel/arch/m32r/platforms/oaks32r/io.c b/kernel/arch/m32r/platforms/oaks32r/io.c
index 364a3b2e8..3ce1f3ac0 100644
--- a/kernel/arch/m32r/platforms/oaks32r/io.c
+++ b/kernel/arch/m32r/platforms/oaks32r/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/oaks32r/io.c
  *
diff --git a/kernel/arch/m32r/platforms/oaks32r/setup.c b/kernel/arch/m32r/platforms/oaks32r/setup.c
index f8373c069..8188c0baa 100644
--- a/kernel/arch/m32r/platforms/oaks32r/setup.c
+++ b/kernel/arch/m32r/platforms/oaks32r/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/oaks32r/setup.c
  *
diff --git a/kernel/arch/m32r/platforms/usrv/setup.c b/kernel/arch/m32r/platforms/usrv/setup.c
index dcde0ec77..ba828b16c 100644
--- a/kernel/arch/m32r/platforms/usrv/setup.c
+++ b/kernel/arch/m32r/platforms/usrv/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m32r/platforms/usrv/setup.c
  *
diff --git a/kernel/arch/m68k/68000/Makefile b/kernel/arch/m68k/68000/Makefile
index 1eab70c71..4f7d4b45a 100644
--- a/kernel/arch/m68k/68000/Makefile
+++ b/kernel/arch/m68k/68000/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ##################################################
 #
 # Makefile for 68000 core based cpus
diff --git a/kernel/arch/m68k/68000/bootlogo-vz.h b/kernel/arch/m68k/68000/bootlogo-vz.h
index 6ff09beba..1afa33955 100644
--- a/kernel/arch/m68k/68000/bootlogo-vz.h
+++ b/kernel/arch/m68k/68000/bootlogo-vz.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/compiler.h>
 
 #define splash_width 640
diff --git a/kernel/arch/m68k/68000/bootlogo.h b/kernel/arch/m68k/68000/bootlogo.h
index c466db3ca..b4d7e6c26 100644
--- a/kernel/arch/m68k/68000/bootlogo.h
+++ b/kernel/arch/m68k/68000/bootlogo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/compiler.h>
 
 #define bootlogo_width 160
diff --git a/kernel/arch/m68k/68000/head.S b/kernel/arch/m68k/68000/head.S
index 536ef9616..140220662 100644
--- a/kernel/arch/m68k/68000/head.S
+++ b/kernel/arch/m68k/68000/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * head.S - Common startup code for 68000 core based CPU's
  *
diff --git a/kernel/arch/m68k/Kconfig b/kernel/arch/m68k/Kconfig
index 353d90487..785612b57 100644
--- a/kernel/arch/m68k/Kconfig
+++ b/kernel/arch/m68k/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config M68K
 	bool
 	default y
diff --git a/kernel/arch/m68k/Kconfig.bus b/kernel/arch/m68k/Kconfig.bus
index 675b08719..d5e66ec13 100644
--- a/kernel/arch/m68k/Kconfig.bus
+++ b/kernel/arch/m68k/Kconfig.bus
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MMU
 
 comment "Bus Support"
diff --git a/kernel/arch/m68k/Kconfig.cpu b/kernel/arch/m68k/Kconfig.cpu
index d2219f30b..ff5f08963 100644
--- a/kernel/arch/m68k/Kconfig.cpu
+++ b/kernel/arch/m68k/Kconfig.cpu
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 comment "Processor Type"
 
 choice
diff --git a/kernel/arch/m68k/Kconfig.debug b/kernel/arch/m68k/Kconfig.debug
index 50a67d08a..04690b179 100644
--- a/kernel/arch/m68k/Kconfig.debug
+++ b/kernel/arch/m68k/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/m68k/Kconfig.devices b/kernel/arch/m68k/Kconfig.devices
index 42b6fcfc3..3e9b0b826 100644
--- a/kernel/arch/m68k/Kconfig.devices
+++ b/kernel/arch/m68k/Kconfig.devices
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MMU
 
 config ARCH_MAY_HAVE_PC_FDC
diff --git a/kernel/arch/m68k/Kconfig.machine b/kernel/arch/m68k/Kconfig.machine
index 9225b4ad9..5cd57b4d3 100644
--- a/kernel/arch/m68k/Kconfig.machine
+++ b/kernel/arch/m68k/Kconfig.machine
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 comment "Machine Types"
 
 if M68KCLASSIC
diff --git a/kernel/arch/m68k/amiga/chipram.c b/kernel/arch/m68k/amiga/chipram.c
index ba03cec3f..a537953bc 100644
--- a/kernel/arch/m68k/amiga/chipram.c
+++ b/kernel/arch/m68k/amiga/chipram.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 **  linux/amiga/chipram.c
 **
diff --git a/kernel/arch/m68k/apollo/config.c b/kernel/arch/m68k/apollo/config.c
index 432bc8bac..0d27706f1 100644
--- a/kernel/arch/m68k/apollo/config.c
+++ b/kernel/arch/m68k/apollo/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/m68k/apollo/dn_ints.c b/kernel/arch/m68k/apollo/dn_ints.c
index 17be1e7e2..02cff7efc 100644
--- a/kernel/arch/m68k/apollo/dn_ints.c
+++ b/kernel/arch/m68k/apollo/dn_ints.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 
diff --git a/kernel/arch/m68k/bvme6000/rtc.c b/kernel/arch/m68k/bvme6000/rtc.c
index e4f1faffe..b43eeef09 100644
--- a/kernel/arch/m68k/bvme6000/rtc.c
+++ b/kernel/arch/m68k/bvme6000/rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Real Time Clock interface for Linux on the BVME6000
  *
diff --git a/kernel/arch/m68k/coldfire/Makefile b/kernel/arch/m68k/coldfire/Makefile
index 4aa2c57af..f8cef9681 100644
--- a/kernel/arch/m68k/coldfire/Makefile
+++ b/kernel/arch/m68k/coldfire/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the m68knommu kernel.
 #
diff --git a/kernel/arch/m68k/coldfire/cache.c b/kernel/arch/m68k/coldfire/cache.c
index 71beeaf0c..98ee89b87 100644
--- a/kernel/arch/m68k/coldfire/cache.c
+++ b/kernel/arch/m68k/coldfire/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/clk.c b/kernel/arch/m68k/coldfire/clk.c
index 856069a31..849cd208e 100644
--- a/kernel/arch/m68k/coldfire/clk.c
+++ b/kernel/arch/m68k/coldfire/clk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/dma.c b/kernel/arch/m68k/coldfire/dma.c
index df5ce20d1..c3279f746 100644
--- a/kernel/arch/m68k/coldfire/dma.c
+++ b/kernel/arch/m68k/coldfire/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/dma_timer.c b/kernel/arch/m68k/coldfire/dma_timer.c
index 8273eea57..cbb289439 100644
--- a/kernel/arch/m68k/coldfire/dma_timer.c
+++ b/kernel/arch/m68k/coldfire/dma_timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dma_timer.c -- Freescale ColdFire DMA Timer.
  *
diff --git a/kernel/arch/m68k/coldfire/firebee.c b/kernel/arch/m68k/coldfire/firebee.c
index 46d50534f..3b9d4fc6f 100644
--- a/kernel/arch/m68k/coldfire/firebee.c
+++ b/kernel/arch/m68k/coldfire/firebee.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/head.S b/kernel/arch/m68k/coldfire/head.S
index bdb472c48..c6d7fd28c 100644
--- a/kernel/arch/m68k/coldfire/head.S
+++ b/kernel/arch/m68k/coldfire/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m5206.c b/kernel/arch/m68k/coldfire/m5206.c
index a3bcf0883..2f14ea95c 100644
--- a/kernel/arch/m68k/coldfire/m5206.c
+++ b/kernel/arch/m68k/coldfire/m5206.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m520x.c b/kernel/arch/m68k/coldfire/m520x.c
index 5ba69217c..b5b2a267d 100644
--- a/kernel/arch/m68k/coldfire/m520x.c
+++ b/kernel/arch/m68k/coldfire/m520x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m523x.c b/kernel/arch/m68k/coldfire/m523x.c
index f7a0fcc56..ddf2496ed 100644
--- a/kernel/arch/m68k/coldfire/m523x.c
+++ b/kernel/arch/m68k/coldfire/m523x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m5249.c b/kernel/arch/m68k/coldfire/m5249.c
index b16cf9b45..0590f8c42 100644
--- a/kernel/arch/m68k/coldfire/m5249.c
+++ b/kernel/arch/m68k/coldfire/m5249.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m525x.c b/kernel/arch/m68k/coldfire/m525x.c
index 110e2cd34..1772359c4 100644
--- a/kernel/arch/m68k/coldfire/m525x.c
+++ b/kernel/arch/m68k/coldfire/m525x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m5272.c b/kernel/arch/m68k/coldfire/m5272.c
index 9abb1a441..ad1185c68 100644
--- a/kernel/arch/m68k/coldfire/m5272.c
+++ b/kernel/arch/m68k/coldfire/m5272.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m527x.c b/kernel/arch/m68k/coldfire/m527x.c
index b10b436b5..cad462df6 100644
--- a/kernel/arch/m68k/coldfire/m527x.c
+++ b/kernel/arch/m68k/coldfire/m527x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m528x.c b/kernel/arch/m68k/coldfire/m528x.c
index ea76998d5..7ad319388 100644
--- a/kernel/arch/m68k/coldfire/m528x.c
+++ b/kernel/arch/m68k/coldfire/m528x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m5307.c b/kernel/arch/m68k/coldfire/m5307.c
index cc5e8a50a..64b4b1fd3 100644
--- a/kernel/arch/m68k/coldfire/m5307.c
+++ b/kernel/arch/m68k/coldfire/m5307.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m5407.c b/kernel/arch/m68k/coldfire/m5407.c
index 38863ddbe..0400d7611 100644
--- a/kernel/arch/m68k/coldfire/m5407.c
+++ b/kernel/arch/m68k/coldfire/m5407.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/m5441x.c b/kernel/arch/m68k/coldfire/m5441x.c
index 04fd7fde9..315d14b0d 100644
--- a/kernel/arch/m68k/coldfire/m5441x.c
+++ b/kernel/arch/m68k/coldfire/m5441x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	m5441x.c -- support for Coldfire m5441x processors
  *
diff --git a/kernel/arch/m68k/coldfire/m54xx.c b/kernel/arch/m68k/coldfire/m54xx.c
index c552851ec..e53ffed13 100644
--- a/kernel/arch/m68k/coldfire/m54xx.c
+++ b/kernel/arch/m68k/coldfire/m54xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/nettel.c b/kernel/arch/m68k/coldfire/nettel.c
index ddc48ec1b..ea8df6e7a 100644
--- a/kernel/arch/m68k/coldfire/nettel.c
+++ b/kernel/arch/m68k/coldfire/nettel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/pit.c b/kernel/arch/m68k/coldfire/pit.c
index 6c0878018..eb6f16b0e 100644
--- a/kernel/arch/m68k/coldfire/pit.c
+++ b/kernel/arch/m68k/coldfire/pit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/sltimers.c b/kernel/arch/m68k/coldfire/sltimers.c
index 3292c0d68..1b11e7bac 100644
--- a/kernel/arch/m68k/coldfire/sltimers.c
+++ b/kernel/arch/m68k/coldfire/sltimers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/timers.c b/kernel/arch/m68k/coldfire/timers.c
index 2dc7a5820..227aa5d13 100644
--- a/kernel/arch/m68k/coldfire/timers.c
+++ b/kernel/arch/m68k/coldfire/timers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/coldfire/vectors.c b/kernel/arch/m68k/coldfire/vectors.c
index 08923fe60..3bf0d69ee 100644
--- a/kernel/arch/m68k/coldfire/vectors.c
+++ b/kernel/arch/m68k/coldfire/vectors.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /***************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/fpsp040/Makefile b/kernel/arch/m68k/fpsp040/Makefile
index 9506d883a..aab04d372 100644
--- a/kernel/arch/m68k/fpsp040/Makefile
+++ b/kernel/arch/m68k/fpsp040/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Linux arch/m68k/fpsp040 source directory
 #
diff --git a/kernel/arch/m68k/hp300/config.c b/kernel/arch/m68k/hp300/config.c
index 7cfab158f..a19bcd23f 100644
--- a/kernel/arch/m68k/hp300/config.c
+++ b/kernel/arch/m68k/hp300/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/hp300/config.c
  *
diff --git a/kernel/arch/m68k/hp300/time.c b/kernel/arch/m68k/hp300/time.c
index 749543b42..289d928a4 100644
--- a/kernel/arch/m68k/hp300/time.c
+++ b/kernel/arch/m68k/hp300/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/hp300/time.c
  *
diff --git a/kernel/arch/m68k/include/asm/MC68328.h b/kernel/arch/m68k/include/asm/MC68328.h
index b61230e74..6e14e9226 100644
--- a/kernel/arch/m68k/include/asm/MC68328.h
+++ b/kernel/arch/m68k/include/asm/MC68328.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* include/asm-m68knommu/MC68328.h: '328 control registers
  *
diff --git a/kernel/arch/m68k/include/asm/MC68EZ328.h b/kernel/arch/m68k/include/asm/MC68EZ328.h
index 703331ece..c50b9f6a8 100644
--- a/kernel/arch/m68k/include/asm/MC68EZ328.h
+++ b/kernel/arch/m68k/include/asm/MC68EZ328.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* include/asm-m68knommu/MC68EZ328.h: 'EZ328 control registers
  *
diff --git a/kernel/arch/m68k/include/asm/MC68VZ328.h b/kernel/arch/m68k/include/asm/MC68VZ328.h
index fbaed7ddf..dc894cfcf 100644
--- a/kernel/arch/m68k/include/asm/MC68VZ328.h
+++ b/kernel/arch/m68k/include/asm/MC68VZ328.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* include/asm-m68knommu/MC68VZ328.h: 'VZ328 control registers
  *
diff --git a/kernel/arch/m68k/include/asm/adb_iop.h b/kernel/arch/m68k/include/asm/adb_iop.h
index 8a48e56f2..195d7fb12 100644
--- a/kernel/arch/m68k/include/asm/adb_iop.h
+++ b/kernel/arch/m68k/include/asm/adb_iop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ADB through the IOP
  * Written by Joshua M. Thompson
diff --git a/kernel/arch/m68k/include/asm/apollohw.h b/kernel/arch/m68k/include/asm/apollohw.h
index 87fc899d3..52066f3b8 100644
--- a/kernel/arch/m68k/include/asm/apollohw.h
+++ b/kernel/arch/m68k/include/asm/apollohw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* apollohw.h : some structures to access apollo HW */
 
 #ifndef _ASMm68k_APOLLOHW_H_
diff --git a/kernel/arch/m68k/include/asm/atafd.h b/kernel/arch/m68k/include/asm/atafd.h
index 8456889ee..ad7014cad 100644
--- a/kernel/arch/m68k/include/asm/atafd.h
+++ b/kernel/arch/m68k/include/asm/atafd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_FD_H
 #define _ASM_M68K_FD_H
 
diff --git a/kernel/arch/m68k/include/asm/atafdreg.h b/kernel/arch/m68k/include/asm/atafdreg.h
index bbf80949f..c31b4919e 100644
--- a/kernel/arch/m68k/include/asm/atafdreg.h
+++ b/kernel/arch/m68k/include/asm/atafdreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FDREG_H
 #define _LINUX_FDREG_H
 
diff --git a/kernel/arch/m68k/include/asm/atari_joystick.h b/kernel/arch/m68k/include/asm/atari_joystick.h
index 93be7da9f..c4a6a06e6 100644
--- a/kernel/arch/m68k/include/asm/atari_joystick.h
+++ b/kernel/arch/m68k/include/asm/atari_joystick.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ATARI_JOYSTICK_H
 #define _LINUX_ATARI_JOYSTICK_H
 
diff --git a/kernel/arch/m68k/include/asm/atari_stdma.h b/kernel/arch/m68k/include/asm/atari_stdma.h
index d24e34d87..70de9b124 100644
--- a/kernel/arch/m68k/include/asm/atari_stdma.h
+++ b/kernel/arch/m68k/include/asm/atari_stdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _atari_stdma_h
 #define _atari_stdma_h
diff --git a/kernel/arch/m68k/include/asm/atari_stram.h b/kernel/arch/m68k/include/asm/atari_stram.h
index 4e771c22d..1fc19102a 100644
--- a/kernel/arch/m68k/include/asm/atari_stram.h
+++ b/kernel/arch/m68k/include/asm/atari_stram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_ATARI_STRAM_H
 #define _M68K_ATARI_STRAM_H
 
diff --git a/kernel/arch/m68k/include/asm/atomic.h b/kernel/arch/m68k/include/asm/atomic.h
index cf4c3a7b1..e993e2860 100644
--- a/kernel/arch/m68k/include/asm/atomic.h
+++ b/kernel/arch/m68k/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_M68K_ATOMIC__
 #define __ARCH_M68K_ATOMIC__
 
diff --git a/kernel/arch/m68k/include/asm/bootstd.h b/kernel/arch/m68k/include/asm/bootstd.h
index e518f5a57..1dab93ddb 100644
--- a/kernel/arch/m68k/include/asm/bootstd.h
+++ b/kernel/arch/m68k/include/asm/bootstd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* bootstd.h:  Bootloader system call interface
  *
  * (c) 1999, Rt-Control, Inc.
diff --git a/kernel/arch/m68k/include/asm/bug.h b/kernel/arch/m68k/include/asm/bug.h
index 5bc8d91d6..b7e2bf1ba 100644
--- a/kernel/arch/m68k/include/asm/bug.h
+++ b/kernel/arch/m68k/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_BUG_H
 #define _M68K_BUG_H
 
diff --git a/kernel/arch/m68k/include/asm/bugs.h b/kernel/arch/m68k/include/asm/bugs.h
index d06207b9b..745530651 100644
--- a/kernel/arch/m68k/include/asm/bugs.h
+++ b/kernel/arch/m68k/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/asm-m68k/bugs.h
  *
diff --git a/kernel/arch/m68k/include/asm/bvme6000hw.h b/kernel/arch/m68k/include/asm/bvme6000hw.h
index f40d2f851..7b1309bb2 100644
--- a/kernel/arch/m68k/include/asm/bvme6000hw.h
+++ b/kernel/arch/m68k/include/asm/bvme6000hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_BVME6000HW_H_
 #define _M68K_BVME6000HW_H_
 
diff --git a/kernel/arch/m68k/include/asm/cache.h b/kernel/arch/m68k/include/asm/cache.h
index 0395c51e4..9c06458f3 100644
--- a/kernel/arch/m68k/include/asm/cache.h
+++ b/kernel/arch/m68k/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-m68k/cache.h
  */
diff --git a/kernel/arch/m68k/include/asm/cacheflush.h b/kernel/arch/m68k/include/asm/cacheflush.h
index 4fc738209..29b8e638b 100644
--- a/kernel/arch/m68k/include/asm/cacheflush.h
+++ b/kernel/arch/m68k/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __uClinux__
 #include <asm/cacheflush_no.h>
 #else
diff --git a/kernel/arch/m68k/include/asm/cacheflush_mm.h b/kernel/arch/m68k/include/asm/cacheflush_mm.h
index fa2c3d681..1e2544eca 100644
--- a/kernel/arch/m68k/include/asm/cacheflush_mm.h
+++ b/kernel/arch/m68k/include/asm/cacheflush_mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_CACHEFLUSH_H
 #define _M68K_CACHEFLUSH_H
 
diff --git a/kernel/arch/m68k/include/asm/cacheflush_no.h b/kernel/arch/m68k/include/asm/cacheflush_no.h
index d2b3935ae..11e9a9dcb 100644
--- a/kernel/arch/m68k/include/asm/cacheflush_no.h
+++ b/kernel/arch/m68k/include/asm/cacheflush_no.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68KNOMMU_CACHEFLUSH_H
 #define _M68KNOMMU_CACHEFLUSH_H
 
diff --git a/kernel/arch/m68k/include/asm/checksum.h b/kernel/arch/m68k/include/asm/checksum.h
index 75e91f03b..f9b94e4b9 100644
--- a/kernel/arch/m68k/include/asm/checksum.h
+++ b/kernel/arch/m68k/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_CHECKSUM_H
 #define _M68K_CHECKSUM_H
 
diff --git a/kernel/arch/m68k/include/asm/cmpxchg.h b/kernel/arch/m68k/include/asm/cmpxchg.h
index 83b1df80f..38e1d7acc 100644
--- a/kernel/arch/m68k/include/asm/cmpxchg.h
+++ b/kernel/arch/m68k/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_M68K_CMPXCHG__
 #define __ARCH_M68K_CMPXCHG__
 
diff --git a/kernel/arch/m68k/include/asm/coldfire.h b/kernel/arch/m68k/include/asm/coldfire.h
index 50aa4dac9..d9cb26fb3 100644
--- a/kernel/arch/m68k/include/asm/coldfire.h
+++ b/kernel/arch/m68k/include/asm/coldfire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/contregs.h b/kernel/arch/m68k/include/asm/contregs.h
index d1ea750bd..f82ca0ab3 100644
--- a/kernel/arch/m68k/include/asm/contregs.h
+++ b/kernel/arch/m68k/include/asm/contregs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_CONTREGS_H
 #define _M68K_CONTREGS_H
 
diff --git a/kernel/arch/m68k/include/asm/current.h b/kernel/arch/m68k/include/asm/current.h
index 91fcc5358..6390ef2f7 100644
--- a/kernel/arch/m68k/include/asm/current.h
+++ b/kernel/arch/m68k/include/asm/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_CURRENT_H
 #define _M68K_CURRENT_H
 
diff --git a/kernel/arch/m68k/include/asm/delay.h b/kernel/arch/m68k/include/asm/delay.h
index c598d847d..7f474121e 100644
--- a/kernel/arch/m68k/include/asm/delay.h
+++ b/kernel/arch/m68k/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_DELAY_H
 #define _M68K_DELAY_H
 
diff --git a/kernel/arch/m68k/include/asm/div64.h b/kernel/arch/m68k/include/asm/div64.h
index ef881cfbb..365f39f5e 100644
--- a/kernel/arch/m68k/include/asm/div64.h
+++ b/kernel/arch/m68k/include/asm/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_DIV64_H
 #define _M68K_DIV64_H
 
diff --git a/kernel/arch/m68k/include/asm/dma-mapping.h b/kernel/arch/m68k/include/asm/dma-mapping.h
index 9210e4707..3e1a3ffba 100644
--- a/kernel/arch/m68k/include/asm/dma-mapping.h
+++ b/kernel/arch/m68k/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_DMA_MAPPING_H
 #define _M68K_DMA_MAPPING_H
 
diff --git a/kernel/arch/m68k/include/asm/dma.h b/kernel/arch/m68k/include/asm/dma.h
index 208b4daa1..b0978a23b 100644
--- a/kernel/arch/m68k/include/asm/dma.h
+++ b/kernel/arch/m68k/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_DMA_H
 #define _M68K_DMA_H 1
 
diff --git a/kernel/arch/m68k/include/asm/dvma.h b/kernel/arch/m68k/include/asm/dvma.h
index 890bbf7e7..f609ec1de 100644
--- a/kernel/arch/m68k/include/asm/dvma.h
+++ b/kernel/arch/m68k/include/asm/dvma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-m68k/dma.h
  *
diff --git a/kernel/arch/m68k/include/asm/elf.h b/kernel/arch/m68k/include/asm/elf.h
index b1c26de43..3d387ceae 100644
--- a/kernel/arch/m68k/include/asm/elf.h
+++ b/kernel/arch/m68k/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMm68k_ELF_H
 #define __ASMm68k_ELF_H
 
diff --git a/kernel/arch/m68k/include/asm/entry.h b/kernel/arch/m68k/include/asm/entry.h
index d7de0f1a8..9b52b060c 100644
--- a/kernel/arch/m68k/include/asm/entry.h
+++ b/kernel/arch/m68k/include/asm/entry.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M68K_ENTRY_H
 #define __M68K_ENTRY_H
 
diff --git a/kernel/arch/m68k/include/asm/fb.h b/kernel/arch/m68k/include/asm/fb.h
index be4e4c679..b86c6e2e2 100644
--- a/kernel/arch/m68k/include/asm/fb.h
+++ b/kernel/arch/m68k/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
diff --git a/kernel/arch/m68k/include/asm/fbio.h b/kernel/arch/m68k/include/asm/fbio.h
index 0a21da87f..590b923c4 100644
--- a/kernel/arch/m68k/include/asm/fbio.h
+++ b/kernel/arch/m68k/include/asm/fbio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_FBIO_H
 #define __LINUX_FBIO_H
 
diff --git a/kernel/arch/m68k/include/asm/flat.h b/kernel/arch/m68k/include/asm/flat.h
index b2a41f5b3..4f1d1e373 100644
--- a/kernel/arch/m68k/include/asm/flat.h
+++ b/kernel/arch/m68k/include/asm/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * flat.h -- uClinux flat-format executables
  */
diff --git a/kernel/arch/m68k/include/asm/fpu.h b/kernel/arch/m68k/include/asm/fpu.h
index 526db9da9..ab12be88d 100644
--- a/kernel/arch/m68k/include/asm/fpu.h
+++ b/kernel/arch/m68k/include/asm/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M68K_FPU_H
 #define __M68K_FPU_H
 
diff --git a/kernel/arch/m68k/include/asm/hardirq.h b/kernel/arch/m68k/include/asm/hardirq.h
index 6c618529d..117931654 100644
--- a/kernel/arch/m68k/include/asm/hardirq.h
+++ b/kernel/arch/m68k/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M68K_HARDIRQ_H
 #define __M68K_HARDIRQ_H
 
diff --git a/kernel/arch/m68k/include/asm/hash.h b/kernel/arch/m68k/include/asm/hash.h
index 6407af84a..6d0d0c893 100644
--- a/kernel/arch/m68k/include/asm/hash.h
+++ b/kernel/arch/m68k/include/asm/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HASH_H
 #define _ASM_HASH_H
 
diff --git a/kernel/arch/m68k/include/asm/hp300hw.h b/kernel/arch/m68k/include/asm/hp300hw.h
index 64f5271dd..0909800be 100644
--- a/kernel/arch/m68k/include/asm/hp300hw.h
+++ b/kernel/arch/m68k/include/asm/hp300hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_HP300HW_H
 #define _M68K_HP300HW_H
 
diff --git a/kernel/arch/m68k/include/asm/hwtest.h b/kernel/arch/m68k/include/asm/hwtest.h
index 402c8a440..f8d646205 100644
--- a/kernel/arch/m68k/include/asm/hwtest.h
+++ b/kernel/arch/m68k/include/asm/hwtest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Routines to test for presence/absence of hardware registers:
  * see arch/m68k/mm/hwtest.c.
  *  -- PMM <pmaydell@chiark.greenend.org.uk> 05/1998
diff --git a/kernel/arch/m68k/include/asm/ide.h b/kernel/arch/m68k/include/asm/ide.h
index 492fee8a1..05cc7dc00 100644
--- a/kernel/arch/m68k/include/asm/ide.h
+++ b/kernel/arch/m68k/include/asm/ide.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 1994-1996  Linus Torvalds & authors
  */
diff --git a/kernel/arch/m68k/include/asm/idprom.h b/kernel/arch/m68k/include/asm/idprom.h
index 160616a89..13b099d01 100644
--- a/kernel/arch/m68k/include/asm/idprom.h
+++ b/kernel/arch/m68k/include/asm/idprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_IDPROM_H
 #define _M68K_IDPROM_H
 /*
diff --git a/kernel/arch/m68k/include/asm/intersil.h b/kernel/arch/m68k/include/asm/intersil.h
index f482902ca..b696348f9 100644
--- a/kernel/arch/m68k/include/asm/intersil.h
+++ b/kernel/arch/m68k/include/asm/intersil.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SUN3_INTERSIL_H
 #define _SUN3_INTERSIL_H
 /* bits 0 and 1 */
diff --git a/kernel/arch/m68k/include/asm/io.h b/kernel/arch/m68k/include/asm/io.h
index bccd5a914..756089cc0 100644
--- a/kernel/arch/m68k/include/asm/io.h
+++ b/kernel/arch/m68k/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __uClinux__
 #include <asm/io_no.h>
 #else
diff --git a/kernel/arch/m68k/include/asm/io_mm.h b/kernel/arch/m68k/include/asm/io_mm.h
index c98ac8158..ed5333e87 100644
--- a/kernel/arch/m68k/include/asm/io_mm.h
+++ b/kernel/arch/m68k/include/asm/io_mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-m68k/io.h
  *
diff --git a/kernel/arch/m68k/include/asm/io_no.h b/kernel/arch/m68k/include/asm/io_no.h
index ad7bd40e6..86f45b403 100644
--- a/kernel/arch/m68k/include/asm/io_no.h
+++ b/kernel/arch/m68k/include/asm/io_no.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68KNOMMU_IO_H
 #define _M68KNOMMU_IO_H
 
diff --git a/kernel/arch/m68k/include/asm/irq.h b/kernel/arch/m68k/include/asm/irq.h
index a644f4a53..91dd49379 100644
--- a/kernel/arch/m68k/include/asm/irq.h
+++ b/kernel/arch/m68k/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_IRQ_H_
 #define _M68K_IRQ_H_
 
diff --git a/kernel/arch/m68k/include/asm/irqflags.h b/kernel/arch/m68k/include/asm/irqflags.h
index b59418183..3799a2481 100644
--- a/kernel/arch/m68k/include/asm/irqflags.h
+++ b/kernel/arch/m68k/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_IRQFLAGS_H
 #define _M68K_IRQFLAGS_H
 
diff --git a/kernel/arch/m68k/include/asm/kexec.h b/kernel/arch/m68k/include/asm/kexec.h
index 3df97abac..f5a8b2def 100644
--- a/kernel/arch/m68k/include/asm/kexec.h
+++ b/kernel/arch/m68k/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_KEXEC_H
 #define _ASM_M68K_KEXEC_H
 
diff --git a/kernel/arch/m68k/include/asm/linkage.h b/kernel/arch/m68k/include/asm/linkage.h
index 066e74f66..c8b842827 100644
--- a/kernel/arch/m68k/include/asm/linkage.h
+++ b/kernel/arch/m68k/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/m68k/include/asm/m5206sim.h b/kernel/arch/m68k/include/asm/m5206sim.h
index 0ddf3efbc..ceb42670a 100644
--- a/kernel/arch/m68k/include/asm/m5206sim.h
+++ b/kernel/arch/m68k/include/asm/m5206sim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m520xsim.h b/kernel/arch/m68k/include/asm/m520xsim.h
index 6d50cefa7..8b3da5624 100644
--- a/kernel/arch/m68k/include/asm/m520xsim.h
+++ b/kernel/arch/m68k/include/asm/m520xsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m523xsim.h b/kernel/arch/m68k/include/asm/m523xsim.h
index d43f6ab1e..a3082411a 100644
--- a/kernel/arch/m68k/include/asm/m523xsim.h
+++ b/kernel/arch/m68k/include/asm/m523xsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m525xsim.h b/kernel/arch/m68k/include/asm/m525xsim.h
index 699f20c8a..de01b701d 100644
--- a/kernel/arch/m68k/include/asm/m525xsim.h
+++ b/kernel/arch/m68k/include/asm/m525xsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m5272sim.h b/kernel/arch/m68k/include/asm/m5272sim.h
index 1fb01bb05..135dd50f0 100644
--- a/kernel/arch/m68k/include/asm/m5272sim.h
+++ b/kernel/arch/m68k/include/asm/m5272sim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m527xsim.h b/kernel/arch/m68k/include/asm/m527xsim.h
index 35f6fbc89..d92814bf9 100644
--- a/kernel/arch/m68k/include/asm/m527xsim.h
+++ b/kernel/arch/m68k/include/asm/m527xsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m528xsim.h b/kernel/arch/m68k/include/asm/m528xsim.h
index 67f6182d1..7b60a57e9 100644
--- a/kernel/arch/m68k/include/asm/m528xsim.h
+++ b/kernel/arch/m68k/include/asm/m528xsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m52xxacr.h b/kernel/arch/m68k/include/asm/m52xxacr.h
index abc391a9a..2cb29ed52 100644
--- a/kernel/arch/m68k/include/asm/m52xxacr.h
+++ b/kernel/arch/m68k/include/asm/m52xxacr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m5307sim.h b/kernel/arch/m68k/include/asm/m5307sim.h
index d2595e04e..25059f205 100644
--- a/kernel/arch/m68k/include/asm/m5307sim.h
+++ b/kernel/arch/m68k/include/asm/m5307sim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m53xxacr.h b/kernel/arch/m68k/include/asm/m53xxacr.h
index 3177ce833..9138a624c 100644
--- a/kernel/arch/m68k/include/asm/m53xxacr.h
+++ b/kernel/arch/m68k/include/asm/m53xxacr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m53xxsim.h b/kernel/arch/m68k/include/asm/m53xxsim.h
index 53329ae4d..22c1c92b9 100644
--- a/kernel/arch/m68k/include/asm/m53xxsim.h
+++ b/kernel/arch/m68k/include/asm/m53xxsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m5407sim.h b/kernel/arch/m68k/include/asm/m5407sim.h
index ab40c16ba..0c2720d8e 100644
--- a/kernel/arch/m68k/include/asm/m5407sim.h
+++ b/kernel/arch/m68k/include/asm/m5407sim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/m5441xsim.h b/kernel/arch/m68k/include/asm/m5441xsim.h
index 64f60be47..4e9095b94 100644
--- a/kernel/arch/m68k/include/asm/m5441xsim.h
+++ b/kernel/arch/m68k/include/asm/m5441xsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	m5441xsim.h -- Coldfire 5441x register definitions
  *
diff --git a/kernel/arch/m68k/include/asm/m54xxacr.h b/kernel/arch/m68k/include/asm/m54xxacr.h
index c6ac05cda..466df7b03 100644
--- a/kernel/arch/m68k/include/asm/m54xxacr.h
+++ b/kernel/arch/m68k/include/asm/m54xxacr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Bit definitions for the MCF54xx ACR and CACR registers.
  */
diff --git a/kernel/arch/m68k/include/asm/m54xxgpt.h b/kernel/arch/m68k/include/asm/m54xxgpt.h
index 0b69cd1ed..b1f912157 100644
--- a/kernel/arch/m68k/include/asm/m54xxgpt.h
+++ b/kernel/arch/m68k/include/asm/m54xxgpt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	m54xxgpt.h
  * Purpose:	Register and bit definitions for the MCF54XX
diff --git a/kernel/arch/m68k/include/asm/m54xxsim.h b/kernel/arch/m68k/include/asm/m54xxsim.h
index 7758d0a1a..2a3305f6f 100644
--- a/kernel/arch/m68k/include/asm/m54xxsim.h
+++ b/kernel/arch/m68k/include/asm/m54xxsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	m54xxsim.h -- ColdFire 547x/548x System Integration Unit support.
  */
diff --git a/kernel/arch/m68k/include/asm/mac_asc.h b/kernel/arch/m68k/include/asm/mac_asc.h
index fc2e5467b..075990251 100644
--- a/kernel/arch/m68k/include/asm/mac_asc.h
+++ b/kernel/arch/m68k/include/asm/mac_asc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Apple Sound Chip
  */
diff --git a/kernel/arch/m68k/include/asm/mac_baboon.h b/kernel/arch/m68k/include/asm/mac_baboon.h
index a2d32f658..08d9b8829 100644
--- a/kernel/arch/m68k/include/asm/mac_baboon.h
+++ b/kernel/arch/m68k/include/asm/mac_baboon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for the "Baboon" custom IC on the PowerBook 190.
  */
diff --git a/kernel/arch/m68k/include/asm/mac_iop.h b/kernel/arch/m68k/include/asm/mac_iop.h
index 42566fd05..73dae2abe 100644
--- a/kernel/arch/m68k/include/asm/mac_iop.h
+++ b/kernel/arch/m68k/include/asm/mac_iop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * I/O Processor (IOP) defines and structures, mostly snagged from A/UX
  * header files.
diff --git a/kernel/arch/m68k/include/asm/mac_oss.h b/kernel/arch/m68k/include/asm/mac_oss.h
index 425fbff4f..56ef986c0 100644
--- a/kernel/arch/m68k/include/asm/mac_oss.h
+++ b/kernel/arch/m68k/include/asm/mac_oss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	OSS
  *
diff --git a/kernel/arch/m68k/include/asm/mac_psc.h b/kernel/arch/m68k/include/asm/mac_psc.h
index 923305117..86a5a5eab 100644
--- a/kernel/arch/m68k/include/asm/mac_psc.h
+++ b/kernel/arch/m68k/include/asm/mac_psc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Apple Peripheral System Controller (PSC)
  *
diff --git a/kernel/arch/m68k/include/asm/mac_via.h b/kernel/arch/m68k/include/asm/mac_via.h
index 53c632c85..de1470c4d 100644
--- a/kernel/arch/m68k/include/asm/mac_via.h
+++ b/kernel/arch/m68k/include/asm/mac_via.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	6522 Versatile Interface Adapter (VIA)
  *
diff --git a/kernel/arch/m68k/include/asm/machdep.h b/kernel/arch/m68k/include/asm/machdep.h
index 953ca21da..1605da48e 100644
--- a/kernel/arch/m68k/include/asm/machdep.h
+++ b/kernel/arch/m68k/include/asm/machdep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_MACHDEP_H
 #define _M68K_MACHDEP_H
 
diff --git a/kernel/arch/m68k/include/asm/machines.h b/kernel/arch/m68k/include/asm/machines.h
index be667e84f..1332bad00 100644
--- a/kernel/arch/m68k/include/asm/machines.h
+++ b/kernel/arch/m68k/include/asm/machines.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * machines.h:  Defines for taking apart the machine type value in the
  *              idprom and determining the kind of machine we are on.
diff --git a/kernel/arch/m68k/include/asm/macintosh.h b/kernel/arch/m68k/include/asm/macintosh.h
index 5b81ab188..f42c27400 100644
--- a/kernel/arch/m68k/include/asm/macintosh.h
+++ b/kernel/arch/m68k/include/asm/macintosh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACINTOSH_H
 #define __ASM_MACINTOSH_H
 
diff --git a/kernel/arch/m68k/include/asm/math-emu.h b/kernel/arch/m68k/include/asm/math-emu.h
index b062696d5..eefaa3a2b 100644
--- a/kernel/arch/m68k/include/asm/math-emu.h
+++ b/kernel/arch/m68k/include/asm/math-emu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_SETUP_H
 #define _ASM_M68K_SETUP_H
 
diff --git a/kernel/arch/m68k/include/asm/mc146818rtc.h b/kernel/arch/m68k/include/asm/mc146818rtc.h
index 05b43bf5c..6e9f319ce 100644
--- a/kernel/arch/m68k/include/asm/mc146818rtc.h
+++ b/kernel/arch/m68k/include/asm/mc146818rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/m68k/include/asm/mcf8390.h b/kernel/arch/m68k/include/asm/mcf8390.h
index a72a20819..412360ef1 100644
--- a/kernel/arch/m68k/include/asm/mcf8390.h
+++ b/kernel/arch/m68k/include/asm/mcf8390.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcf_pgalloc.h b/kernel/arch/m68k/include/asm/mcf_pgalloc.h
index fb95aed5f..8b707c249 100644
--- a/kernel/arch/m68k/include/asm/mcf_pgalloc.h
+++ b/kernel/arch/m68k/include/asm/mcf_pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef M68K_MCF_PGALLOC_H
 #define M68K_MCF_PGALLOC_H
 
diff --git a/kernel/arch/m68k/include/asm/mcf_pgtable.h b/kernel/arch/m68k/include/asm/mcf_pgtable.h
index 2500ce04f..5d5502cb2 100644
--- a/kernel/arch/m68k/include/asm/mcf_pgtable.h
+++ b/kernel/arch/m68k/include/asm/mcf_pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MCF_PGTABLE_H
 #define _MCF_PGTABLE_H
 
diff --git a/kernel/arch/m68k/include/asm/mcfclk.h b/kernel/arch/m68k/include/asm/mcfclk.h
index ea4791e3a..0aca504fa 100644
--- a/kernel/arch/m68k/include/asm/mcfclk.h
+++ b/kernel/arch/m68k/include/asm/mcfclk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mcfclk.h -- coldfire specific clock structure
  */
diff --git a/kernel/arch/m68k/include/asm/mcfdma.h b/kernel/arch/m68k/include/asm/mcfdma.h
index 10bc7e391..6227317dd 100644
--- a/kernel/arch/m68k/include/asm/mcfdma.h
+++ b/kernel/arch/m68k/include/asm/mcfdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcfintc.h b/kernel/arch/m68k/include/asm/mcfintc.h
index 4183320a3..8bcfa33ef 100644
--- a/kernel/arch/m68k/include/asm/mcfintc.h
+++ b/kernel/arch/m68k/include/asm/mcfintc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcfpit.h b/kernel/arch/m68k/include/asm/mcfpit.h
index 9fd321ca0..20c81e07d 100644
--- a/kernel/arch/m68k/include/asm/mcfpit.h
+++ b/kernel/arch/m68k/include/asm/mcfpit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcfsim.h b/kernel/arch/m68k/include/asm/mcfsim.h
index bc867de8a..bef089510 100644
--- a/kernel/arch/m68k/include/asm/mcfsim.h
+++ b/kernel/arch/m68k/include/asm/mcfsim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcfslt.h b/kernel/arch/m68k/include/asm/mcfslt.h
index c2314b6f8..a539f0ecc 100644
--- a/kernel/arch/m68k/include/asm/mcfslt.h
+++ b/kernel/arch/m68k/include/asm/mcfslt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcftimer.h b/kernel/arch/m68k/include/asm/mcftimer.h
index 1150e42c3..4fe83db64 100644
--- a/kernel/arch/m68k/include/asm/mcftimer.h
+++ b/kernel/arch/m68k/include/asm/mcftimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcfuart.h b/kernel/arch/m68k/include/asm/mcfuart.h
index b40c20f66..a1f35352f 100644
--- a/kernel/arch/m68k/include/asm/mcfuart.h
+++ b/kernel/arch/m68k/include/asm/mcfuart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mcfwdebug.h b/kernel/arch/m68k/include/asm/mcfwdebug.h
index 27f70e45d..bbe06cf03 100644
--- a/kernel/arch/m68k/include/asm/mcfwdebug.h
+++ b/kernel/arch/m68k/include/asm/mcfwdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/mmu.h b/kernel/arch/m68k/include/asm/mmu.h
index 8a11a63ee..5c15aacb1 100644
--- a/kernel/arch/m68k/include/asm/mmu.h
+++ b/kernel/arch/m68k/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/m68k/include/asm/mmu_context.h b/kernel/arch/m68k/include/asm/mmu_context.h
index 4a6ae6dff..836acea8f 100644
--- a/kernel/arch/m68k/include/asm/mmu_context.h
+++ b/kernel/arch/m68k/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M68K_MMU_CONTEXT_H
 #define __M68K_MMU_CONTEXT_H
 
diff --git a/kernel/arch/m68k/include/asm/mmzone.h b/kernel/arch/m68k/include/asm/mmzone.h
index e1f1ec7b7..64573fe8e 100644
--- a/kernel/arch/m68k/include/asm/mmzone.h
+++ b/kernel/arch/m68k/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_MMZONE_H_
 #define _ASM_M68K_MMZONE_H_
 
diff --git a/kernel/arch/m68k/include/asm/module.h b/kernel/arch/m68k/include/asm/module.h
index 8b58fce84..36cb06cc0 100644
--- a/kernel/arch/m68k/include/asm/module.h
+++ b/kernel/arch/m68k/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_MODULE_H
 #define _ASM_M68K_MODULE_H
 
diff --git a/kernel/arch/m68k/include/asm/motorola_pgalloc.h b/kernel/arch/m68k/include/asm/motorola_pgalloc.h
index c895b9872..7859a8631 100644
--- a/kernel/arch/m68k/include/asm/motorola_pgalloc.h
+++ b/kernel/arch/m68k/include/asm/motorola_pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MOTOROLA_PGALLOC_H
 #define _MOTOROLA_PGALLOC_H
 
diff --git a/kernel/arch/m68k/include/asm/motorola_pgtable.h b/kernel/arch/m68k/include/asm/motorola_pgtable.h
index 0085aab80..7f66a7bad 100644
--- a/kernel/arch/m68k/include/asm/motorola_pgtable.h
+++ b/kernel/arch/m68k/include/asm/motorola_pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MOTOROLA_PGTABLE_H
 #define _MOTOROLA_PGTABLE_H
 
diff --git a/kernel/arch/m68k/include/asm/movs.h b/kernel/arch/m68k/include/asm/movs.h
index 67dbea369..390d7b47b 100644
--- a/kernel/arch/m68k/include/asm/movs.h
+++ b/kernel/arch/m68k/include/asm/movs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef  __MOVS_H__
 #define __MOVS_H__
 
diff --git a/kernel/arch/m68k/include/asm/mvme147hw.h b/kernel/arch/m68k/include/asm/mvme147hw.h
index b81043108..9c7ff67c5 100644
--- a/kernel/arch/m68k/include/asm/mvme147hw.h
+++ b/kernel/arch/m68k/include/asm/mvme147hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MVME147HW_H_
 #define _MVME147HW_H_
 
diff --git a/kernel/arch/m68k/include/asm/mvme16xhw.h b/kernel/arch/m68k/include/asm/mvme16xhw.h
index 1eb89de63..cc7f5ae12 100644
--- a/kernel/arch/m68k/include/asm/mvme16xhw.h
+++ b/kernel/arch/m68k/include/asm/mvme16xhw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_MVME16xHW_H_
 #define _M68K_MVME16xHW_H_
 
diff --git a/kernel/arch/m68k/include/asm/nettel.h b/kernel/arch/m68k/include/asm/nettel.h
index 926375d53..45716ead7 100644
--- a/kernel/arch/m68k/include/asm/nettel.h
+++ b/kernel/arch/m68k/include/asm/nettel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/arch/m68k/include/asm/nubus.h b/kernel/arch/m68k/include/asm/nubus.h
index d6be9976f..d0d2039e4 100644
--- a/kernel/arch/m68k/include/asm/nubus.h
+++ b/kernel/arch/m68k/include/asm/nubus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_NUBUS_H
 #define _ASM_M68K_NUBUS_H
 
diff --git a/kernel/arch/m68k/include/asm/openprom.h b/kernel/arch/m68k/include/asm/openprom.h
index d33cdadf7..dd22e649f 100644
--- a/kernel/arch/m68k/include/asm/openprom.h
+++ b/kernel/arch/m68k/include/asm/openprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_OPENPROM_H
 #define __SPARC_OPENPROM_H
 
diff --git a/kernel/arch/m68k/include/asm/oplib.h b/kernel/arch/m68k/include/asm/oplib.h
index f082d0333..48cb4fd09 100644
--- a/kernel/arch/m68k/include/asm/oplib.h
+++ b/kernel/arch/m68k/include/asm/oplib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * oplib.h:  Describes the interface and available routines in the
  *           Linux Prom library.
diff --git a/kernel/arch/m68k/include/asm/page.h b/kernel/arch/m68k/include/asm/page.h
index d8a02c7e7..700d81958 100644
--- a/kernel/arch/m68k/include/asm/page.h
+++ b/kernel/arch/m68k/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_PAGE_H
 #define _M68K_PAGE_H
 
diff --git a/kernel/arch/m68k/include/asm/page_mm.h b/kernel/arch/m68k/include/asm/page_mm.h
index e7a194645..e6b759921 100644
--- a/kernel/arch/m68k/include/asm/page_mm.h
+++ b/kernel/arch/m68k/include/asm/page_mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_PAGE_MM_H
 #define _M68K_PAGE_MM_H
 
diff --git a/kernel/arch/m68k/include/asm/page_no.h b/kernel/arch/m68k/include/asm/page_no.h
index fa7f32d98..e644c4daf 100644
--- a/kernel/arch/m68k/include/asm/page_no.h
+++ b/kernel/arch/m68k/include/asm/page_no.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_PAGE_NO_H
 #define _M68K_PAGE_NO_H
 
diff --git a/kernel/arch/m68k/include/asm/page_offset.h b/kernel/arch/m68k/include/asm/page_offset.h
index 82626a8f1..11dc3cb8c 100644
--- a/kernel/arch/m68k/include/asm/page_offset.h
+++ b/kernel/arch/m68k/include/asm/page_offset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* This handles the memory map.. */
 
 #if defined(CONFIG_RAMBASE)
diff --git a/kernel/arch/m68k/include/asm/parport.h b/kernel/arch/m68k/include/asm/parport.h
index c85cece77..becfebd5c 100644
--- a/kernel/arch/m68k/include/asm/parport.h
+++ b/kernel/arch/m68k/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * parport.h: platform-specific PC-style parport initialisation
  *
diff --git a/kernel/arch/m68k/include/asm/pci.h b/kernel/arch/m68k/include/asm/pci.h
index 3a3dbcf40..ef26fae8c 100644
--- a/kernel/arch/m68k/include/asm/pci.h
+++ b/kernel/arch/m68k/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_PCI_H
 #define _ASM_M68K_PCI_H
 
diff --git a/kernel/arch/m68k/include/asm/pgalloc.h b/kernel/arch/m68k/include/asm/pgalloc.h
index 37bee7e32..24ca46d2e 100644
--- a/kernel/arch/m68k/include/asm/pgalloc.h
+++ b/kernel/arch/m68k/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef M68K_PGALLOC_H
 #define M68K_PGALLOC_H
 
diff --git a/kernel/arch/m68k/include/asm/pgtable.h b/kernel/arch/m68k/include/asm/pgtable.h
index a3d733b52..ad15d655a 100644
--- a/kernel/arch/m68k/include/asm/pgtable.h
+++ b/kernel/arch/m68k/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __uClinux__
 #include <asm/pgtable_no.h>
 #else
diff --git a/kernel/arch/m68k/include/asm/pgtable_mm.h b/kernel/arch/m68k/include/asm/pgtable_mm.h
index 35ed4a998..6181e4134 100644
--- a/kernel/arch/m68k/include/asm/pgtable_mm.h
+++ b/kernel/arch/m68k/include/asm/pgtable_mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_PGTABLE_H
 #define _M68K_PGTABLE_H
 
diff --git a/kernel/arch/m68k/include/asm/pgtable_no.h b/kernel/arch/m68k/include/asm/pgtable_no.h
index ac7d87a02..fc3a96c77 100644
--- a/kernel/arch/m68k/include/asm/pgtable_no.h
+++ b/kernel/arch/m68k/include/asm/pgtable_no.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68KNOMMU_PGTABLE_H
 #define _M68KNOMMU_PGTABLE_H
 
diff --git a/kernel/arch/m68k/include/asm/processor.h b/kernel/arch/m68k/include/asm/processor.h
index 94c360304..464e9f5f5 100644
--- a/kernel/arch/m68k/include/asm/processor.h
+++ b/kernel/arch/m68k/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-m68k/processor.h
  *
diff --git a/kernel/arch/m68k/include/asm/ptrace.h b/kernel/arch/m68k/include/asm/ptrace.h
index a45cb6894..ea5a80ca1 100644
--- a/kernel/arch/m68k/include/asm/ptrace.h
+++ b/kernel/arch/m68k/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_PTRACE_H
 #define _M68K_PTRACE_H
 
diff --git a/kernel/arch/m68k/include/asm/q40_master.h b/kernel/arch/m68k/include/asm/q40_master.h
index c48d21b68..3a89c0888 100644
--- a/kernel/arch/m68k/include/asm/q40_master.h
+++ b/kernel/arch/m68k/include/asm/q40_master.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Q40 master Chip Control
  * RTC stuff merged for compactness.
diff --git a/kernel/arch/m68k/include/asm/q40ints.h b/kernel/arch/m68k/include/asm/q40ints.h
index 22f12c9eb..7c93ac411 100644
--- a/kernel/arch/m68k/include/asm/q40ints.h
+++ b/kernel/arch/m68k/include/asm/q40ints.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * contains some Q40 related interrupt definitions
  */
diff --git a/kernel/arch/m68k/include/asm/quicc_simple.h b/kernel/arch/m68k/include/asm/quicc_simple.h
index c3636932d..b9e2808b4 100644
--- a/kernel/arch/m68k/include/asm/quicc_simple.h
+++ b/kernel/arch/m68k/include/asm/quicc_simple.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /***********************************
  * $Id: quicc_simple.h,v 1.1 2002/03/02 15:01:10 gerg Exp $
  ***********************************
diff --git a/kernel/arch/m68k/include/asm/raw_io.h b/kernel/arch/m68k/include/asm/raw_io.h
index 932faa356..05e940c29 100644
--- a/kernel/arch/m68k/include/asm/raw_io.h
+++ b/kernel/arch/m68k/include/asm/raw_io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-m68k/raw_io.h
  *
diff --git a/kernel/arch/m68k/include/asm/segment.h b/kernel/arch/m68k/include/asm/segment.h
index 98216b811..0b4cc1e07 100644
--- a/kernel/arch/m68k/include/asm/segment.h
+++ b/kernel/arch/m68k/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_SEGMENT_H
 #define _M68K_SEGMENT_H
 
diff --git a/kernel/arch/m68k/include/asm/serial.h b/kernel/arch/m68k/include/asm/serial.h
index 6d4497049..3f76bc7b9 100644
--- a/kernel/arch/m68k/include/asm/serial.h
+++ b/kernel/arch/m68k/include/asm/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-m68k/serial.h
  *
diff --git a/kernel/arch/m68k/include/asm/signal.h b/kernel/arch/m68k/include/asm/signal.h
index 3bc64d02b..8af85c38d 100644
--- a/kernel/arch/m68k/include/asm/signal.h
+++ b/kernel/arch/m68k/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_SIGNAL_H
 #define _M68K_SIGNAL_H
 
diff --git a/kernel/arch/m68k/include/asm/string.h b/kernel/arch/m68k/include/asm/string.h
index c30c03d98..f759d944c 100644
--- a/kernel/arch/m68k/include/asm/string.h
+++ b/kernel/arch/m68k/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_STRING_H_
 #define _M68K_STRING_H_
 
diff --git a/kernel/arch/m68k/include/asm/sun3-head.h b/kernel/arch/m68k/include/asm/sun3-head.h
index 05af2f18b..5656a265e 100644
--- a/kernel/arch/m68k/include/asm/sun3-head.h
+++ b/kernel/arch/m68k/include/asm/sun3-head.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUN3_HEAD_H
 #define __SUN3_HEAD_H
 
diff --git a/kernel/arch/m68k/include/asm/sun3_pgalloc.h b/kernel/arch/m68k/include/asm/sun3_pgalloc.h
index 1901f61f9..11485d38d 100644
--- a/kernel/arch/m68k/include/asm/sun3_pgalloc.h
+++ b/kernel/arch/m68k/include/asm/sun3_pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sun3_pgalloc.h --
  * reorganization around 2.3.39, routines moved from sun3_pgtable.h
  *
diff --git a/kernel/arch/m68k/include/asm/sun3_pgtable.h b/kernel/arch/m68k/include/asm/sun3_pgtable.h
index d5104a7b5..c987d5086 100644
--- a/kernel/arch/m68k/include/asm/sun3_pgtable.h
+++ b/kernel/arch/m68k/include/asm/sun3_pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SUN3_PGTABLE_H
 #define _SUN3_PGTABLE_H
 
diff --git a/kernel/arch/m68k/include/asm/sun3mmu.h b/kernel/arch/m68k/include/asm/sun3mmu.h
index d8f17a0d8..21a75daa2 100644
--- a/kernel/arch/m68k/include/asm/sun3mmu.h
+++ b/kernel/arch/m68k/include/asm/sun3mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for Sun3 custom MMU.
  */
diff --git a/kernel/arch/m68k/include/asm/sun3x.h b/kernel/arch/m68k/include/asm/sun3x.h
index f5691a1ed..b3a83bcaf 100644
--- a/kernel/arch/m68k/include/asm/sun3x.h
+++ b/kernel/arch/m68k/include/asm/sun3x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SUN3X_H
 #define SUN3X_H
 
diff --git a/kernel/arch/m68k/include/asm/sun3xflop.h b/kernel/arch/m68k/include/asm/sun3xflop.h
index 159269b7f..ef04c43ac 100644
--- a/kernel/arch/m68k/include/asm/sun3xflop.h
+++ b/kernel/arch/m68k/include/asm/sun3xflop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sun3xflop.h: Sun3/80 specific parts of the floppy driver.
  *
  * Derived partially from asm-sparc/floppy.h, which is:
diff --git a/kernel/arch/m68k/include/asm/sun3xprom.h b/kernel/arch/m68k/include/asm/sun3xprom.h
index 6735efcf5..d244ca4a9 100644
--- a/kernel/arch/m68k/include/asm/sun3xprom.h
+++ b/kernel/arch/m68k/include/asm/sun3xprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Useful PROM locations */
 
 #ifndef SUN3X_PROM_H
diff --git a/kernel/arch/m68k/include/asm/switch_to.h b/kernel/arch/m68k/include/asm/switch_to.h
index 16fd6b634..94f02f46c 100644
--- a/kernel/arch/m68k/include/asm/switch_to.h
+++ b/kernel/arch/m68k/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_SWITCH_TO_H
 #define _M68K_SWITCH_TO_H
 
diff --git a/kernel/arch/m68k/include/asm/thread_info.h b/kernel/arch/m68k/include/asm/thread_info.h
index cee13c2e5..928035591 100644
--- a/kernel/arch/m68k/include/asm/thread_info.h
+++ b/kernel/arch/m68k/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_THREAD_INFO_H
 #define _ASM_M68K_THREAD_INFO_H
 
diff --git a/kernel/arch/m68k/include/asm/timex.h b/kernel/arch/m68k/include/asm/timex.h
index efc1f4892..6a21d9358 100644
--- a/kernel/arch/m68k/include/asm/timex.h
+++ b/kernel/arch/m68k/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-m68k/timex.h
  *
diff --git a/kernel/arch/m68k/include/asm/tlb.h b/kernel/arch/m68k/include/asm/tlb.h
index 1785cff73..b4b9efb6f 100644
--- a/kernel/arch/m68k/include/asm/tlb.h
+++ b/kernel/arch/m68k/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_TLB_H
 #define _M68K_TLB_H
 
diff --git a/kernel/arch/m68k/include/asm/tlbflush.h b/kernel/arch/m68k/include/asm/tlbflush.h
index 965ea35c9..191e75a6b 100644
--- a/kernel/arch/m68k/include/asm/tlbflush.h
+++ b/kernel/arch/m68k/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_TLBFLUSH_H
 #define _M68K_TLBFLUSH_H
 
diff --git a/kernel/arch/m68k/include/asm/uaccess.h b/kernel/arch/m68k/include/asm/uaccess.h
index 63ba18e4c..e896466a4 100644
--- a/kernel/arch/m68k/include/asm/uaccess.h
+++ b/kernel/arch/m68k/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __uClinux__
 #include <asm/uaccess_no.h>
 #else
diff --git a/kernel/arch/m68k/include/asm/uaccess_mm.h b/kernel/arch/m68k/include/asm/uaccess_mm.h
index 1da1e23de..75c172e90 100644
--- a/kernel/arch/m68k/include/asm/uaccess_mm.h
+++ b/kernel/arch/m68k/include/asm/uaccess_mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M68K_UACCESS_H
 #define __M68K_UACCESS_H
 
diff --git a/kernel/arch/m68k/include/asm/uaccess_no.h b/kernel/arch/m68k/include/asm/uaccess_no.h
index 53d7b792a..892efb56b 100644
--- a/kernel/arch/m68k/include/asm/uaccess_no.h
+++ b/kernel/arch/m68k/include/asm/uaccess_no.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __M68KNOMMU_UACCESS_H
 #define __M68KNOMMU_UACCESS_H
 
diff --git a/kernel/arch/m68k/include/asm/ucontext.h b/kernel/arch/m68k/include/asm/ucontext.h
index e4e22669e..1523a8e5f 100644
--- a/kernel/arch/m68k/include/asm/ucontext.h
+++ b/kernel/arch/m68k/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_UCONTEXT_H
 #define _M68K_UCONTEXT_H
 
diff --git a/kernel/arch/m68k/include/asm/unaligned.h b/kernel/arch/m68k/include/asm/unaligned.h
index 2b3ca0bf7..98c8930d3 100644
--- a/kernel/arch/m68k/include/asm/unaligned.h
+++ b/kernel/arch/m68k/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_UNALIGNED_H
 #define _ASM_M68K_UNALIGNED_H
 
diff --git a/kernel/arch/m68k/include/asm/unistd.h b/kernel/arch/m68k/include/asm/unistd.h
index aab1edd0d..30d0d3fbd 100644
--- a/kernel/arch/m68k/include/asm/unistd.h
+++ b/kernel/arch/m68k/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_UNISTD_H_
 #define _ASM_M68K_UNISTD_H_
 
diff --git a/kernel/arch/m68k/include/asm/user.h b/kernel/arch/m68k/include/asm/user.h
index f1f478d6e..509d55597 100644
--- a/kernel/arch/m68k/include/asm/user.h
+++ b/kernel/arch/m68k/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _M68K_USER_H
 #define _M68K_USER_H
 
diff --git a/kernel/arch/m68k/include/asm/vga.h b/kernel/arch/m68k/include/asm/vga.h
index d3aa1401e..010a624d1 100644
--- a/kernel/arch/m68k/include/asm/vga.h
+++ b/kernel/arch/m68k/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_VGA_H
 #define _ASM_M68K_VGA_H
 
diff --git a/kernel/arch/m68k/include/asm/virtconvert.h b/kernel/arch/m68k/include/asm/virtconvert.h
index b8a82fb1c..4aea6be7b 100644
--- a/kernel/arch/m68k/include/asm/virtconvert.h
+++ b/kernel/arch/m68k/include/asm/virtconvert.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __VIRT_CONVERT__
 #define __VIRT_CONVERT__
 
diff --git a/kernel/arch/m68k/include/asm/zorro.h b/kernel/arch/m68k/include/asm/zorro.h
index 5ce97c22b..96f64bf7b 100644
--- a/kernel/arch/m68k/include/asm/zorro.h
+++ b/kernel/arch/m68k/include/asm/zorro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_M68K_ZORRO_H
 #define _ASM_M68K_ZORRO_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/a.out.h b/kernel/arch/m68k/include/uapi/asm/a.out.h
index 3885fe434..3eb24fd8b 100644
--- a/kernel/arch/m68k/include/uapi/asm/a.out.h
+++ b/kernel/arch/m68k/include/uapi/asm/a.out.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __M68K_A_OUT_H__
 #define __M68K_A_OUT_H__
 
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-amiga.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-amiga.h
index daad3c58d..69bf4dda3 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-amiga.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-amiga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-amiga.h -- Amiga-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-apollo.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-apollo.h
index a93e0af1c..c226f7957 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-apollo.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-apollo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-apollo.h -- Apollo-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-atari.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-atari.h
index a81785404..f2218a090 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-atari.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-atari.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-atari.h -- Atari-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-hp300.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-hp300.h
index c90cb71ed..2141c4f5f 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-hp300.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-hp300.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-hp300.h -- HP9000/300-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-mac.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-mac.h
index b44ff7389..449928cfc 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-mac.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-mac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-mac.h -- Macintosh-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-q40.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-q40.h
index c79fea7e5..78bda04bf 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-q40.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-q40.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-q40.h -- Q40-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo-vme.h b/kernel/arch/m68k/include/uapi/asm/bootinfo-vme.h
index a135eb41d..f36a09ab5 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo-vme.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo-vme.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/bootinfo-vme.h -- VME-specific boot information definitions
 */
diff --git a/kernel/arch/m68k/include/uapi/asm/bootinfo.h b/kernel/arch/m68k/include/uapi/asm/bootinfo.h
index a48cf544c..38d314038 100644
--- a/kernel/arch/m68k/include/uapi/asm/bootinfo.h
+++ b/kernel/arch/m68k/include/uapi/asm/bootinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * asm/bootinfo.h -- Definition of the Linux/m68k boot information structure
  *
diff --git a/kernel/arch/m68k/include/uapi/asm/byteorder.h b/kernel/arch/m68k/include/uapi/asm/byteorder.h
index 31b260a88..1fb5732f4 100644
--- a/kernel/arch/m68k/include/uapi/asm/byteorder.h
+++ b/kernel/arch/m68k/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _M68K_BYTEORDER_H
 #define _M68K_BYTEORDER_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/cachectl.h b/kernel/arch/m68k/include/uapi/asm/cachectl.h
index 525978e95..6171e246c 100644
--- a/kernel/arch/m68k/include/uapi/asm/cachectl.h
+++ b/kernel/arch/m68k/include/uapi/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _M68K_CACHECTL_H
 #define _M68K_CACHECTL_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/fcntl.h b/kernel/arch/m68k/include/uapi/asm/fcntl.h
index 1c369b20d..c6861e6ee 100644
--- a/kernel/arch/m68k/include/uapi/asm/fcntl.h
+++ b/kernel/arch/m68k/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _M68K_FCNTL_H
 #define _M68K_FCNTL_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/ioctls.h b/kernel/arch/m68k/include/uapi/asm/ioctls.h
index 1332bb4ca..d92d7c778 100644
--- a/kernel/arch/m68k/include/uapi/asm/ioctls.h
+++ b/kernel/arch/m68k/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_M68K_IOCTLS_H__
 #define __ARCH_M68K_IOCTLS_H__
 
diff --git a/kernel/arch/m68k/include/uapi/asm/param.h b/kernel/arch/m68k/include/uapi/asm/param.h
index 36265ccf5..726b2e7ec 100644
--- a/kernel/arch/m68k/include/uapi/asm/param.h
+++ b/kernel/arch/m68k/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _M68K_PARAM_H
 #define _M68K_PARAM_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/poll.h b/kernel/arch/m68k/include/uapi/asm/poll.h
index f080fcdb6..c3e3fcc15 100644
--- a/kernel/arch/m68k/include/uapi/asm/poll.h
+++ b/kernel/arch/m68k/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __m68k_POLL_H
 #define __m68k_POLL_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/posix_types.h b/kernel/arch/m68k/include/uapi/asm/posix_types.h
index cf4dbf70f..10a65149b 100644
--- a/kernel/arch/m68k/include/uapi/asm/posix_types.h
+++ b/kernel/arch/m68k/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_M68K_POSIX_TYPES_H
 #define __ARCH_M68K_POSIX_TYPES_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/ptrace.h b/kernel/arch/m68k/include/uapi/asm/ptrace.h
index caf92fd34..19a1b9d0d 100644
--- a/kernel/arch/m68k/include/uapi/asm/ptrace.h
+++ b/kernel/arch/m68k/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_M68K_PTRACE_H
 #define _UAPI_M68K_PTRACE_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/setup.h b/kernel/arch/m68k/include/uapi/asm/setup.h
index 6a6dc6367..25fe26d55 100644
--- a/kernel/arch/m68k/include/uapi/asm/setup.h
+++ b/kernel/arch/m68k/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
 ** asm/setup.h -- Definition of the Linux/m68k setup information
 **
diff --git a/kernel/arch/m68k/include/uapi/asm/sigcontext.h b/kernel/arch/m68k/include/uapi/asm/sigcontext.h
index 523db2a51..6cc8421c8 100644
--- a/kernel/arch/m68k/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/m68k/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_M68k_SIGCONTEXT_H
 #define _ASM_M68k_SIGCONTEXT_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/signal.h b/kernel/arch/m68k/include/uapi/asm/signal.h
index cba6f858b..915cc755a 100644
--- a/kernel/arch/m68k/include/uapi/asm/signal.h
+++ b/kernel/arch/m68k/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_M68K_SIGNAL_H
 #define _UAPI_M68K_SIGNAL_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/stat.h b/kernel/arch/m68k/include/uapi/asm/stat.h
index dd38bc2e9..1e15e6517 100644
--- a/kernel/arch/m68k/include/uapi/asm/stat.h
+++ b/kernel/arch/m68k/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _M68K_STAT_H
 #define _M68K_STAT_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/swab.h b/kernel/arch/m68k/include/uapi/asm/swab.h
index b7b37a40d..9ef4fafba 100644
--- a/kernel/arch/m68k/include/uapi/asm/swab.h
+++ b/kernel/arch/m68k/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _M68K_SWAB_H
 #define _M68K_SWAB_H
 
diff --git a/kernel/arch/m68k/include/uapi/asm/unistd.h b/kernel/arch/m68k/include/uapi/asm/unistd.h
index 25589f5b8..de3054f8a 100644
--- a/kernel/arch/m68k/include/uapi/asm/unistd.h
+++ b/kernel/arch/m68k/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_M68K_UNISTD_H_
 #define _UAPI_ASM_M68K_UNISTD_H_
 
diff --git a/kernel/arch/m68k/kernel/Makefile b/kernel/arch/m68k/kernel/Makefile
index 74c898ced..dbac7f874 100644
--- a/kernel/arch/m68k/kernel/Makefile
+++ b/kernel/arch/m68k/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/m68k/kernel/asm-offsets.c b/kernel/arch/m68k/kernel/asm-offsets.c
index 3a386341a..ccea35505 100644
--- a/kernel/arch/m68k/kernel/asm-offsets.c
+++ b/kernel/arch/m68k/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This program is used to generate definitions needed by
  * assembly language modules.
diff --git a/kernel/arch/m68k/kernel/bootinfo_proc.c b/kernel/arch/m68k/kernel/bootinfo_proc.c
index 2a33a9645..3b9cab849 100644
--- a/kernel/arch/m68k/kernel/bootinfo_proc.c
+++ b/kernel/arch/m68k/kernel/bootinfo_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Based on arch/arm/kernel/atags_proc.c
  */
diff --git a/kernel/arch/m68k/kernel/machine_kexec.c b/kernel/arch/m68k/kernel/machine_kexec.c
index d4affc917..206f84983 100644
--- a/kernel/arch/m68k/kernel/machine_kexec.c
+++ b/kernel/arch/m68k/kernel/machine_kexec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * machine_kexec.c - handle transition of Linux booting another kernel
  */
diff --git a/kernel/arch/m68k/kernel/process.c b/kernel/arch/m68k/kernel/process.c
index 7df92f8b0..4e77a0673 100644
--- a/kernel/arch/m68k/kernel/process.c
+++ b/kernel/arch/m68k/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/kernel/process.c
  *
diff --git a/kernel/arch/m68k/kernel/relocate_kernel.S b/kernel/arch/m68k/kernel/relocate_kernel.S
index 3e09a8906..ab0f1e7d4 100644
--- a/kernel/arch/m68k/kernel/relocate_kernel.S
+++ b/kernel/arch/m68k/kernel/relocate_kernel.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 #include <asm/asm-offsets.h>
diff --git a/kernel/arch/m68k/kernel/setup.c b/kernel/arch/m68k/kernel/setup.c
index 4bf129f1d..854e09f40 100644
--- a/kernel/arch/m68k/kernel/setup.c
+++ b/kernel/arch/m68k/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifdef CONFIG_MMU
 #include "setup_mm.c"
 #else
diff --git a/kernel/arch/m68k/kernel/setup_mm.c b/kernel/arch/m68k/kernel/setup_mm.c
index 7a2c21212..657a9843e 100644
--- a/kernel/arch/m68k/kernel/setup_mm.c
+++ b/kernel/arch/m68k/kernel/setup_mm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/kernel/setup.c
  *
diff --git a/kernel/arch/m68k/kernel/setup_no.c b/kernel/arch/m68k/kernel/setup_no.c
index 8afe6f651..a98af1018 100644
--- a/kernel/arch/m68k/kernel/setup_no.c
+++ b/kernel/arch/m68k/kernel/setup_no.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68knommu/kernel/setup.c
  *
diff --git a/kernel/arch/m68k/kernel/sun3-head.S b/kernel/arch/m68k/kernel/sun3-head.S
index 43036bf4a..faf18f4fa 100644
--- a/kernel/arch/m68k/kernel/sun3-head.S
+++ b/kernel/arch/m68k/kernel/sun3-head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <linux/init.h>
 
diff --git a/kernel/arch/m68k/kernel/sys_m68k.c b/kernel/arch/m68k/kernel/sys_m68k.c
index 933e4815d..27e10af51 100644
--- a/kernel/arch/m68k/kernel/sys_m68k.c
+++ b/kernel/arch/m68k/kernel/sys_m68k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m68k/kernel/sys_m68k.c
  *
diff --git a/kernel/arch/m68k/kernel/syscalltable.S b/kernel/arch/m68k/kernel/syscalltable.S
index 8c9fcfafe..2c8402e75 100644
--- a/kernel/arch/m68k/kernel/syscalltable.S
+++ b/kernel/arch/m68k/kernel/syscalltable.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
  *
diff --git a/kernel/arch/m68k/kernel/vmlinux-nommu.lds b/kernel/arch/m68k/kernel/vmlinux-nommu.lds
index d2c8abf1c..3aa571a51 100644
--- a/kernel/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/kernel/arch/m68k/kernel/vmlinux-nommu.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	vmlinux.lds.S -- master linker script for m68knommu arch
  *
diff --git a/kernel/arch/m68k/kernel/vmlinux-std.lds b/kernel/arch/m68k/kernel/vmlinux-std.lds
index 5b5ce1e4d..89172b897 100644
--- a/kernel/arch/m68k/kernel/vmlinux-std.lds
+++ b/kernel/arch/m68k/kernel/vmlinux-std.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make m68k Linux kernel */
 
 #include <asm-generic/vmlinux.lds.h>
diff --git a/kernel/arch/m68k/kernel/vmlinux-sun3.lds b/kernel/arch/m68k/kernel/vmlinux-sun3.lds
index fe5ea1974..293990efc 100644
--- a/kernel/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/kernel/arch/m68k/kernel/vmlinux-sun3.lds
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make m68k Linux kernel */
 
 #include <asm-generic/vmlinux.lds.h>
diff --git a/kernel/arch/m68k/kernel/vmlinux.lds.S b/kernel/arch/m68k/kernel/vmlinux.lds.S
index 69ec79638..d3d3c305e 100644
--- a/kernel/arch/m68k/kernel/vmlinux.lds.S
+++ b/kernel/arch/m68k/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
 PHDRS
 {
diff --git a/kernel/arch/m68k/lib/Makefile b/kernel/arch/m68k/lib/Makefile
index fcd8eb1d7..eca17f14b 100644
--- a/kernel/arch/m68k/lib/Makefile
+++ b/kernel/arch/m68k/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 #
 # Makefile for m68k-specific library files..
diff --git a/kernel/arch/m68k/mac/baboon.c b/kernel/arch/m68k/mac/baboon.c
index 514acde3c..850f0dc28 100644
--- a/kernel/arch/m68k/mac/baboon.c
+++ b/kernel/arch/m68k/mac/baboon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Baboon Custom IC Management
  *
diff --git a/kernel/arch/m68k/mac/mac_penguin.S b/kernel/arch/m68k/mac/mac_penguin.S
index b3ce30b60..359e63bb6 100644
--- a/kernel/arch/m68k/mac/mac_penguin.S
+++ b/kernel/arch/m68k/mac/mac_penguin.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 .byte \
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0xFF,0xFF,0xFF,0xFF,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
diff --git a/kernel/arch/m68k/mac/macboing.c b/kernel/arch/m68k/mac/macboing.c
index ffaa1f643..fa2b9604f 100644
--- a/kernel/arch/m68k/mac/macboing.c
+++ b/kernel/arch/m68k/mac/macboing.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Mac bong noise generator. Note - we ought to put a boingy noise
  *	here 8)
diff --git a/kernel/arch/m68k/mac/macints.c b/kernel/arch/m68k/mac/macints.c
index 9637dee90..e3575388c 100644
--- a/kernel/arch/m68k/mac/macints.c
+++ b/kernel/arch/m68k/mac/macints.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Macintosh interrupts
  *
diff --git a/kernel/arch/m68k/mac/misc.c b/kernel/arch/m68k/mac/misc.c
index d96348a52..4956edaac 100644
--- a/kernel/arch/m68k/mac/misc.c
+++ b/kernel/arch/m68k/mac/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Miscellaneous Mac68K-specific stuff
  */
diff --git a/kernel/arch/m68k/mac/oss.c b/kernel/arch/m68k/mac/oss.c
index ca84dcf41..34c0993dc 100644
--- a/kernel/arch/m68k/mac/oss.c
+++ b/kernel/arch/m68k/mac/oss.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Operating System Services (OSS) chip handling
  *	Written by Joshua M. Thompson (funaho@jurai.org)
diff --git a/kernel/arch/m68k/mac/via.c b/kernel/arch/m68k/mac/via.c
index 16629e91f..9f59a662a 100644
--- a/kernel/arch/m68k/mac/via.c
+++ b/kernel/arch/m68k/mac/via.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	6522 Versatile Interface Adapter (VIA)
  *
diff --git a/kernel/arch/m68k/mm/Makefile b/kernel/arch/m68k/mm/Makefile
index cfbf32057..b3adb5253 100644
--- a/kernel/arch/m68k/mm/Makefile
+++ b/kernel/arch/m68k/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux m68k-specific parts of the memory manager.
 #
diff --git a/kernel/arch/m68k/mm/cache.c b/kernel/arch/m68k/mm/cache.c
index 3d84c1f2f..079e64898 100644
--- a/kernel/arch/m68k/mm/cache.c
+++ b/kernel/arch/m68k/mm/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/mm/cache.c
  *
diff --git a/kernel/arch/m68k/mm/fault.c b/kernel/arch/m68k/mm/fault.c
index 2795e4ca0..127d7c1f2 100644
--- a/kernel/arch/m68k/mm/fault.c
+++ b/kernel/arch/m68k/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/mm/fault.c
  *
diff --git a/kernel/arch/m68k/mm/hwtest.c b/kernel/arch/m68k/mm/hwtest.c
index fb8be4dd3..fe99aa999 100644
--- a/kernel/arch/m68k/mm/hwtest.c
+++ b/kernel/arch/m68k/mm/hwtest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Tests for presence or absence of hardware registers.
  * This code was originally in atari/config.c, but I noticed
  * that it was also in drivers/nubus/nubus.c and I wanted to
diff --git a/kernel/arch/m68k/mm/init.c b/kernel/arch/m68k/mm/init.c
index a6ffead9b..e85acd131 100644
--- a/kernel/arch/m68k/mm/init.c
+++ b/kernel/arch/m68k/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/mm/init.c
  *
diff --git a/kernel/arch/m68k/mm/kmap.c b/kernel/arch/m68k/mm/kmap.c
index 6e4955bc5..c2a38321c 100644
--- a/kernel/arch/m68k/mm/kmap.c
+++ b/kernel/arch/m68k/mm/kmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/mm/kmap.c
  *
diff --git a/kernel/arch/m68k/mm/mcfmmu.c b/kernel/arch/m68k/mm/mcfmmu.c
index 87131cd3b..8d1408583 100644
--- a/kernel/arch/m68k/mm/mcfmmu.c
+++ b/kernel/arch/m68k/mm/mcfmmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Based upon linux/arch/m68k/mm/sun3mmu.c
  * Based upon linux/arch/ppc/mm/mmu_context.c
diff --git a/kernel/arch/m68k/mm/memory.c b/kernel/arch/m68k/mm/memory.c
index 4902b681a..b86a2e216 100644
--- a/kernel/arch/m68k/mm/memory.c
+++ b/kernel/arch/m68k/mm/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/mm/memory.c
  *
diff --git a/kernel/arch/m68k/mm/motorola.c b/kernel/arch/m68k/mm/motorola.c
index 7cb72dbc2..e490ecc78 100644
--- a/kernel/arch/m68k/mm/motorola.c
+++ b/kernel/arch/m68k/mm/motorola.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m68k/mm/motorola.c
  *
diff --git a/kernel/arch/m68k/mm/sun3mmu.c b/kernel/arch/m68k/mm/sun3mmu.c
index 177d776de..4a9979908 100644
--- a/kernel/arch/m68k/mm/sun3mmu.c
+++ b/kernel/arch/m68k/mm/sun3mmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m68k/mm/sun3mmu.c
  *
diff --git a/kernel/arch/m68k/mvme16x/rtc.c b/kernel/arch/m68k/mvme16x/rtc.c
index 7b24577a7..ccbaae112 100644
--- a/kernel/arch/m68k/mvme16x/rtc.c
+++ b/kernel/arch/m68k/mvme16x/rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Real Time Clock interface for Linux on the MVME16x
  *
diff --git a/kernel/arch/m68k/sun3/dvma.c b/kernel/arch/m68k/sun3/dvma.c
index ca02ee258..5f92c72b0 100644
--- a/kernel/arch/m68k/sun3/dvma.c
+++ b/kernel/arch/m68k/sun3/dvma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m68k/sun3/dvma.c
  *
diff --git a/kernel/arch/m68k/sun3/idprom.c b/kernel/arch/m68k/sun3/idprom.c
index 9c23f506d..1ace5353d 100644
--- a/kernel/arch/m68k/sun3/idprom.c
+++ b/kernel/arch/m68k/sun3/idprom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * idprom.c: Routines to load the idprom into kernel addresses and
  *           interpret the data contained within.
diff --git a/kernel/arch/m68k/sun3/leds.c b/kernel/arch/m68k/sun3/leds.c
index aad2e0a06..7c67b58eb 100644
--- a/kernel/arch/m68k/sun3/leds.c
+++ b/kernel/arch/m68k/sun3/leds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/contregs.h>
 #include <asm/sun3mmu.h>
 #include <asm/io.h>
diff --git a/kernel/arch/m68k/sun3/mmu_emu.c b/kernel/arch/m68k/sun3/mmu_emu.c
index 7fdc61525..d30da12a1 100644
--- a/kernel/arch/m68k/sun3/mmu_emu.c
+++ b/kernel/arch/m68k/sun3/mmu_emu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 ** Tablewalk MMU emulator
 **
diff --git a/kernel/arch/m68k/sun3/prom/console.c b/kernel/arch/m68k/sun3/prom/console.c
index e92364373..eb4f6c903 100644
--- a/kernel/arch/m68k/sun3/prom/console.c
+++ b/kernel/arch/m68k/sun3/prom/console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
diff --git a/kernel/arch/m68k/sun3/prom/init.c b/kernel/arch/m68k/sun3/prom/init.c
index eeba067d5..0c6d99df6 100644
--- a/kernel/arch/m68k/sun3/prom/init.c
+++ b/kernel/arch/m68k/sun3/prom/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
diff --git a/kernel/arch/m68k/sun3/prom/misc.c b/kernel/arch/m68k/sun3/prom/misc.c
index 3d60e1337..b8c95940d 100644
--- a/kernel/arch/m68k/sun3/prom/misc.c
+++ b/kernel/arch/m68k/sun3/prom/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
diff --git a/kernel/arch/m68k/sun3/prom/printf.c b/kernel/arch/m68k/sun3/prom/printf.c
index 5b82bea03..b6724cc66 100644
--- a/kernel/arch/m68k/sun3/prom/printf.c
+++ b/kernel/arch/m68k/sun3/prom/printf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * printf.c:  Internal prom library printf facility.
  *
diff --git a/kernel/arch/m68k/sun3/sun3dvma.c b/kernel/arch/m68k/sun3/sun3dvma.c
index d36bd15f9..8546922ad 100644
--- a/kernel/arch/m68k/sun3/sun3dvma.c
+++ b/kernel/arch/m68k/sun3/sun3dvma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m68k/sun3/sun3dvma.c
  *
diff --git a/kernel/arch/m68k/sun3x/config.c b/kernel/arch/m68k/sun3x/config.c
index 0532d64d1..33d3a1c6f 100644
--- a/kernel/arch/m68k/sun3x/config.c
+++ b/kernel/arch/m68k/sun3x/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Setup kernel for a Sun3x machine
  *
diff --git a/kernel/arch/m68k/sun3x/dvma.c b/kernel/arch/m68k/sun3x/dvma.c
index 9413c8724..b2acbc862 100644
--- a/kernel/arch/m68k/sun3x/dvma.c
+++ b/kernel/arch/m68k/sun3x/dvma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Virtual DMA allocation
  *
diff --git a/kernel/arch/m68k/sun3x/prom.c b/kernel/arch/m68k/sun3x/prom.c
index 5d60e65c1..be14c899a 100644
--- a/kernel/arch/m68k/sun3x/prom.c
+++ b/kernel/arch/m68k/sun3x/prom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Prom access routines for the sun3x */
 
 #include <linux/types.h>
diff --git a/kernel/arch/m68k/sun3x/time.c b/kernel/arch/m68k/sun3x/time.c
index 431d3c430..7a2c53d9f 100644
--- a/kernel/arch/m68k/sun3x/time.c
+++ b/kernel/arch/m68k/sun3x/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/m68k/sun3x/time.c
  *
diff --git a/kernel/arch/m68k/sun3x/time.h b/kernel/arch/m68k/sun3x/time.h
index a4f9126be..496f40641 100644
--- a/kernel/arch/m68k/sun3x/time.h
+++ b/kernel/arch/m68k/sun3x/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SUN3X_TIME_H
 #define SUN3X_TIME_H
 
diff --git a/kernel/arch/m68k/tools/amiga/Makefile b/kernel/arch/m68k/tools/amiga/Makefile
index 113436136..e6425b367 100644
--- a/kernel/arch/m68k/tools/amiga/Makefile
+++ b/kernel/arch/m68k/tools/amiga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 CC =		m68k-cbm-amigados-gcc
 CFLAGS =	-Wall -O2
diff --git a/kernel/arch/metag/Kconfig b/kernel/arch/metag/Kconfig
index 7d8b322e5..c7b62a339 100644
--- a/kernel/arch/metag/Kconfig
+++ b/kernel/arch/metag/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config METAG
 	def_bool y
 	select EMBEDDED
diff --git a/kernel/arch/metag/Kconfig.debug b/kernel/arch/metag/Kconfig.debug
index cb5c92860..ac4516c60 100644
--- a/kernel/arch/metag/Kconfig.debug
+++ b/kernel/arch/metag/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/metag/Kconfig.soc b/kernel/arch/metag/Kconfig.soc
index 50f979c2b..c521f0e00 100644
--- a/kernel/arch/metag/Kconfig.soc
+++ b/kernel/arch/metag/Kconfig.soc
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "SoC Type"
 	default META21_FPGA
diff --git a/kernel/arch/metag/boot/dts/Makefile b/kernel/arch/metag/boot/dts/Makefile
index 097c6da45..ad5dde558 100644
--- a/kernel/arch/metag/boot/dts/Makefile
+++ b/kernel/arch/metag/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-y	+= skeleton.dtb
 dtb-y	+= tz1090_generic.dtb
 
diff --git a/kernel/arch/metag/boot/dts/skeleton.dtsi b/kernel/arch/metag/boot/dts/skeleton.dtsi
index 78229eacc..43e2ffe73 100644
--- a/kernel/arch/metag/boot/dts/skeleton.dtsi
+++ b/kernel/arch/metag/boot/dts/skeleton.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Skeleton device tree; the bare minimum needed to boot; just include and
  * add a compatible value.  The bootloader will typically populate the memory
diff --git a/kernel/arch/metag/include/asm/atomic.h b/kernel/arch/metag/include/asm/atomic.h
index 8ff0a7086..97ae189c2 100644
--- a/kernel/arch/metag/include/asm/atomic.h
+++ b/kernel/arch/metag/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_ATOMIC_H
 #define __ASM_METAG_ATOMIC_H
 
diff --git a/kernel/arch/metag/include/asm/atomic_lnkget.h b/kernel/arch/metag/include/asm/atomic_lnkget.h
index def2c642f..17e8c61c9 100644
--- a/kernel/arch/metag/include/asm/atomic_lnkget.h
+++ b/kernel/arch/metag/include/asm/atomic_lnkget.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_ATOMIC_LNKGET_H
 #define __ASM_METAG_ATOMIC_LNKGET_H
 
diff --git a/kernel/arch/metag/include/asm/atomic_lock1.h b/kernel/arch/metag/include/asm/atomic_lock1.h
index eee779f26..2ce8fa3a7 100644
--- a/kernel/arch/metag/include/asm/atomic_lock1.h
+++ b/kernel/arch/metag/include/asm/atomic_lock1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_ATOMIC_LOCK1_H
 #define __ASM_METAG_ATOMIC_LOCK1_H
 
diff --git a/kernel/arch/metag/include/asm/barrier.h b/kernel/arch/metag/include/asm/barrier.h
index 5418517aa..2661fec56 100644
--- a/kernel/arch/metag/include/asm/barrier.h
+++ b/kernel/arch/metag/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_BARRIER_H
 #define _ASM_METAG_BARRIER_H
 
diff --git a/kernel/arch/metag/include/asm/bitops.h b/kernel/arch/metag/include/asm/bitops.h
index 2671134ee..766ad4301 100644
--- a/kernel/arch/metag/include/asm/bitops.h
+++ b/kernel/arch/metag/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_BITOPS_H
 #define __ASM_METAG_BITOPS_H
 
diff --git a/kernel/arch/metag/include/asm/bug.h b/kernel/arch/metag/include/asm/bug.h
index 9f8967f10..ee07a943f 100644
--- a/kernel/arch/metag/include/asm/bug.h
+++ b/kernel/arch/metag/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_BUG_H
 #define _ASM_METAG_BUG_H
 
diff --git a/kernel/arch/metag/include/asm/cache.h b/kernel/arch/metag/include/asm/cache.h
index a43b650cf..b5df02239 100644
--- a/kernel/arch/metag/include/asm/cache.h
+++ b/kernel/arch/metag/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_CACHE_H
 #define __ASM_METAG_CACHE_H
 
diff --git a/kernel/arch/metag/include/asm/cacheflush.h b/kernel/arch/metag/include/asm/cacheflush.h
index 7787ec5e3..2584a51ec 100644
--- a/kernel/arch/metag/include/asm/cacheflush.h
+++ b/kernel/arch/metag/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_CACHEFLUSH_H
 #define _METAG_CACHEFLUSH_H
 
diff --git a/kernel/arch/metag/include/asm/cachepart.h b/kernel/arch/metag/include/asm/cachepart.h
index cf6b44e91..79411e977 100644
--- a/kernel/arch/metag/include/asm/cachepart.h
+++ b/kernel/arch/metag/include/asm/cachepart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Meta cache partition manipulation.
  *
diff --git a/kernel/arch/metag/include/asm/checksum.h b/kernel/arch/metag/include/asm/checksum.h
index f65fe83b1..6533d14e9 100644
--- a/kernel/arch/metag/include/asm/checksum.h
+++ b/kernel/arch/metag/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_CHECKSUM_H
 #define _METAG_CHECKSUM_H
 
diff --git a/kernel/arch/metag/include/asm/cmpxchg.h b/kernel/arch/metag/include/asm/cmpxchg.h
index be29e3e44..68c4ab146 100644
--- a/kernel/arch/metag/include/asm/cmpxchg.h
+++ b/kernel/arch/metag/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_CMPXCHG_H
 #define __ASM_METAG_CMPXCHG_H
 
diff --git a/kernel/arch/metag/include/asm/cmpxchg_irq.h b/kernel/arch/metag/include/asm/cmpxchg_irq.h
index 649573168..5255e37f8 100644
--- a/kernel/arch/metag/include/asm/cmpxchg_irq.h
+++ b/kernel/arch/metag/include/asm/cmpxchg_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_CMPXCHG_IRQ_H
 #define __ASM_METAG_CMPXCHG_IRQ_H
 
diff --git a/kernel/arch/metag/include/asm/cmpxchg_lnkget.h b/kernel/arch/metag/include/asm/cmpxchg_lnkget.h
index 2369ad394..c69be00a4 100644
--- a/kernel/arch/metag/include/asm/cmpxchg_lnkget.h
+++ b/kernel/arch/metag/include/asm/cmpxchg_lnkget.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_CMPXCHG_LNKGET_H
 #define __ASM_METAG_CMPXCHG_LNKGET_H
 
diff --git a/kernel/arch/metag/include/asm/cmpxchg_lock1.h b/kernel/arch/metag/include/asm/cmpxchg_lock1.h
index fd6850474..5976e39db 100644
--- a/kernel/arch/metag/include/asm/cmpxchg_lock1.h
+++ b/kernel/arch/metag/include/asm/cmpxchg_lock1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_CMPXCHG_LOCK1_H
 #define __ASM_METAG_CMPXCHG_LOCK1_H
 
diff --git a/kernel/arch/metag/include/asm/core_reg.h b/kernel/arch/metag/include/asm/core_reg.h
index bdbc3a51f..ca70a0a29 100644
--- a/kernel/arch/metag/include/asm/core_reg.h
+++ b/kernel/arch/metag/include/asm/core_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_CORE_REG_H_
 #define __ASM_METAG_CORE_REG_H_
 
diff --git a/kernel/arch/metag/include/asm/cpu.h b/kernel/arch/metag/include/asm/cpu.h
index decf12969..9dac67de4 100644
--- a/kernel/arch/metag/include/asm/cpu.h
+++ b/kernel/arch/metag/include/asm/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_CPU_H
 #define _ASM_METAG_CPU_H
 
diff --git a/kernel/arch/metag/include/asm/da.h b/kernel/arch/metag/include/asm/da.h
index 81bd5212f..901daa540 100644
--- a/kernel/arch/metag/include/asm/da.h
+++ b/kernel/arch/metag/include/asm/da.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Meta DA JTAG debugger control.
  *
diff --git a/kernel/arch/metag/include/asm/delay.h b/kernel/arch/metag/include/asm/delay.h
index 9c92f9969..fd73d3d5d 100644
--- a/kernel/arch/metag/include/asm/delay.h
+++ b/kernel/arch/metag/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_DELAY_H
 #define _METAG_DELAY_H
 
diff --git a/kernel/arch/metag/include/asm/div64.h b/kernel/arch/metag/include/asm/div64.h
index 0fdd11676..e3686d2ae 100644
--- a/kernel/arch/metag/include/asm/div64.h
+++ b/kernel/arch/metag/include/asm/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_DIV64_H__
 #define __ASM_DIV64_H__
 
diff --git a/kernel/arch/metag/include/asm/dma-mapping.h b/kernel/arch/metag/include/asm/dma-mapping.h
index ea573be2b..7465ce54a 100644
--- a/kernel/arch/metag/include/asm/dma-mapping.h
+++ b/kernel/arch/metag/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_DMA_MAPPING_H
 #define _ASM_METAG_DMA_MAPPING_H
 
diff --git a/kernel/arch/metag/include/asm/elf.h b/kernel/arch/metag/include/asm/elf.h
index 87b0cf1e0..a6c33800b 100644
--- a/kernel/arch/metag/include/asm/elf.h
+++ b/kernel/arch/metag/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_ELF_H
 #define __ASM_METAG_ELF_H
 
diff --git a/kernel/arch/metag/include/asm/ftrace.h b/kernel/arch/metag/include/asm/ftrace.h
index a2269d60a..b1c8c76fb 100644
--- a/kernel/arch/metag/include/asm/ftrace.h
+++ b/kernel/arch/metag/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_FTRACE
 #define _ASM_METAG_FTRACE
 
diff --git a/kernel/arch/metag/include/asm/global_lock.h b/kernel/arch/metag/include/asm/global_lock.h
index fc831c88c..4d3da9682 100644
--- a/kernel/arch/metag/include/asm/global_lock.h
+++ b/kernel/arch/metag/include/asm/global_lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_GLOBAL_LOCK_H
 #define __ASM_METAG_GLOBAL_LOCK_H
 
diff --git a/kernel/arch/metag/include/asm/highmem.h b/kernel/arch/metag/include/asm/highmem.h
index 9b1d172cd..8b0dfd684 100644
--- a/kernel/arch/metag/include/asm/highmem.h
+++ b/kernel/arch/metag/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HIGHMEM_H
 #define _ASM_HIGHMEM_H
 
diff --git a/kernel/arch/metag/include/asm/hugetlb.h b/kernel/arch/metag/include/asm/hugetlb.h
index 905ed422d..1607363d2 100644
--- a/kernel/arch/metag/include/asm/hugetlb.h
+++ b/kernel/arch/metag/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_HUGETLB_H
 #define _ASM_METAG_HUGETLB_H
 
diff --git a/kernel/arch/metag/include/asm/hwthread.h b/kernel/arch/metag/include/asm/hwthread.h
index 8f9786619..8d2171da5 100644
--- a/kernel/arch/metag/include/asm/hwthread.h
+++ b/kernel/arch/metag/include/asm/hwthread.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2008 Imagination Technologies
  */
diff --git a/kernel/arch/metag/include/asm/io.h b/kernel/arch/metag/include/asm/io.h
index 9890f21ea..71cd2bc54 100644
--- a/kernel/arch/metag/include/asm/io.h
+++ b/kernel/arch/metag/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_IO_H
 #define _ASM_METAG_IO_H
 
diff --git a/kernel/arch/metag/include/asm/irq.h b/kernel/arch/metag/include/asm/irq.h
index 6ac6d4a05..cb02c2993 100644
--- a/kernel/arch/metag/include/asm/irq.h
+++ b/kernel/arch/metag/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_IRQ_H
 #define __ASM_METAG_IRQ_H
 
diff --git a/kernel/arch/metag/include/asm/irqflags.h b/kernel/arch/metag/include/asm/irqflags.h
index 339b16f06..e2fe34acb 100644
--- a/kernel/arch/metag/include/asm/irqflags.h
+++ b/kernel/arch/metag/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IRQ flags handling
  *
diff --git a/kernel/arch/metag/include/asm/l2cache.h b/kernel/arch/metag/include/asm/l2cache.h
index bffbeaa4d..f260b158b 100644
--- a/kernel/arch/metag/include/asm/l2cache.h
+++ b/kernel/arch/metag/include/asm/l2cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_L2CACHE_H
 #define _METAG_L2CACHE_H
 
diff --git a/kernel/arch/metag/include/asm/linkage.h b/kernel/arch/metag/include/asm/linkage.h
index 73bf25ba4..3a9024ecb 100644
--- a/kernel/arch/metag/include/asm/linkage.h
+++ b/kernel/arch/metag/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/metag/include/asm/mman.h b/kernel/arch/metag/include/asm/mman.h
index 17999dba9..dcb0d20a6 100644
--- a/kernel/arch/metag/include/asm/mman.h
+++ b/kernel/arch/metag/include/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __METAG_MMAN_H__
 #define __METAG_MMAN_H__
 
diff --git a/kernel/arch/metag/include/asm/mmu.h b/kernel/arch/metag/include/asm/mmu.h
index 9c321147c..cab5a01c3 100644
--- a/kernel/arch/metag/include/asm/mmu.h
+++ b/kernel/arch/metag/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/metag/include/asm/mmu_context.h b/kernel/arch/metag/include/asm/mmu_context.h
index 2e0312748..7b4766379 100644
--- a/kernel/arch/metag/include/asm/mmu_context.h
+++ b/kernel/arch/metag/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __METAG_MMU_CONTEXT_H
 #define __METAG_MMU_CONTEXT_H
 
diff --git a/kernel/arch/metag/include/asm/mmzone.h b/kernel/arch/metag/include/asm/mmzone.h
index 9c88a9c65..8627fb532 100644
--- a/kernel/arch/metag/include/asm/mmzone.h
+++ b/kernel/arch/metag/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_MMZONE_H
 #define __ASM_METAG_MMZONE_H
 
diff --git a/kernel/arch/metag/include/asm/module.h b/kernel/arch/metag/include/asm/module.h
index e47e60941..e957171c3 100644
--- a/kernel/arch/metag/include/asm/module.h
+++ b/kernel/arch/metag/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_MODULE_H
 #define _ASM_METAG_MODULE_H
 
diff --git a/kernel/arch/metag/include/asm/page.h b/kernel/arch/metag/include/asm/page.h
index 1e8e281b8..9e994d770 100644
--- a/kernel/arch/metag/include/asm/page.h
+++ b/kernel/arch/metag/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_PAGE_H
 #define _METAG_PAGE_H
 
diff --git a/kernel/arch/metag/include/asm/pgalloc.h b/kernel/arch/metag/include/asm/pgalloc.h
index c2caa1ee4..0b9d95d78 100644
--- a/kernel/arch/metag/include/asm/pgalloc.h
+++ b/kernel/arch/metag/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_PGALLOC_H
 #define _METAG_PGALLOC_H
 
diff --git a/kernel/arch/metag/include/asm/pgtable-bits.h b/kernel/arch/metag/include/asm/pgtable-bits.h
index 25ba6729f..5f6b82282 100644
--- a/kernel/arch/metag/include/asm/pgtable-bits.h
+++ b/kernel/arch/metag/include/asm/pgtable-bits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Meta page table definitions.
  */
diff --git a/kernel/arch/metag/include/asm/pgtable.h b/kernel/arch/metag/include/asm/pgtable.h
index 0c151e5af..a3422f06c 100644
--- a/kernel/arch/metag/include/asm/pgtable.h
+++ b/kernel/arch/metag/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Macros and functions to manipulate Meta page tables.
  */
diff --git a/kernel/arch/metag/include/asm/processor.h b/kernel/arch/metag/include/asm/processor.h
index 8ae92d6ab..9a0c502cd 100644
--- a/kernel/arch/metag/include/asm/processor.h
+++ b/kernel/arch/metag/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2005,2006,2007,2008 Imagination Technologies
  */
diff --git a/kernel/arch/metag/include/asm/ptrace.h b/kernel/arch/metag/include/asm/ptrace.h
index fcabc18da..9074f254c 100644
--- a/kernel/arch/metag/include/asm/ptrace.h
+++ b/kernel/arch/metag/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_PTRACE_H
 #define _METAG_PTRACE_H
 
diff --git a/kernel/arch/metag/include/asm/setup.h b/kernel/arch/metag/include/asm/setup.h
index e9fdee945..504621d79 100644
--- a/kernel/arch/metag/include/asm/setup.h
+++ b/kernel/arch/metag/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_SETUP_H
 #define _ASM_METAG_SETUP_H
 
diff --git a/kernel/arch/metag/include/asm/smp.h b/kernel/arch/metag/include/asm/smp.h
index 1d7e770f7..8d3683d83 100644
--- a/kernel/arch/metag/include/asm/smp.h
+++ b/kernel/arch/metag/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
 
diff --git a/kernel/arch/metag/include/asm/sparsemem.h b/kernel/arch/metag/include/asm/sparsemem.h
index 03fe255d6..2942894ba 100644
--- a/kernel/arch/metag/include/asm/sparsemem.h
+++ b/kernel/arch/metag/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_SPARSEMEM_H
 #define __ASM_METAG_SPARSEMEM_H
 
diff --git a/kernel/arch/metag/include/asm/spinlock.h b/kernel/arch/metag/include/asm/spinlock.h
index ddf7fe570..349938c35 100644
--- a/kernel/arch/metag/include/asm/spinlock.h
+++ b/kernel/arch/metag/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_H
 #define __ASM_SPINLOCK_H
 
diff --git a/kernel/arch/metag/include/asm/spinlock_lnkget.h b/kernel/arch/metag/include/asm/spinlock_lnkget.h
index ad8436fee..029935560 100644
--- a/kernel/arch/metag/include/asm/spinlock_lnkget.h
+++ b/kernel/arch/metag/include/asm/spinlock_lnkget.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_LNKGET_H
 #define __ASM_SPINLOCK_LNKGET_H
 
diff --git a/kernel/arch/metag/include/asm/spinlock_lock1.h b/kernel/arch/metag/include/asm/spinlock_lock1.h
index c630444cf..12de9862d 100644
--- a/kernel/arch/metag/include/asm/spinlock_lock1.h
+++ b/kernel/arch/metag/include/asm/spinlock_lock1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_LOCK1_H
 #define __ASM_SPINLOCK_LOCK1_H
 
diff --git a/kernel/arch/metag/include/asm/spinlock_types.h b/kernel/arch/metag/include/asm/spinlock_types.h
index b76391405..cd197f1be 100644
--- a/kernel/arch/metag/include/asm/spinlock_types.h
+++ b/kernel/arch/metag/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_SPINLOCK_TYPES_H
 #define _ASM_METAG_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/metag/include/asm/stacktrace.h b/kernel/arch/metag/include/asm/stacktrace.h
index 2830a0fe7..f45e3cb2b 100644
--- a/kernel/arch/metag/include/asm/stacktrace.h
+++ b/kernel/arch/metag/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_STACKTRACE_H
 #define __ASM_STACKTRACE_H
 
diff --git a/kernel/arch/metag/include/asm/string.h b/kernel/arch/metag/include/asm/string.h
index 53e3806ee..86f9614d5 100644
--- a/kernel/arch/metag/include/asm/string.h
+++ b/kernel/arch/metag/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_STRING_H_
 #define _METAG_STRING_H_
 
diff --git a/kernel/arch/metag/include/asm/syscalls.h b/kernel/arch/metag/include/asm/syscalls.h
index a02b95556..eac0cf120 100644
--- a/kernel/arch/metag/include/asm/syscalls.h
+++ b/kernel/arch/metag/include/asm/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_SYSCALLS_H
 #define _ASM_METAG_SYSCALLS_H
 
diff --git a/kernel/arch/metag/include/asm/tcm.h b/kernel/arch/metag/include/asm/tcm.h
index 7711c317b..a0a4997e4 100644
--- a/kernel/arch/metag/include/asm/tcm.h
+++ b/kernel/arch/metag/include/asm/tcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TCM_H__
 #define __ASM_TCM_H__
 
diff --git a/kernel/arch/metag/include/asm/thread_info.h b/kernel/arch/metag/include/asm/thread_info.h
index 32677cc27..554f73a77 100644
--- a/kernel/arch/metag/include/asm/thread_info.h
+++ b/kernel/arch/metag/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: Meta low-level thread information
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)
diff --git a/kernel/arch/metag/include/asm/tlb.h b/kernel/arch/metag/include/asm/tlb.h
index 048282f1c..fbe6ee91e 100644
--- a/kernel/arch/metag/include/asm/tlb.h
+++ b/kernel/arch/metag/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_TLB_H
 #define __ASM_METAG_TLB_H
 
diff --git a/kernel/arch/metag/include/asm/tlbflush.h b/kernel/arch/metag/include/asm/tlbflush.h
index 566acf918..f3e5d99a3 100644
--- a/kernel/arch/metag/include/asm/tlbflush.h
+++ b/kernel/arch/metag/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_METAG_TLBFLUSH_H
 #define __ASM_METAG_TLBFLUSH_H
 
diff --git a/kernel/arch/metag/include/asm/topology.h b/kernel/arch/metag/include/asm/topology.h
index 707c7f7b6..df0d9e6b7 100644
--- a/kernel/arch/metag/include/asm/topology.h
+++ b/kernel/arch/metag/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_METAG_TOPOLOGY_H
 #define _ASM_METAG_TOPOLOGY_H
 
diff --git a/kernel/arch/metag/include/asm/uaccess.h b/kernel/arch/metag/include/asm/uaccess.h
index 47469e266..a5311eb36 100644
--- a/kernel/arch/metag/include/asm/uaccess.h
+++ b/kernel/arch/metag/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __METAG_UACCESS_H
 #define __METAG_UACCESS_H
 
diff --git a/kernel/arch/metag/include/asm/user_gateway.h b/kernel/arch/metag/include/asm/user_gateway.h
index e404c09e3..cf2392b95 100644
--- a/kernel/arch/metag/include/asm/user_gateway.h
+++ b/kernel/arch/metag/include/asm/user_gateway.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2010 Imagination Technologies
  */
diff --git a/kernel/arch/metag/include/uapi/asm/byteorder.h b/kernel/arch/metag/include/uapi/asm/byteorder.h
index 9558416d5..e5e03ff7e 100644
--- a/kernel/arch/metag/include/uapi/asm/byteorder.h
+++ b/kernel/arch/metag/include/uapi/asm/byteorder.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <linux/byteorder/little_endian.h>
diff --git a/kernel/arch/metag/include/uapi/asm/ech.h b/kernel/arch/metag/include/uapi/asm/ech.h
index ac94d1cf9..1e09f1ea4 100644
--- a/kernel/arch/metag/include/uapi/asm/ech.h
+++ b/kernel/arch/metag/include/uapi/asm/ech.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_METAG_ECH_H
 #define _UAPI_METAG_ECH_H
 
diff --git a/kernel/arch/metag/include/uapi/asm/ptrace.h b/kernel/arch/metag/include/uapi/asm/ptrace.h
index 45d97809d..8ad9daa84 100644
--- a/kernel/arch/metag/include/uapi/asm/ptrace.h
+++ b/kernel/arch/metag/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_METAG_PTRACE_H
 #define _UAPI_METAG_PTRACE_H
 
diff --git a/kernel/arch/metag/include/uapi/asm/sigcontext.h b/kernel/arch/metag/include/uapi/asm/sigcontext.h
index ef79a910c..ac7e1f28d 100644
--- a/kernel/arch/metag/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/metag/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_METAG_SIGCONTEXT_H
 #define _ASM_METAG_SIGCONTEXT_H
 
diff --git a/kernel/arch/metag/include/uapi/asm/siginfo.h b/kernel/arch/metag/include/uapi/asm/siginfo.h
index b2e0c8b62..b54ef7186 100644
--- a/kernel/arch/metag/include/uapi/asm/siginfo.h
+++ b/kernel/arch/metag/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _METAG_SIGINFO_H
 #define _METAG_SIGINFO_H
 
diff --git a/kernel/arch/metag/include/uapi/asm/swab.h b/kernel/arch/metag/include/uapi/asm/swab.h
index 1076b3a63..30d696fcc 100644
--- a/kernel/arch/metag/include/uapi/asm/swab.h
+++ b/kernel/arch/metag/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_METAG_SWAB_H
 #define __ASM_METAG_SWAB_H
 
diff --git a/kernel/arch/metag/include/uapi/asm/unistd.h b/kernel/arch/metag/include/uapi/asm/unistd.h
index 459b6ec15..9f72c4cfc 100644
--- a/kernel/arch/metag/include/uapi/asm/unistd.h
+++ b/kernel/arch/metag/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 Imagination Technologies Ltd.
  *
diff --git a/kernel/arch/metag/kernel/Makefile b/kernel/arch/metag/kernel/Makefile
index d7675f4a5..73441d8c0 100644
--- a/kernel/arch/metag/kernel/Makefile
+++ b/kernel/arch/metag/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/Meta kernel.
 #
diff --git a/kernel/arch/metag/kernel/asm-offsets.c b/kernel/arch/metag/kernel/asm-offsets.c
index bfc9205f9..d9b348b99 100644
--- a/kernel/arch/metag/kernel/asm-offsets.c
+++ b/kernel/arch/metag/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This program is used to generate definitions needed by
  * assembly language modules.
diff --git a/kernel/arch/metag/kernel/cachepart.c b/kernel/arch/metag/kernel/cachepart.c
index db944c2e7..6e0f8a80c 100644
--- a/kernel/arch/metag/kernel/cachepart.c
+++ b/kernel/arch/metag/kernel/cachepart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Meta cache partition manipulation.
  *
diff --git a/kernel/arch/metag/kernel/core_reg.c b/kernel/arch/metag/kernel/core_reg.c
index 671cce8c3..df2833f27 100644
--- a/kernel/arch/metag/kernel/core_reg.c
+++ b/kernel/arch/metag/kernel/core_reg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Support for reading and writing Meta core internal registers.
  *
diff --git a/kernel/arch/metag/kernel/head.S b/kernel/arch/metag/kernel/head.S
index 713f71d1b..3ed278134 100644
--- a/kernel/arch/metag/kernel/head.S
+++ b/kernel/arch/metag/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	! Copyright 2005,2006,2007,2009 Imagination Technologies
 
 #include <linux/init.h>
diff --git a/kernel/arch/metag/kernel/irq.c b/kernel/arch/metag/kernel/irq.c
index c9939604a..704cf17f8 100644
--- a/kernel/arch/metag/kernel/irq.c
+++ b/kernel/arch/metag/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux/Meta general interrupt handling code
  *
diff --git a/kernel/arch/metag/kernel/machines.c b/kernel/arch/metag/kernel/machines.c
index 1edf6ba19..e49790181 100644
--- a/kernel/arch/metag/kernel/machines.c
+++ b/kernel/arch/metag/kernel/machines.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/metag/kernel/machines.c
  *
diff --git a/kernel/arch/metag/kernel/metag_ksyms.c b/kernel/arch/metag/kernel/metag_ksyms.c
index 215c94ad6..e312386ef 100644
--- a/kernel/arch/metag/kernel/metag_ksyms.c
+++ b/kernel/arch/metag/kernel/metag_ksyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/types.h>
 
diff --git a/kernel/arch/metag/kernel/perf_callchain.c b/kernel/arch/metag/kernel/perf_callchain.c
index 3e8e04804..d325ba101 100644
--- a/kernel/arch/metag/kernel/perf_callchain.c
+++ b/kernel/arch/metag/kernel/perf_callchain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Perf callchain handling code.
  *
diff --git a/kernel/arch/metag/kernel/process.c b/kernel/arch/metag/kernel/process.c
index c4606ce74..0909834c8 100644
--- a/kernel/arch/metag/kernel/process.c
+++ b/kernel/arch/metag/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005,2006,2007,2008,2009,2010,2011 Imagination Technologies
  *
diff --git a/kernel/arch/metag/kernel/signal.c b/kernel/arch/metag/kernel/signal.c
index 338925d80..e64e8b0a9 100644
--- a/kernel/arch/metag/kernel/signal.c
+++ b/kernel/arch/metag/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991,1992  Linus Torvalds
  *  Copyright (C) 2005-2012  Imagination Technologies Ltd.
diff --git a/kernel/arch/metag/kernel/sys_metag.c b/kernel/arch/metag/kernel/sys_metag.c
index efe833a45..27d96499d 100644
--- a/kernel/arch/metag/kernel/sys_metag.c
+++ b/kernel/arch/metag/kernel/sys_metag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains various random system calls that
  * have a non-standard calling sequence on the Linux/Meta
diff --git a/kernel/arch/metag/kernel/tbiunexp.S b/kernel/arch/metag/kernel/tbiunexp.S
index 907bbe0b2..266480808 100644
--- a/kernel/arch/metag/kernel/tbiunexp.S
+++ b/kernel/arch/metag/kernel/tbiunexp.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Pass a breakpoint through to Codescape */
 
 #include <asm/tbx.h>
diff --git a/kernel/arch/metag/kernel/tcm.c b/kernel/arch/metag/kernel/tcm.c
index 5d102b31c..1d7b4e33b 100644
--- a/kernel/arch/metag/kernel/tcm.c
+++ b/kernel/arch/metag/kernel/tcm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 Imagination Technologies Ltd.
  */
diff --git a/kernel/arch/metag/kernel/time.c b/kernel/arch/metag/kernel/time.c
index f1c8c53da..1e809e3b4 100644
--- a/kernel/arch/metag/kernel/time.c
+++ b/kernel/arch/metag/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2013 Imagination Technologies Ltd.
  *
diff --git a/kernel/arch/metag/kernel/user_gateway.S b/kernel/arch/metag/kernel/user_gateway.S
index 7167f3e8d..7833fb8f9 100644
--- a/kernel/arch/metag/kernel/user_gateway.S
+++ b/kernel/arch/metag/kernel/user_gateway.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2010 Imagination Technologies Ltd.
  *
diff --git a/kernel/arch/metag/kernel/vmlinux.lds.S b/kernel/arch/metag/kernel/vmlinux.lds.S
index e6c700eaf..1efadae2e 100644
--- a/kernel/arch/metag/kernel/vmlinux.lds.S
+++ b/kernel/arch/metag/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make Meta Linux kernel */
 
 #include <asm/thread_info.h>
diff --git a/kernel/arch/metag/lib/Makefile b/kernel/arch/metag/lib/Makefile
index a41d24e27..3982850d6 100644
--- a/kernel/arch/metag/lib/Makefile
+++ b/kernel/arch/metag/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Meta-specific library files.
 #
diff --git a/kernel/arch/metag/lib/ashldi3.S b/kernel/arch/metag/lib/ashldi3.S
index 78d6974cf..5055df9e5 100644
--- a/kernel/arch/metag/lib/ashldi3.S
+++ b/kernel/arch/metag/lib/ashldi3.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 by Imagination Technologies Ltd.
 !
 ! 64-bit arithmetic shift left routine.
diff --git a/kernel/arch/metag/lib/ashrdi3.S b/kernel/arch/metag/lib/ashrdi3.S
index 7cb7ed3bb..0c838fd9d 100644
--- a/kernel/arch/metag/lib/ashrdi3.S
+++ b/kernel/arch/metag/lib/ashrdi3.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 by Imagination Technologies Ltd.
 !
 ! 64-bit arithmetic shift right routine.
diff --git a/kernel/arch/metag/lib/clear_page.S b/kernel/arch/metag/lib/clear_page.S
index 43144eebe..87756a5d1 100644
--- a/kernel/arch/metag/lib/clear_page.S
+++ b/kernel/arch/metag/lib/clear_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
         ! Copyright 2007,2008,2009 Imagination Technologies Ltd.
 
 #include <asm/page.h>
diff --git a/kernel/arch/metag/lib/cmpdi2.S b/kernel/arch/metag/lib/cmpdi2.S
index 9c5c663c5..ab70bd94f 100644
--- a/kernel/arch/metag/lib/cmpdi2.S
+++ b/kernel/arch/metag/lib/cmpdi2.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 by Imagination Technologies Ltd.
 !
 ! 64-bit signed compare routine.
diff --git a/kernel/arch/metag/lib/copy_page.S b/kernel/arch/metag/lib/copy_page.S
index 91f7d4612..abbc75e94 100644
--- a/kernel/arch/metag/lib/copy_page.S
+++ b/kernel/arch/metag/lib/copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
         ! Copyright 2007,2008 Imagination Technologies Ltd.
 
 #include <asm/page.h>
diff --git a/kernel/arch/metag/lib/delay.c b/kernel/arch/metag/lib/delay.c
index 0b308f48b..6754012a2 100644
--- a/kernel/arch/metag/lib/delay.c
+++ b/kernel/arch/metag/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Precise Delay Loops for Meta
  *
diff --git a/kernel/arch/metag/lib/div64.S b/kernel/arch/metag/lib/div64.S
index 1cfc93498..55eece273 100644
--- a/kernel/arch/metag/lib/div64.S
+++ b/kernel/arch/metag/lib/div64.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 Imagination Technologies Ltd.
 !
 ! Signed/unsigned 64-bit division routines.
diff --git a/kernel/arch/metag/lib/divsi3.S b/kernel/arch/metag/lib/divsi3.S
index 11124cc93..9e31abefb 100644
--- a/kernel/arch/metag/lib/divsi3.S
+++ b/kernel/arch/metag/lib/divsi3.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 !               Imagination Technologies Ltd
 !
diff --git a/kernel/arch/metag/lib/ip_fast_csum.S b/kernel/arch/metag/lib/ip_fast_csum.S
index 533b1e73d..441f489d6 100644
--- a/kernel/arch/metag/lib/ip_fast_csum.S
+++ b/kernel/arch/metag/lib/ip_fast_csum.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 	.text
 /*
diff --git a/kernel/arch/metag/lib/lshrdi3.S b/kernel/arch/metag/lib/lshrdi3.S
index 47f720283..cf7ffc9b3 100644
--- a/kernel/arch/metag/lib/lshrdi3.S
+++ b/kernel/arch/metag/lib/lshrdi3.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 by Imagination Technologies Ltd.
 !
 ! 64-bit logical shift right routine.
diff --git a/kernel/arch/metag/lib/memcpy.S b/kernel/arch/metag/lib/memcpy.S
index 46b7a2b94..c2e8395f9 100644
--- a/kernel/arch/metag/lib/memcpy.S
+++ b/kernel/arch/metag/lib/memcpy.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 !   Copyright (C) 2008-2012 Imagination Technologies Ltd.
 
 	.text
diff --git a/kernel/arch/metag/lib/memmove.S b/kernel/arch/metag/lib/memmove.S
index 228ea04d7..934abda0e 100644
--- a/kernel/arch/metag/lib/memmove.S
+++ b/kernel/arch/metag/lib/memmove.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 !   Copyright (C) 2008-2012 Imagination Technologies Ltd.
 
 	.text
diff --git a/kernel/arch/metag/lib/memset.S b/kernel/arch/metag/lib/memset.S
index 721085bad..6ee246d83 100644
--- a/kernel/arch/metag/lib/memset.S
+++ b/kernel/arch/metag/lib/memset.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 !   Copyright (C) 2008-2012 Imagination Technologies Ltd.
 
 	.text
diff --git a/kernel/arch/metag/lib/modsi3.S b/kernel/arch/metag/lib/modsi3.S
index 210cfa856..d65a2e5b3 100644
--- a/kernel/arch/metag/lib/modsi3.S
+++ b/kernel/arch/metag/lib/modsi3.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 !               Imagination Technologies Ltd
 !
diff --git a/kernel/arch/metag/lib/muldi3.S b/kernel/arch/metag/lib/muldi3.S
index ee66ca864..9d1067902 100644
--- a/kernel/arch/metag/lib/muldi3.S
+++ b/kernel/arch/metag/lib/muldi3.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 by Imagination Technologies Ltd.
 !
 ! 64-bit multiply routine.
diff --git a/kernel/arch/metag/lib/ucmpdi2.S b/kernel/arch/metag/lib/ucmpdi2.S
index 6f3347f7d..46f5686db 100644
--- a/kernel/arch/metag/lib/ucmpdi2.S
+++ b/kernel/arch/metag/lib/ucmpdi2.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! Copyright (C) 2012 by Imagination Technologies Ltd.
 !
 ! 64-bit unsigned compare routine.
diff --git a/kernel/arch/metag/lib/usercopy.c b/kernel/arch/metag/lib/usercopy.c
index c941abdb8..a48ef522c 100644
--- a/kernel/arch/metag/lib/usercopy.c
+++ b/kernel/arch/metag/lib/usercopy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * User address space access functions.
  * The non-inlined parts of asm-metag/uaccess.h are here.
diff --git a/kernel/arch/metag/mm/Kconfig b/kernel/arch/metag/mm/Kconfig
index 03fb8f155..9d4b2c67d 100644
--- a/kernel/arch/metag/mm/Kconfig
+++ b/kernel/arch/metag/mm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Memory management options"
 
 config PAGE_OFFSET
diff --git a/kernel/arch/metag/mm/Makefile b/kernel/arch/metag/mm/Makefile
index 994331164..0c7c91ba9 100644
--- a/kernel/arch/metag/mm/Makefile
+++ b/kernel/arch/metag/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux Meta-specific parts of the memory manager.
 #
diff --git a/kernel/arch/metag/mm/extable.c b/kernel/arch/metag/mm/extable.c
index 3aa90b78b..9b92d3ad7 100644
--- a/kernel/arch/metag/mm/extable.c
+++ b/kernel/arch/metag/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/extable.h>
 #include <linux/uaccess.h>
 
diff --git a/kernel/arch/metag/mm/fault.c b/kernel/arch/metag/mm/fault.c
index 505547748..de54fe686 100644
--- a/kernel/arch/metag/mm/fault.c
+++ b/kernel/arch/metag/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Meta page fault handling.
  *
diff --git a/kernel/arch/metag/mm/highmem.c b/kernel/arch/metag/mm/highmem.c
index f19a87f2c..83527fc7c 100644
--- a/kernel/arch/metag/mm/highmem.c
+++ b/kernel/arch/metag/mm/highmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/highmem.h>
 #include <linux/sched.h>
diff --git a/kernel/arch/metag/mm/hugetlbpage.c b/kernel/arch/metag/mm/hugetlbpage.c
index 67fd53e29..012ee4c80 100644
--- a/kernel/arch/metag/mm/hugetlbpage.c
+++ b/kernel/arch/metag/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/metag/mm/hugetlbpage.c
  *
diff --git a/kernel/arch/metag/mm/init.c b/kernel/arch/metag/mm/init.c
index 188d4d9fb..0e2ca9058 100644
--- a/kernel/arch/metag/mm/init.c
+++ b/kernel/arch/metag/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2005,2006,2007,2008,2009,2010 Imagination Technologies
  *
diff --git a/kernel/arch/metag/mm/ioremap.c b/kernel/arch/metag/mm/ioremap.c
index a136a435f..df2b59cb0 100644
--- a/kernel/arch/metag/mm/ioremap.c
+++ b/kernel/arch/metag/mm/ioremap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Re-map IO memory to kernel address space so that we can access it.
  * Needed for memory-mapped I/O devices mapped outside our normal DRAM
diff --git a/kernel/arch/metag/mm/l2cache.c b/kernel/arch/metag/mm/l2cache.c
index c64ee615c..addffc589 100644
--- a/kernel/arch/metag/mm/l2cache.c
+++ b/kernel/arch/metag/mm/l2cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
diff --git a/kernel/arch/metag/mm/maccess.c b/kernel/arch/metag/mm/maccess.c
index eba2cfc93..c22755165 100644
--- a/kernel/arch/metag/mm/maccess.c
+++ b/kernel/arch/metag/mm/maccess.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * safe read and write memory routines callable while atomic
  *
diff --git a/kernel/arch/metag/mm/mmu-meta1.c b/kernel/arch/metag/mm/mmu-meta1.c
index 62ebab909..53190b13d 100644
--- a/kernel/arch/metag/mm/mmu-meta1.c
+++ b/kernel/arch/metag/mm/mmu-meta1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2005,2006,2007,2008,2009 Imagination Technologies
  *
diff --git a/kernel/arch/metag/mm/mmu-meta2.c b/kernel/arch/metag/mm/mmu-meta2.c
index 81dcbb0bb..8b668a69c 100644
--- a/kernel/arch/metag/mm/mmu-meta2.c
+++ b/kernel/arch/metag/mm/mmu-meta2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2008,2009,2010,2011 Imagination Technologies Ltd.
  *
diff --git a/kernel/arch/metag/oprofile/Makefile b/kernel/arch/metag/oprofile/Makefile
index c9639d473..dc92a4a3d 100644
--- a/kernel/arch/metag/oprofile/Makefile
+++ b/kernel/arch/metag/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE)	+= oprofile.o
 
 oprofile-core-y	+= buffer_sync.o
diff --git a/kernel/arch/metag/oprofile/backtrace.h b/kernel/arch/metag/oprofile/backtrace.h
index c0fcc4265..60adb862a 100644
--- a/kernel/arch/metag/oprofile/backtrace.h
+++ b/kernel/arch/metag/oprofile/backtrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METAG_OPROFILE_BACKTRACE_H
 #define _METAG_OPROFILE_BACKTRACE_H
 
diff --git a/kernel/arch/metag/tbx/Makefile b/kernel/arch/metag/tbx/Makefile
index e994239e5..98bc5453c 100644
--- a/kernel/arch/metag/tbx/Makefile
+++ b/kernel/arch/metag/tbx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for TBX library files..
 #
diff --git a/kernel/arch/microblaze/Makefile b/kernel/arch/microblaze/Makefile
index 1f6c48682..830ee7d42 100644
--- a/kernel/arch/microblaze/Makefile
+++ b/kernel/arch/microblaze/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 KBUILD_DEFCONFIG := mmu_defconfig
 
 ifeq ($(CONFIG_MMU),y)
diff --git a/kernel/arch/microblaze/boot/Makefile b/kernel/arch/microblaze/boot/Makefile
index 91d2068da..47f94cc38 100644
--- a/kernel/arch/microblaze/boot/Makefile
+++ b/kernel/arch/microblaze/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/microblaze/boot/Makefile
 #
diff --git a/kernel/arch/microblaze/boot/dts/Makefile b/kernel/arch/microblaze/boot/dts/Makefile
index a3d2e42c3..1f77913d4 100644
--- a/kernel/arch/microblaze/boot/dts/Makefile
+++ b/kernel/arch/microblaze/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 
 obj-y += linked_dtb.o
diff --git a/kernel/arch/microblaze/include/asm/asm-compat.h b/kernel/arch/microblaze/include/asm/asm-compat.h
index e7bc9dc11..c05259ce2 100644
--- a/kernel/arch/microblaze/include/asm/asm-compat.h
+++ b/kernel/arch/microblaze/include/asm/asm-compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MICROBLAZE_ASM_COMPAT_H
 #define _ASM_MICROBLAZE_ASM_COMPAT_H
 
diff --git a/kernel/arch/microblaze/include/asm/atomic.h b/kernel/arch/microblaze/include/asm/atomic.h
index 42ac382a0..41e9aff23 100644
--- a/kernel/arch/microblaze/include/asm/atomic.h
+++ b/kernel/arch/microblaze/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MICROBLAZE_ATOMIC_H
 #define _ASM_MICROBLAZE_ATOMIC_H
 
diff --git a/kernel/arch/microblaze/include/asm/cmpxchg.h b/kernel/arch/microblaze/include/asm/cmpxchg.h
index 538afc0ab..596300c74 100644
--- a/kernel/arch/microblaze/include/asm/cmpxchg.h
+++ b/kernel/arch/microblaze/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MICROBLAZE_CMPXCHG_H
 #define _ASM_MICROBLAZE_CMPXCHG_H
 
diff --git a/kernel/arch/microblaze/include/asm/ftrace.h b/kernel/arch/microblaze/include/asm/ftrace.h
index da0144f40..5db7f4489 100644
--- a/kernel/arch/microblaze/include/asm/ftrace.h
+++ b/kernel/arch/microblaze/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MICROBLAZE_FTRACE
 #define _ASM_MICROBLAZE_FTRACE
 
diff --git a/kernel/arch/microblaze/include/asm/futex.h b/kernel/arch/microblaze/include/asm/futex.h
index a9dad9e5e..2572077b0 100644
--- a/kernel/arch/microblaze/include/asm/futex.h
+++ b/kernel/arch/microblaze/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MICROBLAZE_FUTEX_H
 #define _ASM_MICROBLAZE_FUTEX_H
 
diff --git a/kernel/arch/microblaze/include/asm/hash.h b/kernel/arch/microblaze/include/asm/hash.h
index 753513ae8..ef4741a40 100644
--- a/kernel/arch/microblaze/include/asm/hash.h
+++ b/kernel/arch/microblaze/include/asm/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HASH_H
 #define _ASM_HASH_H
 
diff --git a/kernel/arch/microblaze/include/asm/highmem.h b/kernel/arch/microblaze/include/asm/highmem.h
index 67925ef18..332c78e15 100644
--- a/kernel/arch/microblaze/include/asm/highmem.h
+++ b/kernel/arch/microblaze/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * highmem.h: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/microblaze/include/asm/kgdb.h b/kernel/arch/microblaze/include/asm/kgdb.h
index ad27acb2b..8dc5ebb07 100644
--- a/kernel/arch/microblaze/include/asm/kgdb.h
+++ b/kernel/arch/microblaze/include/asm/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __KERNEL__
 #ifndef __MICROBLAZE_KGDB_H__
 #define __MICROBLAZE_KGDB_H__
diff --git a/kernel/arch/microblaze/include/asm/mmu_context.h b/kernel/arch/microblaze/include/asm/mmu_context.h
index 0ccd8c402..f74f9da07 100644
--- a/kernel/arch/microblaze/include/asm/mmu_context.h
+++ b/kernel/arch/microblaze/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_MMU
 # include <asm/mmu_context_mm.h>
 #else
diff --git a/kernel/arch/microblaze/include/asm/seccomp.h b/kernel/arch/microblaze/include/asm/seccomp.h
index 204618a2c..95cdcabee 100644
--- a/kernel/arch/microblaze/include/asm/seccomp.h
+++ b/kernel/arch/microblaze/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MICROBLAZE_SECCOMP_H
 #define _ASM_MICROBLAZE_SECCOMP_H
 
diff --git a/kernel/arch/microblaze/include/asm/syscall.h b/kernel/arch/microblaze/include/asm/syscall.h
index 04a5bece8..220decd60 100644
--- a/kernel/arch/microblaze/include/asm/syscall.h
+++ b/kernel/arch/microblaze/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MICROBLAZE_SYSCALL_H
 #define __ASM_MICROBLAZE_SYSCALL_H
 
diff --git a/kernel/arch/microblaze/include/uapi/asm/auxvec.h b/kernel/arch/microblaze/include/uapi/asm/auxvec.h
index 8b1378917..93dd07bd0 100644
--- a/kernel/arch/microblaze/include/uapi/asm/auxvec.h
+++ b/kernel/arch/microblaze/include/uapi/asm/auxvec.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
diff --git a/kernel/arch/microblaze/include/uapi/asm/byteorder.h b/kernel/arch/microblaze/include/uapi/asm/byteorder.h
index 31902762a..763660169 100644
--- a/kernel/arch/microblaze/include/uapi/asm/byteorder.h
+++ b/kernel/arch/microblaze/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_MICROBLAZE_BYTEORDER_H
 #define _ASM_MICROBLAZE_BYTEORDER_H
 
diff --git a/kernel/arch/microblaze/include/uapi/asm/elf.h b/kernel/arch/microblaze/include/uapi/asm/elf.h
index e9bcdb6e0..6b656de29 100644
--- a/kernel/arch/microblaze/include/uapi/asm/elf.h
+++ b/kernel/arch/microblaze/include/uapi/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
  * Copyright (C) 2008-2009 PetaLogix
diff --git a/kernel/arch/microblaze/include/uapi/asm/posix_types.h b/kernel/arch/microblaze/include/uapi/asm/posix_types.h
index 0e1503967..f3249da69 100644
--- a/kernel/arch/microblaze/include/uapi/asm/posix_types.h
+++ b/kernel/arch/microblaze/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_MICROBLAZE_POSIX_TYPES_H
 #define _ASM_MICROBLAZE_POSIX_TYPES_H
 
diff --git a/kernel/arch/microblaze/include/uapi/asm/ptrace.h b/kernel/arch/microblaze/include/uapi/asm/ptrace.h
index d31238a5f..46dd94cb7 100644
--- a/kernel/arch/microblaze/include/uapi/asm/ptrace.h
+++ b/kernel/arch/microblaze/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2006 Atmark Techno, Inc.
  *
diff --git a/kernel/arch/microblaze/include/uapi/asm/setup.h b/kernel/arch/microblaze/include/uapi/asm/setup.h
index 76bc2acee..6831794e6 100644
--- a/kernel/arch/microblaze/include/uapi/asm/setup.h
+++ b/kernel/arch/microblaze/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
  * Copyright (C) 2007-2009 PetaLogix
diff --git a/kernel/arch/microblaze/include/uapi/asm/sigcontext.h b/kernel/arch/microblaze/include/uapi/asm/sigcontext.h
index 55873c80c..47eb2e211 100644
--- a/kernel/arch/microblaze/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/microblaze/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2006 Atmark Techno, Inc.
  *
diff --git a/kernel/arch/microblaze/include/uapi/asm/unistd.h b/kernel/arch/microblaze/include/uapi/asm/unistd.h
index a88b3c11c..eb156f914 100644
--- a/kernel/arch/microblaze/include/uapi/asm/unistd.h
+++ b/kernel/arch/microblaze/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu>
  * Copyright (C) 2006 Atmark Techno, Inc.
diff --git a/kernel/arch/microblaze/kernel/Makefile b/kernel/arch/microblaze/kernel/Makefile
index e098381af..0da76fa1a 100644
--- a/kernel/arch/microblaze/kernel/Makefile
+++ b/kernel/arch/microblaze/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile
 #
diff --git a/kernel/arch/microblaze/kernel/cpu/Makefile b/kernel/arch/microblaze/kernel/cpu/Makefile
index fceed4ede..059afc75a 100644
--- a/kernel/arch/microblaze/kernel/cpu/Makefile
+++ b/kernel/arch/microblaze/kernel/cpu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Build the appropriate CPU version support
 #
diff --git a/kernel/arch/microblaze/kernel/dma.c b/kernel/arch/microblaze/kernel/dma.c
index 94700c527..e63f154be 100644
--- a/kernel/arch/microblaze/kernel/dma.c
+++ b/kernel/arch/microblaze/kernel/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2009-2010 PetaLogix
  * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation
diff --git a/kernel/arch/microblaze/kernel/syscall_table.S b/kernel/arch/microblaze/kernel/syscall_table.S
index c48ff4ad2..56bcf3131 100644
--- a/kernel/arch/microblaze/kernel/syscall_table.S
+++ b/kernel/arch/microblaze/kernel/syscall_table.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 ENTRY(sys_call_table)
 	.long sys_restart_syscall	/* 0 - old "setup()" system call,
 					 * used for restarting */
diff --git a/kernel/arch/microblaze/lib/Makefile b/kernel/arch/microblaze/lib/Makefile
index 70c7ae6a3..9fe7ab688 100644
--- a/kernel/arch/microblaze/lib/Makefile
+++ b/kernel/arch/microblaze/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile
 #
diff --git a/kernel/arch/microblaze/lib/ashldi3.c b/kernel/arch/microblaze/lib/ashldi3.c
index 1af904cd9..4d0f9481b 100644
--- a/kernel/arch/microblaze/lib/ashldi3.c
+++ b/kernel/arch/microblaze/lib/ashldi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/microblaze/lib/ashrdi3.c b/kernel/arch/microblaze/lib/ashrdi3.c
index 32c334c05..268098a96 100644
--- a/kernel/arch/microblaze/lib/ashrdi3.c
+++ b/kernel/arch/microblaze/lib/ashrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/microblaze/lib/cmpdi2.c b/kernel/arch/microblaze/lib/cmpdi2.c
index 67abc9ac1..b3f896385 100644
--- a/kernel/arch/microblaze/lib/cmpdi2.c
+++ b/kernel/arch/microblaze/lib/cmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/microblaze/lib/divsi3.S b/kernel/arch/microblaze/lib/divsi3.S
index 595b02d6e..919fb69f8 100644
--- a/kernel/arch/microblaze/lib/divsi3.S
+++ b/kernel/arch/microblaze/lib/divsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 /*
diff --git a/kernel/arch/microblaze/lib/libgcc.h b/kernel/arch/microblaze/lib/libgcc.h
index ab077ef7e..a909366c2 100644
--- a/kernel/arch/microblaze/lib/libgcc.h
+++ b/kernel/arch/microblaze/lib/libgcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LIBGCC_H
 #define __ASM_LIBGCC_H
 
diff --git a/kernel/arch/microblaze/lib/lshrdi3.c b/kernel/arch/microblaze/lib/lshrdi3.c
index adcb253f1..00eb82682 100644
--- a/kernel/arch/microblaze/lib/lshrdi3.c
+++ b/kernel/arch/microblaze/lib/lshrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/microblaze/lib/modsi3.S b/kernel/arch/microblaze/lib/modsi3.S
index 84e0bee6e..64154865c 100644
--- a/kernel/arch/microblaze/lib/modsi3.S
+++ b/kernel/arch/microblaze/lib/modsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 /*
diff --git a/kernel/arch/microblaze/lib/muldi3.c b/kernel/arch/microblaze/lib/muldi3.c
index a3f9a03ac..8e6bc17e2 100644
--- a/kernel/arch/microblaze/lib/muldi3.c
+++ b/kernel/arch/microblaze/lib/muldi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/microblaze/lib/mulsi3.S b/kernel/arch/microblaze/lib/mulsi3.S
index 90bd7b93a..d6703a4d9 100644
--- a/kernel/arch/microblaze/lib/mulsi3.S
+++ b/kernel/arch/microblaze/lib/mulsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 /*
diff --git a/kernel/arch/microblaze/lib/ucmpdi2.c b/kernel/arch/microblaze/lib/ucmpdi2.c
index d05f15851..c60e068ff 100644
--- a/kernel/arch/microblaze/lib/ucmpdi2.c
+++ b/kernel/arch/microblaze/lib/ucmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/microblaze/lib/udivsi3.S b/kernel/arch/microblaze/lib/udivsi3.S
index 64cf57e4b..acdc66723 100644
--- a/kernel/arch/microblaze/lib/udivsi3.S
+++ b/kernel/arch/microblaze/lib/udivsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 /*
diff --git a/kernel/arch/microblaze/lib/umodsi3.S b/kernel/arch/microblaze/lib/umodsi3.S
index 17d16bafa..f4b814e88 100644
--- a/kernel/arch/microblaze/lib/umodsi3.S
+++ b/kernel/arch/microblaze/lib/umodsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 /*
diff --git a/kernel/arch/microblaze/mm/highmem.c b/kernel/arch/microblaze/mm/highmem.c
index ed4454c5c..d7569f77f 100644
--- a/kernel/arch/microblaze/mm/highmem.c
+++ b/kernel/arch/microblaze/mm/highmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * highmem.c: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/microblaze/oprofile/Makefile b/kernel/arch/microblaze/oprofile/Makefile
index 0d0348c8a..107f2f55d 100644
--- a/kernel/arch/microblaze/oprofile/Makefile
+++ b/kernel/arch/microblaze/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # arch/microblaze/oprofile/Makefile
 #
diff --git a/kernel/arch/microblaze/pci/iomap.c b/kernel/arch/microblaze/pci/iomap.c
index 94149f5e6..bde74af4c 100644
--- a/kernel/arch/microblaze/pci/iomap.c
+++ b/kernel/arch/microblaze/pci/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ppc64 "iomap" interface implementation.
  *
diff --git a/kernel/arch/mips/Kconfig b/kernel/arch/mips/Kconfig
index cb7fcc421..5d3284d20 100644
--- a/kernel/arch/mips/Kconfig
+++ b/kernel/arch/mips/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MIPS
 	bool
 	default y
diff --git a/kernel/arch/mips/Kconfig.debug b/kernel/arch/mips/Kconfig.debug
index 42a97c592..464af5e02 100644
--- a/kernel/arch/mips/Kconfig.debug
+++ b/kernel/arch/mips/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/mips/Makefile.postlink b/kernel/arch/mips/Makefile.postlink
index 4b7f5a648..4eea4188c 100644
--- a/kernel/arch/mips/Makefile.postlink
+++ b/kernel/arch/mips/Makefile.postlink
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ===========================================================================
 # Post-link MIPS pass
 # ===========================================================================
diff --git a/kernel/arch/mips/alchemy/Kconfig b/kernel/arch/mips/alchemy/Kconfig
index 88b4d6a79..7d73f7f42 100644
--- a/kernel/arch/mips/alchemy/Kconfig
+++ b/kernel/arch/mips/alchemy/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # au1000-style gpio and interrupt controllers
 config ALCHEMY_GPIOINT_AU1000
 	bool
diff --git a/kernel/arch/mips/alchemy/common/clock.c b/kernel/arch/mips/alchemy/common/clock.c
index 7ba7ea0a2..a83c7b7e2 100644
--- a/kernel/arch/mips/alchemy/common/clock.c
+++ b/kernel/arch/mips/alchemy/common/clock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alchemy clocks.
  *
diff --git a/kernel/arch/mips/alchemy/devboards/db1300.c b/kernel/arch/mips/alchemy/devboards/db1300.c
index cd1ae29f9..efb318e03 100644
--- a/kernel/arch/mips/alchemy/devboards/db1300.c
+++ b/kernel/arch/mips/alchemy/devboards/db1300.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DBAu1300 init and platform device setup.
  *
diff --git a/kernel/arch/mips/alchemy/devboards/db1550.c b/kernel/arch/mips/alchemy/devboards/db1550.c
index 421bd5793..7d3dfaa10 100644
--- a/kernel/arch/mips/alchemy/devboards/db1550.c
+++ b/kernel/arch/mips/alchemy/devboards/db1550.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alchemy Db1550/Pb1550 board support
  *
diff --git a/kernel/arch/mips/alchemy/devboards/db1xxx.c b/kernel/arch/mips/alchemy/devboards/db1xxx.c
index c9ad28995..e6d25aad8 100644
--- a/kernel/arch/mips/alchemy/devboards/db1xxx.c
+++ b/kernel/arch/mips/alchemy/devboards/db1xxx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alchemy DB/PB1xxx board support.
  */
diff --git a/kernel/arch/mips/alchemy/devboards/platform.c b/kernel/arch/mips/alchemy/devboards/platform.c
index be139a019..4640edab2 100644
--- a/kernel/arch/mips/alchemy/devboards/platform.c
+++ b/kernel/arch/mips/alchemy/devboards/platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * devoard misc stuff.
  */
diff --git a/kernel/arch/mips/alchemy/devboards/platform.h b/kernel/arch/mips/alchemy/devboards/platform.h
index 5ac055d2c..23d98fc09 100644
--- a/kernel/arch/mips/alchemy/devboards/platform.h
+++ b/kernel/arch/mips/alchemy/devboards/platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DEVBOARD_PLATFORM_H_
 #define _DEVBOARD_PLATFORM_H_
 
diff --git a/kernel/arch/mips/alchemy/devboards/pm.c b/kernel/arch/mips/alchemy/devboards/pm.c
index 93024dc6b..73c778146 100644
--- a/kernel/arch/mips/alchemy/devboards/pm.c
+++ b/kernel/arch/mips/alchemy/devboards/pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alchemy Development Board example suspend userspace interface.
  *
diff --git a/kernel/arch/mips/ar7/Makefile b/kernel/arch/mips/ar7/Makefile
index 7435e44b3..cd51c6c6e 100644
--- a/kernel/arch/mips/ar7/Makefile
+++ b/kernel/arch/mips/ar7/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-y := \
 	prom.o \
diff --git a/kernel/arch/mips/ath25/Kconfig b/kernel/arch/mips/ath25/Kconfig
index fc19dd57e..7070b4bcd 100644
--- a/kernel/arch/mips/ath25/Kconfig
+++ b/kernel/arch/mips/ath25/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config SOC_AR5312
 	bool "Atheros AR5312/AR2312+ SoC support"
 	depends on ATH25
diff --git a/kernel/arch/mips/ath25/ar2315.h b/kernel/arch/mips/ath25/ar2315.h
index 877afe63e..fccc64f6d 100644
--- a/kernel/arch/mips/ath25/ar2315.h
+++ b/kernel/arch/mips/ath25/ar2315.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AR2315_H
 #define __AR2315_H
 
diff --git a/kernel/arch/mips/ath25/ar5312.h b/kernel/arch/mips/ath25/ar5312.h
index 470abb005..67518a59a 100644
--- a/kernel/arch/mips/ath25/ar5312.h
+++ b/kernel/arch/mips/ath25/ar5312.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AR5312_H
 #define __AR5312_H
 
diff --git a/kernel/arch/mips/ath25/devices.c b/kernel/arch/mips/ath25/devices.c
index 7a64567d1..e1156347d 100644
--- a/kernel/arch/mips/ath25/devices.c
+++ b/kernel/arch/mips/ath25/devices.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/serial_8250.h>
diff --git a/kernel/arch/mips/ath25/devices.h b/kernel/arch/mips/ath25/devices.h
index 04d414115..44cf69063 100644
--- a/kernel/arch/mips/ath25/devices.h
+++ b/kernel/arch/mips/ath25/devices.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATH25_DEVICES_H
 #define __ATH25_DEVICES_H
 
diff --git a/kernel/arch/mips/ath79/Kconfig b/kernel/arch/mips/ath79/Kconfig
index dfc60209d..9547cf1ea 100644
--- a/kernel/arch/mips/ath79/Kconfig
+++ b/kernel/arch/mips/ath79/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if ATH79
 
 menu "Atheros AR71XX/AR724X/AR913X machine selection"
diff --git a/kernel/arch/mips/bcm47xx/Kconfig b/kernel/arch/mips/bcm47xx/Kconfig
index e970fd9cf..29471038d 100644
--- a/kernel/arch/mips/bcm47xx/Kconfig
+++ b/kernel/arch/mips/bcm47xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if BCM47XX
 
 config BCM47XX_SSB
diff --git a/kernel/arch/mips/bcm47xx/bcm47xx_private.h b/kernel/arch/mips/bcm47xx/bcm47xx_private.h
index 0367ac728..bb96743bb 100644
--- a/kernel/arch/mips/bcm47xx/bcm47xx_private.h
+++ b/kernel/arch/mips/bcm47xx/bcm47xx_private.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCM47XX_PRIVATE_H_
 #define LINUX_BCM47XX_PRIVATE_H_
 
diff --git a/kernel/arch/mips/bcm47xx/board.c b/kernel/arch/mips/bcm47xx/board.c
index 8cbe60cc5..edfaef0d7 100644
--- a/kernel/arch/mips/bcm47xx/board.c
+++ b/kernel/arch/mips/bcm47xx/board.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/export.h>
 #include <linux/string.h>
diff --git a/kernel/arch/mips/bcm47xx/buttons.c b/kernel/arch/mips/bcm47xx/buttons.c
index 8a760d801..88a8fb2bb 100644
--- a/kernel/arch/mips/bcm47xx/buttons.c
+++ b/kernel/arch/mips/bcm47xx/buttons.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcm47xx_private.h"
 
 #include <linux/input.h>
diff --git a/kernel/arch/mips/bcm47xx/leds.c b/kernel/arch/mips/bcm47xx/leds.c
index a35f1d5cd..d4f2407a4 100644
--- a/kernel/arch/mips/bcm47xx/leds.c
+++ b/kernel/arch/mips/bcm47xx/leds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcm47xx_private.h"
 
 #include <linux/leds.h>
diff --git a/kernel/arch/mips/bcm47xx/workarounds.c b/kernel/arch/mips/bcm47xx/workarounds.c
index e81ce4623..1a8a07e7a 100644
--- a/kernel/arch/mips/bcm47xx/workarounds.c
+++ b/kernel/arch/mips/bcm47xx/workarounds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcm47xx_private.h"
 
 #include <linux/gpio.h>
diff --git a/kernel/arch/mips/bcm63xx/Kconfig b/kernel/arch/mips/bcm63xx/Kconfig
index a057fdf11..96ed735a4 100644
--- a/kernel/arch/mips/bcm63xx/Kconfig
+++ b/kernel/arch/mips/bcm63xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "CPU support"
 	depends on BCM63XX
 
diff --git a/kernel/arch/mips/bcm63xx/Makefile b/kernel/arch/mips/bcm63xx/Makefile
index 9019f54ae..c69f297fc 100644
--- a/kernel/arch/mips/bcm63xx/Makefile
+++ b/kernel/arch/mips/bcm63xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
 		   dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
diff --git a/kernel/arch/mips/bcm63xx/boards/Kconfig b/kernel/arch/mips/bcm63xx/boards/Kconfig
index c6aed33d8..6ff0a7481 100644
--- a/kernel/arch/mips/bcm63xx/boards/Kconfig
+++ b/kernel/arch/mips/bcm63xx/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "Board support"
 	depends on BCM63XX
diff --git a/kernel/arch/mips/bmips/Kconfig b/kernel/arch/mips/bmips/Kconfig
index 2d60f2540..63dfc6950 100644
--- a/kernel/arch/mips/bmips/Kconfig
+++ b/kernel/arch/mips/bmips/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if BMIPS_GENERIC
 
 choice
diff --git a/kernel/arch/mips/boot/compressed/dbg.c b/kernel/arch/mips/boot/compressed/dbg.c
index 06c6a5bd1..f6728a8fd 100644
--- a/kernel/arch/mips/boot/compressed/dbg.c
+++ b/kernel/arch/mips/boot/compressed/dbg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MIPS-specific debug support for pre-boot environment
  *
diff --git a/kernel/arch/mips/boot/compressed/string.c b/kernel/arch/mips/boot/compressed/string.c
index 9de9885ac..43beecc35 100644
--- a/kernel/arch/mips/boot/compressed/string.c
+++ b/kernel/arch/mips/boot/compressed/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/mips/boot/compressed/string.c
  *
diff --git a/kernel/arch/mips/boot/compressed/uart-16550.c b/kernel/arch/mips/boot/compressed/uart-16550.c
index f7521142d..b3043c08f 100644
--- a/kernel/arch/mips/boot/compressed/uart-16550.c
+++ b/kernel/arch/mips/boot/compressed/uart-16550.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 16550 compatible uart based serial debug support for zboot
  */
diff --git a/kernel/arch/mips/boot/compressed/uart-alchemy.c b/kernel/arch/mips/boot/compressed/uart-alchemy.c
index 4bee55b93..8ec63011e 100644
--- a/kernel/arch/mips/boot/compressed/uart-alchemy.c
+++ b/kernel/arch/mips/boot/compressed/uart-alchemy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/mach-au1x00/au1000.h>
 
 void putc(char c)
diff --git a/kernel/arch/mips/boot/compressed/uart-prom.c b/kernel/arch/mips/boot/compressed/uart-prom.c
index 1c3d51bc9..d6f0fee0a 100644
--- a/kernel/arch/mips/boot/compressed/uart-prom.c
+++ b/kernel/arch/mips/boot/compressed/uart-prom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 extern void prom_putchar(unsigned char ch);
 
diff --git a/kernel/arch/mips/boot/dts/Makefile b/kernel/arch/mips/boot/dts/Makefile
index cbac26ce0..e0a4e939f 100644
--- a/kernel/arch/mips/boot/dts/Makefile
+++ b/kernel/arch/mips/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dts-dirs	+= brcm
 dts-dirs	+= cavium-octeon
 dts-dirs	+= img
diff --git a/kernel/arch/mips/boot/dts/brcm/Makefile b/kernel/arch/mips/boot/dts/brcm/Makefile
index d61bc2aeb..9e09cc455 100644
--- a/kernel/arch/mips/boot/dts/brcm/Makefile
+++ b/kernel/arch/mips/boot/dts/brcm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_DT_BCM93384WVG)		+= bcm93384wvg.dtb
 dtb-$(CONFIG_DT_BCM93384WVG_VIPER)	+= bcm93384wvg_viper.dtb
 dtb-$(CONFIG_DT_BCM96368MVWG)		+= bcm96368mvwg.dtb
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts b/kernel/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
index 2f2e80fdc..ed6023a91 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm3368.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm3368.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm3368.dtsi
index bee855cb8..277cde02b 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm3368.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm3368.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
index aa406b43c..eb2a9c6ed 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm3384_viper.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
index a7bd8564e..d7ad769a4 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm3384_zephyr.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts b/kernel/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
index 430d35ca3..2bc0d8401 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm63268.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm63268.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm63268.dtsi
index 7e6bf2cc0..3b09f44e6 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm63268.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm63268.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm6328.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm6328.dtsi
index 5633b9d90..644486fe4 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm6328.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm6328.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts b/kernel/arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts
index 702eae2a2..5e62190aa 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm6358-neufbox4-sercomm.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm6358.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm6358.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm6358.dtsi
index f9d8d3921..682df7fb7 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm6358.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm6358.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts b/kernel/arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
index 480f2a5bf..3e83bee5b 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm6362.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm6362.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm6362.dtsi
index c507da594..a82a5e5de 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm6362.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm6362.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm6368.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm6368.dtsi
index d0e3a70b3..7a72f59ae 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm6368.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm6368.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7125.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7125.dtsi
index 79f838ed9..2f9ef565e 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7125.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7125.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7346.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7346.dtsi
index da7bfa45a..02e426fe6 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7346.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7346.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7358.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7358.dtsi
index 9b0576045..1089d6ebc 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7358.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7358.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7360.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7360.dtsi
index 57b613c6a..4b87ebec4 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7360.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7360.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7362.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7362.dtsi
index c2a2843aa..ca657df34 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7362.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7362.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7420.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7420.dtsi
index 532fc8a15..d262e11bc 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7420.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7420.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7425.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7425.dtsi
index f56fb25f2..e4fb9b6e6 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7425.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7425.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm7435.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm7435.dtsi
index f2cead2ea..1484e8990 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm7435.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm7435.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm93384wvg.dts b/kernel/arch/mips/boot/dts/brcm/bcm93384wvg.dts
index d1e44a17d..601e4d929 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm93384wvg.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm93384wvg.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm3384_zephyr.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts b/kernel/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
index 1ecb2696a..938a8e661 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm93384wvg_viper.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm3384_viper.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm96368mvwg.dts b/kernel/arch/mips/boot/dts/brcm/bcm96368mvwg.dts
index 8c71c6845..6d772c394 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm96368mvwg.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm96368mvwg.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm6368.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97125cbmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97125cbmb.dts
index d72bc423c..7f59ea2de 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97125cbmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97125cbmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7125.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
index ea52d7b57..9e7d5228f 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97346dbsmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7346.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97358svmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97358svmb.dts
index 71357fdc1..708207a00 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97358svmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97358svmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7358.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97360svmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97360svmb.dts
index e2fed406c..73c6dc9c8 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97360svmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97360svmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7360.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97362svmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97362svmb.dts
index 78bffdf11..37bacfdcf 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97362svmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97362svmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7362.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97420c.dts b/kernel/arch/mips/boot/dts/brcm/bcm97420c.dts
index d62b448a1..f96241e94 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97420c.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97420c.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7420.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97425svmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97425svmb.dts
index 73aa006bd..ce762c7b2 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97425svmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97425svmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7425.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97435svmb.dts b/kernel/arch/mips/boot/dts/brcm/bcm97435svmb.dts
index 0a915f3fe..d4dd31a54 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97435svmb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97435svmb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm7435.dtsi"
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi
index 3c24f97de..96c30d857 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 &nand {
 	nandcs@1 {
 		compatible = "brcm,nandcs";
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi b/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi
index cb531816e..7b5afefbb 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi
+++ b/kernel/arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 &nand {
 	nandcs@1 {
 		compatible = "brcm,nandcs";
diff --git a/kernel/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts b/kernel/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
index 1da460868..8d58c1971 100644
--- a/kernel/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
+++ b/kernel/arch/mips/boot/dts/brcm/bcm9ejtagprb.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "bcm6328.dtsi"
diff --git a/kernel/arch/mips/boot/dts/cavium-octeon/Makefile b/kernel/arch/mips/boot/dts/cavium-octeon/Makefile
index 5b99c40a0..35300e091 100644
--- a/kernel/arch/mips/boot/dts/cavium-octeon/Makefile
+++ b/kernel/arch/mips/boot/dts/cavium-octeon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_CAVIUM_OCTEON_SOC)	+= octeon_3xxx.dtb octeon_68xx.dtb
 
 obj-y				+= $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts b/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
index ca6b4467b..0fa3dd181 100644
--- a/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
+++ b/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OCTEON 3XXX, 5XXX, 63XX device tree skeleton.
  *
diff --git a/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi b/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi
index 5302148e0..3c296623d 100644
--- a/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi
+++ b/kernel/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* OCTEON 3XXX DTS common parts. */
 
 /dts-v1/;
diff --git a/kernel/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts b/kernel/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
index 79b46fcb0..3d0acbb2e 100644
--- a/kernel/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
+++ b/kernel/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /*
  * OCTEON 68XX device tree skeleton.
diff --git a/kernel/arch/mips/boot/dts/img/Makefile b/kernel/arch/mips/boot/dts/img/Makefile
index 3d70958d0..139bcd887 100644
--- a/kernel/arch/mips/boot/dts/img/Makefile
+++ b/kernel/arch/mips/boot/dts/img/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON)	+= boston.dtb
 
 dtb-$(CONFIG_MACH_PISTACHIO)	+= pistachio_marduk.dtb
diff --git a/kernel/arch/mips/boot/dts/img/boston.dts b/kernel/arch/mips/boot/dts/img/boston.dts
index 53bfa29a7..2cd49b60e 100644
--- a/kernel/arch/mips/boot/dts/img/boston.dts
+++ b/kernel/arch/mips/boot/dts/img/boston.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/clock/boston-clock.h>
diff --git a/kernel/arch/mips/boot/dts/ingenic/Makefile b/kernel/arch/mips/boot/dts/ingenic/Makefile
index f2b864f07..779826257 100644
--- a/kernel/arch/mips/boot/dts/ingenic/Makefile
+++ b/kernel/arch/mips/boot/dts/ingenic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_JZ4740_QI_LB60)	+= qi_lb60.dtb
 dtb-$(CONFIG_JZ4780_CI20)	+= ci20.dtb
 
diff --git a/kernel/arch/mips/boot/dts/ingenic/ci20.dts b/kernel/arch/mips/boot/dts/ingenic/ci20.dts
index 6c3818449..a4cc52214 100644
--- a/kernel/arch/mips/boot/dts/ingenic/ci20.dts
+++ b/kernel/arch/mips/boot/dts/ingenic/ci20.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "jz4780.dtsi"
diff --git a/kernel/arch/mips/boot/dts/ingenic/jz4740.dtsi b/kernel/arch/mips/boot/dts/ingenic/jz4740.dtsi
index 2ca7ce748..cd5185bb9 100644
--- a/kernel/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/kernel/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/jz4740-cgu.h>
 
 / {
diff --git a/kernel/arch/mips/boot/dts/ingenic/jz4780.dtsi b/kernel/arch/mips/boot/dts/ingenic/jz4780.dtsi
index e906134ec..ff3298f29 100644
--- a/kernel/arch/mips/boot/dts/ingenic/jz4780.dtsi
+++ b/kernel/arch/mips/boot/dts/ingenic/jz4780.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/jz4780-cgu.h>
 
 / {
diff --git a/kernel/arch/mips/boot/dts/ingenic/qi_lb60.dts b/kernel/arch/mips/boot/dts/ingenic/qi_lb60.dts
index b715ee2ac..76aaf8982 100644
--- a/kernel/arch/mips/boot/dts/ingenic/qi_lb60.dts
+++ b/kernel/arch/mips/boot/dts/ingenic/qi_lb60.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "jz4740.dtsi"
diff --git a/kernel/arch/mips/boot/dts/lantiq/Makefile b/kernel/arch/mips/boot/dts/lantiq/Makefile
index 0906c6214..0c50e3246 100644
--- a/kernel/arch/mips/boot/dts/lantiq/Makefile
+++ b/kernel/arch/mips/boot/dts/lantiq/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_DT_EASY50712)	+= easy50712.dtb
 
 obj-y				+= $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/kernel/arch/mips/boot/dts/lantiq/danube.dtsi b/kernel/arch/mips/boot/dts/lantiq/danube.dtsi
index d4c59e003..2dd950181 100644
--- a/kernel/arch/mips/boot/dts/lantiq/danube.dtsi
+++ b/kernel/arch/mips/boot/dts/lantiq/danube.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/lantiq/easy50712.dts b/kernel/arch/mips/boot/dts/lantiq/easy50712.dts
index b59962585..c37a33962 100644
--- a/kernel/arch/mips/boot/dts/lantiq/easy50712.dts
+++ b/kernel/arch/mips/boot/dts/lantiq/easy50712.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "danube.dtsi"
diff --git a/kernel/arch/mips/boot/dts/mti/Makefile b/kernel/arch/mips/boot/dts/mti/Makefile
index fcabd69b7..5ee06f73c 100644
--- a/kernel/arch/mips/boot/dts/mti/Makefile
+++ b/kernel/arch/mips/boot/dts/mti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_MIPS_MALTA)	+= malta.dtb
 dtb-$(CONFIG_LEGACY_BOARD_SEAD3)	+= sead3.dtb
 
diff --git a/kernel/arch/mips/boot/dts/mti/malta.dts b/kernel/arch/mips/boot/dts/mti/malta.dts
index ffe3a1508..9944e716e 100644
--- a/kernel/arch/mips/boot/dts/mti/malta.dts
+++ b/kernel/arch/mips/boot/dts/mti/malta.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/interrupt-controller/irq.h>
diff --git a/kernel/arch/mips/boot/dts/mti/sead3.dts b/kernel/arch/mips/boot/dts/mti/sead3.dts
index 4f8bc83c2..192c26ff1 100644
--- a/kernel/arch/mips/boot/dts/mti/sead3.dts
+++ b/kernel/arch/mips/boot/dts/mti/sead3.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /memreserve/ 0x00000000 0x00001000;	// reserved
diff --git a/kernel/arch/mips/boot/dts/netlogic/Makefile b/kernel/arch/mips/boot/dts/netlogic/Makefile
index 986805714..1cb2fdbd8 100644
--- a/kernel/arch/mips/boot/dts/netlogic/Makefile
+++ b/kernel/arch/mips/boot/dts/netlogic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_DT_XLP_EVP)	+= xlp_evp.dtb
 dtb-$(CONFIG_DT_XLP_SVP)	+= xlp_svp.dtb
 dtb-$(CONFIG_DT_XLP_FVP)	+= xlp_fvp.dtb
diff --git a/kernel/arch/mips/boot/dts/netlogic/xlp_evp.dts b/kernel/arch/mips/boot/dts/netlogic/xlp_evp.dts
index ec16ec2d8..e63e55926 100644
--- a/kernel/arch/mips/boot/dts/netlogic/xlp_evp.dts
+++ b/kernel/arch/mips/boot/dts/netlogic/xlp_evp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XLP8XX Device Tree Source for EVP boards
  */
diff --git a/kernel/arch/mips/boot/dts/netlogic/xlp_fvp.dts b/kernel/arch/mips/boot/dts/netlogic/xlp_fvp.dts
index 4bcebe641..d05abf13f 100644
--- a/kernel/arch/mips/boot/dts/netlogic/xlp_fvp.dts
+++ b/kernel/arch/mips/boot/dts/netlogic/xlp_fvp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XLP2XX Device Tree Source for FVP boards
  */
diff --git a/kernel/arch/mips/boot/dts/netlogic/xlp_gvp.dts b/kernel/arch/mips/boot/dts/netlogic/xlp_gvp.dts
index b3ccb82ad..d47de4851 100644
--- a/kernel/arch/mips/boot/dts/netlogic/xlp_gvp.dts
+++ b/kernel/arch/mips/boot/dts/netlogic/xlp_gvp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XLP9XX Device Tree Source for GVP boards
  */
diff --git a/kernel/arch/mips/boot/dts/netlogic/xlp_rvp.dts b/kernel/arch/mips/boot/dts/netlogic/xlp_rvp.dts
index 3783639a3..aa0faee19 100644
--- a/kernel/arch/mips/boot/dts/netlogic/xlp_rvp.dts
+++ b/kernel/arch/mips/boot/dts/netlogic/xlp_rvp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XLP5XX Device Tree Source for RVP boards
  */
diff --git a/kernel/arch/mips/boot/dts/netlogic/xlp_svp.dts b/kernel/arch/mips/boot/dts/netlogic/xlp_svp.dts
index 44d6640c1..3bb0b2e08 100644
--- a/kernel/arch/mips/boot/dts/netlogic/xlp_svp.dts
+++ b/kernel/arch/mips/boot/dts/netlogic/xlp_svp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XLP3XX Device Tree Source for SVP boards
  */
diff --git a/kernel/arch/mips/boot/dts/pic32/Makefile b/kernel/arch/mips/boot/dts/pic32/Makefile
index 7ac790551..a86ddd289 100644
--- a/kernel/arch/mips/boot/dts/pic32/Makefile
+++ b/kernel/arch/mips/boot/dts/pic32/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_DTB_PIC32_MZDA_SK)		+= pic32mzda_sk.dtb
 
 dtb-$(CONFIG_DTB_PIC32_NONE)		+= \
diff --git a/kernel/arch/mips/boot/dts/qca/Makefile b/kernel/arch/mips/boot/dts/qca/Makefile
index 63a9ddf04..eabd94eb5 100644
--- a/kernel/arch/mips/boot/dts/qca/Makefile
+++ b/kernel/arch/mips/boot/dts/qca/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # All DTBs
 dtb-$(CONFIG_ATH79)			+= ar9132_tl_wr1043nd_v1.dtb
 dtb-$(CONFIG_ATH79)			+= ar9331_dpt_module.dtb
diff --git a/kernel/arch/mips/boot/dts/qca/ar9132.dtsi b/kernel/arch/mips/boot/dts/qca/ar9132.dtsi
index 302f0a8d2..1fe561c5f 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9132.dtsi
+++ b/kernel/arch/mips/boot/dts/qca/ar9132.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/ath79-clk.h>
 
 / {
diff --git a/kernel/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/kernel/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
index 3c3b7ce57..3931033e4 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
+++ b/kernel/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/mips/boot/dts/qca/ar9331.dtsi b/kernel/arch/mips/boot/dts/qca/ar9331.dtsi
index cf47ed4d8..efd5f0722 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9331.dtsi
+++ b/kernel/arch/mips/boot/dts/qca/ar9331.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dt-bindings/clock/ath79-clk.h>
 
 / {
diff --git a/kernel/arch/mips/boot/dts/qca/ar9331_dpt_module.dts b/kernel/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
index 98e74500e..d4e4502da 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
+++ b/kernel/arch/mips/boot/dts/qca/ar9331_dpt_module.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts b/kernel/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
index 56f832076..4f95ccf17 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
+++ b/kernel/arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/mips/boot/dts/qca/ar9331_omega.dts b/kernel/arch/mips/boot/dts/qca/ar9331_omega.dts
index b2be3b044..f70f79c4d 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9331_omega.dts
+++ b/kernel/arch/mips/boot/dts/qca/ar9331_omega.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts b/kernel/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
index 919cf3b85..748131aea 100644
--- a/kernel/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
+++ b/kernel/arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include <dt-bindings/gpio/gpio.h>
diff --git a/kernel/arch/mips/boot/dts/ralink/Makefile b/kernel/arch/mips/boot/dts/ralink/Makefile
index 55e2937b6..a80eeeecf 100644
--- a/kernel/arch/mips/boot/dts/ralink/Makefile
+++ b/kernel/arch/mips/boot/dts/ralink/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_DTB_RT2880_EVAL)	+= rt2880_eval.dtb
 dtb-$(CONFIG_DTB_RT305X_EVAL)	+= rt3052_eval.dtb
 dtb-$(CONFIG_DTB_RT3883_EVAL)	+= rt3883_eval.dtb
diff --git a/kernel/arch/mips/boot/dts/ralink/mt7620a.dtsi b/kernel/arch/mips/boot/dts/ralink/mt7620a.dtsi
index 793c0c7ca..1f6e5320f 100644
--- a/kernel/arch/mips/boot/dts/ralink/mt7620a.dtsi
+++ b/kernel/arch/mips/boot/dts/ralink/mt7620a.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/ralink/mt7620a_eval.dts b/kernel/arch/mips/boot/dts/ralink/mt7620a_eval.dts
index 709f58132..8de8f89f3 100644
--- a/kernel/arch/mips/boot/dts/ralink/mt7620a_eval.dts
+++ b/kernel/arch/mips/boot/dts/ralink/mt7620a_eval.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "mt7620a.dtsi"
diff --git a/kernel/arch/mips/boot/dts/ralink/rt2880.dtsi b/kernel/arch/mips/boot/dts/ralink/rt2880.dtsi
index fb2faef0a..8fc1987d9 100644
--- a/kernel/arch/mips/boot/dts/ralink/rt2880.dtsi
+++ b/kernel/arch/mips/boot/dts/ralink/rt2880.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/ralink/rt2880_eval.dts b/kernel/arch/mips/boot/dts/ralink/rt2880_eval.dts
index 0a685db09..759bc1dd5 100644
--- a/kernel/arch/mips/boot/dts/ralink/rt2880_eval.dts
+++ b/kernel/arch/mips/boot/dts/ralink/rt2880_eval.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "rt2880.dtsi"
diff --git a/kernel/arch/mips/boot/dts/ralink/rt3050.dtsi b/kernel/arch/mips/boot/dts/ralink/rt3050.dtsi
index d3cb57f98..23062333a 100644
--- a/kernel/arch/mips/boot/dts/ralink/rt3050.dtsi
+++ b/kernel/arch/mips/boot/dts/ralink/rt3050.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/ralink/rt3052_eval.dts b/kernel/arch/mips/boot/dts/ralink/rt3052_eval.dts
index ec9e9a035..674efdd42 100644
--- a/kernel/arch/mips/boot/dts/ralink/rt3052_eval.dts
+++ b/kernel/arch/mips/boot/dts/ralink/rt3052_eval.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "rt3050.dtsi"
diff --git a/kernel/arch/mips/boot/dts/ralink/rt3883.dtsi b/kernel/arch/mips/boot/dts/ralink/rt3883.dtsi
index 3d6fc9afd..61132cf15 100644
--- a/kernel/arch/mips/boot/dts/ralink/rt3883.dtsi
+++ b/kernel/arch/mips/boot/dts/ralink/rt3883.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/ralink/rt3883_eval.dts b/kernel/arch/mips/boot/dts/ralink/rt3883_eval.dts
index e8df21a5d..c22bc84df 100644
--- a/kernel/arch/mips/boot/dts/ralink/rt3883_eval.dts
+++ b/kernel/arch/mips/boot/dts/ralink/rt3883_eval.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 /include/ "rt3883.dtsi"
diff --git a/kernel/arch/mips/boot/dts/xilfpga/Makefile b/kernel/arch/mips/boot/dts/xilfpga/Makefile
index 913a752a9..498ac081e 100644
--- a/kernel/arch/mips/boot/dts/xilfpga/Makefile
+++ b/kernel/arch/mips/boot/dts/xilfpga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dtb-$(CONFIG_XILFPGA_NEXYS4DDR)	+= nexys4ddr.dtb
 
 obj-y				+= $(patsubst %.dtb, %.dtb.o, $(dtb-y))
diff --git a/kernel/arch/mips/boot/dts/xilfpga/microAptiv.dtsi b/kernel/arch/mips/boot/dts/xilfpga/microAptiv.dtsi
index 81d518e75..87b2b1f9a 100644
--- a/kernel/arch/mips/boot/dts/xilfpga/microAptiv.dtsi
+++ b/kernel/arch/mips/boot/dts/xilfpga/microAptiv.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/kernel/arch/mips/boot/dts/xilfpga/nexys4ddr.dts b/kernel/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
index 09a62f2e2..41fee03dc 100644
--- a/kernel/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
+++ b/kernel/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 #include "microAptiv.dtsi"
diff --git a/kernel/arch/mips/boot/ecoff.h b/kernel/arch/mips/boot/ecoff.h
index 7a75ce2c1..b3e73c22c 100644
--- a/kernel/arch/mips/boot/ecoff.h
+++ b/kernel/arch/mips/boot/ecoff.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Some ECOFF definitions.
  */
diff --git a/kernel/arch/mips/boot/tools/Makefile b/kernel/arch/mips/boot/tools/Makefile
index d232a68f6..5f8e73734 100644
--- a/kernel/arch/mips/boot/tools/Makefile
+++ b/kernel/arch/mips/boot/tools/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 hostprogs-y	+= relocs
 relocs-objs	+= relocs_32.o
diff --git a/kernel/arch/mips/boot/tools/relocs.c b/kernel/arch/mips/boot/tools/relocs.c
index b9cbf7852..1bf53f352 100644
--- a/kernel/arch/mips/boot/tools/relocs.c
+++ b/kernel/arch/mips/boot/tools/relocs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* This is included from relocs_32/64.c */
 
 #define ElfW(type)		_ElfW(ELF_BITS, type)
diff --git a/kernel/arch/mips/boot/tools/relocs.h b/kernel/arch/mips/boot/tools/relocs.h
index 3cf676f49..607ff0103 100644
--- a/kernel/arch/mips/boot/tools/relocs.h
+++ b/kernel/arch/mips/boot/tools/relocs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RELOCS_H
 #define RELOCS_H
 
diff --git a/kernel/arch/mips/boot/tools/relocs_32.c b/kernel/arch/mips/boot/tools/relocs_32.c
index 915bdc07f..428bea489 100644
--- a/kernel/arch/mips/boot/tools/relocs_32.c
+++ b/kernel/arch/mips/boot/tools/relocs_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "relocs.h"
 
 #define ELF_BITS 32
diff --git a/kernel/arch/mips/boot/tools/relocs_64.c b/kernel/arch/mips/boot/tools/relocs_64.c
index 06066e6ac..154015d74 100644
--- a/kernel/arch/mips/boot/tools/relocs_64.c
+++ b/kernel/arch/mips/boot/tools/relocs_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "relocs.h"
 
 #define ELF_BITS 64
diff --git a/kernel/arch/mips/boot/tools/relocs_main.c b/kernel/arch/mips/boot/tools/relocs_main.c
index d8fe2343b..e2453a564 100644
--- a/kernel/arch/mips/boot/tools/relocs_main.c
+++ b/kernel/arch/mips/boot/tools/relocs_main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/kernel/arch/mips/cavium-octeon/Kconfig b/kernel/arch/mips/cavium-octeon/Kconfig
index 5c0b56203..204a1670f 100644
--- a/kernel/arch/mips/cavium-octeon/Kconfig
+++ b/kernel/arch/mips/cavium-octeon/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if CPU_CAVIUM_OCTEON
 
 config CAVIUM_CN63XXP1
diff --git a/kernel/arch/mips/cavium-octeon/crypto/Makefile b/kernel/arch/mips/cavium-octeon/crypto/Makefile
index f7aa9d5d3..db26c73fa 100644
--- a/kernel/arch/mips/cavium-octeon/crypto/Makefile
+++ b/kernel/arch/mips/cavium-octeon/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # OCTEON-specific crypto modules.
 #
diff --git a/kernel/arch/mips/dec/int-handler.S b/kernel/arch/mips/dec/int-handler.S
index cea2bb162..a25ef822e 100644
--- a/kernel/arch/mips/dec/int-handler.S
+++ b/kernel/arch/mips/dec/int-handler.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1995, 1996, 1997 Paul M. Antoine and Harald Koerfgen
  * Copyright (C) 2000, 2001, 2002, 2003, 2005  Maciej W. Rozycki
diff --git a/kernel/arch/mips/dec/prom/cmdline.c b/kernel/arch/mips/dec/prom/cmdline.c
index c3490bebb..3ed63280a 100644
--- a/kernel/arch/mips/dec/prom/cmdline.c
+++ b/kernel/arch/mips/dec/prom/cmdline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cmdline.c: read the command line passed to us by the PROM.
  *
diff --git a/kernel/arch/mips/dec/prom/dectypes.h b/kernel/arch/mips/dec/prom/dectypes.h
index 69ea5b9c8..9fcbcc7cd 100644
--- a/kernel/arch/mips/dec/prom/dectypes.h
+++ b/kernel/arch/mips/dec/prom/dectypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DECTYPES
 #define DECTYPES
 
diff --git a/kernel/arch/mips/dec/prom/identify.c b/kernel/arch/mips/dec/prom/identify.c
index 0c14a9d6a..80cd14cd1 100644
--- a/kernel/arch/mips/dec/prom/identify.c
+++ b/kernel/arch/mips/dec/prom/identify.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * identify.c: machine identification code.
  *
diff --git a/kernel/arch/mips/dec/prom/init.c b/kernel/arch/mips/dec/prom/init.c
index d88eb7a66..cc988bbd2 100644
--- a/kernel/arch/mips/dec/prom/init.c
+++ b/kernel/arch/mips/dec/prom/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * init.c: PROM library initialisation code.
  *
diff --git a/kernel/arch/mips/dec/prom/locore.S b/kernel/arch/mips/dec/prom/locore.S
index f72b57410..0eb8fab62 100644
--- a/kernel/arch/mips/dec/prom/locore.S
+++ b/kernel/arch/mips/dec/prom/locore.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * locore.S
  */
diff --git a/kernel/arch/mips/dec/prom/memory.c b/kernel/arch/mips/dec/prom/memory.c
index 8c62316f2..a2acc6454 100644
--- a/kernel/arch/mips/dec/prom/memory.c
+++ b/kernel/arch/mips/dec/prom/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * memory.c: memory initialisation code.
  *
diff --git a/kernel/arch/mips/dec/reset.c b/kernel/arch/mips/dec/reset.c
index c15a87904..3df01f1da 100644
--- a/kernel/arch/mips/dec/reset.c
+++ b/kernel/arch/mips/dec/reset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Reset a DECstation machine.
  *
diff --git a/kernel/arch/mips/dec/time.c b/kernel/arch/mips/dec/time.c
index 1914e56f0..a2a150e4f 100644
--- a/kernel/arch/mips/dec/time.c
+++ b/kernel/arch/mips/dec/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992, 1995  Linus Torvalds
  *  Copyright (C) 2000, 2003  Maciej W. Rozycki
diff --git a/kernel/arch/mips/fw/arc/Makefile b/kernel/arch/mips/fw/arc/Makefile
index 4f349ec1e..31dd7305d 100644
--- a/kernel/arch/mips/fw/arc/Makefile
+++ b/kernel/arch/mips/fw/arc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ARC prom monitor library routines under Linux.
 #
diff --git a/kernel/arch/mips/fw/arc/arc_con.c b/kernel/arch/mips/fw/arc/arc_con.c
index bc32fe64f..769d4b9ac 100644
--- a/kernel/arch/mips/fw/arc/arc_con.c
+++ b/kernel/arch/mips/fw/arc/arc_con.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wrap-around code for a console using the
  * ARC io-routines.
diff --git a/kernel/arch/mips/fw/arc/memory.c b/kernel/arch/mips/fw/arc/memory.c
index 0d75b5a0b..dd9496f26 100644
--- a/kernel/arch/mips/fw/arc/memory.c
+++ b/kernel/arch/mips/fw/arc/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * memory.c: PROM library functions for acquiring/using memory descriptors
  *	     given to us from the ARCS firmware.
diff --git a/kernel/arch/mips/fw/arc/salone.c b/kernel/arch/mips/fw/arc/salone.c
index 9b568950d..2d99f44d5 100644
--- a/kernel/arch/mips/fw/arc/salone.c
+++ b/kernel/arch/mips/fw/arc/salone.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Routines to load into memory and execute stand-along program images using
  * ARCS PROM firmware.
diff --git a/kernel/arch/mips/generic/Kconfig b/kernel/arch/mips/generic/Kconfig
index e0436aaf7..0b67c4666 100644
--- a/kernel/arch/mips/generic/Kconfig
+++ b/kernel/arch/mips/generic/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MIPS_GENERIC
 
 config LEGACY_BOARDS
diff --git a/kernel/arch/mips/generic/Makefile b/kernel/arch/mips/generic/Makefile
index 56b3ea565..874967363 100644
--- a/kernel/arch/mips/generic/Makefile
+++ b/kernel/arch/mips/generic/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 Imagination Technologies
-# Author: Paul Burton <paul.burton@imgtec.com>
+# Author: Paul Burton <paul.burton@mips.com>
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/generic/Platform b/kernel/arch/mips/generic/Platform
index f5312dfa8..b51432dd1 100644
--- a/kernel/arch/mips/generic/Platform
+++ b/kernel/arch/mips/generic/Platform
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2016 Imagination Technologies
-# Author: Paul Burton <paul.burton@imgtec.com>
+# Author: Paul Burton <paul.burton@mips.com>
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/generic/board-ni169445.its.S b/kernel/arch/mips/generic/board-ni169445.its.S
index d12e12fe9..e4cb4f95a 100644
--- a/kernel/arch/mips/generic/board-ni169445.its.S
+++ b/kernel/arch/mips/generic/board-ni169445.its.S
@@ -1,4 +1,4 @@
-{
+/ {
 	images {
 		fdt@ni169445 {
 			description = "NI 169445 device tree";
diff --git a/kernel/arch/mips/generic/board-sead3.c b/kernel/arch/mips/generic/board-sead3.c
index f109a6b9f..10cf93d97 100644
--- a/kernel/arch/mips/generic/board-sead3.c
+++ b/kernel/arch/mips/generic/board-sead3.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/generic/init.c b/kernel/arch/mips/generic/init.c
index 15a7fb8e2..5ba6fcc26 100644
--- a/kernel/arch/mips/generic/init.c
+++ b/kernel/arch/mips/generic/init.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -20,7 +20,7 @@
 #include <asm/fw/fw.h>
 #include <asm/irq_cpu.h>
 #include <asm/machine.h>
-#include <asm/mips-cpc.h>
+#include <asm/mips-cps.h>
 #include <asm/prom.h>
 #include <asm/smp-ops.h>
 #include <asm/time.h>
diff --git a/kernel/arch/mips/generic/irq.c b/kernel/arch/mips/generic/irq.c
index 5322d09dd..394f8161e 100644
--- a/kernel/arch/mips/generic/irq.c
+++ b/kernel/arch/mips/generic/irq.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/generic/kexec.c b/kernel/arch/mips/generic/kexec.c
index e9fb73529..1ca409f58 100644
--- a/kernel/arch/mips/generic/kexec.c
+++ b/kernel/arch/mips/generic/kexec.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+ * Author: Marcin Nowakowski <marcin.nowakowski@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/generic/proc.c b/kernel/arch/mips/generic/proc.c
index 42b33250a..199fb2cc5 100644
--- a/kernel/arch/mips/generic/proc.c
+++ b/kernel/arch/mips/generic/proc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/generic/vmlinux.its.S b/kernel/arch/mips/generic/vmlinux.its.S
index f67fbf1c8..1a08438fd 100644
--- a/kernel/arch/mips/generic/vmlinux.its.S
+++ b/kernel/arch/mips/generic/vmlinux.its.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /dts-v1/;
 
 / {
diff --git a/kernel/arch/mips/generic/yamon-dt.c b/kernel/arch/mips/generic/yamon-dt.c
index 6077bca9b..b408dac72 100644
--- a/kernel/arch/mips/generic/yamon-dt.c
+++ b/kernel/arch/mips/generic/yamon-dt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/asm-prototypes.h b/kernel/arch/mips/include/asm/asm-prototypes.h
index 6e28971fe..d60b57f34 100644
--- a/kernel/arch/mips/include/asm/asm-prototypes.h
+++ b/kernel/arch/mips/include/asm/asm-prototypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/checksum.h>
 #include <asm/page.h>
 #include <asm/fpu.h>
diff --git a/kernel/arch/mips/include/asm/asmmacro-32.h b/kernel/arch/mips/include/asm/asmmacro-32.h
index 0ef39ad0f..1c08c1f79 100644
--- a/kernel/arch/mips/include/asm/asmmacro-32.h
+++ b/kernel/arch/mips/include/asm/asmmacro-32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * asmmacro.h: Assembler macros to make things easier to read.
  *
diff --git a/kernel/arch/mips/include/asm/asmmacro-64.h b/kernel/arch/mips/include/asm/asmmacro-64.h
index 38ea60946..68039dee5 100644
--- a/kernel/arch/mips/include/asm/asmmacro-64.h
+++ b/kernel/arch/mips/include/asm/asmmacro-64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * asmmacro.h: Assembler macros to make things easier to read.
  *
diff --git a/kernel/arch/mips/include/asm/bitrev.h b/kernel/arch/mips/include/asm/bitrev.h
index bc739a404..8a2538e08 100644
--- a/kernel/arch/mips/include/asm/bitrev.h
+++ b/kernel/arch/mips/include/asm/bitrev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MIPS_ASM_BITREV_H__
 #define __MIPS_ASM_BITREV_H__
 
diff --git a/kernel/arch/mips/include/asm/bmips-spaces.h b/kernel/arch/mips/include/asm/bmips-spaces.h
index eb96541ae..febc4c30a 100644
--- a/kernel/arch/mips/include/asm/bmips-spaces.h
+++ b/kernel/arch/mips/include/asm/bmips-spaces.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_BMIPS_SPACES_H
 #define __ASM_BMIPS_SPACES_H
 
diff --git a/kernel/arch/mips/include/asm/bug.h b/kernel/arch/mips/include/asm/bug.h
index 540c98a81..745dc160a 100644
--- a/kernel/arch/mips/include/asm/bug.h
+++ b/kernel/arch/mips/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_BUG_H
 #define __ASM_BUG_H
 
diff --git a/kernel/arch/mips/include/asm/bugs.h b/kernel/arch/mips/include/asm/bugs.h
index b160a7067..d8ab8b712 100644
--- a/kernel/arch/mips/include/asm/bugs.h
+++ b/kernel/arch/mips/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is included by init/main.c to check for architecture-dependent bugs.
  *
diff --git a/kernel/arch/mips/include/asm/clock.h b/kernel/arch/mips/include/asm/clock.h
index 4809c29a4..5a8f96ebe 100644
--- a/kernel/arch/mips/include/asm/clock.h
+++ b/kernel/arch/mips/include/asm/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MIPS_CLOCK_H
 #define __ASM_MIPS_CLOCK_H
 
diff --git a/kernel/arch/mips/include/asm/cmp.h b/kernel/arch/mips/include/asm/cmp.h
index 033d97303..e9e87504b 100644
--- a/kernel/arch/mips/include/asm/cmp.h
+++ b/kernel/arch/mips/include/asm/cmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CMP_H
 #define _ASM_CMP_H
 
diff --git a/kernel/arch/mips/include/asm/compat-signal.h b/kernel/arch/mips/include/asm/compat-signal.h
index 4c6176467..e87cd243b 100644
--- a/kernel/arch/mips/include/asm/compat-signal.h
+++ b/kernel/arch/mips/include/asm/compat-signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_COMPAT_SIGNAL_H
 #define __ASM_COMPAT_SIGNAL_H
 
diff --git a/kernel/arch/mips/include/asm/compat.h b/kernel/arch/mips/include/asm/compat.h
index a9580097c..8e2b5b556 100644
--- a/kernel/arch/mips/include/asm/compat.h
+++ b/kernel/arch/mips/include/asm/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_COMPAT_H
 #define _ASM_COMPAT_H
 /*
diff --git a/kernel/arch/mips/include/asm/cpu.h b/kernel/arch/mips/include/asm/cpu.h
index ece9b84f3..d39324c4a 100644
--- a/kernel/arch/mips/include/asm/cpu.h
+++ b/kernel/arch/mips/include/asm/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * cpu.h: Values of the PRId register used to match up
  *	  various MIPS cpu types.
diff --git a/kernel/arch/mips/include/asm/dma-mapping.h b/kernel/arch/mips/include/asm/dma-mapping.h
index aba71385f..42f8cbad6 100644
--- a/kernel/arch/mips/include/asm/dma-mapping.h
+++ b/kernel/arch/mips/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_DMA_MAPPING_H
 #define _ASM_DMA_MAPPING_H
 
diff --git a/kernel/arch/mips/include/asm/dma.h b/kernel/arch/mips/include/asm/dma.h
index 5b9ed1bff..be726b943 100644
--- a/kernel/arch/mips/include/asm/dma.h
+++ b/kernel/arch/mips/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
diff --git a/kernel/arch/mips/include/asm/dsemul.h b/kernel/arch/mips/include/asm/dsemul.h
index a6e067801..b47a97527 100644
--- a/kernel/arch/mips/include/asm/dsemul.h
+++ b/kernel/arch/mips/include/asm/dsemul.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/edac.h b/kernel/arch/mips/include/asm/edac.h
index 980b16527..fc4677673 100644
--- a/kernel/arch/mips/include/asm/edac.h
+++ b/kernel/arch/mips/include/asm/edac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_EDAC_H
 #define ASM_EDAC_H
 
diff --git a/kernel/arch/mips/include/asm/extable.h b/kernel/arch/mips/include/asm/extable.h
index dce7a627a..78d0ae156 100644
--- a/kernel/arch/mips/include/asm/extable.h
+++ b/kernel/arch/mips/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_EXTABLE_H
 #define _ASM_EXTABLE_H
 
diff --git a/kernel/arch/mips/include/asm/fw/arc/hinv.h b/kernel/arch/mips/include/asm/fw/arc/hinv.h
index 9fac64a26..d67b6a90f 100644
--- a/kernel/arch/mips/include/asm/fw/arc/hinv.h
+++ b/kernel/arch/mips/include/asm/fw/arc/hinv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ARCS hardware/memory inventory/configuration and system ID definitions.
  */
diff --git a/kernel/arch/mips/include/asm/gio_device.h b/kernel/arch/mips/include/asm/gio_device.h
index 71a986e9b..c52948f9c 100644
--- a/kernel/arch/mips/include/asm/gio_device.h
+++ b/kernel/arch/mips/include/asm/gio_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
 
diff --git a/kernel/arch/mips/include/asm/highmem.h b/kernel/arch/mips/include/asm/highmem.h
index 279b6d14f..9d84aafc3 100644
--- a/kernel/arch/mips/include/asm/highmem.h
+++ b/kernel/arch/mips/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * highmem.h: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/mips/include/asm/hpet.h b/kernel/arch/mips/include/asm/hpet.h
index 18a8f778b..d47268ece 100644
--- a/kernel/arch/mips/include/asm/hpet.h
+++ b/kernel/arch/mips/include/asm/hpet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HPET_H
 #define _ASM_HPET_H
 
diff --git a/kernel/arch/mips/include/asm/idle.h b/kernel/arch/mips/include/asm/idle.h
index a2d18ab57..655a6dbc8 100644
--- a/kernel/arch/mips/include/asm/idle.h
+++ b/kernel/arch/mips/include/asm/idle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IDLE_H
 #define __ASM_IDLE_H
 
diff --git a/kernel/arch/mips/include/asm/isadep.h b/kernel/arch/mips/include/asm/isadep.h
index b4af6eb24..d16832023 100644
--- a/kernel/arch/mips/include/asm/isadep.h
+++ b/kernel/arch/mips/include/asm/isadep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Various ISA level dependent constants.
  * Most of the following constants reflect the different layout
diff --git a/kernel/arch/mips/include/asm/jazzdma.h b/kernel/arch/mips/include/asm/jazzdma.h
index 2cefc3c47..d913439c7 100644
--- a/kernel/arch/mips/include/asm/jazzdma.h
+++ b/kernel/arch/mips/include/asm/jazzdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Helpfile for jazzdma.c -- Mips Jazz R4030 DMA controller support
  */
diff --git a/kernel/arch/mips/include/asm/kdebug.h b/kernel/arch/mips/include/asm/kdebug.h
index 8e3d08e73..a55a207cf 100644
--- a/kernel/arch/mips/include/asm/kdebug.h
+++ b/kernel/arch/mips/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MIPS_KDEBUG_H
 #define _ASM_MIPS_KDEBUG_H
 
diff --git a/kernel/arch/mips/include/asm/kgdb.h b/kernel/arch/mips/include/asm/kgdb.h
index 69dc0df94..4f2302267 100644
--- a/kernel/arch/mips/include/asm/kgdb.h
+++ b/kernel/arch/mips/include/asm/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_KGDB_H_
 #define __ASM_KGDB_H_
 
diff --git a/kernel/arch/mips/include/asm/kmap_types.h b/kernel/arch/mips/include/asm/kmap_types.h
index c1909dcad..16665dc24 100644
--- a/kernel/arch/mips/include/asm/kmap_types.h
+++ b/kernel/arch/mips/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
diff --git a/kernel/arch/mips/include/asm/kvm_para.h b/kernel/arch/mips/include/asm/kvm_para.h
index 5a9aa918a..60b1aa0b7 100644
--- a/kernel/arch/mips/include/asm/kvm_para.h
+++ b/kernel/arch/mips/include/asm/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MIPS_KVM_PARA_H
 #define _ASM_MIPS_KVM_PARA_H
 
diff --git a/kernel/arch/mips/include/asm/lasat/ds1603.h b/kernel/arch/mips/include/asm/lasat/ds1603.h
index edcd7544b..ab833be96 100644
--- a/kernel/arch/mips/include/asm/lasat/ds1603.h
+++ b/kernel/arch/mips/include/asm/lasat/ds1603.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/addrspace.h>
 
 /* Lasat 100	*/
diff --git a/kernel/arch/mips/include/asm/lasat/eeprom.h b/kernel/arch/mips/include/asm/lasat/eeprom.h
index d918b822e..24001a5cb 100644
--- a/kernel/arch/mips/include/asm/lasat/eeprom.h
+++ b/kernel/arch/mips/include/asm/lasat/eeprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/addrspace.h>
 
 /* lasat 100 */
diff --git a/kernel/arch/mips/include/asm/lasat/head.h b/kernel/arch/mips/include/asm/lasat/head.h
index f5589f31a..20b0ecedd 100644
--- a/kernel/arch/mips/include/asm/lasat/head.h
+++ b/kernel/arch/mips/include/asm/lasat/head.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Image header stuff
  */
diff --git a/kernel/arch/mips/include/asm/lasat/lasatint.h b/kernel/arch/mips/include/asm/lasat/lasatint.h
index e0d2458b4..b2b346e0c 100644
--- a/kernel/arch/mips/include/asm/lasat/lasatint.h
+++ b/kernel/arch/mips/include/asm/lasat/lasatint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LASAT_LASATINT_H
 #define __ASM_LASAT_LASATINT_H
 
diff --git a/kernel/arch/mips/include/asm/lasat/picvue.h b/kernel/arch/mips/include/asm/lasat/picvue.h
index 42a492edc..99987c5a4 100644
--- a/kernel/arch/mips/include/asm/lasat/picvue.h
+++ b/kernel/arch/mips/include/asm/lasat/picvue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Lasat 100 */
 #define PVC_REG_100		KSEG1ADDR(0x1c820000)
 #define PVC_DATA_SHIFT_100	0
diff --git a/kernel/arch/mips/include/asm/lasat/serial.h b/kernel/arch/mips/include/asm/lasat/serial.h
index a2f6c7a9c..7b43d7408 100644
--- a/kernel/arch/mips/include/asm/lasat/serial.h
+++ b/kernel/arch/mips/include/asm/lasat/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/lasat/lasat.h>
 
 /* Lasat 100 boards serial configuration */
diff --git a/kernel/arch/mips/include/asm/linkage.h b/kernel/arch/mips/include/asm/linkage.h
index 99651b0ea..1829c2b6d 100644
--- a/kernel/arch/mips/include/asm/linkage.h
+++ b/kernel/arch/mips/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/mips/include/asm/local.h b/kernel/arch/mips/include/asm/local.h
index 8feaed62a..ac8264eca 100644
--- a/kernel/arch/mips/include/asm/local.h
+++ b/kernel/arch/mips/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_MIPS_LOCAL_H
 #define _ARCH_MIPS_LOCAL_H
 
diff --git a/kernel/arch/mips/include/asm/m48t37.h b/kernel/arch/mips/include/asm/m48t37.h
index e6eaf5339..3687a02e6 100644
--- a/kernel/arch/mips/include/asm/m48t37.h
+++ b/kernel/arch/mips/include/asm/m48t37.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Registers for the SGS-Thomson M48T37 Timekeeper RAM chip
  */
diff --git a/kernel/arch/mips/include/asm/maar.h b/kernel/arch/mips/include/asm/maar.h
index e10f78bef..1e0da80bb 100644
--- a/kernel/arch/mips/include/asm/maar.h
+++ b/kernel/arch/mips/include/asm/maar.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mach-ath25/ath25_platform.h b/kernel/arch/mips/include/asm/mach-ath25/ath25_platform.h
index 4f4ee4f9e..0aacc55aa 100644
--- a/kernel/arch/mips/include/asm/mach-ath25/ath25_platform.h
+++ b/kernel/arch/mips/include/asm/mach-ath25/ath25_platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_ATH25_PLATFORM_H
 #define __ASM_MACH_ATH25_PLATFORM_H
 
diff --git a/kernel/arch/mips/include/asm/mach-au1x00/au1200fb.h b/kernel/arch/mips/include/asm/mach-au1x00/au1200fb.h
index b3c87cc64..e0e98f06c 100644
--- a/kernel/arch/mips/include/asm/mach-au1x00/au1200fb.h
+++ b/kernel/arch/mips/include/asm/mach-au1x00/au1200fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * platform data for au1200fb driver.
  */
diff --git a/kernel/arch/mips/include/asm/mach-au1x00/au1550_spi.h b/kernel/arch/mips/include/asm/mach-au1x00/au1550_spi.h
index 08e1958e9..fe6ca4606 100644
--- a/kernel/arch/mips/include/asm/mach-au1x00/au1550_spi.h
+++ b/kernel/arch/mips/include/asm/mach-au1x00/au1550_spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * au1550_spi.h - Au1550 PSC SPI controller driver - platform data structure
  */
diff --git a/kernel/arch/mips/include/asm/mach-au1x00/au1550nd.h b/kernel/arch/mips/include/asm/mach-au1x00/au1550nd.h
index ad4c0a03a..d26dc1dad 100644
--- a/kernel/arch/mips/include/asm/mach-au1x00/au1550nd.h
+++ b/kernel/arch/mips/include/asm/mach-au1x00/au1550nd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * platform data for the Au1550 NAND driver
  */
diff --git a/kernel/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h b/kernel/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
index 49dc8d9db..9d1c8d5ed 100644
--- a/kernel/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
+++ b/kernel/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AU1X00_ETH_DATA_H
 #define __AU1X00_ETH_DATA_H
 
diff --git a/kernel/arch/mips/include/asm/mach-au1x00/gpio-au1300.h b/kernel/arch/mips/include/asm/mach-au1x00/gpio-au1300.h
index d607d643b..d25846a12 100644
--- a/kernel/arch/mips/include/asm/mach-au1x00/gpio-au1300.h
+++ b/kernel/arch/mips/include/asm/mach-au1x00/gpio-au1300.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * gpio-au1300.h -- GPIO control for Au1300 GPIC and compatibles.
  *
diff --git a/kernel/arch/mips/include/asm/mach-au1x00/prom.h b/kernel/arch/mips/include/asm/mach-au1x00/prom.h
index 4c0e09cf1..c62ee0246 100644
--- a/kernel/arch/mips/include/asm/mach-au1x00/prom.h
+++ b/kernel/arch/mips/include/asm/mach-au1x00/prom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AU1X00_PROM_H
 #define __AU1X00_PROM_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/kernel/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
index ee3d4fe51..cbf9da7f2 100644
--- a/kernel/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+++ b/kernel/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM47XX_BOARD_H
 #define __BCM47XX_BOARD_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h b/kernel/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
index b7992cd4a..b23ff47ea 100644
--- a/kernel/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
+++ b/kernel/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h
index fa3e7e617..1d19a726f 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_BOARD_H_
 #define BCM63XX_BOARD_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
index 56bb19219..1cad18e66 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_CPU_H_
 #define BCM63XX_CPU_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h
index b1821c866..1c634d7c1 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_CS_H
 #define BCM63XX_CS_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h
index b587d45c3..4e4970787 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM63XX_DSP_H
 #define __BCM63XX_DSP_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
index c4e856f27..c0bd47444 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_ENET_H_
 #define BCM63XX_DEV_ENET_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
index 354b8481e..4d5005f2b 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM63XX_FLASH_H
 #define __BCM63XX_FLASH_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
index 1b1acafb3..f93f176c1 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_HSSPI_H
 #define BCM63XX_DEV_HSSPI_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h
index c549344b7..1951c125c 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_PCI_H_
 #define BCM63XX_DEV_PCI_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h
index 2beb3969c..01674ac58 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_PCMCIA_H_
 #define BCM63XX_DEV_PCMCIA_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
index dd2995488..0ab750522 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_SPI_H
 #define BCM63XX_DEV_SPI_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
index 23c705baf..88f8cf1c7 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_UART_H_
 #define BCM63XX_DEV_UART_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
index 5d6d6986f..3f920baff 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_DEV_USB_USBD_H_
 #define BCM63XX_DEV_USB_USBD_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
index 565ff36a1..8fe88c225 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_GPIO_H
 #define BCM63XX_GPIO_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
index 7033144aa..31c692433 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_IO_H_
 #define BCM63XX_IO_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h
index 0c3074b87..7887bc690 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_IRQ_H_
 #define BCM63XX_IRQ_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
index 1e89df724..73df916e4 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_IUDMA_H_
 #define BCM63XX_IUDMA_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
index 348df49dc..f78d725f2 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_NVRAM_H
 #define BCM63XX_NVRAM_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
index 24080af57..bc3444cd4 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_REGS_H_
 #define BCM63XX_REGS_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h
index 3a6eb9c1a..2c0645b7d 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM63XX_RESET_H
 #define __BCM63XX_RESET_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h
index c0fce833c..bcbece793 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_TIMER_H_
 #define BCM63XX_TIMER_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h b/kernel/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
index b86a0efba..5e5b1bc4a 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOARD_BCM963XX_H_
 #define BOARD_BCM963XX_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/kernel/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
index b56cf10b9..0ebecbdb9 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/ioremap.h b/kernel/arch/mips/include/asm/mach-bcm63xx/ioremap.h
index aea6e64b8..8cd261ec0 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/ioremap.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/ioremap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_IOREMAP_H_
 #define BCM63XX_IOREMAP_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-bcm63xx/irq.h b/kernel/arch/mips/include/asm/mach-bcm63xx/irq.h
index 2bbfc8d1f..b016f0615 100644
--- a/kernel/arch/mips/include/asm/mach-bcm63xx/irq.h
+++ b/kernel/arch/mips/include/asm/mach-bcm63xx/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_BCM63XX_IRQ_H
 #define __ASM_MACH_BCM63XX_IRQ_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h b/kernel/arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h
index fa0583e1c..68a219d80 100644
--- a/kernel/arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h
+++ b/kernel/arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_BMIPS_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_BMIPS_CPU_FEATURE_OVERRIDES_H
 
diff --git a/kernel/arch/mips/include/asm/mach-bmips/ioremap.h b/kernel/arch/mips/include/asm/mach-bmips/ioremap.h
index 29c7a7bb7..52632ebc7 100644
--- a/kernel/arch/mips/include/asm/mach-bmips/ioremap.h
+++ b/kernel/arch/mips/include/asm/mach-bmips/ioremap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_BMIPS_IOREMAP_H
 #define __ASM_MACH_BMIPS_IOREMAP_H
 
diff --git a/kernel/arch/mips/include/asm/mach-db1x00/bcsr.h b/kernel/arch/mips/include/asm/mach-db1x00/bcsr.h
index 3c3ed4ae4..4a27738e8 100644
--- a/kernel/arch/mips/include/asm/mach-db1x00/bcsr.h
+++ b/kernel/arch/mips/include/asm/mach-db1x00/bcsr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * bcsr.h -- Db1xxx/Pb1xxx Devboard CPLD registers ("BCSR") abstraction.
  *
diff --git a/kernel/arch/mips/include/asm/mach-generic/kmalloc.h b/kernel/arch/mips/include/asm/mach-generic/kmalloc.h
index a5d669086..74207c7bd 100644
--- a/kernel/arch/mips/include/asm/mach-generic/kmalloc.h
+++ b/kernel/arch/mips/include/asm/mach-generic/kmalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_GENERIC_KMALLOC_H
 #define __ASM_MACH_GENERIC_KMALLOC_H
 
diff --git a/kernel/arch/mips/include/asm/mach-ip27/mmzone.h b/kernel/arch/mips/include/asm/mach-ip27/mmzone.h
index ebc9377ff..2ed3094de 100644
--- a/kernel/arch/mips/include/asm/mach-ip27/mmzone.h
+++ b/kernel/arch/mips/include/asm/mach-ip27/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MACH_MMZONE_H
 #define _ASM_MACH_MMZONE_H
 
diff --git a/kernel/arch/mips/include/asm/mach-ip27/topology.h b/kernel/arch/mips/include/asm/mach-ip27/topology.h
index 3fb7a0e09..42ea13136 100644
--- a/kernel/arch/mips/include/asm/mach-ip27/topology.h
+++ b/kernel/arch/mips/include/asm/mach-ip27/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MACH_TOPOLOGY_H
 #define _ASM_MACH_TOPOLOGY_H	1
 
diff --git a/kernel/arch/mips/include/asm/mach-ip32/kmalloc.h b/kernel/arch/mips/include/asm/mach-ip32/kmalloc.h
index 042ca926c..07a0146ea 100644
--- a/kernel/arch/mips/include/asm/mach-ip32/kmalloc.h
+++ b/kernel/arch/mips/include/asm/mach-ip32/kmalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_IP32_KMALLOC_H
 #define __ASM_MACH_IP32_KMALLOC_H
 
diff --git a/kernel/arch/mips/include/asm/mach-jz4740/base.h b/kernel/arch/mips/include/asm/mach-jz4740/base.h
index f37318605..96b2d6674 100644
--- a/kernel/arch/mips/include/asm/mach-jz4740/base.h
+++ b/kernel/arch/mips/include/asm/mach-jz4740/base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_JZ4740_BASE_H__
 #define __ASM_MACH_JZ4740_BASE_H__
 
diff --git a/kernel/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h b/kernel/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
index 8543f432b..e9cc62cfa 100644
--- a/kernel/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
+++ b/kernel/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MMC_JZ4740_MMC
 #define __LINUX_MMC_JZ4740_MMC
 
diff --git a/kernel/arch/mips/include/asm/mach-lasat/irq.h b/kernel/arch/mips/include/asm/mach-lasat/irq.h
index 3a282419d..d79cbe075 100644
--- a/kernel/arch/mips/include/asm/mach-lasat/irq.h
+++ b/kernel/arch/mips/include/asm/mach-lasat/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MACH_LASAT_IRQ_H
 #define _ASM_MACH_LASAT_IRQ_H
 
diff --git a/kernel/arch/mips/include/asm/mach-lasat/mach-gt64120.h b/kernel/arch/mips/include/asm/mach-lasat/mach-gt64120.h
index c253d3fa5..6666a8871 100644
--- a/kernel/arch/mips/include/asm/mach-lasat/mach-gt64120.h
+++ b/kernel/arch/mips/include/asm/mach-lasat/mach-gt64120.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  This is a direct copy of the ev96100.h file, with a global
  * search and replace.	The numbers are the same.
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/boot_param.h b/kernel/arch/mips/include/asm/mach-loongson64/boot_param.h
index 9f9bb9c53..4f69f0871 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/boot_param.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/boot_param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_LOONGSON64_BOOT_PARAM_H_
 #define __ASM_MACH_LOONGSON64_BOOT_PARAM_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536.h b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536.h
index a0ee0cb77..9795b3361 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The header file of cs5536 south bridge.
  *
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_mfgpt.h b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_mfgpt.h
index 021d0172d..52e8bb0fc 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_mfgpt.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_mfgpt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * cs5536 mfgpt header file
  */
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h
index bf9dd9eb4..a0d4b7528 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * the definition file of cs5536 Virtual Support Module(VSM).
  * pci configuration space can be accessed through the VSM, so
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_vsm.h b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_vsm.h
index 1f17c1815..70d0153cc 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_vsm.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/cs5536/cs5536_vsm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * the read/write interfaces for Virtual Support Module(VSM)
  *
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/irq.h b/kernel/arch/mips/include/asm/mach-loongson64/irq.h
index d18c45c7c..3644b68c0 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/irq.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_LOONGSON64_IRQ_H_
 #define __ASM_MACH_LOONGSON64_IRQ_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/loongson_hwmon.h b/kernel/arch/mips/include/asm/mach-loongson64/loongson_hwmon.h
index 74230d0ca..545f91f2a 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/loongson_hwmon.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/loongson_hwmon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LOONGSON_HWMON_H_
 #define __LOONGSON_HWMON_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/spaces.h b/kernel/arch/mips/include/asm/mach-loongson64/spaces.h
index c6040b9fc..e85bc1d9c 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/spaces.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/spaces.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_LOONGSON64_SPACES_H_
 #define __ASM_MACH_LOONGSON64_SPACES_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/topology.h b/kernel/arch/mips/include/asm/mach-loongson64/topology.h
index bcb885615..7ff819ab3 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/topology.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MACH_TOPOLOGY_H
 #define _ASM_MACH_TOPOLOGY_H
 
diff --git a/kernel/arch/mips/include/asm/mach-loongson64/workarounds.h b/kernel/arch/mips/include/asm/mach-loongson64/workarounds.h
index e659f041e..17b71172a 100644
--- a/kernel/arch/mips/include/asm/mach-loongson64/workarounds.h
+++ b/kernel/arch/mips/include/asm/mach-loongson64/workarounds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_LOONGSON64_WORKAROUNDS_H_
 #define __ASM_MACH_LOONGSON64_WORKAROUNDS_H_
 
diff --git a/kernel/arch/mips/include/asm/mach-malta/irq.h b/kernel/arch/mips/include/asm/mach-malta/irq.h
index 47cfe64ef..af9eeea25 100644
--- a/kernel/arch/mips/include/asm/mach-malta/irq.h
+++ b/kernel/arch/mips/include/asm/mach-malta/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_MIPS_IRQ_H
 #define __ASM_MACH_MIPS_IRQ_H
 
diff --git a/kernel/arch/mips/include/asm/mach-malta/mach-gt64120.h b/kernel/arch/mips/include/asm/mach-malta/mach-gt64120.h
index 62a4b2889..b9dee7c3e 100644
--- a/kernel/arch/mips/include/asm/mach-malta/mach-gt64120.h
+++ b/kernel/arch/mips/include/asm/mach-malta/mach-gt64120.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  This is a direct copy of the ev96100.h file, with a global
  * search and replace.	The numbers are the same.
diff --git a/kernel/arch/mips/include/asm/mach-malta/malta-dtshim.h b/kernel/arch/mips/include/asm/mach-malta/malta-dtshim.h
index cfd777663..d696a7598 100644
--- a/kernel/arch/mips/include/asm/mach-malta/malta-dtshim.h
+++ b/kernel/arch/mips/include/asm/mach-malta/malta-dtshim.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mach-malta/malta-pm.h b/kernel/arch/mips/include/asm/mach-malta/malta-pm.h
index c2c2e2010..347b53dbc 100644
--- a/kernel/arch/mips/include/asm/mach-malta/malta-pm.h
+++ b/kernel/arch/mips/include/asm/mach-malta/malta-pm.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mach-ralink/irq.h b/kernel/arch/mips/include/asm/mach-ralink/irq.h
index 4321865e0..86473e399 100644
--- a/kernel/arch/mips/include/asm/mach-ralink/irq.h
+++ b/kernel/arch/mips/include/asm/mach-ralink/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_RALINK_IRQ_H
 #define __ASM_MACH_RALINK_IRQ_H
 
diff --git a/kernel/arch/mips/include/asm/mach-rc32434/dma.h b/kernel/arch/mips/include/asm/mach-rc32434/dma.h
index 4322191e4..44dc87bb8 100644
--- a/kernel/arch/mips/include/asm/mach-rc32434/dma.h
+++ b/kernel/arch/mips/include/asm/mach-rc32434/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2002 Integrated Device Technology, Inc.
  *		All rights reserved.
diff --git a/kernel/arch/mips/include/asm/mach-rc32434/dma_v.h b/kernel/arch/mips/include/asm/mach-rc32434/dma_v.h
index 28c54063a..37d73b987 100644
--- a/kernel/arch/mips/include/asm/mach-rc32434/dma_v.h
+++ b/kernel/arch/mips/include/asm/mach-rc32434/dma_v.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2002 Integrated Device Technology, Inc.
  *		All rights reserved.
diff --git a/kernel/arch/mips/include/asm/mach-rc32434/gpio.h b/kernel/arch/mips/include/asm/mach-rc32434/gpio.h
index db211212c..a3192da9f 100644
--- a/kernel/arch/mips/include/asm/mach-rc32434/gpio.h
+++ b/kernel/arch/mips/include/asm/mach-rc32434/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2002 Integrated Device Technology, Inc.
  *	All rights reserved.
diff --git a/kernel/arch/mips/include/asm/mach-rc32434/irq.h b/kernel/arch/mips/include/asm/mach-rc32434/irq.h
index b76dec95c..ebe32bd5a 100644
--- a/kernel/arch/mips/include/asm/mach-rc32434/irq.h
+++ b/kernel/arch/mips/include/asm/mach-rc32434/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_RC32434_IRQ_H
 #define __ASM_RC32434_IRQ_H
 
diff --git a/kernel/arch/mips/include/asm/mach-rc32434/rc32434.h b/kernel/arch/mips/include/asm/mach-rc32434/rc32434.h
index 02fd32b4b..1bec6cc8a 100644
--- a/kernel/arch/mips/include/asm/mach-rc32434/rc32434.h
+++ b/kernel/arch/mips/include/asm/mach-rc32434/rc32434.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for IDT RC323434 CPU.
  */
diff --git a/kernel/arch/mips/include/asm/mach-tx39xx/mangle-port.h b/kernel/arch/mips/include/asm/mach-tx39xx/mangle-port.h
index ef0b502fd..ab7a70bd8 100644
--- a/kernel/arch/mips/include/asm/mach-tx39xx/mangle-port.h
+++ b/kernel/arch/mips/include/asm/mach-tx39xx/mangle-port.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_TX39XX_MANGLE_PORT_H
 #define __ASM_MACH_TX39XX_MANGLE_PORT_H
 
diff --git a/kernel/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h b/kernel/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
index b9d39dc45..04e424725 100644
--- a/kernel/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
+++ b/kernel/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H
 
diff --git a/kernel/arch/mips/include/asm/mach-tx49xx/kmalloc.h b/kernel/arch/mips/include/asm/mach-tx49xx/kmalloc.h
index ff9a8b86c..c2a0a6fa4 100644
--- a/kernel/arch/mips/include/asm/mach-tx49xx/kmalloc.h
+++ b/kernel/arch/mips/include/asm/mach-tx49xx/kmalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_TX49XX_KMALLOC_H
 #define __ASM_MACH_TX49XX_KMALLOC_H
 
diff --git a/kernel/arch/mips/include/asm/mach-tx49xx/mangle-port.h b/kernel/arch/mips/include/asm/mach-tx49xx/mangle-port.h
index 490867b03..e061ef38f 100644
--- a/kernel/arch/mips/include/asm/mach-tx49xx/mangle-port.h
+++ b/kernel/arch/mips/include/asm/mach-tx49xx/mangle-port.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_TX49XX_MANGLE_PORT_H
 #define __ASM_MACH_TX49XX_MANGLE_PORT_H
 
diff --git a/kernel/arch/mips/include/asm/mach-vr41xx/irq.h b/kernel/arch/mips/include/asm/mach-vr41xx/irq.h
index 862058d3f..3d63afae3 100644
--- a/kernel/arch/mips/include/asm/mach-vr41xx/irq.h
+++ b/kernel/arch/mips/include/asm/mach-vr41xx/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_VR41XX_IRQ_H
 #define __ASM_MACH_VR41XX_IRQ_H
 
diff --git a/kernel/arch/mips/include/asm/machine.h b/kernel/arch/mips/include/asm/machine.h
index ecb6c7335..e0d9b373d 100644
--- a/kernel/arch/mips/include/asm/machine.h
+++ b/kernel/arch/mips/include/asm/machine.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mips-boards/launch.h b/kernel/arch/mips/include/asm/mips-boards/launch.h
index 653477e40..f93aa5ee2 100644
--- a/kernel/arch/mips/include/asm/mips-boards/launch.h
+++ b/kernel/arch/mips/include/asm/mips-boards/launch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  */
diff --git a/kernel/arch/mips/include/asm/mips-cm.h b/kernel/arch/mips/include/asm/mips-cm.h
index f6231b91b..8bc5df49b 100644
--- a/kernel/arch/mips/include/asm/mips-cm.h
+++ b/kernel/arch/mips/include/asm/mips-cm.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -142,8 +142,8 @@ GCR_ACCESSOR_RO(64, 0x000, config)
 GCR_ACCESSOR_RW(64, 0x008, base)
 #define CM_GCR_BASE_GCRBASE			GENMASK_ULL(47, 15)
 #define CM_GCR_BASE_CMDEFTGT			GENMASK(1, 0)
-#define  CM_GCR_BASE_CMDEFTGT_DISABLED		0
-#define  CM_GCR_BASE_CMDEFTGT_MEM		1
+#define  CM_GCR_BASE_CMDEFTGT_MEM		0
+#define  CM_GCR_BASE_CMDEFTGT_RESERVED		1
 #define  CM_GCR_BASE_CMDEFTGT_IOCU0		2
 #define  CM_GCR_BASE_CMDEFTGT_IOCU1		3
 
diff --git a/kernel/arch/mips/include/asm/mips-cpc.h b/kernel/arch/mips/include/asm/mips-cpc.h
index f885051a8..b55e335cf 100644
--- a/kernel/arch/mips/include/asm/mips-cpc.h
+++ b/kernel/arch/mips/include/asm/mips-cpc.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mips-cps.h b/kernel/arch/mips/include/asm/mips-cps.h
index bf02b5070..8ad4a85ee 100644
--- a/kernel/arch/mips/include/asm/mips-cps.h
+++ b/kernel/arch/mips/include/asm/mips-cps.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2017 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mips-gic.h b/kernel/arch/mips/include/asm/mips-gic.h
index a2badf572..558059a8f 100644
--- a/kernel/arch/mips/include/asm/mips-gic.h
+++ b/kernel/arch/mips/include/asm/mips-gic.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2017 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/mips_mt.h b/kernel/arch/mips/include/asm/mips_mt.h
index aa4cca060..b444523ec 100644
--- a/kernel/arch/mips/include/asm/mips_mt.h
+++ b/kernel/arch/mips/include/asm/mips_mt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions and declarations for MIPS MT support that are common between
  * the VSMP, and AP/SP kernel models.
diff --git a/kernel/arch/mips/include/asm/mipsmtregs.h b/kernel/arch/mips/include/asm/mipsmtregs.h
index 5f8052ce4..212336b7c 100644
--- a/kernel/arch/mips/include/asm/mipsmtregs.h
+++ b/kernel/arch/mips/include/asm/mipsmtregs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * MT regs definitions, follows on from mipsregs.h
  * Copyright (C) 2004 - 2005 MIPS Technologies, Inc.  All rights reserved.
diff --git a/kernel/arch/mips/include/asm/mipsprom.h b/kernel/arch/mips/include/asm/mipsprom.h
index e93943fab..2eda19f8f 100644
--- a/kernel/arch/mips/include/asm/mipsprom.h
+++ b/kernel/arch/mips/include/asm/mipsprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MIPSPROM_H
 #define __ASM_MIPSPROM_H
 
diff --git a/kernel/arch/mips/include/asm/mmu.h b/kernel/arch/mips/include/asm/mmu.h
index f6ba08d77..0740be7d5 100644
--- a/kernel/arch/mips/include/asm/mmu.h
+++ b/kernel/arch/mips/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MMU_H
 #define __ASM_MMU_H
 
diff --git a/kernel/arch/mips/include/asm/mmzone.h b/kernel/arch/mips/include/asm/mmzone.h
index f53ec54c9..f085fba41 100644
--- a/kernel/arch/mips/include/asm/mmzone.h
+++ b/kernel/arch/mips/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Written by Kanoj Sarcar (kanoj@sgi.com) Aug 99
  * Rewritten for Linux 2.6 by Christoph Hellwig (hch@lst.de) Jan 2004
diff --git a/kernel/arch/mips/include/asm/module.h b/kernel/arch/mips/include/asm/module.h
index 06552a965..6dc0b21b8 100644
--- a/kernel/arch/mips/include/asm/module.h
+++ b/kernel/arch/mips/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_MODULE_H
 #define _ASM_MODULE_H
 
diff --git a/kernel/arch/mips/include/asm/msa.h b/kernel/arch/mips/include/asm/msa.h
index 8967b475a..b1845102f 100644
--- a/kernel/arch/mips/include/asm/msa.h
+++ b/kernel/arch/mips/include/asm/msa.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/nile4.h b/kernel/arch/mips/include/asm/nile4.h
index 99e97f8bf..9d36b7823 100644
--- a/kernel/arch/mips/include/asm/nile4.h
+++ b/kernel/arch/mips/include/asm/nile4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  asm-mips/nile4.h -- NEC Vrc-5074 Nile 4 definitions
  *
diff --git a/kernel/arch/mips/include/asm/octeon/cvmx-config.h b/kernel/arch/mips/include/asm/octeon/cvmx-config.h
index f4f1996e0..a8c358c02 100644
--- a/kernel/arch/mips/include/asm/octeon/cvmx-config.h
+++ b/kernel/arch/mips/include/asm/octeon/cvmx-config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CVMX_CONFIG_H__
 #define __CVMX_CONFIG_H__
 
diff --git a/kernel/arch/mips/include/asm/pm-cps.h b/kernel/arch/mips/include/asm/pm-cps.h
index 89d58d80b..bb0616967 100644
--- a/kernel/arch/mips/include/asm/pm-cps.h
+++ b/kernel/arch/mips/include/asm/pm-cps.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/seccomp.h b/kernel/arch/mips/include/asm/seccomp.h
index d886d6f76..e383d7e27 100644
--- a/kernel/arch/mips/include/asm/seccomp.h
+++ b/kernel/arch/mips/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SECCOMP_H
 
 #include <linux/unistd.h>
diff --git a/kernel/arch/mips/include/asm/setup.h b/kernel/arch/mips/include/asm/setup.h
index 4f5279a83..d49d247d4 100644
--- a/kernel/arch/mips/include/asm/setup.h
+++ b/kernel/arch/mips/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MIPS_SETUP_H
 #define _MIPS_SETUP_H
 
diff --git a/kernel/arch/mips/include/asm/sgi/pi1.h b/kernel/arch/mips/include/asm/sgi/pi1.h
index 96b1a0771..88b814ef3 100644
--- a/kernel/arch/mips/include/asm/sgi/pi1.h
+++ b/kernel/arch/mips/include/asm/sgi/pi1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * pi1.h: Definitions for SGI PI1 parallel port
  */
diff --git a/kernel/arch/mips/include/asm/smp-cps.h b/kernel/arch/mips/include/asm/smp-cps.h
index 2ae1f61a4..16b4ee3fe 100644
--- a/kernel/arch/mips/include/asm/smp-cps.h
+++ b/kernel/arch/mips/include/asm/smp-cps.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/asm/sn/hub.h b/kernel/arch/mips/include/asm/sn/hub.h
index 1992d9254..338f7eed7 100644
--- a/kernel/arch/mips/include/asm/sn/hub.h
+++ b/kernel/arch/mips/include/asm/sn/hub.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SN_HUB_H
 #define __ASM_SN_HUB_H
 
diff --git a/kernel/arch/mips/include/asm/sn/ioc3.h b/kernel/arch/mips/include/asm/sn/ioc3.h
index feb385180..25c8dccab 100644
--- a/kernel/arch/mips/include/asm/sn/ioc3.h
+++ b/kernel/arch/mips/include/asm/sn/ioc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999, 2000 Ralf Baechle
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
diff --git a/kernel/arch/mips/include/asm/sn/klkernvars.h b/kernel/arch/mips/include/asm/sn/klkernvars.h
index 6af25ba41..ea6b21795 100644
--- a/kernel/arch/mips/include/asm/sn/klkernvars.h
+++ b/kernel/arch/mips/include/asm/sn/klkernvars.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File ported from IRIX to Linux by Kanoj Sarcar, 06/08/00.
  * Copyright 2000 Silicon Graphics, Inc.
diff --git a/kernel/arch/mips/include/asm/sn/mapped_kernel.h b/kernel/arch/mips/include/asm/sn/mapped_kernel.h
index 401f3b0ee..2f3efa91c 100644
--- a/kernel/arch/mips/include/asm/sn/mapped_kernel.h
+++ b/kernel/arch/mips/include/asm/sn/mapped_kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File created by Kanoj Sarcar 06/06/00.
  * Copyright 2000 Silicon Graphics, Inc.
diff --git a/kernel/arch/mips/include/asm/sn/sn_private.h b/kernel/arch/mips/include/asm/sn/sn_private.h
index fdfae43d8..f09ba846c 100644
--- a/kernel/arch/mips/include/asm/sn/sn_private.h
+++ b/kernel/arch/mips/include/asm/sn/sn_private.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SN_SN_PRIVATE_H
 #define __ASM_SN_SN_PRIVATE_H
 
diff --git a/kernel/arch/mips/include/asm/sparsemem.h b/kernel/arch/mips/include/asm/sparsemem.h
index b1071c1e5..b0686ca3d 100644
--- a/kernel/arch/mips/include/asm/sparsemem.h
+++ b/kernel/arch/mips/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MIPS_SPARSEMEM_H
 #define _MIPS_SPARSEMEM_H
 #ifdef CONFIG_SPARSEMEM
diff --git a/kernel/arch/mips/include/asm/spinlock_types.h b/kernel/arch/mips/include/asm/spinlock_types.h
index 177e722eb..28fd4b140 100644
--- a/kernel/arch/mips/include/asm/spinlock_types.h
+++ b/kernel/arch/mips/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPINLOCK_TYPES_H
 #define _ASM_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/mips/include/asm/spram.h b/kernel/arch/mips/include/asm/spram.h
index 0f90d88e4..63cb90fd4 100644
--- a/kernel/arch/mips/include/asm/spram.h
+++ b/kernel/arch/mips/include/asm/spram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MIPS_SPRAM_H
 #define _MIPS_SPRAM_H
 
diff --git a/kernel/arch/mips/include/asm/stackframe.h b/kernel/arch/mips/include/asm/stackframe.h
index 5d3563c55..2161357cc 100644
--- a/kernel/arch/mips/include/asm/stackframe.h
+++ b/kernel/arch/mips/include/asm/stackframe.h
@@ -199,6 +199,10 @@
 		sll	k0, 3		/* extract cu0 bit */
 		.set	noreorder
 		bltz	k0, 8f
+		 move	k0, sp
+		.if \docfi
+		.cfi_register sp, k0
+		.endif
 #ifdef CONFIG_EVA
 		/*
 		 * Flush interAptiv's Return Prediction Stack (RPS) by writing
@@ -225,10 +229,6 @@
 		MTC0	k0, CP0_ENTRYHI
 #endif
 		.set	reorder
-		 move	k0, sp
-		.if \docfi
-		.cfi_register sp, k0
-		.endif
 		/* Called from user mode, new stack. */
 		get_saved_sp docfi=\docfi tosp=1
 8:
diff --git a/kernel/arch/mips/include/asm/stackprotector.h b/kernel/arch/mips/include/asm/stackprotector.h
index eb9b1035e..68d4be9e1 100644
--- a/kernel/arch/mips/include/asm/stackprotector.h
+++ b/kernel/arch/mips/include/asm/stackprotector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * GCC stack protector support.
  *
diff --git a/kernel/arch/mips/include/asm/stacktrace.h b/kernel/arch/mips/include/asm/stacktrace.h
index 10c4e9c84..8ad25c25b 100644
--- a/kernel/arch/mips/include/asm/stacktrace.h
+++ b/kernel/arch/mips/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_STACKTRACE_H
 #define _ASM_STACKTRACE_H
 
diff --git a/kernel/arch/mips/include/asm/thread_info.h b/kernel/arch/mips/include/asm/thread_info.h
index b439e5127..5e8927f99 100644
--- a/kernel/arch/mips/include/asm/thread_info.h
+++ b/kernel/arch/mips/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: MIPS low-level thread information
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)
diff --git a/kernel/arch/mips/include/asm/tlb.h b/kernel/arch/mips/include/asm/tlb.h
index 939734de4..b6823b9e9 100644
--- a/kernel/arch/mips/include/asm/tlb.h
+++ b/kernel/arch/mips/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TLB_H
 #define __ASM_TLB_H
 
diff --git a/kernel/arch/mips/include/asm/tlbex.h b/kernel/arch/mips/include/asm/tlbex.h
index 53050e9dd..4ed7ebed3 100644
--- a/kernel/arch/mips/include/asm/tlbex.h
+++ b/kernel/arch/mips/include/asm/tlbex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TLBEX_H
 #define __ASM_TLBEX_H
 
diff --git a/kernel/arch/mips/include/asm/tlbflush.h b/kernel/arch/mips/include/asm/tlbflush.h
index 86b21de12..40a361092 100644
--- a/kernel/arch/mips/include/asm/tlbflush.h
+++ b/kernel/arch/mips/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TLBFLUSH_H
 #define __ASM_TLBFLUSH_H
 
diff --git a/kernel/arch/mips/include/asm/tlbmisc.h b/kernel/arch/mips/include/asm/tlbmisc.h
index 3a452282c..c1a540669 100644
--- a/kernel/arch/mips/include/asm/tlbmisc.h
+++ b/kernel/arch/mips/include/asm/tlbmisc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TLBMISC_H
 #define __ASM_TLBMISC_H
 
diff --git a/kernel/arch/mips/include/asm/txx9/boards.h b/kernel/arch/mips/include/asm/txx9/boards.h
index cbe9476d9..d45237bef 100644
--- a/kernel/arch/mips/include/asm/txx9/boards.h
+++ b/kernel/arch/mips/include/asm/txx9/boards.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_TOSHIBA_JMR3927
 BOARD_VEC(jmr3927_vec)
 #endif
diff --git a/kernel/arch/mips/include/asm/vga.h b/kernel/arch/mips/include/asm/vga.h
index 975ff51f8..0136e0366 100644
--- a/kernel/arch/mips/include/asm/vga.h
+++ b/kernel/arch/mips/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Access to VGA videoram
  *
diff --git a/kernel/arch/mips/include/asm/yamon-dt.h b/kernel/arch/mips/include/asm/yamon-dt.h
index 485cfe3e4..10a073e68 100644
--- a/kernel/arch/mips/include/asm/yamon-dt.h
+++ b/kernel/arch/mips/include/asm/yamon-dt.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/include/uapi/asm/auxvec.h b/kernel/arch/mips/include/uapi/asm/auxvec.h
index 45ba259a3..612c2c41f 100644
--- a/kernel/arch/mips/include/uapi/asm/auxvec.h
+++ b/kernel/arch/mips/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2015 Imagination Technologies
  * Author: Alex Smith <alex.smith@imgtec.com>
diff --git a/kernel/arch/mips/include/uapi/asm/bitfield.h b/kernel/arch/mips/include/uapi/asm/bitfield.h
index ad9861359..b11713d87 100644
--- a/kernel/arch/mips/include/uapi/asm/bitfield.h
+++ b/kernel/arch/mips/include/uapi/asm/bitfield.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/bitsperlong.h b/kernel/arch/mips/include/uapi/asm/bitsperlong.h
index 3e4c10a8e..7268380d8 100644
--- a/kernel/arch/mips/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/mips/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_MIPS_BITSPERLONG_H
 #define __ASM_MIPS_BITSPERLONG_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/break.h b/kernel/arch/mips/include/uapi/asm/break.h
index 9c4265cbf..10380b1bc 100644
--- a/kernel/arch/mips/include/uapi/asm/break.h
+++ b/kernel/arch/mips/include/uapi/asm/break.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/byteorder.h b/kernel/arch/mips/include/uapi/asm/byteorder.h
index 9579051ff..b4edc85f9 100644
--- a/kernel/arch/mips/include/uapi/asm/byteorder.h
+++ b/kernel/arch/mips/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/cachectl.h b/kernel/arch/mips/include/uapi/asm/cachectl.h
index 230390908..af7639ff4 100644
--- a/kernel/arch/mips/include/uapi/asm/cachectl.h
+++ b/kernel/arch/mips/include/uapi/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/errno.h b/kernel/arch/mips/include/uapi/asm/errno.h
index 02d645d7a..2fb714e2d 100644
--- a/kernel/arch/mips/include/uapi/asm/errno.h
+++ b/kernel/arch/mips/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/fcntl.h b/kernel/arch/mips/include/uapi/asm/fcntl.h
index 6ca432f00..42e13dead 100644
--- a/kernel/arch/mips/include/uapi/asm/fcntl.h
+++ b/kernel/arch/mips/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/hwcap.h b/kernel/arch/mips/include/uapi/asm/hwcap.h
index c7484a7ca..600ad8fd6 100644
--- a/kernel/arch/mips/include/uapi/asm/hwcap.h
+++ b/kernel/arch/mips/include/uapi/asm/hwcap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_HWCAP_H
 #define _UAPI_ASM_HWCAP_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/inst.h b/kernel/arch/mips/include/uapi/asm/inst.h
index 6abea5183..c05dcf5ab 100644
--- a/kernel/arch/mips/include/uapi/asm/inst.h
+++ b/kernel/arch/mips/include/uapi/asm/inst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Format of an instruction in memory.
  *
diff --git a/kernel/arch/mips/include/uapi/asm/ioctl.h b/kernel/arch/mips/include/uapi/asm/ioctl.h
index c515a1a4c..1050a6ea2 100644
--- a/kernel/arch/mips/include/uapi/asm/ioctl.h
+++ b/kernel/arch/mips/include/uapi/asm/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/ioctls.h b/kernel/arch/mips/include/uapi/asm/ioctls.h
index 1609cb090..890245a9f 100644
--- a/kernel/arch/mips/include/uapi/asm/ioctls.h
+++ b/kernel/arch/mips/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/kvm.h b/kernel/arch/mips/include/uapi/asm/kvm.h
index 0318c6b44..edcf717c4 100644
--- a/kernel/arch/mips/include/uapi/asm/kvm.h
+++ b/kernel/arch/mips/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/mman.h b/kernel/arch/mips/include/uapi/asm/mman.h
index da3216007..20c3df7a8 100644
--- a/kernel/arch/mips/include/uapi/asm/mman.h
+++ b/kernel/arch/mips/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/msgbuf.h b/kernel/arch/mips/include/uapi/asm/msgbuf.h
index df849e87d..eb4d0f9d7 100644
--- a/kernel/arch/mips/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/mips/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_MSGBUF_H
 #define _ASM_MSGBUF_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/param.h b/kernel/arch/mips/include/uapi/asm/param.h
index da3920fce..3f337ed66 100644
--- a/kernel/arch/mips/include/uapi/asm/param.h
+++ b/kernel/arch/mips/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/poll.h b/kernel/arch/mips/include/uapi/asm/poll.h
index 47b952080..ad289d7b7 100644
--- a/kernel/arch/mips/include/uapi/asm/poll.h
+++ b/kernel/arch/mips/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_POLL_H
 #define __ASM_POLL_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/posix_types.h b/kernel/arch/mips/include/uapi/asm/posix_types.h
index fa03ec3fb..6aa49c10f 100644
--- a/kernel/arch/mips/include/uapi/asm/posix_types.h
+++ b/kernel/arch/mips/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/ptrace.h b/kernel/arch/mips/include/uapi/asm/ptrace.h
index 91a3d197e..f3c025445 100644
--- a/kernel/arch/mips/include/uapi/asm/ptrace.h
+++ b/kernel/arch/mips/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/reg.h b/kernel/arch/mips/include/uapi/asm/reg.h
index 081e377f4..56d15cb81 100644
--- a/kernel/arch/mips/include/uapi/asm/reg.h
+++ b/kernel/arch/mips/include/uapi/asm/reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Various register offset definitions for debuggers, core file
  * examiners and whatnot.
diff --git a/kernel/arch/mips/include/uapi/asm/resource.h b/kernel/arch/mips/include/uapi/asm/resource.h
index b26439d4a..372ff8f4b 100644
--- a/kernel/arch/mips/include/uapi/asm/resource.h
+++ b/kernel/arch/mips/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/sembuf.h b/kernel/arch/mips/include/uapi/asm/sembuf.h
index e1085ac88..2c0f507ab 100644
--- a/kernel/arch/mips/include/uapi/asm/sembuf.h
+++ b/kernel/arch/mips/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SEMBUF_H
 #define _ASM_SEMBUF_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/setup.h b/kernel/arch/mips/include/uapi/asm/setup.h
index 93f237bb1..7d48c433b 100644
--- a/kernel/arch/mips/include/uapi/asm/setup.h
+++ b/kernel/arch/mips/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_MIPS_SETUP_H
 #define _UAPI_MIPS_SETUP_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/sgidefs.h b/kernel/arch/mips/include/uapi/asm/sgidefs.h
index 876442fcf..26143e3b7 100644
--- a/kernel/arch/mips/include/uapi/asm/sgidefs.h
+++ b/kernel/arch/mips/include/uapi/asm/sgidefs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/shmbuf.h b/kernel/arch/mips/include/uapi/asm/shmbuf.h
index f99443827..379e6bca5 100644
--- a/kernel/arch/mips/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/mips/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SHMBUF_H
 #define _ASM_SHMBUF_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/sigcontext.h b/kernel/arch/mips/include/uapi/asm/sigcontext.h
index 5cbd9ae64..d0a540e88 100644
--- a/kernel/arch/mips/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/mips/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/siginfo.h b/kernel/arch/mips/include/uapi/asm/siginfo.h
index cf6113bbc..f17d8163d 100644
--- a/kernel/arch/mips/include/uapi/asm/siginfo.h
+++ b/kernel/arch/mips/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/signal.h b/kernel/arch/mips/include/uapi/asm/signal.h
index addb9f556..53104b10a 100644
--- a/kernel/arch/mips/include/uapi/asm/signal.h
+++ b/kernel/arch/mips/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/socket.h b/kernel/arch/mips/include/uapi/asm/socket.h
index 6c755bc07..49c3d4795 100644
--- a/kernel/arch/mips/include/uapi/asm/socket.h
+++ b/kernel/arch/mips/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/sockios.h b/kernel/arch/mips/include/uapi/asm/sockios.h
index 419fbe661..5b40a8859 100644
--- a/kernel/arch/mips/include/uapi/asm/sockios.h
+++ b/kernel/arch/mips/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Socket-level I/O control calls.
  *
diff --git a/kernel/arch/mips/include/uapi/asm/stat.h b/kernel/arch/mips/include/uapi/asm/stat.h
index b47bc541b..95416f366 100644
--- a/kernel/arch/mips/include/uapi/asm/stat.h
+++ b/kernel/arch/mips/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/statfs.h b/kernel/arch/mips/include/uapi/asm/statfs.h
index 3305c834f..f4174dcae 100644
--- a/kernel/arch/mips/include/uapi/asm/statfs.h
+++ b/kernel/arch/mips/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/swab.h b/kernel/arch/mips/include/uapi/asm/swab.h
index 23cd9b118..d6795fe4e 100644
--- a/kernel/arch/mips/include/uapi/asm/swab.h
+++ b/kernel/arch/mips/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/sysmips.h b/kernel/arch/mips/include/uapi/asm/sysmips.h
index ae637e907..4c009e10d 100644
--- a/kernel/arch/mips/include/uapi/asm/sysmips.h
+++ b/kernel/arch/mips/include/uapi/asm/sysmips.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for the MIPS sysmips(2) call
  *
diff --git a/kernel/arch/mips/include/uapi/asm/termbits.h b/kernel/arch/mips/include/uapi/asm/termbits.h
index 2750203e1..dfeffba72 100644
--- a/kernel/arch/mips/include/uapi/asm/termbits.h
+++ b/kernel/arch/mips/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/termios.h b/kernel/arch/mips/include/uapi/asm/termios.h
index baeb2fa87..d6c576794 100644
--- a/kernel/arch/mips/include/uapi/asm/termios.h
+++ b/kernel/arch/mips/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/types.h b/kernel/arch/mips/include/uapi/asm/types.h
index f3dd9ff0c..6b2150484 100644
--- a/kernel/arch/mips/include/uapi/asm/types.h
+++ b/kernel/arch/mips/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/include/uapi/asm/ucontext.h b/kernel/arch/mips/include/uapi/asm/ucontext.h
index 2320144ce..2d3bf8eeb 100644
--- a/kernel/arch/mips/include/uapi/asm/ucontext.h
+++ b/kernel/arch/mips/include/uapi/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __MIPS_UAPI_ASM_UCONTEXT_H
 #define __MIPS_UAPI_ASM_UCONTEXT_H
 
diff --git a/kernel/arch/mips/include/uapi/asm/unistd.h b/kernel/arch/mips/include/uapi/asm/unistd.h
index 78faf4292..bb05e9916 100644
--- a/kernel/arch/mips/include/uapi/asm/unistd.h
+++ b/kernel/arch/mips/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/arch/mips/jazz/Kconfig b/kernel/arch/mips/jazz/Kconfig
index fb1e072da..06838f80a 100644
--- a/kernel/arch/mips/jazz/Kconfig
+++ b/kernel/arch/mips/jazz/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ACER_PICA_61
 	bool "Support for Acer PICA 1 chipset"
 	depends on MACH_JAZZ
diff --git a/kernel/arch/mips/jazz/jazzdma.c b/kernel/arch/mips/jazz/jazzdma.c
index 11172fdae..d626a9a39 100644
--- a/kernel/arch/mips/jazz/jazzdma.c
+++ b/kernel/arch/mips/jazz/jazzdma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Mips Jazz DMA controller support
  * Copyright (C) 1995, 1996 by Andreas Busse
diff --git a/kernel/arch/mips/jazz/reset.c b/kernel/arch/mips/jazz/reset.c
index dd889fe86..052b01f5d 100644
--- a/kernel/arch/mips/jazz/reset.c
+++ b/kernel/arch/mips/jazz/reset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Reset a Jazz machine.
  *
diff --git a/kernel/arch/mips/jz4740/Kconfig b/kernel/arch/mips/jz4740/Kconfig
index 36f820176..643af2012 100644
--- a/kernel/arch/mips/jz4740/Kconfig
+++ b/kernel/arch/mips/jz4740/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "Machine type"
 	depends on MACH_INGENIC
diff --git a/kernel/arch/mips/jz4740/Makefile b/kernel/arch/mips/jz4740/Makefile
index 6b9c1f7c3..88d6aa7d0 100644
--- a/kernel/arch/mips/jz4740/Makefile
+++ b/kernel/arch/mips/jz4740/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Ingenic JZ4740.
 #
diff --git a/kernel/arch/mips/jz4740/reset.h b/kernel/arch/mips/jz4740/reset.h
index 5202ab4ad..4e8746ee9 100644
--- a/kernel/arch/mips/jz4740/reset.h
+++ b/kernel/arch/mips/jz4740/reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MIPS_JZ4740_RESET_H__
 #define __MIPS_JZ4740_RESET_H__
 
diff --git a/kernel/arch/mips/kernel/Makefile b/kernel/arch/mips/kernel/Makefile
index 07f0f4a4b..f10e1e15e 100644
--- a/kernel/arch/mips/kernel/Makefile
+++ b/kernel/arch/mips/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/MIPS kernel.
 #
diff --git a/kernel/arch/mips/kernel/asm-offsets.c b/kernel/arch/mips/kernel/asm-offsets.c
index a670c0c11..c1cd41456 100644
--- a/kernel/arch/mips/kernel/asm-offsets.c
+++ b/kernel/arch/mips/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * asm-offsets.c: Calculate pt_regs and task_struct offsets.
  *
diff --git a/kernel/arch/mips/kernel/binfmt_elfn32.c b/kernel/arch/mips/kernel/binfmt_elfn32.c
index 4a2ff3953..89b234844 100644
--- a/kernel/arch/mips/kernel/binfmt_elfn32.c
+++ b/kernel/arch/mips/kernel/binfmt_elfn32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for n32 Linux/MIPS ELF binaries.
  * Author: Ralf Baechle (ralf@linux-mips.org)
diff --git a/kernel/arch/mips/kernel/binfmt_elfo32.c b/kernel/arch/mips/kernel/binfmt_elfo32.c
index 3916404e7..a88c59db3 100644
--- a/kernel/arch/mips/kernel/binfmt_elfo32.c
+++ b/kernel/arch/mips/kernel/binfmt_elfo32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for o32 Linux/MIPS ELF binaries.
  * Author: Ralf Baechle (ralf@linux-mips.org)
diff --git a/kernel/arch/mips/kernel/cmpxchg.c b/kernel/arch/mips/kernel/cmpxchg.c
index 7730f1d34..0b9535bc2 100644
--- a/kernel/arch/mips/kernel/cmpxchg.c
+++ b/kernel/arch/mips/kernel/cmpxchg.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2017 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/cps-vec-ns16550.S b/kernel/arch/mips/kernel/cps-vec-ns16550.S
index 6d246ad05..b37af23a5 100644
--- a/kernel/arch/mips/kernel/cps-vec-ns16550.S
+++ b/kernel/arch/mips/kernel/cps-vec-ns16550.S
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/cps-vec.S b/kernel/arch/mips/kernel/cps-vec.S
index d173b49f2..c7ed26029 100644
--- a/kernel/arch/mips/kernel/cps-vec.S
+++ b/kernel/arch/mips/kernel/cps-vec.S
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/crash.c b/kernel/arch/mips/kernel/crash.c
index ca25cd393..d455363d5 100644
--- a/kernel/arch/mips/kernel/crash.c
+++ b/kernel/arch/mips/kernel/crash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/smp.h>
 #include <linux/reboot.h>
diff --git a/kernel/arch/mips/kernel/crash_dump.c b/kernel/arch/mips/kernel/crash_dump.c
index 77ee99a2d..a8657d29c 100644
--- a/kernel/arch/mips/kernel/crash_dump.c
+++ b/kernel/arch/mips/kernel/crash_dump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/highmem.h>
 #include <linux/bootmem.h>
 #include <linux/crash_dump.h>
diff --git a/kernel/arch/mips/kernel/elf.c b/kernel/arch/mips/kernel/elf.c
index 0828d6d96..731325a61 100644
--- a/kernel/arch/mips/kernel/elf.c
+++ b/kernel/arch/mips/kernel/elf.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/ftrace.c b/kernel/arch/mips/kernel/ftrace.c
index 9d9b8fbae..99285be0e 100644
--- a/kernel/arch/mips/kernel/ftrace.c
+++ b/kernel/arch/mips/kernel/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Code for replacing ftrace calls with jumps.
  *
diff --git a/kernel/arch/mips/kernel/i8253.c b/kernel/arch/mips/kernel/i8253.c
index c5bc344fc..5f209f111 100644
--- a/kernel/arch/mips/kernel/i8253.c
+++ b/kernel/arch/mips/kernel/i8253.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * i8253.c  8253/PIT functions
  *
diff --git a/kernel/arch/mips/kernel/linux32.c b/kernel/arch/mips/kernel/linux32.c
index b01bdef10..b332f6fc1 100644
--- a/kernel/arch/mips/kernel/linux32.c
+++ b/kernel/arch/mips/kernel/linux32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Conversion between 32-bit and 64-bit native system calls.
  *
diff --git a/kernel/arch/mips/kernel/mips-cm.c b/kernel/arch/mips/kernel/mips-cm.c
index e91c8c4e2..dd5567b1e 100644
--- a/kernel/arch/mips/kernel/mips-cm.c
+++ b/kernel/arch/mips/kernel/mips-cm.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/mips-cpc.c b/kernel/arch/mips/kernel/mips-cpc.c
index f66b05ebf..19c88d770 100644
--- a/kernel/arch/mips/kernel/mips-cpc.c
+++ b/kernel/arch/mips/kernel/mips-cpc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/mips-mt-fpaff.c b/kernel/arch/mips/kernel/mips-mt-fpaff.c
index 8cab633e0..a7c0f97e4 100644
--- a/kernel/arch/mips/kernel/mips-mt-fpaff.c
+++ b/kernel/arch/mips/kernel/mips-mt-fpaff.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * General MIPS MT support routines, usable in AP/SP and SMVP.
  * Copyright (C) 2005 Mips Technologies, Inc
diff --git a/kernel/arch/mips/kernel/mips-mt.c b/kernel/arch/mips/kernel/mips-mt.c
index 88b1ef5f8..efaa25276 100644
--- a/kernel/arch/mips/kernel/mips-mt.c
+++ b/kernel/arch/mips/kernel/mips-mt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * General MIPS MT support routines, usable in AP/SP and SMVP.
  * Copyright (C) 2005 Mips Technologies, Inc
diff --git a/kernel/arch/mips/kernel/pm-cps.c b/kernel/arch/mips/kernel/pm-cps.c
index 4655017f2..9dd624c2f 100644
--- a/kernel/arch/mips/kernel/pm-cps.c
+++ b/kernel/arch/mips/kernel/pm-cps.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/probes-common.h b/kernel/arch/mips/kernel/probes-common.h
index dd08e4113..d2bf77b18 100644
--- a/kernel/arch/mips/kernel/probes-common.h
+++ b/kernel/arch/mips/kernel/probes-common.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+ * Author: Marcin Nowakowski <marcin.nowakowski@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/kernel/proc.c b/kernel/arch/mips/kernel/proc.c
index bd9bf528f..b2de408a2 100644
--- a/kernel/arch/mips/kernel/proc.c
+++ b/kernel/arch/mips/kernel/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1995, 1996, 2001  Ralf Baechle
  *  Copyright (C) 2001, 2004  MIPS Technologies, Inc.
diff --git a/kernel/arch/mips/kernel/r2300_switch.S b/kernel/arch/mips/kernel/r2300_switch.S
index e57703b1d..665897139 100644
--- a/kernel/arch/mips/kernel/r2300_switch.S
+++ b/kernel/arch/mips/kernel/r2300_switch.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * r2300_switch.S: R2300 specific task switching code.
  *
diff --git a/kernel/arch/mips/kernel/relocate.c b/kernel/arch/mips/kernel/relocate.c
index 2d1a0c438..cbf4cc0b0 100644
--- a/kernel/arch/mips/kernel/relocate.c
+++ b/kernel/arch/mips/kernel/relocate.c
@@ -6,7 +6,7 @@
  * Support for Kernel relocation at boot time
  *
  * Copyright (C) 2015, Imagination Technologies Ltd.
- * Authors: Matt Redfearn (matt.redfearn@imgtec.com)
+ * Authors: Matt Redfearn (matt.redfearn@mips.com)
  */
 #include <asm/bootinfo.h>
 #include <asm/cacheflush.h>
diff --git a/kernel/arch/mips/kernel/smp-cmp.c b/kernel/arch/mips/kernel/smp-cmp.c
index 05295a490..a2322009c 100644
--- a/kernel/arch/mips/kernel/smp-cmp.c
+++ b/kernel/arch/mips/kernel/smp-cmp.c
@@ -19,7 +19,7 @@
 #undef DEBUG
 
 #include <linux/kernel.h>
-#include <linux/sched.h>
+#include <linux/sched/task_stack.h>
 #include <linux/smp.h>
 #include <linux/cpumask.h>
 #include <linux/interrupt.h>
@@ -50,8 +50,8 @@ static void cmp_init_secondary(void)
 
 #ifdef CONFIG_MIPS_MT_SMP
 	if (cpu_has_mipsmt)
-		c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) &
-			TCBIND_CURVPE;
+		cpu_set_vpe_id(c, (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) &
+				  TCBIND_CURVPE);
 #endif
 }
 
diff --git a/kernel/arch/mips/kernel/smp-cps.c b/kernel/arch/mips/kernel/smp-cps.c
index 0063122c8..ecc1a853f 100644
--- a/kernel/arch/mips/kernel/smp-cps.c
+++ b/kernel/arch/mips/kernel/smp-cps.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2013 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -306,7 +306,7 @@ static int cps_boot_secondary(int cpu, struct task_struct *idle)
 	int err;
 
 	/* We don't yet support booting CPUs in other clusters */
-	if (cpu_cluster(&cpu_data[cpu]) != cpu_cluster(&current_cpu_data))
+	if (cpu_cluster(&cpu_data[cpu]) != cpu_cluster(&raw_current_cpu_data))
 		return -ENOSYS;
 
 	vpe_cfg->pc = (unsigned long)&smp_bootstrap;
diff --git a/kernel/arch/mips/kernel/smp.c b/kernel/arch/mips/kernel/smp.c
index bbe19b64d..88be966d3 100644
--- a/kernel/arch/mips/kernel/smp.c
+++ b/kernel/arch/mips/kernel/smp.c
@@ -42,7 +42,7 @@
 #include <asm/processor.h>
 #include <asm/idle.h>
 #include <asm/r4k-timer.h>
-#include <asm/mips-cpc.h>
+#include <asm/mips-cps.h>
 #include <asm/mmu_context.h>
 #include <asm/time.h>
 #include <asm/setup.h>
@@ -66,6 +66,7 @@ EXPORT_SYMBOL(cpu_sibling_map);
 cpumask_t cpu_core_map[NR_CPUS] __read_mostly;
 EXPORT_SYMBOL(cpu_core_map);
 
+static DECLARE_COMPLETION(cpu_starting);
 static DECLARE_COMPLETION(cpu_running);
 
 /*
@@ -374,6 +375,12 @@ asmlinkage void start_secondary(void)
 	cpumask_set_cpu(cpu, &cpu_coherent_mask);
 	notify_cpu_starting(cpu);
 
+	/* Notify boot CPU that we're starting & ready to sync counters */
+	complete(&cpu_starting);
+
+	synchronise_count_slave(cpu);
+
+	/* The CPU is running and counters synchronised, now mark it online */
 	set_cpu_online(cpu, true);
 
 	set_cpu_sibling_map(cpu);
@@ -381,8 +388,11 @@ asmlinkage void start_secondary(void)
 
 	calculate_cpu_foreign_map();
 
+	/*
+	 * Notify boot CPU that we're up & online and it can safely return
+	 * from __cpu_up
+	 */
 	complete(&cpu_running);
-	synchronise_count_slave(cpu);
 
 	/*
 	 * irq will be enabled in ->smp_finish(), enabling it too early
@@ -445,17 +455,17 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
 	if (err)
 		return err;
 
-	/*
-	 * We must check for timeout here, as the CPU will not be marked
-	 * online until the counters are synchronised.
-	 */
-	if (!wait_for_completion_timeout(&cpu_running,
+	/* Wait for CPU to start and be ready to sync counters */
+	if (!wait_for_completion_timeout(&cpu_starting,
 					 msecs_to_jiffies(1000))) {
 		pr_crit("CPU%u: failed to start\n", cpu);
 		return -EIO;
 	}
 
 	synchronise_count_master(cpu);
+
+	/* Wait for CPU to finish startup & mark itself online before return */
+	wait_for_completion(&cpu_running);
 	return 0;
 }
 
diff --git a/kernel/arch/mips/kernel/spinlock_test.c b/kernel/arch/mips/kernel/spinlock_test.c
index f7d86955d..eaed550e7 100644
--- a/kernel/arch/mips/kernel/spinlock_test.c
+++ b/kernel/arch/mips/kernel/spinlock_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kthread.h>
 #include <linux/hrtimer.h>
diff --git a/kernel/arch/mips/kernel/sync-r4k.c b/kernel/arch/mips/kernel/sync-r4k.c
index 1df1160b6..f2973ce87 100644
--- a/kernel/arch/mips/kernel/sync-r4k.c
+++ b/kernel/arch/mips/kernel/sync-r4k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Count register synchronisation.
  *
diff --git a/kernel/arch/mips/kernel/sysrq.c b/kernel/arch/mips/kernel/sysrq.c
index 5f0553930..e5a2a6ab7 100644
--- a/kernel/arch/mips/kernel/sysrq.c
+++ b/kernel/arch/mips/kernel/sysrq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MIPS specific sysrq operations.
  *
diff --git a/kernel/arch/mips/kernel/topology.c b/kernel/arch/mips/kernel/topology.c
index cf3eb61fa..cd3e1f82e 100644
--- a/kernel/arch/mips/kernel/topology.c
+++ b/kernel/arch/mips/kernel/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cpu.h>
 #include <linux/cpumask.h>
 #include <linux/init.h>
diff --git a/kernel/arch/mips/kernel/uprobes.c b/kernel/arch/mips/kernel/uprobes.c
index e99e3fae5..f7a0645cc 100644
--- a/kernel/arch/mips/kernel/uprobes.c
+++ b/kernel/arch/mips/kernel/uprobes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/highmem.h>
 #include <linux/kdebug.h>
 #include <linux/types.h>
diff --git a/kernel/arch/mips/kernel/vmlinux.lds.S b/kernel/arch/mips/kernel/vmlinux.lds.S
index 8ca2371aa..971a50400 100644
--- a/kernel/arch/mips/kernel/vmlinux.lds.S
+++ b/kernel/arch/mips/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 
diff --git a/kernel/arch/mips/kvm/Kconfig b/kernel/arch/mips/kvm/Kconfig
index 50a722dfb..b17447ce8 100644
--- a/kernel/arch/mips/kvm/Kconfig
+++ b/kernel/arch/mips/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/mips/kvm/Makefile b/kernel/arch/mips/kvm/Makefile
index 45d90f5d5..01affc1d2 100644
--- a/kernel/arch/mips/kvm/Makefile
+++ b/kernel/arch/mips/kvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for KVM support for MIPS
 #
 
diff --git a/kernel/arch/mips/lantiq/Kconfig b/kernel/arch/mips/lantiq/Kconfig
index 35bc69b78..692ae85a3 100644
--- a/kernel/arch/mips/lantiq/Kconfig
+++ b/kernel/arch/mips/lantiq/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if LANTIQ
 
 config SOC_TYPE_XWAY
diff --git a/kernel/arch/mips/lasat/Kconfig b/kernel/arch/mips/lasat/Kconfig
index 8776d0a34..11b89e94b 100644
--- a/kernel/arch/mips/lasat/Kconfig
+++ b/kernel/arch/mips/lasat/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PICVUE
 	tristate "PICVUE LCD display driver"
 	depends on LASAT
diff --git a/kernel/arch/mips/lasat/Makefile b/kernel/arch/mips/lasat/Makefile
index 869bd3b37..1789b227e 100644
--- a/kernel/arch/mips/lasat/Makefile
+++ b/kernel/arch/mips/lasat/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the LASAT specific kernel interface routines under Linux.
 #
diff --git a/kernel/arch/mips/lasat/at93c.c b/kernel/arch/mips/lasat/at93c.c
index 4e272a262..f895fe94b 100644
--- a/kernel/arch/mips/lasat/at93c.c
+++ b/kernel/arch/mips/lasat/at93c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Atmel AT93C46 serial eeprom driver
  *
diff --git a/kernel/arch/mips/lasat/at93c.h b/kernel/arch/mips/lasat/at93c.h
index cfe2f99b1..7a99a02d8 100644
--- a/kernel/arch/mips/lasat/at93c.h
+++ b/kernel/arch/mips/lasat/at93c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Atmel AT93C46 serial eeprom driver
  *
diff --git a/kernel/arch/mips/lasat/ds1603.c b/kernel/arch/mips/lasat/ds1603.c
index c6fd96ff1..8bd5cf820 100644
--- a/kernel/arch/mips/lasat/ds1603.c
+++ b/kernel/arch/mips/lasat/ds1603.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dallas Semiconductors 1603 RTC driver
  *
diff --git a/kernel/arch/mips/lasat/ds1603.h b/kernel/arch/mips/lasat/ds1603.h
index 3e718b1cc..00987d3bd 100644
--- a/kernel/arch/mips/lasat/ds1603.h
+++ b/kernel/arch/mips/lasat/ds1603.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Dallas Semiconductors 1603 RTC driver
  *
diff --git a/kernel/arch/mips/lasat/image/Makefile b/kernel/arch/mips/lasat/image/Makefile
index fd3207567..9ab1326f5 100644
--- a/kernel/arch/mips/lasat/image/Makefile
+++ b/kernel/arch/mips/lasat/image/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # MAKEFILE FOR THE MIPS LINUX BOOTLOADER AND ROM DEBUGGER
 #
diff --git a/kernel/arch/mips/lasat/image/head.S b/kernel/arch/mips/lasat/image/head.S
index 41babbe43..1a27312d4 100644
--- a/kernel/arch/mips/lasat/image/head.S
+++ b/kernel/arch/mips/lasat/image/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/lasat/head.h>
 
 	.text
diff --git a/kernel/arch/mips/lasat/lasat_models.h b/kernel/arch/mips/lasat/lasat_models.h
index e1cbd26ae..474e57342 100644
--- a/kernel/arch/mips/lasat/lasat_models.h
+++ b/kernel/arch/mips/lasat/lasat_models.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Model description tables
  */
diff --git a/kernel/arch/mips/lasat/picvue.h b/kernel/arch/mips/lasat/picvue.h
index d0119fca3..161d3bf50 100644
--- a/kernel/arch/mips/lasat/picvue.h
+++ b/kernel/arch/mips/lasat/picvue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Picvue PVC160206 display driver
  *
diff --git a/kernel/arch/mips/lasat/prom.c b/kernel/arch/mips/lasat/prom.c
index 20fde19a5..17e15b50a 100644
--- a/kernel/arch/mips/lasat/prom.c
+++ b/kernel/arch/mips/lasat/prom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PROM interface routines.
  */
diff --git a/kernel/arch/mips/lasat/prom.h b/kernel/arch/mips/lasat/prom.h
index 337acbc27..3d1df853e 100644
--- a/kernel/arch/mips/lasat/prom.h
+++ b/kernel/arch/mips/lasat/prom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PROM_H
 #define __PROM_H
 
diff --git a/kernel/arch/mips/lib/Makefile b/kernel/arch/mips/lib/Makefile
index 6ab430d24..78c2affea 100644
--- a/kernel/arch/mips/lib/Makefile
+++ b/kernel/arch/mips/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for MIPS-specific library files..
 #
diff --git a/kernel/arch/mips/lib/ashldi3.c b/kernel/arch/mips/lib/ashldi3.c
index c3e22053d..24cd6903e 100644
--- a/kernel/arch/mips/lib/ashldi3.c
+++ b/kernel/arch/mips/lib/ashldi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/mips/lib/ashrdi3.c b/kernel/arch/mips/lib/ashrdi3.c
index 174560248..23f5295af 100644
--- a/kernel/arch/mips/lib/ashrdi3.c
+++ b/kernel/arch/mips/lib/ashrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/mips/lib/bswapdi.c b/kernel/arch/mips/lib/bswapdi.c
index a8114148f..fcef74084 100644
--- a/kernel/arch/mips/lib/bswapdi.c
+++ b/kernel/arch/mips/lib/bswapdi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/compiler.h>
 
diff --git a/kernel/arch/mips/lib/bswapsi.c b/kernel/arch/mips/lib/bswapsi.c
index 106fd9783..22d8e4f6d 100644
--- a/kernel/arch/mips/lib/bswapsi.c
+++ b/kernel/arch/mips/lib/bswapsi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/compiler.h>
 
diff --git a/kernel/arch/mips/lib/cmpdi2.c b/kernel/arch/mips/lib/cmpdi2.c
index 9d849d874..93cfc7859 100644
--- a/kernel/arch/mips/lib/cmpdi2.c
+++ b/kernel/arch/mips/lib/cmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/mips/lib/dump_tlb.c b/kernel/arch/mips/lib/dump_tlb.c
index 6eb50a713..781ad96b7 100644
--- a/kernel/arch/mips/lib/dump_tlb.c
+++ b/kernel/arch/mips/lib/dump_tlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dump R4x00 TLB for debugging purposes.
  *
diff --git a/kernel/arch/mips/lib/iomap-pci.c b/kernel/arch/mips/lib/iomap-pci.c
index 8ed3f25a9..4850509c5 100644
--- a/kernel/arch/mips/lib/iomap-pci.c
+++ b/kernel/arch/mips/lib/iomap-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement the default iomap interfaces
  *
diff --git a/kernel/arch/mips/lib/iomap.c b/kernel/arch/mips/lib/iomap.c
index 9daa92428..9b31653f3 100644
--- a/kernel/arch/mips/lib/iomap.c
+++ b/kernel/arch/mips/lib/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement the default iomap interfaces
  *
diff --git a/kernel/arch/mips/lib/libgcc.h b/kernel/arch/mips/lib/libgcc.h
index 05909d58e..28002ed90 100644
--- a/kernel/arch/mips/lib/libgcc.h
+++ b/kernel/arch/mips/lib/libgcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LIBGCC_H
 #define __ASM_LIBGCC_H
 
diff --git a/kernel/arch/mips/lib/lshrdi3.c b/kernel/arch/mips/lib/lshrdi3.c
index 221167c1b..914b971ac 100644
--- a/kernel/arch/mips/lib/lshrdi3.c
+++ b/kernel/arch/mips/lib/lshrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/mips/lib/r3k_dump_tlb.c b/kernel/arch/mips/lib/r3k_dump_tlb.c
index 85b4086e5..b97d9c5d8 100644
--- a/kernel/arch/mips/lib/r3k_dump_tlb.c
+++ b/kernel/arch/mips/lib/r3k_dump_tlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dump R3000 TLB for debugging purposes.
  *
diff --git a/kernel/arch/mips/lib/ucmpdi2.c b/kernel/arch/mips/lib/ucmpdi2.c
index 08067fa53..c31c78ca4 100644
--- a/kernel/arch/mips/lib/ucmpdi2.c
+++ b/kernel/arch/mips/lib/ucmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/mips/loongson32/Kconfig b/kernel/arch/mips/loongson32/Kconfig
index 3c0c2f209..462b126f4 100644
--- a/kernel/arch/mips/loongson32/Kconfig
+++ b/kernel/arch/mips/loongson32/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MACH_LOONGSON32
 
 choice
diff --git a/kernel/arch/mips/loongson64/Kconfig b/kernel/arch/mips/loongson64/Kconfig
index 8e6e29267..0d249fc3c 100644
--- a/kernel/arch/mips/loongson64/Kconfig
+++ b/kernel/arch/mips/loongson64/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MACH_LOONGSON64
 
 choice
diff --git a/kernel/arch/mips/loongson64/common/Makefile b/kernel/arch/mips/loongson64/common/Makefile
index 074d9cb15..8235ac7ea 100644
--- a/kernel/arch/mips/loongson64/common/Makefile
+++ b/kernel/arch/mips/loongson64/common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for loongson based machines.
 #
diff --git a/kernel/arch/mips/loongson64/common/dma-swiotlb.c b/kernel/arch/mips/loongson64/common/dma-swiotlb.c
index 34486c138..ef07740ce 100644
--- a/kernel/arch/mips/loongson64/common/dma-swiotlb.c
+++ b/kernel/arch/mips/loongson64/common/dma-swiotlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
diff --git a/kernel/arch/mips/loongson64/loongson-3/acpi_init.c b/kernel/arch/mips/loongson64/loongson-3/acpi_init.c
index dbdad79ea..8d7c119dd 100644
--- a/kernel/arch/mips/loongson64/loongson-3/acpi_init.c
+++ b/kernel/arch/mips/loongson64/loongson-3/acpi_init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
diff --git a/kernel/arch/mips/loongson64/loongson-3/hpet.c b/kernel/arch/mips/loongson64/loongson-3/hpet.c
index 4df9d4b73..ed15430ad 100644
--- a/kernel/arch/mips/loongson64/loongson-3/hpet.c
+++ b/kernel/arch/mips/loongson64/loongson-3/hpet.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/percpu.h>
diff --git a/kernel/arch/mips/loongson64/loongson-3/irq.c b/kernel/arch/mips/loongson64/loongson-3/irq.c
index 7202e52cd..cbeb20f9f 100644
--- a/kernel/arch/mips/loongson64/loongson-3/irq.c
+++ b/kernel/arch/mips/loongson64/loongson-3/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <loongson.h>
 #include <irq.h>
 #include <linux/interrupt.h>
diff --git a/kernel/arch/mips/loongson64/loongson-3/smp.h b/kernel/arch/mips/loongson64/loongson-3/smp.h
index d98ff654b..957bde81e 100644
--- a/kernel/arch/mips/loongson64/loongson-3/smp.h
+++ b/kernel/arch/mips/loongson64/loongson-3/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LOONGSON_SMP_H_
 #define __LOONGSON_SMP_H_
 
diff --git a/kernel/arch/mips/math-emu/Makefile b/kernel/arch/mips/math-emu/Makefile
index e9f10b88b..81d25ff32 100644
--- a/kernel/arch/mips/math-emu/Makefile
+++ b/kernel/arch/mips/math-emu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/MIPS kernel FPU emulation.
 #
diff --git a/kernel/arch/mips/math-emu/dsemul.c b/kernel/arch/mips/math-emu/dsemul.c
index b6bfd3625..5450f4d1c 100644
--- a/kernel/arch/mips/math-emu/dsemul.c
+++ b/kernel/arch/mips/math-emu/dsemul.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/mm_types.h>
diff --git a/kernel/arch/mips/math-emu/me-debugfs.c b/kernel/arch/mips/math-emu/me-debugfs.c
index 8c0ec154a..62566385c 100644
--- a/kernel/arch/mips/math-emu/me-debugfs.c
+++ b/kernel/arch/mips/math-emu/me-debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cpumask.h>
 #include <linux/debugfs.h>
 #include <linux/fs.h>
diff --git a/kernel/arch/mips/mm/Makefile b/kernel/arch/mips/mm/Makefile
index b4cc8811a..c463bdad4 100644
--- a/kernel/arch/mips/mm/Makefile
+++ b/kernel/arch/mips/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/MIPS-specific parts of the memory manager.
 #
diff --git a/kernel/arch/mips/mm/c-r3k.c b/kernel/arch/mips/mm/c-r3k.c
index 21e4e662c..3466fcdae 100644
--- a/kernel/arch/mips/mm/c-r3k.c
+++ b/kernel/arch/mips/mm/c-r3k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * r2300.c: R2000 and R3000 specific mmu/cache code.
  *
diff --git a/kernel/arch/mips/mm/c-tx39.c b/kernel/arch/mips/mm/c-tx39.c
index 5c282583e..5f6c099a9 100644
--- a/kernel/arch/mips/mm/c-tx39.c
+++ b/kernel/arch/mips/mm/c-tx39.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * r2300.c: R2000 and R3000 specific mmu/cache code.
  *
diff --git a/kernel/arch/mips/mm/gup.c b/kernel/arch/mips/mm/gup.c
index d8c3c1592..1e4658eee 100644
--- a/kernel/arch/mips/mm/gup.c
+++ b/kernel/arch/mips/mm/gup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Lockless get_user_pages_fast for MIPS
  *
diff --git a/kernel/arch/mips/mm/highmem.c b/kernel/arch/mips/mm/highmem.c
index f13f51003..d08e6d7d5 100644
--- a/kernel/arch/mips/mm/highmem.c
+++ b/kernel/arch/mips/mm/highmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/init.h>
 #include <linux/export.h>
diff --git a/kernel/arch/mips/mm/sc-debugfs.c b/kernel/arch/mips/mm/sc-debugfs.c
index 7e945e310..2e2132d3f 100644
--- a/kernel/arch/mips/mm/sc-debugfs.c
+++ b/kernel/arch/mips/mm/sc-debugfs.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/mm/sc-ip22.c b/kernel/arch/mips/mm/sc-ip22.c
index f293a97cb..ea059cd86 100644
--- a/kernel/arch/mips/mm/sc-ip22.c
+++ b/kernel/arch/mips/mm/sc-ip22.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sc-ip22.c: Indy cache management functions.
  *
diff --git a/kernel/arch/mips/mm/sc-mips.c b/kernel/arch/mips/mm/sc-mips.c
index acfb89273..548acb7f8 100644
--- a/kernel/arch/mips/mm/sc-mips.c
+++ b/kernel/arch/mips/mm/sc-mips.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2006 Chris Dearman (chris@mips.com),
  */
diff --git a/kernel/arch/mips/mm/sc-r5k.c b/kernel/arch/mips/mm/sc-r5k.c
index 751b5cd18..c7b94c951 100644
--- a/kernel/arch/mips/mm/sc-r5k.c
+++ b/kernel/arch/mips/mm/sc-r5k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org),
  * derived from r4xx0.c by David S. Miller (davem@davemloft.net).
diff --git a/kernel/arch/mips/mm/sc-rm7k.c b/kernel/arch/mips/mm/sc-rm7k.c
index 78f900c59..e9e3777a7 100644
--- a/kernel/arch/mips/mm/sc-rm7k.c
+++ b/kernel/arch/mips/mm/sc-rm7k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sc-rm7k.c: RM7000 cache management functions.
  *
diff --git a/kernel/arch/mips/mm/tlb-r3k.c b/kernel/arch/mips/mm/tlb-r3k.c
index 1290b9956..6f589e011 100644
--- a/kernel/arch/mips/mm/tlb-r3k.c
+++ b/kernel/arch/mips/mm/tlb-r3k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * r2300.c: R2000 and R3000 specific mmu/cache code.
  *
diff --git a/kernel/arch/mips/mm/uasm-micromips.c b/kernel/arch/mips/mm/uasm-micromips.c
index c28ff53c8..cdb5a191b 100644
--- a/kernel/arch/mips/mm/uasm-micromips.c
+++ b/kernel/arch/mips/mm/uasm-micromips.c
@@ -80,7 +80,7 @@ static const struct insn const insn_table_MM[insn_invalid] = {
 	[insn_jr]	= {M(mm_pool32a_op, 0, 0, 0, mm_jalr_op, mm_pool32axf_op), RS},
 	[insn_lb]	= {M(mm_lb32_op, 0, 0, 0, 0, 0), RT | RS | SIMM},
 	[insn_ld]	= {0, 0},
-	[insn_lh]	= {M(mm_lh32_op, 0, 0, 0, 0, 0), RS | RS | SIMM},
+	[insn_lh]	= {M(mm_lh32_op, 0, 0, 0, 0, 0), RT | RS | SIMM},
 	[insn_ll]	= {M(mm_pool32c_op, 0, 0, (mm_ll_func << 1), 0, 0), RS | RT | SIMM},
 	[insn_lld]	= {0, 0},
 	[insn_lui]	= {M(mm_pool32i_op, mm_lui_op, 0, 0, 0, 0), RS | SIMM},
diff --git a/kernel/arch/mips/mti-malta/Makefile b/kernel/arch/mips/mti-malta/Makefile
index 5827af77c..63940bdce 100644
--- a/kernel/arch/mips/mti-malta/Makefile
+++ b/kernel/arch/mips/mti-malta/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Carsten Langgaard, carstenl@mips.com
 # Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
diff --git a/kernel/arch/mips/mti-malta/malta-dt.c b/kernel/arch/mips/mti-malta/malta-dt.c
index 482294310..b39711703 100644
--- a/kernel/arch/mips/mti-malta/malta-dt.c
+++ b/kernel/arch/mips/mti-malta/malta-dt.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/mti-malta/malta-dtshim.c b/kernel/arch/mips/mti-malta/malta-dtshim.c
index a6699c152..7859b6e49 100644
--- a/kernel/arch/mips/mti-malta/malta-dtshim.c
+++ b/kernel/arch/mips/mti-malta/malta-dtshim.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/mti-malta/malta-pm.c b/kernel/arch/mips/mti-malta/malta-pm.c
index c1e456c01..efbd659fb 100644
--- a/kernel/arch/mips/mti-malta/malta-pm.c
+++ b/kernel/arch/mips/mti-malta/malta-pm.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/net/ebpf_jit.c b/kernel/arch/mips/net/ebpf_jit.c
index 01b7a87ea..962b0259b 100644
--- a/kernel/arch/mips/net/ebpf_jit.c
+++ b/kernel/arch/mips/net/ebpf_jit.c
@@ -1513,7 +1513,7 @@ ld_skb_common:
 		}
 		src = ebpf_to_mips_reg(ctx, insn, src_reg_no_fp);
 		if (src < 0)
-			return dst;
+			return src;
 		if (BPF_MODE(insn->code) == BPF_XADD) {
 			switch (BPF_SIZE(insn->code)) {
 			case BPF_W:
diff --git a/kernel/arch/mips/netlogic/Kconfig b/kernel/arch/mips/netlogic/Kconfig
index fb00606e3..8296b13af 100644
--- a/kernel/arch/mips/netlogic/Kconfig
+++ b/kernel/arch/mips/netlogic/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if NLM_XLP_BOARD || NLM_XLR_BOARD
 
 if NLM_XLP_BOARD
diff --git a/kernel/arch/mips/netlogic/common/Makefile b/kernel/arch/mips/netlogic/common/Makefile
index 362739d62..60d00b5d7 100644
--- a/kernel/arch/mips/netlogic/common/Makefile
+++ b/kernel/arch/mips/netlogic/common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				+= irq.o time.o
 obj-y				+= nlm-dma.o
 obj-y				+= reset.o
diff --git a/kernel/arch/mips/netlogic/xlp/Makefile b/kernel/arch/mips/netlogic/xlp/Makefile
index 6b43af0a3..d62465717 100644
--- a/kernel/arch/mips/netlogic/xlp/Makefile
+++ b/kernel/arch/mips/netlogic/xlp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				+= setup.o nlm_hal.o cop2-ex.o dt.o
 obj-$(CONFIG_SMP)		+= wakeup.o
 ifdef CONFIG_USB
diff --git a/kernel/arch/mips/oprofile/Makefile b/kernel/arch/mips/oprofile/Makefile
index 070afdb29..011cf9f89 100644
--- a/kernel/arch/mips/oprofile/Makefile
+++ b/kernel/arch/mips/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/mips/oprofile/backtrace.c b/kernel/arch/mips/oprofile/backtrace.c
index 16ace558c..806fb7980 100644
--- a/kernel/arch/mips/oprofile/backtrace.c
+++ b/kernel/arch/mips/oprofile/backtrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/oprofile.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
diff --git a/kernel/arch/mips/paravirt/Kconfig b/kernel/arch/mips/paravirt/Kconfig
index ecae5861b..46b110fec 100644
--- a/kernel/arch/mips/paravirt/Kconfig
+++ b/kernel/arch/mips/paravirt/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MIPS_PARAVIRT
 
 config MIPS_PCI_VIRTIO
diff --git a/kernel/arch/mips/pci/Makefile b/kernel/arch/mips/pci/Makefile
index 4b821481d..8185a2bfa 100644
--- a/kernel/arch/mips/pci/Makefile
+++ b/kernel/arch/mips/pci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PCI specific kernel interface routines under Linux.
 #
diff --git a/kernel/arch/mips/pci/fixup-ip32.c b/kernel/arch/mips/pci/fixup-ip32.c
index c6ec18a07..d091ffc53 100644
--- a/kernel/arch/mips/pci/fixup-ip32.c
+++ b/kernel/arch/mips/pci/fixup-ip32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
diff --git a/kernel/arch/mips/pci/fixup-malta.c b/kernel/arch/mips/pci/fixup-malta.c
index 3ec853317..8131e0ffe 100644
--- a/kernel/arch/mips/pci/fixup-malta.c
+++ b/kernel/arch/mips/pci/fixup-malta.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <asm/mips-boards/piix4.h>
diff --git a/kernel/arch/mips/pci/ops-loongson3.c b/kernel/arch/mips/pci/ops-loongson3.c
index 46ed541a3..9e118431e 100644
--- a/kernel/arch/mips/pci/ops-loongson3.c
+++ b/kernel/arch/mips/pci/ops-loongson3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/mips/pci/ops-nile4.c b/kernel/arch/mips/pci/ops-nile4.c
index b9d1fd0ff..b00658d19 100644
--- a/kernel/arch/mips/pci/ops-nile4.c
+++ b/kernel/arch/mips/pci/ops-nile4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <asm/bootinfo.h>
diff --git a/kernel/arch/mips/pci/pci-alchemy.c b/kernel/arch/mips/pci/pci-alchemy.c
index f15ec98de..4f2411f48 100644
--- a/kernel/arch/mips/pci/pci-alchemy.c
+++ b/kernel/arch/mips/pci/pci-alchemy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Alchemy PCI host mode support.
  *
diff --git a/kernel/arch/mips/pci/pci-bcm63xx.h b/kernel/arch/mips/pci/pci-bcm63xx.h
index ffab4da7b..214def1e4 100644
--- a/kernel/arch/mips/pci/pci-bcm63xx.h
+++ b/kernel/arch/mips/pci/pci-bcm63xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PCI_BCM63XX_H_
 #define PCI_BCM63XX_H_
 
diff --git a/kernel/arch/mips/pci/pci-generic.c b/kernel/arch/mips/pci/pci-generic.c
index dce304dc3..676348164 100644
--- a/kernel/arch/mips/pci/pci-generic.c
+++ b/kernel/arch/mips/pci/pci-generic.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * pcibios_align_resource taken from arch/arm/kernel/bios32.c.
  *
diff --git a/kernel/arch/mips/pic32/Kconfig b/kernel/arch/mips/pic32/Kconfig
index 527d37da0..e284e8918 100644
--- a/kernel/arch/mips/pic32/Kconfig
+++ b/kernel/arch/mips/pic32/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if MACH_PIC32
 
 choice
diff --git a/kernel/arch/mips/pistachio/Kconfig b/kernel/arch/mips/pistachio/Kconfig
index 97731ea94..9a0e06c95 100644
--- a/kernel/arch/mips/pistachio/Kconfig
+++ b/kernel/arch/mips/pistachio/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PISTACHIO_GPTIMER_CLKSRC
 	bool "Enable General Purpose Timer based clocksource"
 	depends on MACH_PISTACHIO
diff --git a/kernel/arch/mips/pmcs-msp71xx/Kconfig b/kernel/arch/mips/pmcs-msp71xx/Kconfig
index 4190093d3..d319bc0c3 100644
--- a/kernel/arch/mips/pmcs-msp71xx/Kconfig
+++ b/kernel/arch/mips/pmcs-msp71xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "PMC-Sierra MSP SOC type"
 	depends on PMC_MSP
diff --git a/kernel/arch/mips/pmcs-msp71xx/Makefile b/kernel/arch/mips/pmcs-msp71xx/Makefile
index d4f7220f2..c040bd6ed 100644
--- a/kernel/arch/mips/pmcs-msp71xx/Makefile
+++ b/kernel/arch/mips/pmcs-msp71xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PMC-Sierra MSP SOCs
 #
diff --git a/kernel/arch/mips/power/hibernate.c b/kernel/arch/mips/power/hibernate.c
index 19a9af68b..94ab17c3c 100644
--- a/kernel/arch/mips/power/hibernate.c
+++ b/kernel/arch/mips/power/hibernate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/tlbflush.h>
 
 extern int restore_image(void);
diff --git a/kernel/arch/mips/ralink/Kconfig b/kernel/arch/mips/ralink/Kconfig
index b4627080b..f26736b70 100644
--- a/kernel/arch/mips/ralink/Kconfig
+++ b/kernel/arch/mips/ralink/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if RALINK
 
 config CLKEVT_RT3352
diff --git a/kernel/arch/mips/rb532/setup.c b/kernel/arch/mips/rb532/setup.c
index d0c64e71d..1aa4df138 100644
--- a/kernel/arch/mips/rb532/setup.c
+++ b/kernel/arch/mips/rb532/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * setup.c - boot time setup code
  */
diff --git a/kernel/arch/mips/sgi-ip22/Makefile b/kernel/arch/mips/sgi-ip22/Makefile
index 411cda9ee..45f42fa08 100644
--- a/kernel/arch/mips/sgi-ip22/Makefile
+++ b/kernel/arch/mips/sgi-ip22/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the SGI specific kernel interface routines
 # under Linux.
diff --git a/kernel/arch/mips/sgi-ip22/ip22-berr.c b/kernel/arch/mips/sgi-ip22/ip22-berr.c
index ff8e1935c..34bb9801d 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-berr.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-berr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip22-berr.c: Bus error handling.
  *
diff --git a/kernel/arch/mips/sgi-ip22/ip22-hpc.c b/kernel/arch/mips/sgi-ip22/ip22-hpc.c
index 396956e07..49922e86c 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-hpc.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-hpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip22-hpc.c: Routines for generic manipulation of the HPC controllers.
  *
diff --git a/kernel/arch/mips/sgi-ip22/ip22-int.c b/kernel/arch/mips/sgi-ip22/ip22-int.c
index c66889fc4..3804895fa 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-int.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-int.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip22-int.c: Routines for generic manipulation of the INT[23] ASIC
  *	       found on INDY and Indigo2 workstations.
diff --git a/kernel/arch/mips/sgi-ip22/ip22-mc.c b/kernel/arch/mips/sgi-ip22/ip22-mc.c
index db5a64026..1944d4150 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-mc.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-mc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip22-mc.c: Routines for manipulating SGI Memory Controller.
  *
diff --git a/kernel/arch/mips/sgi-ip22/ip22-nvram.c b/kernel/arch/mips/sgi-ip22/ip22-nvram.c
index cc6133bb5..e727ef519 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-nvram.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-nvram.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip22-nvram.c: NVRAM and serial EEPROM handling.
  *
diff --git a/kernel/arch/mips/sgi-ip22/ip22-platform.c b/kernel/arch/mips/sgi-ip22/ip22-platform.c
index a14fd32b7..37ad26716 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-platform.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/if_ether.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/mips/sgi-ip22/ip22-setup.c b/kernel/arch/mips/sgi-ip22/ip22-setup.c
index 872159970..b69daa024 100644
--- a/kernel/arch/mips/sgi-ip22/ip22-setup.c
+++ b/kernel/arch/mips/sgi-ip22/ip22-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip22-setup.c: SGI specific setup, including init of the feature struct.
  *
diff --git a/kernel/arch/mips/sgi-ip22/ip28-berr.c b/kernel/arch/mips/sgi-ip22/ip28-berr.c
index 75460e1e1..2ed8e4990 100644
--- a/kernel/arch/mips/sgi-ip22/ip28-berr.c
+++ b/kernel/arch/mips/sgi-ip22/ip28-berr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip28-berr.c: Bus error handling.
  *
diff --git a/kernel/arch/mips/sgi-ip27/Kconfig b/kernel/arch/mips/sgi-ip27/Kconfig
index 4d8705a65..ef3847e7a 100644
--- a/kernel/arch/mips/sgi-ip27/Kconfig
+++ b/kernel/arch/mips/sgi-ip27/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "Node addressing mode"
 	depends on SGI_IP27
diff --git a/kernel/arch/mips/sgi-ip27/Makefile b/kernel/arch/mips/sgi-ip27/Makefile
index ab4affa62..73502fda1 100644
--- a/kernel/arch/mips/sgi-ip27/Makefile
+++ b/kernel/arch/mips/sgi-ip27/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the IP27 specific kernel interface routines under Linux.
 #
diff --git a/kernel/arch/mips/sgi-ip27/ip27-irq-pci.c b/kernel/arch/mips/sgi-ip27/ip27-irq-pci.c
index 2a1c40784..cd449e90b 100644
--- a/kernel/arch/mips/sgi-ip27/ip27-irq-pci.c
+++ b/kernel/arch/mips/sgi-ip27/ip27-irq-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip27-irq.c: Highlevel interrupt handling for IP27 architecture.
  *
diff --git a/kernel/arch/mips/sgi-ip27/ip27-irq.c b/kernel/arch/mips/sgi-ip27/ip27-irq.c
index 16ec4e12d..0dde6164a 100644
--- a/kernel/arch/mips/sgi-ip27/ip27-irq.c
+++ b/kernel/arch/mips/sgi-ip27/ip27-irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ip27-irq.c: Highlevel interrupt handling for IP27 architecture.
  *
diff --git a/kernel/arch/mips/sgi-ip27/ip27-klconfig.c b/kernel/arch/mips/sgi-ip27/ip27-klconfig.c
index c873d62ff..41171ff0c 100644
--- a/kernel/arch/mips/sgi-ip27/ip27-klconfig.c
+++ b/kernel/arch/mips/sgi-ip27/ip27-klconfig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1999, 2000 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
diff --git a/kernel/arch/mips/sgi-ip27/ip27-klnuma.c b/kernel/arch/mips/sgi-ip27/ip27-klnuma.c
index 2beb03907..a4f01328d 100644
--- a/kernel/arch/mips/sgi-ip27/ip27-klnuma.c
+++ b/kernel/arch/mips/sgi-ip27/ip27-klnuma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Ported from IRIX to Linux by Kanoj Sarcar, 06/08/00.
  * Copyright 2000 - 2001 Silicon Graphics, Inc.
diff --git a/kernel/arch/mips/sgi-ip27/ip27-nmi.c b/kernel/arch/mips/sgi-ip27/ip27-nmi.c
index cfceaea92..8ac2bfa35 100644
--- a/kernel/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/kernel/arch/mips/sgi-ip27/ip27-nmi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/mmzone.h>
 #include <linux/nodemask.h>
diff --git a/kernel/arch/mips/sgi-ip27/ip27-timer.c b/kernel/arch/mips/sgi-ip27/ip27-timer.c
index a53f0c8c9..9d5524753 100644
--- a/kernel/arch/mips/sgi-ip27/ip27-timer.c
+++ b/kernel/arch/mips/sgi-ip27/ip27-timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copytight (C) 1999, 2000, 05, 06 Ralf Baechle (ralf@linux-mips.org)
  * Copytight (C) 1999, 2000 Silicon Graphics, Inc.
diff --git a/kernel/arch/mips/sibyte/Kconfig b/kernel/arch/mips/sibyte/Kconfig
index 707b88441..f4dbce25b 100644
--- a/kernel/arch/mips/sibyte/Kconfig
+++ b/kernel/arch/mips/sibyte/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config SIBYTE_SB1250
 	bool
 	select CEVT_SB1250
diff --git a/kernel/arch/mips/sibyte/Makefile b/kernel/arch/mips/sibyte/Makefile
index 455c40d6d..d015c4d79 100644
--- a/kernel/arch/mips/sibyte/Makefile
+++ b/kernel/arch/mips/sibyte/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Sibyte SB1250 / BCM1480 family of SOCs
 #
diff --git a/kernel/arch/mips/sibyte/common/cfe_console.c b/kernel/arch/mips/sibyte/common/cfe_console.c
index 1ad2da103..8af7b41f7 100644
--- a/kernel/arch/mips/sibyte/common/cfe_console.c
+++ b/kernel/arch/mips/sibyte/common/cfe_console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/console.h>
diff --git a/kernel/arch/mips/sibyte/swarm/platform.c b/kernel/arch/mips/sibyte/swarm/platform.c
index 1cecdcf85..484969db7 100644
--- a/kernel/arch/mips/sibyte/swarm/platform.c
+++ b/kernel/arch/mips/sibyte/swarm/platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/kernel/arch/mips/sni/reset.c b/kernel/arch/mips/sni/reset.c
index 6afa34346..66f963d8d 100644
--- a/kernel/arch/mips/sni/reset.c
+++ b/kernel/arch/mips/sni/reset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/mips/sni/process.c
  *
diff --git a/kernel/arch/mips/sni/time.c b/kernel/arch/mips/sni/time.c
index 7ee14f41f..0eb7d1e88 100644
--- a/kernel/arch/mips/sni/time.c
+++ b/kernel/arch/mips/sni/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/i8253.h>
 #include <linux/interrupt.h>
diff --git a/kernel/arch/mips/tools/generic-board-config.sh b/kernel/arch/mips/tools/generic-board-config.sh
index 654d652d7..08849f83e 100755
--- a/kernel/arch/mips/tools/generic-board-config.sh
+++ b/kernel/arch/mips/tools/generic-board-config.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Copyright (C) 2017 Imagination Technologies
-# Author: Paul Burton <paul.burton@imgtec.com>
+# Author: Paul Burton <paul.burton@mips.com>
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
diff --git a/kernel/arch/mips/txx9/Kconfig b/kernel/arch/mips/txx9/Kconfig
index 42923478d..d2509c93f 100644
--- a/kernel/arch/mips/txx9/Kconfig
+++ b/kernel/arch/mips/txx9/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MACH_TX39XX
 	bool
 	select MACH_TXX9
diff --git a/kernel/arch/mips/txx9/Makefile b/kernel/arch/mips/txx9/Makefile
index 34787dabf..195295937 100644
--- a/kernel/arch/mips/txx9/Makefile
+++ b/kernel/arch/mips/txx9/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Common TXx9
 #
diff --git a/kernel/arch/mips/txx9/generic/Makefile b/kernel/arch/mips/txx9/generic/Makefile
index 1863c167e..6d00580fc 100644
--- a/kernel/arch/mips/txx9/generic/Makefile
+++ b/kernel/arch/mips/txx9/generic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for common code for TXx9 based systems
 #
diff --git a/kernel/arch/mips/vdso/Makefile b/kernel/arch/mips/vdso/Makefile
index b47d2a45d..ce196046a 100644
--- a/kernel/arch/mips/vdso/Makefile
+++ b/kernel/arch/mips/vdso/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Objects to go into the VDSO.
 obj-vdso-y := elf.o gettimeofday.o sigreturn.o
 
diff --git a/kernel/arch/mips/vr41xx/Kconfig b/kernel/arch/mips/vr41xx/Kconfig
index 74927b4d4..992c988b8 100644
--- a/kernel/arch/mips/vr41xx/Kconfig
+++ b/kernel/arch/mips/vr41xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "Machine type"
 	depends on MACH_VR41XX
diff --git a/kernel/arch/mips/xilfpga/Kconfig b/kernel/arch/mips/xilfpga/Kconfig
index 42a030a0e..ca7b2368e 100644
--- a/kernel/arch/mips/xilfpga/Kconfig
+++ b/kernel/arch/mips/xilfpga/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 choice
 	prompt "Machine type"
 	depends on MACH_XILFPGA
diff --git a/kernel/arch/mn10300/Kconfig b/kernel/arch/mn10300/Kconfig
index 38e3494bf..e9d8d60bd 100644
--- a/kernel/arch/mn10300/Kconfig
+++ b/kernel/arch/mn10300/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MN10300
 	def_bool y
 	select HAVE_EXIT_THREAD
diff --git a/kernel/arch/mn10300/Kconfig.debug b/kernel/arch/mn10300/Kconfig.debug
index 94efb3ed2..37ada651f 100644
--- a/kernel/arch/mn10300/Kconfig.debug
+++ b/kernel/arch/mn10300/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/mn10300/boot/compressed/Makefile b/kernel/arch/mn10300/boot/compressed/Makefile
index 5f56f9de1..9b9a48fc8 100644
--- a/kernel/arch/mn10300/boot/compressed/Makefile
+++ b/kernel/arch/mn10300/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Create a compressed vmlinux image from the original vmlinux
 #
diff --git a/kernel/arch/mn10300/boot/tools/build.c b/kernel/arch/mn10300/boot/tools/build.c
index 4f552ead0..3ce158fe0 100644
--- a/kernel/arch/mn10300/boot/tools/build.c
+++ b/kernel/arch/mn10300/boot/tools/build.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 1997 Martin Mares
diff --git a/kernel/arch/mn10300/include/asm/kmap_types.h b/kernel/arch/mn10300/include/asm/kmap_types.h
index 76d093b58..f444d7ffa 100644
--- a/kernel/arch/mn10300/include/asm/kmap_types.h
+++ b/kernel/arch/mn10300/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
diff --git a/kernel/arch/mn10300/include/asm/mmu.h b/kernel/arch/mn10300/include/asm/mmu.h
index 2d2d097e7..b9d6d41ad 100644
--- a/kernel/arch/mn10300/include/asm/mmu.h
+++ b/kernel/arch/mn10300/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* MN10300 Memory management context
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/mn10300/include/asm/page_offset.h b/kernel/arch/mn10300/include/asm/page_offset.h
index 8eb5b16ad..1e869aa09 100644
--- a/kernel/arch/mn10300/include/asm/page_offset.h
+++ b/kernel/arch/mn10300/include/asm/page_offset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* MN10300 Kernel base address
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/mn10300/include/asm/shmparam.h b/kernel/arch/mn10300/include/asm/shmparam.h
index ab666ed1a..3a31faaa4 100644
--- a/kernel/arch/mn10300/include/asm/shmparam.h
+++ b/kernel/arch/mn10300/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SHMPARAM_H
 #define _ASM_SHMPARAM_H
 
diff --git a/kernel/arch/mn10300/include/asm/spinlock_types.h b/kernel/arch/mn10300/include/asm/spinlock_types.h
index 653dc519b..32abdc89b 100644
--- a/kernel/arch/mn10300/include/asm/spinlock_types.h
+++ b/kernel/arch/mn10300/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPINLOCK_TYPES_H
 #define _ASM_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/mn10300/include/asm/termios.h b/kernel/arch/mn10300/include/asm/termios.h
index c2e29c75d..4010edcaa 100644
--- a/kernel/arch/mn10300/include/asm/termios.h
+++ b/kernel/arch/mn10300/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_TERMIOS_H
 #define _ASM_TERMIOS_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/bitsperlong.h b/kernel/arch/mn10300/include/uapi/asm/bitsperlong.h
index 6dc0bb0c1..76da34b10 100644
--- a/kernel/arch/mn10300/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/mn10300/include/uapi/asm/bitsperlong.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/bitsperlong.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/byteorder.h b/kernel/arch/mn10300/include/uapi/asm/byteorder.h
index 5dd0bdd9f..3467df912 100644
--- a/kernel/arch/mn10300/include/uapi/asm/byteorder.h
+++ b/kernel/arch/mn10300/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_BYTEORDER_H
 #define _ASM_BYTEORDER_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/errno.h b/kernel/arch/mn10300/include/uapi/asm/errno.h
index 4c82b503d..9addba592 100644
--- a/kernel/arch/mn10300/include/uapi/asm/errno.h
+++ b/kernel/arch/mn10300/include/uapi/asm/errno.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/errno.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/fcntl.h b/kernel/arch/mn10300/include/uapi/asm/fcntl.h
index 46ab12db5..a77648c50 100644
--- a/kernel/arch/mn10300/include/uapi/asm/fcntl.h
+++ b/kernel/arch/mn10300/include/uapi/asm/fcntl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/fcntl.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/ioctl.h b/kernel/arch/mn10300/include/uapi/asm/ioctl.h
index b279fe06d..b809c4566 100644
--- a/kernel/arch/mn10300/include/uapi/asm/ioctl.h
+++ b/kernel/arch/mn10300/include/uapi/asm/ioctl.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ioctl.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/ioctls.h b/kernel/arch/mn10300/include/uapi/asm/ioctls.h
index 0212f4b22..0955d4f85 100644
--- a/kernel/arch/mn10300/include/uapi/asm/ioctls.h
+++ b/kernel/arch/mn10300/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_IOCTLS_H
 #define _ASM_IOCTLS_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/ipcbuf.h b/kernel/arch/mn10300/include/uapi/asm/ipcbuf.h
index 84c7e51cb..90d6445a1 100644
--- a/kernel/arch/mn10300/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/mn10300/include/uapi/asm/ipcbuf.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/ipcbuf.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/kvm_para.h b/kernel/arch/mn10300/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/mn10300/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/mn10300/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/mman.h b/kernel/arch/mn10300/include/uapi/asm/mman.h
index db5c53da7..eb7f4798c 100644
--- a/kernel/arch/mn10300/include/uapi/asm/mman.h
+++ b/kernel/arch/mn10300/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/mman.h>
 
 #define MIN_MAP_ADDR	PAGE_SIZE	/* minimum fixed mmap address */
diff --git a/kernel/arch/mn10300/include/uapi/asm/msgbuf.h b/kernel/arch/mn10300/include/uapi/asm/msgbuf.h
index 8b602450c..5982def83 100644
--- a/kernel/arch/mn10300/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/mn10300/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_MSGBUF_H
 #define _ASM_MSGBUF_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/param.h b/kernel/arch/mn10300/include/uapi/asm/param.h
index 02a0ca6f1..e0020d774 100644
--- a/kernel/arch/mn10300/include/uapi/asm/param.h
+++ b/kernel/arch/mn10300/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 Kernel parameters
  *
  * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
diff --git a/kernel/arch/mn10300/include/uapi/asm/poll.h b/kernel/arch/mn10300/include/uapi/asm/poll.h
index c98509d31..b7132a305 100644
--- a/kernel/arch/mn10300/include/uapi/asm/poll.h
+++ b/kernel/arch/mn10300/include/uapi/asm/poll.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/poll.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/posix_types.h b/kernel/arch/mn10300/include/uapi/asm/posix_types.h
index d31eeea48..6b4cfc713 100644
--- a/kernel/arch/mn10300/include/uapi/asm/posix_types.h
+++ b/kernel/arch/mn10300/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 POSIX types
  *
  * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
diff --git a/kernel/arch/mn10300/include/uapi/asm/ptrace.h b/kernel/arch/mn10300/include/uapi/asm/ptrace.h
index 71b2251b7..f485c481a 100644
--- a/kernel/arch/mn10300/include/uapi/asm/ptrace.h
+++ b/kernel/arch/mn10300/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 Exception frame layout and ptrace constants
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/mn10300/include/uapi/asm/resource.h b/kernel/arch/mn10300/include/uapi/asm/resource.h
index 04bc4db89..49a81fbab 100644
--- a/kernel/arch/mn10300/include/uapi/asm/resource.h
+++ b/kernel/arch/mn10300/include/uapi/asm/resource.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/resource.h>
diff --git a/kernel/arch/mn10300/include/uapi/asm/sembuf.h b/kernel/arch/mn10300/include/uapi/asm/sembuf.h
index 301f3f9d8..ef44c42c7 100644
--- a/kernel/arch/mn10300/include/uapi/asm/sembuf.h
+++ b/kernel/arch/mn10300/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SEMBUF_H
 #define _ASM_SEMBUF_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/setup.h b/kernel/arch/mn10300/include/uapi/asm/setup.h
index ae5704fa7..043dd4b92 100644
--- a/kernel/arch/mn10300/include/uapi/asm/setup.h
+++ b/kernel/arch/mn10300/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * There isn't anything here anymore, but the file must not be empty or patch
  * will delete it.
diff --git a/kernel/arch/mn10300/include/uapi/asm/shmbuf.h b/kernel/arch/mn10300/include/uapi/asm/shmbuf.h
index 8f300cc35..6e81f74f5 100644
--- a/kernel/arch/mn10300/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/mn10300/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SHMBUF_H
 #define _ASM_SHMBUF_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/sigcontext.h b/kernel/arch/mn10300/include/uapi/asm/sigcontext.h
index 4de3afff4..1c361fabb 100644
--- a/kernel/arch/mn10300/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/mn10300/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 Userspace signal context
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/mn10300/include/uapi/asm/signal.h b/kernel/arch/mn10300/include/uapi/asm/signal.h
index f423a08d7..566cb199d 100644
--- a/kernel/arch/mn10300/include/uapi/asm/signal.h
+++ b/kernel/arch/mn10300/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 Signal definitions
  *
  * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
diff --git a/kernel/arch/mn10300/include/uapi/asm/socket.h b/kernel/arch/mn10300/include/uapi/asm/socket.h
index ac82a3f26..b35eee132 100644
--- a/kernel/arch/mn10300/include/uapi/asm/socket.h
+++ b/kernel/arch/mn10300/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/sockios.h b/kernel/arch/mn10300/include/uapi/asm/sockios.h
index b03043a1c..5706baa3c 100644
--- a/kernel/arch/mn10300/include/uapi/asm/sockios.h
+++ b/kernel/arch/mn10300/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SOCKIOS_H
 #define _ASM_SOCKIOS_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/stat.h b/kernel/arch/mn10300/include/uapi/asm/stat.h
index 63ff8371c..769f5f882 100644
--- a/kernel/arch/mn10300/include/uapi/asm/stat.h
+++ b/kernel/arch/mn10300/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_STAT_H
 #define _ASM_STAT_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/swab.h b/kernel/arch/mn10300/include/uapi/asm/swab.h
index bd818a820..d2284dd27 100644
--- a/kernel/arch/mn10300/include/uapi/asm/swab.h
+++ b/kernel/arch/mn10300/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 Byte-order primitive construction
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/mn10300/include/uapi/asm/termbits.h b/kernel/arch/mn10300/include/uapi/asm/termbits.h
index 130d42495..fca82ea2c 100644
--- a/kernel/arch/mn10300/include/uapi/asm/termbits.h
+++ b/kernel/arch/mn10300/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_TERMBITS_H
 #define _ASM_TERMBITS_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/termios.h b/kernel/arch/mn10300/include/uapi/asm/termios.h
index 11d3cc9d3..25981aadb 100644
--- a/kernel/arch/mn10300/include/uapi/asm/termios.h
+++ b/kernel/arch/mn10300/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_TERMIOS_H
 #define _UAPI_ASM_TERMIOS_H
 
diff --git a/kernel/arch/mn10300/include/uapi/asm/types.h b/kernel/arch/mn10300/include/uapi/asm/types.h
index 8b3f0501b..7d2a697e2 100644
--- a/kernel/arch/mn10300/include/uapi/asm/types.h
+++ b/kernel/arch/mn10300/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 Basic type definitions
  *
  * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd.
diff --git a/kernel/arch/mn10300/include/uapi/asm/unistd.h b/kernel/arch/mn10300/include/uapi/asm/unistd.h
index e28ac3f42..c0c96b650 100644
--- a/kernel/arch/mn10300/include/uapi/asm/unistd.h
+++ b/kernel/arch/mn10300/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* MN10300 System call number list
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/arch/mn10300/kernel/Makefile b/kernel/arch/mn10300/kernel/Makefile
index 561029f7f..de32af0e4 100644
--- a/kernel/arch/mn10300/kernel/Makefile
+++ b/kernel/arch/mn10300/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the MN10300-specific core kernel code
 #
diff --git a/kernel/arch/mn10300/kernel/asm-offsets.c b/kernel/arch/mn10300/kernel/asm-offsets.c
index e5a61c659..57e6cc962 100644
--- a/kernel/arch/mn10300/kernel/asm-offsets.c
+++ b/kernel/arch/mn10300/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed
diff --git a/kernel/arch/mn10300/kernel/gdb-stub.c b/kernel/arch/mn10300/kernel/gdb-stub.c
index a128c57b5..3399d5699 100644
--- a/kernel/arch/mn10300/kernel/gdb-stub.c
+++ b/kernel/arch/mn10300/kernel/gdb-stub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* MN10300 GDB stub
  *
  * Originally written by Glenn Engel, Lake Stevens Instrument Division
diff --git a/kernel/arch/mn10300/mm/Kconfig.cache b/kernel/arch/mn10300/mm/Kconfig.cache
index bfbe52691..8cc5d9ec3 100644
--- a/kernel/arch/mn10300/mm/Kconfig.cache
+++ b/kernel/arch/mn10300/mm/Kconfig.cache
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # MN10300 CPU cache options
 #
diff --git a/kernel/arch/mn10300/mm/Makefile b/kernel/arch/mn10300/mm/Makefile
index 11f38466a..048ba6f67 100644
--- a/kernel/arch/mn10300/mm/Makefile
+++ b/kernel/arch/mn10300/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the MN10300-specific memory management code
 #
diff --git a/kernel/arch/mn10300/oprofile/Makefile b/kernel/arch/mn10300/oprofile/Makefile
index 918dbe60e..9fa95aaf4 100644
--- a/kernel/arch/mn10300/oprofile/Makefile
+++ b/kernel/arch/mn10300/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the MN10300-specific profiling code
 #
diff --git a/kernel/arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h b/kernel/arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h
index f537801a4..516afe824 100644
--- a/kernel/arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h
+++ b/kernel/arch/mn10300/proc-mn103e010/include/proc/intctl-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PROC_INTCTL_REGS_H
 #define _ASM_PROC_INTCTL_REGS_H
 
diff --git a/kernel/arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h b/kernel/arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h
index a1e977273..4d4084ea6 100644
--- a/kernel/arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h
+++ b/kernel/arch/mn10300/proc-mn2ws0050/include/proc/intctl-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PROC_INTCTL_REGS_H
 #define _ASM_PROC_INTCTL_REGS_H
 
diff --git a/kernel/arch/mn10300/unit-asb2364/include/unit/fpga-regs.h b/kernel/arch/mn10300/unit-asb2364/include/unit/fpga-regs.h
index 33f100f9b..2901ed344 100644
--- a/kernel/arch/mn10300/unit-asb2364/include/unit/fpga-regs.h
+++ b/kernel/arch/mn10300/unit-asb2364/include/unit/fpga-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ASB2364 FPGA registers
  */
 
diff --git a/kernel/arch/nios2/Kconfig b/kernel/arch/nios2/Kconfig
index c587764b9..60fae03da 100644
--- a/kernel/arch/nios2/Kconfig
+++ b/kernel/arch/nios2/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config NIOS2
 	def_bool y
 	select TIMER_OF
diff --git a/kernel/arch/nios2/Kconfig.debug b/kernel/arch/nios2/Kconfig.debug
index 551052203..edfeef049 100644
--- a/kernel/arch/nios2/Kconfig.debug
+++ b/kernel/arch/nios2/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/nios2/boot/compressed/Makefile b/kernel/arch/nios2/boot/compressed/Makefile
index d5921c9a9..791e43092 100644
--- a/kernel/arch/nios2/boot/compressed/Makefile
+++ b/kernel/arch/nios2/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # create a compressed vmlinux image from the original vmlinux
 #
diff --git a/kernel/arch/nios2/include/uapi/asm/byteorder.h b/kernel/arch/nios2/include/uapi/asm/byteorder.h
index 3ab5dc20d..639007a55 100644
--- a/kernel/arch/nios2/include/uapi/asm/byteorder.h
+++ b/kernel/arch/nios2/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2009   Thomas Chou <thomas@wytron.com.tw>
  * Copyright (C) 2004   Microtronix Datacom Ltd
diff --git a/kernel/arch/nios2/include/uapi/asm/elf.h b/kernel/arch/nios2/include/uapi/asm/elf.h
index 6f06d3b29..ab0df71f8 100644
--- a/kernel/arch/nios2/include/uapi/asm/elf.h
+++ b/kernel/arch/nios2/include/uapi/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2011 Tobias Klauser <tklauser@distanz.ch>
  *
diff --git a/kernel/arch/nios2/include/uapi/asm/ptrace.h b/kernel/arch/nios2/include/uapi/asm/ptrace.h
index 1d35de90a..2b91dbe5b 100644
--- a/kernel/arch/nios2/include/uapi/asm/ptrace.h
+++ b/kernel/arch/nios2/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2010 Tobias Klauser <tklauser@distanz.ch>
  * Copyright (C) 2004 Microtronix Datacom Ltd
diff --git a/kernel/arch/nios2/include/uapi/asm/sigcontext.h b/kernel/arch/nios2/include/uapi/asm/sigcontext.h
index b67944a50..204ae3475 100644
--- a/kernel/arch/nios2/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/nios2/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2004, Microtronix Datacom Ltd.
  *
diff --git a/kernel/arch/nios2/include/uapi/asm/signal.h b/kernel/arch/nios2/include/uapi/asm/signal.h
index f29ee6314..b0d983068 100644
--- a/kernel/arch/nios2/include/uapi/asm/signal.h
+++ b/kernel/arch/nios2/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright Altera Corporation (C) 2013. All rights reserved
  *
diff --git a/kernel/arch/nios2/include/uapi/asm/swab.h b/kernel/arch/nios2/include/uapi/asm/swab.h
index b4e22ebae..9750547a5 100644
--- a/kernel/arch/nios2/include/uapi/asm/swab.h
+++ b/kernel/arch/nios2/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 Tobias Klauser <tklauser@distanz.ch>
  * Copyright (C) 2011 Pyramid Technical Consultants, Inc.
diff --git a/kernel/arch/nios2/include/uapi/asm/unistd.h b/kernel/arch/nios2/include/uapi/asm/unistd.h
index 51a32c71c..b6bdae04b 100644
--- a/kernel/arch/nios2/include/uapi/asm/unistd.h
+++ b/kernel/arch/nios2/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2013 Altera Corporation
  *
diff --git a/kernel/arch/nios2/kernel/Makefile b/kernel/arch/nios2/kernel/Makefile
index 06d07432b..0b645e1e3 100644
--- a/kernel/arch/nios2/kernel/Makefile
+++ b/kernel/arch/nios2/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the nios2 linux kernel.
 #
diff --git a/kernel/arch/nios2/mm/Makefile b/kernel/arch/nios2/mm/Makefile
index 3cbd08408..9d37fafd1 100644
--- a/kernel/arch/nios2/mm/Makefile
+++ b/kernel/arch/nios2/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Nios2-specific parts of the memory manager.
 #
diff --git a/kernel/arch/openrisc/Kconfig b/kernel/arch/openrisc/Kconfig
index a0f2e4a32..df2136ab1 100644
--- a/kernel/arch/openrisc/Kconfig
+++ b/kernel/arch/openrisc/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
diff --git a/kernel/arch/openrisc/boot/dts/Makefile b/kernel/arch/openrisc/boot/dts/Makefile
index b092d30d6..792ce7143 100644
--- a/kernel/arch/openrisc/boot/dts/Makefile
+++ b/kernel/arch/openrisc/boot/dts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'
 BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o
 else
diff --git a/kernel/arch/openrisc/boot/dts/or1ksim.dts b/kernel/arch/openrisc/boot/dts/or1ksim.dts
index 5d4f9027a..9f4b856da 100644
--- a/kernel/arch/openrisc/boot/dts/or1ksim.dts
+++ b/kernel/arch/openrisc/boot/dts/or1ksim.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 / {
 	compatible = "opencores,or1ksim";
diff --git a/kernel/arch/openrisc/include/asm/futex.h b/kernel/arch/openrisc/include/asm/futex.h
index 8fed278a2..618da4a1b 100644
--- a/kernel/arch/openrisc/include/asm/futex.h
+++ b/kernel/arch/openrisc/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_OPENRISC_FUTEX_H
 #define __ASM_OPENRISC_FUTEX_H
 
diff --git a/kernel/arch/openrisc/include/asm/string.h b/kernel/arch/openrisc/include/asm/string.h
index 64939ccd7..69b975454 100644
--- a/kernel/arch/openrisc/include/asm/string.h
+++ b/kernel/arch/openrisc/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_OPENRISC_STRING_H
 #define __ASM_OPENRISC_STRING_H
 
diff --git a/kernel/arch/openrisc/include/uapi/asm/elf.h b/kernel/arch/openrisc/include/uapi/asm/elf.h
index 88842760e..e892d5061 100644
--- a/kernel/arch/openrisc/include/uapi/asm/elf.h
+++ b/kernel/arch/openrisc/include/uapi/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * OpenRISC Linux
  *
diff --git a/kernel/arch/openrisc/include/uapi/asm/param.h b/kernel/arch/openrisc/include/uapi/asm/param.h
index c39a33661..103471e31 100644
--- a/kernel/arch/openrisc/include/uapi/asm/param.h
+++ b/kernel/arch/openrisc/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * OpenRISC Linux
  *
diff --git a/kernel/arch/openrisc/include/uapi/asm/ptrace.h b/kernel/arch/openrisc/include/uapi/asm/ptrace.h
index 9760bd17f..d4fab268f 100644
--- a/kernel/arch/openrisc/include/uapi/asm/ptrace.h
+++ b/kernel/arch/openrisc/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * OpenRISC Linux
  *
diff --git a/kernel/arch/openrisc/include/uapi/asm/sigcontext.h b/kernel/arch/openrisc/include/uapi/asm/sigcontext.h
index b79c2b19a..8ab775fc3 100644
--- a/kernel/arch/openrisc/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/openrisc/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * OpenRISC Linux
  *
diff --git a/kernel/arch/openrisc/include/uapi/asm/unistd.h b/kernel/arch/openrisc/include/uapi/asm/unistd.h
index 471905bd7..9a3ee3896 100644
--- a/kernel/arch/openrisc/include/uapi/asm/unistd.h
+++ b/kernel/arch/openrisc/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * OpenRISC Linux
  *
diff --git a/kernel/arch/openrisc/kernel/Makefile b/kernel/arch/openrisc/kernel/Makefile
index ec6d9d37c..c4ea6caba 100644
--- a/kernel/arch/openrisc/kernel/Makefile
+++ b/kernel/arch/openrisc/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/openrisc/kernel/vmlinux.h b/kernel/arch/openrisc/kernel/vmlinux.h
index bbcdf21b0..bdea46c61 100644
--- a/kernel/arch/openrisc/kernel/vmlinux.h
+++ b/kernel/arch/openrisc/kernel/vmlinux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OPENRISC_VMLINUX_H_
 #define __OPENRISC_VMLINUX_H_
 
diff --git a/kernel/arch/openrisc/lib/memcpy.c b/kernel/arch/openrisc/lib/memcpy.c
index 669887a60..fe2177628 100644
--- a/kernel/arch/openrisc/lib/memcpy.c
+++ b/kernel/arch/openrisc/lib/memcpy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/openrisc/lib/memcpy.c
  *
diff --git a/kernel/arch/parisc/Kconfig b/kernel/arch/parisc/Kconfig
index a57dedbfc..1fd3eb5b6 100644
--- a/kernel/arch/parisc/Kconfig
+++ b/kernel/arch/parisc/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PARISC
 	def_bool y
 	select ARCH_MIGHT_HAVE_PC_PARPORT
diff --git a/kernel/arch/parisc/Kconfig.debug b/kernel/arch/parisc/Kconfig.debug
index 0d856b94c..fb3507f9b 100644
--- a/kernel/arch/parisc/Kconfig.debug
+++ b/kernel/arch/parisc/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/parisc/include/asm/agp.h b/kernel/arch/parisc/include/asm/agp.h
index d226ffa8f..cb04470e6 100644
--- a/kernel/arch/parisc/include/asm/agp.h
+++ b/kernel/arch/parisc/include/asm/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_AGP_H
 #define _ASM_PARISC_AGP_H
 
diff --git a/kernel/arch/parisc/include/asm/atomic.h b/kernel/arch/parisc/include/asm/atomic.h
index 17b98a87e..bc54addd5 100644
--- a/kernel/arch/parisc/include/asm/atomic.h
+++ b/kernel/arch/parisc/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
  * Copyright (C) 2006 Kyle McMartin <kyle@parisc-linux.org>
  */
diff --git a/kernel/arch/parisc/include/asm/bitops.h b/kernel/arch/parisc/include/asm/bitops.h
index da8794332..53252d4f9 100644
--- a/kernel/arch/parisc/include/asm/bitops.h
+++ b/kernel/arch/parisc/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_BITOPS_H
 #define _PARISC_BITOPS_H
 
diff --git a/kernel/arch/parisc/include/asm/bug.h b/kernel/arch/parisc/include/asm/bug.h
index 07ea467f2..4b6d60b94 100644
--- a/kernel/arch/parisc/include/asm/bug.h
+++ b/kernel/arch/parisc/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_BUG_H
 #define _PARISC_BUG_H
 
diff --git a/kernel/arch/parisc/include/asm/bugs.h b/kernel/arch/parisc/include/asm/bugs.h
index 9e6284342..0a7f9db6b 100644
--- a/kernel/arch/parisc/include/asm/bugs.h
+++ b/kernel/arch/parisc/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/asm-parisc/bugs.h
  *
diff --git a/kernel/arch/parisc/include/asm/cache.h b/kernel/arch/parisc/include/asm/cache.h
index df0f52bd1..150b7f30e 100644
--- a/kernel/arch/parisc/include/asm/cache.h
+++ b/kernel/arch/parisc/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-parisc/cache.h
  */
diff --git a/kernel/arch/parisc/include/asm/cacheflush.h b/kernel/arch/parisc/include/asm/cacheflush.h
index c7e15cc5c..3742508cc 100644
--- a/kernel/arch/parisc/include/asm/cacheflush.h
+++ b/kernel/arch/parisc/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_CACHEFLUSH_H
 #define _PARISC_CACHEFLUSH_H
 
diff --git a/kernel/arch/parisc/include/asm/checksum.h b/kernel/arch/parisc/include/asm/checksum.h
index 60c2c4261..3cbf1f1c1 100644
--- a/kernel/arch/parisc/include/asm/checksum.h
+++ b/kernel/arch/parisc/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_CHECKSUM_H
 #define _PARISC_CHECKSUM_H
 
diff --git a/kernel/arch/parisc/include/asm/cmpxchg.h b/kernel/arch/parisc/include/asm/cmpxchg.h
index 7ada30900..f627c37da 100644
--- a/kernel/arch/parisc/include/asm/cmpxchg.h
+++ b/kernel/arch/parisc/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * forked from parisc asm/atomic.h which was:
  *	Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
diff --git a/kernel/arch/parisc/include/asm/compat.h b/kernel/arch/parisc/include/asm/compat.h
index 3387307cc..07f48827a 100644
--- a/kernel/arch/parisc/include/asm/compat.h
+++ b/kernel/arch/parisc/include/asm/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_COMPAT_H
 #define _ASM_PARISC_COMPAT_H
 /*
diff --git a/kernel/arch/parisc/include/asm/compat_ucontext.h b/kernel/arch/parisc/include/asm/compat_ucontext.h
index 2f7292afd..c606f1bc8 100644
--- a/kernel/arch/parisc/include/asm/compat_ucontext.h
+++ b/kernel/arch/parisc/include/asm/compat_ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_COMPAT_UCONTEXT_H
 #define _ASM_PARISC_COMPAT_UCONTEXT_H
 
diff --git a/kernel/arch/parisc/include/asm/delay.h b/kernel/arch/parisc/include/asm/delay.h
index 08e58e679..841b506b7 100644
--- a/kernel/arch/parisc/include/asm/delay.h
+++ b/kernel/arch/parisc/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_DELAY_H
 #define _ASM_PARISC_DELAY_H
 
diff --git a/kernel/arch/parisc/include/asm/dma-mapping.h b/kernel/arch/parisc/include/asm/dma-mapping.h
index 2b16282ad..7af4a00b5 100644
--- a/kernel/arch/parisc/include/asm/dma-mapping.h
+++ b/kernel/arch/parisc/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_DMA_MAPPING_H
 #define _PARISC_DMA_MAPPING_H
 
diff --git a/kernel/arch/parisc/include/asm/dma.h b/kernel/arch/parisc/include/asm/dma.h
index fd48ae2de..eea80ed34 100644
--- a/kernel/arch/parisc/include/asm/dma.h
+++ b/kernel/arch/parisc/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
  * High DMA channel support & info by Hannu Savolainen
diff --git a/kernel/arch/parisc/include/asm/elf.h b/kernel/arch/parisc/include/asm/elf.h
index a6b2a4215..382d75a2e 100644
--- a/kernel/arch/parisc/include/asm/elf.h
+++ b/kernel/arch/parisc/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMPARISC_ELF_H
 #define __ASMPARISC_ELF_H
 
diff --git a/kernel/arch/parisc/include/asm/fb.h b/kernel/arch/parisc/include/asm/fb.h
index 4d503a023..c4cd6360f 100644
--- a/kernel/arch/parisc/include/asm/fb.h
+++ b/kernel/arch/parisc/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
diff --git a/kernel/arch/parisc/include/asm/fixmap.h b/kernel/arch/parisc/include/asm/fixmap.h
index 6fec4d4a1..f7c3a0905 100644
--- a/kernel/arch/parisc/include/asm/fixmap.h
+++ b/kernel/arch/parisc/include/asm/fixmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FIXMAP_H
 #define _ASM_FIXMAP_H
 
diff --git a/kernel/arch/parisc/include/asm/ftrace.h b/kernel/arch/parisc/include/asm/ftrace.h
index d635c6b02..42b2c75a1 100644
--- a/kernel/arch/parisc/include/asm/ftrace.h
+++ b/kernel/arch/parisc/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_FTRACE_H
 #define _ASM_PARISC_FTRACE_H
 
diff --git a/kernel/arch/parisc/include/asm/futex.h b/kernel/arch/parisc/include/asm/futex.h
index c601aab2f..cf7ba058f 100644
--- a/kernel/arch/parisc/include/asm/futex.h
+++ b/kernel/arch/parisc/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_FUTEX_H
 #define _ASM_PARISC_FUTEX_H
 
diff --git a/kernel/arch/parisc/include/asm/hardirq.h b/kernel/arch/parisc/include/asm/hardirq.h
index 9b3bd039a..077815169 100644
--- a/kernel/arch/parisc/include/asm/hardirq.h
+++ b/kernel/arch/parisc/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* hardirq.h: PA-RISC hard IRQ support.
  *
  * Copyright (C) 2001 Matthew Wilcox <matthew@wil.cx>
diff --git a/kernel/arch/parisc/include/asm/hardware.h b/kernel/arch/parisc/include/asm/hardware.h
index d1d864b81..d6e1ed145 100644
--- a/kernel/arch/parisc/include/asm/hardware.h
+++ b/kernel/arch/parisc/include/asm/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_HARDWARE_H
 #define _PARISC_HARDWARE_H
 
diff --git a/kernel/arch/parisc/include/asm/hash.h b/kernel/arch/parisc/include/asm/hash.h
index dbe93311a..525950ed8 100644
--- a/kernel/arch/parisc/include/asm/hash.h
+++ b/kernel/arch/parisc/include/asm/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_HASH_H
 #define _ASM_HASH_H
 
diff --git a/kernel/arch/parisc/include/asm/hugetlb.h b/kernel/arch/parisc/include/asm/hugetlb.h
index a65d88871..58e0f4620 100644
--- a/kernel/arch/parisc/include/asm/hugetlb.h
+++ b/kernel/arch/parisc/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC64_HUGETLB_H
 #define _ASM_PARISC64_HUGETLB_H
 
diff --git a/kernel/arch/parisc/include/asm/ide.h b/kernel/arch/parisc/include/asm/ide.h
index 81700a232..34cdac01e 100644
--- a/kernel/arch/parisc/include/asm/ide.h
+++ b/kernel/arch/parisc/include/asm/ide.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/asm-parisc/ide.h
  *
diff --git a/kernel/arch/parisc/include/asm/io.h b/kernel/arch/parisc/include/asm/io.h
index af98254f7..27c62baa9 100644
--- a/kernel/arch/parisc/include/asm/io.h
+++ b/kernel/arch/parisc/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IO_H
 #define _ASM_IO_H
 
diff --git a/kernel/arch/parisc/include/asm/irq.h b/kernel/arch/parisc/include/asm/irq.h
index 1073599a7..959e79cd2 100644
--- a/kernel/arch/parisc/include/asm/irq.h
+++ b/kernel/arch/parisc/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-parisc/irq.h
  *
diff --git a/kernel/arch/parisc/include/asm/irqflags.h b/kernel/arch/parisc/include/asm/irqflags.h
index 34f9cb9b4..38a19c0ba 100644
--- a/kernel/arch/parisc/include/asm/irqflags.h
+++ b/kernel/arch/parisc/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PARISC_IRQFLAGS_H
 #define __PARISC_IRQFLAGS_H
 
diff --git a/kernel/arch/parisc/include/asm/kbdleds.h b/kernel/arch/parisc/include/asm/kbdleds.h
index 2e2e75a83..50fcce810 100644
--- a/kernel/arch/parisc/include/asm/kbdleds.h
+++ b/kernel/arch/parisc/include/asm/kbdleds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_KBDLEDS_H
 #define _ASM_PARISC_KBDLEDS_H
 
diff --git a/kernel/arch/parisc/include/asm/kmap_types.h b/kernel/arch/parisc/include/asm/kmap_types.h
index 58e91ed03..3e70b5cd1 100644
--- a/kernel/arch/parisc/include/asm/kmap_types.h
+++ b/kernel/arch/parisc/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
diff --git a/kernel/arch/parisc/include/asm/ldcw.h b/kernel/arch/parisc/include/asm/ldcw.h
index 8be707e1b..dd5a08aaa 100644
--- a/kernel/arch/parisc/include/asm/ldcw.h
+++ b/kernel/arch/parisc/include/asm/ldcw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PARISC_LDCW_H
 #define __PARISC_LDCW_H
 
diff --git a/kernel/arch/parisc/include/asm/led.h b/kernel/arch/parisc/include/asm/led.h
index c3405ab9d..6de13d08a 100644
--- a/kernel/arch/parisc/include/asm/led.h
+++ b/kernel/arch/parisc/include/asm/led.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LED_H
 #define LED_H
 
diff --git a/kernel/arch/parisc/include/asm/linkage.h b/kernel/arch/parisc/include/asm/linkage.h
index 67e6b433d..9a69bf6fc 100644
--- a/kernel/arch/parisc/include/asm/linkage.h
+++ b/kernel/arch/parisc/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PARISC_LINKAGE_H
 #define __ASM_PARISC_LINKAGE_H
 
diff --git a/kernel/arch/parisc/include/asm/machdep.h b/kernel/arch/parisc/include/asm/machdep.h
index a231c97d7..215d2c439 100644
--- a/kernel/arch/parisc/include/asm/machdep.h
+++ b/kernel/arch/parisc/include/asm/machdep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_MACHDEP_H
 #define _PARISC_MACHDEP_H
 
diff --git a/kernel/arch/parisc/include/asm/mckinley.h b/kernel/arch/parisc/include/asm/mckinley.h
index d1ea6f129..eb84dbeb7 100644
--- a/kernel/arch/parisc/include/asm/mckinley.h
+++ b/kernel/arch/parisc/include/asm/mckinley.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_PARISC_MCKINLEY_H
 #define ASM_PARISC_MCKINLEY_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/parisc/include/asm/mmu.h b/kernel/arch/parisc/include/asm/mmu.h
index 6a310cf8b..3fb70a601 100644
--- a/kernel/arch/parisc/include/asm/mmu.h
+++ b/kernel/arch/parisc/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_MMU_H_
 #define _PARISC_MMU_H_
 
diff --git a/kernel/arch/parisc/include/asm/mmu_context.h b/kernel/arch/parisc/include/asm/mmu_context.h
index e4a657094..697a906ab 100644
--- a/kernel/arch/parisc/include/asm/mmu_context.h
+++ b/kernel/arch/parisc/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PARISC_MMU_CONTEXT_H
 #define __PARISC_MMU_CONTEXT_H
 
diff --git a/kernel/arch/parisc/include/asm/mmzone.h b/kernel/arch/parisc/include/asm/mmzone.h
index b6b34a098..fafa3893f 100644
--- a/kernel/arch/parisc/include/asm/mmzone.h
+++ b/kernel/arch/parisc/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_MMZONE_H
 #define _PARISC_MMZONE_H
 
diff --git a/kernel/arch/parisc/include/asm/module.h b/kernel/arch/parisc/include/asm/module.h
index bab37e991..c8c131a74 100644
--- a/kernel/arch/parisc/include/asm/module.h
+++ b/kernel/arch/parisc/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_MODULE_H
 #define _ASM_PARISC_MODULE_H
 
diff --git a/kernel/arch/parisc/include/asm/page.h b/kernel/arch/parisc/include/asm/page.h
index bfed09d80..af00fe9bf 100644
--- a/kernel/arch/parisc/include/asm/page.h
+++ b/kernel/arch/parisc/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_PAGE_H
 #define _PARISC_PAGE_H
 
diff --git a/kernel/arch/parisc/include/asm/parisc-device.h b/kernel/arch/parisc/include/asm/parisc-device.h
index eaf4dc1c7..d02d144c6 100644
--- a/kernel/arch/parisc/include/asm/parisc-device.h
+++ b/kernel/arch/parisc/include/asm/parisc-device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_PARISC_DEVICE_H_
 #define _ASM_PARISC_PARISC_DEVICE_H_
 
diff --git a/kernel/arch/parisc/include/asm/parport.h b/kernel/arch/parisc/include/asm/parport.h
index c391d7cbc..2c8e2321c 100644
--- a/kernel/arch/parisc/include/asm/parport.h
+++ b/kernel/arch/parisc/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  *
  * parport.h: ia32-compatible parport initialisation
diff --git a/kernel/arch/parisc/include/asm/pci.h b/kernel/arch/parisc/include/asm/pci.h
index 1de1a3f41..6108e9df0 100644
--- a/kernel/arch/parisc/include/asm/pci.h
+++ b/kernel/arch/parisc/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PARISC_PCI_H
 #define __ASM_PARISC_PCI_H
 
diff --git a/kernel/arch/parisc/include/asm/pdc.h b/kernel/arch/parisc/include/asm/pdc.h
index 510341f62..efee44a5e 100644
--- a/kernel/arch/parisc/include/asm/pdc.h
+++ b/kernel/arch/parisc/include/asm/pdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_PDC_H
 #define _PARISC_PDC_H
 
diff --git a/kernel/arch/parisc/include/asm/perf.h b/kernel/arch/parisc/include/asm/perf.h
index a18e11972..2a5a60aff 100644
--- a/kernel/arch/parisc/include/asm/perf.h
+++ b/kernel/arch/parisc/include/asm/perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PERF_H_
 #define _ASM_PERF_H_
 
diff --git a/kernel/arch/parisc/include/asm/pgalloc.h b/kernel/arch/parisc/include/asm/pgalloc.h
index f08dda3f0..cf13275f7 100644
--- a/kernel/arch/parisc/include/asm/pgalloc.h
+++ b/kernel/arch/parisc/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PGALLOC_H
 #define _ASM_PGALLOC_H
 
diff --git a/kernel/arch/parisc/include/asm/pgtable.h b/kernel/arch/parisc/include/asm/pgtable.h
index 71ca86cb0..fa6b7c78f 100644
--- a/kernel/arch/parisc/include/asm/pgtable.h
+++ b/kernel/arch/parisc/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_PGTABLE_H
 #define _PARISC_PGTABLE_H
 
diff --git a/kernel/arch/parisc/include/asm/prefetch.h b/kernel/arch/parisc/include/asm/prefetch.h
index 1ee7c8267..6e63f7200 100644
--- a/kernel/arch/parisc/include/asm/prefetch.h
+++ b/kernel/arch/parisc/include/asm/prefetch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-parisc/prefetch.h
  *
diff --git a/kernel/arch/parisc/include/asm/processor.h b/kernel/arch/parisc/include/asm/processor.h
index b3b66c3d6..0e6ab6e4a 100644
--- a/kernel/arch/parisc/include/asm/processor.h
+++ b/kernel/arch/parisc/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-parisc/processor.h
  *
diff --git a/kernel/arch/parisc/include/asm/psw.h b/kernel/arch/parisc/include/asm/psw.h
index ad69a35e9..76c301146 100644
--- a/kernel/arch/parisc/include/asm/psw.h
+++ b/kernel/arch/parisc/include/asm/psw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_PSW_H
 
 
diff --git a/kernel/arch/parisc/include/asm/ptrace.h b/kernel/arch/parisc/include/asm/ptrace.h
index 3c3cb004b..46da07670 100644
--- a/kernel/arch/parisc/include/asm/ptrace.h
+++ b/kernel/arch/parisc/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* written by Philipp Rumpf, Copyright (C) 1999 SuSE GmbH Nuernberg
 ** Copyright (C) 2000 Grant Grundler, Hewlett-Packard
 */
diff --git a/kernel/arch/parisc/include/asm/ropes.h b/kernel/arch/parisc/include/asm/ropes.h
index 09f51d5ab..8e51c775c 100644
--- a/kernel/arch/parisc/include/asm/ropes.h
+++ b/kernel/arch/parisc/include/asm/ropes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_ROPES_H_
 #define _ASM_PARISC_ROPES_H_
 
diff --git a/kernel/arch/parisc/include/asm/rt_sigframe.h b/kernel/arch/parisc/include/asm/rt_sigframe.h
index f0dd3b30f..2b3010ade 100644
--- a/kernel/arch/parisc/include/asm/rt_sigframe.h
+++ b/kernel/arch/parisc/include/asm/rt_sigframe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_RT_SIGFRAME_H
 #define _ASM_PARISC_RT_SIGFRAME_H
 
diff --git a/kernel/arch/parisc/include/asm/runway.h b/kernel/arch/parisc/include/asm/runway.h
index 5bea02da7..f3cfe6943 100644
--- a/kernel/arch/parisc/include/asm/runway.h
+++ b/kernel/arch/parisc/include/asm/runway.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_PARISC_RUNWAY_H
 #define ASM_PARISC_RUNWAY_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/parisc/include/asm/sections.h b/kernel/arch/parisc/include/asm/sections.h
index 9d13c3507..accdf40aa 100644
--- a/kernel/arch/parisc/include/asm/sections.h
+++ b/kernel/arch/parisc/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_SECTIONS_H
 #define _PARISC_SECTIONS_H
 
diff --git a/kernel/arch/parisc/include/asm/shmparam.h b/kernel/arch/parisc/include/asm/shmparam.h
index afe1300ab..74f74e4d3 100644
--- a/kernel/arch/parisc/include/asm/shmparam.h
+++ b/kernel/arch/parisc/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMPARISC_SHMPARAM_H
 #define _ASMPARISC_SHMPARAM_H
 
diff --git a/kernel/arch/parisc/include/asm/signal.h b/kernel/arch/parisc/include/asm/signal.h
index 81a545773..eeb5c8858 100644
--- a/kernel/arch/parisc/include/asm/signal.h
+++ b/kernel/arch/parisc/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_SIGNAL_H
 #define _ASM_PARISC_SIGNAL_H
 
diff --git a/kernel/arch/parisc/include/asm/smp.h b/kernel/arch/parisc/include/asm/smp.h
index ad9c9c3b4..b9a18db4b 100644
--- a/kernel/arch/parisc/include/asm/smp.h
+++ b/kernel/arch/parisc/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
 
diff --git a/kernel/arch/parisc/include/asm/socket.h b/kernel/arch/parisc/include/asm/socket.h
index 748016cb1..79feff1b0 100644
--- a/kernel/arch/parisc/include/asm/socket.h
+++ b/kernel/arch/parisc/include/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
 
diff --git a/kernel/arch/parisc/include/asm/special_insns.h b/kernel/arch/parisc/include/asm/special_insns.h
index e15093088..3d4dd68e1 100644
--- a/kernel/arch/parisc/include/asm/special_insns.h
+++ b/kernel/arch/parisc/include/asm/special_insns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PARISC_SPECIAL_INSNS_H
 #define __PARISC_SPECIAL_INSNS_H
 
diff --git a/kernel/arch/parisc/include/asm/spinlock.h b/kernel/arch/parisc/include/asm/spinlock.h
index 55bfe4aff..af03359e6 100644
--- a/kernel/arch/parisc/include/asm/spinlock.h
+++ b/kernel/arch/parisc/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_H
 #define __ASM_SPINLOCK_H
 
diff --git a/kernel/arch/parisc/include/asm/spinlock_types.h b/kernel/arch/parisc/include/asm/spinlock_types.h
index 8c373aa28..42979c570 100644
--- a/kernel/arch/parisc/include/asm/spinlock_types.h
+++ b/kernel/arch/parisc/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_TYPES_H
 #define __ASM_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/parisc/include/asm/string.h b/kernel/arch/parisc/include/asm/string.h
index eda01be65..f6e1132f4 100644
--- a/kernel/arch/parisc/include/asm/string.h
+++ b/kernel/arch/parisc/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PA_STRING_H_
 #define _PA_STRING_H_
 
diff --git a/kernel/arch/parisc/include/asm/superio.h b/kernel/arch/parisc/include/asm/superio.h
index 6598acb4d..5e11c11d4 100644
--- a/kernel/arch/parisc/include/asm/superio.h
+++ b/kernel/arch/parisc/include/asm/superio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_SUPERIO_H
 #define _PARISC_SUPERIO_H
 
diff --git a/kernel/arch/parisc/include/asm/switch_to.h b/kernel/arch/parisc/include/asm/switch_to.h
index 8ed8fea1e..f2ac9cc0d 100644
--- a/kernel/arch/parisc/include/asm/switch_to.h
+++ b/kernel/arch/parisc/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PARISC_SWITCH_TO_H
 #define __PARISC_SWITCH_TO_H
 
diff --git a/kernel/arch/parisc/include/asm/syscall.h b/kernel/arch/parisc/include/asm/syscall.h
index 5e0b4e6bd..8bff1a58c 100644
--- a/kernel/arch/parisc/include/asm/syscall.h
+++ b/kernel/arch/parisc/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* syscall.h */
 
 #ifndef _ASM_PARISC_SYSCALL_H_
diff --git a/kernel/arch/parisc/include/asm/termios.h b/kernel/arch/parisc/include/asm/termios.h
index 9bbc0c897..cded9dc90 100644
--- a/kernel/arch/parisc/include/asm/termios.h
+++ b/kernel/arch/parisc/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_TERMIOS_H
 #define _PARISC_TERMIOS_H
 
diff --git a/kernel/arch/parisc/include/asm/thread_info.h b/kernel/arch/parisc/include/asm/thread_info.h
index bc208136b..c980a02a5 100644
--- a/kernel/arch/parisc/include/asm/thread_info.h
+++ b/kernel/arch/parisc/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_THREAD_INFO_H
 #define _ASM_PARISC_THREAD_INFO_H
 
diff --git a/kernel/arch/parisc/include/asm/timex.h b/kernel/arch/parisc/include/asm/timex.h
index 2bd51f6d8..45537cd4d 100644
--- a/kernel/arch/parisc/include/asm/timex.h
+++ b/kernel/arch/parisc/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-parisc/timex.h
  *
diff --git a/kernel/arch/parisc/include/asm/tlb.h b/kernel/arch/parisc/include/asm/tlb.h
index 079249039..0c881e74d 100644
--- a/kernel/arch/parisc/include/asm/tlb.h
+++ b/kernel/arch/parisc/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_TLB_H
 #define _PARISC_TLB_H
 
diff --git a/kernel/arch/parisc/include/asm/tlbflush.h b/kernel/arch/parisc/include/asm/tlbflush.h
index e84b96478..14668bd52 100644
--- a/kernel/arch/parisc/include/asm/tlbflush.h
+++ b/kernel/arch/parisc/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PARISC_TLBFLUSH_H
 #define _PARISC_TLBFLUSH_H
 
diff --git a/kernel/arch/parisc/include/asm/traps.h b/kernel/arch/parisc/include/asm/traps.h
index 63670231f..e00013248 100644
--- a/kernel/arch/parisc/include/asm/traps.h
+++ b/kernel/arch/parisc/include/asm/traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_TRAPS_H
 #define __ASM_TRAPS_H
 
diff --git a/kernel/arch/parisc/include/asm/uaccess.h b/kernel/arch/parisc/include/asm/uaccess.h
index cab33a0d0..ea70e36ce 100644
--- a/kernel/arch/parisc/include/asm/uaccess.h
+++ b/kernel/arch/parisc/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PARISC_UACCESS_H
 #define __PARISC_UACCESS_H
 
diff --git a/kernel/arch/parisc/include/asm/ucontext.h b/kernel/arch/parisc/include/asm/ucontext.h
index 6c8883e4b..ac7f86386 100644
--- a/kernel/arch/parisc/include/asm/ucontext.h
+++ b/kernel/arch/parisc/include/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_UCONTEXT_H
 #define _ASM_PARISC_UCONTEXT_H
 
diff --git a/kernel/arch/parisc/include/asm/unaligned.h b/kernel/arch/parisc/include/asm/unaligned.h
index dfc5d3321..e9029c7c2 100644
--- a/kernel/arch/parisc/include/asm/unaligned.h
+++ b/kernel/arch/parisc/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_UNALIGNED_H
 #define _ASM_PARISC_UNALIGNED_H
 
diff --git a/kernel/arch/parisc/include/asm/unistd.h b/kernel/arch/parisc/include/asm/unistd.h
index 7dc31c84d..3d507d04e 100644
--- a/kernel/arch/parisc/include/asm/unistd.h
+++ b/kernel/arch/parisc/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_PARISC_UNISTD_H_
 #define _ASM_PARISC_UNISTD_H_
 
diff --git a/kernel/arch/parisc/include/asm/unwind.h b/kernel/arch/parisc/include/asm/unwind.h
index 52482e4fc..c73a3ee20 100644
--- a/kernel/arch/parisc/include/asm/unwind.h
+++ b/kernel/arch/parisc/include/asm/unwind.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UNWIND_H_
 #define _UNWIND_H_
 
diff --git a/kernel/arch/parisc/include/uapi/asm/bitsperlong.h b/kernel/arch/parisc/include/uapi/asm/bitsperlong.h
index 07fa7e50b..307e2ef1c 100644
--- a/kernel/arch/parisc/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/parisc/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_PARISC_BITSPERLONG_H
 #define __ASM_PARISC_BITSPERLONG_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/byteorder.h b/kernel/arch/parisc/include/uapi/asm/byteorder.h
index 58af2c5f5..a59d9b7e3 100644
--- a/kernel/arch/parisc/include/uapi/asm/byteorder.h
+++ b/kernel/arch/parisc/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_BYTEORDER_H
 #define _PARISC_BYTEORDER_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/errno.h b/kernel/arch/parisc/include/uapi/asm/errno.h
index 274d5bc6e..fc0df353f 100644
--- a/kernel/arch/parisc/include/uapi/asm/errno.h
+++ b/kernel/arch/parisc/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_ERRNO_H
 #define _PARISC_ERRNO_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/fcntl.h b/kernel/arch/parisc/include/uapi/asm/fcntl.h
index 34a46cbc7..03ce20e5a 100644
--- a/kernel/arch/parisc/include/uapi/asm/fcntl.h
+++ b/kernel/arch/parisc/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_FCNTL_H
 #define _PARISC_FCNTL_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/ioctl.h b/kernel/arch/parisc/include/uapi/asm/ioctl.h
index ec8efa02b..b509bcc94 100644
--- a/kernel/arch/parisc/include/uapi/asm/ioctl.h
+++ b/kernel/arch/parisc/include/uapi/asm/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *    Linux/PA-RISC Project (http://www.parisc-linux.org/)
  *    Copyright (C) 1999,2003 Matthew Wilcox < willy at debian . org >
diff --git a/kernel/arch/parisc/include/uapi/asm/ioctls.h b/kernel/arch/parisc/include/uapi/asm/ioctls.h
index d0e332140..aafb1c0ca 100644
--- a/kernel/arch/parisc/include/uapi/asm/ioctls.h
+++ b/kernel/arch/parisc/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_PARISC_IOCTLS_H__
 #define __ARCH_PARISC_IOCTLS_H__
 
diff --git a/kernel/arch/parisc/include/uapi/asm/ipcbuf.h b/kernel/arch/parisc/include/uapi/asm/ipcbuf.h
index 790c4119f..edf266204 100644
--- a/kernel/arch/parisc/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/parisc/include/uapi/asm/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __PARISC_IPCBUF_H__
 #define __PARISC_IPCBUF_H__
 
diff --git a/kernel/arch/parisc/include/uapi/asm/mman.h b/kernel/arch/parisc/include/uapi/asm/mman.h
index 775b5d5e4..d1af0d74a 100644
--- a/kernel/arch/parisc/include/uapi/asm/mman.h
+++ b/kernel/arch/parisc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __PARISC_MMAN_H__
 #define __PARISC_MMAN_H__
 
diff --git a/kernel/arch/parisc/include/uapi/asm/msgbuf.h b/kernel/arch/parisc/include/uapi/asm/msgbuf.h
index 2e83ac758..b48b810e6 100644
--- a/kernel/arch/parisc/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/parisc/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_MSGBUF_H
 #define _PARISC_MSGBUF_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/pdc.h b/kernel/arch/parisc/include/uapi/asm/pdc.h
index 1f30b4977..0ad117617 100644
--- a/kernel/arch/parisc/include/uapi/asm/pdc.h
+++ b/kernel/arch/parisc/include/uapi/asm/pdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_PARISC_PDC_H
 #define _UAPI_PARISC_PDC_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/posix_types.h b/kernel/arch/parisc/include/uapi/asm/posix_types.h
index f3b5f70b9..2785632c8 100644
--- a/kernel/arch/parisc/include/uapi/asm/posix_types.h
+++ b/kernel/arch/parisc/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_PARISC_POSIX_TYPES_H
 #define __ARCH_PARISC_POSIX_TYPES_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/ptrace.h b/kernel/arch/parisc/include/uapi/asm/ptrace.h
index 02ce2eb99..e72e06247 100644
--- a/kernel/arch/parisc/include/uapi/asm/ptrace.h
+++ b/kernel/arch/parisc/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* written by Philipp Rumpf, Copyright (C) 1999 SuSE GmbH Nuernberg
 ** Copyright (C) 2000 Grant Grundler, Hewlett-Packard
 */
diff --git a/kernel/arch/parisc/include/uapi/asm/sembuf.h b/kernel/arch/parisc/include/uapi/asm/sembuf.h
index c20971bf5..746c5d86a 100644
--- a/kernel/arch/parisc/include/uapi/asm/sembuf.h
+++ b/kernel/arch/parisc/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_SEMBUF_H
 #define _PARISC_SEMBUF_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/setup.h b/kernel/arch/parisc/include/uapi/asm/setup.h
index 7da2e5b87..78b2f4ec7 100644
--- a/kernel/arch/parisc/include/uapi/asm/setup.h
+++ b/kernel/arch/parisc/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_SETUP_H
 #define _PARISC_SETUP_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/shmbuf.h b/kernel/arch/parisc/include/uapi/asm/shmbuf.h
index 750e13e77..cd4dbce55 100644
--- a/kernel/arch/parisc/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/parisc/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_SHMBUF_H
 #define _PARISC_SHMBUF_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/sigcontext.h b/kernel/arch/parisc/include/uapi/asm/sigcontext.h
index 27ef31bb3..be404bb0f 100644
--- a/kernel/arch/parisc/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/parisc/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMPARISC_SIGCONTEXT_H
 #define _ASMPARISC_SIGCONTEXT_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/siginfo.h b/kernel/arch/parisc/include/uapi/asm/siginfo.h
index 8fd10f85c..4a1062e05 100644
--- a/kernel/arch/parisc/include/uapi/asm/siginfo.h
+++ b/kernel/arch/parisc/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_SIGINFO_H
 #define _PARISC_SIGINFO_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/signal.h b/kernel/arch/parisc/include/uapi/asm/signal.h
index e26043b73..d38563a39 100644
--- a/kernel/arch/parisc/include/uapi/asm/signal.h
+++ b/kernel/arch/parisc/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_PARISC_SIGNAL_H
 #define _UAPI_ASM_PARISC_SIGNAL_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/socket.h b/kernel/arch/parisc/include/uapi/asm/socket.h
index 3b2bf7ae7..1d0fdc3b5 100644
--- a/kernel/arch/parisc/include/uapi/asm/socket.h
+++ b/kernel/arch/parisc/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_SOCKET_H
 #define _UAPI_ASM_SOCKET_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/sockios.h b/kernel/arch/parisc/include/uapi/asm/sockios.h
index dabfbc748..66a3ba64d 100644
--- a/kernel/arch/parisc/include/uapi/asm/sockios.h
+++ b/kernel/arch/parisc/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_PARISC_SOCKIOS__
 #define __ARCH_PARISC_SOCKIOS__
 
diff --git a/kernel/arch/parisc/include/uapi/asm/stat.h b/kernel/arch/parisc/include/uapi/asm/stat.h
index 3310d2a49..b5bbf6704 100644
--- a/kernel/arch/parisc/include/uapi/asm/stat.h
+++ b/kernel/arch/parisc/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_STAT_H
 #define _PARISC_STAT_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/statfs.h b/kernel/arch/parisc/include/uapi/asm/statfs.h
index 324bea905..e5de020c2 100644
--- a/kernel/arch/parisc/include/uapi/asm/statfs.h
+++ b/kernel/arch/parisc/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_STATFS_H
 #define _PARISC_STATFS_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/swab.h b/kernel/arch/parisc/include/uapi/asm/swab.h
index 928e1bbac..35fb2d1bf 100644
--- a/kernel/arch/parisc/include/uapi/asm/swab.h
+++ b/kernel/arch/parisc/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_SWAB_H
 #define _PARISC_SWAB_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/termbits.h b/kernel/arch/parisc/include/uapi/asm/termbits.h
index d1ab92177..40e920f8d 100644
--- a/kernel/arch/parisc/include/uapi/asm/termbits.h
+++ b/kernel/arch/parisc/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_PARISC_TERMBITS_H__
 #define __ARCH_PARISC_TERMBITS_H__
 
diff --git a/kernel/arch/parisc/include/uapi/asm/termios.h b/kernel/arch/parisc/include/uapi/asm/termios.h
index f33773950..aba174f23 100644
--- a/kernel/arch/parisc/include/uapi/asm/termios.h
+++ b/kernel/arch/parisc/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_PARISC_TERMIOS_H
 #define _UAPI_PARISC_TERMIOS_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/types.h b/kernel/arch/parisc/include/uapi/asm/types.h
index 8866f9bbd..28c7d7453 100644
--- a/kernel/arch/parisc/include/uapi/asm/types.h
+++ b/kernel/arch/parisc/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _PARISC_TYPES_H
 #define _PARISC_TYPES_H
 
diff --git a/kernel/arch/parisc/include/uapi/asm/unistd.h b/kernel/arch/parisc/include/uapi/asm/unistd.h
index 667c99421..4872e77aa 100644
--- a/kernel/arch/parisc/include/uapi/asm/unistd.h
+++ b/kernel/arch/parisc/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_PARISC_UNISTD_H_
 #define _UAPI_ASM_PARISC_UNISTD_H_
 
diff --git a/kernel/arch/parisc/kernel/Makefile b/kernel/arch/parisc/kernel/Makefile
index c4294df69..649dc3eda 100644
--- a/kernel/arch/parisc/kernel/Makefile
+++ b/kernel/arch/parisc/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for arch/parisc/kernel
 #
diff --git a/kernel/arch/parisc/kernel/audit.c b/kernel/arch/parisc/kernel/audit.c
index eb64a6148..9eb47b222 100644
--- a/kernel/arch/parisc/kernel/audit.c
+++ b/kernel/arch/parisc/kernel/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/arch/parisc/kernel/binfmt_elf32.c b/kernel/arch/parisc/kernel/binfmt_elf32.c
index f2adcf33f..20dfa081e 100644
--- a/kernel/arch/parisc/kernel/binfmt_elf32.c
+++ b/kernel/arch/parisc/kernel/binfmt_elf32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for 32-bit Linux/Parisc ELF binaries on 64 bit kernels
  *
diff --git a/kernel/arch/parisc/kernel/compat_audit.c b/kernel/arch/parisc/kernel/compat_audit.c
index c74478f6b..20c39c9d8 100644
--- a/kernel/arch/parisc/kernel/compat_audit.c
+++ b/kernel/arch/parisc/kernel/compat_audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/unistd.h>
 
 unsigned int parisc32_dir_class[] = {
diff --git a/kernel/arch/parisc/kernel/ftrace.c b/kernel/arch/parisc/kernel/ftrace.c
index 5a5506a35..6fa8535d3 100644
--- a/kernel/arch/parisc/kernel/ftrace.c
+++ b/kernel/arch/parisc/kernel/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Code for tracing calls in Linux kernel.
  * Copyright (C) 2009-2016 Helge Deller <deller@gmx.de>
diff --git a/kernel/arch/parisc/kernel/pa7300lc.c b/kernel/arch/parisc/kernel/pa7300lc.c
index 9b245fc67..0d770ac83 100644
--- a/kernel/arch/parisc/kernel/pa7300lc.c
+++ b/kernel/arch/parisc/kernel/pa7300lc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *   linux/arch/parisc/kernel/pa7300lc.c
  *	- PA7300LC-specific functions	
diff --git a/kernel/arch/parisc/kernel/pci-dma.c b/kernel/arch/parisc/kernel/pci-dma.c
index bd4c0a747..412231d10 100644
--- a/kernel/arch/parisc/kernel/pci-dma.c
+++ b/kernel/arch/parisc/kernel/pci-dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 ** PARISC 1.1 Dynamic DMA mapping support.
 ** This implementation is for PA-RISC platforms that do not support
diff --git a/kernel/arch/parisc/kernel/pdt.c b/kernel/arch/parisc/kernel/pdt.c
index 00aed0829..e07eb34c8 100644
--- a/kernel/arch/parisc/kernel/pdt.c
+++ b/kernel/arch/parisc/kernel/pdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Page Deallocation Table (PDT) support
  *
diff --git a/kernel/arch/parisc/kernel/ptrace.c b/kernel/arch/parisc/kernel/ptrace.c
index f8b6959d2..1a2be6e63 100644
--- a/kernel/arch/parisc/kernel/ptrace.c
+++ b/kernel/arch/parisc/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Kernel support for the ptrace() and syscall tracing interfaces.
  *
diff --git a/kernel/arch/parisc/kernel/signal.c b/kernel/arch/parisc/kernel/signal.c
index 26f12f45b..f2a4038e2 100644
--- a/kernel/arch/parisc/kernel/signal.c
+++ b/kernel/arch/parisc/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/parisc/kernel/signal.c: Architecture-specific signal
  *  handling support.
diff --git a/kernel/arch/parisc/kernel/sys_parisc32.c b/kernel/arch/parisc/kernel/sys_parisc32.c
index 93c1963d7..2a12a547b 100644
--- a/kernel/arch/parisc/kernel/sys_parisc32.c
+++ b/kernel/arch/parisc/kernel/sys_parisc32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sys_parisc32.c: Conversion between 32bit and 64bit native syscalls.
  *
diff --git a/kernel/arch/parisc/kernel/time.c b/kernel/arch/parisc/kernel/time.c
index 8c0105a49..4b8fd6dc2 100644
--- a/kernel/arch/parisc/kernel/time.c
+++ b/kernel/arch/parisc/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/parisc/kernel/time.c
  *
diff --git a/kernel/arch/parisc/kernel/traps.c b/kernel/arch/parisc/kernel/traps.c
index 230333157..8453724b8 100644
--- a/kernel/arch/parisc/kernel/traps.c
+++ b/kernel/arch/parisc/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/parisc/traps.c
  *
diff --git a/kernel/arch/parisc/kernel/unwind.c b/kernel/arch/parisc/kernel/unwind.c
index caab39dfa..5a657986e 100644
--- a/kernel/arch/parisc/kernel/unwind.c
+++ b/kernel/arch/parisc/kernel/unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Kernel unwinding support
  *
diff --git a/kernel/arch/parisc/kernel/vmlinux.lds.S b/kernel/arch/parisc/kernel/vmlinux.lds.S
index ffe2cbf52..159a2ec0b 100644
--- a/kernel/arch/parisc/kernel/vmlinux.lds.S
+++ b/kernel/arch/parisc/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*    Kernel link layout for various "sections"
  *
  *    Copyright (C) 1999-2003 Matthew Wilcox <willy at parisc-linux.org>
diff --git a/kernel/arch/parisc/lib/bitops.c b/kernel/arch/parisc/lib/bitops.c
index 8e45b0a97..70ffbcf88 100644
--- a/kernel/arch/parisc/lib/bitops.c
+++ b/kernel/arch/parisc/lib/bitops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bitops.c: atomic operations which got too long to be inlined all over
  *      the place.
diff --git a/kernel/arch/parisc/lib/delay.c b/kernel/arch/parisc/lib/delay.c
index ec9255f27..7eab4bb8a 100644
--- a/kernel/arch/parisc/lib/delay.c
+++ b/kernel/arch/parisc/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Precise Delay Loops for parisc
  *
diff --git a/kernel/arch/parisc/lib/io.c b/kernel/arch/parisc/lib/io.c
index 7c1406ff8..7c00496b4 100644
--- a/kernel/arch/parisc/lib/io.c
+++ b/kernel/arch/parisc/lib/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/parisc/lib/io.c
  *
diff --git a/kernel/arch/parisc/lib/iomap.c b/kernel/arch/parisc/lib/iomap.c
index eaffbb90a..4b19e6e64 100644
--- a/kernel/arch/parisc/lib/iomap.c
+++ b/kernel/arch/parisc/lib/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * iomap.c - Implement iomap interface for PA-RISC
  * Copyright (c) 2004 Matthew Wilcox
diff --git a/kernel/arch/parisc/lib/ucmpdi2.c b/kernel/arch/parisc/lib/ucmpdi2.c
index 149c016f3..8e6014a14 100644
--- a/kernel/arch/parisc/lib/ucmpdi2.c
+++ b/kernel/arch/parisc/lib/ucmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 
 union ull_union {
diff --git a/kernel/arch/parisc/math-emu/Makefile b/kernel/arch/parisc/math-emu/Makefile
index 0bd63b08a..b6c4b2549 100644
--- a/kernel/arch/parisc/math-emu/Makefile
+++ b/kernel/arch/parisc/math-emu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux/parisc floating point code
 #
diff --git a/kernel/arch/parisc/mm/hugetlbpage.c b/kernel/arch/parisc/mm/hugetlbpage.c
index 5eb8f633b..d77479ae3 100644
--- a/kernel/arch/parisc/mm/hugetlbpage.c
+++ b/kernel/arch/parisc/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PARISC64 Huge TLB page support.
  *
diff --git a/kernel/arch/parisc/mm/init.c b/kernel/arch/parisc/mm/init.c
index 1ca9a2b42..13f7854e0 100644
--- a/kernel/arch/parisc/mm/init.c
+++ b/kernel/arch/parisc/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/parisc/mm/init.c
  *
diff --git a/kernel/arch/parisc/mm/ioremap.c b/kernel/arch/parisc/mm/ioremap.c
index 838d0259c..92a9b5f12 100644
--- a/kernel/arch/parisc/mm/ioremap.c
+++ b/kernel/arch/parisc/mm/ioremap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/parisc/mm/ioremap.c
  *
diff --git a/kernel/arch/parisc/oprofile/Makefile b/kernel/arch/parisc/oprofile/Makefile
index e9feca1ca..86a1ccc32 100644
--- a/kernel/arch/parisc/oprofile/Makefile
+++ b/kernel/arch/parisc/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/powerpc/Kconfig b/kernel/arch/powerpc/Kconfig
index 809c468ed..cb782ac1c 100644
--- a/kernel/arch/powerpc/Kconfig
+++ b/kernel/arch/powerpc/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 source "arch/powerpc/platforms/Kconfig.cputype"
 
 config PPC32
diff --git a/kernel/arch/powerpc/Kconfig.debug b/kernel/arch/powerpc/Kconfig.debug
index c86df2463..be1c8c5be 100644
--- a/kernel/arch/powerpc/Kconfig.debug
+++ b/kernel/arch/powerpc/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/powerpc/Makefile.postlink b/kernel/arch/powerpc/Makefile.postlink
index 5db43ebbe..83f8e5ba2 100644
--- a/kernel/arch/powerpc/Makefile.postlink
+++ b/kernel/arch/powerpc/Makefile.postlink
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ===========================================================================
 # Post-link powerpc pass
 # ===========================================================================
diff --git a/kernel/arch/powerpc/boot/Makefile b/kernel/arch/powerpc/boot/Makefile
index c4e6fe35c..651974192 100644
--- a/kernel/arch/powerpc/boot/Makefile
+++ b/kernel/arch/powerpc/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for making ELF bootable images for booting on CHRP
 # using Open Firmware.
 #
diff --git a/kernel/arch/powerpc/boot/cpm-serial.c b/kernel/arch/powerpc/boot/cpm-serial.c
index 19dc15abe..dfb56829c 100644
--- a/kernel/arch/powerpc/boot/cpm-serial.c
+++ b/kernel/arch/powerpc/boot/cpm-serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CPM serial console support.
  *
diff --git a/kernel/arch/powerpc/boot/cuboot.h b/kernel/arch/powerpc/boot/cuboot.h
index cd2aa7f34..c2b2c58ea 100644
--- a/kernel/arch/powerpc/boot/cuboot.h
+++ b/kernel/arch/powerpc/boot/cuboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_CUBOOT_H_
 #define _PPC_BOOT_CUBOOT_H_
 
diff --git a/kernel/arch/powerpc/boot/dcr.h b/kernel/arch/powerpc/boot/dcr.h
index bf8f4ede1..334ab8b5a 100644
--- a/kernel/arch/powerpc/boot/dcr.h
+++ b/kernel/arch/powerpc/boot/dcr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_DCR_H_
 #define _PPC_BOOT_DCR_H_
 
diff --git a/kernel/arch/powerpc/boot/dts/virtex440-ml510.dts b/kernel/arch/powerpc/boot/dts/virtex440-ml510.dts
index 81a8dc2c6..81201d390 100644
--- a/kernel/arch/powerpc/boot/dts/virtex440-ml510.dts
+++ b/kernel/arch/powerpc/boot/dts/virtex440-ml510.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xilinx ML510 Reference Design support
  *
diff --git a/kernel/arch/powerpc/boot/elf.h b/kernel/arch/powerpc/boot/elf.h
index 1941bc50d..f6aa7c20f 100644
--- a/kernel/arch/powerpc/boot/elf.h
+++ b/kernel/arch/powerpc/boot/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_ELF_H_
 #define _PPC_BOOT_ELF_H_
 
diff --git a/kernel/arch/powerpc/boot/epapr-wrapper.c b/kernel/arch/powerpc/boot/epapr-wrapper.c
index c10191006..01262f50b 100644
--- a/kernel/arch/powerpc/boot/epapr-wrapper.c
+++ b/kernel/arch/powerpc/boot/epapr-wrapper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 extern void epapr_platform_init(unsigned long r3, unsigned long r4,
 				unsigned long r5, unsigned long r6,
 				unsigned long r7);
diff --git a/kernel/arch/powerpc/boot/fixed-head.S b/kernel/arch/powerpc/boot/fixed-head.S
index 8e14cd9e1..4346c750c 100644
--- a/kernel/arch/powerpc/boot/fixed-head.S
+++ b/kernel/arch/powerpc/boot/fixed-head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.text
 	.global _zimage_start
 _zimage_start:
diff --git a/kernel/arch/powerpc/boot/fsl-soc.h b/kernel/arch/powerpc/boot/fsl-soc.h
index 5da26fc6e..00b2cb89f 100644
--- a/kernel/arch/powerpc/boot/fsl-soc.h
+++ b/kernel/arch/powerpc/boot/fsl-soc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_FSL_SOC_H_
 #define _PPC_BOOT_FSL_SOC_H_
 
diff --git a/kernel/arch/powerpc/boot/io.h b/kernel/arch/powerpc/boot/io.h
index 394da5500..5c6f90c34 100644
--- a/kernel/arch/powerpc/boot/io.h
+++ b/kernel/arch/powerpc/boot/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IO_H
 #define _IO_H
 
diff --git a/kernel/arch/powerpc/boot/libfdt_env.h b/kernel/arch/powerpc/boot/libfdt_env.h
index 7e3789ea3..f52c31b1f 100644
--- a/kernel/arch/powerpc/boot/libfdt_env.h
+++ b/kernel/arch/powerpc/boot/libfdt_env.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 #define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 
diff --git a/kernel/arch/powerpc/boot/mktree.c b/kernel/arch/powerpc/boot/mktree.c
index e2ae24340..dc603f3c1 100644
--- a/kernel/arch/powerpc/boot/mktree.c
+++ b/kernel/arch/powerpc/boot/mktree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Makes a tree bootable image for IBM Evaluation boards.
  * Basically, just take a zImage, skip the ELF header, and stuff
diff --git a/kernel/arch/powerpc/boot/motload-head.S b/kernel/arch/powerpc/boot/motload-head.S
index 41cabb4b6..826dad0c1 100644
--- a/kernel/arch/powerpc/boot/motload-head.S
+++ b/kernel/arch/powerpc/boot/motload-head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "ppc_asm.h"
 
 	.text
diff --git a/kernel/arch/powerpc/boot/mpc52xx-psc.c b/kernel/arch/powerpc/boot/mpc52xx-psc.c
index d4cb4e4e0..c2c08633e 100644
--- a/kernel/arch/powerpc/boot/mpc52xx-psc.c
+++ b/kernel/arch/powerpc/boot/mpc52xx-psc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MPC5200 PSC serial console support.
  *
diff --git a/kernel/arch/powerpc/boot/mpc8xx.h b/kernel/arch/powerpc/boot/mpc8xx.h
index 3f59901ab..3852ed900 100644
--- a/kernel/arch/powerpc/boot/mpc8xx.h
+++ b/kernel/arch/powerpc/boot/mpc8xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_MPC8xx_H_
 #define _PPC_BOOT_MPC8xx_H_
 
diff --git a/kernel/arch/powerpc/boot/ns16550.c b/kernel/arch/powerpc/boot/ns16550.c
index 8c9ead94b..b0da4466d 100644
--- a/kernel/arch/powerpc/boot/ns16550.c
+++ b/kernel/arch/powerpc/boot/ns16550.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 16550 serial console support.
  *
diff --git a/kernel/arch/powerpc/boot/of.h b/kernel/arch/powerpc/boot/of.h
index 53f8f27f9..31b2f5dfd 100644
--- a/kernel/arch/powerpc/boot/of.h
+++ b/kernel/arch/powerpc/boot/of.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_OF_H_
 #define _PPC_BOOT_OF_H_
 
diff --git a/kernel/arch/powerpc/boot/planetcore.h b/kernel/arch/powerpc/boot/planetcore.h
index d53c733cc..5311db06c 100644
--- a/kernel/arch/powerpc/boot/planetcore.h
+++ b/kernel/arch/powerpc/boot/planetcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_PLANETCORE_H_
 #define _PPC_BOOT_PLANETCORE_H_
 
diff --git a/kernel/arch/powerpc/boot/pq2.h b/kernel/arch/powerpc/boot/pq2.h
index 481698c7a..f577b3bec 100644
--- a/kernel/arch/powerpc/boot/pq2.h
+++ b/kernel/arch/powerpc/boot/pq2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_PQ2_H_
 #define _PPC_BOOT_PQ2_H_
 
diff --git a/kernel/arch/powerpc/boot/pseries-head.S b/kernel/arch/powerpc/boot/pseries-head.S
index 6ef6e02e8..1b1a638ce 100644
--- a/kernel/arch/powerpc/boot/pseries-head.S
+++ b/kernel/arch/powerpc/boot/pseries-head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "ppc_asm.h"
 
 	.text
diff --git a/kernel/arch/powerpc/boot/redboot.h b/kernel/arch/powerpc/boot/redboot.h
index ace0b7fed..8f319b1ad 100644
--- a/kernel/arch/powerpc/boot/redboot.h
+++ b/kernel/arch/powerpc/boot/redboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_REDBOOT_H
 #define _PPC_REDBOOT_H
 
diff --git a/kernel/arch/powerpc/boot/rs6000.h b/kernel/arch/powerpc/boot/rs6000.h
index d70517ccc..a9d879155 100644
--- a/kernel/arch/powerpc/boot/rs6000.h
+++ b/kernel/arch/powerpc/boot/rs6000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* IBM RS/6000 "XCOFF" file definitions for BFD.
    Copyright (C) 1990, 1991 Free Software Foundation, Inc.
    FIXME: Can someone provide a transliteration of this name into ASCII?
diff --git a/kernel/arch/powerpc/boot/stdio.h b/kernel/arch/powerpc/boot/stdio.h
index adffc5841..884d5959a 100644
--- a/kernel/arch/powerpc/boot/stdio.h
+++ b/kernel/arch/powerpc/boot/stdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_STDIO_H_
 #define _PPC_BOOT_STDIO_H_
 
diff --git a/kernel/arch/powerpc/boot/stdlib.h b/kernel/arch/powerpc/boot/stdlib.h
index 1bf01ac73..0a61fcd10 100644
--- a/kernel/arch/powerpc/boot/stdlib.h
+++ b/kernel/arch/powerpc/boot/stdlib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_STDLIB_H_
 #define _PPC_BOOT_STDLIB_H_
 
diff --git a/kernel/arch/powerpc/boot/string.h b/kernel/arch/powerpc/boot/string.h
index 50091cc0e..3fb71171d 100644
--- a/kernel/arch/powerpc/boot/string.h
+++ b/kernel/arch/powerpc/boot/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_STRING_H_
 #define _PPC_BOOT_STRING_H_
 #include <stddef.h>
diff --git a/kernel/arch/powerpc/boot/swab.h b/kernel/arch/powerpc/boot/swab.h
index d0e143108..11d2069fb 100644
--- a/kernel/arch/powerpc/boot/swab.h
+++ b/kernel/arch/powerpc/boot/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_BOOT_SWAB_H_
 #define _PPC_BOOT_SWAB_H_
 
diff --git a/kernel/arch/powerpc/boot/types.h b/kernel/arch/powerpc/boot/types.h
index af6b66b84..8a4c418b7 100644
--- a/kernel/arch/powerpc/boot/types.h
+++ b/kernel/arch/powerpc/boot/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TYPES_H_
 #define _TYPES_H_
 
diff --git a/kernel/arch/powerpc/boot/virtex405-head.S b/kernel/arch/powerpc/boot/virtex405-head.S
index 3edb13f94..00bab7d7c 100644
--- a/kernel/arch/powerpc/boot/virtex405-head.S
+++ b/kernel/arch/powerpc/boot/virtex405-head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "ppc_asm.h"
 
 	.text
diff --git a/kernel/arch/powerpc/boot/xz_config.h b/kernel/arch/powerpc/boot/xz_config.h
index 5c6afdbca..e22e5b377 100644
--- a/kernel/arch/powerpc/boot/xz_config.h
+++ b/kernel/arch/powerpc/boot/xz_config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __XZ_CONFIG_H__
 #define __XZ_CONFIG_H__
 
diff --git a/kernel/arch/powerpc/boot/zImage.coff.lds.S b/kernel/arch/powerpc/boot/zImage.coff.lds.S
index de4c9e3c9..117951295 100644
--- a/kernel/arch/powerpc/boot/zImage.coff.lds.S
+++ b/kernel/arch/powerpc/boot/zImage.coff.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 OUTPUT_ARCH(powerpc:common)
 ENTRY(_zimage_start_opd)
 EXTERN(_zimage_start_opd)
diff --git a/kernel/arch/powerpc/boot/zImage.lds.S b/kernel/arch/powerpc/boot/zImage.lds.S
index f080abfc2..4ac1e36ed 100644
--- a/kernel/arch/powerpc/boot/zImage.lds.S
+++ b/kernel/arch/powerpc/boot/zImage.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 
 #ifdef CONFIG_PPC64_BOOT_WRAPPER
diff --git a/kernel/arch/powerpc/boot/zImage.ps3.lds.S b/kernel/arch/powerpc/boot/zImage.ps3.lds.S
index aaa469c1e..7b2ff2eaa 100644
--- a/kernel/arch/powerpc/boot/zImage.ps3.lds.S
+++ b/kernel/arch/powerpc/boot/zImage.ps3.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 OUTPUT_ARCH(powerpc:common)
 ENTRY(_zimage_start)
 EXTERN(_zimage_start)
diff --git a/kernel/arch/powerpc/crypto/Makefile b/kernel/arch/powerpc/crypto/Makefile
index 67eca3af9..4808d97fe 100644
--- a/kernel/arch/powerpc/crypto/Makefile
+++ b/kernel/arch/powerpc/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # powerpc/crypto/Makefile
 #
diff --git a/kernel/arch/powerpc/crypto/sha1-powerpc-asm.S b/kernel/arch/powerpc/crypto/sha1-powerpc-asm.S
index 82ddc9bdf..c8951ce0d 100644
--- a/kernel/arch/powerpc/crypto/sha1-powerpc-asm.S
+++ b/kernel/arch/powerpc/crypto/sha1-powerpc-asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SHA-1 implementation for PowerPC.
  *
diff --git a/kernel/arch/powerpc/include/asm/agp.h b/kernel/arch/powerpc/include/asm/agp.h
index 416e12c2d..b29b1186f 100644
--- a/kernel/arch/powerpc/include/asm/agp.h
+++ b/kernel/arch/powerpc/include/asm/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_AGP_H
 #define _ASM_POWERPC_AGP_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/archrandom.h b/kernel/arch/powerpc/include/asm/archrandom.h
index 85e88f7a5..9c63b596e 100644
--- a/kernel/arch/powerpc/include/asm/archrandom.h
+++ b/kernel/arch/powerpc/include/asm/archrandom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_ARCHRANDOM_H
 #define _ASM_POWERPC_ARCHRANDOM_H
 
diff --git a/kernel/arch/powerpc/include/asm/atomic.h b/kernel/arch/powerpc/include/asm/atomic.h
index a2cc8010c..682b3e6a1 100644
--- a/kernel/arch/powerpc/include/asm/atomic.h
+++ b/kernel/arch/powerpc/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_ATOMIC_H_
 #define _ASM_POWERPC_ATOMIC_H_
 
diff --git a/kernel/arch/powerpc/include/asm/backlight.h b/kernel/arch/powerpc/include/asm/backlight.h
index 8cf5c37c3..1b5eab62e 100644
--- a/kernel/arch/powerpc/include/asm/backlight.h
+++ b/kernel/arch/powerpc/include/asm/backlight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Routines for handling backlight control on PowerBooks
  *
diff --git a/kernel/arch/powerpc/include/asm/barrier.h b/kernel/arch/powerpc/include/asm/barrier.h
index 9c601adfc..10daa1d56 100644
--- a/kernel/arch/powerpc/include/asm/barrier.h
+++ b/kernel/arch/powerpc/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
  */
diff --git a/kernel/arch/powerpc/include/asm/book3s/32/hash.h b/kernel/arch/powerpc/include/asm/book3s/32/hash.h
index 880db13a2..f2892c7ab 100644
--- a/kernel/arch/powerpc/include/asm/book3s/32/hash.h
+++ b/kernel/arch/powerpc/include/asm/book3s/32/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_32_HASH_H
 #define _ASM_POWERPC_BOOK3S_32_HASH_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/book3s/32/mmu-hash.h b/kernel/arch/powerpc/include/asm/book3s/32/mmu-hash.h
index b82e06349..e38c91388 100644
--- a/kernel/arch/powerpc/include/asm/book3s/32/mmu-hash.h
+++ b/kernel/arch/powerpc/include/asm/book3s/32/mmu-hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_
 #define _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_
 /*
diff --git a/kernel/arch/powerpc/include/asm/book3s/32/pgalloc.h b/kernel/arch/powerpc/include/asm/book3s/32/pgalloc.h
index a120e7f8d..5073cc75f 100644
--- a/kernel/arch/powerpc/include/asm/book3s/32/pgalloc.h
+++ b/kernel/arch/powerpc/include/asm/book3s/32/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_32_PGALLOC_H
 #define _ASM_POWERPC_BOOK3S_32_PGALLOC_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/32/pgtable.h b/kernel/arch/powerpc/include/asm/book3s/32/pgtable.h
index 4d453f979..016579ef1 100644
--- a/kernel/arch/powerpc/include/asm/book3s/32/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/book3s/32/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_32_PGTABLE_H
 #define _ASM_POWERPC_BOOK3S_32_PGTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/hash-4k.h b/kernel/arch/powerpc/include/asm/book3s/64/hash-4k.h
index 0c4e47057..197ced1ea 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/hash-4k.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/hash-4k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_HASH_4K_H
 #define _ASM_POWERPC_BOOK3S_64_HASH_4K_H
 /*
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/hash-64k.h b/kernel/arch/powerpc/include/asm/book3s/64/hash-64k.h
index 9732837aa..8d40cf03c 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/hash-64k.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/hash-64k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_HASH_64K_H
 #define _ASM_POWERPC_BOOK3S_64_HASH_64K_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/hash.h b/kernel/arch/powerpc/include/asm/book3s/64/hash.h
index f88452019..ecb1239d7 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/hash.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_HASH_H
 #define _ASM_POWERPC_BOOK3S_64_HASH_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/hugetlb.h b/kernel/arch/powerpc/include/asm/book3s/64/hugetlb.h
index 2d1ca488c..c459f937d 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/hugetlb.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_HUGETLB_H
 #define _ASM_POWERPC_BOOK3S_64_HUGETLB_H
 /*
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/mmu.h b/kernel/arch/powerpc/include/asm/book3s/64/mmu.h
index c3b00e8ff..37fdede5a 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_MMU_H_
 #define _ASM_POWERPC_BOOK3S_64_MMU_H_
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/kernel/arch/powerpc/include/asm/book3s/64/pgtable-4k.h
index 8708a0239..af5f2baac 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/pgtable-4k.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/pgtable-4k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_4K_H
 #define _ASM_POWERPC_BOOK3S_64_PGTABLE_4K_H
 /*
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/pgtable-64k.h b/kernel/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
index 2ce420939..fb4b3ba52 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/pgtable-64k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_64K_H
 #define _ASM_POWERPC_BOOK3S_64_PGTABLE_64K_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/pgtable.h b/kernel/arch/powerpc/include/asm/book3s/64/pgtable.h
index b9aff515b..9a677cd59 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_H_
 #define _ASM_POWERPC_BOOK3S_64_PGTABLE_H_
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/radix-4k.h b/kernel/arch/powerpc/include/asm/book3s/64/radix-4k.h
index 7c3b1fe16..a61aa9cd6 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/radix-4k.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/radix-4k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGTABLE_RADIX_4K_H
 #define _ASM_POWERPC_PGTABLE_RADIX_4K_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/radix-64k.h b/kernel/arch/powerpc/include/asm/book3s/64/radix-64k.h
index 82dc355f0..c7e71ba29 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/radix-64k.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/radix-64k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGTABLE_RADIX_64K_H
 #define _ASM_POWERPC_PGTABLE_RADIX_64K_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/radix.h b/kernel/arch/powerpc/include/asm/book3s/64/radix.h
index 1e5ba94e6..19c44e149 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/radix.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/radix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGTABLE_RADIX_H
 #define _ASM_POWERPC_PGTABLE_RADIX_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h b/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
index 2f6373144..42178897a 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_TLBFLUSH_HASH_H
 #define _ASM_POWERPC_BOOK3S_64_TLBFLUSH_HASH_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h b/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
index 9b433a624..c2115dfce 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/tlbflush-radix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_TLBFLUSH_RADIX_H
 #define _ASM_POWERPC_TLBFLUSH_RADIX_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/64/tlbflush.h b/kernel/arch/powerpc/include/asm/book3s/64/tlbflush.h
index 72b925f97..fcffddbb3 100644
--- a/kernel/arch/powerpc/include/asm/book3s/64/tlbflush.h
+++ b/kernel/arch/powerpc/include/asm/book3s/64/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_64_TLBFLUSH_H
 #define _ASM_POWERPC_BOOK3S_64_TLBFLUSH_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/pgalloc.h b/kernel/arch/powerpc/include/asm/book3s/pgalloc.h
index c0a69ae92..6b178ca14 100644
--- a/kernel/arch/powerpc/include/asm/book3s/pgalloc.h
+++ b/kernel/arch/powerpc/include/asm/book3s/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_PGALLOC_H
 #define _ASM_POWERPC_BOOK3S_PGALLOC_H
 
diff --git a/kernel/arch/powerpc/include/asm/book3s/pgtable.h b/kernel/arch/powerpc/include/asm/book3s/pgtable.h
index 8b0f4a292..6436b65ac 100644
--- a/kernel/arch/powerpc/include/asm/book3s/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/book3s/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BOOK3S_PGTABLE_H
 #define _ASM_POWERPC_BOOK3S_PGTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/bootx.h b/kernel/arch/powerpc/include/asm/bootx.h
index dd9461003..1c121f3c5 100644
--- a/kernel/arch/powerpc/include/asm/bootx.h
+++ b/kernel/arch/powerpc/include/asm/bootx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file describes the structure passed from the BootX application
  * (for MacOS) when it is used to boot Linux.
diff --git a/kernel/arch/powerpc/include/asm/btext.h b/kernel/arch/powerpc/include/asm/btext.h
index 89fc38264..3ffad0303 100644
--- a/kernel/arch/powerpc/include/asm/btext.h
+++ b/kernel/arch/powerpc/include/asm/btext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for using the procedures in btext.c.
  *
diff --git a/kernel/arch/powerpc/include/asm/bug.h b/kernel/arch/powerpc/include/asm/bug.h
index 7ee763d3b..3c04249bc 100644
--- a/kernel/arch/powerpc/include/asm/bug.h
+++ b/kernel/arch/powerpc/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_BUG_H
 #define _ASM_POWERPC_BUG_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/cache.h b/kernel/arch/powerpc/include/asm/cache.h
index d122f7f95..c1d257aa4 100644
--- a/kernel/arch/powerpc/include/asm/cache.h
+++ b/kernel/arch/powerpc/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_CACHE_H
 #define _ASM_POWERPC_CACHE_H
 
diff --git a/kernel/arch/powerpc/include/asm/cell-regs.h b/kernel/arch/powerpc/include/asm/cell-regs.h
index fdf64fd25..e1c431ef3 100644
--- a/kernel/arch/powerpc/include/asm/cell-regs.h
+++ b/kernel/arch/powerpc/include/asm/cell-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * cbe_regs.h
  *
diff --git a/kernel/arch/powerpc/include/asm/cmpxchg.h b/kernel/arch/powerpc/include/asm/cmpxchg.h
index fc46b664c..9b001f1f6 100644
--- a/kernel/arch/powerpc/include/asm/cmpxchg.h
+++ b/kernel/arch/powerpc/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_CMPXCHG_H_
 #define _ASM_POWERPC_CMPXCHG_H_
 
diff --git a/kernel/arch/powerpc/include/asm/code-patching.h b/kernel/arch/powerpc/include/asm/code-patching.h
index 5482928ee..abef812de 100644
--- a/kernel/arch/powerpc/include/asm/code-patching.h
+++ b/kernel/arch/powerpc/include/asm/code-patching.h
@@ -83,16 +83,8 @@ static inline unsigned long ppc_function_entry(void *func)
 	 * On PPC64 ABIv1 the function pointer actually points to the
 	 * function's descriptor. The first entry in the descriptor is the
 	 * address of the function text.
-	 *
-	 * However, we may also receive pointer to an assembly symbol. To
-	 * detect that, we first check if the function pointer we receive
-	 * already points to kernel/module text and we only dereference it
-	 * if it doesn't.
 	 */
-	if (kernel_text_address((unsigned long)func))
-		return (unsigned long)func;
-	else
-		return ((func_descr_t *)func)->entry;
+	return ((func_descr_t *)func)->entry;
 #else
 	return (unsigned long)func;
 #endif
diff --git a/kernel/arch/powerpc/include/asm/compat.h b/kernel/arch/powerpc/include/asm/compat.h
index f256e1d14..a035b1e5d 100644
--- a/kernel/arch/powerpc/include/asm/compat.h
+++ b/kernel/arch/powerpc/include/asm/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_COMPAT_H
 #define _ASM_POWERPC_COMPAT_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/context_tracking.h b/kernel/arch/powerpc/include/asm/context_tracking.h
index 40014921f..f2682b28b 100644
--- a/kernel/arch/powerpc/include/asm/context_tracking.h
+++ b/kernel/arch/powerpc/include/asm/context_tracking.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_CONTEXT_TRACKING_H
 #define _ASM_POWERPC_CONTEXT_TRACKING_H
 
diff --git a/kernel/arch/powerpc/include/asm/cpm.h b/kernel/arch/powerpc/include/asm/cpm.h
index 2c5c5b476..b925df1b8 100644
--- a/kernel/arch/powerpc/include/asm/cpm.h
+++ b/kernel/arch/powerpc/include/asm/cpm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPM_H
 #define __CPM_H
 
diff --git a/kernel/arch/powerpc/include/asm/cpm1.h b/kernel/arch/powerpc/include/asm/cpm1.h
index 14ad37865..3db821876 100644
--- a/kernel/arch/powerpc/include/asm/cpm1.h
+++ b/kernel/arch/powerpc/include/asm/cpm1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * MPC8xx Communication Processor Module.
  * Copyright (c) 1997 Dan Malek (dmalek@jlc.net)
diff --git a/kernel/arch/powerpc/include/asm/cpm2.h b/kernel/arch/powerpc/include/asm/cpm2.h
index 7c8608b09..2211b934e 100644
--- a/kernel/arch/powerpc/include/asm/cpm2.h
+++ b/kernel/arch/powerpc/include/asm/cpm2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Communication Processor Module v2.
  *
diff --git a/kernel/arch/powerpc/include/asm/cpu_has_feature.h b/kernel/arch/powerpc/include/asm/cpu_has_feature.h
index 0d1df02bf..7897d16e0 100644
--- a/kernel/arch/powerpc/include/asm/cpu_has_feature.h
+++ b/kernel/arch/powerpc/include/asm/cpu_has_feature.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_CPU_HAS_FEATURE_H
 #define __ASM_POWERPC_CPU_HAS_FEATURE_H
 
diff --git a/kernel/arch/powerpc/include/asm/cpuidle.h b/kernel/arch/powerpc/include/asm/cpuidle.h
index eb43b5c3a..e210a83eb 100644
--- a/kernel/arch/powerpc/include/asm/cpuidle.h
+++ b/kernel/arch/powerpc/include/asm/cpuidle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_CPUIDLE_H
 #define _ASM_POWERPC_CPUIDLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/cputable.h b/kernel/arch/powerpc/include/asm/cputable.h
index a9bf921f4..53b31c2bc 100644
--- a/kernel/arch/powerpc/include/asm/cputable.h
+++ b/kernel/arch/powerpc/include/asm/cputable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_CPUTABLE_H
 #define __ASM_POWERPC_CPUTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/cputhreads.h b/kernel/arch/powerpc/include/asm/cputhreads.h
index 9377bdf42..d71a90924 100644
--- a/kernel/arch/powerpc/include/asm/cputhreads.h
+++ b/kernel/arch/powerpc/include/asm/cputhreads.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_CPUTHREADS_H
 #define _ASM_POWERPC_CPUTHREADS_H
 
diff --git a/kernel/arch/powerpc/include/asm/dbdma.h b/kernel/arch/powerpc/include/asm/dbdma.h
index 6c69836b4..4785c1716 100644
--- a/kernel/arch/powerpc/include/asm/dbdma.h
+++ b/kernel/arch/powerpc/include/asm/dbdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for using the Apple Descriptor-Based DMA controller
  * in Power Macintosh computers.
diff --git a/kernel/arch/powerpc/include/asm/dcr-regs.h b/kernel/arch/powerpc/include/asm/dcr-regs.h
index 380274de4..5c1a4973f 100644
--- a/kernel/arch/powerpc/include/asm/dcr-regs.h
+++ b/kernel/arch/powerpc/include/asm/dcr-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common DCR / SDR / CPR register definitions used on various IBM/AMCC
  * 4xx processors
diff --git a/kernel/arch/powerpc/include/asm/debug.h b/kernel/arch/powerpc/include/asm/debug.h
index 5d5af3fdd..14e71ff65 100644
--- a/kernel/arch/powerpc/include/asm/debug.h
+++ b/kernel/arch/powerpc/include/asm/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
  */
diff --git a/kernel/arch/powerpc/include/asm/dma-mapping.h b/kernel/arch/powerpc/include/asm/dma-mapping.h
index eaece3d3e..ee1e38ff1 100644
--- a/kernel/arch/powerpc/include/asm/dma-mapping.h
+++ b/kernel/arch/powerpc/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2004 IBM
  *
diff --git a/kernel/arch/powerpc/include/asm/dma.h b/kernel/arch/powerpc/include/asm/dma.h
index a5c6d83b5..1b4f02548 100644
--- a/kernel/arch/powerpc/include/asm/dma.h
+++ b/kernel/arch/powerpc/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_DMA_H
 #define _ASM_POWERPC_DMA_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/dt_cpu_ftrs.h b/kernel/arch/powerpc/include/asm/dt_cpu_ftrs.h
index 7a34fc11b..71515d909 100644
--- a/kernel/arch/powerpc/include/asm/dt_cpu_ftrs.h
+++ b/kernel/arch/powerpc/include/asm/dt_cpu_ftrs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_DT_CPU_FTRS_H
 #define __ASM_POWERPC_DT_CPU_FTRS_H
 
diff --git a/kernel/arch/powerpc/include/asm/exec.h b/kernel/arch/powerpc/include/asm/exec.h
index 8196e9c7d..92cac4851 100644
--- a/kernel/arch/powerpc/include/asm/exec.h
+++ b/kernel/arch/powerpc/include/asm/exec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
  */
diff --git a/kernel/arch/powerpc/include/asm/extable.h b/kernel/arch/powerpc/include/asm/extable.h
index 07cc45cd8..eb91b2d29 100644
--- a/kernel/arch/powerpc/include/asm/extable.h
+++ b/kernel/arch/powerpc/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_POWERPC_EXTABLE_H
 #define _ARCH_POWERPC_EXTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/fb.h b/kernel/arch/powerpc/include/asm/fb.h
index 411af8d17..6541ab77c 100644
--- a/kernel/arch/powerpc/include/asm/fb.h
+++ b/kernel/arch/powerpc/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
diff --git a/kernel/arch/powerpc/include/asm/ftrace.h b/kernel/arch/powerpc/include/asm/ftrace.h
index 686c5f70e..9abddde37 100644
--- a/kernel/arch/powerpc/include/asm/ftrace.h
+++ b/kernel/arch/powerpc/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_FTRACE
 #define _ASM_POWERPC_FTRACE
 
diff --git a/kernel/arch/powerpc/include/asm/futex.h b/kernel/arch/powerpc/include/asm/futex.h
index 719ed9b61..1a944c18c 100644
--- a/kernel/arch/powerpc/include/asm/futex.h
+++ b/kernel/arch/powerpc/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_FUTEX_H
 #define _ASM_POWERPC_FUTEX_H
 
diff --git a/kernel/arch/powerpc/include/asm/grackle.h b/kernel/arch/powerpc/include/asm/grackle.h
index bd7812a51..7376e3fa1 100644
--- a/kernel/arch/powerpc/include/asm/grackle.h
+++ b/kernel/arch/powerpc/include/asm/grackle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_GRACKLE_H
 #define _ASM_POWERPC_GRACKLE_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/hardirq.h b/kernel/arch/powerpc/include/asm/hardirq.h
index c97603d61..456f9e7b8 100644
--- a/kernel/arch/powerpc/include/asm/hardirq.h
+++ b/kernel/arch/powerpc/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_HARDIRQ_H
 #define _ASM_POWERPC_HARDIRQ_H
 
diff --git a/kernel/arch/powerpc/include/asm/head-64.h b/kernel/arch/powerpc/include/asm/head-64.h
index d81eac5b5..fdcff76e9 100644
--- a/kernel/arch/powerpc/include/asm/head-64.h
+++ b/kernel/arch/powerpc/include/asm/head-64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_HEAD_64_H
 #define _ASM_POWERPC_HEAD_64_H
 
diff --git a/kernel/arch/powerpc/include/asm/heathrow.h b/kernel/arch/powerpc/include/asm/heathrow.h
index 93f54958a..8bc5b1687 100644
--- a/kernel/arch/powerpc/include/asm/heathrow.h
+++ b/kernel/arch/powerpc/include/asm/heathrow.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_HEATHROW_H
 #define _ASM_POWERPC_HEATHROW_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/highmem.h b/kernel/arch/powerpc/include/asm/highmem.h
index 01c2c23b3..cec820f96 100644
--- a/kernel/arch/powerpc/include/asm/highmem.h
+++ b/kernel/arch/powerpc/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * highmem.h: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/powerpc/include/asm/hugetlb.h b/kernel/arch/powerpc/include/asm/hugetlb.h
index b8a0fb442..93f982391 100644
--- a/kernel/arch/powerpc/include/asm/hugetlb.h
+++ b/kernel/arch/powerpc/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_HUGETLB_H
 #define _ASM_POWERPC_HUGETLB_H
 
diff --git a/kernel/arch/powerpc/include/asm/hvcall.h b/kernel/arch/powerpc/include/asm/hvcall.h
index 3d34dc086..a409177be 100644
--- a/kernel/arch/powerpc/include/asm/hvcall.h
+++ b/kernel/arch/powerpc/include/asm/hvcall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_HVCALL_H
 #define _ASM_POWERPC_HVCALL_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/hvsi.h b/kernel/arch/powerpc/include/asm/hvsi.h
index d4a531571..3fdc54df6 100644
--- a/kernel/arch/powerpc/include/asm/hvsi.h
+++ b/kernel/arch/powerpc/include/asm/hvsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _HVSI_H
 #define _HVSI_H
 
diff --git a/kernel/arch/powerpc/include/asm/hw_irq.h b/kernel/arch/powerpc/include/asm/hw_irq.h
index c1dd19293..abd04c36c 100644
--- a/kernel/arch/powerpc/include/asm/hw_irq.h
+++ b/kernel/arch/powerpc/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
  */
diff --git a/kernel/arch/powerpc/include/asm/i8259.h b/kernel/arch/powerpc/include/asm/i8259.h
index c3fdfbd5a..d7f08ae49 100644
--- a/kernel/arch/powerpc/include/asm/i8259.h
+++ b/kernel/arch/powerpc/include/asm/i8259.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_I8259_H
 #define _ASM_POWERPC_I8259_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/ide.h b/kernel/arch/powerpc/include/asm/ide.h
index da01b20ae..ce87a4441 100644
--- a/kernel/arch/powerpc/include/asm/ide.h
+++ b/kernel/arch/powerpc/include/asm/ide.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 1994-1996 Linus Torvalds & authors
  *
diff --git a/kernel/arch/powerpc/include/asm/ima.h b/kernel/arch/powerpc/include/asm/ima.h
index 2313bdfac..ead488cf3 100644
--- a/kernel/arch/powerpc/include/asm/ima.h
+++ b/kernel/arch/powerpc/include/asm/ima.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_IMA_H
 #define _ASM_POWERPC_IMA_H
 
diff --git a/kernel/arch/powerpc/include/asm/immap_cpm2.h b/kernel/arch/powerpc/include/asm/immap_cpm2.h
index 7c64fda53..845d5b3fb 100644
--- a/kernel/arch/powerpc/include/asm/immap_cpm2.h
+++ b/kernel/arch/powerpc/include/asm/immap_cpm2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CPM2 Internal Memory Map
  * Copyright (c) 1999 Dan Malek (dmalek@jlc.net)
diff --git a/kernel/arch/powerpc/include/asm/io-defs.h b/kernel/arch/powerpc/include/asm/io-defs.h
index 44d7927ae..faf8617cc 100644
--- a/kernel/arch/powerpc/include/asm/io-defs.h
+++ b/kernel/arch/powerpc/include/asm/io-defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* This file is meant to be include multiple times by other headers */
 /* last 2 argments are used by platforms/cell/io-workarounds.[ch] */
 
diff --git a/kernel/arch/powerpc/include/asm/irq_work.h b/kernel/arch/powerpc/include/asm/irq_work.h
index 744fd54de..c6d3078bd 100644
--- a/kernel/arch/powerpc/include/asm/irq_work.h
+++ b/kernel/arch/powerpc/include/asm/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_IRQ_WORK_H
 #define _ASM_POWERPC_IRQ_WORK_H
 
diff --git a/kernel/arch/powerpc/include/asm/irqflags.h b/kernel/arch/powerpc/include/asm/irqflags.h
index f2149066f..1aeb5f13b 100644
--- a/kernel/arch/powerpc/include/asm/irqflags.h
+++ b/kernel/arch/powerpc/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IRQ flags handling
  */
diff --git a/kernel/arch/powerpc/include/asm/isa-bridge.h b/kernel/arch/powerpc/include/asm/isa-bridge.h
index a3a7c1d63..47295894b 100644
--- a/kernel/arch/powerpc/include/asm/isa-bridge.h
+++ b/kernel/arch/powerpc/include/asm/isa-bridge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ISA_BRIDGE_H
 #define __ISA_BRIDGE_H
 
diff --git a/kernel/arch/powerpc/include/asm/kdebug.h b/kernel/arch/powerpc/include/asm/kdebug.h
index ae6d20672..0f7c1ef37 100644
--- a/kernel/arch/powerpc/include/asm/kdebug.h
+++ b/kernel/arch/powerpc/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_KDEBUG_H
 #define _ASM_POWERPC_KDEBUG_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/kdump.h b/kernel/arch/powerpc/include/asm/kdump.h
index c9776202d..fd128d1e5 100644
--- a/kernel/arch/powerpc/include/asm/kdump.h
+++ b/kernel/arch/powerpc/include/asm/kdump.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC64_KDUMP_H
 #define _PPC64_KDUMP_H
 
diff --git a/kernel/arch/powerpc/include/asm/kexec.h b/kernel/arch/powerpc/include/asm/kexec.h
index 25668bc8c..4419d4356 100644
--- a/kernel/arch/powerpc/include/asm/kexec.h
+++ b/kernel/arch/powerpc/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_KEXEC_H
 #define _ASM_POWERPC_KEXEC_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/keylargo.h b/kernel/arch/powerpc/include/asm/keylargo.h
index 2156315d8..debdf5480 100644
--- a/kernel/arch/powerpc/include/asm/keylargo.h
+++ b/kernel/arch/powerpc/include/asm/keylargo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_KEYLARGO_H
 #define _ASM_POWERPC_KEYLARGO_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/libata-portmap.h b/kernel/arch/powerpc/include/asm/libata-portmap.h
index 4396db57b..7c602da62 100644
--- a/kernel/arch/powerpc/include/asm/libata-portmap.h
+++ b/kernel/arch/powerpc/include/asm/libata-portmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_LIBATA_PORTMAP_H
 #define __ASM_POWERPC_LIBATA_PORTMAP_H
 
diff --git a/kernel/arch/powerpc/include/asm/linkage.h b/kernel/arch/powerpc/include/asm/linkage.h
index 0cf5e2117..1f00d2891 100644
--- a/kernel/arch/powerpc/include/asm/linkage.h
+++ b/kernel/arch/powerpc/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_LINKAGE_H
 #define _ASM_POWERPC_LINKAGE_H
 
diff --git a/kernel/arch/powerpc/include/asm/local.h b/kernel/arch/powerpc/include/asm/local.h
index b8da91363..600a68bd7 100644
--- a/kernel/arch/powerpc/include/asm/local.h
+++ b/kernel/arch/powerpc/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_POWERPC_LOCAL_H
 #define _ARCH_POWERPC_LOCAL_H
 
diff --git a/kernel/arch/powerpc/include/asm/macio.h b/kernel/arch/powerpc/include/asm/macio.h
index 27af7f8bb..ff5fd82d9 100644
--- a/kernel/arch/powerpc/include/asm/macio.h
+++ b/kernel/arch/powerpc/include/asm/macio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACIO_ASIC_H__
 #define __MACIO_ASIC_H__
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/mediabay.h b/kernel/arch/powerpc/include/asm/mediabay.h
index 11037a413..230fda470 100644
--- a/kernel/arch/powerpc/include/asm/mediabay.h
+++ b/kernel/arch/powerpc/include/asm/mediabay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mediabay.h: definitions for using the media bay
  * on PowerBook 3400 and similar computers.
diff --git a/kernel/arch/powerpc/include/asm/mmu-40x.h b/kernel/arch/powerpc/include/asm/mmu-40x.h
index 34916865e..74f4edb59 100644
--- a/kernel/arch/powerpc/include/asm/mmu-40x.h
+++ b/kernel/arch/powerpc/include/asm/mmu-40x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_MMU_40X_H_
 #define _ASM_POWERPC_MMU_40X_H_
 
diff --git a/kernel/arch/powerpc/include/asm/mmu-44x.h b/kernel/arch/powerpc/include/asm/mmu-44x.h
index bf52d704f..cb57f29f5 100644
--- a/kernel/arch/powerpc/include/asm/mmu-44x.h
+++ b/kernel/arch/powerpc/include/asm/mmu-44x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_MMU_44X_H_
 #define _ASM_POWERPC_MMU_44X_H_
 /*
diff --git a/kernel/arch/powerpc/include/asm/mmu-8xx.h b/kernel/arch/powerpc/include/asm/mmu-8xx.h
index 798b5bf91..5bb3dbede 100644
--- a/kernel/arch/powerpc/include/asm/mmu-8xx.h
+++ b/kernel/arch/powerpc/include/asm/mmu-8xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_MMU_8XX_H_
 #define _ASM_POWERPC_MMU_8XX_H_
 /*
diff --git a/kernel/arch/powerpc/include/asm/mmu-book3e.h b/kernel/arch/powerpc/include/asm/mmu-book3e.h
index 7ca8d8e80..cda94a0f5 100644
--- a/kernel/arch/powerpc/include/asm/mmu-book3e.h
+++ b/kernel/arch/powerpc/include/asm/mmu-book3e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_MMU_BOOK3E_H_
 #define _ASM_POWERPC_MMU_BOOK3E_H_
 /*
diff --git a/kernel/arch/powerpc/include/asm/mmu.h b/kernel/arch/powerpc/include/asm/mmu.h
index 78260409d..6364f5c2c 100644
--- a/kernel/arch/powerpc/include/asm/mmu.h
+++ b/kernel/arch/powerpc/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_MMU_H_
 #define _ASM_POWERPC_MMU_H_
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/mmu_context.h b/kernel/arch/powerpc/include/asm/mmu_context.h
index 309592589..492d8140a 100644
--- a/kernel/arch/powerpc/include/asm/mmu_context.h
+++ b/kernel/arch/powerpc/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_MMU_CONTEXT_H
 #define __ASM_POWERPC_MMU_CONTEXT_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/mmzone.h b/kernel/arch/powerpc/include/asm/mmzone.h
index 4d52ccfc2..91c69ff53 100644
--- a/kernel/arch/powerpc/include/asm/mmzone.h
+++ b/kernel/arch/powerpc/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Written by Kanoj Sarcar (kanoj@sgi.com) Aug 99
  *
diff --git a/kernel/arch/powerpc/include/asm/mpc6xx.h b/kernel/arch/powerpc/include/asm/mpc6xx.h
index effc2291b..6ed9f4ccc 100644
--- a/kernel/arch/powerpc/include/asm/mpc6xx.h
+++ b/kernel/arch/powerpc/include/asm/mpc6xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_MPC6xx_H
 #define __ASM_POWERPC_MPC6xx_H
 
diff --git a/kernel/arch/powerpc/include/asm/mpc8260.h b/kernel/arch/powerpc/include/asm/mpc8260.h
index 03317e1e6..fd8c57074 100644
--- a/kernel/arch/powerpc/include/asm/mpc8260.h
+++ b/kernel/arch/powerpc/include/asm/mpc8260.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Since there are many different boards and no standard configuration,
  * we have a unique include file for each.  Rather than change every
diff --git a/kernel/arch/powerpc/include/asm/mpic.h b/kernel/arch/powerpc/include/asm/mpic.h
index 98697611e..fad8ddd69 100644
--- a/kernel/arch/powerpc/include/asm/mpic.h
+++ b/kernel/arch/powerpc/include/asm/mpic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_MPIC_H
 #define _ASM_POWERPC_MPIC_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/nmi.h b/kernel/arch/powerpc/include/asm/nmi.h
index 3760150a0..e97f58689 100644
--- a/kernel/arch/powerpc/include/asm/nmi.h
+++ b/kernel/arch/powerpc/include/asm/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_NMI_H
 #define _ASM_NMI_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/32/pgalloc.h b/kernel/arch/powerpc/include/asm/nohash/32/pgalloc.h
index cc369a70f..d072139ff 100644
--- a/kernel/arch/powerpc/include/asm/nohash/32/pgalloc.h
+++ b/kernel/arch/powerpc/include/asm/nohash/32/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGALLOC_32_H
 #define _ASM_POWERPC_PGALLOC_32_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/32/pgtable.h b/kernel/arch/powerpc/include/asm/nohash/32/pgtable.h
index 185c6a47f..cc2bfec3a 100644
--- a/kernel/arch/powerpc/include/asm/nohash/32/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/nohash/32/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_32_PGTABLE_H
 #define _ASM_POWERPC_NOHASH_32_PGTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/32/pte-40x.h b/kernel/arch/powerpc/include/asm/nohash/32/pte-40x.h
index 9624ebdac..124f9ac23 100644
--- a/kernel/arch/powerpc/include/asm/nohash/32/pte-40x.h
+++ b/kernel/arch/powerpc/include/asm/nohash/32/pte-40x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_32_PTE_40x_H
 #define _ASM_POWERPC_NOHASH_32_PTE_40x_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/nohash/32/pte-44x.h b/kernel/arch/powerpc/include/asm/nohash/32/pte-44x.h
index 0656ff81e..f812c0272 100644
--- a/kernel/arch/powerpc/include/asm/nohash/32/pte-44x.h
+++ b/kernel/arch/powerpc/include/asm/nohash/32/pte-44x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_32_PTE_44x_H
 #define _ASM_POWERPC_NOHASH_32_PTE_44x_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/nohash/32/pte-8xx.h b/kernel/arch/powerpc/include/asm/nohash/32/pte-8xx.h
index b4df2734c..6dc0180fd 100644
--- a/kernel/arch/powerpc/include/asm/nohash/32/pte-8xx.h
+++ b/kernel/arch/powerpc/include/asm/nohash/32/pte-8xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_32_PTE_8xx_H
 #define _ASM_POWERPC_NOHASH_32_PTE_8xx_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h b/kernel/arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h
index 5422d00c6..d1ee24e9e 100644
--- a/kernel/arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h
+++ b/kernel/arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_32_PTE_FSL_BOOKE_H
 #define _ASM_POWERPC_NOHASH_32_PTE_FSL_BOOKE_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/nohash/64/pgtable-4k.h b/kernel/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
index 9f4de0a10..c40ec32b8 100644
--- a/kernel/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
+++ b/kernel/arch/powerpc/include/asm/nohash/64/pgtable-4k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_64_PGTABLE_4K_H
 #define _ASM_POWERPC_NOHASH_64_PGTABLE_4K_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/64/pgtable-64k.h b/kernel/arch/powerpc/include/asm/nohash/64/pgtable-64k.h
index 1facb584d..7210c2818 100644
--- a/kernel/arch/powerpc/include/asm/nohash/64/pgtable-64k.h
+++ b/kernel/arch/powerpc/include/asm/nohash/64/pgtable-64k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_64_PGTABLE_64K_H
 #define _ASM_POWERPC_NOHASH_64_PGTABLE_64K_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/64/pgtable.h b/kernel/arch/powerpc/include/asm/nohash/64/pgtable.h
index f0ff384d4..265bbd7cb 100644
--- a/kernel/arch/powerpc/include/asm/nohash/64/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/nohash/64/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_64_PGTABLE_H
 #define _ASM_POWERPC_NOHASH_64_PGTABLE_H
 /*
diff --git a/kernel/arch/powerpc/include/asm/nohash/pgalloc.h b/kernel/arch/powerpc/include/asm/nohash/pgalloc.h
index b39ec956d..0634f2949 100644
--- a/kernel/arch/powerpc/include/asm/nohash/pgalloc.h
+++ b/kernel/arch/powerpc/include/asm/nohash/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_PGALLOC_H
 #define _ASM_POWERPC_NOHASH_PGALLOC_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/pgtable.h b/kernel/arch/powerpc/include/asm/nohash/pgtable.h
index 17989c3d9..5c68f4a59 100644
--- a/kernel/arch/powerpc/include/asm/nohash/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/nohash/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_PGTABLE_H
 #define _ASM_POWERPC_NOHASH_PGTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/nohash/pte-book3e.h b/kernel/arch/powerpc/include/asm/nohash/pte-book3e.h
index e16807b78..2da4532ca 100644
--- a/kernel/arch/powerpc/include/asm/nohash/pte-book3e.h
+++ b/kernel/arch/powerpc/include/asm/nohash/pte-book3e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_NOHASH_PTE_BOOK3E_H
 #define _ASM_POWERPC_NOHASH_PTE_BOOK3E_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/ohare.h b/kernel/arch/powerpc/include/asm/ohare.h
index 0d030f9de..da3371fc3 100644
--- a/kernel/arch/powerpc/include/asm/ohare.h
+++ b/kernel/arch/powerpc/include/asm/ohare.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_OHARE_H
 #define _ASM_POWERPC_OHARE_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/page_32.h b/kernel/arch/powerpc/include/asm/page_32.h
index 6a8e1797f..5c378e9b7 100644
--- a/kernel/arch/powerpc/include/asm/page_32.h
+++ b/kernel/arch/powerpc/include/asm/page_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PAGE_32_H
 #define _ASM_POWERPC_PAGE_32_H
 
diff --git a/kernel/arch/powerpc/include/asm/parport.h b/kernel/arch/powerpc/include/asm/parport.h
index 6595ad1d1..8abfb8f7c 100644
--- a/kernel/arch/powerpc/include/asm/parport.h
+++ b/kernel/arch/powerpc/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * parport.h: platform-specific PC-style parport initialisation
  *
diff --git a/kernel/arch/powerpc/include/asm/percpu.h b/kernel/arch/powerpc/include/asm/percpu.h
index 2cedefddb..dce863a76 100644
--- a/kernel/arch/powerpc/include/asm/percpu.h
+++ b/kernel/arch/powerpc/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PERCPU_H_
 #define _ASM_POWERPC_PERCPU_H_
 #ifdef __powerpc64__
diff --git a/kernel/arch/powerpc/include/asm/pgalloc.h b/kernel/arch/powerpc/include/asm/pgalloc.h
index 45ae1212a..a14203c00 100644
--- a/kernel/arch/powerpc/include/asm/pgalloc.h
+++ b/kernel/arch/powerpc/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGALLOC_H
 #define _ASM_POWERPC_PGALLOC_H
 
diff --git a/kernel/arch/powerpc/include/asm/pgtable-be-types.h b/kernel/arch/powerpc/include/asm/pgtable-be-types.h
index 67e7e3d99..beb6e3e79 100644
--- a/kernel/arch/powerpc/include/asm/pgtable-be-types.h
+++ b/kernel/arch/powerpc/include/asm/pgtable-be-types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGTABLE_BE_TYPES_H
 #define _ASM_POWERPC_PGTABLE_BE_TYPES_H
 
diff --git a/kernel/arch/powerpc/include/asm/pgtable-types.h b/kernel/arch/powerpc/include/asm/pgtable-types.h
index 369a164b5..cfe89a6fc 100644
--- a/kernel/arch/powerpc/include/asm/pgtable-types.h
+++ b/kernel/arch/powerpc/include/asm/pgtable-types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGTABLE_TYPES_H
 #define _ASM_POWERPC_PGTABLE_TYPES_H
 
diff --git a/kernel/arch/powerpc/include/asm/pgtable.h b/kernel/arch/powerpc/include/asm/pgtable.h
index 7d0d38f58..ab7d2d996 100644
--- a/kernel/arch/powerpc/include/asm/pgtable.h
+++ b/kernel/arch/powerpc/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PGTABLE_H
 #define _ASM_POWERPC_PGTABLE_H
 
diff --git a/kernel/arch/powerpc/include/asm/plpar_wrappers.h b/kernel/arch/powerpc/include/asm/plpar_wrappers.h
index c7b164836..7f01b22fa 100644
--- a/kernel/arch/powerpc/include/asm/plpar_wrappers.h
+++ b/kernel/arch/powerpc/include/asm/plpar_wrappers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_PLPAR_WRAPPERS_H
 #define _ASM_POWERPC_PLPAR_WRAPPERS_H
 
diff --git a/kernel/arch/powerpc/include/asm/pmac_pfunc.h b/kernel/arch/powerpc/include/asm/pmac_pfunc.h
index 1330d6a58..73bd8f28f 100644
--- a/kernel/arch/powerpc/include/asm/pmac_pfunc.h
+++ b/kernel/arch/powerpc/include/asm/pmac_pfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PMAC_PFUNC_H__
 #define __PMAC_PFUNC_H__
 
diff --git a/kernel/arch/powerpc/include/asm/pte-common.h b/kernel/arch/powerpc/include/asm/pte-common.h
index 4ba26dd25..ce142ef99 100644
--- a/kernel/arch/powerpc/include/asm/pte-common.h
+++ b/kernel/arch/powerpc/include/asm/pte-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Included from asm/pgtable-*.h only ! */
 
 /*
diff --git a/kernel/arch/powerpc/include/asm/reg.h b/kernel/arch/powerpc/include/asm/reg.h
index f92eaf7a4..b779f3ccd 100644
--- a/kernel/arch/powerpc/include/asm/reg.h
+++ b/kernel/arch/powerpc/include/asm/reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Contains the definition of registers common to all PowerPC variants.
  * If a register definition has been changed in a different PowerPC
diff --git a/kernel/arch/powerpc/include/asm/reg_8xx.h b/kernel/arch/powerpc/include/asm/reg_8xx.h
index ae16fef7a..53a7e2955 100644
--- a/kernel/arch/powerpc/include/asm/reg_8xx.h
+++ b/kernel/arch/powerpc/include/asm/reg_8xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Contains register definitions common to PowerPC 8xx CPUs.  Notice
  */
diff --git a/kernel/arch/powerpc/include/asm/reg_fsl_emb.h b/kernel/arch/powerpc/include/asm/reg_fsl_emb.h
index 0e3ddf517..d7ccf93e6 100644
--- a/kernel/arch/powerpc/include/asm/reg_fsl_emb.h
+++ b/kernel/arch/powerpc/include/asm/reg_fsl_emb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Contains register definitions for the Freescale Embedded Performance
  * Monitor.
diff --git a/kernel/arch/powerpc/include/asm/runlatch.h b/kernel/arch/powerpc/include/asm/runlatch.h
index 54e9b9638..cfb390edf 100644
--- a/kernel/arch/powerpc/include/asm/runlatch.h
+++ b/kernel/arch/powerpc/include/asm/runlatch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
  */
diff --git a/kernel/arch/powerpc/include/asm/seccomp.h b/kernel/arch/powerpc/include/asm/seccomp.h
index c1818e35c..51209f607 100644
--- a/kernel/arch/powerpc/include/asm/seccomp.h
+++ b/kernel/arch/powerpc/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SECCOMP_H
 #define _ASM_POWERPC_SECCOMP_H
 
diff --git a/kernel/arch/powerpc/include/asm/sections.h b/kernel/arch/powerpc/include/asm/sections.h
index 7902d6358..82bec63bb 100644
--- a/kernel/arch/powerpc/include/asm/sections.h
+++ b/kernel/arch/powerpc/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SECTIONS_H
 #define _ASM_POWERPC_SECTIONS_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/setup.h b/kernel/arch/powerpc/include/asm/setup.h
index 3a3fb0ca6..257d23dbf 100644
--- a/kernel/arch/powerpc/include/asm/setup.h
+++ b/kernel/arch/powerpc/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SETUP_H
 #define _ASM_POWERPC_SETUP_H
 
diff --git a/kernel/arch/powerpc/include/asm/shmparam.h b/kernel/arch/powerpc/include/asm/shmparam.h
index 5cda42a6d..bc0968839 100644
--- a/kernel/arch/powerpc/include/asm/shmparam.h
+++ b/kernel/arch/powerpc/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SHMPARAM_H
 #define _ASM_POWERPC_SHMPARAM_H
 
diff --git a/kernel/arch/powerpc/include/asm/signal.h b/kernel/arch/powerpc/include/asm/signal.h
index 5ff77722a..0803ca8b9 100644
--- a/kernel/arch/powerpc/include/asm/signal.h
+++ b/kernel/arch/powerpc/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SIGNAL_H
 #define _ASM_POWERPC_SIGNAL_H
 
diff --git a/kernel/arch/powerpc/include/asm/smu.h b/kernel/arch/powerpc/include/asm/smu.h
index 09f98e861..8dff086c0 100644
--- a/kernel/arch/powerpc/include/asm/smu.h
+++ b/kernel/arch/powerpc/include/asm/smu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SMU_H
 #define _SMU_H
 
diff --git a/kernel/arch/powerpc/include/asm/sparsemem.h b/kernel/arch/powerpc/include/asm/sparsemem.h
index c88930c9d..a7916ee6d 100644
--- a/kernel/arch/powerpc/include/asm/sparsemem.h
+++ b/kernel/arch/powerpc/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SPARSEMEM_H
 #define _ASM_POWERPC_SPARSEMEM_H 1
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/spinlock_types.h b/kernel/arch/powerpc/include/asm/spinlock_types.h
index 2351adc4f..87adaf13b 100644
--- a/kernel/arch/powerpc/include/asm/spinlock_types.h
+++ b/kernel/arch/powerpc/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SPINLOCK_TYPES_H
 #define _ASM_POWERPC_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/powerpc/include/asm/string.h b/kernel/arch/powerpc/include/asm/string.h
index cc9addefb..d98ac188c 100644
--- a/kernel/arch/powerpc/include/asm/string.h
+++ b/kernel/arch/powerpc/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_STRING_H
 #define _ASM_POWERPC_STRING_H
 
diff --git a/kernel/arch/powerpc/include/asm/switch_to.h b/kernel/arch/powerpc/include/asm/switch_to.h
index 17c838067..bf820f53e 100644
--- a/kernel/arch/powerpc/include/asm/switch_to.h
+++ b/kernel/arch/powerpc/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
  */
diff --git a/kernel/arch/powerpc/include/asm/synch.h b/kernel/arch/powerpc/include/asm/synch.h
index 78efe8d5d..63e7f5a1f 100644
--- a/kernel/arch/powerpc/include/asm/synch.h
+++ b/kernel/arch/powerpc/include/asm/synch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_SYNCH_H 
 #define _ASM_POWERPC_SYNCH_H 
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/syscalls.h b/kernel/arch/powerpc/include/asm/syscalls.h
index 16fab6898..1b90a3516 100644
--- a/kernel/arch/powerpc/include/asm/syscalls.h
+++ b/kernel/arch/powerpc/include/asm/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_POWERPC_SYSCALLS_H
 #define __ASM_POWERPC_SYSCALLS_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/systbl.h b/kernel/arch/powerpc/include/asm/systbl.h
index 1c9470881..449912f05 100644
--- a/kernel/arch/powerpc/include/asm/systbl.h
+++ b/kernel/arch/powerpc/include/asm/systbl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * List of powerpc syscalls. For the meaning of the _SPU suffix see
  * arch/powerpc/platforms/cell/spu_callbacks.c
diff --git a/kernel/arch/powerpc/include/asm/thread_info.h b/kernel/arch/powerpc/include/asm/thread_info.h
index a941cc6fc..a264c3ad3 100644
--- a/kernel/arch/powerpc/include/asm/thread_info.h
+++ b/kernel/arch/powerpc/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: PowerPC low-level thread information
  * adapted from the i386 version by Paul Mackerras
  *
diff --git a/kernel/arch/powerpc/include/asm/timex.h b/kernel/arch/powerpc/include/asm/timex.h
index cb61eae5b..926b9f91a 100644
--- a/kernel/arch/powerpc/include/asm/timex.h
+++ b/kernel/arch/powerpc/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_TIMEX_H
 #define _ASM_POWERPC_TIMEX_H
 
diff --git a/kernel/arch/powerpc/include/asm/tm.h b/kernel/arch/powerpc/include/asm/tm.h
index 82e06ca3a..a8bc72a7f 100644
--- a/kernel/arch/powerpc/include/asm/tm.h
+++ b/kernel/arch/powerpc/include/asm/tm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Transactional memory support routines to reclaim and recheckpoint
  * transactional process state.
diff --git a/kernel/arch/powerpc/include/asm/topology.h b/kernel/arch/powerpc/include/asm/topology.h
index 2d84bca8d..023ff9f17 100644
--- a/kernel/arch/powerpc/include/asm/topology.h
+++ b/kernel/arch/powerpc/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_TOPOLOGY_H
 #define _ASM_POWERPC_TOPOLOGY_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/include/asm/trace.h b/kernel/arch/powerpc/include/asm/trace.h
index 18f168aeb..33f3b4791 100644
--- a/kernel/arch/powerpc/include/asm/trace.h
+++ b/kernel/arch/powerpc/include/asm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM powerpc
 
diff --git a/kernel/arch/powerpc/include/asm/uaccess.h b/kernel/arch/powerpc/include/asm/uaccess.h
index 9c0e60ca1..11f4bd07c 100644
--- a/kernel/arch/powerpc/include/asm/uaccess.h
+++ b/kernel/arch/powerpc/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_POWERPC_UACCESS_H
 #define _ARCH_POWERPC_UACCESS_H
 
diff --git a/kernel/arch/powerpc/include/asm/unaligned.h b/kernel/arch/powerpc/include/asm/unaligned.h
index 8296381ae..ce69c5eff 100644
--- a/kernel/arch/powerpc/include/asm/unaligned.h
+++ b/kernel/arch/powerpc/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_UNALIGNED_H
 #define _ASM_POWERPC_UNALIGNED_H
 
diff --git a/kernel/arch/powerpc/include/asm/uninorth.h b/kernel/arch/powerpc/include/asm/uninorth.h
index a1d112979..e278299b9 100644
--- a/kernel/arch/powerpc/include/asm/uninorth.h
+++ b/kernel/arch/powerpc/include/asm/uninorth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * uninorth.h: definitions for using the "UniNorth" host bridge chip
  *             from Apple. This chip is used on "Core99" machines
diff --git a/kernel/arch/powerpc/include/asm/user.h b/kernel/arch/powerpc/include/asm/user.h
index 3fd4545dd..5c0e082ea 100644
--- a/kernel/arch/powerpc/include/asm/user.h
+++ b/kernel/arch/powerpc/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_USER_H
 #define _ASM_POWERPC_USER_H
 
diff --git a/kernel/arch/powerpc/include/asm/vdso.h b/kernel/arch/powerpc/include/asm/vdso.h
index c53f5f6d1..b5e1f8f8a 100644
--- a/kernel/arch/powerpc/include/asm/vdso.h
+++ b/kernel/arch/powerpc/include/asm/vdso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PPC64_VDSO_H__
 #define __PPC64_VDSO_H__
 
diff --git a/kernel/arch/powerpc/include/asm/vga.h b/kernel/arch/powerpc/include/asm/vga.h
index 7a7b541b7..fcf721682 100644
--- a/kernel/arch/powerpc/include/asm/vga.h
+++ b/kernel/arch/powerpc/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_POWERPC_VGA_H_
 #define _ASM_POWERPC_VGA_H_
 
diff --git a/kernel/arch/powerpc/include/asm/xics.h b/kernel/arch/powerpc/include/asm/xics.h
index 7ce2c3ac2..8e903b3f9 100644
--- a/kernel/arch/powerpc/include/asm/xics.h
+++ b/kernel/arch/powerpc/include/asm/xics.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common definitions across all variants of ICP and ICS interrupt
  * controllers.
diff --git a/kernel/arch/powerpc/include/uapi/asm/auxvec.h b/kernel/arch/powerpc/include/uapi/asm/auxvec.h
index be6e94ece..7af21dc0e 100644
--- a/kernel/arch/powerpc/include/uapi/asm/auxvec.h
+++ b/kernel/arch/powerpc/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_AUXVEC_H
 #define _ASM_POWERPC_AUXVEC_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/bitsperlong.h b/kernel/arch/powerpc/include/uapi/asm/bitsperlong.h
index 5f1659032..46ece3ecf 100644
--- a/kernel/arch/powerpc/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/powerpc/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_POWERPC_BITSPERLONG_H
 #define __ASM_POWERPC_BITSPERLONG_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/bootx.h b/kernel/arch/powerpc/include/uapi/asm/bootx.h
index 6e51cf070..6728c7e24 100644
--- a/kernel/arch/powerpc/include/uapi/asm/bootx.h
+++ b/kernel/arch/powerpc/include/uapi/asm/bootx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file describes the structure passed from the BootX application
  * (for MacOS) when it is used to boot Linux.
diff --git a/kernel/arch/powerpc/include/uapi/asm/byteorder.h b/kernel/arch/powerpc/include/uapi/asm/byteorder.h
index ca931d074..8ef66f7d9 100644
--- a/kernel/arch/powerpc/include/uapi/asm/byteorder.h
+++ b/kernel/arch/powerpc/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_BYTEORDER_H
 #define _ASM_POWERPC_BYTEORDER_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/cputable.h b/kernel/arch/powerpc/include/uapi/asm/cputable.h
index 4d877144f..50bcb4295 100644
--- a/kernel/arch/powerpc/include/uapi/asm/cputable.h
+++ b/kernel/arch/powerpc/include/uapi/asm/cputable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_POWERPC_CPUTABLE_H
 #define _UAPI__ASM_POWERPC_CPUTABLE_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/eeh.h b/kernel/arch/powerpc/include/uapi/asm/eeh.h
index 291b7d181..28186071f 100644
--- a/kernel/arch/powerpc/include/uapi/asm/eeh.h
+++ b/kernel/arch/powerpc/include/uapi/asm/eeh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
diff --git a/kernel/arch/powerpc/include/uapi/asm/elf.h b/kernel/arch/powerpc/include/uapi/asm/elf.h
index b2c6fdd5a..5f201d40b 100644
--- a/kernel/arch/powerpc/include/uapi/asm/elf.h
+++ b/kernel/arch/powerpc/include/uapi/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * ELF register definitions..
  *
diff --git a/kernel/arch/powerpc/include/uapi/asm/epapr_hcalls.h b/kernel/arch/powerpc/include/uapi/asm/epapr_hcalls.h
index b4504f394..90a0ee6d0 100644
--- a/kernel/arch/powerpc/include/uapi/asm/epapr_hcalls.h
+++ b/kernel/arch/powerpc/include/uapi/asm/epapr_hcalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * ePAPR hcall interface
  *
diff --git a/kernel/arch/powerpc/include/uapi/asm/errno.h b/kernel/arch/powerpc/include/uapi/asm/errno.h
index e8b6b5f7d..cc7985689 100644
--- a/kernel/arch/powerpc/include/uapi/asm/errno.h
+++ b/kernel/arch/powerpc/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_ERRNO_H
 #define _ASM_POWERPC_ERRNO_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/fcntl.h b/kernel/arch/powerpc/include/uapi/asm/fcntl.h
index ce5c4516d..65ce08322 100644
--- a/kernel/arch/powerpc/include/uapi/asm/fcntl.h
+++ b/kernel/arch/powerpc/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_FCNTL_H
 #define _ASM_FCNTL_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/ioctl.h b/kernel/arch/powerpc/include/uapi/asm/ioctl.h
index 57d683042..d623af4b9 100644
--- a/kernel/arch/powerpc/include/uapi/asm/ioctl.h
+++ b/kernel/arch/powerpc/include/uapi/asm/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_IOCTL_H
 #define _ASM_POWERPC_IOCTL_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/ioctls.h b/kernel/arch/powerpc/include/uapi/asm/ioctls.h
index e3b10469f..41b1a5c15 100644
--- a/kernel/arch/powerpc/include/uapi/asm/ioctls.h
+++ b/kernel/arch/powerpc/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_IOCTLS_H
 #define _ASM_POWERPC_IOCTLS_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/ipcbuf.h b/kernel/arch/powerpc/include/uapi/asm/ipcbuf.h
index 2c3e1d94d..21e1e0ec0 100644
--- a/kernel/arch/powerpc/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/powerpc/include/uapi/asm/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_IPCBUF_H
 #define _ASM_POWERPC_IPCBUF_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/kvm.h b/kernel/arch/powerpc/include/uapi/asm/kvm.h
index 8cf8f0c96..61d6049f4 100644
--- a/kernel/arch/powerpc/include/uapi/asm/kvm.h
+++ b/kernel/arch/powerpc/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
diff --git a/kernel/arch/powerpc/include/uapi/asm/kvm_para.h b/kernel/arch/powerpc/include/uapi/asm/kvm_para.h
index 91e42f09b..01555c6ae 100644
--- a/kernel/arch/powerpc/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/powerpc/include/uapi/asm/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
diff --git a/kernel/arch/powerpc/include/uapi/asm/mman.h b/kernel/arch/powerpc/include/uapi/asm/mman.h
index 03c06ba74..e63bc37e3 100644
--- a/kernel/arch/powerpc/include/uapi/asm/mman.h
+++ b/kernel/arch/powerpc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/kernel/arch/powerpc/include/uapi/asm/msgbuf.h b/kernel/arch/powerpc/include/uapi/asm/msgbuf.h
index dd76743c7..65beb0942 100644
--- a/kernel/arch/powerpc/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/powerpc/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_MSGBUF_H
 #define _ASM_POWERPC_MSGBUF_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/nvram.h b/kernel/arch/powerpc/include/uapi/asm/nvram.h
index 608bdc8ae..c92c7f056 100644
--- a/kernel/arch/powerpc/include/uapi/asm/nvram.h
+++ b/kernel/arch/powerpc/include/uapi/asm/nvram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * NVRAM definitions and access functions.
  *
diff --git a/kernel/arch/powerpc/include/uapi/asm/opal-prd.h b/kernel/arch/powerpc/include/uapi/asm/opal-prd.h
index 319ff4a26..1869cf83a 100644
--- a/kernel/arch/powerpc/include/uapi/asm/opal-prd.h
+++ b/kernel/arch/powerpc/include/uapi/asm/opal-prd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * OPAL Runtime Diagnostics interface driver
  * Supported on POWERNV platform
diff --git a/kernel/arch/powerpc/include/uapi/asm/perf_event.h b/kernel/arch/powerpc/include/uapi/asm/perf_event.h
index 80a4d40cf..ce488e48d 100644
--- a/kernel/arch/powerpc/include/uapi/asm/perf_event.h
+++ b/kernel/arch/powerpc/include/uapi/asm/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2013 Michael Ellerman, IBM Corp.
  *
diff --git a/kernel/arch/powerpc/include/uapi/asm/perf_regs.h b/kernel/arch/powerpc/include/uapi/asm/perf_regs.h
index 6a9320974..9e52c86cc 100644
--- a/kernel/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/kernel/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_POWERPC_PERF_REGS_H
 #define _UAPI_ASM_POWERPC_PERF_REGS_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/posix_types.h b/kernel/arch/powerpc/include/uapi/asm/posix_types.h
index 2958c5b97..f698400e4 100644
--- a/kernel/arch/powerpc/include/uapi/asm/posix_types.h
+++ b/kernel/arch/powerpc/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_POSIX_TYPES_H
 #define _ASM_POWERPC_POSIX_TYPES_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/ps3fb.h b/kernel/arch/powerpc/include/uapi/asm/ps3fb.h
index e7233a849..fd7e3a0d3 100644
--- a/kernel/arch/powerpc/include/uapi/asm/ps3fb.h
+++ b/kernel/arch/powerpc/include/uapi/asm/ps3fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2006 Sony Computer Entertainment Inc.
  * Copyright 2006, 2007 Sony Corporation
diff --git a/kernel/arch/powerpc/include/uapi/asm/ptrace.h b/kernel/arch/powerpc/include/uapi/asm/ptrace.h
index 8036b3854..5e3edc2a7 100644
--- a/kernel/arch/powerpc/include/uapi/asm/ptrace.h
+++ b/kernel/arch/powerpc/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2001 PPC64 Team, IBM Corp
  *
diff --git a/kernel/arch/powerpc/include/uapi/asm/sembuf.h b/kernel/arch/powerpc/include/uapi/asm/sembuf.h
index 99a41938a..8f393d60f 100644
--- a/kernel/arch/powerpc/include/uapi/asm/sembuf.h
+++ b/kernel/arch/powerpc/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_SEMBUF_H
 #define _ASM_POWERPC_SEMBUF_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/setup.h b/kernel/arch/powerpc/include/uapi/asm/setup.h
index ae3fb68cb..c54940b09 100644
--- a/kernel/arch/powerpc/include/uapi/asm/setup.h
+++ b/kernel/arch/powerpc/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_POWERPC_SETUP_H
 #define _UAPI_ASM_POWERPC_SETUP_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/shmbuf.h b/kernel/arch/powerpc/include/uapi/asm/shmbuf.h
index 8efa39698..deb1c3e50 100644
--- a/kernel/arch/powerpc/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/powerpc/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_SHMBUF_H
 #define _ASM_POWERPC_SHMBUF_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/sigcontext.h b/kernel/arch/powerpc/include/uapi/asm/sigcontext.h
index 3ad0c7f00..2fbe485ac 100644
--- a/kernel/arch/powerpc/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/powerpc/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_SIGCONTEXT_H
 #define _ASM_POWERPC_SIGCONTEXT_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/siginfo.h b/kernel/arch/powerpc/include/uapi/asm/siginfo.h
index ccce3ef5c..1a691141e 100644
--- a/kernel/arch/powerpc/include/uapi/asm/siginfo.h
+++ b/kernel/arch/powerpc/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_SIGINFO_H
 #define _ASM_POWERPC_SIGINFO_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/signal.h b/kernel/arch/powerpc/include/uapi/asm/signal.h
index 6c69ee94f..85b0a7aa4 100644
--- a/kernel/arch/powerpc/include/uapi/asm/signal.h
+++ b/kernel/arch/powerpc/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_POWERPC_SIGNAL_H
 #define _UAPI_ASM_POWERPC_SIGNAL_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/socket.h b/kernel/arch/powerpc/include/uapi/asm/socket.h
index 3c590c7c4..94de465e0 100644
--- a/kernel/arch/powerpc/include/uapi/asm/socket.h
+++ b/kernel/arch/powerpc/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_SOCKET_H
 #define _ASM_POWERPC_SOCKET_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/spu_info.h b/kernel/arch/powerpc/include/uapi/asm/spu_info.h
index ed071bf97..cabfcbba9 100644
--- a/kernel/arch/powerpc/include/uapi/asm/spu_info.h
+++ b/kernel/arch/powerpc/include/uapi/asm/spu_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * SPU info structures
  *
diff --git a/kernel/arch/powerpc/include/uapi/asm/stat.h b/kernel/arch/powerpc/include/uapi/asm/stat.h
index 84880b80c..afd25f2ff 100644
--- a/kernel/arch/powerpc/include/uapi/asm/stat.h
+++ b/kernel/arch/powerpc/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_STAT_H
 #define _ASM_POWERPC_STAT_H
 /*
diff --git a/kernel/arch/powerpc/include/uapi/asm/swab.h b/kernel/arch/powerpc/include/uapi/asm/swab.h
index b6c368aa5..17b16c44d 100644
--- a/kernel/arch/powerpc/include/uapi/asm/swab.h
+++ b/kernel/arch/powerpc/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/kernel/arch/powerpc/include/uapi/asm/termbits.h b/kernel/arch/powerpc/include/uapi/asm/termbits.h
index 549d700e1..ed18bc61f 100644
--- a/kernel/arch/powerpc/include/uapi/asm/termbits.h
+++ b/kernel/arch/powerpc/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_TERMBITS_H
 #define _ASM_POWERPC_TERMBITS_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/termios.h b/kernel/arch/powerpc/include/uapi/asm/termios.h
index 6cca5cdfe..5d07fc89b 100644
--- a/kernel/arch/powerpc/include/uapi/asm/termios.h
+++ b/kernel/arch/powerpc/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Liberally adapted from alpha/termios.h.  In particular, the c_cc[]
  * fields have been reordered so that termio & termios share the
diff --git a/kernel/arch/powerpc/include/uapi/asm/tm.h b/kernel/arch/powerpc/include/uapi/asm/tm.h
index 504765981..e1bf0e2fa 100644
--- a/kernel/arch/powerpc/include/uapi/asm/tm.h
+++ b/kernel/arch/powerpc/include/uapi/asm/tm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_TM_H
 #define _ASM_POWERPC_TM_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/types.h b/kernel/arch/powerpc/include/uapi/asm/types.h
index 4b8ab990a..327616fb7 100644
--- a/kernel/arch/powerpc/include/uapi/asm/types.h
+++ b/kernel/arch/powerpc/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * This file is never included by application software unless
  * explicitly requested (e.g., via linux/types.h) in which case the
diff --git a/kernel/arch/powerpc/include/uapi/asm/ucontext.h b/kernel/arch/powerpc/include/uapi/asm/ucontext.h
index d9a4ddf0c..6f14a96d4 100644
--- a/kernel/arch/powerpc/include/uapi/asm/ucontext.h
+++ b/kernel/arch/powerpc/include/uapi/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_POWERPC_UCONTEXT_H
 #define _ASM_POWERPC_UCONTEXT_H
 
diff --git a/kernel/arch/powerpc/include/uapi/asm/unistd.h b/kernel/arch/powerpc/include/uapi/asm/unistd.h
index b85f14228..df8684f31 100644
--- a/kernel/arch/powerpc/include/uapi/asm/unistd.h
+++ b/kernel/arch/powerpc/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * This file contains the system call numbers.
  *
diff --git a/kernel/arch/powerpc/kernel/Makefile b/kernel/arch/powerpc/kernel/Makefile
index 91960f830..6c6cce937 100644
--- a/kernel/arch/powerpc/kernel/Makefile
+++ b/kernel/arch/powerpc/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/powerpc/kernel/align.c b/kernel/arch/powerpc/kernel/align.c
index 43ef25156..3e6c0744c 100644
--- a/kernel/arch/powerpc/kernel/align.c
+++ b/kernel/arch/powerpc/kernel/align.c
@@ -332,7 +332,7 @@ int fix_alignment(struct pt_regs *regs)
 	 * when pasting to a co-processor. Furthermore, paste_last is the
 	 * synchronisation point for preceding copy/paste sequences.
 	 */
-	if ((instr & 0xfc0006fe) == PPC_INST_COPY)
+	if ((instr & 0xfc0006fe) == (PPC_INST_COPY & 0xfc0006fe))
 		return -EIO;
 
 	r = analyse_instr(&op, regs, instr);
diff --git a/kernel/arch/powerpc/kernel/audit.c b/kernel/arch/powerpc/kernel/audit.c
index a4dab7cab..a2dddd7f3 100644
--- a/kernel/arch/powerpc/kernel/audit.c
+++ b/kernel/arch/powerpc/kernel/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/arch/powerpc/kernel/btext.c b/kernel/arch/powerpc/kernel/btext.c
index 3f46ca1c5..6537cba1a 100644
--- a/kernel/arch/powerpc/kernel/btext.c
+++ b/kernel/arch/powerpc/kernel/btext.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Procedures for drawing on the screen early on in the boot process.
  *
diff --git a/kernel/arch/powerpc/kernel/cacheinfo.h b/kernel/arch/powerpc/kernel/cacheinfo.h
index a7b74d36a..955f5e999 100644
--- a/kernel/arch/powerpc/kernel/cacheinfo.h
+++ b/kernel/arch/powerpc/kernel/cacheinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_CACHEINFO_H
 #define _PPC_CACHEINFO_H
 
diff --git a/kernel/arch/powerpc/kernel/compat_audit.c b/kernel/arch/powerpc/kernel/compat_audit.c
index 108ff14e2..55c6ccda0 100644
--- a/kernel/arch/powerpc/kernel/compat_audit.c
+++ b/kernel/arch/powerpc/kernel/compat_audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef __powerpc64__
 #include <asm/unistd.h>
 
diff --git a/kernel/arch/powerpc/kernel/dma-iommu.c b/kernel/arch/powerpc/kernel/dma-iommu.c
index 8f7abf9ba..66f33e7f8 100644
--- a/kernel/arch/powerpc/kernel/dma-iommu.c
+++ b/kernel/arch/powerpc/kernel/dma-iommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation
  *
diff --git a/kernel/arch/powerpc/kernel/exceptions-64s.S b/kernel/arch/powerpc/kernel/exceptions-64s.S
index b82586c53..1c80bd292 100644
--- a/kernel/arch/powerpc/kernel/exceptions-64s.S
+++ b/kernel/arch/powerpc/kernel/exceptions-64s.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains the 64-bit "server" PowerPC variant
  * of the low level exception handling including exception
diff --git a/kernel/arch/powerpc/kernel/fsl_booke_entry_mapping.S b/kernel/arch/powerpc/kernel/fsl_booke_entry_mapping.S
index 83dd0f677..ea065282b 100644
--- a/kernel/arch/powerpc/kernel/fsl_booke_entry_mapping.S
+++ b/kernel/arch/powerpc/kernel/fsl_booke_entry_mapping.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* 1. Find the index of the entry we're executing in */
 	bl	invstr				/* Find our address */
diff --git a/kernel/arch/powerpc/kernel/head_booke.h b/kernel/arch/powerpc/kernel/head_booke.h
index a620203f7..d0862a100 100644
--- a/kernel/arch/powerpc/kernel/head_booke.h
+++ b/kernel/arch/powerpc/kernel/head_booke.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HEAD_BOOKE_H__
 #define __HEAD_BOOKE_H__
 
diff --git a/kernel/arch/powerpc/kernel/iomap.c b/kernel/arch/powerpc/kernel/iomap.c
index a1854d1de..aab456ed2 100644
--- a/kernel/arch/powerpc/kernel/iomap.c
+++ b/kernel/arch/powerpc/kernel/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ppc64 "iomap" interface implementation.
  *
diff --git a/kernel/arch/powerpc/kernel/kprobes.c b/kernel/arch/powerpc/kernel/kprobes.c
index 367494dc6..bebc3007a 100644
--- a/kernel/arch/powerpc/kernel/kprobes.c
+++ b/kernel/arch/powerpc/kernel/kprobes.c
@@ -600,7 +600,12 @@ NOKPROBE_SYMBOL(kprobe_fault_handler);
 
 unsigned long arch_deref_entry_point(void *entry)
 {
-	return ppc_global_function_entry(entry);
+#ifdef PPC64_ELF_ABI_v1
+	if (!kernel_text_address((unsigned long)entry))
+		return ppc_global_function_entry(entry);
+	else
+#endif
+		return (unsigned long)entry;
 }
 NOKPROBE_SYMBOL(arch_deref_entry_point);
 
diff --git a/kernel/arch/powerpc/kernel/legacy_serial.c b/kernel/arch/powerpc/kernel/legacy_serial.c
index 5e5a64a8b..33b34a58f 100644
--- a/kernel/arch/powerpc/kernel/legacy_serial.c
+++ b/kernel/arch/powerpc/kernel/legacy_serial.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/serial.h>
 #include <linux/serial_8250.h>
diff --git a/kernel/arch/powerpc/kernel/prom_parse.c b/kernel/arch/powerpc/kernel/prom_parse.c
index 6295e646f..9cb7f88df 100644
--- a/kernel/arch/powerpc/kernel/prom_parse.c
+++ b/kernel/arch/powerpc/kernel/prom_parse.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef DEBUG
 
 #include <linux/kernel.h>
diff --git a/kernel/arch/powerpc/kernel/rtas-proc.c b/kernel/arch/powerpc/kernel/rtas-proc.c
index df56dfc4b..c8c5f3a55 100644
--- a/kernel/arch/powerpc/kernel/rtas-proc.c
+++ b/kernel/arch/powerpc/kernel/rtas-proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *   Copyright (C) 2000 Tilmann Bitterberg
  *   (tilmann@bitterberg.de)
diff --git a/kernel/arch/powerpc/kernel/rtas-rtc.c b/kernel/arch/powerpc/kernel/rtas-rtc.c
index c57c19358..49600985c 100644
--- a/kernel/arch/powerpc/kernel/rtas-rtc.c
+++ b/kernel/arch/powerpc/kernel/rtas-rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/time.h>
 #include <linux/timer.h>
diff --git a/kernel/arch/powerpc/kernel/smp-tbsync.c b/kernel/arch/powerpc/kernel/smp-tbsync.c
index 7a37ecd3a..21c39355b 100644
--- a/kernel/arch/powerpc/kernel/smp-tbsync.c
+++ b/kernel/arch/powerpc/kernel/smp-tbsync.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Smp timebase synchronization for ppc.
  *
diff --git a/kernel/arch/powerpc/kernel/swsusp_32.S b/kernel/arch/powerpc/kernel/swsusp_32.S
index ba4dee3d2..34b73a262 100644
--- a/kernel/arch/powerpc/kernel/swsusp_32.S
+++ b/kernel/arch/powerpc/kernel/swsusp_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/threads.h>
 #include <asm/processor.h>
 #include <asm/page.h>
diff --git a/kernel/arch/powerpc/kernel/swsusp_booke.S b/kernel/arch/powerpc/kernel/swsusp_booke.S
index 553c1405e..88cfdbd53 100644
--- a/kernel/arch/powerpc/kernel/swsusp_booke.S
+++ b/kernel/arch/powerpc/kernel/swsusp_booke.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Based on swsusp_32.S, modified for FSL BookE by
  * Anton Vorontsov <avorontsov@ru.mvista.com>
diff --git a/kernel/arch/powerpc/kernel/tau_6xx.c b/kernel/arch/powerpc/kernel/tau_6xx.c
index a753b72ef..a3374e8a2 100644
--- a/kernel/arch/powerpc/kernel/tau_6xx.c
+++ b/kernel/arch/powerpc/kernel/tau_6xx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * temp.c	Thermal management for cpu's with Thermal Assist Units
  *
diff --git a/kernel/arch/powerpc/kernel/tm.S b/kernel/arch/powerpc/kernel/tm.S
index c4ba37822..1da12f521 100644
--- a/kernel/arch/powerpc/kernel/tm.S
+++ b/kernel/arch/powerpc/kernel/tm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Transactional memory support routines to reclaim and recheckpoint
  * transactional process state.
diff --git a/kernel/arch/powerpc/kernel/trace/Makefile b/kernel/arch/powerpc/kernel/trace/Makefile
index 729dffc5f..d22d8bafb 100644
--- a/kernel/arch/powerpc/kernel/trace/Makefile
+++ b/kernel/arch/powerpc/kernel/trace/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the powerpc trace subsystem
 #
diff --git a/kernel/arch/powerpc/kernel/trace/ftrace.c b/kernel/arch/powerpc/kernel/trace/ftrace.c
index 32509de6c..4741fe112 100644
--- a/kernel/arch/powerpc/kernel/trace/ftrace.c
+++ b/kernel/arch/powerpc/kernel/trace/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Code for replacing ftrace calls with jumps.
  *
diff --git a/kernel/arch/powerpc/kernel/vdso32/Makefile b/kernel/arch/powerpc/kernel/vdso32/Makefile
index 78a7449bf..b8c434d1d 100644
--- a/kernel/arch/powerpc/kernel/vdso32/Makefile
+++ b/kernel/arch/powerpc/kernel/vdso32/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # List of files in the vdso, has to be asm only for now
 
diff --git a/kernel/arch/powerpc/kernel/vdso32/vdso32.lds.S b/kernel/arch/powerpc/kernel/vdso32/vdso32.lds.S
index e58ee10fa..099a6db14 100644
--- a/kernel/arch/powerpc/kernel/vdso32/vdso32.lds.S
+++ b/kernel/arch/powerpc/kernel/vdso32/vdso32.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is the infamous ld script for the 32 bits vdso
  * library
diff --git a/kernel/arch/powerpc/kernel/vdso32/vdso32_wrapper.S b/kernel/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
index 6ac107ac4..3f5ef035b 100644
--- a/kernel/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
+++ b/kernel/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/page.h>
 
diff --git a/kernel/arch/powerpc/kernel/vdso64/Makefile b/kernel/arch/powerpc/kernel/vdso64/Makefile
index 31107bf5a..69cecb346 100644
--- a/kernel/arch/powerpc/kernel/vdso64/Makefile
+++ b/kernel/arch/powerpc/kernel/vdso64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # List of files in the vdso, has to be asm only for now
 
 obj-vdso64 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o getcpu.o
diff --git a/kernel/arch/powerpc/kernel/vdso64/vdso64.lds.S b/kernel/arch/powerpc/kernel/vdso64/vdso64.lds.S
index 64fb183a4..256fb9720 100644
--- a/kernel/arch/powerpc/kernel/vdso64/vdso64.lds.S
+++ b/kernel/arch/powerpc/kernel/vdso64/vdso64.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is the infamous ld script for the 64 bits vdso
  * library
diff --git a/kernel/arch/powerpc/kernel/vdso64/vdso64_wrapper.S b/kernel/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
index df60fca6a..1d56d81fe 100644
--- a/kernel/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
+++ b/kernel/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/page.h>
 
diff --git a/kernel/arch/powerpc/kernel/vecemu.c b/kernel/arch/powerpc/kernel/vecemu.c
index 2d8f6d8cc..881208588 100644
--- a/kernel/arch/powerpc/kernel/vecemu.c
+++ b/kernel/arch/powerpc/kernel/vecemu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Routines to emulate some Altivec/VMX instructions, specifically
  * those that can trap when given denormalized operands in Java mode.
diff --git a/kernel/arch/powerpc/kernel/vector.S b/kernel/arch/powerpc/kernel/vector.S
index 0c123f340..f314fd475 100644
--- a/kernel/arch/powerpc/kernel/vector.S
+++ b/kernel/arch/powerpc/kernel/vector.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/reg.h>
diff --git a/kernel/arch/powerpc/kernel/vmlinux.lds.S b/kernel/arch/powerpc/kernel/vmlinux.lds.S
index 882628fa6..0494e1566 100644
--- a/kernel/arch/powerpc/kernel/vmlinux.lds.S
+++ b/kernel/arch/powerpc/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_PPC64
 #define PROVIDE32(x)	PROVIDE(__unused__##x)
 #else
diff --git a/kernel/arch/powerpc/kernel/watchdog.c b/kernel/arch/powerpc/kernel/watchdog.c
index c702a8981..57190f384 100644
--- a/kernel/arch/powerpc/kernel/watchdog.c
+++ b/kernel/arch/powerpc/kernel/watchdog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Watchdog support on powerpc systems.
  *
diff --git a/kernel/arch/powerpc/kvm/Kconfig b/kernel/arch/powerpc/kvm/Kconfig
index 0c52cb5d4..b12b8eb39 100644
--- a/kernel/arch/powerpc/kvm/Kconfig
+++ b/kernel/arch/powerpc/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/powerpc/kvm/Makefile b/kernel/arch/powerpc/kvm/Makefile
index 381a6ec0f..85ba80de7 100644
--- a/kernel/arch/powerpc/kvm/Makefile
+++ b/kernel/arch/powerpc/kvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Kernel-based Virtual Machine module
 #
diff --git a/kernel/arch/powerpc/kvm/book3s_hv_rm_xive.c b/kernel/arch/powerpc/kvm/book3s_hv_rm_xive.c
index 5b81a807d..174d75e47 100644
--- a/kernel/arch/powerpc/kvm/book3s_hv_rm_xive.c
+++ b/kernel/arch/powerpc/kvm/book3s_hv_rm_xive.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/kvm_host.h>
 #include <linux/err.h>
diff --git a/kernel/arch/powerpc/kvm/irq.h b/kernel/arch/powerpc/kvm/irq.h
index 3f1be85a8..e6463f866 100644
--- a/kernel/arch/powerpc/kvm/irq.h
+++ b/kernel/arch/powerpc/kvm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IRQ_H
 #define __IRQ_H
 
diff --git a/kernel/arch/powerpc/kvm/trace.h b/kernel/arch/powerpc/kvm/trace.h
index 2e0e67ef3..491b0f715 100644
--- a/kernel/arch/powerpc/kvm/trace.h
+++ b/kernel/arch/powerpc/kvm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_H
 
diff --git a/kernel/arch/powerpc/kvm/trace_book3s.h b/kernel/arch/powerpc/kvm/trace_book3s.h
index f647ce0f4..f3b23759e 100644
--- a/kernel/arch/powerpc/kvm/trace_book3s.h
+++ b/kernel/arch/powerpc/kvm/trace_book3s.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_BOOK3S_H)
 #define _TRACE_KVM_BOOK3S_H
 
diff --git a/kernel/arch/powerpc/kvm/trace_booke.h b/kernel/arch/powerpc/kvm/trace_booke.h
index 7ec534d1d..ac640e81f 100644
--- a/kernel/arch/powerpc/kvm/trace_booke.h
+++ b/kernel/arch/powerpc/kvm/trace_booke.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_BOOKE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_BOOKE_H
 
diff --git a/kernel/arch/powerpc/kvm/trace_hv.h b/kernel/arch/powerpc/kvm/trace_hv.h
index ebc6dd449..bcfe8a987 100644
--- a/kernel/arch/powerpc/kvm/trace_hv.h
+++ b/kernel/arch/powerpc/kvm/trace_hv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_HV_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_HV_H
 
diff --git a/kernel/arch/powerpc/kvm/trace_pr.h b/kernel/arch/powerpc/kvm/trace_pr.h
index d44f32418..85785a370 100644
--- a/kernel/arch/powerpc/kvm/trace_pr.h
+++ b/kernel/arch/powerpc/kvm/trace_pr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #if !defined(_TRACE_KVM_PR_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_PR_H
diff --git a/kernel/arch/powerpc/lib/Makefile b/kernel/arch/powerpc/lib/Makefile
index 50d5bf954..c66c3626a 100644
--- a/kernel/arch/powerpc/lib/Makefile
+++ b/kernel/arch/powerpc/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ppc-specific library files..
 #
diff --git a/kernel/arch/powerpc/lib/alloc.c b/kernel/arch/powerpc/lib/alloc.c
index a58abe4af..06796dec0 100644
--- a/kernel/arch/powerpc/lib/alloc.c
+++ b/kernel/arch/powerpc/lib/alloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/powerpc/lib/xor_vmx.h b/kernel/arch/powerpc/lib/xor_vmx.h
index 474670845..5c2b0839b 100644
--- a/kernel/arch/powerpc/lib/xor_vmx.h
+++ b/kernel/arch/powerpc/lib/xor_vmx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Simple interface to link xor_vmx.c and xor_vmx_glue.c
  *
diff --git a/kernel/arch/powerpc/math-emu/Makefile b/kernel/arch/powerpc/math-emu/Makefile
index 1b46ab4f6..494df26c5 100644
--- a/kernel/arch/powerpc/math-emu/Makefile
+++ b/kernel/arch/powerpc/math-emu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 math-emu-common-objs = math.o fre.o fsqrt.o fsqrts.o frsqrtes.o mtfsf.o mtfsfi.o
 obj-$(CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED) += $(math-emu-common-objs)
 obj-$(CONFIG_MATH_EMULATION_FULL) += $(math-emu-common-objs) fabs.o fadd.o \
diff --git a/kernel/arch/powerpc/math-emu/fabs.c b/kernel/arch/powerpc/math-emu/fabs.c
index a5e7ad138..3b62fd70b 100644
--- a/kernel/arch/powerpc/math-emu/fabs.c
+++ b/kernel/arch/powerpc/math-emu/fabs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fadd.c b/kernel/arch/powerpc/math-emu/fadd.c
index 29de37e0e..727e49ad5 100644
--- a/kernel/arch/powerpc/math-emu/fadd.c
+++ b/kernel/arch/powerpc/math-emu/fadd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fadds.c b/kernel/arch/powerpc/math-emu/fadds.c
index 7093c5b58..45254be05 100644
--- a/kernel/arch/powerpc/math-emu/fadds.c
+++ b/kernel/arch/powerpc/math-emu/fadds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fcmpo.c b/kernel/arch/powerpc/math-emu/fcmpo.c
index 5d6444672..f437d0896 100644
--- a/kernel/arch/powerpc/math-emu/fcmpo.c
+++ b/kernel/arch/powerpc/math-emu/fcmpo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fcmpu.c b/kernel/arch/powerpc/math-emu/fcmpu.c
index 0f9bf4864..65631fa5d 100644
--- a/kernel/arch/powerpc/math-emu/fcmpu.c
+++ b/kernel/arch/powerpc/math-emu/fcmpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fctiw.c b/kernel/arch/powerpc/math-emu/fctiw.c
index 716d6da7f..ebb0f11e7 100644
--- a/kernel/arch/powerpc/math-emu/fctiw.c
+++ b/kernel/arch/powerpc/math-emu/fctiw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fctiwz.c b/kernel/arch/powerpc/math-emu/fctiwz.c
index 7212fa7cf..426271c4f 100644
--- a/kernel/arch/powerpc/math-emu/fctiwz.c
+++ b/kernel/arch/powerpc/math-emu/fctiwz.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fdiv.c b/kernel/arch/powerpc/math-emu/fdiv.c
index e1e452069..6e64ece2d 100644
--- a/kernel/arch/powerpc/math-emu/fdiv.c
+++ b/kernel/arch/powerpc/math-emu/fdiv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fdivs.c b/kernel/arch/powerpc/math-emu/fdivs.c
index 5511e2d1c..f9f7adf46 100644
--- a/kernel/arch/powerpc/math-emu/fdivs.c
+++ b/kernel/arch/powerpc/math-emu/fdivs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmadd.c b/kernel/arch/powerpc/math-emu/fmadd.c
index 2b6fae0bc..e8458aed5 100644
--- a/kernel/arch/powerpc/math-emu/fmadd.c
+++ b/kernel/arch/powerpc/math-emu/fmadd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmadds.c b/kernel/arch/powerpc/math-emu/fmadds.c
index aff35f24a..a6d3f9842 100644
--- a/kernel/arch/powerpc/math-emu/fmadds.c
+++ b/kernel/arch/powerpc/math-emu/fmadds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmr.c b/kernel/arch/powerpc/math-emu/fmr.c
index f6347911f..48c643742 100644
--- a/kernel/arch/powerpc/math-emu/fmr.c
+++ b/kernel/arch/powerpc/math-emu/fmr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmsub.c b/kernel/arch/powerpc/math-emu/fmsub.c
index 1fb26cebe..605cda49e 100644
--- a/kernel/arch/powerpc/math-emu/fmsub.c
+++ b/kernel/arch/powerpc/math-emu/fmsub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmsubs.c b/kernel/arch/powerpc/math-emu/fmsubs.c
index f73965453..f26ec0acf 100644
--- a/kernel/arch/powerpc/math-emu/fmsubs.c
+++ b/kernel/arch/powerpc/math-emu/fmsubs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmul.c b/kernel/arch/powerpc/math-emu/fmul.c
index ffd31b549..d114f7acd 100644
--- a/kernel/arch/powerpc/math-emu/fmul.c
+++ b/kernel/arch/powerpc/math-emu/fmul.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fmuls.c b/kernel/arch/powerpc/math-emu/fmuls.c
index 21aee431c..aaeba0acb 100644
--- a/kernel/arch/powerpc/math-emu/fmuls.c
+++ b/kernel/arch/powerpc/math-emu/fmuls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fnabs.c b/kernel/arch/powerpc/math-emu/fnabs.c
index af877a53d..6c439e6c2 100644
--- a/kernel/arch/powerpc/math-emu/fnabs.c
+++ b/kernel/arch/powerpc/math-emu/fnabs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fneg.c b/kernel/arch/powerpc/math-emu/fneg.c
index 8417d1747..791e724f7 100644
--- a/kernel/arch/powerpc/math-emu/fneg.c
+++ b/kernel/arch/powerpc/math-emu/fneg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fnmadd.c b/kernel/arch/powerpc/math-emu/fnmadd.c
index 6316ef0e0..02a7099b2 100644
--- a/kernel/arch/powerpc/math-emu/fnmadd.c
+++ b/kernel/arch/powerpc/math-emu/fnmadd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fnmadds.c b/kernel/arch/powerpc/math-emu/fnmadds.c
index 9ffe037df..ce42a7a44 100644
--- a/kernel/arch/powerpc/math-emu/fnmadds.c
+++ b/kernel/arch/powerpc/math-emu/fnmadds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fnmsub.c b/kernel/arch/powerpc/math-emu/fnmsub.c
index f97a9cfb5..eade699c5 100644
--- a/kernel/arch/powerpc/math-emu/fnmsub.c
+++ b/kernel/arch/powerpc/math-emu/fnmsub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fnmsubs.c b/kernel/arch/powerpc/math-emu/fnmsubs.c
index 7fa1217bd..4e1f6c2b7 100644
--- a/kernel/arch/powerpc/math-emu/fnmsubs.c
+++ b/kernel/arch/powerpc/math-emu/fnmsubs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fre.c b/kernel/arch/powerpc/math-emu/fre.c
index b621a790a..584b16f53 100644
--- a/kernel/arch/powerpc/math-emu/fre.c
+++ b/kernel/arch/powerpc/math-emu/fre.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fres.c b/kernel/arch/powerpc/math-emu/fres.c
index 211c30d01..f7d5654ce 100644
--- a/kernel/arch/powerpc/math-emu/fres.c
+++ b/kernel/arch/powerpc/math-emu/fres.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/frsp.c b/kernel/arch/powerpc/math-emu/frsp.c
index 3e3bc73e2..cb33e3d9b 100644
--- a/kernel/arch/powerpc/math-emu/frsp.c
+++ b/kernel/arch/powerpc/math-emu/frsp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/frsqrte.c b/kernel/arch/powerpc/math-emu/frsqrte.c
index 7c2ce4375..72955b27c 100644
--- a/kernel/arch/powerpc/math-emu/frsqrte.c
+++ b/kernel/arch/powerpc/math-emu/frsqrte.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/frsqrtes.c b/kernel/arch/powerpc/math-emu/frsqrtes.c
index 269951a8c..a036f7b71 100644
--- a/kernel/arch/powerpc/math-emu/frsqrtes.c
+++ b/kernel/arch/powerpc/math-emu/frsqrtes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fsel.c b/kernel/arch/powerpc/math-emu/fsel.c
index 32b62c6c7..b0d15e15a 100644
--- a/kernel/arch/powerpc/math-emu/fsel.c
+++ b/kernel/arch/powerpc/math-emu/fsel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fsqrt.c b/kernel/arch/powerpc/math-emu/fsqrt.c
index 0e2a34b61..054385903 100644
--- a/kernel/arch/powerpc/math-emu/fsqrt.c
+++ b/kernel/arch/powerpc/math-emu/fsqrt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fsqrts.c b/kernel/arch/powerpc/math-emu/fsqrts.c
index 420cf19b5..1624f97c6 100644
--- a/kernel/arch/powerpc/math-emu/fsqrts.c
+++ b/kernel/arch/powerpc/math-emu/fsqrts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fsub.c b/kernel/arch/powerpc/math-emu/fsub.c
index feedd705c..47a8f847b 100644
--- a/kernel/arch/powerpc/math-emu/fsub.c
+++ b/kernel/arch/powerpc/math-emu/fsub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/fsubs.c b/kernel/arch/powerpc/math-emu/fsubs.c
index 741905140..fa1b3b18c 100644
--- a/kernel/arch/powerpc/math-emu/fsubs.c
+++ b/kernel/arch/powerpc/math-emu/fsubs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/lfd.c b/kernel/arch/powerpc/math-emu/lfd.c
index d998a5074..3a6b03d99 100644
--- a/kernel/arch/powerpc/math-emu/lfd.c
+++ b/kernel/arch/powerpc/math-emu/lfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/lfs.c b/kernel/arch/powerpc/math-emu/lfs.c
index 1ee10b83d..7fd3d0854 100644
--- a/kernel/arch/powerpc/math-emu/lfs.c
+++ b/kernel/arch/powerpc/math-emu/lfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/math.c b/kernel/arch/powerpc/math-emu/math.c
index 76ee2e5db..30b4b69c6 100644
--- a/kernel/arch/powerpc/math-emu/math.c
+++ b/kernel/arch/powerpc/math-emu/math.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1999  Eddie C. Dost  (ecd@atecom.com)
  */
diff --git a/kernel/arch/powerpc/math-emu/mcrfs.c b/kernel/arch/powerpc/math-emu/mcrfs.c
index 8e8e72397..9c4fdaace 100644
--- a/kernel/arch/powerpc/math-emu/mcrfs.c
+++ b/kernel/arch/powerpc/math-emu/mcrfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/mffs.c b/kernel/arch/powerpc/math-emu/mffs.c
index e00fdc22a..d42f1278e 100644
--- a/kernel/arch/powerpc/math-emu/mffs.c
+++ b/kernel/arch/powerpc/math-emu/mffs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/mtfsb0.c b/kernel/arch/powerpc/math-emu/mtfsb0.c
index 5ed3e7d50..5753170b5 100644
--- a/kernel/arch/powerpc/math-emu/mtfsb0.c
+++ b/kernel/arch/powerpc/math-emu/mtfsb0.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/mtfsb1.c b/kernel/arch/powerpc/math-emu/mtfsb1.c
index 602aa16ed..8162c3bfd 100644
--- a/kernel/arch/powerpc/math-emu/mtfsb1.c
+++ b/kernel/arch/powerpc/math-emu/mtfsb1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/mtfsf.c b/kernel/arch/powerpc/math-emu/mtfsf.c
index b0d5593ad..7ae990f6b 100644
--- a/kernel/arch/powerpc/math-emu/mtfsf.c
+++ b/kernel/arch/powerpc/math-emu/mtfsf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/mtfsfi.c b/kernel/arch/powerpc/math-emu/mtfsfi.c
index 5df30541a..45f1edbda 100644
--- a/kernel/arch/powerpc/math-emu/mtfsfi.c
+++ b/kernel/arch/powerpc/math-emu/mtfsfi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/stfd.c b/kernel/arch/powerpc/math-emu/stfd.c
index 6baeaec13..463d2f083 100644
--- a/kernel/arch/powerpc/math-emu/stfd.c
+++ b/kernel/arch/powerpc/math-emu/stfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/stfiwx.c b/kernel/arch/powerpc/math-emu/stfiwx.c
index 9da7c5d1a..24ae9622f 100644
--- a/kernel/arch/powerpc/math-emu/stfiwx.c
+++ b/kernel/arch/powerpc/math-emu/stfiwx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/stfs.c b/kernel/arch/powerpc/math-emu/stfs.c
index 62bd25264..ddf9bbdb5 100644
--- a/kernel/arch/powerpc/math-emu/stfs.c
+++ b/kernel/arch/powerpc/math-emu/stfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/powerpc/math-emu/udivmodti4.c b/kernel/arch/powerpc/math-emu/udivmodti4.c
index 6172044ab..1e52633dc 100644
--- a/kernel/arch/powerpc/math-emu/udivmodti4.c
+++ b/kernel/arch/powerpc/math-emu/udivmodti4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny.  */
 
 #include <math-emu/soft-fp.h>
diff --git a/kernel/arch/powerpc/mm/Makefile b/kernel/arch/powerpc/mm/Makefile
index fb844d2f2..a0c327d54 100644
--- a/kernel/arch/powerpc/mm/Makefile
+++ b/kernel/arch/powerpc/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux ppc-specific parts of the memory manager.
 #
diff --git a/kernel/arch/powerpc/mm/highmem.c b/kernel/arch/powerpc/mm/highmem.c
index e292c8a60..668e87d03 100644
--- a/kernel/arch/powerpc/mm/highmem.c
+++ b/kernel/arch/powerpc/mm/highmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * highmem.c: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/powerpc/mm/hugetlbpage-book3e.c b/kernel/arch/powerpc/mm/hugetlbpage-book3e.c
index bfe4e8526..f84ec46cd 100644
--- a/kernel/arch/powerpc/mm/hugetlbpage-book3e.c
+++ b/kernel/arch/powerpc/mm/hugetlbpage-book3e.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PPC Huge TLB Page Support for Book3E MMU
  *
diff --git a/kernel/arch/powerpc/mm/hugetlbpage-hash64.c b/kernel/arch/powerpc/mm/hugetlbpage-hash64.c
index a84bb4449..0c2a91df3 100644
--- a/kernel/arch/powerpc/mm/hugetlbpage-hash64.c
+++ b/kernel/arch/powerpc/mm/hugetlbpage-hash64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PPC64 Huge TLB Page Support for hash based MMUs (POWER4 and later)
  *
diff --git a/kernel/arch/powerpc/mm/hugetlbpage-radix.c b/kernel/arch/powerpc/mm/hugetlbpage-radix.c
index a12e86395..558e9d389 100644
--- a/kernel/arch/powerpc/mm/hugetlbpage-radix.c
+++ b/kernel/arch/powerpc/mm/hugetlbpage-radix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
 #include <asm/pgtable.h>
diff --git a/kernel/arch/powerpc/mm/tlb-radix.c b/kernel/arch/powerpc/mm/tlb-radix.c
index b3e849c48..d30402864 100644
--- a/kernel/arch/powerpc/mm/tlb-radix.c
+++ b/kernel/arch/powerpc/mm/tlb-radix.c
@@ -360,12 +360,14 @@ void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr)
 
 
 	pid = mm ? mm->context.id : 0;
+	preempt_disable();
 	if (unlikely(pid == MMU_NO_CONTEXT))
 		goto no_context;
 
 	/* 4k page size, just blow the world */
 	if (PAGE_SIZE == 0x1000) {
 		radix__flush_all_mm(mm);
+		preempt_enable();
 		return;
 	}
 
diff --git a/kernel/arch/powerpc/mm/vphn.c b/kernel/arch/powerpc/mm/vphn.c
index 5f8ef50e5..f83044faa 100644
--- a/kernel/arch/powerpc/mm/vphn.c
+++ b/kernel/arch/powerpc/mm/vphn.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/byteorder.h>
 #include "vphn.h"
 
diff --git a/kernel/arch/powerpc/mm/vphn.h b/kernel/arch/powerpc/mm/vphn.h
index fe8b7805b..f9ffdb394 100644
--- a/kernel/arch/powerpc/mm/vphn.h
+++ b/kernel/arch/powerpc/mm/vphn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_POWERPC_MM_VPHN_H_
 #define _ARCH_POWERPC_MM_VPHN_H_
 
diff --git a/kernel/arch/powerpc/net/Makefile b/kernel/arch/powerpc/net/Makefile
index c1ff16a6e..02d369ca6 100644
--- a/kernel/arch/powerpc/net/Makefile
+++ b/kernel/arch/powerpc/net/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific network modules
 #
diff --git a/kernel/arch/powerpc/oprofile/Makefile b/kernel/arch/powerpc/oprofile/Makefile
index cedbbeced..7a7834c39 100644
--- a/kernel/arch/powerpc/oprofile/Makefile
+++ b/kernel/arch/powerpc/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 ccflags-$(CONFIG_PPC64)	:= $(NO_MINIMAL_TOC)
diff --git a/kernel/arch/powerpc/perf/Makefile b/kernel/arch/powerpc/perf/Makefile
index 3f3a5ce66..225c9c86d 100644
--- a/kernel/arch/powerpc/perf/Makefile
+++ b/kernel/arch/powerpc/perf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 obj-$(CONFIG_PERF_EVENTS)	+= callchain.o perf_regs.o
diff --git a/kernel/arch/powerpc/perf/hv-24x7-catalog.h b/kernel/arch/powerpc/perf/hv-24x7-catalog.h
index 69e2e1faf..5fab5a397 100644
--- a/kernel/arch/powerpc/perf/hv-24x7-catalog.h
+++ b/kernel/arch/powerpc/perf/hv-24x7-catalog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_POWERPC_PERF_HV_24X7_CATALOG_H_
 #define LINUX_POWERPC_PERF_HV_24X7_CATALOG_H_
 
diff --git a/kernel/arch/powerpc/perf/hv-24x7-domains.h b/kernel/arch/powerpc/perf/hv-24x7-domains.h
index 49c1efd50..6f91f62e0 100644
--- a/kernel/arch/powerpc/perf/hv-24x7-domains.h
+++ b/kernel/arch/powerpc/perf/hv-24x7-domains.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  * DOMAIN(name, num, index_kind, is_physical)
diff --git a/kernel/arch/powerpc/perf/hv-24x7.h b/kernel/arch/powerpc/perf/hv-24x7.h
index 5092c4a22..ae4ae4813 100644
--- a/kernel/arch/powerpc/perf/hv-24x7.h
+++ b/kernel/arch/powerpc/perf/hv-24x7.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_POWERPC_PERF_HV_24X7_H_
 #define LINUX_POWERPC_PERF_HV_24X7_H_
 
diff --git a/kernel/arch/powerpc/perf/hv-common.c b/kernel/arch/powerpc/perf/hv-common.c
index 7dce8f109..0370518ed 100644
--- a/kernel/arch/powerpc/perf/hv-common.c
+++ b/kernel/arch/powerpc/perf/hv-common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/io.h>
 #include <asm/hvcall.h>
 
diff --git a/kernel/arch/powerpc/perf/hv-common.h b/kernel/arch/powerpc/perf/hv-common.h
index 349aaba4d..2cce17bc3 100644
--- a/kernel/arch/powerpc/perf/hv-common.h
+++ b/kernel/arch/powerpc/perf/hv-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_POWERPC_PERF_HV_COMMON_H_
 #define LINUX_POWERPC_PERF_HV_COMMON_H_
 
diff --git a/kernel/arch/powerpc/perf/hv-gpci-requests.h b/kernel/arch/powerpc/perf/hv-gpci-requests.h
index acd17648c..e608f9db1 100644
--- a/kernel/arch/powerpc/perf/hv-gpci-requests.h
+++ b/kernel/arch/powerpc/perf/hv-gpci-requests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include "req-gen/_begin.h"
 
diff --git a/kernel/arch/powerpc/perf/hv-gpci.h b/kernel/arch/powerpc/perf/hv-gpci.h
index 86ede8275..a3053eda5 100644
--- a/kernel/arch/powerpc/perf/hv-gpci.h
+++ b/kernel/arch/powerpc/perf/hv-gpci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_POWERPC_PERF_HV_GPCI_H_
 #define LINUX_POWERPC_PERF_HV_GPCI_H_
 
diff --git a/kernel/arch/powerpc/perf/imc-pmu.c b/kernel/arch/powerpc/perf/imc-pmu.c
index 881262458..36344117c 100644
--- a/kernel/arch/powerpc/perf/imc-pmu.c
+++ b/kernel/arch/powerpc/perf/imc-pmu.c
@@ -607,6 +607,20 @@ static int ppc_core_imc_cpu_offline(unsigned int cpu)
 	if (!cpumask_test_and_clear_cpu(cpu, &core_imc_cpumask))
 		return 0;
 
+	/*
+	 * Check whether core_imc is registered. We could end up here
+	 * if the cpuhotplug callback registration fails. i.e, callback
+	 * invokes the offline path for all sucessfully registered cpus.
+	 * At this stage, core_imc pmu will not be registered and we
+	 * should return here.
+	 *
+	 * We return with a zero since this is not an offline failure.
+	 * And cpuhp_setup_state() returns the actual failure reason
+	 * to the caller, which inturn will call the cleanup routine.
+	 */
+	if (!core_imc_pmu->pmu.event_init)
+		return 0;
+
 	/* Find any online cpu in that core except the current "cpu" */
 	ncpu = cpumask_any_but(cpu_sibling_mask(cpu), cpu);
 
@@ -1104,7 +1118,7 @@ static int init_nest_pmu_ref(void)
 
 static void cleanup_all_core_imc_memory(void)
 {
-	int i, nr_cores = num_present_cpus() / threads_per_core;
+	int i, nr_cores = DIV_ROUND_UP(num_present_cpus(), threads_per_core);
 	struct imc_mem_info *ptr = core_imc_pmu->mem_info;
 	int size = core_imc_pmu->counter_mem_size;
 
@@ -1212,7 +1226,7 @@ static int imc_mem_init(struct imc_pmu *pmu_ptr, struct device_node *parent,
 		if (!pmu_ptr->pmu.name)
 			return -ENOMEM;
 
-		nr_cores = num_present_cpus() / threads_per_core;
+		nr_cores = DIV_ROUND_UP(num_present_cpus(), threads_per_core);
 		pmu_ptr->mem_info = kcalloc(nr_cores, sizeof(struct imc_mem_info),
 								GFP_KERNEL);
 
diff --git a/kernel/arch/powerpc/perf/req-gen/_begin.h b/kernel/arch/powerpc/perf/req-gen/_begin.h
index acfb17a55..549f8782c 100644
--- a/kernel/arch/powerpc/perf/req-gen/_begin.h
+++ b/kernel/arch/powerpc/perf/req-gen/_begin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Include paths to be used in interface defining headers */
 #ifndef POWERPC_PERF_REQ_GEN_H_
 #define POWERPC_PERF_REQ_GEN_H_
diff --git a/kernel/arch/powerpc/perf/req-gen/_clear.h b/kernel/arch/powerpc/perf/req-gen/_clear.h
index 422974f89..67c385915 100644
--- a/kernel/arch/powerpc/perf/req-gen/_clear.h
+++ b/kernel/arch/powerpc/perf/req-gen/_clear.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #undef __field_
 #undef __count_
diff --git a/kernel/arch/powerpc/perf/req-gen/_request-begin.h b/kernel/arch/powerpc/perf/req-gen/_request-begin.h
index f6d98642c..7c74c2ab4 100644
--- a/kernel/arch/powerpc/perf/req-gen/_request-begin.h
+++ b/kernel/arch/powerpc/perf/req-gen/_request-begin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #define REQUEST(r_contents) \
 	REQUEST_(REQUEST_NAME, REQUEST_NUM, REQUEST_IDX_KIND, I(r_contents))
diff --git a/kernel/arch/powerpc/perf/req-gen/_request-end.h b/kernel/arch/powerpc/perf/req-gen/_request-end.h
index 5573be6c3..7d9f4046c 100644
--- a/kernel/arch/powerpc/perf/req-gen/_request-end.h
+++ b/kernel/arch/powerpc/perf/req-gen/_request-end.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef REQUEST
 #undef __field
 #undef __array
diff --git a/kernel/arch/powerpc/perf/req-gen/perf.h b/kernel/arch/powerpc/perf/req-gen/perf.h
index 1b1224693..871a9a176 100644
--- a/kernel/arch/powerpc/perf/req-gen/perf.h
+++ b/kernel/arch/powerpc/perf/req-gen/perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_POWERPC_PERF_REQ_GEN_PERF_H_
 #define LINUX_POWERPC_PERF_REQ_GEN_PERF_H_
 
diff --git a/kernel/arch/powerpc/platforms/40x/Kconfig b/kernel/arch/powerpc/platforms/40x/Kconfig
index abc24501c..60254a321 100644
--- a/kernel/arch/powerpc/platforms/40x/Kconfig
+++ b/kernel/arch/powerpc/platforms/40x/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ACADIA
 	bool "Acadia"
 	depends on 40x
diff --git a/kernel/arch/powerpc/platforms/44x/44x.h b/kernel/arch/powerpc/platforms/44x/44x.h
index 63f703ecd..0e912a6a0 100644
--- a/kernel/arch/powerpc/platforms/44x/44x.h
+++ b/kernel/arch/powerpc/platforms/44x/44x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __POWERPC_PLATFORMS_44X_44X_H
 #define __POWERPC_PLATFORMS_44X_44X_H
 
diff --git a/kernel/arch/powerpc/platforms/44x/Kconfig b/kernel/arch/powerpc/platforms/44x/Kconfig
index 01cb109eb..a6011422b 100644
--- a/kernel/arch/powerpc/platforms/44x/Kconfig
+++ b/kernel/arch/powerpc/platforms/44x/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_47x
 	bool "Support for 47x variant"
 	depends on 44x
diff --git a/kernel/arch/powerpc/platforms/44x/Makefile b/kernel/arch/powerpc/platforms/44x/Makefile
index 2c5651992..1b78c6af8 100644
--- a/kernel/arch/powerpc/platforms/44x/Makefile
+++ b/kernel/arch/powerpc/platforms/44x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y	+= misc_44x.o machine_check.o
 ifneq ($(CONFIG_PPC4xx_CPM),y)
 obj-y	+= idle.o
diff --git a/kernel/arch/powerpc/platforms/44x/virtex_ml510.c b/kernel/arch/powerpc/platforms/44x/virtex_ml510.c
index 1fdb87486..349f218b3 100644
--- a/kernel/arch/powerpc/platforms/44x/virtex_ml510.c
+++ b/kernel/arch/powerpc/platforms/44x/virtex_ml510.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/i8259.h>
 #include <linux/pci.h>
 #include "44x.h"
diff --git a/kernel/arch/powerpc/platforms/512x/Kconfig b/kernel/arch/powerpc/platforms/512x/Kconfig
index bf7ae5cbd..b59eab6cb 100644
--- a/kernel/arch/powerpc/platforms/512x/Kconfig
+++ b/kernel/arch/powerpc/platforms/512x/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_MPC512x
 	bool "512x-based boards"
 	depends on 6xx
diff --git a/kernel/arch/powerpc/platforms/512x/Makefile b/kernel/arch/powerpc/platforms/512x/Makefile
index f47d42295..2daf22ee2 100644
--- a/kernel/arch/powerpc/platforms/512x/Makefile
+++ b/kernel/arch/powerpc/platforms/512x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Freescale PowerPC 512x linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/52xx/Kconfig b/kernel/arch/powerpc/platforms/52xx/Kconfig
index e4c745981..55a587070 100644
--- a/kernel/arch/powerpc/platforms/52xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/52xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_MPC52xx
 	bool "52xx-based boards"
 	depends on 6xx
diff --git a/kernel/arch/powerpc/platforms/52xx/Makefile b/kernel/arch/powerpc/platforms/52xx/Makefile
index 4e6248679..ff2f86fe5 100644
--- a/kernel/arch/powerpc/platforms/52xx/Makefile
+++ b/kernel/arch/powerpc/platforms/52xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for 52xx based boards
 #
diff --git a/kernel/arch/powerpc/platforms/52xx/lite5200_pm.c b/kernel/arch/powerpc/platforms/52xx/lite5200_pm.c
index 870b70f5d..e7da22d1d 100644
--- a/kernel/arch/powerpc/platforms/52xx/lite5200_pm.c
+++ b/kernel/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/suspend.h>
 #include <asm/io.h>
diff --git a/kernel/arch/powerpc/platforms/52xx/lite5200_sleep.S b/kernel/arch/powerpc/platforms/52xx/lite5200_sleep.S
index 08ab6fefc..3a9969c42 100644
--- a/kernel/arch/powerpc/platforms/52xx/lite5200_sleep.S
+++ b/kernel/arch/powerpc/platforms/52xx/lite5200_sleep.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/reg.h>
 #include <asm/ppc_asm.h>
 #include <asm/processor.h>
diff --git a/kernel/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/kernel/arch/powerpc/platforms/52xx/mpc52xx_pm.c
index 8310e8b5b..31d351567 100644
--- a/kernel/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+++ b/kernel/arch/powerpc/platforms/52xx/mpc52xx_pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/suspend.h>
 #include <linux/io.h>
diff --git a/kernel/arch/powerpc/platforms/52xx/mpc52xx_sleep.S b/kernel/arch/powerpc/platforms/52xx/mpc52xx_sleep.S
index 4dc170b0a..a66eb311b 100644
--- a/kernel/arch/powerpc/platforms/52xx/mpc52xx_sleep.S
+++ b/kernel/arch/powerpc/platforms/52xx/mpc52xx_sleep.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/reg.h>
 #include <asm/ppc_asm.h>
 #include <asm/processor.h>
diff --git a/kernel/arch/powerpc/platforms/82xx/Kconfig b/kernel/arch/powerpc/platforms/82xx/Kconfig
index 994d1a959..6e0409936 100644
--- a/kernel/arch/powerpc/platforms/82xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/82xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig PPC_82xx
 	bool "82xx-based boards (PQ II)"
 	depends on 6xx
diff --git a/kernel/arch/powerpc/platforms/82xx/Makefile b/kernel/arch/powerpc/platforms/82xx/Makefile
index 455fe21e3..8d713c601 100644
--- a/kernel/arch/powerpc/platforms/82xx/Makefile
+++ b/kernel/arch/powerpc/platforms/82xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PowerPC 82xx linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/82xx/pq2.h b/kernel/arch/powerpc/platforms/82xx/pq2.h
index 3080ce344..902ef0bd4 100644
--- a/kernel/arch/powerpc/platforms/82xx/pq2.h
+++ b/kernel/arch/powerpc/platforms/82xx/pq2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PQ2_H
 #define _PQ2_H
 
diff --git a/kernel/arch/powerpc/platforms/83xx/Kconfig b/kernel/arch/powerpc/platforms/83xx/Kconfig
index 4ef7f1cd0..7e38b7b71 100644
--- a/kernel/arch/powerpc/platforms/83xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/83xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig PPC_83xx
 	bool "83xx-based boards"
 	depends on 6xx
diff --git a/kernel/arch/powerpc/platforms/83xx/Makefile b/kernel/arch/powerpc/platforms/83xx/Makefile
index ed95bfcbc..bb4720897 100644
--- a/kernel/arch/powerpc/platforms/83xx/Makefile
+++ b/kernel/arch/powerpc/platforms/83xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PowerPC 83xx linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/83xx/mpc83xx.h b/kernel/arch/powerpc/platforms/83xx/mpc83xx.h
index 636eb9d04..459145623 100644
--- a/kernel/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/kernel/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MPC83XX_H__
 #define __MPC83XX_H__
 
diff --git a/kernel/arch/powerpc/platforms/85xx/Kconfig b/kernel/arch/powerpc/platforms/85xx/Kconfig
index 47b389dc4..68920d42b 100644
--- a/kernel/arch/powerpc/platforms/85xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/85xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig FSL_SOC_BOOKE
 	bool "Freescale Book-E Machine Type"
 	depends on PPC_85xx || PPC_BOOK3E
diff --git a/kernel/arch/powerpc/platforms/85xx/Makefile b/kernel/arch/powerpc/platforms/85xx/Makefile
index fe19dad56..d1dd0dca5 100644
--- a/kernel/arch/powerpc/platforms/85xx/Makefile
+++ b/kernel/arch/powerpc/platforms/85xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PowerPC 85xx linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/85xx/mpc85xx.h b/kernel/arch/powerpc/platforms/85xx/mpc85xx.h
index 39056f6be..fa23f9b05 100644
--- a/kernel/arch/powerpc/platforms/85xx/mpc85xx.h
+++ b/kernel/arch/powerpc/platforms/85xx/mpc85xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MPC85xx_H
 #define MPC85xx_H
 extern int mpc85xx_common_publish_devices(void);
diff --git a/kernel/arch/powerpc/platforms/85xx/smp.h b/kernel/arch/powerpc/platforms/85xx/smp.h
index 0b20ae315..3936ff6df 100644
--- a/kernel/arch/powerpc/platforms/85xx/smp.h
+++ b/kernel/arch/powerpc/platforms/85xx/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef POWERPC_85XX_SMP_H_
 #define POWERPC_85XX_SMP_H_ 1
 
diff --git a/kernel/arch/powerpc/platforms/86xx/Kconfig b/kernel/arch/powerpc/platforms/86xx/Kconfig
index ce619bd1f..bcd179d3e 100644
--- a/kernel/arch/powerpc/platforms/86xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/86xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_86xx
 menuconfig PPC_86xx
 	bool "86xx-based boards"
diff --git a/kernel/arch/powerpc/platforms/86xx/Makefile b/kernel/arch/powerpc/platforms/86xx/Makefile
index 01958fedc..2c04449be 100644
--- a/kernel/arch/powerpc/platforms/86xx/Makefile
+++ b/kernel/arch/powerpc/platforms/86xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PowerPC 86xx linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/8xx/Kconfig b/kernel/arch/powerpc/platforms/8xx/Kconfig
index 536b0c5d5..e2089d3de 100644
--- a/kernel/arch/powerpc/platforms/8xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/8xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config CPM1
 	bool
 	select CPM
diff --git a/kernel/arch/powerpc/platforms/8xx/Makefile b/kernel/arch/powerpc/platforms/8xx/Makefile
index f9af3218b..708ab099e 100644
--- a/kernel/arch/powerpc/platforms/8xx/Makefile
+++ b/kernel/arch/powerpc/platforms/8xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PowerPC 8xx linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/8xx/m8xx_setup.c b/kernel/arch/powerpc/platforms/8xx/m8xx_setup.c
index 1917d69f8..e1274db53 100644
--- a/kernel/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/kernel/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
diff --git a/kernel/arch/powerpc/platforms/Kconfig b/kernel/arch/powerpc/platforms/Kconfig
index 4fd64d3f5..d5e34ce5f 100644
--- a/kernel/arch/powerpc/platforms/Kconfig
+++ b/kernel/arch/powerpc/platforms/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Platform support"
 
 source "arch/powerpc/platforms/powernv/Kconfig"
diff --git a/kernel/arch/powerpc/platforms/Kconfig.cputype b/kernel/arch/powerpc/platforms/Kconfig.cputype
index 13663efc1..a78f25511 100644
--- a/kernel/arch/powerpc/platforms/Kconfig.cputype
+++ b/kernel/arch/powerpc/platforms/Kconfig.cputype
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC64
 	bool "64-bit kernel"
 	default n
diff --git a/kernel/arch/powerpc/platforms/Makefile b/kernel/arch/powerpc/platforms/Makefile
index d7a55ecfa..e46bb7ea7 100644
--- a/kernel/arch/powerpc/platforms/Makefile
+++ b/kernel/arch/powerpc/platforms/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
diff --git a/kernel/arch/powerpc/platforms/amigaone/Kconfig b/kernel/arch/powerpc/platforms/amigaone/Kconfig
index 128de25cc..03dc1e37c 100644
--- a/kernel/arch/powerpc/platforms/amigaone/Kconfig
+++ b/kernel/arch/powerpc/platforms/amigaone/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config AMIGAONE
 	bool "Eyetech AmigaOne/MAI Teron"
 	depends on 6xx && BROKEN_ON_SMP
diff --git a/kernel/arch/powerpc/platforms/cell/Kconfig b/kernel/arch/powerpc/platforms/cell/Kconfig
index a4522f09d..9f5958f16 100644
--- a/kernel/arch/powerpc/platforms/cell/Kconfig
+++ b/kernel/arch/powerpc/platforms/cell/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_CELL
 	bool
 	default n
diff --git a/kernel/arch/powerpc/platforms/cell/Makefile b/kernel/arch/powerpc/platforms/cell/Makefile
index 004643057..d5f808e8a 100644
--- a/kernel/arch/powerpc/platforms/cell/Makefile
+++ b/kernel/arch/powerpc/platforms/cell/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PPC_CELL_COMMON)		+= cbe_regs.o interrupt.o pervasive.o
 
 obj-$(CONFIG_PPC_CELL_NATIVE)		+= iommu.o setup.o spider-pic.o \
diff --git a/kernel/arch/powerpc/platforms/cell/interrupt.h b/kernel/arch/powerpc/platforms/cell/interrupt.h
index 4f60ae6ca..a47902248 100644
--- a/kernel/arch/powerpc/platforms/cell/interrupt.h
+++ b/kernel/arch/powerpc/platforms/cell/interrupt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_CELL_PIC_H
 #define ASM_CELL_PIC_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/platforms/cell/ras.h b/kernel/arch/powerpc/platforms/cell/ras.h
index eb7ee54c8..6c2e6bc00 100644
--- a/kernel/arch/powerpc/platforms/cell/ras.h
+++ b/kernel/arch/powerpc/platforms/cell/ras.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RAS_H
 #define RAS_H
 
diff --git a/kernel/arch/powerpc/platforms/cell/spufs/Makefile b/kernel/arch/powerpc/platforms/cell/spufs/Makefile
index 52a7d2596..52e4c80ec 100644
--- a/kernel/arch/powerpc/platforms/cell/spufs/Makefile
+++ b/kernel/arch/powerpc/platforms/cell/spufs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_SPU_FS) += spufs.o
 spufs-y += inode.o file.o context.o syscalls.o
diff --git a/kernel/arch/powerpc/platforms/cell/spufs/run.c b/kernel/arch/powerpc/platforms/cell/spufs/run.c
index cfacbee24..07f82d739 100644
--- a/kernel/arch/powerpc/platforms/cell/spufs/run.c
+++ b/kernel/arch/powerpc/platforms/cell/spufs/run.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define DEBUG
 
 #include <linux/wait.h>
diff --git a/kernel/arch/powerpc/platforms/cell/spufs/sputrace.h b/kernel/arch/powerpc/platforms/cell/spufs/sputrace.h
index db2656aa4..d557e999b 100644
--- a/kernel/arch/powerpc/platforms/cell/spufs/sputrace.h
+++ b/kernel/arch/powerpc/platforms/cell/spufs/sputrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_SPUFS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SPUFS_H
 
diff --git a/kernel/arch/powerpc/platforms/cell/spufs/syscalls.c b/kernel/arch/powerpc/platforms/cell/spufs/syscalls.c
index 0d290ea83..157e046e6 100644
--- a/kernel/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/kernel/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/export.h>
diff --git a/kernel/arch/powerpc/platforms/chrp/Kconfig b/kernel/arch/powerpc/platforms/chrp/Kconfig
index d3cdab582..ead99eff8 100644
--- a/kernel/arch/powerpc/platforms/chrp/Kconfig
+++ b/kernel/arch/powerpc/platforms/chrp/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_CHRP
 	bool "Common Hardware Reference Platform (CHRP) based machines"
 	depends on 6xx
diff --git a/kernel/arch/powerpc/platforms/chrp/chrp.h b/kernel/arch/powerpc/platforms/chrp/chrp.h
index 63f0aee4c..a5a7c338c 100644
--- a/kernel/arch/powerpc/platforms/chrp/chrp.h
+++ b/kernel/arch/powerpc/platforms/chrp/chrp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Declarations of CHRP platform-specific things.
  */
diff --git a/kernel/arch/powerpc/platforms/chrp/pci.c b/kernel/arch/powerpc/platforms/chrp/pci.c
index 27264794f..0f512d35f 100644
--- a/kernel/arch/powerpc/platforms/chrp/pci.c
+++ b/kernel/arch/powerpc/platforms/chrp/pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CHRP pci routines.
  */
diff --git a/kernel/arch/powerpc/platforms/chrp/pegasos_eth.c b/kernel/arch/powerpc/platforms/chrp/pegasos_eth.c
index 19760712b..485cf5ef7 100644
--- a/kernel/arch/powerpc/platforms/chrp/pegasos_eth.c
+++ b/kernel/arch/powerpc/platforms/chrp/pegasos_eth.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2005 Sven Luther <sl@bplan-gmbh.de>
  *  Thanks to :
diff --git a/kernel/arch/powerpc/platforms/chrp/setup.c b/kernel/arch/powerpc/platforms/chrp/setup.c
index 0ce1b45f0..481ed133e 100644
--- a/kernel/arch/powerpc/platforms/chrp/setup.c
+++ b/kernel/arch/powerpc/platforms/chrp/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1995  Linus Torvalds
  *  Adapted from 'alpha' version by Gary Thomas
diff --git a/kernel/arch/powerpc/platforms/chrp/smp.c b/kernel/arch/powerpc/platforms/chrp/smp.c
index 14515040f..f7bb6cb8d 100644
--- a/kernel/arch/powerpc/platforms/chrp/smp.c
+++ b/kernel/arch/powerpc/platforms/chrp/smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Smp support for CHRP machines.
  *
diff --git a/kernel/arch/powerpc/platforms/chrp/time.c b/kernel/arch/powerpc/platforms/chrp/time.c
index f803f4b8a..03d115aaa 100644
--- a/kernel/arch/powerpc/platforms/chrp/time.c
+++ b/kernel/arch/powerpc/platforms/chrp/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992, 1995  Linus Torvalds
  *
diff --git a/kernel/arch/powerpc/platforms/embedded6xx/Kconfig b/kernel/arch/powerpc/platforms/embedded6xx/Kconfig
index a25f496c2..9fb2d5912 100644
--- a/kernel/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/kernel/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config EMBEDDED6xx
 	bool "Embedded 6xx/7xx/7xxx-based boards"
 	depends on 6xx && BROKEN_ON_SMP
diff --git a/kernel/arch/powerpc/platforms/embedded6xx/Makefile b/kernel/arch/powerpc/platforms/embedded6xx/Makefile
index f126a2a09..12154e325 100644
--- a/kernel/arch/powerpc/platforms/embedded6xx/Makefile
+++ b/kernel/arch/powerpc/platforms/embedded6xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the 6xx/7xx/7xxxx linux kernel.
 #
diff --git a/kernel/arch/powerpc/platforms/maple/Kconfig b/kernel/arch/powerpc/platforms/maple/Kconfig
index e359d0db0..376d0be36 100644
--- a/kernel/arch/powerpc/platforms/maple/Kconfig
+++ b/kernel/arch/powerpc/platforms/maple/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_MAPLE
 	depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
 	bool "Maple 970FX Evaluation Board"
diff --git a/kernel/arch/powerpc/platforms/maple/maple.h b/kernel/arch/powerpc/platforms/maple/maple.h
index eecfa182b..d10f4af3a 100644
--- a/kernel/arch/powerpc/platforms/maple/maple.h
+++ b/kernel/arch/powerpc/platforms/maple/maple.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Declarations for maple-specific code.
  *
diff --git a/kernel/arch/powerpc/platforms/pasemi/Kconfig b/kernel/arch/powerpc/platforms/pasemi/Kconfig
index c7f1dbe94..d458a791d 100644
--- a/kernel/arch/powerpc/platforms/pasemi/Kconfig
+++ b/kernel/arch/powerpc/platforms/pasemi/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_PASEMI
 	depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
 	bool "PA Semi SoC-based platforms"
diff --git a/kernel/arch/powerpc/platforms/pasemi/pasemi.h b/kernel/arch/powerpc/platforms/pasemi/pasemi.h
index 74cbcb357..329d2a619 100644
--- a/kernel/arch/powerpc/platforms/pasemi/pasemi.h
+++ b/kernel/arch/powerpc/platforms/pasemi/pasemi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PASEMI_PASEMI_H
 #define _PASEMI_PASEMI_H
 
diff --git a/kernel/arch/powerpc/platforms/powermac/Kconfig b/kernel/arch/powerpc/platforms/powermac/Kconfig
index 43c606268..fc90cb35c 100644
--- a/kernel/arch/powerpc/platforms/powermac/Kconfig
+++ b/kernel/arch/powerpc/platforms/powermac/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_PMAC
 	bool "Apple PowerMac based machines"
 	depends on PPC_BOOK3S && CPU_BIG_ENDIAN
diff --git a/kernel/arch/powerpc/platforms/powermac/Makefile b/kernel/arch/powerpc/platforms/powermac/Makefile
index 1eb7b45e0..f2839eed0 100644
--- a/kernel/arch/powerpc/platforms/powermac/Makefile
+++ b/kernel/arch/powerpc/platforms/powermac/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS_bootx_init.o  		+= -fPIC
 
 ifdef CONFIG_FUNCTION_TRACER
diff --git a/kernel/arch/powerpc/platforms/powermac/pfunc_base.c b/kernel/arch/powerpc/platforms/powermac/pfunc_base.c
index 860159d46..fd2e21055 100644
--- a/kernel/arch/powerpc/platforms/powermac/pfunc_base.c
+++ b/kernel/arch/powerpc/platforms/powermac/pfunc_base.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/kernel/arch/powerpc/platforms/powermac/pmac.h b/kernel/arch/powerpc/platforms/powermac/pmac.h
index e7f8163d6..6f15b8804 100644
--- a/kernel/arch/powerpc/platforms/powermac/pmac.h
+++ b/kernel/arch/powerpc/platforms/powermac/pmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PMAC_H__
 #define __PMAC_H__
 
diff --git a/kernel/arch/powerpc/platforms/powermac/time.c b/kernel/arch/powerpc/platforms/powermac/time.c
index 8680bb697..274af6fa3 100644
--- a/kernel/arch/powerpc/platforms/powermac/time.c
+++ b/kernel/arch/powerpc/platforms/powermac/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for periodic interrupts (100 per second) and for getting
  * the current time from the RTC on Power Macintoshes.
diff --git a/kernel/arch/powerpc/platforms/powermac/udbg_adb.c b/kernel/arch/powerpc/platforms/powermac/udbg_adb.c
index 366bd221e..64f38f0d1 100644
--- a/kernel/arch/powerpc/platforms/powermac/udbg_adb.c
+++ b/kernel/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/kernel/arch/powerpc/platforms/powernv/Kconfig b/kernel/arch/powerpc/platforms/powernv/Kconfig
index 340cbe263..f8dc98d3d 100644
--- a/kernel/arch/powerpc/platforms/powernv/Kconfig
+++ b/kernel/arch/powerpc/platforms/powernv/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_POWERNV
 	depends on PPC64 && PPC_BOOK3S
 	bool "IBM PowerNV (Non-Virtualized) platform support"
diff --git a/kernel/arch/powerpc/platforms/powernv/Makefile b/kernel/arch/powerpc/platforms/powernv/Makefile
index 37d60f7dd..7a31c2650 100644
--- a/kernel/arch/powerpc/platforms/powernv/Makefile
+++ b/kernel/arch/powerpc/platforms/powernv/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y			+= setup.o opal-wrappers.o opal.o opal-async.o idle.o
 obj-y			+= opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
 obj-y			+= rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
diff --git a/kernel/arch/powerpc/platforms/powernv/opal-tracepoints.c b/kernel/arch/powerpc/platforms/powernv/opal-tracepoints.c
index 3c447002e..1ab7d26c0 100644
--- a/kernel/arch/powerpc/platforms/powernv/opal-tracepoints.c
+++ b/kernel/arch/powerpc/platforms/powernv/opal-tracepoints.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/percpu.h>
 #include <linux/jump_label.h>
 #include <asm/trace.h>
diff --git a/kernel/arch/powerpc/platforms/powernv/pci.h b/kernel/arch/powerpc/platforms/powernv/pci.h
index a95273c52..b47f9406d 100644
--- a/kernel/arch/powerpc/platforms/powernv/pci.h
+++ b/kernel/arch/powerpc/platforms/powernv/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __POWERNV_PCI_H
 #define __POWERNV_PCI_H
 
diff --git a/kernel/arch/powerpc/platforms/powernv/powernv.h b/kernel/arch/powerpc/platforms/powernv/powernv.h
index a159d4857..94f17ab13 100644
--- a/kernel/arch/powerpc/platforms/powernv/powernv.h
+++ b/kernel/arch/powerpc/platforms/powernv/powernv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _POWERNV_H
 #define _POWERNV_H
 
diff --git a/kernel/arch/powerpc/platforms/ps3/Kconfig b/kernel/arch/powerpc/platforms/ps3/Kconfig
index b27f40f26..6f7525555 100644
--- a/kernel/arch/powerpc/platforms/ps3/Kconfig
+++ b/kernel/arch/powerpc/platforms/ps3/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_PS3
 	bool "Sony PS3"
 	depends on PPC64 && PPC_BOOK3S && CPU_BIG_ENDIAN
diff --git a/kernel/arch/powerpc/platforms/ps3/Makefile b/kernel/arch/powerpc/platforms/ps3/Makefile
index 02b9e636d..86bf2967a 100644
--- a/kernel/arch/powerpc/platforms/ps3/Makefile
+++ b/kernel/arch/powerpc/platforms/ps3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o
 obj-y += interrupt.o exports.o os-area.o
 obj-y += system-bus.o
diff --git a/kernel/arch/powerpc/platforms/pseries/Kconfig b/kernel/arch/powerpc/platforms/pseries/Kconfig
index 71dd69d9e..0c698fd6d 100644
--- a/kernel/arch/powerpc/platforms/pseries/Kconfig
+++ b/kernel/arch/powerpc/platforms/pseries/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_PSERIES
 	depends on PPC64 && PPC_BOOK3S
 	bool "IBM pSeries & new (POWER5-based) iSeries"
diff --git a/kernel/arch/powerpc/platforms/pseries/Makefile b/kernel/arch/powerpc/platforms/pseries/Makefile
index 8f4ba089e..13eede60c 100644
--- a/kernel/arch/powerpc/platforms/pseries/Makefile
+++ b/kernel/arch/powerpc/platforms/pseries/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_PPC64)			:= $(NO_MINIMAL_TOC)
 ccflags-$(CONFIG_PPC_PSERIES_DEBUG)	+= -DDEBUG
 
diff --git a/kernel/arch/powerpc/platforms/pseries/of_helpers.c b/kernel/arch/powerpc/platforms/pseries/of_helpers.c
index 2798933c0..7e75101fa 100644
--- a/kernel/arch/powerpc/platforms/pseries/of_helpers.c
+++ b/kernel/arch/powerpc/platforms/pseries/of_helpers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/powerpc/platforms/pseries/of_helpers.h b/kernel/arch/powerpc/platforms/pseries/of_helpers.h
index bb83d39ae..decad6553 100644
--- a/kernel/arch/powerpc/platforms/pseries/of_helpers.h
+++ b/kernel/arch/powerpc/platforms/pseries/of_helpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PSERIES_OF_HELPERS_H
 #define _PSERIES_OF_HELPERS_H
 
diff --git a/kernel/arch/powerpc/platforms/pseries/offline_states.h b/kernel/arch/powerpc/platforms/pseries/offline_states.h
index 08672d913..51414aee2 100644
--- a/kernel/arch/powerpc/platforms/pseries/offline_states.h
+++ b/kernel/arch/powerpc/platforms/pseries/offline_states.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OFFLINE_STATES_H_
 #define _OFFLINE_STATES_H_
 
diff --git a/kernel/arch/powerpc/purgatory/Makefile b/kernel/arch/powerpc/purgatory/Makefile
index ac8793c13..30e05decb 100644
--- a/kernel/arch/powerpc/purgatory/Makefile
+++ b/kernel/arch/powerpc/purgatory/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 targets += trampoline.o purgatory.ro kexec-purgatory.c
 
 LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined
diff --git a/kernel/arch/powerpc/sysdev/Kconfig b/kernel/arch/powerpc/sysdev/Kconfig
index caf882e74..bcef2ac56 100644
--- a/kernel/arch/powerpc/sysdev/Kconfig
+++ b/kernel/arch/powerpc/sysdev/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
 #
diff --git a/kernel/arch/powerpc/sysdev/Makefile b/kernel/arch/powerpc/sysdev/Makefile
index 79416fa2e..0baba2140 100644
--- a/kernel/arch/powerpc/sysdev/Makefile
+++ b/kernel/arch/powerpc/sysdev/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 ccflags-$(CONFIG_PPC64)		:= $(NO_MINIMAL_TOC)
diff --git a/kernel/arch/powerpc/sysdev/cpm1.c b/kernel/arch/powerpc/sysdev/cpm1.c
index c651e6689..c6f154b60 100644
--- a/kernel/arch/powerpc/sysdev/cpm1.c
+++ b/kernel/arch/powerpc/sysdev/cpm1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * General Purpose functions for the global management of the
  * Communication Processor Module.
diff --git a/kernel/arch/powerpc/sysdev/cpm2_pic.h b/kernel/arch/powerpc/sysdev/cpm2_pic.h
index 2c5f70c24..a8a26951f 100644
--- a/kernel/arch/powerpc/sysdev/cpm2_pic.h
+++ b/kernel/arch/powerpc/sysdev/cpm2_pic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_KERNEL_CPM2_H
 #define _PPC_KERNEL_CPM2_H
 
diff --git a/kernel/arch/powerpc/sysdev/fsl_soc.h b/kernel/arch/powerpc/sysdev/fsl_soc.h
index 2640446f8..db11b06eb 100644
--- a/kernel/arch/powerpc/sysdev/fsl_soc.h
+++ b/kernel/arch/powerpc/sysdev/fsl_soc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PPC_FSL_SOC_H
 #define __PPC_FSL_SOC_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/powerpc/sysdev/ge/ge_pic.h b/kernel/arch/powerpc/sysdev/ge/ge_pic.h
index 5bf7e4b81..923dedba3 100644
--- a/kernel/arch/powerpc/sysdev/ge/ge_pic.h
+++ b/kernel/arch/powerpc/sysdev/ge/ge_pic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GEF_PIC_H__
 #define __GEF_PIC_H__
 
diff --git a/kernel/arch/powerpc/sysdev/micropatch.c b/kernel/arch/powerpc/sysdev/micropatch.c
index 6727dc54d..33a9042fc 100644
--- a/kernel/arch/powerpc/sysdev/micropatch.c
+++ b/kernel/arch/powerpc/sysdev/micropatch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /* Microcode patches for the CPM as supplied by Motorola.
  * This is the one for IIC/SPI.  There is a newer one that
diff --git a/kernel/arch/powerpc/sysdev/mpc5xxx_clocks.c b/kernel/arch/powerpc/sysdev/mpc5xxx_clocks.c
index 573292663..834a6d7fb 100644
--- a/kernel/arch/powerpc/sysdev/mpc5xxx_clocks.c
+++ b/kernel/arch/powerpc/sysdev/mpc5xxx_clocks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * 	mpc5xxx_get_bus_frequency - Find the bus frequency for a device
  * 	@node:	device node
diff --git a/kernel/arch/powerpc/sysdev/mv64x60.h b/kernel/arch/powerpc/sysdev/mv64x60.h
index 4f618fa46..60cfcb90d 100644
--- a/kernel/arch/powerpc/sysdev/mv64x60.h
+++ b/kernel/arch/powerpc/sysdev/mv64x60.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MV64X60_H__
 #define __MV64X60_H__
 
diff --git a/kernel/arch/powerpc/sysdev/simple_gpio.h b/kernel/arch/powerpc/sysdev/simple_gpio.h
index 3a7b0c513..f3f3a20d3 100644
--- a/kernel/arch/powerpc/sysdev/simple_gpio.h
+++ b/kernel/arch/powerpc/sysdev/simple_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SYSDEV_SIMPLE_GPIO_H
 #define __SYSDEV_SIMPLE_GPIO_H
 
diff --git a/kernel/arch/powerpc/sysdev/xics/Kconfig b/kernel/arch/powerpc/sysdev/xics/Kconfig
index 385e7aa9e..86fee428f 100644
--- a/kernel/arch/powerpc/sysdev/xics/Kconfig
+++ b/kernel/arch/powerpc/sysdev/xics/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_XICS
        def_bool n
        select PPC_SMP_MUXED_IPI
diff --git a/kernel/arch/powerpc/sysdev/xics/Makefile b/kernel/arch/powerpc/sysdev/xics/Makefile
index 5d7f5a656..5d438d924 100644
--- a/kernel/arch/powerpc/sysdev/xics/Makefile
+++ b/kernel/arch/powerpc/sysdev/xics/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
 
 obj-y				+= xics-common.o
diff --git a/kernel/arch/powerpc/sysdev/xics/ics-rtas.c b/kernel/arch/powerpc/sysdev/xics/ics-rtas.c
index 78ee5c778..42e0c56ff 100644
--- a/kernel/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/kernel/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/irq.h>
diff --git a/kernel/arch/powerpc/sysdev/xive/Kconfig b/kernel/arch/powerpc/sysdev/xive/Kconfig
index 3e3e25b5e..70ee976e1 100644
--- a/kernel/arch/powerpc/sysdev/xive/Kconfig
+++ b/kernel/arch/powerpc/sysdev/xive/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config PPC_XIVE
 	bool
 	default n
diff --git a/kernel/arch/powerpc/tools/gcc-check-mprofile-kernel.sh b/kernel/arch/powerpc/tools/gcc-check-mprofile-kernel.sh
index c658d8cf7..061f8035b 100755
--- a/kernel/arch/powerpc/tools/gcc-check-mprofile-kernel.sh
+++ b/kernel/arch/powerpc/tools/gcc-check-mprofile-kernel.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 set -e
 set -o pipefail
diff --git a/kernel/arch/powerpc/xmon/Makefile b/kernel/arch/powerpc/xmon/Makefile
index 1dd88315c..1bc3abb23 100644
--- a/kernel/arch/powerpc/xmon/Makefile
+++ b/kernel/arch/powerpc/xmon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for xmon
 
 subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
diff --git a/kernel/arch/powerpc/xmon/nonstdio.h b/kernel/arch/powerpc/xmon/nonstdio.h
index f86533656..2202ec619 100644
--- a/kernel/arch/powerpc/xmon/nonstdio.h
+++ b/kernel/arch/powerpc/xmon/nonstdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define EOF	(-1)
 
 #define printf	xmon_printf
diff --git a/kernel/arch/powerpc/xmon/spr_access.S b/kernel/arch/powerpc/xmon/spr_access.S
index 7d8b0e8ed..4099cbcdd 100644
--- a/kernel/arch/powerpc/xmon/spr_access.S
+++ b/kernel/arch/powerpc/xmon/spr_access.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/ppc_asm.h>
 
 /* unsigned long xmon_mfspr(sprn, default_value) */
diff --git a/kernel/arch/s390/Kconfig b/kernel/arch/s390/Kconfig
index 48af97032..ae55e715c 100644
--- a/kernel/arch/s390/Kconfig
+++ b/kernel/arch/s390/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MMU
 	def_bool y
 
diff --git a/kernel/arch/s390/Kconfig.debug b/kernel/arch/s390/Kconfig.debug
index ba5f878a2..2cfdfbf8d 100644
--- a/kernel/arch/s390/Kconfig.debug
+++ b/kernel/arch/s390/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/s390/appldata/appldata.h b/kernel/arch/s390/appldata/appldata.h
index 4a67f2b5f..10346d2f3 100644
--- a/kernel/arch/s390/appldata/appldata.h
+++ b/kernel/arch/s390/appldata/appldata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions and interface for Linux - z/VM Monitor Stream.
  *
diff --git a/kernel/arch/s390/boot/Makefile b/kernel/arch/s390/boot/Makefile
index 9a42ecec5..da9dad35c 100644
--- a/kernel/arch/s390/boot/Makefile
+++ b/kernel/arch/s390/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux s390-specific parts of the memory manager.
 #
diff --git a/kernel/arch/s390/boot/compressed/Makefile b/kernel/arch/s390/boot/compressed/Makefile
index f7e4c834e..3df10c989 100644
--- a/kernel/arch/s390/boot/compressed/Makefile
+++ b/kernel/arch/s390/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/s390/boot/compressed/Makefile
 #
diff --git a/kernel/arch/s390/boot/compressed/head.S b/kernel/arch/s390/boot/compressed/head.S
index 11f6254c5..231d1491d 100644
--- a/kernel/arch/s390/boot/compressed/head.S
+++ b/kernel/arch/s390/boot/compressed/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Startup glue code to uncompress the kernel
  *
diff --git a/kernel/arch/s390/boot/compressed/misc.c b/kernel/arch/s390/boot/compressed/misc.c
index 33ca29333..77633200f 100644
--- a/kernel/arch/s390/boot/compressed/misc.c
+++ b/kernel/arch/s390/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Definitions and wrapper functions for kernel decompressor
  *
diff --git a/kernel/arch/s390/boot/compressed/vmlinux.lds.S b/kernel/arch/s390/boot/compressed/vmlinux.lds.S
index 747735f83..88e46d4a7 100644
--- a/kernel/arch/s390/boot/compressed/vmlinux.lds.S
+++ b/kernel/arch/s390/boot/compressed/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 
 OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
diff --git a/kernel/arch/s390/crypto/Makefile b/kernel/arch/s390/crypto/Makefile
index ad4bd7777..a51010ea6 100644
--- a/kernel/arch/s390/crypto/Makefile
+++ b/kernel/arch/s390/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Cryptographic API
 #
diff --git a/kernel/arch/s390/crypto/crc32be-vx.S b/kernel/arch/s390/crypto/crc32be-vx.S
index 8013989cd..e8077f097 100644
--- a/kernel/arch/s390/crypto/crc32be-vx.S
+++ b/kernel/arch/s390/crypto/crc32be-vx.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Hardware-accelerated CRC-32 variants for Linux on z Systems
  *
diff --git a/kernel/arch/s390/crypto/crc32le-vx.S b/kernel/arch/s390/crypto/crc32le-vx.S
index 17f2504c2..d8c67a58c 100644
--- a/kernel/arch/s390/crypto/crc32le-vx.S
+++ b/kernel/arch/s390/crypto/crc32le-vx.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Hardware-accelerated CRC-32 variants for Linux on z Systems
  *
diff --git a/kernel/arch/s390/hypfs/hypfs.h b/kernel/arch/s390/hypfs/hypfs.h
index eecde500e..52348e0a8 100644
--- a/kernel/arch/s390/hypfs/hypfs.h
+++ b/kernel/arch/s390/hypfs/hypfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Hypervisor filesystem for Linux on s390.
  *
diff --git a/kernel/arch/s390/hypfs/hypfs_dbfs.c b/kernel/arch/s390/hypfs/hypfs_dbfs.c
index 752f6df3e..b9bdf5c19 100644
--- a/kernel/arch/s390/hypfs/hypfs_dbfs.c
+++ b/kernel/arch/s390/hypfs/hypfs_dbfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Hypervisor filesystem for Linux on s390 - debugfs interface
  *
diff --git a/kernel/arch/s390/hypfs/hypfs_diag.c b/kernel/arch/s390/hypfs/hypfs_diag.c
index 794bebb43..be8cc5320 100644
--- a/kernel/arch/s390/hypfs/hypfs_diag.c
+++ b/kernel/arch/s390/hypfs/hypfs_diag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Hypervisor filesystem for Linux on s390. Diag 204 and 224
  *    implementation.
diff --git a/kernel/arch/s390/hypfs/hypfs_diag0c.c b/kernel/arch/s390/hypfs/hypfs_diag0c.c
index 0f1927cbb..dce87f1be 100644
--- a/kernel/arch/s390/hypfs/hypfs_diag0c.c
+++ b/kernel/arch/s390/hypfs/hypfs_diag0c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Hypervisor filesystem for Linux on s390
  *
diff --git a/kernel/arch/s390/hypfs/hypfs_sprp.c b/kernel/arch/s390/hypfs/hypfs_sprp.c
index c9e5c72f7..ae0ed8dd5 100644
--- a/kernel/arch/s390/hypfs/hypfs_sprp.c
+++ b/kernel/arch/s390/hypfs/hypfs_sprp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Hypervisor filesystem for Linux on s390.
  *    Set Partition-Resource Parameter interface.
diff --git a/kernel/arch/s390/hypfs/hypfs_vm.c b/kernel/arch/s390/hypfs/hypfs_vm.c
index 012919d98..c4b7b681e 100644
--- a/kernel/arch/s390/hypfs/hypfs_vm.c
+++ b/kernel/arch/s390/hypfs/hypfs_vm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Hypervisor filesystem for Linux on s390. z/VM implementation.
  *
diff --git a/kernel/arch/s390/include/asm/airq.h b/kernel/arch/s390/include/asm/airq.h
index bd93ff666..fcf539efb 100644
--- a/kernel/arch/s390/include/asm/airq.h
+++ b/kernel/arch/s390/include/asm/airq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2002, 2007
  *    Author(s): Ingo Adlung <adlung@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/appldata.h b/kernel/arch/s390/include/asm/appldata.h
index a6263d4e8..4afbb5938 100644
--- a/kernel/arch/s390/include/asm/appldata.h
+++ b/kernel/arch/s390/include/asm/appldata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2006
  *
diff --git a/kernel/arch/s390/include/asm/archrandom.h b/kernel/arch/s390/include/asm/archrandom.h
index 6033901a4..e9f7d7a57 100644
--- a/kernel/arch/s390/include/asm/archrandom.h
+++ b/kernel/arch/s390/include/asm/archrandom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Kernel interface for the s390 arch_random_* functions
  *
diff --git a/kernel/arch/s390/include/asm/asm-prototypes.h b/kernel/arch/s390/include/asm/asm-prototypes.h
index 2c3413b0c..c37eb921b 100644
--- a/kernel/arch/s390/include/asm/asm-prototypes.h
+++ b/kernel/arch/s390/include/asm/asm-prototypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_PROTOTYPES_H
 
 #include <linux/kvm_host.h>
diff --git a/kernel/arch/s390/include/asm/atomic.h b/kernel/arch/s390/include/asm/atomic.h
index f7f69dfd2..4b55532f1 100644
--- a/kernel/arch/s390/include/asm/atomic.h
+++ b/kernel/arch/s390/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2016
  * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
diff --git a/kernel/arch/s390/include/asm/atomic_ops.h b/kernel/arch/s390/include/asm/atomic_ops.h
index ba6d29412..f479e4c0b 100644
--- a/kernel/arch/s390/include/asm/atomic_ops.h
+++ b/kernel/arch/s390/include/asm/atomic_ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Low level function for atomic operations
  *
diff --git a/kernel/arch/s390/include/asm/barrier.h b/kernel/arch/s390/include/asm/barrier.h
index 5c8db3ce6..10432607a 100644
--- a/kernel/arch/s390/include/asm/barrier.h
+++ b/kernel/arch/s390/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2009
  *
diff --git a/kernel/arch/s390/include/asm/bitops.h b/kernel/arch/s390/include/asm/bitops.h
index 99902b7b9..31e400c1a 100644
--- a/kernel/arch/s390/include/asm/bitops.h
+++ b/kernel/arch/s390/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 1999,2013
  *
diff --git a/kernel/arch/s390/include/asm/bug.h b/kernel/arch/s390/include/asm/bug.h
index ce9cc1239..429f43a8a 100644
--- a/kernel/arch/s390/include/asm/bug.h
+++ b/kernel/arch/s390/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_BUG_H
 #define _ASM_S390_BUG_H
 
diff --git a/kernel/arch/s390/include/asm/cache.h b/kernel/arch/s390/include/asm/cache.h
index 05219a5e0..d5e22e837 100644
--- a/kernel/arch/s390/include/asm/cache.h
+++ b/kernel/arch/s390/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/ccwdev.h b/kernel/arch/s390/include/asm/ccwdev.h
index b80e456d6..633f8da86 100644
--- a/kernel/arch/s390/include/asm/ccwdev.h
+++ b/kernel/arch/s390/include/asm/ccwdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2002, 2009
  *
diff --git a/kernel/arch/s390/include/asm/ccwgroup.h b/kernel/arch/s390/include/asm/ccwgroup.h
index 057ce0ca6..b00777ce9 100644
--- a/kernel/arch/s390/include/asm/ccwgroup.h
+++ b/kernel/arch/s390/include/asm/ccwgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_CCWGROUP_H
 #define S390_CCWGROUP_H
 
diff --git a/kernel/arch/s390/include/asm/checksum.h b/kernel/arch/s390/include/asm/checksum.h
index 12bf4fef2..91e376b0d 100644
--- a/kernel/arch/s390/include/asm/checksum.h
+++ b/kernel/arch/s390/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    S390 fast network checksum routines
  *
diff --git a/kernel/arch/s390/include/asm/chpid.h b/kernel/arch/s390/include/asm/chpid.h
index 7298eec98..4773f7479 100644
--- a/kernel/arch/s390/include/asm/chpid.h
+++ b/kernel/arch/s390/include/asm/chpid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007, 2012
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/cio.h b/kernel/arch/s390/include/asm/cio.h
index 7a38ca851..dc84a0171 100644
--- a/kernel/arch/s390/include/asm/cio.h
+++ b/kernel/arch/s390/include/asm/cio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common interface for I/O on S/390
  */
diff --git a/kernel/arch/s390/include/asm/clp.h b/kernel/arch/s390/include/asm/clp.h
index 5687d62fb..3925b0f08 100644
--- a/kernel/arch/s390/include/asm/clp.h
+++ b/kernel/arch/s390/include/asm/clp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_CLP_H
 #define _ASM_S390_CLP_H
 
diff --git a/kernel/arch/s390/include/asm/cmb.h b/kernel/arch/s390/include/asm/cmb.h
index ed2630c23..599594c37 100644
--- a/kernel/arch/s390/include/asm/cmb.h
+++ b/kernel/arch/s390/include/asm/cmb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_CMB_H
 #define S390_CMB_H
 
diff --git a/kernel/arch/s390/include/asm/cmpxchg.h b/kernel/arch/s390/include/asm/cmpxchg.h
index 24ea6948e..af99c1f66 100644
--- a/kernel/arch/s390/include/asm/cmpxchg.h
+++ b/kernel/arch/s390/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2011
  *
diff --git a/kernel/arch/s390/include/asm/compat.h b/kernel/arch/s390/include/asm/compat.h
index 07a82bc93..1b60eb367 100644
--- a/kernel/arch/s390/include/asm/compat.h
+++ b/kernel/arch/s390/include/asm/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390X_COMPAT_H
 #define _ASM_S390X_COMPAT_H
 /*
diff --git a/kernel/arch/s390/include/asm/cpacf.h b/kernel/arch/s390/include/asm/cpacf.h
index e06f2556b..056670ebb 100644
--- a/kernel/arch/s390/include/asm/cpacf.h
+++ b/kernel/arch/s390/include/asm/cpacf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CP Assist for Cryptographic Functions (CPACF)
  *
diff --git a/kernel/arch/s390/include/asm/cpcmd.h b/kernel/arch/s390/include/asm/cpcmd.h
index ca2b0624a..c3c993abe 100644
--- a/kernel/arch/s390/include/asm/cpcmd.h
+++ b/kernel/arch/s390/include/asm/cpcmd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/cpu.h b/kernel/arch/s390/include/asm/cpu.h
index 915410003..62228a884 100644
--- a/kernel/arch/s390/include/asm/cpu.h
+++ b/kernel/arch/s390/include/asm/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2000, 2009
  *    Author(s): Hartmut Penner <hp@de.ibm.com>,
diff --git a/kernel/arch/s390/include/asm/cpufeature.h b/kernel/arch/s390/include/asm/cpufeature.h
index fa7e69b7c..1d007c6ed 100644
--- a/kernel/arch/s390/include/asm/cpufeature.h
+++ b/kernel/arch/s390/include/asm/cpufeature.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Module interface for CPU features
  *
diff --git a/kernel/arch/s390/include/asm/cputime.h b/kernel/arch/s390/include/asm/cputime.h
index 9072bf63a..cb729d111 100644
--- a/kernel/arch/s390/include/asm/cputime.h
+++ b/kernel/arch/s390/include/asm/cputime.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2004
  *
diff --git a/kernel/arch/s390/include/asm/crw.h b/kernel/arch/s390/include/asm/crw.h
index bcb9cd2a7..c6ebfd31f 100644
--- a/kernel/arch/s390/include/asm/crw.h
+++ b/kernel/arch/s390/include/asm/crw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *   Data definitions for channel report processing
  *    Copyright IBM Corp. 2000, 2009
diff --git a/kernel/arch/s390/include/asm/css_chars.h b/kernel/arch/s390/include/asm/css_chars.h
index 09d1dd46b..a478eb61a 100644
--- a/kernel/arch/s390/include/asm/css_chars.h
+++ b/kernel/arch/s390/include/asm/css_chars.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CSS_CHARS_H
 #define _ASM_CSS_CHARS_H
 
diff --git a/kernel/arch/s390/include/asm/ctl_reg.h b/kernel/arch/s390/include/asm/ctl_reg.h
index e508dff92..93e0d72f6 100644
--- a/kernel/arch/s390/include/asm/ctl_reg.h
+++ b/kernel/arch/s390/include/asm/ctl_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2009
  *
diff --git a/kernel/arch/s390/include/asm/current.h b/kernel/arch/s390/include/asm/current.h
index b80941f30..68f843152 100644
--- a/kernel/arch/s390/include/asm/current.h
+++ b/kernel/arch/s390/include/asm/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/debug.h b/kernel/arch/s390/include/asm/debug.h
index df7b54ea9..a4ed25dd3 100644
--- a/kernel/arch/s390/include/asm/debug.h
+++ b/kernel/arch/s390/include/asm/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *   S/390 debug facility
  *
diff --git a/kernel/arch/s390/include/asm/delay.h b/kernel/arch/s390/include/asm/delay.h
index 3f6e4095f..898323fd9 100644
--- a/kernel/arch/s390/include/asm/delay.h
+++ b/kernel/arch/s390/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/diag.h b/kernel/arch/s390/include/asm/diag.h
index 88162bb5c..6db785672 100644
--- a/kernel/arch/s390/include/asm/diag.h
+++ b/kernel/arch/s390/include/asm/diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * s390 diagnose functions
  *
diff --git a/kernel/arch/s390/include/asm/dis.h b/kernel/arch/s390/include/asm/dis.h
index 37f617dfb..78d1b2d72 100644
--- a/kernel/arch/s390/include/asm/dis.h
+++ b/kernel/arch/s390/include/asm/dis.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Disassemble s390 instructions.
  *
diff --git a/kernel/arch/s390/include/asm/dma-mapping.h b/kernel/arch/s390/include/asm/dma-mapping.h
index 512ad0eaa..8fc8764fe 100644
--- a/kernel/arch/s390/include/asm/dma-mapping.h
+++ b/kernel/arch/s390/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_DMA_MAPPING_H
 #define _ASM_S390_DMA_MAPPING_H
 
diff --git a/kernel/arch/s390/include/asm/dma.h b/kernel/arch/s390/include/asm/dma.h
index bb9bdcd20..6f26f35d4 100644
--- a/kernel/arch/s390/include/asm/dma.h
+++ b/kernel/arch/s390/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_DMA_H
 #define _ASM_S390_DMA_H
 
diff --git a/kernel/arch/s390/include/asm/eadm.h b/kernel/arch/s390/include/asm/eadm.h
index 144809a3f..eb5323161 100644
--- a/kernel/arch/s390/include/asm/eadm.h
+++ b/kernel/arch/s390/include/asm/eadm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_EADM_H
 #define _ASM_S390_EADM_H
 
diff --git a/kernel/arch/s390/include/asm/ebcdic.h b/kernel/arch/s390/include/asm/ebcdic.h
index b71735eab..29441beb9 100644
--- a/kernel/arch/s390/include/asm/ebcdic.h
+++ b/kernel/arch/s390/include/asm/ebcdic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    EBCDIC -> ASCII, ASCII -> EBCDIC conversion routines.
  *
diff --git a/kernel/arch/s390/include/asm/elf.h b/kernel/arch/s390/include/asm/elf.h
index 65998a1f5..9a3cb3983 100644
--- a/kernel/arch/s390/include/asm/elf.h
+++ b/kernel/arch/s390/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/exec.h b/kernel/arch/s390/include/asm/exec.h
index c4a93d632..641bfbec9 100644
--- a/kernel/arch/s390/include/asm/exec.h
+++ b/kernel/arch/s390/include/asm/exec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2009
  *
diff --git a/kernel/arch/s390/include/asm/extable.h b/kernel/arch/s390/include/asm/extable.h
index 16cfe2d62..80a4e5a9c 100644
--- a/kernel/arch/s390/include/asm/extable.h
+++ b/kernel/arch/s390/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __S390_EXTABLE_H
 #define __S390_EXTABLE_H
 /*
diff --git a/kernel/arch/s390/include/asm/extmem.h b/kernel/arch/s390/include/asm/extmem.h
index 6276002d7..568fd81bb 100644
--- a/kernel/arch/s390/include/asm/extmem.h
+++ b/kernel/arch/s390/include/asm/extmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  definitions for external memory segment support
  *  Copyright IBM Corp. 2003
diff --git a/kernel/arch/s390/include/asm/facility.h b/kernel/arch/s390/include/asm/facility.h
index cb60d5c57..f04064457 100644
--- a/kernel/arch/s390/include/asm/facility.h
+++ b/kernel/arch/s390/include/asm/facility.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2009
  *
diff --git a/kernel/arch/s390/include/asm/fcx.h b/kernel/arch/s390/include/asm/fcx.h
index 04cb4b4bc..cff0749e9 100644
--- a/kernel/arch/s390/include/asm/fcx.h
+++ b/kernel/arch/s390/include/asm/fcx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Functions for assembling fcx enabled I/O control blocks.
  *
diff --git a/kernel/arch/s390/include/asm/fpu/api.h b/kernel/arch/s390/include/asm/fpu/api.h
index 02124d66b..34a7ae684 100644
--- a/kernel/arch/s390/include/asm/fpu/api.h
+++ b/kernel/arch/s390/include/asm/fpu/api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * In-kernel FPU support functions
  *
diff --git a/kernel/arch/s390/include/asm/fpu/internal.h b/kernel/arch/s390/include/asm/fpu/internal.h
index 629c90865..4a71dbbf7 100644
--- a/kernel/arch/s390/include/asm/fpu/internal.h
+++ b/kernel/arch/s390/include/asm/fpu/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * FPU state and register content conversion primitives
  *
diff --git a/kernel/arch/s390/include/asm/fpu/types.h b/kernel/arch/s390/include/asm/fpu/types.h
index bce255ead..d889e9436 100644
--- a/kernel/arch/s390/include/asm/fpu/types.h
+++ b/kernel/arch/s390/include/asm/fpu/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * FPU data structures
  *
diff --git a/kernel/arch/s390/include/asm/ftrace.h b/kernel/arch/s390/include/asm/ftrace.h
index 836c56290..cfccc0edd 100644
--- a/kernel/arch/s390/include/asm/ftrace.h
+++ b/kernel/arch/s390/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_FTRACE_H
 #define _ASM_S390_FTRACE_H
 
diff --git a/kernel/arch/s390/include/asm/futex.h b/kernel/arch/s390/include/asm/futex.h
index 8f8eec9e1..9b5a3469f 100644
--- a/kernel/arch/s390/include/asm/futex.h
+++ b/kernel/arch/s390/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_FUTEX_H
 #define _ASM_S390_FUTEX_H
 
diff --git a/kernel/arch/s390/include/asm/gmap.h b/kernel/arch/s390/include/asm/gmap.h
index 741ddba0b..e07cce88d 100644
--- a/kernel/arch/s390/include/asm/gmap.h
+++ b/kernel/arch/s390/include/asm/gmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  KVM guest address space mapping code
  *
diff --git a/kernel/arch/s390/include/asm/hardirq.h b/kernel/arch/s390/include/asm/hardirq.h
index b7eabaaef..a296c6acf 100644
--- a/kernel/arch/s390/include/asm/hardirq.h
+++ b/kernel/arch/s390/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/asm/hugetlb.h b/kernel/arch/s390/include/asm/hugetlb.h
index d95869ce3..9c5fc5020 100644
--- a/kernel/arch/s390/include/asm/hugetlb.h
+++ b/kernel/arch/s390/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  IBM System z Huge TLB Page Support for Kernel.
  *
diff --git a/kernel/arch/s390/include/asm/hw_irq.h b/kernel/arch/s390/include/asm/hw_irq.h
index ee96a8b69..adae17675 100644
--- a/kernel/arch/s390/include/asm/hw_irq.h
+++ b/kernel/arch/s390/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _HW_IRQ_H
 #define _HW_IRQ_H
 
diff --git a/kernel/arch/s390/include/asm/idals.h b/kernel/arch/s390/include/asm/idals.h
index 280b60a0b..15578fd76 100644
--- a/kernel/arch/s390/include/asm/idals.h
+++ b/kernel/arch/s390/include/asm/idals.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/idle.h b/kernel/arch/s390/include/asm/idle.h
index 51ff96d9f..6d4226dcf 100644
--- a/kernel/arch/s390/include/asm/idle.h
+++ b/kernel/arch/s390/include/asm/idle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2014
  *
diff --git a/kernel/arch/s390/include/asm/io.h b/kernel/arch/s390/include/asm/io.h
index 904e4b3af..f34d72934 100644
--- a/kernel/arch/s390/include/asm/io.h
+++ b/kernel/arch/s390/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/ipl.h b/kernel/arch/s390/include/asm/ipl.h
index 6810bd757..5a8d92758 100644
--- a/kernel/arch/s390/include/asm/ipl.h
+++ b/kernel/arch/s390/include/asm/ipl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * s390 (re)ipl support
  *
diff --git a/kernel/arch/s390/include/asm/irq.h b/kernel/arch/s390/include/asm/irq.h
index 70c9bce76..2f7f27e54 100644
--- a/kernel/arch/s390/include/asm/irq.h
+++ b/kernel/arch/s390/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
diff --git a/kernel/arch/s390/include/asm/irqflags.h b/kernel/arch/s390/include/asm/irqflags.h
index 595a275c3..586df4c9e 100644
--- a/kernel/arch/s390/include/asm/irqflags.h
+++ b/kernel/arch/s390/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2006, 2010
  *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/isc.h b/kernel/arch/s390/include/asm/isc.h
index 8a0b721a9..6cb9e2ed0 100644
--- a/kernel/arch/s390/include/asm/isc.h
+++ b/kernel/arch/s390/include/asm/isc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_ISC_H
 #define _ASM_S390_ISC_H
 
diff --git a/kernel/arch/s390/include/asm/itcw.h b/kernel/arch/s390/include/asm/itcw.h
index fb1bedd3d..59b739613 100644
--- a/kernel/arch/s390/include/asm/itcw.h
+++ b/kernel/arch/s390/include/asm/itcw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Functions for incremental construction of fcx enabled I/O control blocks.
  *
diff --git a/kernel/arch/s390/include/asm/jump_label.h b/kernel/arch/s390/include/asm/jump_label.h
index 9be198f5e..40f651292 100644
--- a/kernel/arch/s390/include/asm/jump_label.h
+++ b/kernel/arch/s390/include/asm/jump_label.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_JUMP_LABEL_H
 #define _ASM_S390_JUMP_LABEL_H
 
diff --git a/kernel/arch/s390/include/asm/kdebug.h b/kernel/arch/s390/include/asm/kdebug.h
index 5c1abd476..d5327f064 100644
--- a/kernel/arch/s390/include/asm/kdebug.h
+++ b/kernel/arch/s390/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_KDEBUG_H
 #define _S390_KDEBUG_H
 
diff --git a/kernel/arch/s390/include/asm/kexec.h b/kernel/arch/s390/include/asm/kexec.h
index dccf24ee2..1d708a419 100644
--- a/kernel/arch/s390/include/asm/kexec.h
+++ b/kernel/arch/s390/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2005
  *
diff --git a/kernel/arch/s390/include/asm/linkage.h b/kernel/arch/s390/include/asm/linkage.h
index 27da78cf4..1b95da3fd 100644
--- a/kernel/arch/s390/include/asm/linkage.h
+++ b/kernel/arch/s390/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/s390/include/asm/lowcore.h b/kernel/arch/s390/include/asm/lowcore.h
index a6870ea6e..917f7344c 100644
--- a/kernel/arch/s390/include/asm/lowcore.h
+++ b/kernel/arch/s390/include/asm/lowcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 1999, 2012
  *    Author(s): Hartmut Penner <hp@de.ibm.com>,
diff --git a/kernel/arch/s390/include/asm/mmu.h b/kernel/arch/s390/include/asm/mmu.h
index 3f46a6577..db35c41a5 100644
--- a/kernel/arch/s390/include/asm/mmu.h
+++ b/kernel/arch/s390/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/s390/include/asm/mmu_context.h b/kernel/arch/s390/include/asm/mmu_context.h
index 3c9abedc3..43607bb12 100644
--- a/kernel/arch/s390/include/asm/mmu_context.h
+++ b/kernel/arch/s390/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/mmzone.h b/kernel/arch/s390/include/asm/mmzone.h
index a9e834e60..73e3e7c69 100644
--- a/kernel/arch/s390/include/asm/mmzone.h
+++ b/kernel/arch/s390/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/include/asm/module.h b/kernel/arch/s390/include/asm/module.h
index df1f861a8..e0a6d2984 100644
--- a/kernel/arch/s390/include/asm/module.h
+++ b/kernel/arch/s390/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_MODULE_H
 #define _ASM_S390_MODULE_H
 
diff --git a/kernel/arch/s390/include/asm/nmi.h b/kernel/arch/s390/include/asm/nmi.h
index c8e211b9a..c8a7beadd 100644
--- a/kernel/arch/s390/include/asm/nmi.h
+++ b/kernel/arch/s390/include/asm/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *   Machine check handler definitions
  *
diff --git a/kernel/arch/s390/include/asm/numa.h b/kernel/arch/s390/include/asm/numa.h
index dc19ee0c9..35f8cbe7e 100644
--- a/kernel/arch/s390/include/asm/numa.h
+++ b/kernel/arch/s390/include/asm/numa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/include/asm/os_info.h b/kernel/arch/s390/include/asm/os_info.h
index 943475382..3c89279d2 100644
--- a/kernel/arch/s390/include/asm/os_info.h
+++ b/kernel/arch/s390/include/asm/os_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * OS info memory interface
  *
diff --git a/kernel/arch/s390/include/asm/page-states.h b/kernel/arch/s390/include/asm/page-states.h
index 22b0f49e8..c33c4deb5 100644
--- a/kernel/arch/s390/include/asm/page-states.h
+++ b/kernel/arch/s390/include/asm/page-states.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2017
  *    Author(s): Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
diff --git a/kernel/arch/s390/include/asm/page.h b/kernel/arch/s390/include/asm/page.h
index 5d5c2b350..41e3908b3 100644
--- a/kernel/arch/s390/include/asm/page.h
+++ b/kernel/arch/s390/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/asm/pci.h b/kernel/arch/s390/include/asm/pci.h
index 386df9ade..12fe35910 100644
--- a/kernel/arch/s390/include/asm/pci.h
+++ b/kernel/arch/s390/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_S390_PCI_H
 #define __ASM_S390_PCI_H
 
diff --git a/kernel/arch/s390/include/asm/pci_clp.h b/kernel/arch/s390/include/asm/pci_clp.h
index 938b8cc19..b3b31b31f 100644
--- a/kernel/arch/s390/include/asm/pci_clp.h
+++ b/kernel/arch/s390/include/asm/pci_clp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_PCI_CLP_H
 #define _ASM_S390_PCI_CLP_H
 
diff --git a/kernel/arch/s390/include/asm/pci_debug.h b/kernel/arch/s390/include/asm/pci_debug.h
index ac24b26fc..6c2c38060 100644
--- a/kernel/arch/s390/include/asm/pci_debug.h
+++ b/kernel/arch/s390/include/asm/pci_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_ASM_PCI_DEBUG_H
 #define _S390_ASM_PCI_DEBUG_H
 
diff --git a/kernel/arch/s390/include/asm/pci_dma.h b/kernel/arch/s390/include/asm/pci_dma.h
index 92df3eb8d..e8d9161fa 100644
--- a/kernel/arch/s390/include/asm/pci_dma.h
+++ b/kernel/arch/s390/include/asm/pci_dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_PCI_DMA_H
 #define _ASM_S390_PCI_DMA_H
 
diff --git a/kernel/arch/s390/include/asm/pci_insn.h b/kernel/arch/s390/include/asm/pci_insn.h
index 34abcf275..419e83fa4 100644
--- a/kernel/arch/s390/include/asm/pci_insn.h
+++ b/kernel/arch/s390/include/asm/pci_insn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_PCI_INSN_H
 #define _ASM_S390_PCI_INSN_H
 
diff --git a/kernel/arch/s390/include/asm/pci_io.h b/kernel/arch/s390/include/asm/pci_io.h
index 69aa18be6..cbb9cb9c6 100644
--- a/kernel/arch/s390/include/asm/pci_io.h
+++ b/kernel/arch/s390/include/asm/pci_io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_PCI_IO_H
 #define _ASM_S390_PCI_IO_H
 
diff --git a/kernel/arch/s390/include/asm/percpu.h b/kernel/arch/s390/include/asm/percpu.h
index 90240dfef..0095ddb58 100644
--- a/kernel/arch/s390/include/asm/percpu.h
+++ b/kernel/arch/s390/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_S390_PERCPU__
 #define __ARCH_S390_PERCPU__
 
diff --git a/kernel/arch/s390/include/asm/perf_event.h b/kernel/arch/s390/include/asm/perf_event.h
index dd32beb9d..79aa6421f 100644
--- a/kernel/arch/s390/include/asm/perf_event.h
+++ b/kernel/arch/s390/include/asm/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Performance event support - s390 specific definitions.
  *
diff --git a/kernel/arch/s390/include/asm/pgalloc.h b/kernel/arch/s390/include/asm/pgalloc.h
index a0d916751..bbe99cb82 100644
--- a/kernel/arch/s390/include/asm/pgalloc.h
+++ b/kernel/arch/s390/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/asm/pgtable.h b/kernel/arch/s390/include/asm/pgtable.h
index 20e75a2ca..d7fe98380 100644
--- a/kernel/arch/s390/include/asm/pgtable.h
+++ b/kernel/arch/s390/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/asm/pkey.h b/kernel/arch/s390/include/asm/pkey.h
index 4c484590d..053117ba7 100644
--- a/kernel/arch/s390/include/asm/pkey.h
+++ b/kernel/arch/s390/include/asm/pkey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Kernelspace interface to the pkey device driver
  *
diff --git a/kernel/arch/s390/include/asm/preempt.h b/kernel/arch/s390/include/asm/preempt.h
index b0776b2c8..23a14d187 100644
--- a/kernel/arch/s390/include/asm/preempt.h
+++ b/kernel/arch/s390/include/asm/preempt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PREEMPT_H
 #define __ASM_PREEMPT_H
 
diff --git a/kernel/arch/s390/include/asm/processor.h b/kernel/arch/s390/include/asm/processor.h
index c25d57e0a..9cf92abe2 100644
--- a/kernel/arch/s390/include/asm/processor.h
+++ b/kernel/arch/s390/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/ptrace.h b/kernel/arch/s390/include/asm/ptrace.h
index 853b01245..2f84e77f1 100644
--- a/kernel/arch/s390/include/asm/ptrace.h
+++ b/kernel/arch/s390/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/asm/qdio.h b/kernel/arch/s390/include/asm/qdio.h
index eaee69e7c..de11ecc99 100644
--- a/kernel/arch/s390/include/asm/qdio.h
+++ b/kernel/arch/s390/include/asm/qdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2000, 2008
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/reset.h b/kernel/arch/s390/include/asm/reset.h
index fe11fa88a..6450b31ad 100644
--- a/kernel/arch/s390/include/asm/reset.h
+++ b/kernel/arch/s390/include/asm/reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2006
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/runtime_instr.h b/kernel/arch/s390/include/asm/runtime_instr.h
index 402ad6df4..ea8896ba5 100644
--- a/kernel/arch/s390/include/asm/runtime_instr.h
+++ b/kernel/arch/s390/include/asm/runtime_instr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RUNTIME_INSTR_H
 #define _RUNTIME_INSTR_H
 
diff --git a/kernel/arch/s390/include/asm/rwsem.h b/kernel/arch/s390/include/asm/rwsem.h
index 597e7e96b..f731b7b51 100644
--- a/kernel/arch/s390/include/asm/rwsem.h
+++ b/kernel/arch/s390/include/asm/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_RWSEM_H
 #define _S390_RWSEM_H
 
diff --git a/kernel/arch/s390/include/asm/schid.h b/kernel/arch/s390/include/asm/schid.h
index 40b47dfa9..3ac405a67 100644
--- a/kernel/arch/s390/include/asm/schid.h
+++ b/kernel/arch/s390/include/asm/schid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_SCHID_H
 #define ASM_SCHID_H
 
diff --git a/kernel/arch/s390/include/asm/sclp.h b/kernel/arch/s390/include/asm/sclp.h
index 6f5167bc1..d3c1a8a2e 100644
--- a/kernel/arch/s390/include/asm/sclp.h
+++ b/kernel/arch/s390/include/asm/sclp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/kernel/arch/s390/include/asm/scsw.h b/kernel/arch/s390/include/asm/scsw.h
index 17a7904f0..79b7ffa91 100644
--- a/kernel/arch/s390/include/asm/scsw.h
+++ b/kernel/arch/s390/include/asm/scsw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Helper functions for scsw access.
  *
diff --git a/kernel/arch/s390/include/asm/seccomp.h b/kernel/arch/s390/include/asm/seccomp.h
index e10f83373..795bbe0d7 100644
--- a/kernel/arch/s390/include/asm/seccomp.h
+++ b/kernel/arch/s390/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_SECCOMP_H
 #define _ASM_S390_SECCOMP_H
 
diff --git a/kernel/arch/s390/include/asm/sections.h b/kernel/arch/s390/include/asm/sections.h
index fbd9116eb..0ac3e8166 100644
--- a/kernel/arch/s390/include/asm/sections.h
+++ b/kernel/arch/s390/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_SECTIONS_H
 #define _S390_SECTIONS_H
 
diff --git a/kernel/arch/s390/include/asm/serial.h b/kernel/arch/s390/include/asm/serial.h
index 5b3e48ef5..aaf85a690 100644
--- a/kernel/arch/s390/include/asm/serial.h
+++ b/kernel/arch/s390/include/asm/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_SERIAL_H
 #define _ASM_S390_SERIAL_H
 
diff --git a/kernel/arch/s390/include/asm/set_memory.h b/kernel/arch/s390/include/asm/set_memory.h
index 46a4db44c..c59a83536 100644
--- a/kernel/arch/s390/include/asm/set_memory.h
+++ b/kernel/arch/s390/include/asm/set_memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMS390_SET_MEMORY_H
 #define _ASMS390_SET_MEMORY_H
 
diff --git a/kernel/arch/s390/include/asm/setup.h b/kernel/arch/s390/include/asm/setup.h
index 490e035b3..f2c2b7cd9 100644
--- a/kernel/arch/s390/include/asm/setup.h
+++ b/kernel/arch/s390/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2010
diff --git a/kernel/arch/s390/include/asm/shmparam.h b/kernel/arch/s390/include/asm/shmparam.h
index e98518273..e75d45649 100644
--- a/kernel/arch/s390/include/asm/shmparam.h
+++ b/kernel/arch/s390/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/signal.h b/kernel/arch/s390/include/asm/signal.h
index abf9e5735..7daf4d8b5 100644
--- a/kernel/arch/s390/include/asm/signal.h
+++ b/kernel/arch/s390/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/sigp.h b/kernel/arch/s390/include/asm/sigp.h
index 020a8814d..53ee795cd 100644
--- a/kernel/arch/s390/include/asm/sigp.h
+++ b/kernel/arch/s390/include/asm/sigp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __S390_ASM_SIGP_H
 #define __S390_ASM_SIGP_H
 
diff --git a/kernel/arch/s390/include/asm/smp.h b/kernel/arch/s390/include/asm/smp.h
index 3deb13458..babe83ed4 100644
--- a/kernel/arch/s390/include/asm/smp.h
+++ b/kernel/arch/s390/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 1999, 2012
  *    Author(s): Denis Joseph Barrow,
diff --git a/kernel/arch/s390/include/asm/sparsemem.h b/kernel/arch/s390/include/asm/sparsemem.h
index 334e279f1..c54989360 100644
--- a/kernel/arch/s390/include/asm/sparsemem.h
+++ b/kernel/arch/s390/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_SPARSEMEM_H
 #define _ASM_S390_SPARSEMEM_H
 
diff --git a/kernel/arch/s390/include/asm/spinlock.h b/kernel/arch/s390/include/asm/spinlock.h
index 8182b521c..f3f5e0155 100644
--- a/kernel/arch/s390/include/asm/spinlock.h
+++ b/kernel/arch/s390/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/spinlock_types.h b/kernel/arch/s390/include/asm/spinlock_types.h
index fe755eec2..1861a0c5d 100644
--- a/kernel/arch/s390/include/asm/spinlock_types.h
+++ b/kernel/arch/s390/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_TYPES_H
 #define __ASM_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/s390/include/asm/stp.h b/kernel/arch/s390/include/asm/stp.h
index 768972758..f0ddefb06 100644
--- a/kernel/arch/s390/include/asm/stp.h
+++ b/kernel/arch/s390/include/asm/stp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2006
  *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
diff --git a/kernel/arch/s390/include/asm/string.h b/kernel/arch/s390/include/asm/string.h
index e5f5c7074..27ce49419 100644
--- a/kernel/arch/s390/include/asm/string.h
+++ b/kernel/arch/s390/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/switch_to.h b/kernel/arch/s390/include/asm/switch_to.h
index f6c2b5814..c21fe1d57 100644
--- a/kernel/arch/s390/include/asm/switch_to.h
+++ b/kernel/arch/s390/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2009
  *
diff --git a/kernel/arch/s390/include/asm/termios.h b/kernel/arch/s390/include/asm/termios.h
index db028d17f..46fa3020b 100644
--- a/kernel/arch/s390/include/asm/termios.h
+++ b/kernel/arch/s390/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/thread_info.h b/kernel/arch/s390/include/asm/thread_info.h
index 1aecf432c..0880a37b6 100644
--- a/kernel/arch/s390/include/asm/thread_info.h
+++ b/kernel/arch/s390/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 2002, 2006
diff --git a/kernel/arch/s390/include/asm/timex.h b/kernel/arch/s390/include/asm/timex.h
index 93f2eb3f2..64539c221 100644
--- a/kernel/arch/s390/include/asm/timex.h
+++ b/kernel/arch/s390/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/include/asm/tlb.h b/kernel/arch/s390/include/asm/tlb.h
index 3a14b864b..457b7ba0f 100644
--- a/kernel/arch/s390/include/asm/tlb.h
+++ b/kernel/arch/s390/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_TLB_H
 #define _S390_TLB_H
 
diff --git a/kernel/arch/s390/include/asm/tlbflush.h b/kernel/arch/s390/include/asm/tlbflush.h
index b08d5bc26..8c840f090 100644
--- a/kernel/arch/s390/include/asm/tlbflush.h
+++ b/kernel/arch/s390/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_TLBFLUSH_H
 #define _S390_TLBFLUSH_H
 
diff --git a/kernel/arch/s390/include/asm/topology.h b/kernel/arch/s390/include/asm/topology.h
index 5222da162..55de4eb73 100644
--- a/kernel/arch/s390/include/asm/topology.h
+++ b/kernel/arch/s390/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390_TOPOLOGY_H
 #define _ASM_S390_TOPOLOGY_H
 
diff --git a/kernel/arch/s390/include/asm/trace/diag.h b/kernel/arch/s390/include/asm/trace/diag.h
index cc6cfe788..22fcac4ff 100644
--- a/kernel/arch/s390/include/asm/trace/diag.h
+++ b/kernel/arch/s390/include/asm/trace/diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Tracepoint header for s390 diagnose calls
  *
diff --git a/kernel/arch/s390/include/asm/trace/zcrypt.h b/kernel/arch/s390/include/asm/trace/zcrypt.h
index adcb77faf..457ddaa99 100644
--- a/kernel/arch/s390/include/asm/trace/zcrypt.h
+++ b/kernel/arch/s390/include/asm/trace/zcrypt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Tracepoint definitions for the s390 zcrypt device driver
  *
diff --git a/kernel/arch/s390/include/asm/uaccess.h b/kernel/arch/s390/include/asm/uaccess.h
index 304cfe44d..cdd0f0d99 100644
--- a/kernel/arch/s390/include/asm/uaccess.h
+++ b/kernel/arch/s390/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/asm/unistd.h b/kernel/arch/s390/include/asm/unistd.h
index 3066031a7..7807093b7 100644
--- a/kernel/arch/s390/include/asm/unistd.h
+++ b/kernel/arch/s390/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/uprobes.h b/kernel/arch/s390/include/asm/uprobes.h
index 658393c65..b60b3c7ef 100644
--- a/kernel/arch/s390/include/asm/uprobes.h
+++ b/kernel/arch/s390/include/asm/uprobes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    User-space Probes (UProbes) for s390
  *
diff --git a/kernel/arch/s390/include/asm/user.h b/kernel/arch/s390/include/asm/user.h
index 6ed1d1886..0ca572ced 100644
--- a/kernel/arch/s390/include/asm/user.h
+++ b/kernel/arch/s390/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/asm/vdso.h b/kernel/arch/s390/include/asm/vdso.h
index 88bdc477a..bb2ce7230 100644
--- a/kernel/arch/s390/include/asm/vdso.h
+++ b/kernel/arch/s390/include/asm/vdso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __S390_VDSO_H__
 #define __S390_VDSO_H__
 
diff --git a/kernel/arch/s390/include/asm/vtime.h b/kernel/arch/s390/include/asm/vtime.h
index af9896c53..3622d4ebc 100644
--- a/kernel/arch/s390/include/asm/vtime.h
+++ b/kernel/arch/s390/include/asm/vtime.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S390_VTIME_H
 #define _S390_VTIME_H
 
diff --git a/kernel/arch/s390/include/asm/vtimer.h b/kernel/arch/s390/include/asm/vtimer.h
index 10a179af6..42f707d1c 100644
--- a/kernel/arch/s390/include/asm/vtimer.h
+++ b/kernel/arch/s390/include/asm/vtimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2003, 2012
  *  Virtual CPU timer
diff --git a/kernel/arch/s390/include/asm/vx-insn.h b/kernel/arch/s390/include/asm/vx-insn.h
index 49c24a2af..266a72320 100644
--- a/kernel/arch/s390/include/asm/vx-insn.h
+++ b/kernel/arch/s390/include/asm/vx-insn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Support for Vector Instructions
  *
diff --git a/kernel/arch/s390/include/asm/xor.h b/kernel/arch/s390/include/asm/xor.h
index c988df744..857d6759b 100644
--- a/kernel/arch/s390/include/asm/xor.h
+++ b/kernel/arch/s390/include/asm/xor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Optimited xor routines
  *
diff --git a/kernel/arch/s390/include/uapi/asm/auxvec.h b/kernel/arch/s390/include/uapi/asm/auxvec.h
index c53e08442..a056c4637 100644
--- a/kernel/arch/s390/include/uapi/asm/auxvec.h
+++ b/kernel/arch/s390/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASMS390_AUXVEC_H
 #define __ASMS390_AUXVEC_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/bitsperlong.h b/kernel/arch/s390/include/uapi/asm/bitsperlong.h
index 6b235aea9..cceaf47b0 100644
--- a/kernel/arch/s390/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/s390/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_S390_BITSPERLONG_H
 #define __ASM_S390_BITSPERLONG_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/byteorder.h b/kernel/arch/s390/include/uapi/asm/byteorder.h
index a332e59e2..1442b57dd 100644
--- a/kernel/arch/s390/include/uapi/asm/byteorder.h
+++ b/kernel/arch/s390/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _S390_BYTEORDER_H
 #define _S390_BYTEORDER_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/chpid.h b/kernel/arch/s390/include/uapi/asm/chpid.h
index 6b4fb29cc..2ae2ed8c0 100644
--- a/kernel/arch/s390/include/uapi/asm/chpid.h
+++ b/kernel/arch/s390/include/uapi/asm/chpid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *    Copyright IBM Corp. 2007, 2012
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
diff --git a/kernel/arch/s390/include/uapi/asm/chsc.h b/kernel/arch/s390/include/uapi/asm/chsc.h
index 65dc69472..dc329aa03 100644
--- a/kernel/arch/s390/include/uapi/asm/chsc.h
+++ b/kernel/arch/s390/include/uapi/asm/chsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ioctl interface for /dev/chsc
  *
diff --git a/kernel/arch/s390/include/uapi/asm/clp.h b/kernel/arch/s390/include/uapi/asm/clp.h
index ab72d9d24..b36d9e9cd 100644
--- a/kernel/arch/s390/include/uapi/asm/clp.h
+++ b/kernel/arch/s390/include/uapi/asm/clp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ioctl interface for /dev/clp
  *
diff --git a/kernel/arch/s390/include/uapi/asm/cmb.h b/kernel/arch/s390/include/uapi/asm/cmb.h
index 0c086d00d..ecbe94941 100644
--- a/kernel/arch/s390/include/uapi/asm/cmb.h
+++ b/kernel/arch/s390/include/uapi/asm/cmb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPIS390_CMB_H
 #define _UAPIS390_CMB_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/dasd.h b/kernel/arch/s390/include/uapi/asm/dasd.h
index ab5797cdc..451c60140 100644
--- a/kernel/arch/s390/include/uapi/asm/dasd.h
+++ b/kernel/arch/s390/include/uapi/asm/dasd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* 
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
diff --git a/kernel/arch/s390/include/uapi/asm/debug.h b/kernel/arch/s390/include/uapi/asm/debug.h
index c59fc7912..c7c564d9a 100644
--- a/kernel/arch/s390/include/uapi/asm/debug.h
+++ b/kernel/arch/s390/include/uapi/asm/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *   S/390 debug facility
  *
diff --git a/kernel/arch/s390/include/uapi/asm/guarded_storage.h b/kernel/arch/s390/include/uapi/asm/guarded_storage.h
index 852850e8e..666af1c33 100644
--- a/kernel/arch/s390/include/uapi/asm/guarded_storage.h
+++ b/kernel/arch/s390/include/uapi/asm/guarded_storage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _GUARDED_STORAGE_H
 #define _GUARDED_STORAGE_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/hypfs.h b/kernel/arch/s390/include/uapi/asm/hypfs.h
index b3fe12d8d..fe6174e14 100644
--- a/kernel/arch/s390/include/uapi/asm/hypfs.h
+++ b/kernel/arch/s390/include/uapi/asm/hypfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Structures for hypfs interface
  *
diff --git a/kernel/arch/s390/include/uapi/asm/ioctls.h b/kernel/arch/s390/include/uapi/asm/ioctls.h
index 960a4c1eb..342a3284e 100644
--- a/kernel/arch/s390/include/uapi/asm/ioctls.h
+++ b/kernel/arch/s390/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ARCH_S390_IOCTLS_H__
 #define __ARCH_S390_IOCTLS_H__
 
diff --git a/kernel/arch/s390/include/uapi/asm/ipcbuf.h b/kernel/arch/s390/include/uapi/asm/ipcbuf.h
index 37f293d12..5b1c4f47c 100644
--- a/kernel/arch/s390/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/s390/include/uapi/asm/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __S390_IPCBUF_H__
 #define __S390_IPCBUF_H__
 
diff --git a/kernel/arch/s390/include/uapi/asm/kvm.h b/kernel/arch/s390/include/uapi/asm/kvm.h
index cd7359e23..9ad172dcd 100644
--- a/kernel/arch/s390/include/uapi/asm/kvm.h
+++ b/kernel/arch/s390/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_KVM_S390_H
 #define __LINUX_KVM_S390_H
 /*
diff --git a/kernel/arch/s390/include/uapi/asm/kvm_para.h b/kernel/arch/s390/include/uapi/asm/kvm_para.h
index ff1f4e7b3..0dc86b3a7 100644
--- a/kernel/arch/s390/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/s390/include/uapi/asm/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * User API definitions for paravirtual devices on s390
  *
diff --git a/kernel/arch/s390/include/uapi/asm/kvm_perf.h b/kernel/arch/s390/include/uapi/asm/kvm_perf.h
index 397282727..c36c97ffd 100644
--- a/kernel/arch/s390/include/uapi/asm/kvm_perf.h
+++ b/kernel/arch/s390/include/uapi/asm/kvm_perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for perf-kvm on s390
  *
diff --git a/kernel/arch/s390/include/uapi/asm/kvm_virtio.h b/kernel/arch/s390/include/uapi/asm/kvm_virtio.h
index 44a438ca9..73283677a 100644
--- a/kernel/arch/s390/include/uapi/asm/kvm_virtio.h
+++ b/kernel/arch/s390/include/uapi/asm/kvm_virtio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * definition for virtio for kvm on s390
  *
diff --git a/kernel/arch/s390/include/uapi/asm/monwriter.h b/kernel/arch/s390/include/uapi/asm/monwriter.h
index f845c8e2f..03d172f31 100644
--- a/kernel/arch/s390/include/uapi/asm/monwriter.h
+++ b/kernel/arch/s390/include/uapi/asm/monwriter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright IBM Corp. 2006
  * Character device driver for writing z/VM APPLDATA monitor records
diff --git a/kernel/arch/s390/include/uapi/asm/msgbuf.h b/kernel/arch/s390/include/uapi/asm/msgbuf.h
index 1bbdee927..604f847cd 100644
--- a/kernel/arch/s390/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/s390/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _S390_MSGBUF_H
 #define _S390_MSGBUF_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/pkey.h b/kernel/arch/s390/include/uapi/asm/pkey.h
index e6c04faf8..6f84a53c3 100644
--- a/kernel/arch/s390/include/uapi/asm/pkey.h
+++ b/kernel/arch/s390/include/uapi/asm/pkey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Userspace interface to the pkey device driver
  *
diff --git a/kernel/arch/s390/include/uapi/asm/posix_types.h b/kernel/arch/s390/include/uapi/asm/posix_types.h
index bf2a2ad2f..2a3fc6384 100644
--- a/kernel/arch/s390/include/uapi/asm/posix_types.h
+++ b/kernel/arch/s390/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/ptrace.h b/kernel/arch/s390/include/uapi/asm/ptrace.h
index 77630c74f..0d23c8ff2 100644
--- a/kernel/arch/s390/include/uapi/asm/ptrace.h
+++ b/kernel/arch/s390/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/uapi/asm/qeth.h b/kernel/arch/s390/include/uapi/asm/qeth.h
index 3a896cf52..fac9995df 100644
--- a/kernel/arch/s390/include/uapi/asm/qeth.h
+++ b/kernel/arch/s390/include/uapi/asm/qeth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ioctl definitions for qeth driver
  *
diff --git a/kernel/arch/s390/include/uapi/asm/schid.h b/kernel/arch/s390/include/uapi/asm/schid.h
index 32f3ab2a8..58fca6f48 100644
--- a/kernel/arch/s390/include/uapi/asm/schid.h
+++ b/kernel/arch/s390/include/uapi/asm/schid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPIASM_SCHID_H
 #define _UAPIASM_SCHID_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/sclp_ctl.h b/kernel/arch/s390/include/uapi/asm/sclp_ctl.h
index f2818613e..e4e8c4dcd 100644
--- a/kernel/arch/s390/include/uapi/asm/sclp_ctl.h
+++ b/kernel/arch/s390/include/uapi/asm/sclp_ctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * IOCTL interface for SCLP
  *
diff --git a/kernel/arch/s390/include/uapi/asm/sembuf.h b/kernel/arch/s390/include/uapi/asm/sembuf.h
index 32626b0ca..3e917697b 100644
--- a/kernel/arch/s390/include/uapi/asm/sembuf.h
+++ b/kernel/arch/s390/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _S390_SEMBUF_H
 #define _S390_SEMBUF_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/setup.h b/kernel/arch/s390/include/uapi/asm/setup.h
index 5a637e3e3..1f8803a31 100644
--- a/kernel/arch/s390/include/uapi/asm/setup.h
+++ b/kernel/arch/s390/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2010
diff --git a/kernel/arch/s390/include/uapi/asm/shmbuf.h b/kernel/arch/s390/include/uapi/asm/shmbuf.h
index eed2e280c..9cdce8d7c 100644
--- a/kernel/arch/s390/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/s390/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _S390_SHMBUF_H
 #define _S390_SHMBUF_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/sie.h b/kernel/arch/s390/include/uapi/asm/sie.h
index 3ac634368..6ca1e68d7 100644
--- a/kernel/arch/s390/include/uapi/asm/sie.h
+++ b/kernel/arch/s390/include/uapi/asm/sie.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_S390_SIE_H
 #define _UAPI_ASM_S390_SIE_H
 
diff --git a/kernel/arch/s390/include/uapi/asm/sigcontext.h b/kernel/arch/s390/include/uapi/asm/sigcontext.h
index 5f0b8d7dd..8b3503333 100644
--- a/kernel/arch/s390/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/s390/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/include/uapi/asm/siginfo.h b/kernel/arch/s390/include/uapi/asm/siginfo.h
index 91fd3e4b7..6984820f2 100644
--- a/kernel/arch/s390/include/uapi/asm/siginfo.h
+++ b/kernel/arch/s390/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/signal.h b/kernel/arch/s390/include/uapi/asm/signal.h
index 2f43cfbf5..c57f9d28d 100644
--- a/kernel/arch/s390/include/uapi/asm/signal.h
+++ b/kernel/arch/s390/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/socket.h b/kernel/arch/s390/include/uapi/asm/socket.h
index a56916c83..3510c0fd0 100644
--- a/kernel/arch/s390/include/uapi/asm/socket.h
+++ b/kernel/arch/s390/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/stat.h b/kernel/arch/s390/include/uapi/asm/stat.h
index b4ca97d91..ac253d236 100644
--- a/kernel/arch/s390/include/uapi/asm/stat.h
+++ b/kernel/arch/s390/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/statfs.h b/kernel/arch/s390/include/uapi/asm/statfs.h
index 471eb0918..72604f779 100644
--- a/kernel/arch/s390/include/uapi/asm/statfs.h
+++ b/kernel/arch/s390/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/tape390.h b/kernel/arch/s390/include/uapi/asm/tape390.h
index b2bc4bab7..90266c696 100644
--- a/kernel/arch/s390/include/uapi/asm/tape390.h
+++ b/kernel/arch/s390/include/uapi/asm/tape390.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*************************************************************************
  *
  *	   enables user programs to display messages and control encryption
diff --git a/kernel/arch/s390/include/uapi/asm/termios.h b/kernel/arch/s390/include/uapi/asm/termios.h
index 554f973db..54223169c 100644
--- a/kernel/arch/s390/include/uapi/asm/termios.h
+++ b/kernel/arch/s390/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/types.h b/kernel/arch/s390/include/uapi/asm/types.h
index 3c3951e34..da034c606 100644
--- a/kernel/arch/s390/include/uapi/asm/types.h
+++ b/kernel/arch/s390/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/ucontext.h b/kernel/arch/s390/include/uapi/asm/ucontext.h
index 64a69aa5d..c95f42e85 100644
--- a/kernel/arch/s390/include/uapi/asm/ucontext.h
+++ b/kernel/arch/s390/include/uapi/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/unistd.h b/kernel/arch/s390/include/uapi/asm/unistd.h
index ea42290e7..b52bce8ee 100644
--- a/kernel/arch/s390/include/uapi/asm/unistd.h
+++ b/kernel/arch/s390/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  S390 version
  *
diff --git a/kernel/arch/s390/include/uapi/asm/virtio-ccw.h b/kernel/arch/s390/include/uapi/asm/virtio-ccw.h
index a9a4ebf79..967aad390 100644
--- a/kernel/arch/s390/include/uapi/asm/virtio-ccw.h
+++ b/kernel/arch/s390/include/uapi/asm/virtio-ccw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for virtio-ccw devices.
  *
diff --git a/kernel/arch/s390/include/uapi/asm/vtoc.h b/kernel/arch/s390/include/uapi/asm/vtoc.h
index 221419de2..50c1d7b9e 100644
--- a/kernel/arch/s390/include/uapi/asm/vtoc.h
+++ b/kernel/arch/s390/include/uapi/asm/vtoc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file contains volume label definitions for DASD devices.
  *
diff --git a/kernel/arch/s390/include/uapi/asm/zcrypt.h b/kernel/arch/s390/include/uapi/asm/zcrypt.h
index a777f87ef..137ef4735 100644
--- a/kernel/arch/s390/include/uapi/asm/zcrypt.h
+++ b/kernel/arch/s390/include/uapi/asm/zcrypt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  include/asm-s390/zcrypt.h
  *
diff --git a/kernel/arch/s390/kernel/Makefile b/kernel/arch/s390/kernel/Makefile
index adb3fe2e3..4ce2d0592 100644
--- a/kernel/arch/s390/kernel/Makefile
+++ b/kernel/arch/s390/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/s390/kernel/als.c b/kernel/arch/s390/kernel/als.c
index 14769eb52..d1892bf36 100644
--- a/kernel/arch/s390/kernel/als.c
+++ b/kernel/arch/s390/kernel/als.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2016
  */
diff --git a/kernel/arch/s390/kernel/asm-offsets.c b/kernel/arch/s390/kernel/asm-offsets.c
index 3d42f91c9..0e6d2b032 100644
--- a/kernel/arch/s390/kernel/asm-offsets.c
+++ b/kernel/arch/s390/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed to extract
diff --git a/kernel/arch/s390/kernel/audit.c b/kernel/arch/s390/kernel/audit.c
index f4932c22e..d395c6c99 100644
--- a/kernel/arch/s390/kernel/audit.c
+++ b/kernel/arch/s390/kernel/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/arch/s390/kernel/audit.h b/kernel/arch/s390/kernel/audit.h
index 12b56f4b5..4d4b59641 100644
--- a/kernel/arch/s390/kernel/audit.h
+++ b/kernel/arch/s390/kernel/audit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_S390_KERNEL_AUDIT_H
 #define __ARCH_S390_KERNEL_AUDIT_H
 
diff --git a/kernel/arch/s390/kernel/base.S b/kernel/arch/s390/kernel/base.S
index 326f717df..f6c56009e 100644
--- a/kernel/arch/s390/kernel/base.S
+++ b/kernel/arch/s390/kernel/base.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  arch/s390/kernel/base.S
  *
diff --git a/kernel/arch/s390/kernel/cache.c b/kernel/arch/s390/kernel/cache.c
index c8a83276a..d66825e53 100644
--- a/kernel/arch/s390/kernel/cache.c
+++ b/kernel/arch/s390/kernel/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Extract CPU cache information and expose them via sysfs.
  *
diff --git a/kernel/arch/s390/kernel/compat_audit.c b/kernel/arch/s390/kernel/compat_audit.c
index d6487bf87..444fb1f66 100644
--- a/kernel/arch/s390/kernel/compat_audit.c
+++ b/kernel/arch/s390/kernel/compat_audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef __s390x__
 #include <asm/unistd.h>
 #include "audit.h"
diff --git a/kernel/arch/s390/kernel/compat_linux.c b/kernel/arch/s390/kernel/compat_linux.c
index a3d14161a..f04db3779 100644
--- a/kernel/arch/s390/kernel/compat_linux.c
+++ b/kernel/arch/s390/kernel/compat_linux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  S390 version
  *    Copyright IBM Corp. 2000
diff --git a/kernel/arch/s390/kernel/compat_linux.h b/kernel/arch/s390/kernel/compat_linux.h
index a0a886c04..64509e7db 100644
--- a/kernel/arch/s390/kernel/compat_linux.h
+++ b/kernel/arch/s390/kernel/compat_linux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_S390X_S390_H
 #define _ASM_S390X_S390_H
 
diff --git a/kernel/arch/s390/kernel/compat_ptrace.h b/kernel/arch/s390/kernel/compat_ptrace.h
index 12b823833..3c400fc7e 100644
--- a/kernel/arch/s390/kernel/compat_ptrace.h
+++ b/kernel/arch/s390/kernel/compat_ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PTRACE32_H
 #define _PTRACE32_H
 
diff --git a/kernel/arch/s390/kernel/compat_signal.c b/kernel/arch/s390/kernel/compat_signal.c
index f549c4657..a4a1208e3 100644
--- a/kernel/arch/s390/kernel/compat_signal.c
+++ b/kernel/arch/s390/kernel/compat_signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2000, 2006
  *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
diff --git a/kernel/arch/s390/kernel/compat_wrapper.c b/kernel/arch/s390/kernel/compat_wrapper.c
index 986642a35..d04918583 100644
--- a/kernel/arch/s390/kernel/compat_wrapper.c
+++ b/kernel/arch/s390/kernel/compat_wrapper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Compat system call wrappers.
  *
diff --git a/kernel/arch/s390/kernel/cpcmd.c b/kernel/arch/s390/kernel/cpcmd.c
index 63bc6603e..af013b424 100644
--- a/kernel/arch/s390/kernel/cpcmd.c
+++ b/kernel/arch/s390/kernel/cpcmd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2007
diff --git a/kernel/arch/s390/kernel/crash_dump.c b/kernel/arch/s390/kernel/crash_dump.c
index d628afc26..9f5ea9d87 100644
--- a/kernel/arch/s390/kernel/crash_dump.c
+++ b/kernel/arch/s390/kernel/crash_dump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * S390 kdump implementation
  *
diff --git a/kernel/arch/s390/kernel/debug.c b/kernel/arch/s390/kernel/debug.c
index 1d9e83c40..05a9cf4ae 100644
--- a/kernel/arch/s390/kernel/debug.c
+++ b/kernel/arch/s390/kernel/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *   S/390 debug facility
  *
diff --git a/kernel/arch/s390/kernel/diag.c b/kernel/arch/s390/kernel/diag.c
index 349914571..53a5316cc 100644
--- a/kernel/arch/s390/kernel/diag.c
+++ b/kernel/arch/s390/kernel/diag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of s390 diagnose codes
  *
diff --git a/kernel/arch/s390/kernel/early.c b/kernel/arch/s390/kernel/early.c
index 60181caf8..b945448b9 100644
--- a/kernel/arch/s390/kernel/early.c
+++ b/kernel/arch/s390/kernel/early.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2007, 2009
  *    Author(s): Hongjie Yang <hongjie@us.ibm.com>,
diff --git a/kernel/arch/s390/kernel/early_printk.c b/kernel/arch/s390/kernel/early_printk.c
index 819cb15c6..9431784d7 100644
--- a/kernel/arch/s390/kernel/early_printk.c
+++ b/kernel/arch/s390/kernel/early_printk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2017
  */
diff --git a/kernel/arch/s390/kernel/ebcdic.c b/kernel/arch/s390/kernel/ebcdic.c
index 1d5392b36..c15caeab1 100644
--- a/kernel/arch/s390/kernel/ebcdic.c
+++ b/kernel/arch/s390/kernel/ebcdic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    ECBDIC -> ASCII, ASCII -> ECBDIC,
  *    upper to lower case (EBCDIC) conversion tables.
diff --git a/kernel/arch/s390/kernel/entry.S b/kernel/arch/s390/kernel/entry.S
index d185aa396..7c6904d61 100644
--- a/kernel/arch/s390/kernel/entry.S
+++ b/kernel/arch/s390/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    S390 low-level entry points.
  *
diff --git a/kernel/arch/s390/kernel/entry.h b/kernel/arch/s390/kernel/entry.h
index dbf5f7e18..905bde782 100644
--- a/kernel/arch/s390/kernel/entry.h
+++ b/kernel/arch/s390/kernel/entry.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ENTRY_H
 #define _ENTRY_H
 
diff --git a/kernel/arch/s390/kernel/fpu.c b/kernel/arch/s390/kernel/fpu.c
index 1235b9438..594464f21 100644
--- a/kernel/arch/s390/kernel/fpu.c
+++ b/kernel/arch/s390/kernel/fpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * In-kernel vector facility support functions
  *
diff --git a/kernel/arch/s390/kernel/ftrace.c b/kernel/arch/s390/kernel/ftrace.c
index d03a6d12c..dc76d813e 100644
--- a/kernel/arch/s390/kernel/ftrace.c
+++ b/kernel/arch/s390/kernel/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dynamic function tracer architecture backend.
  *
diff --git a/kernel/arch/s390/kernel/guarded_storage.c b/kernel/arch/s390/kernel/guarded_storage.c
index 6f064745c..bff39b66c 100644
--- a/kernel/arch/s390/kernel/guarded_storage.c
+++ b/kernel/arch/s390/kernel/guarded_storage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2016
  * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/arch/s390/kernel/head.S b/kernel/arch/s390/kernel/head.S
index 8ed753c72..b86fa3ee4 100644
--- a/kernel/arch/s390/kernel/head.S
+++ b/kernel/arch/s390/kernel/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2010
  *
diff --git a/kernel/arch/s390/kernel/head64.S b/kernel/arch/s390/kernel/head64.S
index 0d8f2a858..172002da7 100644
--- a/kernel/arch/s390/kernel/head64.S
+++ b/kernel/arch/s390/kernel/head64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999, 2010
  *
diff --git a/kernel/arch/s390/kernel/head_kdump.S b/kernel/arch/s390/kernel/head_kdump.S
index d05950f02..174d6959b 100644
--- a/kernel/arch/s390/kernel/head_kdump.S
+++ b/kernel/arch/s390/kernel/head_kdump.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * S390 kdump lowlevel functions (new kernel)
  *
diff --git a/kernel/arch/s390/kernel/idle.c b/kernel/arch/s390/kernel/idle.c
index 9340b2a07..b9d8fe457 100644
--- a/kernel/arch/s390/kernel/idle.c
+++ b/kernel/arch/s390/kernel/idle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Idle functions for s390.
  *
diff --git a/kernel/arch/s390/kernel/irq.c b/kernel/arch/s390/kernel/irq.c
index a2fdff0e7..94f2099bc 100644
--- a/kernel/arch/s390/kernel/irq.c
+++ b/kernel/arch/s390/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2004, 2011
  *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
diff --git a/kernel/arch/s390/kernel/jump_label.c b/kernel/arch/s390/kernel/jump_label.c
index 262506cee..43f8430fb 100644
--- a/kernel/arch/s390/kernel/jump_label.c
+++ b/kernel/arch/s390/kernel/jump_label.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Jump label s390 support
  *
diff --git a/kernel/arch/s390/kernel/kdebugfs.c b/kernel/arch/s390/kernel/kdebugfs.c
index ee85e17dd..2c46bd6c6 100644
--- a/kernel/arch/s390/kernel/kdebugfs.c
+++ b/kernel/arch/s390/kernel/kdebugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/debugfs.h>
 #include <linux/export.h>
 #include <linux/init.h>
diff --git a/kernel/arch/s390/kernel/machine_kexec.c b/kernel/arch/s390/kernel/machine_kexec.c
index 3d0b14afa..b0ba2c26b 100644
--- a/kernel/arch/s390/kernel/machine_kexec.c
+++ b/kernel/arch/s390/kernel/machine_kexec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2005, 2011
  *
diff --git a/kernel/arch/s390/kernel/mcount.S b/kernel/arch/s390/kernel/mcount.S
index 9a17e4475..82df7d80f 100644
--- a/kernel/arch/s390/kernel/mcount.S
+++ b/kernel/arch/s390/kernel/mcount.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2008, 2009
  *
diff --git a/kernel/arch/s390/kernel/os_info.c b/kernel/arch/s390/kernel/os_info.c
index 753ba6318..0a5e4bafb 100644
--- a/kernel/arch/s390/kernel/os_info.c
+++ b/kernel/arch/s390/kernel/os_info.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OS info memory interface
  *
diff --git a/kernel/arch/s390/kernel/perf_cpum_cf_events.c b/kernel/arch/s390/kernel/perf_cpum_cf_events.c
index d3133285b..08bfa17ba 100644
--- a/kernel/arch/s390/kernel/perf_cpum_cf_events.c
+++ b/kernel/arch/s390/kernel/perf_cpum_cf_events.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Perf PMU sysfs events attributes for available CPU-measurement counters
  *
diff --git a/kernel/arch/s390/kernel/pgm_check.S b/kernel/arch/s390/kernel/pgm_check.S
index 036aa01d0..3e62aae34 100644
--- a/kernel/arch/s390/kernel/pgm_check.S
+++ b/kernel/arch/s390/kernel/pgm_check.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Program check table.
  *
diff --git a/kernel/arch/s390/kernel/process.c b/kernel/arch/s390/kernel/process.c
index bb32b8618..a4a84fb08 100644
--- a/kernel/arch/s390/kernel/process.c
+++ b/kernel/arch/s390/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file handles the architecture dependent parts of process handling.
  *
diff --git a/kernel/arch/s390/kernel/processor.c b/kernel/arch/s390/kernel/processor.c
index 778cd6536..5362fd868 100644
--- a/kernel/arch/s390/kernel/processor.c
+++ b/kernel/arch/s390/kernel/processor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright IBM Corp. 2008
  *  Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
diff --git a/kernel/arch/s390/kernel/ptrace.c b/kernel/arch/s390/kernel/ptrace.c
index 252ed61a1..1427d60ce 100644
--- a/kernel/arch/s390/kernel/ptrace.c
+++ b/kernel/arch/s390/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Ptrace user space interface.
  *
diff --git a/kernel/arch/s390/kernel/reipl.S b/kernel/arch/s390/kernel/reipl.S
index 89ea8c213..a40ebd1d2 100644
--- a/kernel/arch/s390/kernel/reipl.S
+++ b/kernel/arch/s390/kernel/reipl.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp 2000, 2011
  *    Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,
diff --git a/kernel/arch/s390/kernel/relocate_kernel.S b/kernel/arch/s390/kernel/relocate_kernel.S
index 4bdc65636..ca37e5d5b 100644
--- a/kernel/arch/s390/kernel/relocate_kernel.S
+++ b/kernel/arch/s390/kernel/relocate_kernel.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2005
  *
diff --git a/kernel/arch/s390/kernel/runtime_instr.c b/kernel/arch/s390/kernel/runtime_instr.c
index 429d3a782..32aefb215 100644
--- a/kernel/arch/s390/kernel/runtime_instr.c
+++ b/kernel/arch/s390/kernel/runtime_instr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2012
  * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
diff --git a/kernel/arch/s390/kernel/signal.c b/kernel/arch/s390/kernel/signal.c
index 289dd50f9..2d2960ab3 100644
--- a/kernel/arch/s390/kernel/signal.c
+++ b/kernel/arch/s390/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 1999, 2006
  *    Author(s): Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
diff --git a/kernel/arch/s390/kernel/smp.c b/kernel/arch/s390/kernel/smp.c
index 495ff6959..092c4154a 100644
--- a/kernel/arch/s390/kernel/smp.c
+++ b/kernel/arch/s390/kernel/smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  SMP related functions
  *
diff --git a/kernel/arch/s390/kernel/suspend.c b/kernel/arch/s390/kernel/suspend.c
index c8ea715bf..a8af9c825 100644
--- a/kernel/arch/s390/kernel/suspend.c
+++ b/kernel/arch/s390/kernel/suspend.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Suspend support specific for s390.
  *
diff --git a/kernel/arch/s390/kernel/swsusp.S b/kernel/arch/s390/kernel/swsusp.S
index 6bebc935e..e99187149 100644
--- a/kernel/arch/s390/kernel/swsusp.S
+++ b/kernel/arch/s390/kernel/swsusp.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * S390 64-bit swsusp implementation
  *
diff --git a/kernel/arch/s390/kernel/sys_s390.c b/kernel/arch/s390/kernel/sys_s390.c
index b7af45297..0090037ab 100644
--- a/kernel/arch/s390/kernel/sys_s390.c
+++ b/kernel/arch/s390/kernel/sys_s390.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/kernel/syscalls.S b/kernel/arch/s390/kernel/syscalls.S
index 54fce7b06..d39f121e6 100644
--- a/kernel/arch/s390/kernel/syscalls.S
+++ b/kernel/arch/s390/kernel/syscalls.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * definitions for sys_call_table, each line represents an
  * entry in the table in the form
diff --git a/kernel/arch/s390/kernel/sysinfo.c b/kernel/arch/s390/kernel/sysinfo.c
index fb869b103..a441cba8d 100644
--- a/kernel/arch/s390/kernel/sysinfo.c
+++ b/kernel/arch/s390/kernel/sysinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright IBM Corp. 2001, 2009
  *  Author(s): Ulrich Weigand <Ulrich.Weigand@de.ibm.com>,
diff --git a/kernel/arch/s390/kernel/trace.c b/kernel/arch/s390/kernel/trace.c
index dde7654f5..490b52e85 100644
--- a/kernel/arch/s390/kernel/trace.c
+++ b/kernel/arch/s390/kernel/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tracepoint definitions for s390
  *
diff --git a/kernel/arch/s390/kernel/traps.c b/kernel/arch/s390/kernel/traps.c
index 442e5423c..a5297a22b 100644
--- a/kernel/arch/s390/kernel/traps.c
+++ b/kernel/arch/s390/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999, 2000
diff --git a/kernel/arch/s390/kernel/uprobes.c b/kernel/arch/s390/kernel/uprobes.c
index d94baa8db..d9d1f512f 100644
--- a/kernel/arch/s390/kernel/uprobes.c
+++ b/kernel/arch/s390/kernel/uprobes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  User-space Probes (UProbes) for s390
  *
diff --git a/kernel/arch/s390/kernel/vdso32/Makefile b/kernel/arch/s390/kernel/vdso32/Makefile
index 6cc947896..308564b9b 100644
--- a/kernel/arch/s390/kernel/vdso32/Makefile
+++ b/kernel/arch/s390/kernel/vdso32/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # List of files in the vdso, has to be asm only for now
 
 KCOV_INSTRUMENT := n
diff --git a/kernel/arch/s390/kernel/vdso32/getcpu.S b/kernel/arch/s390/kernel/vdso32/getcpu.S
index c1ed0b720..6e30769dd 100644
--- a/kernel/arch/s390/kernel/vdso32/getcpu.S
+++ b/kernel/arch/s390/kernel/vdso32/getcpu.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Userland implementation of getcpu() for 32 bits processes in a
  * s390 kernel for use in the vDSO
diff --git a/kernel/arch/s390/kernel/vdso32/note.S b/kernel/arch/s390/kernel/vdso32/note.S
index 79a071e43..db19d0680 100644
--- a/kernel/arch/s390/kernel/vdso32/note.S
+++ b/kernel/arch/s390/kernel/vdso32/note.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
  * Here we can supply some information useful to userland.
diff --git a/kernel/arch/s390/kernel/vdso32/vdso32.lds.S b/kernel/arch/s390/kernel/vdso32/vdso32.lds.S
index 263a7f9ee..721c4954c 100644
--- a/kernel/arch/s390/kernel/vdso32/vdso32.lds.S
+++ b/kernel/arch/s390/kernel/vdso32/vdso32.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is the infamous ld script for the 32 bits vdso
  * library
diff --git a/kernel/arch/s390/kernel/vdso32/vdso32_wrapper.S b/kernel/arch/s390/kernel/vdso32/vdso32_wrapper.S
index ae42f8ce3..de2fb9304 100644
--- a/kernel/arch/s390/kernel/vdso32/vdso32_wrapper.S
+++ b/kernel/arch/s390/kernel/vdso32/vdso32_wrapper.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <asm/page.h>
diff --git a/kernel/arch/s390/kernel/vdso64/Makefile b/kernel/arch/s390/kernel/vdso64/Makefile
index 2d54c1808..f81ae7998 100644
--- a/kernel/arch/s390/kernel/vdso64/Makefile
+++ b/kernel/arch/s390/kernel/vdso64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # List of files in the vdso, has to be asm only for now
 
 KCOV_INSTRUMENT := n
diff --git a/kernel/arch/s390/kernel/vdso64/getcpu.S b/kernel/arch/s390/kernel/vdso64/getcpu.S
index 4cbe98291..43983764b 100644
--- a/kernel/arch/s390/kernel/vdso64/getcpu.S
+++ b/kernel/arch/s390/kernel/vdso64/getcpu.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Userland implementation of getcpu() for 64 bits processes in a
  * s390 kernel for use in the vDSO
diff --git a/kernel/arch/s390/kernel/vdso64/vdso64.lds.S b/kernel/arch/s390/kernel/vdso64/vdso64.lds.S
index 9e3dbbcc1..7ddb116b5 100644
--- a/kernel/arch/s390/kernel/vdso64/vdso64.lds.S
+++ b/kernel/arch/s390/kernel/vdso64/vdso64.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is the infamous ld script for the 64 bits vdso
  * library
diff --git a/kernel/arch/s390/kernel/vdso64/vdso64_wrapper.S b/kernel/arch/s390/kernel/vdso64/vdso64_wrapper.S
index c245842b5..672184998 100644
--- a/kernel/arch/s390/kernel/vdso64/vdso64_wrapper.S
+++ b/kernel/arch/s390/kernel/vdso64/vdso64_wrapper.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <asm/page.h>
diff --git a/kernel/arch/s390/kernel/vmlinux.lds.S b/kernel/arch/s390/kernel/vmlinux.lds.S
index 6e2c42bd1..96a713a47 100644
--- a/kernel/arch/s390/kernel/vmlinux.lds.S
+++ b/kernel/arch/s390/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script to make s390 Linux kernel
  * Written by Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
diff --git a/kernel/arch/s390/kvm/Kconfig b/kernel/arch/s390/kvm/Kconfig
index b1900239b..9a4594e0a 100644
--- a/kernel/arch/s390/kvm/Kconfig
+++ b/kernel/arch/s390/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/s390/kvm/gaccess.c b/kernel/arch/s390/kvm/gaccess.c
index 3cc77391a..c24bfa72b 100644
--- a/kernel/arch/s390/kvm/gaccess.c
+++ b/kernel/arch/s390/kvm/gaccess.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * guest access functions
  *
diff --git a/kernel/arch/s390/kvm/trace-s390.h b/kernel/arch/s390/kvm/trace-s390.h
index 78b7e8479..6f0209d45 100644
--- a/kernel/arch/s390/kvm/trace-s390.h
+++ b/kernel/arch/s390/kvm/trace-s390.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVMS390_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVMS390_H
 
diff --git a/kernel/arch/s390/kvm/trace.h b/kernel/arch/s390/kvm/trace.h
index 4fc9d4e5b..aa419eb6a 100644
--- a/kernel/arch/s390/kvm/trace.h
+++ b/kernel/arch/s390/kvm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_H
 
diff --git a/kernel/arch/s390/lib/Makefile b/kernel/arch/s390/lib/Makefile
index 1d1af31e8..9bfe08026 100644
--- a/kernel/arch/s390/lib/Makefile
+++ b/kernel/arch/s390/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for s390-specific library files..
 #
diff --git a/kernel/arch/s390/lib/delay.c b/kernel/arch/s390/lib/delay.c
index 7f17555ad..d4aa10795 100644
--- a/kernel/arch/s390/lib/delay.c
+++ b/kernel/arch/s390/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Precise Delay Loops for S390
  *
diff --git a/kernel/arch/s390/lib/find.c b/kernel/arch/s390/lib/find.c
index d90b9245e..96a8a2e2d 100644
--- a/kernel/arch/s390/lib/find.c
+++ b/kernel/arch/s390/lib/find.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MSB0 numbered special bitops handling.
  *
diff --git a/kernel/arch/s390/lib/mem.S b/kernel/arch/s390/lib/mem.S
index 7ff79a4ff..d66751397 100644
--- a/kernel/arch/s390/lib/mem.S
+++ b/kernel/arch/s390/lib/mem.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * String handling functions.
  *
diff --git a/kernel/arch/s390/lib/probes.c b/kernel/arch/s390/lib/probes.c
index 1963ddbf4..1e184a034 100644
--- a/kernel/arch/s390/lib/probes.c
+++ b/kernel/arch/s390/lib/probes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Common helper functions for kprobes and uprobes
  *
diff --git a/kernel/arch/s390/lib/spinlock.c b/kernel/arch/s390/lib/spinlock.c
index b12663d65..1dc85f552 100644
--- a/kernel/arch/s390/lib/spinlock.c
+++ b/kernel/arch/s390/lib/spinlock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Out of line spinlock code.
  *
diff --git a/kernel/arch/s390/lib/string.c b/kernel/arch/s390/lib/string.c
index 4ee27339c..dbf2fdad2 100644
--- a/kernel/arch/s390/lib/string.c
+++ b/kernel/arch/s390/lib/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Optimized string functions
  *
diff --git a/kernel/arch/s390/lib/uaccess.c b/kernel/arch/s390/lib/uaccess.c
index 4ea910641..802903c50 100644
--- a/kernel/arch/s390/lib/uaccess.c
+++ b/kernel/arch/s390/lib/uaccess.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Standard user space access functions based on mvcp/mvcs and doing
  *  interesting things in the secondary space mode.
diff --git a/kernel/arch/s390/lib/xor.c b/kernel/arch/s390/lib/xor.c
index b4fd05c36..96580590c 100644
--- a/kernel/arch/s390/lib/xor.c
+++ b/kernel/arch/s390/lib/xor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Optimized xor_block operation for RAID4/5
  *
diff --git a/kernel/arch/s390/mm/Makefile b/kernel/arch/s390/mm/Makefile
index 0aa0ad165..33fe41850 100644
--- a/kernel/arch/s390/mm/Makefile
+++ b/kernel/arch/s390/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux s390-specific parts of the memory manager.
 #
diff --git a/kernel/arch/s390/mm/dump_pagetables.c b/kernel/arch/s390/mm/dump_pagetables.c
index 049c3c455..507f23ba2 100644
--- a/kernel/arch/s390/mm/dump_pagetables.c
+++ b/kernel/arch/s390/mm/dump_pagetables.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/sched.h>
diff --git a/kernel/arch/s390/mm/extmem.c b/kernel/arch/s390/mm/extmem.c
index 9f118629b..920d40894 100644
--- a/kernel/arch/s390/mm/extmem.c
+++ b/kernel/arch/s390/mm/extmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Carsten Otte <cotte@de.ibm.com>
  * 		    Rob M van der Heij <rvdheij@nl.ibm.com>
diff --git a/kernel/arch/s390/mm/fault.c b/kernel/arch/s390/mm/fault.c
index bdabb0135..242b78c0a 100644
--- a/kernel/arch/s390/mm/fault.c
+++ b/kernel/arch/s390/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/mm/gup.c b/kernel/arch/s390/mm/gup.c
index 98ffe3ee9..05c8abd86 100644
--- a/kernel/arch/s390/mm/gup.c
+++ b/kernel/arch/s390/mm/gup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Lockless get_user_pages_fast for s390
  *
diff --git a/kernel/arch/s390/mm/hugetlbpage.c b/kernel/arch/s390/mm/hugetlbpage.c
index 44a8e6f03..e804090f4 100644
--- a/kernel/arch/s390/mm/hugetlbpage.c
+++ b/kernel/arch/s390/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  IBM System z Huge TLB Page Support for Kernel.
  *
diff --git a/kernel/arch/s390/mm/init.c b/kernel/arch/s390/mm/init.c
index 3b567838b..41ba9bd53 100644
--- a/kernel/arch/s390/mm/init.c
+++ b/kernel/arch/s390/mm/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  S390 version
  *    Copyright IBM Corp. 1999
diff --git a/kernel/arch/s390/mm/maccess.c b/kernel/arch/s390/mm/maccess.c
index 792f9c63f..7be064758 100644
--- a/kernel/arch/s390/mm/maccess.c
+++ b/kernel/arch/s390/mm/maccess.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Access kernel memory without faulting -- s390 specific implementation.
  *
diff --git a/kernel/arch/s390/mm/mem_detect.c b/kernel/arch/s390/mm/mem_detect.c
index e58dca05b..21f6c82c8 100644
--- a/kernel/arch/s390/mm/mem_detect.c
+++ b/kernel/arch/s390/mm/mem_detect.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2008, 2009
  *
diff --git a/kernel/arch/s390/mm/page-states.c b/kernel/arch/s390/mm/page-states.c
index 07fa7b8ae..382153ff1 100644
--- a/kernel/arch/s390/mm/page-states.c
+++ b/kernel/arch/s390/mm/page-states.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2008
  *
diff --git a/kernel/arch/s390/mm/pageattr.c b/kernel/arch/s390/mm/pageattr.c
index 552f898df..c44171588 100644
--- a/kernel/arch/s390/mm/pageattr.c
+++ b/kernel/arch/s390/mm/pageattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2011
  * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
diff --git a/kernel/arch/s390/mm/pgalloc.c b/kernel/arch/s390/mm/pgalloc.c
index 05f1f27e6..cc2faffa7 100644
--- a/kernel/arch/s390/mm/pgalloc.c
+++ b/kernel/arch/s390/mm/pgalloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Page table allocation functions
  *
diff --git a/kernel/arch/s390/mm/vmem.c b/kernel/arch/s390/mm/vmem.c
index c0af0d7b6..f2ada0bc0 100644
--- a/kernel/arch/s390/mm/vmem.c
+++ b/kernel/arch/s390/mm/vmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2006
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/kernel/arch/s390/net/bpf_jit.S b/kernel/arch/s390/net/bpf_jit.S
index a1c917d88..25bb4643c 100644
--- a/kernel/arch/s390/net/bpf_jit.S
+++ b/kernel/arch/s390/net/bpf_jit.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * BPF Jit compiler for s390, help functions.
  *
diff --git a/kernel/arch/s390/net/bpf_jit.h b/kernel/arch/s390/net/bpf_jit.h
index fda605dbc..7fa55ccff 100644
--- a/kernel/arch/s390/net/bpf_jit.h
+++ b/kernel/arch/s390/net/bpf_jit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * BPF Jit compiler defines
  *
diff --git a/kernel/arch/s390/net/bpf_jit_comp.c b/kernel/arch/s390/net/bpf_jit_comp.c
index 8ec88497a..b15cd2f03 100644
--- a/kernel/arch/s390/net/bpf_jit_comp.c
+++ b/kernel/arch/s390/net/bpf_jit_comp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * BPF Jit compiler for s390.
  *
diff --git a/kernel/arch/s390/numa/mode_emu.c b/kernel/arch/s390/numa/mode_emu.c
index cfd08384f..83b222c57 100644
--- a/kernel/arch/s390/numa/mode_emu.c
+++ b/kernel/arch/s390/numa/mode_emu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/numa/numa.c b/kernel/arch/s390/numa/numa.c
index f576f1073..06a80434c 100644
--- a/kernel/arch/s390/numa/numa.c
+++ b/kernel/arch/s390/numa/numa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/numa/numa_mode.h b/kernel/arch/s390/numa/numa_mode.h
index 08953b0b1..dfd3e2784 100644
--- a/kernel/arch/s390/numa/numa_mode.h
+++ b/kernel/arch/s390/numa/numa_mode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/numa/toptree.c b/kernel/arch/s390/numa/toptree.c
index 26f622b1c..21d1e8a15 100644
--- a/kernel/arch/s390/numa/toptree.c
+++ b/kernel/arch/s390/numa/toptree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/numa/toptree.h b/kernel/arch/s390/numa/toptree.h
index bdf502027..5246371ec 100644
--- a/kernel/arch/s390/numa/toptree.h
+++ b/kernel/arch/s390/numa/toptree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NUMA support for s390
  *
diff --git a/kernel/arch/s390/oprofile/Makefile b/kernel/arch/s390/oprofile/Makefile
index e9dd41b0b..36261f9d3 100644
--- a/kernel/arch/s390/oprofile/Makefile
+++ b/kernel/arch/s390/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/s390/oprofile/init.c b/kernel/arch/s390/oprofile/init.c
index 9a4de4599..43d9525c3 100644
--- a/kernel/arch/s390/oprofile/init.c
+++ b/kernel/arch/s390/oprofile/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * S390 Version
  *   Copyright IBM Corp. 2002, 2011
diff --git a/kernel/arch/s390/pci/pci_clp.c b/kernel/arch/s390/pci/pci_clp.c
index 0ae3936e2..93cd0f1ca 100644
--- a/kernel/arch/s390/pci/pci_clp.c
+++ b/kernel/arch/s390/pci/pci_clp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2012
  *
diff --git a/kernel/arch/s390/pci/pci_event.c b/kernel/arch/s390/pci/pci_event.c
index 0bbc04af4..8d6ee4af4 100644
--- a/kernel/arch/s390/pci/pci_event.c
+++ b/kernel/arch/s390/pci/pci_event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright IBM Corp. 2012
  *
diff --git a/kernel/arch/s390/pci/pci_mmio.c b/kernel/arch/s390/pci/pci_mmio.c
index b1bb2b723..7d42a8794 100644
--- a/kernel/arch/s390/pci/pci_mmio.c
+++ b/kernel/arch/s390/pci/pci_mmio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Access to PCI I/O memory from user space programs.
  *
diff --git a/kernel/arch/s390/pci/pci_sysfs.c b/kernel/arch/s390/pci/pci_sysfs.c
index ed484dc84..430c14b00 100644
--- a/kernel/arch/s390/pci/pci_sysfs.c
+++ b/kernel/arch/s390/pci/pci_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2012
  *
diff --git a/kernel/arch/s390/tools/Makefile b/kernel/arch/s390/tools/Makefile
index 4b5e1e499..d54c149fb 100644
--- a/kernel/arch/s390/tools/Makefile
+++ b/kernel/arch/s390/tools/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for s390 specific build tools
 #
diff --git a/kernel/arch/s390/tools/gen_facilities.c b/kernel/arch/s390/tools/gen_facilities.c
index 70dd8f17d..0373801d9 100644
--- a/kernel/arch/s390/tools/gen_facilities.c
+++ b/kernel/arch/s390/tools/gen_facilities.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simple program to generate defines out of facility lists that use the bit
  * numbering scheme from the Princples of Operations: most significant bit
diff --git a/kernel/arch/score/Kconfig b/kernel/arch/score/Kconfig
index 507d63181..d881f99c9 100644
--- a/kernel/arch/score/Kconfig
+++ b/kernel/arch/score/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Machine selection"
 
 config SCORE
diff --git a/kernel/arch/score/Kconfig.debug b/kernel/arch/score/Kconfig.debug
index d8a9b2d14..041e51dcd 100644
--- a/kernel/arch/score/Kconfig.debug
+++ b/kernel/arch/score/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/score/include/asm/asmmacro.h b/kernel/arch/score/include/asm/asmmacro.h
index a04a54cea..7370a35d1 100644
--- a/kernel/arch/score/include/asm/asmmacro.h
+++ b/kernel/arch/score/include/asm/asmmacro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_ASMMACRO_H
 #define _ASM_SCORE_ASMMACRO_H
 
diff --git a/kernel/arch/score/include/asm/atomic.h b/kernel/arch/score/include/asm/atomic.h
index edf33dbde..56700980b 100644
--- a/kernel/arch/score/include/asm/atomic.h
+++ b/kernel/arch/score/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_ATOMIC_H
 #define _ASM_SCORE_ATOMIC_H
 
diff --git a/kernel/arch/score/include/asm/bitops.h b/kernel/arch/score/include/asm/bitops.h
index c1bf8d6d0..6342b0123 100644
--- a/kernel/arch/score/include/asm/bitops.h
+++ b/kernel/arch/score/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_BITOPS_H
 #define _ASM_SCORE_BITOPS_H
 
diff --git a/kernel/arch/score/include/asm/bug.h b/kernel/arch/score/include/asm/bug.h
index fd7164af1..966b2e9e8 100644
--- a/kernel/arch/score/include/asm/bug.h
+++ b/kernel/arch/score/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_BUG_H
 #define _ASM_SCORE_BUG_H
 
diff --git a/kernel/arch/score/include/asm/bugs.h b/kernel/arch/score/include/asm/bugs.h
index a062e1056..81185dced 100644
--- a/kernel/arch/score/include/asm/bugs.h
+++ b/kernel/arch/score/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_BUGS_H
 #define _ASM_SCORE_BUGS_H
 
diff --git a/kernel/arch/score/include/asm/cache.h b/kernel/arch/score/include/asm/cache.h
index ae3d59f2d..d55de3cbb 100644
--- a/kernel/arch/score/include/asm/cache.h
+++ b/kernel/arch/score/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_CACHE_H
 #define _ASM_SCORE_CACHE_H
 
diff --git a/kernel/arch/score/include/asm/cacheflush.h b/kernel/arch/score/include/asm/cacheflush.h
index 1d545d0ce..cf1e60963 100644
--- a/kernel/arch/score/include/asm/cacheflush.h
+++ b/kernel/arch/score/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_CACHEFLUSH_H
 #define _ASM_SCORE_CACHEFLUSH_H
 
diff --git a/kernel/arch/score/include/asm/checksum.h b/kernel/arch/score/include/asm/checksum.h
index 0338927f4..9f00ca5fd 100644
--- a/kernel/arch/score/include/asm/checksum.h
+++ b/kernel/arch/score/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_CHECKSUM_H
 #define _ASM_SCORE_CHECKSUM_H
 
diff --git a/kernel/arch/score/include/asm/cmpxchg.h b/kernel/arch/score/include/asm/cmpxchg.h
index cc3f6420b..e503073c8 100644
--- a/kernel/arch/score/include/asm/cmpxchg.h
+++ b/kernel/arch/score/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_CMPXCHG_H
 #define _ASM_SCORE_CMPXCHG_H
 
diff --git a/kernel/arch/score/include/asm/delay.h b/kernel/arch/score/include/asm/delay.h
index 529e49471..a4bd2c748 100644
--- a/kernel/arch/score/include/asm/delay.h
+++ b/kernel/arch/score/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_DELAY_H
 #define _ASM_SCORE_DELAY_H
 
diff --git a/kernel/arch/score/include/asm/device.h b/kernel/arch/score/include/asm/device.h
index 2dc7cc5d5..818ad4d01 100644
--- a/kernel/arch/score/include/asm/device.h
+++ b/kernel/arch/score/include/asm/device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_DEVICE_H
 #define _ASM_SCORE_DEVICE_H
 
diff --git a/kernel/arch/score/include/asm/div64.h b/kernel/arch/score/include/asm/div64.h
index 75fae1982..cf73dc218 100644
--- a/kernel/arch/score/include/asm/div64.h
+++ b/kernel/arch/score/include/asm/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_DIV64_H
 #define _ASM_SCORE_DIV64_H
 
diff --git a/kernel/arch/score/include/asm/dma.h b/kernel/arch/score/include/asm/dma.h
index 9f4418529..fd44a9cbe 100644
--- a/kernel/arch/score/include/asm/dma.h
+++ b/kernel/arch/score/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_DMA_H
 #define _ASM_SCORE_DMA_H
 
diff --git a/kernel/arch/score/include/asm/elf.h b/kernel/arch/score/include/asm/elf.h
index 6a9421c69..c970ac160 100644
--- a/kernel/arch/score/include/asm/elf.h
+++ b/kernel/arch/score/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_ELF_H
 #define _ASM_SCORE_ELF_H
 
diff --git a/kernel/arch/score/include/asm/emergency-restart.h b/kernel/arch/score/include/asm/emergency-restart.h
index ca31e9803..b0612c677 100644
--- a/kernel/arch/score/include/asm/emergency-restart.h
+++ b/kernel/arch/score/include/asm/emergency-restart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_EMERGENCY_RESTART_H
 #define _ASM_SCORE_EMERGENCY_RESTART_H
 
diff --git a/kernel/arch/score/include/asm/exec.h b/kernel/arch/score/include/asm/exec.h
index f9f3cd59c..a1f95e1d8 100644
--- a/kernel/arch/score/include/asm/exec.h
+++ b/kernel/arch/score/include/asm/exec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_EXEC_H
 #define _ASM_SCORE_EXEC_H
 
diff --git a/kernel/arch/score/include/asm/fixmap.h b/kernel/arch/score/include/asm/fixmap.h
index ee1676694..68ca31483 100644
--- a/kernel/arch/score/include/asm/fixmap.h
+++ b/kernel/arch/score/include/asm/fixmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_FIXMAP_H
 #define _ASM_SCORE_FIXMAP_H
 
diff --git a/kernel/arch/score/include/asm/futex.h b/kernel/arch/score/include/asm/futex.h
index 1dca2420f..ec247fb36 100644
--- a/kernel/arch/score/include/asm/futex.h
+++ b/kernel/arch/score/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_FUTEX_H
 #define _ASM_SCORE_FUTEX_H
 
diff --git a/kernel/arch/score/include/asm/hardirq.h b/kernel/arch/score/include/asm/hardirq.h
index dc932c50d..d8dd8909c 100644
--- a/kernel/arch/score/include/asm/hardirq.h
+++ b/kernel/arch/score/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_HARDIRQ_H
 #define _ASM_SCORE_HARDIRQ_H
 
diff --git a/kernel/arch/score/include/asm/io.h b/kernel/arch/score/include/asm/io.h
index 574c8827a..37ce8723b 100644
--- a/kernel/arch/score/include/asm/io.h
+++ b/kernel/arch/score/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_IO_H
 #define _ASM_SCORE_IO_H
 
diff --git a/kernel/arch/score/include/asm/irq.h b/kernel/arch/score/include/asm/irq.h
index c883f3df3..c1434c889 100644
--- a/kernel/arch/score/include/asm/irq.h
+++ b/kernel/arch/score/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_IRQ_H
 #define _ASM_SCORE_IRQ_H
 
diff --git a/kernel/arch/score/include/asm/irq_regs.h b/kernel/arch/score/include/asm/irq_regs.h
index b8e881c9a..740b2315d 100644
--- a/kernel/arch/score/include/asm/irq_regs.h
+++ b/kernel/arch/score/include/asm/irq_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_IRQ_REGS_H
 #define _ASM_SCORE_IRQ_REGS_H
 
diff --git a/kernel/arch/score/include/asm/irqflags.h b/kernel/arch/score/include/asm/irqflags.h
index 37c6ac9dd..354c1979e 100644
--- a/kernel/arch/score/include/asm/irqflags.h
+++ b/kernel/arch/score/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_IRQFLAGS_H
 #define _ASM_SCORE_IRQFLAGS_H
 
diff --git a/kernel/arch/score/include/asm/kdebug.h b/kernel/arch/score/include/asm/kdebug.h
index a666e513f..481ba1fb5 100644
--- a/kernel/arch/score/include/asm/kdebug.h
+++ b/kernel/arch/score/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_KDEBUG_H
 #define _ASM_SCORE_KDEBUG_H
 
diff --git a/kernel/arch/score/include/asm/kmap_types.h b/kernel/arch/score/include/asm/kmap_types.h
index 6c46eb507..14261872c 100644
--- a/kernel/arch/score/include/asm/kmap_types.h
+++ b/kernel/arch/score/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_KMAP_TYPES_H
 #define _ASM_SCORE_KMAP_TYPES_H
 
diff --git a/kernel/arch/score/include/asm/linkage.h b/kernel/arch/score/include/asm/linkage.h
index 2323a8ecf..0c11c0099 100644
--- a/kernel/arch/score/include/asm/linkage.h
+++ b/kernel/arch/score/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_LINKAGE_H
 #define _ASM_SCORE_LINKAGE_H
 
diff --git a/kernel/arch/score/include/asm/local.h b/kernel/arch/score/include/asm/local.h
index 7e02f13db..00bdebdf7 100644
--- a/kernel/arch/score/include/asm/local.h
+++ b/kernel/arch/score/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_LOCAL_H
 #define _ASM_SCORE_LOCAL_H
 
diff --git a/kernel/arch/score/include/asm/mmu.h b/kernel/arch/score/include/asm/mmu.h
index 676828e4c..d913369ad 100644
--- a/kernel/arch/score/include/asm/mmu.h
+++ b/kernel/arch/score/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_MMU_H
 #define _ASM_SCORE_MMU_H
 
diff --git a/kernel/arch/score/include/asm/mmu_context.h b/kernel/arch/score/include/asm/mmu_context.h
index 073f95d35..d0aa2a5ae 100644
--- a/kernel/arch/score/include/asm/mmu_context.h
+++ b/kernel/arch/score/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_MMU_CONTEXT_H
 #define _ASM_SCORE_MMU_CONTEXT_H
 
diff --git a/kernel/arch/score/include/asm/module.h b/kernel/arch/score/include/asm/module.h
index 6dc1f2935..33777ed32 100644
--- a/kernel/arch/score/include/asm/module.h
+++ b/kernel/arch/score/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_MODULE_H
 #define _ASM_SCORE_MODULE_H
 
diff --git a/kernel/arch/score/include/asm/page.h b/kernel/arch/score/include/asm/page.h
index 1e9ade8e7..17d9c68b6 100644
--- a/kernel/arch/score/include/asm/page.h
+++ b/kernel/arch/score/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PAGE_H
 #define _ASM_SCORE_PAGE_H
 
diff --git a/kernel/arch/score/include/asm/percpu.h b/kernel/arch/score/include/asm/percpu.h
index e7bd4e05b..5a6a2f7e5 100644
--- a/kernel/arch/score/include/asm/percpu.h
+++ b/kernel/arch/score/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PERCPU_H
 #define _ASM_SCORE_PERCPU_H
 
diff --git a/kernel/arch/score/include/asm/pgalloc.h b/kernel/arch/score/include/asm/pgalloc.h
index 49b012d78..7dfc5c163 100644
--- a/kernel/arch/score/include/asm/pgalloc.h
+++ b/kernel/arch/score/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PGALLOC_H
 #define _ASM_SCORE_PGALLOC_H
 
diff --git a/kernel/arch/score/include/asm/pgtable-bits.h b/kernel/arch/score/include/asm/pgtable-bits.h
index 0e5c6f466..fb8f306f4 100644
--- a/kernel/arch/score/include/asm/pgtable-bits.h
+++ b/kernel/arch/score/include/asm/pgtable-bits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PGTABLE_BITS_H
 #define _ASM_SCORE_PGTABLE_BITS_H
 
diff --git a/kernel/arch/score/include/asm/pgtable.h b/kernel/arch/score/include/asm/pgtable.h
index 46ff8fd67..c14226be0 100644
--- a/kernel/arch/score/include/asm/pgtable.h
+++ b/kernel/arch/score/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PGTABLE_H
 #define _ASM_SCORE_PGTABLE_H
 
diff --git a/kernel/arch/score/include/asm/processor.h b/kernel/arch/score/include/asm/processor.h
index 299274581..1412c774c 100644
--- a/kernel/arch/score/include/asm/processor.h
+++ b/kernel/arch/score/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PROCESSOR_H
 #define _ASM_SCORE_PROCESSOR_H
 
diff --git a/kernel/arch/score/include/asm/ptrace.h b/kernel/arch/score/include/asm/ptrace.h
index abc279d96..026b9c51b 100644
--- a/kernel/arch/score/include/asm/ptrace.h
+++ b/kernel/arch/score/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_PTRACE_H
 #define _ASM_SCORE_PTRACE_H
 
diff --git a/kernel/arch/score/include/asm/scoreregs.h b/kernel/arch/score/include/asm/scoreregs.h
index d0ad29204..ff8d20a49 100644
--- a/kernel/arch/score/include/asm/scoreregs.h
+++ b/kernel/arch/score/include/asm/scoreregs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_SCOREREGS_H
 #define _ASM_SCORE_SCOREREGS_H
 
diff --git a/kernel/arch/score/include/asm/segment.h b/kernel/arch/score/include/asm/segment.h
index e16cf6afb..b00c277e1 100644
--- a/kernel/arch/score/include/asm/segment.h
+++ b/kernel/arch/score/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_SEGMENT_H
 #define _ASM_SCORE_SEGMENT_H
 
diff --git a/kernel/arch/score/include/asm/setup.h b/kernel/arch/score/include/asm/setup.h
index 1f3aa7262..a596d0bd0 100644
--- a/kernel/arch/score/include/asm/setup.h
+++ b/kernel/arch/score/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_SETUP_H
 #define _ASM_SCORE_SETUP_H
 
diff --git a/kernel/arch/score/include/asm/shmparam.h b/kernel/arch/score/include/asm/shmparam.h
index 1d6081314..01a3d0eae 100644
--- a/kernel/arch/score/include/asm/shmparam.h
+++ b/kernel/arch/score/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_SHMPARAM_H
 #define _ASM_SCORE_SHMPARAM_H
 
diff --git a/kernel/arch/score/include/asm/string.h b/kernel/arch/score/include/asm/string.h
index 8a6bf5063..3debf3b23 100644
--- a/kernel/arch/score/include/asm/string.h
+++ b/kernel/arch/score/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_STRING_H
 #define _ASM_SCORE_STRING_H
 
diff --git a/kernel/arch/score/include/asm/switch_to.h b/kernel/arch/score/include/asm/switch_to.h
index fda3f8330..ce730e60c 100644
--- a/kernel/arch/score/include/asm/switch_to.h
+++ b/kernel/arch/score/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_SWITCH_TO_H
 #define _ASM_SCORE_SWITCH_TO_H
 
diff --git a/kernel/arch/score/include/asm/syscalls.h b/kernel/arch/score/include/asm/syscalls.h
index 98d1df92f..caa099fd9 100644
--- a/kernel/arch/score/include/asm/syscalls.h
+++ b/kernel/arch/score/include/asm/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_SYSCALLS_H
 #define _ASM_SCORE_SYSCALLS_H
 
diff --git a/kernel/arch/score/include/asm/thread_info.h b/kernel/arch/score/include/asm/thread_info.h
index 7d9ffb15c..ad51b56e5 100644
--- a/kernel/arch/score/include/asm/thread_info.h
+++ b/kernel/arch/score/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_THREAD_INFO_H
 #define _ASM_SCORE_THREAD_INFO_H
 
diff --git a/kernel/arch/score/include/asm/timex.h b/kernel/arch/score/include/asm/timex.h
index a524ae0c5..ea8e7ff49 100644
--- a/kernel/arch/score/include/asm/timex.h
+++ b/kernel/arch/score/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_TIMEX_H
 #define _ASM_SCORE_TIMEX_H
 
diff --git a/kernel/arch/score/include/asm/tlb.h b/kernel/arch/score/include/asm/tlb.h
index 46882ed52..6e7206428 100644
--- a/kernel/arch/score/include/asm/tlb.h
+++ b/kernel/arch/score/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_TLB_H
 #define _ASM_SCORE_TLB_H
 
diff --git a/kernel/arch/score/include/asm/tlbflush.h b/kernel/arch/score/include/asm/tlbflush.h
index 9cce97836..f48722f4b 100644
--- a/kernel/arch/score/include/asm/tlbflush.h
+++ b/kernel/arch/score/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_TLBFLUSH_H
 #define _ASM_SCORE_TLBFLUSH_H
 
diff --git a/kernel/arch/score/include/asm/topology.h b/kernel/arch/score/include/asm/topology.h
index 425fba381..06577d2a1 100644
--- a/kernel/arch/score/include/asm/topology.h
+++ b/kernel/arch/score/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_TOPOLOGY_H
 #define _ASM_SCORE_TOPOLOGY_H
 
diff --git a/kernel/arch/score/include/asm/uaccess.h b/kernel/arch/score/include/asm/uaccess.h
index 0ef220474..a233f3236 100644
--- a/kernel/arch/score/include/asm/uaccess.h
+++ b/kernel/arch/score/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SCORE_UACCESS_H
 #define __SCORE_UACCESS_H
 
diff --git a/kernel/arch/score/include/asm/unaligned.h b/kernel/arch/score/include/asm/unaligned.h
index 2fc06de51..5db6c805c 100644
--- a/kernel/arch/score/include/asm/unaligned.h
+++ b/kernel/arch/score/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_UNALIGNED_H
 #define _ASM_SCORE_UNALIGNED_H
 
diff --git a/kernel/arch/score/include/asm/user.h b/kernel/arch/score/include/asm/user.h
index 7bfb8e2c8..f7b0f3434 100644
--- a/kernel/arch/score/include/asm/user.h
+++ b/kernel/arch/score/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SCORE_USER_H
 #define _ASM_SCORE_USER_H
 
diff --git a/kernel/arch/score/include/uapi/asm/bitsperlong.h b/kernel/arch/score/include/uapi/asm/bitsperlong.h
index 86ff337aa..df48f2717 100644
--- a/kernel/arch/score/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/score/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_BITSPERLONG_H
 #define _ASM_SCORE_BITSPERLONG_H
 
diff --git a/kernel/arch/score/include/uapi/asm/byteorder.h b/kernel/arch/score/include/uapi/asm/byteorder.h
index 88cbebc79..a5247ea66 100644
--- a/kernel/arch/score/include/uapi/asm/byteorder.h
+++ b/kernel/arch/score/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_BYTEORDER_H
 #define _ASM_SCORE_BYTEORDER_H
 
diff --git a/kernel/arch/score/include/uapi/asm/errno.h b/kernel/arch/score/include/uapi/asm/errno.h
index 29ff39d5a..1b9148657 100644
--- a/kernel/arch/score/include/uapi/asm/errno.h
+++ b/kernel/arch/score/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_ERRNO_H
 #define _ASM_SCORE_ERRNO_H
 
diff --git a/kernel/arch/score/include/uapi/asm/fcntl.h b/kernel/arch/score/include/uapi/asm/fcntl.h
index 03968a310..9c5053b87 100644
--- a/kernel/arch/score/include/uapi/asm/fcntl.h
+++ b/kernel/arch/score/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_FCNTL_H
 #define _ASM_SCORE_FCNTL_H
 
diff --git a/kernel/arch/score/include/uapi/asm/ioctl.h b/kernel/arch/score/include/uapi/asm/ioctl.h
index a351d2194..d6cb6dc33 100644
--- a/kernel/arch/score/include/uapi/asm/ioctl.h
+++ b/kernel/arch/score/include/uapi/asm/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_IOCTL_H
 #define _ASM_SCORE_IOCTL_H
 
diff --git a/kernel/arch/score/include/uapi/asm/ioctls.h b/kernel/arch/score/include/uapi/asm/ioctls.h
index ed01d2b9a..b93b011f0 100644
--- a/kernel/arch/score/include/uapi/asm/ioctls.h
+++ b/kernel/arch/score/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_IOCTLS_H
 #define _ASM_SCORE_IOCTLS_H
 
diff --git a/kernel/arch/score/include/uapi/asm/ipcbuf.h b/kernel/arch/score/include/uapi/asm/ipcbuf.h
index e082ceff1..195ee5253 100644
--- a/kernel/arch/score/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/score/include/uapi/asm/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_IPCBUF_H
 #define _ASM_SCORE_IPCBUF_H
 
diff --git a/kernel/arch/score/include/uapi/asm/kvm_para.h b/kernel/arch/score/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/score/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/score/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/score/include/uapi/asm/mman.h b/kernel/arch/score/include/uapi/asm/mman.h
index 84d85ddfe..b22b83809 100644
--- a/kernel/arch/score/include/uapi/asm/mman.h
+++ b/kernel/arch/score/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_MMAN_H
 #define _ASM_SCORE_MMAN_H
 
diff --git a/kernel/arch/score/include/uapi/asm/msgbuf.h b/kernel/arch/score/include/uapi/asm/msgbuf.h
index 7506721e2..b05a23875 100644
--- a/kernel/arch/score/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/score/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_MSGBUF_H
 #define _ASM_SCORE_MSGBUF_H
 
diff --git a/kernel/arch/score/include/uapi/asm/param.h b/kernel/arch/score/include/uapi/asm/param.h
index 916b8690b..ce09e2632 100644
--- a/kernel/arch/score/include/uapi/asm/param.h
+++ b/kernel/arch/score/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_PARAM_H
 #define _ASM_SCORE_PARAM_H
 
diff --git a/kernel/arch/score/include/uapi/asm/poll.h b/kernel/arch/score/include/uapi/asm/poll.h
index 18532db02..c636b8584 100644
--- a/kernel/arch/score/include/uapi/asm/poll.h
+++ b/kernel/arch/score/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_POLL_H
 #define _ASM_SCORE_POLL_H
 
diff --git a/kernel/arch/score/include/uapi/asm/posix_types.h b/kernel/arch/score/include/uapi/asm/posix_types.h
index b88acf800..63200d56a 100644
--- a/kernel/arch/score/include/uapi/asm/posix_types.h
+++ b/kernel/arch/score/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_POSIX_TYPES_H
 #define _ASM_SCORE_POSIX_TYPES_H
 
diff --git a/kernel/arch/score/include/uapi/asm/ptrace.h b/kernel/arch/score/include/uapi/asm/ptrace.h
index 5c5e79405..e8bd4923f 100644
--- a/kernel/arch/score/include/uapi/asm/ptrace.h
+++ b/kernel/arch/score/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_SCORE_PTRACE_H
 #define _UAPI_ASM_SCORE_PTRACE_H
 
diff --git a/kernel/arch/score/include/uapi/asm/resource.h b/kernel/arch/score/include/uapi/asm/resource.h
index 9ce22bc7b..df3fb9c94 100644
--- a/kernel/arch/score/include/uapi/asm/resource.h
+++ b/kernel/arch/score/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_RESOURCE_H
 #define _ASM_SCORE_RESOURCE_H
 
diff --git a/kernel/arch/score/include/uapi/asm/sembuf.h b/kernel/arch/score/include/uapi/asm/sembuf.h
index dae5e835c..c16e7a947 100644
--- a/kernel/arch/score/include/uapi/asm/sembuf.h
+++ b/kernel/arch/score/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SEMBUF_H
 #define _ASM_SCORE_SEMBUF_H
 
diff --git a/kernel/arch/score/include/uapi/asm/setup.h b/kernel/arch/score/include/uapi/asm/setup.h
index ab9dbdb59..dee583238 100644
--- a/kernel/arch/score/include/uapi/asm/setup.h
+++ b/kernel/arch/score/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_SCORE_SETUP_H
 #define _UAPI_ASM_SCORE_SETUP_H
 
diff --git a/kernel/arch/score/include/uapi/asm/shmbuf.h b/kernel/arch/score/include/uapi/asm/shmbuf.h
index c85b2429b..f38acfe73 100644
--- a/kernel/arch/score/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/score/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SHMBUF_H
 #define _ASM_SCORE_SHMBUF_H
 
diff --git a/kernel/arch/score/include/uapi/asm/sigcontext.h b/kernel/arch/score/include/uapi/asm/sigcontext.h
index 5ffda39dd..2b0cd93a7 100644
--- a/kernel/arch/score/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/score/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SIGCONTEXT_H
 #define _ASM_SCORE_SIGCONTEXT_H
 
diff --git a/kernel/arch/score/include/uapi/asm/signal.h b/kernel/arch/score/include/uapi/asm/signal.h
index 2605bc06b..7fb694972 100644
--- a/kernel/arch/score/include/uapi/asm/signal.h
+++ b/kernel/arch/score/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SIGNAL_H
 #define _ASM_SCORE_SIGNAL_H
 
diff --git a/kernel/arch/score/include/uapi/asm/socket.h b/kernel/arch/score/include/uapi/asm/socket.h
index 612a70e38..f76ba1f72 100644
--- a/kernel/arch/score/include/uapi/asm/socket.h
+++ b/kernel/arch/score/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SOCKET_H
 #define _ASM_SCORE_SOCKET_H
 
diff --git a/kernel/arch/score/include/uapi/asm/sockios.h b/kernel/arch/score/include/uapi/asm/sockios.h
index ba8256480..d0af8ce43 100644
--- a/kernel/arch/score/include/uapi/asm/sockios.h
+++ b/kernel/arch/score/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SOCKIOS_H
 #define _ASM_SCORE_SOCKIOS_H
 
diff --git a/kernel/arch/score/include/uapi/asm/stat.h b/kernel/arch/score/include/uapi/asm/stat.h
index 503705550..669b69f76 100644
--- a/kernel/arch/score/include/uapi/asm/stat.h
+++ b/kernel/arch/score/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_STAT_H
 #define _ASM_SCORE_STAT_H
 
diff --git a/kernel/arch/score/include/uapi/asm/statfs.h b/kernel/arch/score/include/uapi/asm/statfs.h
index 36e41004e..bb92b3e55 100644
--- a/kernel/arch/score/include/uapi/asm/statfs.h
+++ b/kernel/arch/score/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_STATFS_H
 #define _ASM_SCORE_STATFS_H
 
diff --git a/kernel/arch/score/include/uapi/asm/swab.h b/kernel/arch/score/include/uapi/asm/swab.h
index fadc3cc6d..52b092728 100644
--- a/kernel/arch/score/include/uapi/asm/swab.h
+++ b/kernel/arch/score/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_SWAB_H
 #define _ASM_SCORE_SWAB_H
 
diff --git a/kernel/arch/score/include/uapi/asm/termbits.h b/kernel/arch/score/include/uapi/asm/termbits.h
index 9a95c1412..4a6f5511c 100644
--- a/kernel/arch/score/include/uapi/asm/termbits.h
+++ b/kernel/arch/score/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_TERMBITS_H
 #define _ASM_SCORE_TERMBITS_H
 
diff --git a/kernel/arch/score/include/uapi/asm/termios.h b/kernel/arch/score/include/uapi/asm/termios.h
index 40984e811..fabb598ec 100644
--- a/kernel/arch/score/include/uapi/asm/termios.h
+++ b/kernel/arch/score/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_TERMIOS_H
 #define _ASM_SCORE_TERMIOS_H
 
diff --git a/kernel/arch/score/include/uapi/asm/types.h b/kernel/arch/score/include/uapi/asm/types.h
index 214003277..8515287f4 100644
--- a/kernel/arch/score/include/uapi/asm/types.h
+++ b/kernel/arch/score/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_TYPES_H
 #define _ASM_SCORE_TYPES_H
 
diff --git a/kernel/arch/score/include/uapi/asm/unistd.h b/kernel/arch/score/include/uapi/asm/unistd.h
index d4008c339..04da47bd3 100644
--- a/kernel/arch/score/include/uapi/asm/unistd.h
+++ b/kernel/arch/score/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #define __ARCH_HAVE_MMU
 
 #define __ARCH_WANT_RENAMEAT
diff --git a/kernel/arch/score/kernel/Makefile b/kernel/arch/score/kernel/Makefile
index fb1802b3f..42def8cff 100644
--- a/kernel/arch/score/kernel/Makefile
+++ b/kernel/arch/score/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SCORE kernel.
 #
diff --git a/kernel/arch/score/kernel/sys_call_table.c b/kernel/arch/score/kernel/sys_call_table.c
index 287369b88..9e6ae793e 100644
--- a/kernel/arch/score/kernel/sys_call_table.c
+++ b/kernel/arch/score/kernel/sys_call_table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/syscalls.h>
 #include <linux/signal.h>
 #include <linux/unistd.h>
diff --git a/kernel/arch/sh/Kconfig b/kernel/arch/sh/Kconfig
index 640a85925..97fe29316 100644
--- a/kernel/arch/sh/Kconfig
+++ b/kernel/arch/sh/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config SUPERH
 	def_bool y
 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
diff --git a/kernel/arch/sh/Kconfig.cpu b/kernel/arch/sh/Kconfig.cpu
index 05b518e90..4a4edc7e0 100644
--- a/kernel/arch/sh/Kconfig.cpu
+++ b/kernel/arch/sh/Kconfig.cpu
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Processor features"
 
 choice
diff --git a/kernel/arch/sh/Kconfig.debug b/kernel/arch/sh/Kconfig.debug
index 5f2bb4242..d07676726 100644
--- a/kernel/arch/sh/Kconfig.debug
+++ b/kernel/arch/sh/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/sh/boards/Kconfig b/kernel/arch/sh/boards/Kconfig
index 3554fcaa0..6394b4f0a 100644
--- a/kernel/arch/sh/boards/Kconfig
+++ b/kernel/arch/sh/boards/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Board support"
 
 config SOLUTION_ENGINE
diff --git a/kernel/arch/sh/boards/Makefile b/kernel/arch/sh/boards/Makefile
index cea300362..4002a22a7 100644
--- a/kernel/arch/sh/boards/Makefile
+++ b/kernel/arch/sh/boards/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Specific board support, not covered by a mach group.
 #
diff --git a/kernel/arch/sh/boards/board-edosk7705.c b/kernel/arch/sh/boards/board-edosk7705.c
index 5e24c17bb..67a8803eb 100644
--- a/kernel/arch/sh/boards/board-edosk7705.c
+++ b/kernel/arch/sh/boards/board-edosk7705.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/boards/renesas/edosk7705/setup.c
  *
diff --git a/kernel/arch/sh/boards/board-polaris.c b/kernel/arch/sh/boards/board-polaris.c
index 37a08d094..3de7bac01 100644
--- a/kernel/arch/sh/boards/board-polaris.c
+++ b/kernel/arch/sh/boards/board-polaris.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * June 2006 Steve Glendinning <steve.glendinning@shawell.net>
  *
diff --git a/kernel/arch/sh/boards/board-secureedge5410.c b/kernel/arch/sh/boards/board-secureedge5410.c
index 97ec67ffe..603a82325 100644
--- a/kernel/arch/sh/boards/board-secureedge5410.c
+++ b/kernel/arch/sh/boards/board-secureedge5410.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2002  David McCullough <davidm@snapgear.com>
  * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
diff --git a/kernel/arch/sh/boards/board-sh2007.c b/kernel/arch/sh/boards/board-sh2007.c
index 1980bb7e5..ef9c87dee 100644
--- a/kernel/arch/sh/boards/board-sh2007.c
+++ b/kernel/arch/sh/boards/board-sh2007.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SH-2007 board support.
  *
diff --git a/kernel/arch/sh/boards/board-shmin.c b/kernel/arch/sh/boards/board-shmin.c
index 325bed53b..83296c0b7 100644
--- a/kernel/arch/sh/boards/board-shmin.c
+++ b/kernel/arch/sh/boards/board-shmin.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/boards/shmin/setup.c
  *
diff --git a/kernel/arch/sh/boards/mach-highlander/Kconfig b/kernel/arch/sh/boards/mach-highlander/Kconfig
index 42f5589b4..b0abd03ca 100644
--- a/kernel/arch/sh/boards/mach-highlander/Kconfig
+++ b/kernel/arch/sh/boards/mach-highlander/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if SH_HIGHLANDER
 
 choice
diff --git a/kernel/arch/sh/boards/mach-highlander/Makefile b/kernel/arch/sh/boards/mach-highlander/Makefile
index d93aaf880..880ed6813 100644
--- a/kernel/arch/sh/boards/mach-highlander/Makefile
+++ b/kernel/arch/sh/boards/mach-highlander/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Highlander specific parts of the kernel
 #
diff --git a/kernel/arch/sh/boards/mach-migor/Kconfig b/kernel/arch/sh/boards/mach-migor/Kconfig
index a7b3b728e..fb64a10e2 100644
--- a/kernel/arch/sh/boards/mach-migor/Kconfig
+++ b/kernel/arch/sh/boards/mach-migor/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if SH_MIGOR
 
 choice
diff --git a/kernel/arch/sh/boards/mach-r2d/Kconfig b/kernel/arch/sh/boards/mach-r2d/Kconfig
index 8122a9667..21770e668 100644
--- a/kernel/arch/sh/boards/mach-r2d/Kconfig
+++ b/kernel/arch/sh/boards/mach-r2d/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if SH_RTS7751R2D
 
 menu "RTS7751R2D Board Revision"
diff --git a/kernel/arch/sh/boards/mach-r2d/irq.c b/kernel/arch/sh/boards/mach-r2d/irq.c
index 574f009c3..e34f81e9a 100644
--- a/kernel/arch/sh/boards/mach-r2d/irq.c
+++ b/kernel/arch/sh/boards/mach-r2d/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/renesas/rts7751r2d/irq.c
  *
diff --git a/kernel/arch/sh/boards/mach-rsk/Kconfig b/kernel/arch/sh/boards/mach-rsk/Kconfig
index 0b9b2c495..f0299bc44 100644
--- a/kernel/arch/sh/boards/mach-rsk/Kconfig
+++ b/kernel/arch/sh/boards/mach-rsk/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if SH_RSK
 
 choice
diff --git a/kernel/arch/sh/boards/mach-sdk7780/Kconfig b/kernel/arch/sh/boards/mach-sdk7780/Kconfig
index 065f1df09..d4392efd2 100644
--- a/kernel/arch/sh/boards/mach-sdk7780/Kconfig
+++ b/kernel/arch/sh/boards/mach-sdk7780/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if SH_SDK7780
 
 choice
diff --git a/kernel/arch/sh/boards/mach-se/7206/irq.c b/kernel/arch/sh/boards/mach-se/7206/irq.c
index 0db058e70..2b1537082 100644
--- a/kernel/arch/sh/boards/mach-se/7206/irq.c
+++ b/kernel/arch/sh/boards/mach-se/7206/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/se/7206/irq.c
  *
diff --git a/kernel/arch/sh/boards/mach-se/7206/setup.c b/kernel/arch/sh/boards/mach-se/7206/setup.c
index 68883ec95..dc55d3a69 100644
--- a/kernel/arch/sh/boards/mach-se/7206/setup.c
+++ b/kernel/arch/sh/boards/mach-se/7206/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * linux/arch/sh/boards/se/7206/setup.c
diff --git a/kernel/arch/sh/boards/mach-se/7343/setup.c b/kernel/arch/sh/boards/mach-se/7343/setup.c
index 8ce4f2a20..fe0e55060 100644
--- a/kernel/arch/sh/boards/mach-se/7343/setup.c
+++ b/kernel/arch/sh/boards/mach-se/7343/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
diff --git a/kernel/arch/sh/boards/mach-se/770x/irq.c b/kernel/arch/sh/boards/mach-se/770x/irq.c
index 1028c17b8..66e2c8aa0 100644
--- a/kernel/arch/sh/boards/mach-se/770x/irq.c
+++ b/kernel/arch/sh/boards/mach-se/770x/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/se/770x/irq.c
  *
diff --git a/kernel/arch/sh/boards/mach-se/770x/setup.c b/kernel/arch/sh/boards/mach-se/770x/setup.c
index 658326f44..77c35350e 100644
--- a/kernel/arch/sh/boards/mach-se/770x/setup.c
+++ b/kernel/arch/sh/boards/mach-se/770x/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/se/770x/setup.c
  *
diff --git a/kernel/arch/sh/boards/mach-se/7751/irq.c b/kernel/arch/sh/boards/mach-se/7751/irq.c
index 5c9847ea1..dcefe58d8 100644
--- a/kernel/arch/sh/boards/mach-se/7751/irq.c
+++ b/kernel/arch/sh/boards/mach-se/7751/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/se/7751/irq.c
  *
diff --git a/kernel/arch/sh/boards/mach-se/7751/setup.c b/kernel/arch/sh/boards/mach-se/7751/setup.c
index 820f4e7ba..4c4806055 100644
--- a/kernel/arch/sh/boards/mach-se/7751/setup.c
+++ b/kernel/arch/sh/boards/mach-se/7751/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/se/7751/setup.c
  *
diff --git a/kernel/arch/sh/boards/mach-se/Makefile b/kernel/arch/sh/boards/mach-se/Makefile
index b537e238c..8f69fc147 100644
--- a/kernel/arch/sh/boards/mach-se/Makefile
+++ b/kernel/arch/sh/boards/mach-se/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SH_7619_SOLUTION_ENGINE)	+= board-se7619.o
 
 obj-$(CONFIG_SH_SOLUTION_ENGINE)	+= 770x/
diff --git a/kernel/arch/sh/boards/mach-se/board-se7619.c b/kernel/arch/sh/boards/mach-se/board-se7619.c
index 958bcd7aa..4431da64a 100644
--- a/kernel/arch/sh/boards/mach-se/board-se7619.c
+++ b/kernel/arch/sh/boards/mach-se/board-se7619.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/boards/se/7619/setup.c
  *
diff --git a/kernel/arch/sh/boards/mach-sh03/rtc.c b/kernel/arch/sh/boards/mach-sh03/rtc.c
index f83ac7995..dc3d50e3b 100644
--- a/kernel/arch/sh/boards/mach-sh03/rtc.c
+++ b/kernel/arch/sh/boards/mach-sh03/rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/sh03/rtc.c -- CTP/PCI-SH03 on-chip RTC support
  *
diff --git a/kernel/arch/sh/boards/mach-sh03/setup.c b/kernel/arch/sh/boards/mach-sh03/setup.c
index f582dab59..85e7059a7 100644
--- a/kernel/arch/sh/boards/mach-sh03/setup.c
+++ b/kernel/arch/sh/boards/mach-sh03/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/boards/sh03/setup.c
  *
diff --git a/kernel/arch/sh/boot/compressed/Makefile b/kernel/arch/sh/boot/compressed/Makefile
index c4c47ea9f..f5e1bd779 100644
--- a/kernel/arch/sh/boot/compressed/Makefile
+++ b/kernel/arch/sh/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/sh/boot/compressed/Makefile
 #
diff --git a/kernel/arch/sh/boot/compressed/cache.c b/kernel/arch/sh/boot/compressed/cache.c
index d0b77b68a..31e04ff48 100644
--- a/kernel/arch/sh/boot/compressed/cache.c
+++ b/kernel/arch/sh/boot/compressed/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 int cache_control(unsigned int command)
 {
 	volatile unsigned int *p = (volatile unsigned int *) 0x80000000;
diff --git a/kernel/arch/sh/boot/compressed/head_32.S b/kernel/arch/sh/boot/compressed/head_32.S
index 3e150326f..7bb168133 100644
--- a/kernel/arch/sh/boot/compressed/head_32.S
+++ b/kernel/arch/sh/boot/compressed/head_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/sh/boot/compressed/head.S
  *
diff --git a/kernel/arch/sh/boot/compressed/misc.c b/kernel/arch/sh/boot/compressed/misc.c
index ae1dfdb00..f2d9d3079 100644
--- a/kernel/arch/sh/boot/compressed/misc.c
+++ b/kernel/arch/sh/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/boot/compressed/misc.c
  *
diff --git a/kernel/arch/sh/boot/dts/j2_mimas_v2.dts b/kernel/arch/sh/boot/dts/j2_mimas_v2.dts
index 880de7536..9f4742fab 100644
--- a/kernel/arch/sh/boot/dts/j2_mimas_v2.dts
+++ b/kernel/arch/sh/boot/dts/j2_mimas_v2.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 / {
diff --git a/kernel/arch/sh/boot/romimage/Makefile b/kernel/arch/sh/boot/romimage/Makefile
index 43c41191d..c7c8be584 100644
--- a/kernel/arch/sh/boot/romimage/Makefile
+++ b/kernel/arch/sh/boot/romimage/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/sh/boot/romimage/Makefile
 #
diff --git a/kernel/arch/sh/boot/romimage/head.S b/kernel/arch/sh/boot/romimage/head.S
index 4671d1b82..81a0652a3 100644
--- a/kernel/arch/sh/boot/romimage/head.S
+++ b/kernel/arch/sh/boot/romimage/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/sh/boot/romimage/head.S
  *
diff --git a/kernel/arch/sh/cchips/Kconfig b/kernel/arch/sh/cchips/Kconfig
index a5ab2eccd..6be5ddec1 100644
--- a/kernel/arch/sh/cchips/Kconfig
+++ b/kernel/arch/sh/cchips/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Companion Chips"
 
 config HD6446X_SERIES
diff --git a/kernel/arch/sh/cchips/hd6446x/hd64461.c b/kernel/arch/sh/cchips/hd6446x/hd64461.c
index 818009250..f3fba9674 100644
--- a/kernel/arch/sh/cchips/hd6446x/hd64461.c
+++ b/kernel/arch/sh/cchips/hd6446x/hd64461.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Copyright (C) 2000 YAEGASHI Takeshi
  *	Hitachi HD64461 companion chip support
diff --git a/kernel/arch/sh/drivers/Kconfig b/kernel/arch/sh/drivers/Kconfig
index 420c6b2f3..80a45ad28 100644
--- a/kernel/arch/sh/drivers/Kconfig
+++ b/kernel/arch/sh/drivers/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 source "arch/sh/drivers/dma/Kconfig"
 source "arch/sh/cchips/Kconfig"
 
diff --git a/kernel/arch/sh/drivers/Makefile b/kernel/arch/sh/drivers/Makefile
index e13f06beb..3e93b434e 100644
--- a/kernel/arch/sh/drivers/Makefile
+++ b/kernel/arch/sh/drivers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux SuperH-specific device drivers.
 #
diff --git a/kernel/arch/sh/drivers/dma/Kconfig b/kernel/arch/sh/drivers/dma/Kconfig
index 78bc97b1d..d0de378be 100644
--- a/kernel/arch/sh/drivers/dma/Kconfig
+++ b/kernel/arch/sh/drivers/dma/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "DMA support"
 
 
diff --git a/kernel/arch/sh/drivers/pci/Makefile b/kernel/arch/sh/drivers/pci/Makefile
index 82f0a335f..947bfe8bb 100644
--- a/kernel/arch/sh/drivers/pci/Makefile
+++ b/kernel/arch/sh/drivers/pci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PCI specific kernel interface routines under Linux.
 #
diff --git a/kernel/arch/sh/drivers/pci/common.c b/kernel/arch/sh/drivers/pci/common.c
index dbf138199..cae707f34 100644
--- a/kernel/arch/sh/drivers/pci/common.c
+++ b/kernel/arch/sh/drivers/pci/common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
diff --git a/kernel/arch/sh/drivers/pci/fixups-cayman.c b/kernel/arch/sh/drivers/pci/fixups-cayman.c
index 32467884d..c797bfbe2 100644
--- a/kernel/arch/sh/drivers/pci/fixups-cayman.c
+++ b/kernel/arch/sh/drivers/pci/fixups-cayman.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/pci.h>
diff --git a/kernel/arch/sh/drivers/pci/fixups-se7751.c b/kernel/arch/sh/drivers/pci/fixups-se7751.c
index 1cb8d0ac4..608f6521c 100644
--- a/kernel/arch/sh/drivers/pci/fixups-se7751.c
+++ b/kernel/arch/sh/drivers/pci/fixups-se7751.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
diff --git a/kernel/arch/sh/drivers/pci/fixups-sh03.c b/kernel/arch/sh/drivers/pci/fixups-sh03.c
index 55ac1ba2c..7ec4a74ab 100644
--- a/kernel/arch/sh/drivers/pci/fixups-sh03.c
+++ b/kernel/arch/sh/drivers/pci/fixups-sh03.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
diff --git a/kernel/arch/sh/drivers/pci/pci-sh4.h b/kernel/arch/sh/drivers/pci/pci-sh4.h
index 0288efc17..1543c50b6 100644
--- a/kernel/arch/sh/drivers/pci/pci-sh4.h
+++ b/kernel/arch/sh/drivers/pci/pci-sh4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PCI_SH4_H
 #define __PCI_SH4_H
 
diff --git a/kernel/arch/sh/include/asm/adc.h b/kernel/arch/sh/include/asm/adc.h
index 48824c1fa..99ec66849 100644
--- a/kernel/arch/sh/include/asm/adc.h
+++ b/kernel/arch/sh/include/asm/adc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ADC_H
 #define __ASM_ADC_H
 #ifdef __KERNEL__
diff --git a/kernel/arch/sh/include/asm/alignment.h b/kernel/arch/sh/include/asm/alignment.h
index b12efecf5..4f3e715b8 100644
--- a/kernel/arch/sh/include/asm/alignment.h
+++ b/kernel/arch/sh/include/asm/alignment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ALIGNMENT_H
 #define __ASM_SH_ALIGNMENT_H
 
diff --git a/kernel/arch/sh/include/asm/atomic-grb.h b/kernel/arch/sh/include/asm/atomic-grb.h
index d755e96c3..aace62d42 100644
--- a/kernel/arch/sh/include/asm/atomic-grb.h
+++ b/kernel/arch/sh/include/asm/atomic-grb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ATOMIC_GRB_H
 #define __ASM_SH_ATOMIC_GRB_H
 
diff --git a/kernel/arch/sh/include/asm/atomic-irq.h b/kernel/arch/sh/include/asm/atomic-irq.h
index 8e2da5fa0..ee523bd21 100644
--- a/kernel/arch/sh/include/asm/atomic-irq.h
+++ b/kernel/arch/sh/include/asm/atomic-irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ATOMIC_IRQ_H
 #define __ASM_SH_ATOMIC_IRQ_H
 
diff --git a/kernel/arch/sh/include/asm/atomic-llsc.h b/kernel/arch/sh/include/asm/atomic-llsc.h
index 1d159ce50..1d06e4d28 100644
--- a/kernel/arch/sh/include/asm/atomic-llsc.h
+++ b/kernel/arch/sh/include/asm/atomic-llsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ATOMIC_LLSC_H
 #define __ASM_SH_ATOMIC_LLSC_H
 
diff --git a/kernel/arch/sh/include/asm/atomic.h b/kernel/arch/sh/include/asm/atomic.h
index 8a7bd80c8..0fd0099f4 100644
--- a/kernel/arch/sh/include/asm/atomic.h
+++ b/kernel/arch/sh/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ATOMIC_H
 #define __ASM_SH_ATOMIC_H
 
diff --git a/kernel/arch/sh/include/asm/barrier.h b/kernel/arch/sh/include/asm/barrier.h
index 3c30b6e16..66faae19d 100644
--- a/kernel/arch/sh/include/asm/barrier.h
+++ b/kernel/arch/sh/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999, 2000  Niibe Yutaka  &  Kaz Kojima
  * Copyright (C) 2002 Paul Mundt
diff --git a/kernel/arch/sh/include/asm/bitops-cas.h b/kernel/arch/sh/include/asm/bitops-cas.h
index 88f793c04..ba517b3f2 100644
--- a/kernel/arch/sh/include/asm/bitops-cas.h
+++ b/kernel/arch/sh/include/asm/bitops-cas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BITOPS_CAS_H
 #define __ASM_SH_BITOPS_CAS_H
 
diff --git a/kernel/arch/sh/include/asm/bitops-grb.h b/kernel/arch/sh/include/asm/bitops-grb.h
index e73af33ac..75b598039 100644
--- a/kernel/arch/sh/include/asm/bitops-grb.h
+++ b/kernel/arch/sh/include/asm/bitops-grb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BITOPS_GRB_H
 #define __ASM_SH_BITOPS_GRB_H
 
diff --git a/kernel/arch/sh/include/asm/bitops-llsc.h b/kernel/arch/sh/include/asm/bitops-llsc.h
index d8328be06..47036845f 100644
--- a/kernel/arch/sh/include/asm/bitops-llsc.h
+++ b/kernel/arch/sh/include/asm/bitops-llsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BITOPS_LLSC_H
 #define __ASM_SH_BITOPS_LLSC_H
 
diff --git a/kernel/arch/sh/include/asm/bitops-op32.h b/kernel/arch/sh/include/asm/bitops-op32.h
index f0ae7e921..466880362 100644
--- a/kernel/arch/sh/include/asm/bitops-op32.h
+++ b/kernel/arch/sh/include/asm/bitops-op32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BITOPS_OP32_H
 #define __ASM_SH_BITOPS_OP32_H
 
diff --git a/kernel/arch/sh/include/asm/bitops.h b/kernel/arch/sh/include/asm/bitops.h
index a8699d60a..8c3578288 100644
--- a/kernel/arch/sh/include/asm/bitops.h
+++ b/kernel/arch/sh/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BITOPS_H
 #define __ASM_SH_BITOPS_H
 
diff --git a/kernel/arch/sh/include/asm/bl_bit.h b/kernel/arch/sh/include/asm/bl_bit.h
index 06e4163c6..7e3d81691 100644
--- a/kernel/arch/sh/include/asm/bl_bit.h
+++ b/kernel/arch/sh/include/asm/bl_bit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BL_BIT_H
 #define __ASM_SH_BL_BIT_H
 
diff --git a/kernel/arch/sh/include/asm/bl_bit_32.h b/kernel/arch/sh/include/asm/bl_bit_32.h
index fd21eee62..1f7d225fc 100644
--- a/kernel/arch/sh/include/asm/bl_bit_32.h
+++ b/kernel/arch/sh/include/asm/bl_bit_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BL_BIT_32_H
 #define __ASM_SH_BL_BIT_32_H
 
diff --git a/kernel/arch/sh/include/asm/bug.h b/kernel/arch/sh/include/asm/bug.h
index 5b5086367..05a485c4f 100644
--- a/kernel/arch/sh/include/asm/bug.h
+++ b/kernel/arch/sh/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BUG_H
 #define __ASM_SH_BUG_H
 
diff --git a/kernel/arch/sh/include/asm/bugs.h b/kernel/arch/sh/include/asm/bugs.h
index 02a19a1c0..030df56bf 100644
--- a/kernel/arch/sh/include/asm/bugs.h
+++ b/kernel/arch/sh/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BUGS_H
 #define __ASM_SH_BUGS_H
 
diff --git a/kernel/arch/sh/include/asm/cache.h b/kernel/arch/sh/include/asm/cache.h
index ef9e555aa..2408ac487 100644
--- a/kernel/arch/sh/include/asm/cache.h
+++ b/kernel/arch/sh/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: cache.h,v 1.6 2004/03/11 18:08:05 lethal Exp $
  *
  * include/asm-sh/cache.h
diff --git a/kernel/arch/sh/include/asm/cache_insns.h b/kernel/arch/sh/include/asm/cache_insns.h
index 355cb06b7..c5a4acdc5 100644
--- a/kernel/arch/sh/include/asm/cache_insns.h
+++ b/kernel/arch/sh/include/asm/cache_insns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CACHE_INSNS_H
 #define __ASM_SH_CACHE_INSNS_H
 
diff --git a/kernel/arch/sh/include/asm/cache_insns_32.h b/kernel/arch/sh/include/asm/cache_insns_32.h
index b92fe5416..470880b97 100644
--- a/kernel/arch/sh/include/asm/cache_insns_32.h
+++ b/kernel/arch/sh/include/asm/cache_insns_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CACHE_INSNS_32_H
 #define __ASM_SH_CACHE_INSNS_32_H
 
diff --git a/kernel/arch/sh/include/asm/cacheflush.h b/kernel/arch/sh/include/asm/cacheflush.h
index 82e1eabea..d103ab5a4 100644
--- a/kernel/arch/sh/include/asm/cacheflush.h
+++ b/kernel/arch/sh/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CACHEFLUSH_H
 #define __ASM_SH_CACHEFLUSH_H
 
diff --git a/kernel/arch/sh/include/asm/checksum.h b/kernel/arch/sh/include/asm/checksum.h
index 34ae26204..a460a1089 100644
--- a/kernel/arch/sh/include/asm/checksum.h
+++ b/kernel/arch/sh/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_SUPERH32
 # include <asm/checksum_32.h>
 #else
diff --git a/kernel/arch/sh/include/asm/clock.h b/kernel/arch/sh/include/asm/clock.h
index 0390a07e7..b65bc2908 100644
--- a/kernel/arch/sh/include/asm/clock.h
+++ b/kernel/arch/sh/include/asm/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CLOCK_H
 #define __ASM_SH_CLOCK_H
 
diff --git a/kernel/arch/sh/include/asm/cmpxchg-cas.h b/kernel/arch/sh/include/asm/cmpxchg-cas.h
index d0d86649e..f508db6ea 100644
--- a/kernel/arch/sh/include/asm/cmpxchg-cas.h
+++ b/kernel/arch/sh/include/asm/cmpxchg-cas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CMPXCHG_CAS_H
 #define __ASM_SH_CMPXCHG_CAS_H
 
diff --git a/kernel/arch/sh/include/asm/cmpxchg-grb.h b/kernel/arch/sh/include/asm/cmpxchg-grb.h
index 2ed557b31..e12279ea3 100644
--- a/kernel/arch/sh/include/asm/cmpxchg-grb.h
+++ b/kernel/arch/sh/include/asm/cmpxchg-grb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CMPXCHG_GRB_H
 #define __ASM_SH_CMPXCHG_GRB_H
 
diff --git a/kernel/arch/sh/include/asm/cmpxchg-irq.h b/kernel/arch/sh/include/asm/cmpxchg-irq.h
index f88877257..07d3e7f08 100644
--- a/kernel/arch/sh/include/asm/cmpxchg-irq.h
+++ b/kernel/arch/sh/include/asm/cmpxchg-irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CMPXCHG_IRQ_H
 #define __ASM_SH_CMPXCHG_IRQ_H
 
diff --git a/kernel/arch/sh/include/asm/cmpxchg-llsc.h b/kernel/arch/sh/include/asm/cmpxchg-llsc.h
index fcfd32271..d5270cd29 100644
--- a/kernel/arch/sh/include/asm/cmpxchg-llsc.h
+++ b/kernel/arch/sh/include/asm/cmpxchg-llsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CMPXCHG_LLSC_H
 #define __ASM_SH_CMPXCHG_LLSC_H
 
diff --git a/kernel/arch/sh/include/asm/cmpxchg.h b/kernel/arch/sh/include/asm/cmpxchg.h
index 3dfe0467a..e9501d85c 100644
--- a/kernel/arch/sh/include/asm/cmpxchg.h
+++ b/kernel/arch/sh/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CMPXCHG_H
 #define __ASM_SH_CMPXCHG_H
 
diff --git a/kernel/arch/sh/include/asm/dma-mapping.h b/kernel/arch/sh/include/asm/dma-mapping.h
index 9b06be07d..68c1536b3 100644
--- a/kernel/arch/sh/include/asm/dma-mapping.h
+++ b/kernel/arch/sh/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_DMA_MAPPING_H
 #define __ASM_SH_DMA_MAPPING_H
 
diff --git a/kernel/arch/sh/include/asm/dmabrg.h b/kernel/arch/sh/include/asm/dmabrg.h
index c5edba216..69e119cfd 100644
--- a/kernel/arch/sh/include/asm/dmabrg.h
+++ b/kernel/arch/sh/include/asm/dmabrg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SH7760 DMABRG (USB/Audio) support
  */
diff --git a/kernel/arch/sh/include/asm/elf.h b/kernel/arch/sh/include/asm/elf.h
index bf9f44f17..5ec8db1dd 100644
--- a/kernel/arch/sh/include/asm/elf.h
+++ b/kernel/arch/sh/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ELF_H
 #define __ASM_SH_ELF_H
 
diff --git a/kernel/arch/sh/include/asm/entry-macros.S b/kernel/arch/sh/include/asm/entry-macros.S
index cc43a55e1..5ce142d8c 100644
--- a/kernel/arch/sh/include/asm/entry-macros.S
+++ b/kernel/arch/sh/include/asm/entry-macros.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 ! entry.S macro define
 	
 	.macro	cli
diff --git a/kernel/arch/sh/include/asm/extable.h b/kernel/arch/sh/include/asm/extable.h
index df2ee2fcb..ed46f8beb 100644
--- a/kernel/arch/sh/include/asm/extable.h
+++ b/kernel/arch/sh/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_EXTABLE_H
 #define __ASM_SH_EXTABLE_H
 
diff --git a/kernel/arch/sh/include/asm/fpu.h b/kernel/arch/sh/include/asm/fpu.h
index 50921c7cc..43cfaf929 100644
--- a/kernel/arch/sh/include/asm/fpu.h
+++ b/kernel/arch/sh/include/asm/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_FPU_H
 #define __ASM_SH_FPU_H
 
diff --git a/kernel/arch/sh/include/asm/ftrace.h b/kernel/arch/sh/include/asm/ftrace.h
index 1f157b86e..b1c1dc0cc 100644
--- a/kernel/arch/sh/include/asm/ftrace.h
+++ b/kernel/arch/sh/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_FTRACE_H
 #define __ASM_SH_FTRACE_H
 
diff --git a/kernel/arch/sh/include/asm/futex-cas.h b/kernel/arch/sh/include/asm/futex-cas.h
index 267cb7a5f..ed738e32b 100644
--- a/kernel/arch/sh/include/asm/futex-cas.h
+++ b/kernel/arch/sh/include/asm/futex-cas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_FUTEX_CAS_H
 #define __ASM_SH_FUTEX_CAS_H
 
diff --git a/kernel/arch/sh/include/asm/futex-irq.h b/kernel/arch/sh/include/asm/futex-irq.h
index ab01dbee0..9bc053242 100644
--- a/kernel/arch/sh/include/asm/futex-irq.h
+++ b/kernel/arch/sh/include/asm/futex-irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_FUTEX_IRQ_H
 #define __ASM_SH_FUTEX_IRQ_H
 
diff --git a/kernel/arch/sh/include/asm/futex-llsc.h b/kernel/arch/sh/include/asm/futex-llsc.h
index 23591703b..6e1570752 100644
--- a/kernel/arch/sh/include/asm/futex-llsc.h
+++ b/kernel/arch/sh/include/asm/futex-llsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_FUTEX_LLSC_H
 #define __ASM_SH_FUTEX_LLSC_H
 
diff --git a/kernel/arch/sh/include/asm/futex.h b/kernel/arch/sh/include/asm/futex.h
index 8f8cf941a..15bf07bfa 100644
--- a/kernel/arch/sh/include/asm/futex.h
+++ b/kernel/arch/sh/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_FUTEX_H
 #define __ASM_SH_FUTEX_H
 
diff --git a/kernel/arch/sh/include/asm/hardirq.h b/kernel/arch/sh/include/asm/hardirq.h
index 48b191313..edaea3559 100644
--- a/kernel/arch/sh/include/asm/hardirq.h
+++ b/kernel/arch/sh/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HARDIRQ_H
 #define __ASM_SH_HARDIRQ_H
 
diff --git a/kernel/arch/sh/include/asm/hd64461.h b/kernel/arch/sh/include/asm/hd64461.h
index 977355f0a..afb24cb03 100644
--- a/kernel/arch/sh/include/asm/hd64461.h
+++ b/kernel/arch/sh/include/asm/hd64461.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HD64461
 #define __ASM_SH_HD64461
 /*
diff --git a/kernel/arch/sh/include/asm/heartbeat.h b/kernel/arch/sh/include/asm/heartbeat.h
index caaafe5a3..4028ca405 100644
--- a/kernel/arch/sh/include/asm/heartbeat.h
+++ b/kernel/arch/sh/include/asm/heartbeat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HEARTBEAT_H
 #define __ASM_SH_HEARTBEAT_H
 
diff --git a/kernel/arch/sh/include/asm/hugetlb.h b/kernel/arch/sh/include/asm/hugetlb.h
index ef489a56f..735939c0f 100644
--- a/kernel/arch/sh/include/asm/hugetlb.h
+++ b/kernel/arch/sh/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SH_HUGETLB_H
 #define _ASM_SH_HUGETLB_H
 
diff --git a/kernel/arch/sh/include/asm/hw_breakpoint.h b/kernel/arch/sh/include/asm/hw_breakpoint.h
index ec9ad593c..7431c172c 100644
--- a/kernel/arch/sh/include/asm/hw_breakpoint.h
+++ b/kernel/arch/sh/include/asm/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HW_BREAKPOINT_H
 #define __ASM_SH_HW_BREAKPOINT_H
 
diff --git a/kernel/arch/sh/include/asm/hw_irq.h b/kernel/arch/sh/include/asm/hw_irq.h
index 693d44184..ce23e3332 100644
--- a/kernel/arch/sh/include/asm/hw_irq.h
+++ b/kernel/arch/sh/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HW_IRQ_H
 #define __ASM_SH_HW_IRQ_H
 
diff --git a/kernel/arch/sh/include/asm/i2c-sh7760.h b/kernel/arch/sh/include/asm/i2c-sh7760.h
index 69fee1239..a777f1410 100644
--- a/kernel/arch/sh/include/asm/i2c-sh7760.h
+++ b/kernel/arch/sh/include/asm/i2c-sh7760.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * MMIO/IRQ and platform data for SH7760 I2C channels
  */
diff --git a/kernel/arch/sh/include/asm/io.h b/kernel/arch/sh/include/asm/io.h
index 3280a6bfa..98cb8c802 100644
--- a/kernel/arch/sh/include/asm/io.h
+++ b/kernel/arch/sh/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_IO_H
 #define __ASM_SH_IO_H
 
diff --git a/kernel/arch/sh/include/asm/io_generic.h b/kernel/arch/sh/include/asm/io_generic.h
index b5f6956f1..87ec38f4e 100644
--- a/kernel/arch/sh/include/asm/io_generic.h
+++ b/kernel/arch/sh/include/asm/io_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Trivial I/O routine definitions, intentionally meant to be included
  * multiple times. Ugly I/O routine concatenation helpers taken from
diff --git a/kernel/arch/sh/include/asm/io_noioport.h b/kernel/arch/sh/include/asm/io_noioport.h
index c727e6ddf..90d6109f1 100644
--- a/kernel/arch/sh/include/asm/io_noioport.h
+++ b/kernel/arch/sh/include/asm/io_noioport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_IO_NOIOPORT_H
 #define __ASM_SH_IO_NOIOPORT_H
 
diff --git a/kernel/arch/sh/include/asm/io_trapped.h b/kernel/arch/sh/include/asm/io_trapped.h
index 4ab94ef51..ac01b201d 100644
--- a/kernel/arch/sh/include/asm/io_trapped.h
+++ b/kernel/arch/sh/include/asm/io_trapped.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_IO_TRAPPED_H
 #define __ASM_SH_IO_TRAPPED_H
 
diff --git a/kernel/arch/sh/include/asm/irq.h b/kernel/arch/sh/include/asm/irq.h
index 0e4f532e4..8065a3222 100644
--- a/kernel/arch/sh/include/asm/irq.h
+++ b/kernel/arch/sh/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_IRQ_H
 #define __ASM_SH_IRQ_H
 
diff --git a/kernel/arch/sh/include/asm/irqflags.h b/kernel/arch/sh/include/asm/irqflags.h
index 43b760860..25f6cfef3 100644
--- a/kernel/arch/sh/include/asm/irqflags.h
+++ b/kernel/arch/sh/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_IRQFLAGS_H
 #define __ASM_SH_IRQFLAGS_H
 
diff --git a/kernel/arch/sh/include/asm/kdebug.h b/kernel/arch/sh/include/asm/kdebug.h
index 8d6a831e7..5212f5fcd 100644
--- a/kernel/arch/sh/include/asm/kdebug.h
+++ b/kernel/arch/sh/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_KDEBUG_H
 #define __ASM_SH_KDEBUG_H
 
diff --git a/kernel/arch/sh/include/asm/kexec.h b/kernel/arch/sh/include/asm/kexec.h
index ad6ef8a27..fd5f331a3 100644
--- a/kernel/arch/sh/include/asm/kexec.h
+++ b/kernel/arch/sh/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_KEXEC_H
 #define __ASM_SH_KEXEC_H
 
diff --git a/kernel/arch/sh/include/asm/kgdb.h b/kernel/arch/sh/include/asm/kgdb.h
index 9e7d2d1b0..0d5b840cb 100644
--- a/kernel/arch/sh/include/asm/kgdb.h
+++ b/kernel/arch/sh/include/asm/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_KGDB_H
 #define __ASM_SH_KGDB_H
 
diff --git a/kernel/arch/sh/include/asm/kmap_types.h b/kernel/arch/sh/include/asm/kmap_types.h
index 5962b08b6..b78107f92 100644
--- a/kernel/arch/sh/include/asm/kmap_types.h
+++ b/kernel/arch/sh/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SH_KMAP_TYPES_H
 #define __SH_KMAP_TYPES_H
 
diff --git a/kernel/arch/sh/include/asm/kprobes.h b/kernel/arch/sh/include/asm/kprobes.h
index f0986f9b3..85d8bcaa8 100644
--- a/kernel/arch/sh/include/asm/kprobes.h
+++ b/kernel/arch/sh/include/asm/kprobes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_KPROBES_H
 #define __ASM_SH_KPROBES_H
 
diff --git a/kernel/arch/sh/include/asm/linkage.h b/kernel/arch/sh/include/asm/linkage.h
index 3565a4f40..7c2fa27a4 100644
--- a/kernel/arch/sh/include/asm/linkage.h
+++ b/kernel/arch/sh/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
diff --git a/kernel/arch/sh/include/asm/mmu.h b/kernel/arch/sh/include/asm/mmu.h
index 56e4418c1..172e329fd 100644
--- a/kernel/arch/sh/include/asm/mmu.h
+++ b/kernel/arch/sh/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/sh/include/asm/mmu_context.h b/kernel/arch/sh/include/asm/mmu_context.h
index eb6ac3c10..2d0965009 100644
--- a/kernel/arch/sh/include/asm/mmu_context.h
+++ b/kernel/arch/sh/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999 Niibe Yutaka
  * Copyright (C) 2003 - 2007 Paul Mundt
diff --git a/kernel/arch/sh/include/asm/mmu_context_32.h b/kernel/arch/sh/include/asm/mmu_context_32.h
index 10e2e1721..71bf12ef1 100644
--- a/kernel/arch/sh/include/asm/mmu_context_32.h
+++ b/kernel/arch/sh/include/asm/mmu_context_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_MMU_CONTEXT_32_H
 #define __ASM_SH_MMU_CONTEXT_32_H
 
diff --git a/kernel/arch/sh/include/asm/mmzone.h b/kernel/arch/sh/include/asm/mmzone.h
index 15a849696..cbaee1d1b 100644
--- a/kernel/arch/sh/include/asm/mmzone.h
+++ b/kernel/arch/sh/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_MMZONE_H
 #define __ASM_SH_MMZONE_H
 
diff --git a/kernel/arch/sh/include/asm/module.h b/kernel/arch/sh/include/asm/module.h
index 81300d8b5..9f38fb35f 100644
--- a/kernel/arch/sh/include/asm/module.h
+++ b/kernel/arch/sh/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SH_MODULE_H
 #define _ASM_SH_MODULE_H
 
diff --git a/kernel/arch/sh/include/asm/page.h b/kernel/arch/sh/include/asm/page.h
index ceb5201a3..5eef8be3e 100644
--- a/kernel/arch/sh/include/asm/page.h
+++ b/kernel/arch/sh/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PAGE_H
 #define __ASM_SH_PAGE_H
 
diff --git a/kernel/arch/sh/include/asm/pci.h b/kernel/arch/sh/include/asm/pci.h
index 17fa69bc8..53f7ae6ab 100644
--- a/kernel/arch/sh/include/asm/pci.h
+++ b/kernel/arch/sh/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PCI_H
 #define __ASM_SH_PCI_H
 
diff --git a/kernel/arch/sh/include/asm/perf_event.h b/kernel/arch/sh/include/asm/perf_event.h
index 14308bed7..468c7ca8b 100644
--- a/kernel/arch/sh/include/asm/perf_event.h
+++ b/kernel/arch/sh/include/asm/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PERF_EVENT_H
 #define __ASM_SH_PERF_EVENT_H
 
diff --git a/kernel/arch/sh/include/asm/pgalloc.h b/kernel/arch/sh/include/asm/pgalloc.h
index f3f42c84c..ed053a359 100644
--- a/kernel/arch/sh/include/asm/pgalloc.h
+++ b/kernel/arch/sh/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PGALLOC_H
 #define __ASM_SH_PGALLOC_H
 
diff --git a/kernel/arch/sh/include/asm/pgtable-2level.h b/kernel/arch/sh/include/asm/pgtable-2level.h
index f75cf4387..bf1eb51c3 100644
--- a/kernel/arch/sh/include/asm/pgtable-2level.h
+++ b/kernel/arch/sh/include/asm/pgtable-2level.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PGTABLE_2LEVEL_H
 #define __ASM_SH_PGTABLE_2LEVEL_H
 
diff --git a/kernel/arch/sh/include/asm/pgtable-3level.h b/kernel/arch/sh/include/asm/pgtable-3level.h
index 9b1e776ec..7d8587eb6 100644
--- a/kernel/arch/sh/include/asm/pgtable-3level.h
+++ b/kernel/arch/sh/include/asm/pgtable-3level.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PGTABLE_3LEVEL_H
 #define __ASM_SH_PGTABLE_3LEVEL_H
 
diff --git a/kernel/arch/sh/include/asm/pgtable_32.h b/kernel/arch/sh/include/asm/pgtable_32.h
index c646e563a..29274f0e4 100644
--- a/kernel/arch/sh/include/asm/pgtable_32.h
+++ b/kernel/arch/sh/include/asm/pgtable_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PGTABLE_32_H
 #define __ASM_SH_PGTABLE_32_H
 
diff --git a/kernel/arch/sh/include/asm/posix_types.h b/kernel/arch/sh/include/asm/posix_types.h
index 1aa781079..0d670fd94 100644
--- a/kernel/arch/sh/include/asm/posix_types.h
+++ b/kernel/arch/sh/include/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 # ifdef CONFIG_SUPERH32
 #  include <asm/posix_types_32.h>
 # else
diff --git a/kernel/arch/sh/include/asm/processor.h b/kernel/arch/sh/include/asm/processor.h
index 5addd69f7..6fbf8c80e 100644
--- a/kernel/arch/sh/include/asm/processor.h
+++ b/kernel/arch/sh/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PROCESSOR_H
 #define __ASM_SH_PROCESSOR_H
 
diff --git a/kernel/arch/sh/include/asm/processor_32.h b/kernel/arch/sh/include/asm/processor_32.h
index 88ce1e222..95100d8a0 100644
--- a/kernel/arch/sh/include/asm/processor_32.h
+++ b/kernel/arch/sh/include/asm/processor_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-sh/processor.h
  *
diff --git a/kernel/arch/sh/include/asm/ptrace.h b/kernel/arch/sh/include/asm/ptrace.h
index 2506c7db7..9143c7bab 100644
--- a/kernel/arch/sh/include/asm/ptrace.h
+++ b/kernel/arch/sh/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1999, 2000  Niibe Yutaka
  */
diff --git a/kernel/arch/sh/include/asm/ptrace_32.h b/kernel/arch/sh/include/asm/ptrace_32.h
index 1dd4480c5..5f37ad7c6 100644
--- a/kernel/arch/sh/include/asm/ptrace_32.h
+++ b/kernel/arch/sh/include/asm/ptrace_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PTRACE_32_H
 #define __ASM_SH_PTRACE_32_H
 
diff --git a/kernel/arch/sh/include/asm/ptrace_64.h b/kernel/arch/sh/include/asm/ptrace_64.h
index 97f4b5660..6ee08229b 100644
--- a/kernel/arch/sh/include/asm/ptrace_64.h
+++ b/kernel/arch/sh/include/asm/ptrace_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PTRACE_64_H
 #define __ASM_SH_PTRACE_64_H
 
diff --git a/kernel/arch/sh/include/asm/push-switch.h b/kernel/arch/sh/include/asm/push-switch.h
index 4903f9e52..c5f072572 100644
--- a/kernel/arch/sh/include/asm/push-switch.h
+++ b/kernel/arch/sh/include/asm/push-switch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_PUSH_SWITCH_H
 #define __ASM_SH_PUSH_SWITCH_H
 
diff --git a/kernel/arch/sh/include/asm/reboot.h b/kernel/arch/sh/include/asm/reboot.h
index b3da0c63f..5c445c90d 100644
--- a/kernel/arch/sh/include/asm/reboot.h
+++ b/kernel/arch/sh/include/asm/reboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_REBOOT_H
 #define __ASM_SH_REBOOT_H
 
diff --git a/kernel/arch/sh/include/asm/romimage-macros.h b/kernel/arch/sh/include/asm/romimage-macros.h
index ae17a150b..f9352ee7c 100644
--- a/kernel/arch/sh/include/asm/romimage-macros.h
+++ b/kernel/arch/sh/include/asm/romimage-macros.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ROMIMAGE_MACRO_H
 #define __ROMIMAGE_MACRO_H
 
diff --git a/kernel/arch/sh/include/asm/rtc.h b/kernel/arch/sh/include/asm/rtc.h
index f7b010d48..c63555ee1 100644
--- a/kernel/arch/sh/include/asm/rtc.h
+++ b/kernel/arch/sh/include/asm/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_RTC_H
 #define _ASM_RTC_H
 
diff --git a/kernel/arch/sh/include/asm/seccomp.h b/kernel/arch/sh/include/asm/seccomp.h
index 3280ed380..54111e4d3 100644
--- a/kernel/arch/sh/include/asm/seccomp.h
+++ b/kernel/arch/sh/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SECCOMP_H
 
 #include <linux/unistd.h>
diff --git a/kernel/arch/sh/include/asm/sections.h b/kernel/arch/sh/include/asm/sections.h
index 7a99e6af6..8edb82404 100644
--- a/kernel/arch/sh/include/asm/sections.h
+++ b/kernel/arch/sh/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SECTIONS_H
 #define __ASM_SH_SECTIONS_H
 
diff --git a/kernel/arch/sh/include/asm/segment.h b/kernel/arch/sh/include/asm/segment.h
index ff795d3a6..101c13c0c 100644
--- a/kernel/arch/sh/include/asm/segment.h
+++ b/kernel/arch/sh/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SEGMENT_H
 #define __ASM_SH_SEGMENT_H
 
diff --git a/kernel/arch/sh/include/asm/setup.h b/kernel/arch/sh/include/asm/setup.h
index 99238108e..fc8070111 100644
--- a/kernel/arch/sh/include/asm/setup.h
+++ b/kernel/arch/sh/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
diff --git a/kernel/arch/sh/include/asm/sh7760fb.h b/kernel/arch/sh/include/asm/sh7760fb.h
index 8767f61ac..2d9433d75 100644
--- a/kernel/arch/sh/include/asm/sh7760fb.h
+++ b/kernel/arch/sh/include/asm/sh7760fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * sh7760fb.h -- platform data for SH7760/SH7763 LCDC framebuffer driver.
  *
diff --git a/kernel/arch/sh/include/asm/sh_bios.h b/kernel/arch/sh/include/asm/sh_bios.h
index 95714c284..ab693b982 100644
--- a/kernel/arch/sh/include/asm/sh_bios.h
+++ b/kernel/arch/sh/include/asm/sh_bios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_BIOS_H
 #define __ASM_SH_BIOS_H
 
diff --git a/kernel/arch/sh/include/asm/smc37c93x.h b/kernel/arch/sh/include/asm/smc37c93x.h
index 585da2a8f..f054c30a1 100644
--- a/kernel/arch/sh/include/asm/smc37c93x.h
+++ b/kernel/arch/sh/include/asm/smc37c93x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SMC37C93X_H
 #define __ASM_SH_SMC37C93X_H
 
diff --git a/kernel/arch/sh/include/asm/smp-ops.h b/kernel/arch/sh/include/asm/smp-ops.h
index c590f7685..e27702130 100644
--- a/kernel/arch/sh/include/asm/smp-ops.h
+++ b/kernel/arch/sh/include/asm/smp-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SMP_OPS_H
 #define __ASM_SH_SMP_OPS_H
 
diff --git a/kernel/arch/sh/include/asm/smp.h b/kernel/arch/sh/include/asm/smp.h
index c9f8bbdb1..1a0d7cf71 100644
--- a/kernel/arch/sh/include/asm/smp.h
+++ b/kernel/arch/sh/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SMP_H
 #define __ASM_SH_SMP_H
 
diff --git a/kernel/arch/sh/include/asm/sparsemem.h b/kernel/arch/sh/include/asm/sparsemem.h
index 547a540b6..4eb899751 100644
--- a/kernel/arch/sh/include/asm/sparsemem.h
+++ b/kernel/arch/sh/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SPARSEMEM_H
 #define __ASM_SH_SPARSEMEM_H
 
diff --git a/kernel/arch/sh/include/asm/spi.h b/kernel/arch/sh/include/asm/spi.h
index e96f5b095..6780753bd 100644
--- a/kernel/arch/sh/include/asm/spi.h
+++ b/kernel/arch/sh/include/asm/spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPI_H__
 #define __ASM_SPI_H__
 
diff --git a/kernel/arch/sh/include/asm/spinlock_types.h b/kernel/arch/sh/include/asm/spinlock_types.h
index 9b7560db0..e82369f28 100644
--- a/kernel/arch/sh/include/asm/spinlock_types.h
+++ b/kernel/arch/sh/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SPINLOCK_TYPES_H
 #define __ASM_SH_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/sh/include/asm/sram.h b/kernel/arch/sh/include/asm/sram.h
index a2808ce4c..c125cf219 100644
--- a/kernel/arch/sh/include/asm/sram.h
+++ b/kernel/arch/sh/include/asm/sram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SRAM_H
 #define __ASM_SRAM_H
 
diff --git a/kernel/arch/sh/include/asm/stackprotector.h b/kernel/arch/sh/include/asm/stackprotector.h
index 141515a43..35616841d 100644
--- a/kernel/arch/sh/include/asm/stackprotector.h
+++ b/kernel/arch/sh/include/asm/stackprotector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_STACKPROTECTOR_H
 #define __ASM_SH_STACKPROTECTOR_H
 
diff --git a/kernel/arch/sh/include/asm/stacktrace.h b/kernel/arch/sh/include/asm/stacktrace.h
index a7e2d4dfd..50c173c0b 100644
--- a/kernel/arch/sh/include/asm/stacktrace.h
+++ b/kernel/arch/sh/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2009  Matt Fleming
  *
diff --git a/kernel/arch/sh/include/asm/string.h b/kernel/arch/sh/include/asm/string.h
index 114011fa0..84fc5ed9c 100644
--- a/kernel/arch/sh/include/asm/string.h
+++ b/kernel/arch/sh/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_SUPERH32
 # include <asm/string_32.h>
 #else
diff --git a/kernel/arch/sh/include/asm/string_64.h b/kernel/arch/sh/include/asm/string_64.h
index 742007172..d51d6150a 100644
--- a/kernel/arch/sh/include/asm/string_64.h
+++ b/kernel/arch/sh/include/asm/string_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_STRING_64_H
 #define __ASM_SH_STRING_64_H
 
diff --git a/kernel/arch/sh/include/asm/suspend.h b/kernel/arch/sh/include/asm/suspend.h
index 70ae0b288..47db17520 100644
--- a/kernel/arch/sh/include/asm/suspend.h
+++ b/kernel/arch/sh/include/asm/suspend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SH_SUSPEND_H
 #define _ASM_SH_SUSPEND_H
 
diff --git a/kernel/arch/sh/include/asm/switch_to_32.h b/kernel/arch/sh/include/asm/switch_to_32.h
index 7661b4ba8..9c93fb91a 100644
--- a/kernel/arch/sh/include/asm/switch_to_32.h
+++ b/kernel/arch/sh/include/asm/switch_to_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SWITCH_TO_32_H
 #define __ASM_SH_SWITCH_TO_32_H
 
diff --git a/kernel/arch/sh/include/asm/syscall.h b/kernel/arch/sh/include/asm/syscall.h
index 847128da6..90ba00002 100644
--- a/kernel/arch/sh/include/asm/syscall.h
+++ b/kernel/arch/sh/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SYSCALL_H
 #define __ASM_SH_SYSCALL_H
 
diff --git a/kernel/arch/sh/include/asm/syscall_32.h b/kernel/arch/sh/include/asm/syscall_32.h
index 95be3b0ce..6e1187998 100644
--- a/kernel/arch/sh/include/asm/syscall_32.h
+++ b/kernel/arch/sh/include/asm/syscall_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SYSCALL_32_H
 #define __ASM_SH_SYSCALL_32_H
 
diff --git a/kernel/arch/sh/include/asm/syscall_64.h b/kernel/arch/sh/include/asm/syscall_64.h
index c6a797b90..43882580c 100644
--- a/kernel/arch/sh/include/asm/syscall_64.h
+++ b/kernel/arch/sh/include/asm/syscall_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SYSCALL_64_H
 #define __ASM_SH_SYSCALL_64_H
 
diff --git a/kernel/arch/sh/include/asm/syscalls.h b/kernel/arch/sh/include/asm/syscalls.h
index 3dbfef06f..995ef0462 100644
--- a/kernel/arch/sh/include/asm/syscalls.h
+++ b/kernel/arch/sh/include/asm/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SYSCALLS_H
 #define __ASM_SH_SYSCALLS_H
 
diff --git a/kernel/arch/sh/include/asm/syscalls_32.h b/kernel/arch/sh/include/asm/syscalls_32.h
index 4f643aa71..9f9faf63b 100644
--- a/kernel/arch/sh/include/asm/syscalls_32.h
+++ b/kernel/arch/sh/include/asm/syscalls_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SYSCALLS_32_H
 #define __ASM_SH_SYSCALLS_32_H
 
diff --git a/kernel/arch/sh/include/asm/syscalls_64.h b/kernel/arch/sh/include/asm/syscalls_64.h
index d62e8eb22..df42656ce 100644
--- a/kernel/arch/sh/include/asm/syscalls_64.h
+++ b/kernel/arch/sh/include/asm/syscalls_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SYSCALLS_64_H
 #define __ASM_SH_SYSCALLS_64_H
 
diff --git a/kernel/arch/sh/include/asm/thread_info.h b/kernel/arch/sh/include/asm/thread_info.h
index 6c65dcd47..becb798f1 100644
--- a/kernel/arch/sh/include/asm/thread_info.h
+++ b/kernel/arch/sh/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_THREAD_INFO_H
 #define __ASM_SH_THREAD_INFO_H
 
diff --git a/kernel/arch/sh/include/asm/timex.h b/kernel/arch/sh/include/asm/timex.h
index 18bf06d9c..f53f95bf4 100644
--- a/kernel/arch/sh/include/asm/timex.h
+++ b/kernel/arch/sh/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-sh/timex.h
  *
diff --git a/kernel/arch/sh/include/asm/tlb.h b/kernel/arch/sh/include/asm/tlb.h
index 51a8bc967..77abe192f 100644
--- a/kernel/arch/sh/include/asm/tlb.h
+++ b/kernel/arch/sh/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_TLB_H
 #define __ASM_SH_TLB_H
 
diff --git a/kernel/arch/sh/include/asm/tlbflush.h b/kernel/arch/sh/include/asm/tlbflush.h
index 0df66f0c7..8f180cd3b 100644
--- a/kernel/arch/sh/include/asm/tlbflush.h
+++ b/kernel/arch/sh/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_TLBFLUSH_H
 #define __ASM_SH_TLBFLUSH_H
 
diff --git a/kernel/arch/sh/include/asm/topology.h b/kernel/arch/sh/include/asm/topology.h
index 358e3f516..9a32eb409 100644
--- a/kernel/arch/sh/include/asm/topology.h
+++ b/kernel/arch/sh/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SH_TOPOLOGY_H
 #define _ASM_SH_TOPOLOGY_H
 
diff --git a/kernel/arch/sh/include/asm/traps.h b/kernel/arch/sh/include/asm/traps.h
index 9cc149a0d..8844ed0c0 100644
--- a/kernel/arch/sh/include/asm/traps.h
+++ b/kernel/arch/sh/include/asm/traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_TRAPS_H
 #define __ASM_SH_TRAPS_H
 
diff --git a/kernel/arch/sh/include/asm/traps_32.h b/kernel/arch/sh/include/asm/traps_32.h
index 17e129fe4..8c5bbb7b6 100644
--- a/kernel/arch/sh/include/asm/traps_32.h
+++ b/kernel/arch/sh/include/asm/traps_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_TRAPS_32_H
 #define __ASM_SH_TRAPS_32_H
 
diff --git a/kernel/arch/sh/include/asm/types.h b/kernel/arch/sh/include/asm/types.h
index 6a31053fa..df96c511b 100644
--- a/kernel/arch/sh/include/asm/types.h
+++ b/kernel/arch/sh/include/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_TYPES_H
 #define __ASM_SH_TYPES_H
 
diff --git a/kernel/arch/sh/include/asm/uaccess.h b/kernel/arch/sh/include/asm/uaccess.h
index 211b44920..32eb56e00 100644
--- a/kernel/arch/sh/include/asm/uaccess.h
+++ b/kernel/arch/sh/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_UACCESS_H
 #define __ASM_SH_UACCESS_H
 
diff --git a/kernel/arch/sh/include/asm/uaccess_32.h b/kernel/arch/sh/include/asm/uaccess_32.h
index c0de7ee35..624cf55ac 100644
--- a/kernel/arch/sh/include/asm/uaccess_32.h
+++ b/kernel/arch/sh/include/asm/uaccess_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * User space memory access functions
  *
diff --git a/kernel/arch/sh/include/asm/unaligned-sh4a.h b/kernel/arch/sh/include/asm/unaligned-sh4a.h
index 95adc500c..d311f00ed 100644
--- a/kernel/arch/sh/include/asm/unaligned-sh4a.h
+++ b/kernel/arch/sh/include/asm/unaligned-sh4a.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_UNALIGNED_SH4A_H
 #define __ASM_SH_UNALIGNED_SH4A_H
 
diff --git a/kernel/arch/sh/include/asm/unaligned.h b/kernel/arch/sh/include/asm/unaligned.h
index 7d14e0669..0c92e2c73 100644
--- a/kernel/arch/sh/include/asm/unaligned.h
+++ b/kernel/arch/sh/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SH_UNALIGNED_H
 #define _ASM_SH_UNALIGNED_H
 
diff --git a/kernel/arch/sh/include/asm/uncached.h b/kernel/arch/sh/include/asm/uncached.h
index 6f8816b79..e7f68ec61 100644
--- a/kernel/arch/sh/include/asm/uncached.h
+++ b/kernel/arch/sh/include/asm/uncached.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_UNCACHED_H
 #define __ASM_SH_UNCACHED_H
 
diff --git a/kernel/arch/sh/include/asm/unistd.h b/kernel/arch/sh/include/asm/unistd.h
index 126fe8340..b36200af9 100644
--- a/kernel/arch/sh/include/asm/unistd.h
+++ b/kernel/arch/sh/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 # ifdef CONFIG_SUPERH32
 #  include <asm/unistd_32.h>
 # else
diff --git a/kernel/arch/sh/include/asm/unwinder.h b/kernel/arch/sh/include/asm/unwinder.h
index 1e65c07b3..ce82c96c7 100644
--- a/kernel/arch/sh/include/asm/unwinder.h
+++ b/kernel/arch/sh/include/asm/unwinder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNWINDER_H
 #define _LINUX_UNWINDER_H
 
diff --git a/kernel/arch/sh/include/asm/user.h b/kernel/arch/sh/include/asm/user.h
index 8fd3cf6c5..e97f2efed 100644
--- a/kernel/arch/sh/include/asm/user.h
+++ b/kernel/arch/sh/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_USER_H
 #define __ASM_SH_USER_H
 
diff --git a/kernel/arch/sh/include/asm/vmlinux.lds.h b/kernel/arch/sh/include/asm/vmlinux.lds.h
index d58ad493b..f312813f3 100644
--- a/kernel/arch/sh/include/asm/vmlinux.lds.h
+++ b/kernel/arch/sh/include/asm/vmlinux.lds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_VMLINUX_LDS_H
 #define __ASM_SH_VMLINUX_LDS_H
 
diff --git a/kernel/arch/sh/include/asm/word-at-a-time.h b/kernel/arch/sh/include/asm/word-at-a-time.h
index 6e38953ff..4aa398455 100644
--- a/kernel/arch/sh/include/asm/word-at-a-time.h
+++ b/kernel/arch/sh/include/asm/word-at-a-time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_WORD_AT_A_TIME_H
 #define __ASM_SH_WORD_AT_A_TIME_H
 
diff --git a/kernel/arch/sh/include/cpu-common/cpu/rtc.h b/kernel/arch/sh/include/cpu-common/cpu/rtc.h
index 39e2d6e94..5fe726acd 100644
--- a/kernel/arch/sh/include/cpu-common/cpu/rtc.h
+++ b/kernel/arch/sh/include/cpu-common/cpu/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH2_RTC_H
 #define __ASM_SH_CPU_SH2_RTC_H
 
diff --git a/kernel/arch/sh/include/cpu-common/cpu/sigcontext.h b/kernel/arch/sh/include/cpu-common/cpu/sigcontext.h
index fe5c15dd6..e005dd176 100644
--- a/kernel/arch/sh/include/cpu-common/cpu/sigcontext.h
+++ b/kernel/arch/sh/include/cpu-common/cpu/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_SH2_SIGCONTEXT_H
 #define __ASM_CPU_SH2_SIGCONTEXT_H
 
diff --git a/kernel/arch/sh/include/cpu-sh2a/cpu/addrspace.h b/kernel/arch/sh/include/cpu-sh2a/cpu/addrspace.h
index 31eb4b58a..3afa46c09 100644
--- a/kernel/arch/sh/include/cpu-sh2a/cpu/addrspace.h
+++ b/kernel/arch/sh/include/cpu-sh2a/cpu/addrspace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH2A_ADDRSPACE_H
 #define __ASM_SH_CPU_SH2A_ADDRSPACE_H
 
diff --git a/kernel/arch/sh/include/cpu-sh2a/cpu/rtc.h b/kernel/arch/sh/include/cpu-sh2a/cpu/rtc.h
index afb511e2b..6b6c7ee75 100644
--- a/kernel/arch/sh/include/cpu-sh2a/cpu/rtc.h
+++ b/kernel/arch/sh/include/cpu-sh2a/cpu/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH2A_RTC_H
 #define __ASM_SH_CPU_SH2A_RTC_H
 
diff --git a/kernel/arch/sh/include/cpu-sh2a/cpu/sh7203.h b/kernel/arch/sh/include/cpu-sh2a/cpu/sh7203.h
index 79f931590..f250adfa4 100644
--- a/kernel/arch/sh/include/cpu-sh2a/cpu/sh7203.h
+++ b/kernel/arch/sh/include/cpu-sh2a/cpu/sh7203.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7203_H__
 #define __ASM_SH7203_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh2a/cpu/sh7264.h b/kernel/arch/sh/include/cpu-sh2a/cpu/sh7264.h
index 2ae0e938b..d12c19186 100644
--- a/kernel/arch/sh/include/cpu-sh2a/cpu/sh7264.h
+++ b/kernel/arch/sh/include/cpu-sh2a/cpu/sh7264.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7264_H__
 #define __ASM_SH7264_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh2a/cpu/sh7269.h b/kernel/arch/sh/include/cpu-sh2a/cpu/sh7269.h
index 13c495a9f..d516e5d48 100644
--- a/kernel/arch/sh/include/cpu-sh2a/cpu/sh7269.h
+++ b/kernel/arch/sh/include/cpu-sh2a/cpu/sh7269.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7269_H__
 #define __ASM_SH7269_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh3/cpu/adc.h b/kernel/arch/sh/include/cpu-sh3/cpu/adc.h
index b289e3ca1..2ee206c9b 100644
--- a/kernel/arch/sh/include/cpu-sh3/cpu/adc.h
+++ b/kernel/arch/sh/include/cpu-sh3/cpu/adc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_SH3_ADC_H
 #define __ASM_CPU_SH3_ADC_H
 
diff --git a/kernel/arch/sh/include/cpu-sh3/cpu/dac.h b/kernel/arch/sh/include/cpu-sh3/cpu/dac.h
index 98f1d15f0..fd0233160 100644
--- a/kernel/arch/sh/include/cpu-sh3/cpu/dac.h
+++ b/kernel/arch/sh/include/cpu-sh3/cpu/dac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_SH3_DAC_H
 #define __ASM_CPU_SH3_DAC_H
 
diff --git a/kernel/arch/sh/include/cpu-sh3/cpu/dma.h b/kernel/arch/sh/include/cpu-sh3/cpu/dma.h
index bccb4144a..cd139681a 100644
--- a/kernel/arch/sh/include/cpu-sh3/cpu/dma.h
+++ b/kernel/arch/sh/include/cpu-sh3/cpu/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_SH3_DMA_H
 #define __ASM_CPU_SH3_DMA_H
 
diff --git a/kernel/arch/sh/include/cpu-sh3/cpu/serial.h b/kernel/arch/sh/include/cpu-sh3/cpu/serial.h
index 7766329bc..7b2ce6e30 100644
--- a/kernel/arch/sh/include/cpu-sh3/cpu/serial.h
+++ b/kernel/arch/sh/include/cpu-sh3/cpu/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPU_SH3_SERIAL_H
 #define __CPU_SH3_SERIAL_H
 
diff --git a/kernel/arch/sh/include/cpu-sh3/cpu/sh7720.h b/kernel/arch/sh/include/cpu-sh3/cpu/sh7720.h
index 41c1406d6..449790c9e 100644
--- a/kernel/arch/sh/include/cpu-sh3/cpu/sh7720.h
+++ b/kernel/arch/sh/include/cpu-sh3/cpu/sh7720.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7720_H__
 #define __ASM_SH7720_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/dma.h b/kernel/arch/sh/include/cpu-sh4/cpu/dma.h
index a520eb219..38187d06b 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/dma.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_SH4_DMA_H
 #define __ASM_CPU_SH4_DMA_H
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/rtc.h b/kernel/arch/sh/include/cpu-sh4/cpu/rtc.h
index 95e6fb76c..456475669 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/rtc.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH4_RTC_H
 #define __ASM_SH_CPU_SH4_RTC_H
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sh7722.h b/kernel/arch/sh/include/cpu-sh4/cpu/sh7722.h
index 78961ab78..2306c79f4 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sh7722.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sh7722.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7722_H__
 #define __ASM_SH7722_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sh7723.h b/kernel/arch/sh/include/cpu-sh4/cpu/sh7723.h
index 668da89bd..41f675307 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sh7723.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sh7723.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7723_H__
 #define __ASM_SH7723_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sh7724.h b/kernel/arch/sh/include/cpu-sh4/cpu/sh7724.h
index 38859f96d..b3a7caf54 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sh7724.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sh7724.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7724_H__
 #define __ASM_SH7724_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sh7734.h b/kernel/arch/sh/include/cpu-sh4/cpu/sh7734.h
index 2fb9a7b71..96f0246ad 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sh7734.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sh7734.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7734_H__
 #define __ASM_SH7734_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sh7757.h b/kernel/arch/sh/include/cpu-sh4/cpu/sh7757.h
index b40fb541e..6781d41b7 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sh7757.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sh7757.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7757_H__
 #define __ASM_SH7757_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sh7785.h b/kernel/arch/sh/include/cpu-sh4/cpu/sh7785.h
index 9dc9d91e0..37f42071e 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sh7785.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sh7785.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH7785_H__
 #define __ASM_SH7785_H__
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/shx3.h b/kernel/arch/sh/include/cpu-sh4/cpu/shx3.h
index 68d9080a8..f356810b0 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/shx3.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/shx3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPU_SHX3_H
 #define __CPU_SHX3_H
 
diff --git a/kernel/arch/sh/include/cpu-sh4/cpu/sigcontext.h b/kernel/arch/sh/include/cpu-sh4/cpu/sigcontext.h
index ab392f120..2cc5f55dc 100644
--- a/kernel/arch/sh/include/cpu-sh4/cpu/sigcontext.h
+++ b/kernel/arch/sh/include/cpu-sh4/cpu/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_SH4_SIGCONTEXT_H
 #define __ASM_CPU_SH4_SIGCONTEXT_H
 
diff --git a/kernel/arch/sh/include/cpu-sh4a/cpu/dma.h b/kernel/arch/sh/include/cpu-sh4a/cpu/dma.h
index 8ceccceae..bdbbba8a7 100644
--- a/kernel/arch/sh/include/cpu-sh4a/cpu/dma.h
+++ b/kernel/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH4_DMA_SH7780_H
 #define __ASM_SH_CPU_SH4_DMA_SH7780_H
 
diff --git a/kernel/arch/sh/include/cpu-sh4a/cpu/serial.h b/kernel/arch/sh/include/cpu-sh4a/cpu/serial.h
index ff1bc275d..fc206c0bf 100644
--- a/kernel/arch/sh/include/cpu-sh4a/cpu/serial.h
+++ b/kernel/arch/sh/include/cpu-sh4a/cpu/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPU_SH4A_SERIAL_H
 #define __CPU_SH4A_SERIAL_H
 
diff --git a/kernel/arch/sh/include/cpu-sh5/cpu/addrspace.h b/kernel/arch/sh/include/cpu-sh5/cpu/addrspace.h
index dc36b9a03..6dd1e72f3 100644
--- a/kernel/arch/sh/include/cpu-sh5/cpu/addrspace.h
+++ b/kernel/arch/sh/include/cpu-sh5/cpu/addrspace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH5_ADDRSPACE_H
 #define __ASM_SH_CPU_SH5_ADDRSPACE_H
 
diff --git a/kernel/arch/sh/include/cpu-sh5/cpu/mmu_context.h b/kernel/arch/sh/include/cpu-sh5/cpu/mmu_context.h
index 68a1d2cff..23c53be94 100644
--- a/kernel/arch/sh/include/cpu-sh5/cpu/mmu_context.h
+++ b/kernel/arch/sh/include/cpu-sh5/cpu/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH5_MMU_CONTEXT_H
 #define __ASM_SH_CPU_SH5_MMU_CONTEXT_H
 
diff --git a/kernel/arch/sh/include/cpu-sh5/cpu/rtc.h b/kernel/arch/sh/include/cpu-sh5/cpu/rtc.h
index 12ea0ed14..d7e25d435 100644
--- a/kernel/arch/sh/include/cpu-sh5/cpu/rtc.h
+++ b/kernel/arch/sh/include/cpu-sh5/cpu/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_CPU_SH5_RTC_H
 #define __ASM_SH_CPU_SH5_RTC_H
 
diff --git a/kernel/arch/sh/include/mach-common/mach/highlander.h b/kernel/arch/sh/include/mach-common/mach/highlander.h
index 6ce944e33..66d3e40fd 100644
--- a/kernel/arch/sh/include/mach-common/mach/highlander.h
+++ b/kernel/arch/sh/include/mach-common/mach/highlander.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_RENESAS_R7780RP_H
 #define __ASM_SH_RENESAS_R7780RP_H
 
diff --git a/kernel/arch/sh/include/mach-common/mach/r2d.h b/kernel/arch/sh/include/mach-common/mach/r2d.h
index e04f75eaa..0d7e483c7 100644
--- a/kernel/arch/sh/include/mach-common/mach/r2d.h
+++ b/kernel/arch/sh/include/mach-common/mach/r2d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_RENESAS_RTS7751R2D_H
 #define __ASM_SH_RENESAS_RTS7751R2D_H
 
diff --git a/kernel/arch/sh/include/mach-common/mach/romimage.h b/kernel/arch/sh/include/mach-common/mach/romimage.h
index 3670455fa..191571426 100644
--- a/kernel/arch/sh/include/mach-common/mach/romimage.h
+++ b/kernel/arch/sh/include/mach-common/mach/romimage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __ASSEMBLY__
 
 /* do nothing here by default */
diff --git a/kernel/arch/sh/include/mach-common/mach/sh2007.h b/kernel/arch/sh/include/mach-common/mach/sh2007.h
index 48180b9aa..eeb12901a 100644
--- a/kernel/arch/sh/include/mach-common/mach/sh2007.h
+++ b/kernel/arch/sh/include/mach-common/mach/sh2007.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_SH2007_H
 #define __MACH_SH2007_H
 
diff --git a/kernel/arch/sh/include/mach-common/mach/sh7785lcr.h b/kernel/arch/sh/include/mach-common/mach/sh7785lcr.h
index 1292ae5c2..0f3dc3a13 100644
--- a/kernel/arch/sh/include/mach-common/mach/sh7785lcr.h
+++ b/kernel/arch/sh/include/mach-common/mach/sh7785lcr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_RENESAS_SH7785LCR_H
 #define __ASM_SH_RENESAS_SH7785LCR_H
 
diff --git a/kernel/arch/sh/include/mach-common/mach/shmin.h b/kernel/arch/sh/include/mach-common/mach/shmin.h
index 36ba138a8..c2c3e26d1 100644
--- a/kernel/arch/sh/include/mach-common/mach/shmin.h
+++ b/kernel/arch/sh/include/mach-common/mach/shmin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SHMIN_H
 #define __ASM_SH_SHMIN_H
 
diff --git a/kernel/arch/sh/include/mach-common/mach/titan.h b/kernel/arch/sh/include/mach-common/mach/titan.h
index fa3cd801c..54df351de 100644
--- a/kernel/arch/sh/include/mach-common/mach/titan.h
+++ b/kernel/arch/sh/include/mach-common/mach/titan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Platform definitions for Titan
  */
diff --git a/kernel/arch/sh/include/mach-common/mach/urquell.h b/kernel/arch/sh/include/mach-common/mach/urquell.h
index 14b3e1d01..6c9bff3f9 100644
--- a/kernel/arch/sh/include/mach-common/mach/urquell.h
+++ b/kernel/arch/sh/include/mach-common/mach/urquell.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_URQUELL_H
 #define __MACH_URQUELL_H
 
diff --git a/kernel/arch/sh/include/mach-dreamcast/mach/maple.h b/kernel/arch/sh/include/mach-dreamcast/mach/maple.h
index 51f6a87f1..169bdf415 100644
--- a/kernel/arch/sh/include/mach-dreamcast/mach/maple.h
+++ b/kernel/arch/sh/include/mach-dreamcast/mach/maple.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MAPLE_H
 #define __ASM_MAPLE_H
 
diff --git a/kernel/arch/sh/include/mach-ecovec24/mach/romimage.h b/kernel/arch/sh/include/mach-ecovec24/mach/romimage.h
index 60f3e8af0..2da6ff326 100644
--- a/kernel/arch/sh/include/mach-ecovec24/mach/romimage.h
+++ b/kernel/arch/sh/include/mach-ecovec24/mach/romimage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __ASSEMBLY__
 
 /* EcoVec board specific boot code:
diff --git a/kernel/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h b/kernel/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
index 79f154e5c..0e97473af 100644
--- a/kernel/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
+++ b/kernel/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_KFR2R09_H
 #define __ASM_SH_KFR2R09_H
 
diff --git a/kernel/arch/sh/include/mach-kfr2r09/mach/romimage.h b/kernel/arch/sh/include/mach-kfr2r09/mach/romimage.h
index 1afae21ce..209275872 100644
--- a/kernel/arch/sh/include/mach-kfr2r09/mach/romimage.h
+++ b/kernel/arch/sh/include/mach-kfr2r09/mach/romimage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __ASSEMBLY__
 
 /* kfr2r09 board specific boot code:
diff --git a/kernel/arch/sh/include/mach-landisk/mach/gio.h b/kernel/arch/sh/include/mach-landisk/mach/gio.h
index 35d7368b7..b954de617 100644
--- a/kernel/arch/sh/include/mach-landisk/mach/gio.h
+++ b/kernel/arch/sh/include/mach-landisk/mach/gio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_LANDISK_GIO_H
 #define __ASM_SH_LANDISK_GIO_H
 
diff --git a/kernel/arch/sh/include/mach-landisk/mach/iodata_landisk.h b/kernel/arch/sh/include/mach-landisk/mach/iodata_landisk.h
index ceeea48cc..b41308c94 100644
--- a/kernel/arch/sh/include/mach-landisk/mach/iodata_landisk.h
+++ b/kernel/arch/sh/include/mach-landisk/mach/iodata_landisk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_IODATA_LANDISK_H
 #define __ASM_SH_IODATA_LANDISK_H
 
diff --git a/kernel/arch/sh/include/mach-migor/mach/migor.h b/kernel/arch/sh/include/mach-migor/mach/migor.h
index 7de7bb74c..2a422b778 100644
--- a/kernel/arch/sh/include/mach-migor/mach/migor.h
+++ b/kernel/arch/sh/include/mach-migor/mach/migor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_MIGOR_H
 #define __ASM_SH_MIGOR_H
 
diff --git a/kernel/arch/sh/include/mach-sdk7786/mach/fpga.h b/kernel/arch/sh/include/mach-sdk7786/mach/fpga.h
index a9cdac469..76c2e8489 100644
--- a/kernel/arch/sh/include/mach-sdk7786/mach/fpga.h
+++ b/kernel/arch/sh/include/mach-sdk7786/mach/fpga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_SDK7786_FPGA_H
 #define __MACH_SDK7786_FPGA_H
 
diff --git a/kernel/arch/sh/include/mach-sdk7786/mach/irq.h b/kernel/arch/sh/include/mach-sdk7786/mach/irq.h
index 0f584635e..334338090 100644
--- a/kernel/arch/sh/include/mach-sdk7786/mach/irq.h
+++ b/kernel/arch/sh/include/mach-sdk7786/mach/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_SDK7786_IRQ_H
 #define __MACH_SDK7786_IRQ_H
 
diff --git a/kernel/arch/sh/include/mach-se/mach/mrshpc.h b/kernel/arch/sh/include/mach-se/mach/mrshpc.h
index 56287ee85..4e260f399 100644
--- a/kernel/arch/sh/include/mach-se/mach/mrshpc.h
+++ b/kernel/arch/sh/include/mach-se/mach/mrshpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_SE_MRSHPC_H
 #define __MACH_SE_MRSHPC_H
 
diff --git a/kernel/arch/sh/include/mach-se/mach/se.h b/kernel/arch/sh/include/mach-se/mach/se.h
index 8a6d44b49..4246ef9b0 100644
--- a/kernel/arch/sh/include/mach-se/mach/se.h
+++ b/kernel/arch/sh/include/mach-se/mach/se.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HITACHI_SE_H
 #define __ASM_SH_HITACHI_SE_H
 
diff --git a/kernel/arch/sh/include/mach-se/mach/se7206.h b/kernel/arch/sh/include/mach-se/mach/se7206.h
index 698eb8038..cf190279b 100644
--- a/kernel/arch/sh/include/mach-se/mach/se7206.h
+++ b/kernel/arch/sh/include/mach-se/mach/se7206.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SE7206_H
 #define __ASM_SH_SE7206_H
 
diff --git a/kernel/arch/sh/include/mach-se/mach/se7343.h b/kernel/arch/sh/include/mach-se/mach/se7343.h
index 542521c97..107fb5f3e 100644
--- a/kernel/arch/sh/include/mach-se/mach/se7343.h
+++ b/kernel/arch/sh/include/mach-se/mach/se7343.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HITACHI_SE7343_H
 #define __ASM_SH_HITACHI_SE7343_H
 
diff --git a/kernel/arch/sh/include/mach-se/mach/se7751.h b/kernel/arch/sh/include/mach-se/mach/se7751.h
index 271871793..ee5b5e6e5 100644
--- a/kernel/arch/sh/include/mach-se/mach/se7751.h
+++ b/kernel/arch/sh/include/mach-se/mach/se7751.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_HITACHI_7751SE_H
 #define __ASM_SH_HITACHI_7751SE_H
 
diff --git a/kernel/arch/sh/include/mach-sh03/mach/io.h b/kernel/arch/sh/include/mach-sh03/mach/io.h
index c39c785bb..5eacdabd7 100644
--- a/kernel/arch/sh/include/mach-sh03/mach/io.h
+++ b/kernel/arch/sh/include/mach-sh03/mach/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm-sh/sh03/io.h
  *
diff --git a/kernel/arch/sh/include/mach-sh03/mach/sh03.h b/kernel/arch/sh/include/mach-sh03/mach/sh03.h
index 19c40b804..4ced684b1 100644
--- a/kernel/arch/sh/include/mach-sh03/mach/sh03.h
+++ b/kernel/arch/sh/include/mach-sh03/mach/sh03.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_SH03_H
 #define __ASM_SH_SH03_H
 
diff --git a/kernel/arch/sh/include/mach-x3proto/mach/hardware.h b/kernel/arch/sh/include/mach-x3proto/mach/hardware.h
index 52bca57bf..57ea4a5cc 100644
--- a/kernel/arch/sh/include/mach-x3proto/mach/hardware.h
+++ b/kernel/arch/sh/include/mach-x3proto/mach/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_X3PROTO_HARDWARE_H
 #define __MACH_X3PROTO_HARDWARE_H
 
diff --git a/kernel/arch/sh/include/mach-x3proto/mach/ilsel.h b/kernel/arch/sh/include/mach-x3proto/mach/ilsel.h
index e3d304b28..47aeb4b55 100644
--- a/kernel/arch/sh/include/mach-x3proto/mach/ilsel.h
+++ b/kernel/arch/sh/include/mach-x3proto/mach/ilsel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ILSEL_H
 #define __ASM_SH_ILSEL_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/auxvec.h b/kernel/arch/sh/include/uapi/asm/auxvec.h
index 8bcc51af9..8eb47ede7 100644
--- a/kernel/arch/sh/include/uapi/asm/auxvec.h
+++ b/kernel/arch/sh/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_AUXVEC_H
 #define __ASM_SH_AUXVEC_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/byteorder.h b/kernel/arch/sh/include/uapi/asm/byteorder.h
index db2f5d7cb..e27d6da32 100644
--- a/kernel/arch/sh/include/uapi/asm/byteorder.h
+++ b/kernel/arch/sh/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_BYTEORDER_H
 #define __ASM_SH_BYTEORDER_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/cachectl.h b/kernel/arch/sh/include/uapi/asm/cachectl.h
index 6ffb4b7a2..79c566325 100644
--- a/kernel/arch/sh/include/uapi/asm/cachectl.h
+++ b/kernel/arch/sh/include/uapi/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SH_CACHECTL_H
 #define _SH_CACHECTL_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/cpu-features.h b/kernel/arch/sh/include/uapi/asm/cpu-features.h
index 2f1bc8510..6de5f6519 100644
--- a/kernel/arch/sh/include/uapi/asm/cpu-features.h
+++ b/kernel/arch/sh/include/uapi/asm/cpu-features.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_CPU_FEATURES_H
 #define __ASM_SH_CPU_FEATURES_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/hw_breakpoint.h b/kernel/arch/sh/include/uapi/asm/hw_breakpoint.h
index ae5704fa7..043dd4b92 100644
--- a/kernel/arch/sh/include/uapi/asm/hw_breakpoint.h
+++ b/kernel/arch/sh/include/uapi/asm/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * There isn't anything here anymore, but the file must not be empty or patch
  * will delete it.
diff --git a/kernel/arch/sh/include/uapi/asm/ioctls.h b/kernel/arch/sh/include/uapi/asm/ioctls.h
index 787bac9f6..cc62f6f98 100644
--- a/kernel/arch/sh/include/uapi/asm/ioctls.h
+++ b/kernel/arch/sh/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_IOCTLS_H
 #define __ASM_SH_IOCTLS_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/posix_types.h b/kernel/arch/sh/include/uapi/asm/posix_types.h
index dc55e5adf..2644fdd44 100644
--- a/kernel/arch/sh/include/uapi/asm/posix_types.h
+++ b/kernel/arch/sh/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __KERNEL__
 # ifdef __SH5__
 #  include <asm/posix_types_64.h>
diff --git a/kernel/arch/sh/include/uapi/asm/posix_types_32.h b/kernel/arch/sh/include/uapi/asm/posix_types_32.h
index ba0bdc423..ea0f51d1a 100644
--- a/kernel/arch/sh/include/uapi/asm/posix_types_32.h
+++ b/kernel/arch/sh/include/uapi/asm/posix_types_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_POSIX_TYPES_32_H
 #define __ASM_SH_POSIX_TYPES_32_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/posix_types_64.h b/kernel/arch/sh/include/uapi/asm/posix_types_64.h
index 244f7e950..3a9128d4a 100644
--- a/kernel/arch/sh/include/uapi/asm/posix_types_64.h
+++ b/kernel/arch/sh/include/uapi/asm/posix_types_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_POSIX_TYPES_64_H
 #define __ASM_SH_POSIX_TYPES_64_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/ptrace.h b/kernel/arch/sh/include/uapi/asm/ptrace.h
index 8b8c5aca9..4ec9c2b65 100644
--- a/kernel/arch/sh/include/uapi/asm/ptrace.h
+++ b/kernel/arch/sh/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 1999, 2000  Niibe Yutaka
  */
diff --git a/kernel/arch/sh/include/uapi/asm/ptrace_32.h b/kernel/arch/sh/include/uapi/asm/ptrace_32.h
index 926e0cefc..dc8a26015 100644
--- a/kernel/arch/sh/include/uapi/asm/ptrace_32.h
+++ b/kernel/arch/sh/include/uapi/asm/ptrace_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_SH_PTRACE_32_H
 #define _UAPI__ASM_SH_PTRACE_32_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/ptrace_64.h b/kernel/arch/sh/include/uapi/asm/ptrace_64.h
index 0e52ee83e..a6f84eba5 100644
--- a/kernel/arch/sh/include/uapi/asm/ptrace_64.h
+++ b/kernel/arch/sh/include/uapi/asm/ptrace_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_SH_PTRACE_64_H
 #define _UAPI__ASM_SH_PTRACE_64_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/sigcontext.h b/kernel/arch/sh/include/uapi/asm/sigcontext.h
index faa5d0833..d2b7e4f03 100644
--- a/kernel/arch/sh/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/sh/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_SIGCONTEXT_H
 #define __ASM_SH_SIGCONTEXT_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/signal.h b/kernel/arch/sh/include/uapi/asm/signal.h
index cb96d02f5..97299dadd 100644
--- a/kernel/arch/sh/include/uapi/asm/signal.h
+++ b/kernel/arch/sh/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_SIGNAL_H
 #define __ASM_SH_SIGNAL_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/sockios.h b/kernel/arch/sh/include/uapi/asm/sockios.h
index cf8b96b1f..17313d2c3 100644
--- a/kernel/arch/sh/include/uapi/asm/sockios.h
+++ b/kernel/arch/sh/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_SOCKIOS_H
 #define __ASM_SH_SOCKIOS_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/stat.h b/kernel/arch/sh/include/uapi/asm/stat.h
index e1810cc6e..659b87c7c 100644
--- a/kernel/arch/sh/include/uapi/asm/stat.h
+++ b/kernel/arch/sh/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_STAT_H
 #define __ASM_SH_STAT_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/swab.h b/kernel/arch/sh/include/uapi/asm/swab.h
index 1cd09767a..f0b021527 100644
--- a/kernel/arch/sh/include/uapi/asm/swab.h
+++ b/kernel/arch/sh/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_SWAB_H
 #define __ASM_SH_SWAB_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/unistd.h b/kernel/arch/sh/include/uapi/asm/unistd.h
index eeef88dd5..9e0b4e5e6 100644
--- a/kernel/arch/sh/include/uapi/asm/unistd.h
+++ b/kernel/arch/sh/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __KERNEL__
 # ifdef __SH5__
 #  include <asm/unistd_64.h>
diff --git a/kernel/arch/sh/include/uapi/asm/unistd_32.h b/kernel/arch/sh/include/uapi/asm/unistd_32.h
index c801bde9e..58f04cf3d 100644
--- a/kernel/arch/sh/include/uapi/asm/unistd_32.h
+++ b/kernel/arch/sh/include/uapi/asm/unistd_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_UNISTD_32_H
 #define __ASM_SH_UNISTD_32_H
 
diff --git a/kernel/arch/sh/include/uapi/asm/unistd_64.h b/kernel/arch/sh/include/uapi/asm/unistd_64.h
index ce0cb3598..6f809a53a 100644
--- a/kernel/arch/sh/include/uapi/asm/unistd_64.h
+++ b/kernel/arch/sh/include/uapi/asm/unistd_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_SH_UNISTD_64_H
 #define __ASM_SH_UNISTD_64_H
 
diff --git a/kernel/arch/sh/kernel/Makefile b/kernel/arch/sh/kernel/Makefile
index 09040fd07..dc80041f7 100644
--- a/kernel/arch/sh/kernel/Makefile
+++ b/kernel/arch/sh/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH kernel.
 #
diff --git a/kernel/arch/sh/kernel/asm-offsets.c b/kernel/arch/sh/kernel/asm-offsets.c
index 4bd44da91..a0322e832 100644
--- a/kernel/arch/sh/kernel/asm-offsets.c
+++ b/kernel/arch/sh/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This program is used to generate definitions needed by
  * assembly language modules.
diff --git a/kernel/arch/sh/kernel/cpu/Makefile b/kernel/arch/sh/kernel/cpu/Makefile
index 252e9fee6..f7c22ea98 100644
--- a/kernel/arch/sh/kernel/cpu/Makefile
+++ b/kernel/arch/sh/kernel/cpu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH CPU-specific backends.
 #
diff --git a/kernel/arch/sh/kernel/cpu/adc.c b/kernel/arch/sh/kernel/cpu/adc.c
index d307571d5..509136715 100644
--- a/kernel/arch/sh/kernel/cpu/adc.c
+++ b/kernel/arch/sh/kernel/cpu/adc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/kernel/adc.c -- SH3 on-chip ADC support
  *
diff --git a/kernel/arch/sh/kernel/cpu/clock-cpg.c b/kernel/arch/sh/kernel/cpu/clock-cpg.c
index 786c0769b..5b75a384c 100644
--- a/kernel/arch/sh/kernel/cpu/clock-cpg.c
+++ b/kernel/arch/sh/kernel/cpu/clock-cpg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/clk.h>
 #include <linux/compiler.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/sh/kernel/cpu/fpu.c b/kernel/arch/sh/kernel/cpu/fpu.c
index 547c73478..ae354a293 100644
--- a/kernel/arch/sh/kernel/cpu/fpu.c
+++ b/kernel/arch/sh/kernel/cpu/fpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched/signal.h>
 #include <linux/sched/task.h>
 #include <linux/sched/task_stack.h>
diff --git a/kernel/arch/sh/kernel/cpu/irq/imask.c b/kernel/arch/sh/kernel/cpu/irq/imask.c
index e7f1745bd..572585c3f 100644
--- a/kernel/arch/sh/kernel/cpu/irq/imask.c
+++ b/kernel/arch/sh/kernel/cpu/irq/imask.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/kernel/cpu/irq/imask.c
  *
diff --git a/kernel/arch/sh/kernel/cpu/proc.c b/kernel/arch/sh/kernel/cpu/proc.c
index 4df4b284f..85961b4f9 100644
--- a/kernel/arch/sh/kernel/cpu/proc.c
+++ b/kernel/arch/sh/kernel/cpu/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/seq_file.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/kernel/arch/sh/kernel/cpu/sh2a/Makefile b/kernel/arch/sh/kernel/cpu/sh2a/Makefile
index 990195d98..2a7515b65 100644
--- a/kernel/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/kernel/arch/sh/kernel/cpu/sh2a/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH SH-2A backends.
 #
diff --git a/kernel/arch/sh/kernel/cpu/sh3/Makefile b/kernel/arch/sh/kernel/cpu/sh3/Makefile
index d3634ae7b..1dcb43d93 100644
--- a/kernel/arch/sh/kernel/cpu/sh3/Makefile
+++ b/kernel/arch/sh/kernel/cpu/sh3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH SH-3 backends.
 #
diff --git a/kernel/arch/sh/kernel/cpu/sh3/serial-sh770x.c b/kernel/arch/sh/kernel/cpu/sh3/serial-sh770x.c
index 4f7242c67..dec027f23 100644
--- a/kernel/arch/sh/kernel/cpu/sh3/serial-sh770x.c
+++ b/kernel/arch/sh/kernel/cpu/sh3/serial-sh770x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/serial_sci.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
diff --git a/kernel/arch/sh/kernel/cpu/sh3/serial-sh7710.c b/kernel/arch/sh/kernel/cpu/sh3/serial-sh7710.c
index 42190ef6a..ee04052e5 100644
--- a/kernel/arch/sh/kernel/cpu/sh3/serial-sh7710.c
+++ b/kernel/arch/sh/kernel/cpu/sh3/serial-sh7710.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/serial_sci.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
diff --git a/kernel/arch/sh/kernel/cpu/sh3/serial-sh7720.c b/kernel/arch/sh/kernel/cpu/sh3/serial-sh7720.c
index c4a033666..75aaea49d 100644
--- a/kernel/arch/sh/kernel/cpu/sh3/serial-sh7720.c
+++ b/kernel/arch/sh/kernel/cpu/sh3/serial-sh7720.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/serial_sci.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
diff --git a/kernel/arch/sh/kernel/cpu/sh4/Makefile b/kernel/arch/sh/kernel/cpu/sh4/Makefile
index 3a1dbc709..00c16331e 100644
--- a/kernel/arch/sh/kernel/cpu/sh4/Makefile
+++ b/kernel/arch/sh/kernel/cpu/sh4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH SH-4 backends.
 #
diff --git a/kernel/arch/sh/kernel/cpu/sh4a/Makefile b/kernel/arch/sh/kernel/cpu/sh4a/Makefile
index 0705df775..baf73a8fc 100644
--- a/kernel/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/kernel/arch/sh/kernel/cpu/sh4a/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH SH-4 backends.
 #
diff --git a/kernel/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c b/kernel/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
index 271bbc864..0dd5312f9 100644
--- a/kernel/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
+++ b/kernel/arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/sh/kernel/cpu/sh4a/serial-sh7722.c b/kernel/arch/sh/kernel/cpu/sh4a/serial-sh7722.c
index 59bc3a727..6ecc8b6e1 100644
--- a/kernel/arch/sh/kernel/cpu/sh4a/serial-sh7722.c
+++ b/kernel/arch/sh/kernel/cpu/sh4a/serial-sh7722.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/serial_sci.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
diff --git a/kernel/arch/sh/kernel/cpu/sh5/Makefile b/kernel/arch/sh/kernel/cpu/sh5/Makefile
index a184a31e6..97d23ec30 100644
--- a/kernel/arch/sh/kernel/cpu/sh5/Makefile
+++ b/kernel/arch/sh/kernel/cpu/sh5/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/SuperH SH-5 backends.
 #
diff --git a/kernel/arch/sh/kernel/crash_dump.c b/kernel/arch/sh/kernel/crash_dump.c
index b33be5053..a9086127b 100644
--- a/kernel/arch/sh/kernel/crash_dump.c
+++ b/kernel/arch/sh/kernel/crash_dump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	crash_dump.c - Memory preserving reboot related code.
  *
diff --git a/kernel/arch/sh/kernel/ftrace.c b/kernel/arch/sh/kernel/ftrace.c
index d18724d18..96dd9f7da 100644
--- a/kernel/arch/sh/kernel/ftrace.c
+++ b/kernel/arch/sh/kernel/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2008 Matt Fleming <matt@console-pimps.org>
  * Copyright (C) 2008 Paul Mundt <lethal@linux-sh.org>
diff --git a/kernel/arch/sh/kernel/irq.c b/kernel/arch/sh/kernel/irq.c
index 04487e8fc..245dbeb20 100644
--- a/kernel/arch/sh/kernel/irq.c
+++ b/kernel/arch/sh/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/kernel/irq.c
  *
diff --git a/kernel/arch/sh/kernel/kdebugfs.c b/kernel/arch/sh/kernel/kdebugfs.c
index e11c30bb1..95428e05d 100644
--- a/kernel/arch/sh/kernel/kdebugfs.c
+++ b/kernel/arch/sh/kernel/kdebugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/debugfs.h>
diff --git a/kernel/arch/sh/kernel/process.c b/kernel/arch/sh/kernel/process.c
index f8a695a22..b2d9963d5 100644
--- a/kernel/arch/sh/kernel/process.c
+++ b/kernel/arch/sh/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/sh/kernel/ptrace.c b/kernel/arch/sh/kernel/ptrace.c
index 0a0598363..bfc59f2c2 100644
--- a/kernel/arch/sh/kernel/ptrace.c
+++ b/kernel/arch/sh/kernel/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ptrace.h>
 
 /**
diff --git a/kernel/arch/sh/kernel/reboot.c b/kernel/arch/sh/kernel/reboot.c
index 04afe5b20..11001a8a5 100644
--- a/kernel/arch/sh/kernel/reboot.c
+++ b/kernel/arch/sh/kernel/reboot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pm.h>
 #include <linux/kexec.h>
 #include <linux/kernel.h>
diff --git a/kernel/arch/sh/kernel/setup.c b/kernel/arch/sh/kernel/setup.c
index 3a44c753b..b95c411d0 100644
--- a/kernel/arch/sh/kernel/setup.c
+++ b/kernel/arch/sh/kernel/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/kernel/setup.c
  *
diff --git a/kernel/arch/sh/kernel/sh_ksyms_32.c b/kernel/arch/sh/kernel/sh_ksyms_32.c
index 0b30b9dfc..282774472 100644
--- a/kernel/arch/sh/kernel/sh_ksyms_32.c
+++ b/kernel/arch/sh/kernel/sh_ksyms_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/sh/kernel/signal_32.c b/kernel/arch/sh/kernel/signal_32.c
index 08bce11ba..c46c0020f 100644
--- a/kernel/arch/sh/kernel/signal_32.c
+++ b/kernel/arch/sh/kernel/signal_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/sh/kernel/signal.c
  *
diff --git a/kernel/arch/sh/kernel/sys_sh.c b/kernel/arch/sh/kernel/sys_sh.c
index 6576e5ee1..724911c59 100644
--- a/kernel/arch/sh/kernel/sys_sh.c
+++ b/kernel/arch/sh/kernel/sys_sh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/kernel/sys_sh.c
  *
diff --git a/kernel/arch/sh/kernel/sys_sh32.c b/kernel/arch/sh/kernel/sys_sh32.c
index a2e1231a9..f8dc8bfd4 100644
--- a/kernel/arch/sh/kernel/sys_sh32.c
+++ b/kernel/arch/sh/kernel/sys_sh32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
diff --git a/kernel/arch/sh/kernel/traps.c b/kernel/arch/sh/kernel/traps.c
index b32d1c3a4..8b49cced6 100644
--- a/kernel/arch/sh/kernel/traps.c
+++ b/kernel/arch/sh/kernel/traps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/io.h>
 #include <linux/types.h>
diff --git a/kernel/arch/sh/kernel/vmlinux.lds.S b/kernel/arch/sh/kernel/vmlinux.lds.S
index 5b9a3cc90..77a59d8c6 100644
--- a/kernel/arch/sh/kernel/vmlinux.lds.S
+++ b/kernel/arch/sh/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ld script to make SuperH Linux kernel
  * Written by Niibe Yutaka and Paul Mundt
diff --git a/kernel/arch/sh/kernel/vsyscall/Makefile b/kernel/arch/sh/kernel/vsyscall/Makefile
index 6ab108f1a..5db6579bc 100644
--- a/kernel/arch/sh/kernel/vsyscall/Makefile
+++ b/kernel/arch/sh/kernel/vsyscall/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += vsyscall.o vsyscall-syscall.o vsyscall-syms.o
 
 $(obj)/vsyscall-syscall.o: \
diff --git a/kernel/arch/sh/kernel/vsyscall/vsyscall-note.S b/kernel/arch/sh/kernel/vsyscall/vsyscall-note.S
index d4b5be4f3..bb350918b 100644
--- a/kernel/arch/sh/kernel/vsyscall/vsyscall-note.S
+++ b/kernel/arch/sh/kernel/vsyscall/vsyscall-note.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
  * Here we can supply some information useful to userland.
diff --git a/kernel/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S b/kernel/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
index 23af17584..bece5fa73 100644
--- a/kernel/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
+++ b/kernel/arch/sh/kernel/vsyscall/vsyscall-sigreturn.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/unistd.h>
 
 	.text
diff --git a/kernel/arch/sh/kernel/vsyscall/vsyscall-syscall.S b/kernel/arch/sh/kernel/vsyscall/vsyscall-syscall.S
index c2ac7f028..2aeaa2dde 100644
--- a/kernel/arch/sh/kernel/vsyscall/vsyscall-syscall.S
+++ b/kernel/arch/sh/kernel/vsyscall/vsyscall-syscall.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 
 __INITDATA
diff --git a/kernel/arch/sh/kernel/vsyscall/vsyscall-trapa.S b/kernel/arch/sh/kernel/vsyscall/vsyscall-trapa.S
index 0eb74d006..854ea3235 100644
--- a/kernel/arch/sh/kernel/vsyscall/vsyscall-trapa.S
+++ b/kernel/arch/sh/kernel/vsyscall/vsyscall-trapa.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.text
 	.globl __kernel_vsyscall
 	.type __kernel_vsyscall,@function
diff --git a/kernel/arch/sh/kernel/vsyscall/vsyscall.lds.S b/kernel/arch/sh/kernel/vsyscall/vsyscall.lds.S
index 6d59ee7c2..e3582e03c 100644
--- a/kernel/arch/sh/kernel/vsyscall/vsyscall.lds.S
+++ b/kernel/arch/sh/kernel/vsyscall/vsyscall.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for vsyscall DSO.  The vsyscall page is an ELF shared
  * object prelinked to its virtual address, and with only one read-only
diff --git a/kernel/arch/sh/lib/Makefile b/kernel/arch/sh/lib/Makefile
index 3baff31e5..d0abbe5e3 100644
--- a/kernel/arch/sh/lib/Makefile
+++ b/kernel/arch/sh/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for SuperH-specific library files..
 #
diff --git a/kernel/arch/sh/lib/__clear_user.S b/kernel/arch/sh/lib/__clear_user.S
index db1dca7aa..097860690 100644
--- a/kernel/arch/sh/lib/__clear_user.S
+++ b/kernel/arch/sh/lib/__clear_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * __clear_user_page, __clear_user, clear_page implementation of SuperH
  *
diff --git a/kernel/arch/sh/lib/ashldi3.c b/kernel/arch/sh/lib/ashldi3.c
index beb80f316..e5afe0935 100644
--- a/kernel/arch/sh/lib/ashldi3.c
+++ b/kernel/arch/sh/lib/ashldi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/sh/lib/ashrdi3.c b/kernel/arch/sh/lib/ashrdi3.c
index c884a912b..ae263fbf2 100644
--- a/kernel/arch/sh/lib/ashrdi3.c
+++ b/kernel/arch/sh/lib/ashrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/sh/lib/copy_page.S b/kernel/arch/sh/lib/copy_page.S
index 9d7b8bc51..d4e9d18ce 100644
--- a/kernel/arch/sh/lib/copy_page.S
+++ b/kernel/arch/sh/lib/copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * copy_page, __copy_user_page, __copy_user implementation of SuperH
  *
diff --git a/kernel/arch/sh/lib/delay.c b/kernel/arch/sh/lib/delay.c
index 0901b2f14..dad8e6a54 100644
--- a/kernel/arch/sh/lib/delay.c
+++ b/kernel/arch/sh/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Precise Delay Loops for SuperH
  *
diff --git a/kernel/arch/sh/lib/div64-generic.c b/kernel/arch/sh/lib/div64-generic.c
index 60e76aa8b..0b67fbc44 100644
--- a/kernel/arch/sh/lib/div64-generic.c
+++ b/kernel/arch/sh/lib/div64-generic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic __div64_32 wrapper for __xdiv64_32.
  */
diff --git a/kernel/arch/sh/lib/div64.S b/kernel/arch/sh/lib/div64.S
index 5ee7334ea..4a9a966e7 100644
--- a/kernel/arch/sh/lib/div64.S
+++ b/kernel/arch/sh/lib/div64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*	
  * unsigned long __xdiv64_32(unsigned long long n, unsigned long d); 
  */
diff --git a/kernel/arch/sh/lib/lshrdi3.c b/kernel/arch/sh/lib/lshrdi3.c
index dcf8d6810..33eaa1edb 100644
--- a/kernel/arch/sh/lib/lshrdi3.c
+++ b/kernel/arch/sh/lib/lshrdi3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/sh/lib/memchr.S b/kernel/arch/sh/lib/memchr.S
index bc6036ad5..8ded10407 100644
--- a/kernel/arch/sh/lib/memchr.S
+++ b/kernel/arch/sh/lib/memchr.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: memchr.S,v 1.1 2000/04/14 16:49:01 mjd Exp $
  *
  * "memchr" implementation of SuperH
diff --git a/kernel/arch/sh/lib/memcpy-sh4.S b/kernel/arch/sh/lib/memcpy-sh4.S
index 459fa92a7..a2435c0f6 100644
--- a/kernel/arch/sh/lib/memcpy-sh4.S
+++ b/kernel/arch/sh/lib/memcpy-sh4.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * "memcpy" implementation of SuperH
  *
diff --git a/kernel/arch/sh/lib/memcpy.S b/kernel/arch/sh/lib/memcpy.S
index 232fab34c..08ab3062c 100644
--- a/kernel/arch/sh/lib/memcpy.S
+++ b/kernel/arch/sh/lib/memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: memcpy.S,v 1.3 2001/07/27 11:50:52 gniibe Exp $
  *
  * "memcpy" implementation of SuperH
diff --git a/kernel/arch/sh/lib/memmove.S b/kernel/arch/sh/lib/memmove.S
index 5a2211f09..bdca32181 100644
--- a/kernel/arch/sh/lib/memmove.S
+++ b/kernel/arch/sh/lib/memmove.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: memmove.S,v 1.2 2001/07/27 11:51:09 gniibe Exp $
  *
  * "memmove" implementation of SuperH
diff --git a/kernel/arch/sh/lib/memset-sh4.S b/kernel/arch/sh/lib/memset-sh4.S
index 1a6e32cc4..10649c4cd 100644
--- a/kernel/arch/sh/lib/memset-sh4.S
+++ b/kernel/arch/sh/lib/memset-sh4.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * "memset" implementation for SH4
  *
diff --git a/kernel/arch/sh/lib/memset.S b/kernel/arch/sh/lib/memset.S
index af91fe2b7..a6d5ec0bd 100644
--- a/kernel/arch/sh/lib/memset.S
+++ b/kernel/arch/sh/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: memset.S,v 1.1 2000/04/14 16:49:01 mjd Exp $
  *
  * "memset" implementation of SuperH
diff --git a/kernel/arch/sh/lib/strlen.S b/kernel/arch/sh/lib/strlen.S
index 1bcc13f05..80ea53dd3 100644
--- a/kernel/arch/sh/lib/strlen.S
+++ b/kernel/arch/sh/lib/strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: strlen.S,v 1.2 2001/06/29 14:07:15 gniibe Exp $
  *
  * "strlen" implementation of SuperH
diff --git a/kernel/arch/sh/lib64/copy_user_memcpy.S b/kernel/arch/sh/lib64/copy_user_memcpy.S
index 49aeabeba..515f81b00 100644
--- a/kernel/arch/sh/lib64/copy_user_memcpy.S
+++ b/kernel/arch/sh/lib64/copy_user_memcpy.S
@@ -1,3 +1,4 @@
+! SPDX-License-Identifier: GPL-2.0
 !
 ! Fast SH memcpy
 !
diff --git a/kernel/arch/sh/lib64/memcpy.S b/kernel/arch/sh/lib64/memcpy.S
index 5d682e0ee..231ea595b 100644
--- a/kernel/arch/sh/lib64/memcpy.S
+++ b/kernel/arch/sh/lib64/memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Cloned and hacked for uClibc by Paul Mundt, December 2003 */
 /* Modified by SuperH, Inc. September 2003 */
 !
diff --git a/kernel/arch/sh/lib64/memset.S b/kernel/arch/sh/lib64/memset.S
index 2d37b0488..453aa5f1d 100644
--- a/kernel/arch/sh/lib64/memset.S
+++ b/kernel/arch/sh/lib64/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Cloned and hacked for uClibc by Paul Mundt, December 2003 */
 /* Modified by SuperH, Inc. September 2003 */
 !
diff --git a/kernel/arch/sh/lib64/sdivsi3.S b/kernel/arch/sh/lib64/sdivsi3.S
index 1963bbd42..b422e2374 100644
--- a/kernel/arch/sh/lib64/sdivsi3.S
+++ b/kernel/arch/sh/lib64/sdivsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.global	__sdivsi3
 	.global	__sdivsi3_1
 	.global	__sdivsi3_2
diff --git a/kernel/arch/sh/lib64/strcpy.S b/kernel/arch/sh/lib64/strcpy.S
index ea7c9c533..b61631e52 100644
--- a/kernel/arch/sh/lib64/strcpy.S
+++ b/kernel/arch/sh/lib64/strcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Cloned and hacked for uClibc by Paul Mundt, December 2003 */
 /* Modified by SuperH, Inc. September 2003 */
 ! Entry: arg0: destination
diff --git a/kernel/arch/sh/lib64/strlen.S b/kernel/arch/sh/lib64/strlen.S
index cbc0d912e..c00b972f9 100644
--- a/kernel/arch/sh/lib64/strlen.S
+++ b/kernel/arch/sh/lib64/strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Simplistic strlen() implementation for SHmedia.
  *
diff --git a/kernel/arch/sh/lib64/udivdi3.S b/kernel/arch/sh/lib64/udivdi3.S
index 6895c0225..c032cb157 100644
--- a/kernel/arch/sh/lib64/udivdi3.S
+++ b/kernel/arch/sh/lib64/udivdi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.section	.text..SHmedia32,"ax"
 	.align	2
 	.global	__udivdi3
diff --git a/kernel/arch/sh/lib64/udivsi3.S b/kernel/arch/sh/lib64/udivsi3.S
index e68120e4b..e4788fb4f 100644
--- a/kernel/arch/sh/lib64/udivsi3.S
+++ b/kernel/arch/sh/lib64/udivsi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.global	__udivsi3
 	.section	.text..SHmedia32,"ax"
 	.align	2
diff --git a/kernel/arch/sh/math-emu/sfp-util.h b/kernel/arch/sh/math-emu/sfp-util.h
index 8ae1bd310..784f54134 100644
--- a/kernel/arch/sh/math-emu/sfp-util.h
+++ b/kernel/arch/sh/math-emu/sfp-util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * These are copied from glibc/stdlib/longlong.h
  */
diff --git a/kernel/arch/sh/mm/Kconfig b/kernel/arch/sh/mm/Kconfig
index dba285e86..50cdd1349 100644
--- a/kernel/arch/sh/mm/Kconfig
+++ b/kernel/arch/sh/mm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Memory management options"
 
 config QUICKLIST
diff --git a/kernel/arch/sh/mm/Makefile b/kernel/arch/sh/mm/Makefile
index 92c3bd96a..fbe5e7975 100644
--- a/kernel/arch/sh/mm/Makefile
+++ b/kernel/arch/sh/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux SuperH-specific parts of the memory manager.
 #
diff --git a/kernel/arch/sh/mm/extable_32.c b/kernel/arch/sh/mm/extable_32.c
index 940e871bc..14312027b 100644
--- a/kernel/arch/sh/mm/extable_32.c
+++ b/kernel/arch/sh/mm/extable_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sh/mm/extable.c
  *  Taken from:
diff --git a/kernel/arch/sh/mm/flush-sh4.c b/kernel/arch/sh/mm/flush-sh4.c
index 0b85dd9dd..8b8ef8972 100644
--- a/kernel/arch/sh/mm/flush-sh4.c
+++ b/kernel/arch/sh/mm/flush-sh4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <asm/mmu_context.h>
 #include <asm/cache_insns.h>
diff --git a/kernel/arch/sh/mm/gup.c b/kernel/arch/sh/mm/gup.c
index 063c298ba..8045b5bb7 100644
--- a/kernel/arch/sh/mm/gup.c
+++ b/kernel/arch/sh/mm/gup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Lockless get_user_pages_fast for SuperH
  *
diff --git a/kernel/arch/sh/mm/hugetlbpage.c b/kernel/arch/sh/mm/hugetlbpage.c
index d2412d2d6..960deb1f2 100644
--- a/kernel/arch/sh/mm/hugetlbpage.c
+++ b/kernel/arch/sh/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sh/mm/hugetlbpage.c
  *
diff --git a/kernel/arch/sh/mm/ioremap_fixed.c b/kernel/arch/sh/mm/ioremap_fixed.c
index efbe84af9..927a1294c 100644
--- a/kernel/arch/sh/mm/ioremap_fixed.c
+++ b/kernel/arch/sh/mm/ioremap_fixed.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Re-map IO memory to kernel address space so that we can access it.
  *
diff --git a/kernel/arch/sh/mm/pgtable.c b/kernel/arch/sh/mm/pgtable.c
index a62bd8696..5c8f9247c 100644
--- a/kernel/arch/sh/mm/pgtable.c
+++ b/kernel/arch/sh/mm/pgtable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/slab.h>
 
diff --git a/kernel/arch/sh/mm/uncached.c b/kernel/arch/sh/mm/uncached.c
index a7767da81..010010bf2 100644
--- a/kernel/arch/sh/mm/uncached.c
+++ b/kernel/arch/sh/mm/uncached.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/module.h>
 #include <asm/sizes.h>
diff --git a/kernel/arch/sh/oprofile/Makefile b/kernel/arch/sh/oprofile/Makefile
index ce3b11902..d478dd8da 100644
--- a/kernel/arch/sh/oprofile/Makefile
+++ b/kernel/arch/sh/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 CFLAGS_common.o	+= -DUTS_MACHINE='"$(UTS_MACHINE)"'
diff --git a/kernel/arch/sh/tools/gen-mach-types b/kernel/arch/sh/tools/gen-mach-types
index f5ff7c5d8..6d7c2d8ea 100644
--- a/kernel/arch/sh/tools/gen-mach-types
+++ b/kernel/arch/sh/tools/gen-mach-types
@@ -1,4 +1,5 @@
 #!/bin/awk
+# SPDX-License-Identifier: GPL-2.0
 #
 # Awk script to generate include/generated/machtypes.h
 # Heavily based on arch/arm/tools/gen-mach-types
diff --git a/kernel/arch/sparc/Kconfig.debug b/kernel/arch/sparc/Kconfig.debug
index 6db35fba7..4aef29a11 100644
--- a/kernel/arch/sparc/Kconfig.debug
+++ b/kernel/arch/sparc/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/sparc/Makefile b/kernel/arch/sparc/Makefile
index 8496a074b..dbc448923 100644
--- a/kernel/arch/sparc/Makefile
+++ b/kernel/arch/sparc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # sparc/Makefile
 #
diff --git a/kernel/arch/sparc/boot/Makefile b/kernel/arch/sparc/boot/Makefile
index 6a4ceae5e..ec8cd703b 100644
--- a/kernel/arch/sparc/boot/Makefile
+++ b/kernel/arch/sparc/boot/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Sparc boot stuff.
 #
 # Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/crypto/Makefile b/kernel/arch/sparc/crypto/Makefile
index 5d469d817..818d3aa51 100644
--- a/kernel/arch/sparc/crypto/Makefile
+++ b/kernel/arch/sparc/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific CryptoAPI modules.
 #
diff --git a/kernel/arch/sparc/crypto/aes_asm.S b/kernel/arch/sparc/crypto/aes_asm.S
index 1cda8aa7c..155cefb98 100644
--- a/kernel/arch/sparc/crypto/aes_asm.S
+++ b/kernel/arch/sparc/crypto/aes_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/crypto/camellia_asm.S b/kernel/arch/sparc/crypto/camellia_asm.S
index cc39553a4..dcdc9193f 100644
--- a/kernel/arch/sparc/crypto/camellia_asm.S
+++ b/kernel/arch/sparc/crypto/camellia_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/crypto/crc32c_asm.S b/kernel/arch/sparc/crypto/crc32c_asm.S
index 2b1976e76..b8659a479 100644
--- a/kernel/arch/sparc/crypto/crc32c_asm.S
+++ b/kernel/arch/sparc/crypto/crc32c_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 #include <asm/asi.h>
diff --git a/kernel/arch/sparc/crypto/crop_devid.c b/kernel/arch/sparc/crypto/crop_devid.c
index 5f5724a0a..83fc4536d 100644
--- a/kernel/arch/sparc/crypto/crop_devid.c
+++ b/kernel/arch/sparc/crypto/crop_devid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/of_device.h>
 
diff --git a/kernel/arch/sparc/crypto/des_asm.S b/kernel/arch/sparc/crypto/des_asm.S
index b5c8fc269..7157468a6 100644
--- a/kernel/arch/sparc/crypto/des_asm.S
+++ b/kernel/arch/sparc/crypto/des_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/crypto/md5_asm.S b/kernel/arch/sparc/crypto/md5_asm.S
index 3150404e6..7a6637455 100644
--- a/kernel/arch/sparc/crypto/md5_asm.S
+++ b/kernel/arch/sparc/crypto/md5_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/crypto/opcodes.h b/kernel/arch/sparc/crypto/opcodes.h
index 19cbaea69..417b6a10a 100644
--- a/kernel/arch/sparc/crypto/opcodes.h
+++ b/kernel/arch/sparc/crypto/opcodes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OPCODES_H
 #define _OPCODES_H
 
diff --git a/kernel/arch/sparc/crypto/sha1_asm.S b/kernel/arch/sparc/crypto/sha1_asm.S
index 219d10c5a..7d8bf354f 100644
--- a/kernel/arch/sparc/crypto/sha1_asm.S
+++ b/kernel/arch/sparc/crypto/sha1_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/crypto/sha256_asm.S b/kernel/arch/sparc/crypto/sha256_asm.S
index b5f3d5826..0b39ec7d7 100644
--- a/kernel/arch/sparc/crypto/sha256_asm.S
+++ b/kernel/arch/sparc/crypto/sha256_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/crypto/sha512_asm.S b/kernel/arch/sparc/crypto/sha512_asm.S
index 54bfba713..b2f6e6728 100644
--- a/kernel/arch/sparc/crypto/sha512_asm.S
+++ b/kernel/arch/sparc/crypto/sha512_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/visasm.h>
 
diff --git a/kernel/arch/sparc/include/asm/agp.h b/kernel/arch/sparc/include/asm/agp.h
index 70f52c166..efe0d6a12 100644
--- a/kernel/arch/sparc/include/asm/agp.h
+++ b/kernel/arch/sparc/include/asm/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AGP_H
 #define AGP_H 1
 
diff --git a/kernel/arch/sparc/include/asm/apb.h b/kernel/arch/sparc/include/asm/apb.h
index 8f3b57db8..b1dfb1a99 100644
--- a/kernel/arch/sparc/include/asm/apb.h
+++ b/kernel/arch/sparc/include/asm/apb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * apb.h: Advanced PCI Bridge Configuration Registers and Bits
  *
diff --git a/kernel/arch/sparc/include/asm/asm-prototypes.h b/kernel/arch/sparc/include/asm/asm-prototypes.h
index d381e11c5..96e0972e8 100644
--- a/kernel/arch/sparc/include/asm/asm-prototypes.h
+++ b/kernel/arch/sparc/include/asm/asm-prototypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
  */
diff --git a/kernel/arch/sparc/include/asm/asm.h b/kernel/arch/sparc/include/asm/asm.h
index e8e1d94b4..eaed0117a 100644
--- a/kernel/arch/sparc/include/asm/asm.h
+++ b/kernel/arch/sparc/include/asm/asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_ASM_H
 #define _SPARC_ASM_H
 
diff --git a/kernel/arch/sparc/include/asm/asmmacro.h b/kernel/arch/sparc/include/asm/asmmacro.h
index a0e28ef02..49aaf6f3b 100644
--- a/kernel/arch/sparc/include/asm/asmmacro.h
+++ b/kernel/arch/sparc/include/asm/asmmacro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* asmmacro.h: Assembler macros.
  *
  * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/atomic.h b/kernel/arch/sparc/include/asm/atomic.h
index 8ff83d8cc..425151cc4 100644
--- a/kernel/arch/sparc/include/asm/atomic.h
+++ b/kernel/arch/sparc/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_ATOMIC_H
 #define ___ASM_SPARC_ATOMIC_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/atomic_32.h b/kernel/arch/sparc/include/asm/atomic_32.h
index 7643e979e..0c3b3b4a9 100644
--- a/kernel/arch/sparc/include/asm/atomic_32.h
+++ b/kernel/arch/sparc/include/asm/atomic_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* atomic.h: These still suck, but the I-cache hit rate is higher.
  *
  * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/atomic_64.h b/kernel/arch/sparc/include/asm/atomic_64.h
index 24827a3f7..abad97edf 100644
--- a/kernel/arch/sparc/include/asm/atomic_64.h
+++ b/kernel/arch/sparc/include/asm/atomic_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* atomic.h: Thankfully the V9 is at least reasonable for this
  *           stuff.
  *
diff --git a/kernel/arch/sparc/include/asm/auxio.h b/kernel/arch/sparc/include/asm/auxio.h
index 3e09a07b7..a2681052e 100644
--- a/kernel/arch/sparc/include/asm/auxio.h
+++ b/kernel/arch/sparc/include/asm/auxio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_AUXIO_H
 #define ___ASM_SPARC_AUXIO_H
 
diff --git a/kernel/arch/sparc/include/asm/auxio_32.h b/kernel/arch/sparc/include/asm/auxio_32.h
index 5d685df42..852457c7a 100644
--- a/kernel/arch/sparc/include/asm/auxio_32.h
+++ b/kernel/arch/sparc/include/asm/auxio_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * auxio.h:  Definitions and code for the Auxiliary I/O register.
  *
diff --git a/kernel/arch/sparc/include/asm/auxio_64.h b/kernel/arch/sparc/include/asm/auxio_64.h
index 6079e59a7..ae1ed4198 100644
--- a/kernel/arch/sparc/include/asm/auxio_64.h
+++ b/kernel/arch/sparc/include/asm/auxio_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * auxio.h:  Definitions and code for the Auxiliary I/O registers.
  *
diff --git a/kernel/arch/sparc/include/asm/backoff.h b/kernel/arch/sparc/include/asm/backoff.h
index 4e02086b8..8625946d8 100644
--- a/kernel/arch/sparc/include/asm/backoff.h
+++ b/kernel/arch/sparc/include/asm/backoff.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_BACKOFF_H
 #define _SPARC64_BACKOFF_H
 
diff --git a/kernel/arch/sparc/include/asm/barrier.h b/kernel/arch/sparc/include/asm/barrier.h
index b25f02a02..c10b4164b 100644
--- a/kernel/arch/sparc/include/asm/barrier.h
+++ b/kernel/arch/sparc/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_BARRIER_H
 #define ___ASM_SPARC_BARRIER_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/barrier_32.h b/kernel/arch/sparc/include/asm/barrier_32.h
index 8059130a6..304f9c3f7 100644
--- a/kernel/arch/sparc/include/asm/barrier_32.h
+++ b/kernel/arch/sparc/include/asm/barrier_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_BARRIER_H
 #define __SPARC_BARRIER_H
 
diff --git a/kernel/arch/sparc/include/asm/barrier_64.h b/kernel/arch/sparc/include/asm/barrier_64.h
index c9f6ee64f..9fb148bd3 100644
--- a/kernel/arch/sparc/include/asm/barrier_64.h
+++ b/kernel/arch/sparc/include/asm/barrier_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC64_BARRIER_H
 #define __SPARC64_BARRIER_H
 
diff --git a/kernel/arch/sparc/include/asm/bbc.h b/kernel/arch/sparc/include/asm/bbc.h
index 423a85800..00a4f1161 100644
--- a/kernel/arch/sparc/include/asm/bbc.h
+++ b/kernel/arch/sparc/include/asm/bbc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * bbc.h: Defines for BootBus Controller found on UltraSPARC-III
  *        systems.
diff --git a/kernel/arch/sparc/include/asm/bitext.h b/kernel/arch/sparc/include/asm/bitext.h
index 9c988bf3a..2c2a2d85e 100644
--- a/kernel/arch/sparc/include/asm/bitext.h
+++ b/kernel/arch/sparc/include/asm/bitext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * bitext.h: Bit string operations on the sparc, specific to architecture.
  *
diff --git a/kernel/arch/sparc/include/asm/bitops.h b/kernel/arch/sparc/include/asm/bitops.h
index b1edd94bd..4c431d274 100644
--- a/kernel/arch/sparc/include/asm/bitops.h
+++ b/kernel/arch/sparc/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_BITOPS_H
 #define ___ASM_SPARC_BITOPS_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/bitops_32.h b/kernel/arch/sparc/include/asm/bitops_32.h
index 600ed1d9c..0ceff3b91 100644
--- a/kernel/arch/sparc/include/asm/bitops_32.h
+++ b/kernel/arch/sparc/include/asm/bitops_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * bitops.h: Bit string operations on the Sparc.
  *
diff --git a/kernel/arch/sparc/include/asm/bitops_64.h b/kernel/arch/sparc/include/asm/bitops_64.h
index 2d522402a..a90eea24b 100644
--- a/kernel/arch/sparc/include/asm/bitops_64.h
+++ b/kernel/arch/sparc/include/asm/bitops_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * bitops.h: Bit string operations on the V9.
  *
diff --git a/kernel/arch/sparc/include/asm/btext.h b/kernel/arch/sparc/include/asm/btext.h
index 75a32b109..01cdc4265 100644
--- a/kernel/arch/sparc/include/asm/btext.h
+++ b/kernel/arch/sparc/include/asm/btext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_BTEXT_H
 #define _SPARC_BTEXT_H
 
diff --git a/kernel/arch/sparc/include/asm/bug.h b/kernel/arch/sparc/include/asm/bug.h
index eaa8f8d38..6f1752835 100644
--- a/kernel/arch/sparc/include/asm/bug.h
+++ b/kernel/arch/sparc/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_BUG_H
 #define _SPARC_BUG_H
 
diff --git a/kernel/arch/sparc/include/asm/bugs.h b/kernel/arch/sparc/include/asm/bugs.h
index 61d86bbbe..02fa369b9 100644
--- a/kernel/arch/sparc/include/asm/bugs.h
+++ b/kernel/arch/sparc/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* include/asm/bugs.h:  Sparc probes for various bugs.
  *
  * Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/cache.h b/kernel/arch/sparc/include/asm/cache.h
index 5bb6991b4..dcfd58118 100644
--- a/kernel/arch/sparc/include/asm/cache.h
+++ b/kernel/arch/sparc/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* cache.h:  Cache specific code for the Sparc.  These include flushing
  *           and direct tag/data line access.
  *
diff --git a/kernel/arch/sparc/include/asm/cacheflush.h b/kernel/arch/sparc/include/asm/cacheflush.h
index f6c4839b8..881ac76ea 100644
--- a/kernel/arch/sparc/include/asm/cacheflush.h
+++ b/kernel/arch/sparc/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_CACHEFLUSH_H
 #define ___ASM_SPARC_CACHEFLUSH_H
 
diff --git a/kernel/arch/sparc/include/asm/cacheflush_32.h b/kernel/arch/sparc/include/asm/cacheflush_32.h
index 121640061..fb66094a2 100644
--- a/kernel/arch/sparc/include/asm/cacheflush_32.h
+++ b/kernel/arch/sparc/include/asm/cacheflush_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_CACHEFLUSH_H
 #define _SPARC_CACHEFLUSH_H
 
diff --git a/kernel/arch/sparc/include/asm/cacheflush_64.h b/kernel/arch/sparc/include/asm/cacheflush_64.h
index 68513c41e..e7517434d 100644
--- a/kernel/arch/sparc/include/asm/cacheflush_64.h
+++ b/kernel/arch/sparc/include/asm/cacheflush_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_CACHEFLUSH_H
 #define _SPARC64_CACHEFLUSH_H
 
diff --git a/kernel/arch/sparc/include/asm/cachetlb_32.h b/kernel/arch/sparc/include/asm/cachetlb_32.h
index efb19889a..534da70c6 100644
--- a/kernel/arch/sparc/include/asm/cachetlb_32.h
+++ b/kernel/arch/sparc/include/asm/cachetlb_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_CACHETLB_H
 #define _SPARC_CACHETLB_H
 
diff --git a/kernel/arch/sparc/include/asm/chafsr.h b/kernel/arch/sparc/include/asm/chafsr.h
index 85c69b382..01540eca1 100644
--- a/kernel/arch/sparc/include/asm/chafsr.h
+++ b/kernel/arch/sparc/include/asm/chafsr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_CHAFSR_H
 #define _SPARC64_CHAFSR_H
 
diff --git a/kernel/arch/sparc/include/asm/checksum.h b/kernel/arch/sparc/include/asm/checksum.h
index 7ac0d7497..c3be56e2e 100644
--- a/kernel/arch/sparc/include/asm/checksum.h
+++ b/kernel/arch/sparc/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_CHECKSUM_H
 #define ___ASM_SPARC_CHECKSUM_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/checksum_32.h b/kernel/arch/sparc/include/asm/checksum_32.h
index e25af5fc9..d1e53d7ae 100644
--- a/kernel/arch/sparc/include/asm/checksum_32.h
+++ b/kernel/arch/sparc/include/asm/checksum_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_CHECKSUM_H
 #define __SPARC_CHECKSUM_H
 
diff --git a/kernel/arch/sparc/include/asm/checksum_64.h b/kernel/arch/sparc/include/asm/checksum_64.h
index 96a5ed58c..e52450930 100644
--- a/kernel/arch/sparc/include/asm/checksum_64.h
+++ b/kernel/arch/sparc/include/asm/checksum_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC64_CHECKSUM_H
 #define __SPARC64_CHECKSUM_H
 
diff --git a/kernel/arch/sparc/include/asm/chmctrl.h b/kernel/arch/sparc/include/asm/chmctrl.h
index 859b4a4b0..96f043cb2 100644
--- a/kernel/arch/sparc/include/asm/chmctrl.h
+++ b/kernel/arch/sparc/include/asm/chmctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_CHMCTRL_H
 #define _SPARC64_CHMCTRL_H
 
diff --git a/kernel/arch/sparc/include/asm/cmpxchg.h b/kernel/arch/sparc/include/asm/cmpxchg.h
index 9355893ef..b7955c6b9 100644
--- a/kernel/arch/sparc/include/asm/cmpxchg.h
+++ b/kernel/arch/sparc/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_CMPXCHG_H
 #define ___ASM_SPARC_CMPXCHG_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/cmpxchg_32.h b/kernel/arch/sparc/include/asm/cmpxchg_32.h
index 83ffb83c5..3e3823db3 100644
--- a/kernel/arch/sparc/include/asm/cmpxchg_32.h
+++ b/kernel/arch/sparc/include/asm/cmpxchg_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 32-bit atomic xchg() and cmpxchg() definitions.
  *
  * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/cmpxchg_64.h b/kernel/arch/sparc/include/asm/cmpxchg_64.h
index 4028f4f1e..f71ef3729 100644
--- a/kernel/arch/sparc/include/asm/cmpxchg_64.h
+++ b/kernel/arch/sparc/include/asm/cmpxchg_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 64-bit atomic xchg() and cmpxchg() definitions.
  *
  * Copyright (C) 1996, 1997, 2000 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/include/asm/compat.h b/kernel/arch/sparc/include/asm/compat.h
index 6f251c4d6..977c3f280 100644
--- a/kernel/arch/sparc/include/asm/compat.h
+++ b/kernel/arch/sparc/include/asm/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC64_COMPAT_H
 #define _ASM_SPARC64_COMPAT_H
 /*
diff --git a/kernel/arch/sparc/include/asm/compat_signal.h b/kernel/arch/sparc/include/asm/compat_signal.h
index 4b027b104..e5f7a7f28 100644
--- a/kernel/arch/sparc/include/asm/compat_signal.h
+++ b/kernel/arch/sparc/include/asm/compat_signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _COMPAT_SIGNAL_H
 #define _COMPAT_SIGNAL_H
 
diff --git a/kernel/arch/sparc/include/asm/contregs.h b/kernel/arch/sparc/include/asm/contregs.h
index b8abdfcf5..4df56a6ba 100644
--- a/kernel/arch/sparc/include/asm/contregs.h
+++ b/kernel/arch/sparc/include/asm/contregs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_CONTREGS_H
 #define _SPARC_CONTREGS_H
 
diff --git a/kernel/arch/sparc/include/asm/cpu_type.h b/kernel/arch/sparc/include/asm/cpu_type.h
index 84d7d83b8..2b5979985 100644
--- a/kernel/arch/sparc/include/asm/cpu_type.h
+++ b/kernel/arch/sparc/include/asm/cpu_type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CPU_TYPE_H
 #define __ASM_CPU_TYPE_H
 
diff --git a/kernel/arch/sparc/include/asm/cpudata.h b/kernel/arch/sparc/include/asm/cpudata.h
index 128b56b08..d213165ee 100644
--- a/kernel/arch/sparc/include/asm/cpudata.h
+++ b/kernel/arch/sparc/include/asm/cpudata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_CPUDATA_H
 #define ___ASM_SPARC_CPUDATA_H
 
diff --git a/kernel/arch/sparc/include/asm/cpudata_32.h b/kernel/arch/sparc/include/asm/cpudata_32.h
index 05f366379..895d0964b 100644
--- a/kernel/arch/sparc/include/asm/cpudata_32.h
+++ b/kernel/arch/sparc/include/asm/cpudata_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* cpudata.h: Per-cpu parameters.
  *
  * Copyright (C) 2004 Keith M Wesolowski (wesolows@foobazco.org)
diff --git a/kernel/arch/sparc/include/asm/cpudata_64.h b/kernel/arch/sparc/include/asm/cpudata_64.h
index 5b0ed48e5..666d6b5c0 100644
--- a/kernel/arch/sparc/include/asm/cpudata_64.h
+++ b/kernel/arch/sparc/include/asm/cpudata_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* cpudata.h: Per-cpu parameters.
  *
  * Copyright (C) 2003, 2005, 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/current.h b/kernel/arch/sparc/include/asm/current.h
index 10a0df55a..c68312a89 100644
--- a/kernel/arch/sparc/include/asm/current.h
+++ b/kernel/arch/sparc/include/asm/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* include/asm/current.h
  *
  * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
diff --git a/kernel/arch/sparc/include/asm/dcr.h b/kernel/arch/sparc/include/asm/dcr.h
index 620c9ba64..c810e1b42 100644
--- a/kernel/arch/sparc/include/asm/dcr.h
+++ b/kernel/arch/sparc/include/asm/dcr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_DCR_H
 #define _SPARC64_DCR_H
 
diff --git a/kernel/arch/sparc/include/asm/dcu.h b/kernel/arch/sparc/include/asm/dcu.h
index 0f704e106..93f325071 100644
--- a/kernel/arch/sparc/include/asm/dcu.h
+++ b/kernel/arch/sparc/include/asm/dcu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_DCU_H
 #define _SPARC64_DCU_H
 
diff --git a/kernel/arch/sparc/include/asm/delay.h b/kernel/arch/sparc/include/asm/delay.h
index 467caa2a9..c96af9b91 100644
--- a/kernel/arch/sparc/include/asm/delay.h
+++ b/kernel/arch/sparc/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_DELAY_H
 #define ___ASM_SPARC_DELAY_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/delay_32.h b/kernel/arch/sparc/include/asm/delay_32.h
index 3fb8ca144..0e6dfe857 100644
--- a/kernel/arch/sparc/include/asm/delay_32.h
+++ b/kernel/arch/sparc/include/asm/delay_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * delay.h: Linux delay routines on the Sparc.
  *
diff --git a/kernel/arch/sparc/include/asm/delay_64.h b/kernel/arch/sparc/include/asm/delay_64.h
index 0ba542485..22213b1c1 100644
--- a/kernel/arch/sparc/include/asm/delay_64.h
+++ b/kernel/arch/sparc/include/asm/delay_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* delay.h: Linux delay routines on sparc64.
  *
  * Copyright (C) 1996, 2004, 2007 David S. Miller (davem@davemloft.net).
diff --git a/kernel/arch/sparc/include/asm/dma-mapping.h b/kernel/arch/sparc/include/asm/dma-mapping.h
index 60bf1633d..2f3490dd3 100644
--- a/kernel/arch/sparc/include/asm/dma-mapping.h
+++ b/kernel/arch/sparc/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_DMA_MAPPING_H
 #define ___ASM_SPARC_DMA_MAPPING_H
 
diff --git a/kernel/arch/sparc/include/asm/dma.h b/kernel/arch/sparc/include/asm/dma.h
index 3d434ef5e..a1d7c8691 100644
--- a/kernel/arch/sparc/include/asm/dma.h
+++ b/kernel/arch/sparc/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_DMA_H
 #define _ASM_SPARC_DMA_H
 
diff --git a/kernel/arch/sparc/include/asm/ebus_dma.h b/kernel/arch/sparc/include/asm/ebus_dma.h
index fcfb49481..75563ed09 100644
--- a/kernel/arch/sparc/include/asm/ebus_dma.h
+++ b/kernel/arch/sparc/include/asm/ebus_dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPARC_EBUS_DMA_H
 #define __ASM_SPARC_EBUS_DMA_H
 
diff --git a/kernel/arch/sparc/include/asm/ecc.h b/kernel/arch/sparc/include/asm/ecc.h
index ccb84b66f..3d5edee36 100644
--- a/kernel/arch/sparc/include/asm/ecc.h
+++ b/kernel/arch/sparc/include/asm/ecc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ecc.h: Definitions and defines for the external cache/memory
  *        controller on the sun4m.
diff --git a/kernel/arch/sparc/include/asm/elf.h b/kernel/arch/sparc/include/asm/elf.h
index 0a2816c50..bbfb4b002 100644
--- a/kernel/arch/sparc/include/asm/elf.h
+++ b/kernel/arch/sparc/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_ELF_H
 #define ___ASM_SPARC_ELF_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/elf_32.h b/kernel/arch/sparc/include/asm/elf_32.h
index a24e41fcd..37a6016c9 100644
--- a/kernel/arch/sparc/include/asm/elf_32.h
+++ b/kernel/arch/sparc/include/asm/elf_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASMSPARC_ELF_H
 #define __ASMSPARC_ELF_H
 
diff --git a/kernel/arch/sparc/include/asm/elf_64.h b/kernel/arch/sparc/include/asm/elf_64.h
index 3f2d40387..5894389f5 100644
--- a/kernel/arch/sparc/include/asm/elf_64.h
+++ b/kernel/arch/sparc/include/asm/elf_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPARC64_ELF_H
 #define __ASM_SPARC64_ELF_H
 
diff --git a/kernel/arch/sparc/include/asm/estate.h b/kernel/arch/sparc/include/asm/estate.h
index 520c08560..e5e0f84ac 100644
--- a/kernel/arch/sparc/include/asm/estate.h
+++ b/kernel/arch/sparc/include/asm/estate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_ESTATE_H
 #define _SPARC64_ESTATE_H
 
diff --git a/kernel/arch/sparc/include/asm/extable_64.h b/kernel/arch/sparc/include/asm/extable_64.h
index 1121cb056..5a0171907 100644
--- a/kernel/arch/sparc/include/asm/extable_64.h
+++ b/kernel/arch/sparc/include/asm/extable_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_EXTABLE64_H
 #define __ASM_EXTABLE64_H
 /*
diff --git a/kernel/arch/sparc/include/asm/fb.h b/kernel/arch/sparc/include/asm/fb.h
index 2173432ad..f699962e9 100644
--- a/kernel/arch/sparc/include/asm/fb.h
+++ b/kernel/arch/sparc/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_FB_H_
 #define _SPARC_FB_H_
 #include <linux/console.h>
diff --git a/kernel/arch/sparc/include/asm/fbio.h b/kernel/arch/sparc/include/asm/fbio.h
index 1d9afe277..02654cb95 100644
--- a/kernel/arch/sparc/include/asm/fbio.h
+++ b/kernel/arch/sparc/include/asm/fbio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_FBIO_H
 #define __LINUX_FBIO_H
 
diff --git a/kernel/arch/sparc/include/asm/fhc.h b/kernel/arch/sparc/include/asm/fhc.h
index 57f1b303a..0627fa126 100644
--- a/kernel/arch/sparc/include/asm/fhc.h
+++ b/kernel/arch/sparc/include/asm/fhc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* fhc.h: FHC and Clock board register definitions.
  *
  * Copyright (C) 1997, 1999 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/include/asm/floppy.h b/kernel/arch/sparc/include/asm/floppy.h
index faebd335b..4b315802e 100644
--- a/kernel/arch/sparc/include/asm/floppy.h
+++ b/kernel/arch/sparc/include/asm/floppy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_FLOPPY_H
 #define ___ASM_SPARC_FLOPPY_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/floppy_32.h b/kernel/arch/sparc/include/asm/floppy_32.h
index 071b83e52..dd63aa301 100644
--- a/kernel/arch/sparc/include/asm/floppy_32.h
+++ b/kernel/arch/sparc/include/asm/floppy_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* asm/floppy.h: Sparc specific parts of the Floppy driver.
  *
  * Copyright (C) 1995 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/floppy_64.h b/kernel/arch/sparc/include/asm/floppy_64.h
index 625756406..22fbeab92 100644
--- a/kernel/arch/sparc/include/asm/floppy_64.h
+++ b/kernel/arch/sparc/include/asm/floppy_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* floppy.h: Sparc specific parts of the Floppy driver.
  *
  * Copyright (C) 1996, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/fpumacro.h b/kernel/arch/sparc/include/asm/fpumacro.h
index cc463fec8..bc378df97 100644
--- a/kernel/arch/sparc/include/asm/fpumacro.h
+++ b/kernel/arch/sparc/include/asm/fpumacro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* fpumacro.h: FPU related macros.
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/include/asm/ftrace.h b/kernel/arch/sparc/include/asm/ftrace.h
index 62755a339..d3aa1a524 100644
--- a/kernel/arch/sparc/include/asm/ftrace.h
+++ b/kernel/arch/sparc/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC64_FTRACE
 #define _ASM_SPARC64_FTRACE
 
diff --git a/kernel/arch/sparc/include/asm/futex.h b/kernel/arch/sparc/include/asm/futex.h
index 736335f36..75a13a20c 100644
--- a/kernel/arch/sparc/include/asm/futex.h
+++ b/kernel/arch/sparc/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_FUTEX_H
 #define ___ASM_SPARC_FUTEX_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/futex_64.h b/kernel/arch/sparc/include/asm/futex_64.h
index 1cfd89d92..0865ce77e 100644
--- a/kernel/arch/sparc/include/asm/futex_64.h
+++ b/kernel/arch/sparc/include/asm/futex_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_FUTEX_H
 #define _SPARC64_FUTEX_H
 
diff --git a/kernel/arch/sparc/include/asm/hardirq.h b/kernel/arch/sparc/include/asm/hardirq.h
index 44d4e2345..a185f6647 100644
--- a/kernel/arch/sparc/include/asm/hardirq.h
+++ b/kernel/arch/sparc/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_HARDIRQ_H
 #define ___ASM_SPARC_HARDIRQ_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/hardirq_32.h b/kernel/arch/sparc/include/asm/hardirq_32.h
index ee93923b7..9830d8731 100644
--- a/kernel/arch/sparc/include/asm/hardirq_32.h
+++ b/kernel/arch/sparc/include/asm/hardirq_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* hardirq.h: 32-bit Sparc hard IRQ support.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/hardirq_64.h b/kernel/arch/sparc/include/asm/hardirq_64.h
index f478ff1dd..f56540271 100644
--- a/kernel/arch/sparc/include/asm/hardirq_64.h
+++ b/kernel/arch/sparc/include/asm/hardirq_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* hardirq.h: 64-bit Sparc hard IRQ support.
  *
  * Copyright (C) 1997, 1998, 2005 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/head.h b/kernel/arch/sparc/include/asm/head.h
index be8f03f3e..25299b701 100644
--- a/kernel/arch/sparc/include/asm/head.h
+++ b/kernel/arch/sparc/include/asm/head.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_HEAD_H
 #define ___ASM_SPARC_HEAD_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/head_32.h b/kernel/arch/sparc/include/asm/head_32.h
index 6fc60fd18..d2809c859 100644
--- a/kernel/arch/sparc/include/asm/head_32.h
+++ b/kernel/arch/sparc/include/asm/head_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_HEAD_H
 #define __SPARC_HEAD_H
 
diff --git a/kernel/arch/sparc/include/asm/head_64.h b/kernel/arch/sparc/include/asm/head_64.h
index f0700cfee..69a2062d9 100644
--- a/kernel/arch/sparc/include/asm/head_64.h
+++ b/kernel/arch/sparc/include/asm/head_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_HEAD_H
 #define _SPARC64_HEAD_H
 
diff --git a/kernel/arch/sparc/include/asm/hibernate.h b/kernel/arch/sparc/include/asm/hibernate.h
index 2ec34f842..3bb0a96ec 100644
--- a/kernel/arch/sparc/include/asm/hibernate.h
+++ b/kernel/arch/sparc/include/asm/hibernate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * hibernate.h:  Hibernaton support specific for sparc64.
  *
diff --git a/kernel/arch/sparc/include/asm/highmem.h b/kernel/arch/sparc/include/asm/highmem.h
index 92ded294a..18d776925 100644
--- a/kernel/arch/sparc/include/asm/highmem.h
+++ b/kernel/arch/sparc/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * highmem.h: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/sparc/include/asm/hugetlb.h b/kernel/arch/sparc/include/asm/hugetlb.h
index 0ca7caab1..300557c66 100644
--- a/kernel/arch/sparc/include/asm/hugetlb.h
+++ b/kernel/arch/sparc/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC64_HUGETLB_H
 #define _ASM_SPARC64_HUGETLB_H
 
diff --git a/kernel/arch/sparc/include/asm/hvtramp.h b/kernel/arch/sparc/include/asm/hvtramp.h
index 04b56f862..688ea43af 100644
--- a/kernel/arch/sparc/include/asm/hvtramp.h
+++ b/kernel/arch/sparc/include/asm/hvtramp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_HVTRAP_H
 #define _SPARC64_HVTRAP_H
 
diff --git a/kernel/arch/sparc/include/asm/hypervisor.h b/kernel/arch/sparc/include/asm/hypervisor.h
index 3dc9215d0..89a0c57ae 100644
--- a/kernel/arch/sparc/include/asm/hypervisor.h
+++ b/kernel/arch/sparc/include/asm/hypervisor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_HYPERVISOR_H
 #define _SPARC64_HYPERVISOR_H
 
diff --git a/kernel/arch/sparc/include/asm/ide.h b/kernel/arch/sparc/include/asm/ide.h
index b7af3d658..09f026585 100644
--- a/kernel/arch/sparc/include/asm/ide.h
+++ b/kernel/arch/sparc/include/asm/ide.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ide.h: SPARC PCI specific IDE glue.
  *
  * Copyright (C) 1997  David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/idprom.h b/kernel/arch/sparc/include/asm/idprom.h
index 3793f7f91..4c372199c 100644
--- a/kernel/arch/sparc/include/asm/idprom.h
+++ b/kernel/arch/sparc/include/asm/idprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * idprom.h: Macros and defines for idprom routines
  *
diff --git a/kernel/arch/sparc/include/asm/intr_queue.h b/kernel/arch/sparc/include/asm/intr_queue.h
index 206077ded..d61be2a3a 100644
--- a/kernel/arch/sparc/include/asm/intr_queue.h
+++ b/kernel/arch/sparc/include/asm/intr_queue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_INTR_QUEUE_H
 #define _SPARC64_INTR_QUEUE_H
 
diff --git a/kernel/arch/sparc/include/asm/io-unit.h b/kernel/arch/sparc/include/asm/io-unit.h
index 04a9701e7..3ce96e8c0 100644
--- a/kernel/arch/sparc/include/asm/io-unit.h
+++ b/kernel/arch/sparc/include/asm/io-unit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* io-unit.h: Definitions for the sun4d IO-UNIT.
  *
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/include/asm/io.h b/kernel/arch/sparc/include/asm/io.h
index f6902cf3c..2eefa526b 100644
--- a/kernel/arch/sparc/include/asm/io.h
+++ b/kernel/arch/sparc/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_IO_H
 #define ___ASM_SPARC_IO_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/io_32.h b/kernel/arch/sparc/include/asm/io_32.h
index 4dd268a3a..cd51a89b3 100644
--- a/kernel/arch/sparc/include/asm/io_32.h
+++ b/kernel/arch/sparc/include/asm/io_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_IO_H
 #define __SPARC_IO_H
 
diff --git a/kernel/arch/sparc/include/asm/io_64.h b/kernel/arch/sparc/include/asm/io_64.h
index c32fa3f75..9a1e9cbc7 100644
--- a/kernel/arch/sparc/include/asm/io_64.h
+++ b/kernel/arch/sparc/include/asm/io_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC64_IO_H
 #define __SPARC64_IO_H
 
diff --git a/kernel/arch/sparc/include/asm/ioctls.h b/kernel/arch/sparc/include/asm/ioctls.h
index 77413b7e3..c92ac780c 100644
--- a/kernel/arch/sparc/include/asm/ioctls.h
+++ b/kernel/arch/sparc/include/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_IOCTLS_H
 #define _ASM_SPARC_IOCTLS_H
 
diff --git a/kernel/arch/sparc/include/asm/iommu.h b/kernel/arch/sparc/include/asm/iommu.h
index e650965b4..37935cb34 100644
--- a/kernel/arch/sparc/include/asm/iommu.h
+++ b/kernel/arch/sparc/include/asm/iommu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_IOMMU_H
 #define ___ASM_SPARC_IOMMU_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/iommu_32.h b/kernel/arch/sparc/include/asm/iommu_32.h
index f6c066b52..af51cd5ea 100644
--- a/kernel/arch/sparc/include/asm/iommu_32.h
+++ b/kernel/arch/sparc/include/asm/iommu_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* iommu.h: Definitions for the sun4m IOMMU.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/iommu_64.h b/kernel/arch/sparc/include/asm/iommu_64.h
index f24f356f2..9ed6b54ca 100644
--- a/kernel/arch/sparc/include/asm/iommu_64.h
+++ b/kernel/arch/sparc/include/asm/iommu_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* iommu.h: Definitions for the sun5 IOMMU.
  *
  * Copyright (C) 1996, 1999, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/irq.h b/kernel/arch/sparc/include/asm/irq.h
index 3b44a6a14..a2efc274d 100644
--- a/kernel/arch/sparc/include/asm/irq.h
+++ b/kernel/arch/sparc/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_IRQ_H
 #define ___ASM_SPARC_IRQ_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/irq_32.h b/kernel/arch/sparc/include/asm/irq_32.h
index eecd3d844..43ec2609b 100644
--- a/kernel/arch/sparc/include/asm/irq_32.h
+++ b/kernel/arch/sparc/include/asm/irq_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* irq.h: IRQ registers on the Sparc.
  *
  * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/irq_64.h b/kernel/arch/sparc/include/asm/irq_64.h
index 1d51a11fb..4d748e93b 100644
--- a/kernel/arch/sparc/include/asm/irq_64.h
+++ b/kernel/arch/sparc/include/asm/irq_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* irq.h: IRQ registers on the 64-bit Sparc.
  *
  * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/irqflags.h b/kernel/arch/sparc/include/asm/irqflags.h
index 1e138632b..d1bdf6c39 100644
--- a/kernel/arch/sparc/include/asm/irqflags.h
+++ b/kernel/arch/sparc/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_IRQFLAGS_H
 #define ___ASM_SPARC_IRQFLAGS_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/irqflags_32.h b/kernel/arch/sparc/include/asm/irqflags_32.h
index 71cc284f5..7ca3eaf3d 100644
--- a/kernel/arch/sparc/include/asm/irqflags_32.h
+++ b/kernel/arch/sparc/include/asm/irqflags_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm/irqflags.h
  *
diff --git a/kernel/arch/sparc/include/asm/irqflags_64.h b/kernel/arch/sparc/include/asm/irqflags_64.h
index 23cd27f6b..c29ed571a 100644
--- a/kernel/arch/sparc/include/asm/irqflags_64.h
+++ b/kernel/arch/sparc/include/asm/irqflags_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm/irqflags.h
  *
diff --git a/kernel/arch/sparc/include/asm/jump_label.h b/kernel/arch/sparc/include/asm/jump_label.h
index 62d0354d1..94eb529dc 100644
--- a/kernel/arch/sparc/include/asm/jump_label.h
+++ b/kernel/arch/sparc/include/asm/jump_label.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_JUMP_LABEL_H
 #define _ASM_SPARC_JUMP_LABEL_H
 
diff --git a/kernel/arch/sparc/include/asm/kdebug.h b/kernel/arch/sparc/include/asm/kdebug.h
index 8d12581ca..830053f91 100644
--- a/kernel/arch/sparc/include/asm/kdebug.h
+++ b/kernel/arch/sparc/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_KDEBUG_H
 #define ___ASM_SPARC_KDEBUG_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/kdebug_32.h b/kernel/arch/sparc/include/asm/kdebug_32.h
index 1d0b24022..763d42382 100644
--- a/kernel/arch/sparc/include/asm/kdebug_32.h
+++ b/kernel/arch/sparc/include/asm/kdebug_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * kdebug.h:  Defines and definitions for debugging the Linux kernel
  *            under various kernel debuggers.
diff --git a/kernel/arch/sparc/include/asm/kdebug_64.h b/kernel/arch/sparc/include/asm/kdebug_64.h
index 867286bf7..89428bd4f 100644
--- a/kernel/arch/sparc/include/asm/kdebug_64.h
+++ b/kernel/arch/sparc/include/asm/kdebug_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_KDEBUG_H
 #define _SPARC64_KDEBUG_H
 
diff --git a/kernel/arch/sparc/include/asm/kgdb.h b/kernel/arch/sparc/include/asm/kgdb.h
index a6ad7bf84..deabe0279 100644
--- a/kernel/arch/sparc/include/asm/kgdb.h
+++ b/kernel/arch/sparc/include/asm/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_KGDB_H
 #define _SPARC_KGDB_H
 
diff --git a/kernel/arch/sparc/include/asm/kmap_types.h b/kernel/arch/sparc/include/asm/kmap_types.h
index aad21745f..55a99b6bd 100644
--- a/kernel/arch/sparc/include/asm/kmap_types.h
+++ b/kernel/arch/sparc/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
diff --git a/kernel/arch/sparc/include/asm/kprobes.h b/kernel/arch/sparc/include/asm/kprobes.h
index 49f840203..3704490b4 100644
--- a/kernel/arch/sparc/include/asm/kprobes.h
+++ b/kernel/arch/sparc/include/asm/kprobes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_KPROBES_H
 #define _SPARC64_KPROBES_H
 
diff --git a/kernel/arch/sparc/include/asm/ldc.h b/kernel/arch/sparc/include/asm/ldc.h
index 698738a10..ca973955c 100644
--- a/kernel/arch/sparc/include/asm/ldc.h
+++ b/kernel/arch/sparc/include/asm/ldc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_LDC_H
 #define _SPARC64_LDC_H
 
diff --git a/kernel/arch/sparc/include/asm/leon.h b/kernel/arch/sparc/include/asm/leon.h
index 204771cd7..c68bb5b76 100644
--- a/kernel/arch/sparc/include/asm/leon.h
+++ b/kernel/arch/sparc/include/asm/leon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2004 Konrad Eisele (eiselekd@web.de,konrad@gaisler.com) Gaisler Research
  * Copyright (C) 2004 Stefan Holst (mail@s-holst.de) Uni-Stuttgart
diff --git a/kernel/arch/sparc/include/asm/leon_amba.h b/kernel/arch/sparc/include/asm/leon_amba.h
index 24ec48c3f..6433a93f5 100644
--- a/kernel/arch/sparc/include/asm/leon_amba.h
+++ b/kernel/arch/sparc/include/asm/leon_amba.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 *Copyright (C) 2004 Konrad Eisele (eiselekd@web.de,konrad@gaisler.com), Gaisler Research
 *Copyright (C) 2004 Stefan Holst (mail@s-holst.de), Uni-Stuttgart
diff --git a/kernel/arch/sparc/include/asm/leon_pci.h b/kernel/arch/sparc/include/asm/leon_pci.h
index 049d067ed..484a56e81 100644
--- a/kernel/arch/sparc/include/asm/leon_pci.h
+++ b/kernel/arch/sparc/include/asm/leon_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * asm/leon_pci.h
  *
diff --git a/kernel/arch/sparc/include/asm/lsu.h b/kernel/arch/sparc/include/asm/lsu.h
index 7190f8de9..154ae76c0 100644
--- a/kernel/arch/sparc/include/asm/lsu.h
+++ b/kernel/arch/sparc/include/asm/lsu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_LSU_H
 #define _SPARC64_LSU_H
 
diff --git a/kernel/arch/sparc/include/asm/machines.h b/kernel/arch/sparc/include/asm/machines.h
index fd6ddb05d..9f78f70c6 100644
--- a/kernel/arch/sparc/include/asm/machines.h
+++ b/kernel/arch/sparc/include/asm/machines.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * machines.h:  Defines for taking apart the machine type value in the
  *              idprom and determining the kind of machine we are on.
diff --git a/kernel/arch/sparc/include/asm/mbus.h b/kernel/arch/sparc/include/asm/mbus.h
index 14128bcc5..8b6dbe701 100644
--- a/kernel/arch/sparc/include/asm/mbus.h
+++ b/kernel/arch/sparc/include/asm/mbus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mbus.h:  Various defines for MBUS modules.
  *
diff --git a/kernel/arch/sparc/include/asm/mc146818rtc.h b/kernel/arch/sparc/include/asm/mc146818rtc.h
index d8e72f37d..07faf754e 100644
--- a/kernel/arch/sparc/include/asm/mc146818rtc.h
+++ b/kernel/arch/sparc/include/asm/mc146818rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_MC146818RTC_H
 #define ___ASM_SPARC_MC146818RTC_H
 
diff --git a/kernel/arch/sparc/include/asm/mc146818rtc_32.h b/kernel/arch/sparc/include/asm/mc146818rtc_32.h
index fa7eac926..d8fd75da8 100644
--- a/kernel/arch/sparc/include/asm/mc146818rtc_32.h
+++ b/kernel/arch/sparc/include/asm/mc146818rtc_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/sparc/include/asm/mc146818rtc_64.h b/kernel/arch/sparc/include/asm/mc146818rtc_64.h
index 7238d174e..b1708a7e5 100644
--- a/kernel/arch/sparc/include/asm/mc146818rtc_64.h
+++ b/kernel/arch/sparc/include/asm/mc146818rtc_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/sparc/include/asm/mdesc.h b/kernel/arch/sparc/include/asm/mdesc.h
index e8a4c413a..ec31a06d0 100644
--- a/kernel/arch/sparc/include/asm/mdesc.h
+++ b/kernel/arch/sparc/include/asm/mdesc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_MDESC_H
 #define _SPARC64_MDESC_H
 
diff --git a/kernel/arch/sparc/include/asm/memctrl.h b/kernel/arch/sparc/include/asm/memctrl.h
index 4065c56af..6790ed608 100644
--- a/kernel/arch/sparc/include/asm/memctrl.h
+++ b/kernel/arch/sparc/include/asm/memctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_MEMCTRL_H
 #define _SPARC_MEMCTRL_H
 
diff --git a/kernel/arch/sparc/include/asm/mman.h b/kernel/arch/sparc/include/asm/mman.h
index 59bb5938d..7e9472143 100644
--- a/kernel/arch/sparc/include/asm/mman.h
+++ b/kernel/arch/sparc/include/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_MMAN_H__
 #define __SPARC_MMAN_H__
 
diff --git a/kernel/arch/sparc/include/asm/mmu.h b/kernel/arch/sparc/include/asm/mmu.h
index 88fa31388..286457e58 100644
--- a/kernel/arch/sparc/include/asm/mmu.h
+++ b/kernel/arch/sparc/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_MMU_H
 #define ___ASM_SPARC_MMU_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/mmu_32.h b/kernel/arch/sparc/include/asm/mmu_32.h
index 6f056e535..d5b220ca7 100644
--- a/kernel/arch/sparc/include/asm/mmu_32.h
+++ b/kernel/arch/sparc/include/asm/mmu_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/sparc/include/asm/mmu_64.h b/kernel/arch/sparc/include/asm/mmu_64.h
index 83b36a537..5fe64a57b 100644
--- a/kernel/arch/sparc/include/asm/mmu_64.h
+++ b/kernel/arch/sparc/include/asm/mmu_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MMU_H
 #define __MMU_H
 
diff --git a/kernel/arch/sparc/include/asm/mmu_context.h b/kernel/arch/sparc/include/asm/mmu_context.h
index 5531346c6..5e1ea3851 100644
--- a/kernel/arch/sparc/include/asm/mmu_context.h
+++ b/kernel/arch/sparc/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_MMU_CONTEXT_H
 #define ___ASM_SPARC_MMU_CONTEXT_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/mmu_context_32.h b/kernel/arch/sparc/include/asm/mmu_context_32.h
index 2df2a9be8..7ddcb8bad 100644
--- a/kernel/arch/sparc/include/asm/mmu_context_32.h
+++ b/kernel/arch/sparc/include/asm/mmu_context_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_MMU_CONTEXT_H
 #define __SPARC_MMU_CONTEXT_H
 
diff --git a/kernel/arch/sparc/include/asm/mmu_context_64.h b/kernel/arch/sparc/include/asm/mmu_context_64.h
index 87841d687..e25d25b0a 100644
--- a/kernel/arch/sparc/include/asm/mmu_context_64.h
+++ b/kernel/arch/sparc/include/asm/mmu_context_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC64_MMU_CONTEXT_H
 #define __SPARC64_MMU_CONTEXT_H
 
diff --git a/kernel/arch/sparc/include/asm/mmzone.h b/kernel/arch/sparc/include/asm/mmzone.h
index 99d9b9f57..6543fb97a 100644
--- a/kernel/arch/sparc/include/asm/mmzone.h
+++ b/kernel/arch/sparc/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_MMZONE_H
 #define _SPARC64_MMZONE_H
 
diff --git a/kernel/arch/sparc/include/asm/msi.h b/kernel/arch/sparc/include/asm/msi.h
index 724ca5667..3c17c1074 100644
--- a/kernel/arch/sparc/include/asm/msi.h
+++ b/kernel/arch/sparc/include/asm/msi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * msi.h:  Defines specific to the MBus - Sbus - Interface.
  *
diff --git a/kernel/arch/sparc/include/asm/mxcc.h b/kernel/arch/sparc/include/asm/mxcc.h
index c0517bd05..3a2561bea 100644
--- a/kernel/arch/sparc/include/asm/mxcc.h
+++ b/kernel/arch/sparc/include/asm/mxcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mxcc.h:  Definitions of the Viking MXCC registers
  *
diff --git a/kernel/arch/sparc/include/asm/nmi.h b/kernel/arch/sparc/include/asm/nmi.h
index 284eac3ff..90ee7863d 100644
--- a/kernel/arch/sparc/include/asm/nmi.h
+++ b/kernel/arch/sparc/include/asm/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NMI_H
 #define __NMI_H
 
diff --git a/kernel/arch/sparc/include/asm/ns87303.h b/kernel/arch/sparc/include/asm/ns87303.h
index 6b947ee0f..5401894a6 100644
--- a/kernel/arch/sparc/include/asm/ns87303.h
+++ b/kernel/arch/sparc/include/asm/ns87303.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ns87303.h: Configuration Register Description for the
  *            National Semiconductor PC87303 (SuperIO).
  *
diff --git a/kernel/arch/sparc/include/asm/obio.h b/kernel/arch/sparc/include/asm/obio.h
index 426ad7510..1b151f738 100644
--- a/kernel/arch/sparc/include/asm/obio.h
+++ b/kernel/arch/sparc/include/asm/obio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * obio.h:  Some useful locations in 0xFXXXXXXXX PA obio space on sun4d.
  *
diff --git a/kernel/arch/sparc/include/asm/openprom.h b/kernel/arch/sparc/include/asm/openprom.h
index 63374c441..69545b3e5 100644
--- a/kernel/arch/sparc/include/asm/openprom.h
+++ b/kernel/arch/sparc/include/asm/openprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_OPENPROM_H
 #define __SPARC_OPENPROM_H
 
diff --git a/kernel/arch/sparc/include/asm/oplib.h b/kernel/arch/sparc/include/asm/oplib.h
index 72e04e13a..df49a7700 100644
--- a/kernel/arch/sparc/include/asm/oplib.h
+++ b/kernel/arch/sparc/include/asm/oplib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_OPLIB_H
 #define ___ASM_SPARC_OPLIB_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/oplib_32.h b/kernel/arch/sparc/include/asm/oplib_32.h
index 56a09b9d7..d1cf3a27a 100644
--- a/kernel/arch/sparc/include/asm/oplib_32.h
+++ b/kernel/arch/sparc/include/asm/oplib_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * oplib.h:  Describes the interface and available routines in the
  *           Linux Prom library.
diff --git a/kernel/arch/sparc/include/asm/oplib_64.h b/kernel/arch/sparc/include/asm/oplib_64.h
index 2e3a4add8..a67abebd4 100644
--- a/kernel/arch/sparc/include/asm/oplib_64.h
+++ b/kernel/arch/sparc/include/asm/oplib_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* oplib.h:  Describes the interface and available routines in the
  *           Linux Prom library.
  *
diff --git a/kernel/arch/sparc/include/asm/page.h b/kernel/arch/sparc/include/asm/page.h
index 1be2fdec6..5e44cdf2a 100644
--- a/kernel/arch/sparc/include/asm/page.h
+++ b/kernel/arch/sparc/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_PAGE_H
 #define ___ASM_SPARC_PAGE_H
 
diff --git a/kernel/arch/sparc/include/asm/page_32.h b/kernel/arch/sparc/include/asm/page_32.h
index 624921414..b76d59ede 100644
--- a/kernel/arch/sparc/include/asm/page_32.h
+++ b/kernel/arch/sparc/include/asm/page_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * page.h:  Various defines and such for MMU operations on the Sparc for
  *          the Linux kernel.
diff --git a/kernel/arch/sparc/include/asm/page_64.h b/kernel/arch/sparc/include/asm/page_64.h
index 8ee1f9758..c28379b1b 100644
--- a/kernel/arch/sparc/include/asm/page_64.h
+++ b/kernel/arch/sparc/include/asm/page_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_PAGE_H
 #define _SPARC64_PAGE_H
 
diff --git a/kernel/arch/sparc/include/asm/parport.h b/kernel/arch/sparc/include/asm/parport.h
index f005ccac9..05df5f043 100644
--- a/kernel/arch/sparc/include/asm/parport.h
+++ b/kernel/arch/sparc/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* parport.h: sparc64 specific parport initialization and dma.
  *
  * Copyright (C) 1999  Eddie C. Dost  (ecd@skynet.be)
diff --git a/kernel/arch/sparc/include/asm/pbm.h b/kernel/arch/sparc/include/asm/pbm.h
index 458a4916d..0c8626172 100644
--- a/kernel/arch/sparc/include/asm/pbm.h
+++ b/kernel/arch/sparc/include/asm/pbm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * pbm.h: PCI bus module pseudo driver software state
diff --git a/kernel/arch/sparc/include/asm/pci.h b/kernel/arch/sparc/include/asm/pci.h
index 6e14fd179..cad79a6ce 100644
--- a/kernel/arch/sparc/include/asm/pci.h
+++ b/kernel/arch/sparc/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_PCI_H
 #define ___ASM_SPARC_PCI_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/pci_32.h b/kernel/arch/sparc/include/asm/pci_32.h
index b7c092df3..fe361d3d1 100644
--- a/kernel/arch/sparc/include/asm/pci_32.h
+++ b/kernel/arch/sparc/include/asm/pci_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_PCI_H
 #define __SPARC_PCI_H
 
diff --git a/kernel/arch/sparc/include/asm/pci_64.h b/kernel/arch/sparc/include/asm/pci_64.h
index b957ca552..671274e36 100644
--- a/kernel/arch/sparc/include/asm/pci_64.h
+++ b/kernel/arch/sparc/include/asm/pci_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC64_PCI_H
 #define __SPARC64_PCI_H
 
diff --git a/kernel/arch/sparc/include/asm/pcic.h b/kernel/arch/sparc/include/asm/pcic.h
index f41706792..238376b1f 100644
--- a/kernel/arch/sparc/include/asm/pcic.h
+++ b/kernel/arch/sparc/include/asm/pcic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * pcic.h: JavaEngine 1 specific PCI definitions.
  *
diff --git a/kernel/arch/sparc/include/asm/pcr.h b/kernel/arch/sparc/include/asm/pcr.h
index cdf800c33..da834ffbe 100644
--- a/kernel/arch/sparc/include/asm/pcr.h
+++ b/kernel/arch/sparc/include/asm/pcr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PCR_H
 #define __PCR_H
 
diff --git a/kernel/arch/sparc/include/asm/percpu.h b/kernel/arch/sparc/include/asm/percpu.h
index bfb1d19ff..0cd704ef5 100644
--- a/kernel/arch/sparc/include/asm/percpu.h
+++ b/kernel/arch/sparc/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_PERCPU_H
 #define ___ASM_SPARC_PERCPU_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/percpu_32.h b/kernel/arch/sparc/include/asm/percpu_32.h
index 06066a7aa..ee6c7c193 100644
--- a/kernel/arch/sparc/include/asm/percpu_32.h
+++ b/kernel/arch/sparc/include/asm/percpu_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_SPARC_PERCPU__
 #define __ARCH_SPARC_PERCPU__
 
diff --git a/kernel/arch/sparc/include/asm/percpu_64.h b/kernel/arch/sparc/include/asm/percpu_64.h
index 007aafb4a..32ef6f05c 100644
--- a/kernel/arch/sparc/include/asm/percpu_64.h
+++ b/kernel/arch/sparc/include/asm/percpu_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCH_SPARC64_PERCPU__
 #define __ARCH_SPARC64_PERCPU__
 
diff --git a/kernel/arch/sparc/include/asm/perf_event.h b/kernel/arch/sparc/include/asm/perf_event.h
index 4d3dbe370..c2aec0c7f 100644
--- a/kernel/arch/sparc/include/asm/perf_event.h
+++ b/kernel/arch/sparc/include/asm/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPARC_PERF_EVENT_H
 #define __ASM_SPARC_PERF_EVENT_H
 
diff --git a/kernel/arch/sparc/include/asm/pgalloc.h b/kernel/arch/sparc/include/asm/pgalloc.h
index b6db1f7cd..9ea0b3758 100644
--- a/kernel/arch/sparc/include/asm/pgalloc.h
+++ b/kernel/arch/sparc/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_PGALLOC_H
 #define ___ASM_SPARC_PGALLOC_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/pgalloc_32.h b/kernel/arch/sparc/include/asm/pgalloc_32.h
index 0346c7e62..90459481c 100644
--- a/kernel/arch/sparc/include/asm/pgalloc_32.h
+++ b/kernel/arch/sparc/include/asm/pgalloc_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_PGALLOC_H
 #define _SPARC_PGALLOC_H
 
diff --git a/kernel/arch/sparc/include/asm/pgalloc_64.h b/kernel/arch/sparc/include/asm/pgalloc_64.h
index 3529f1378..874632f34 100644
--- a/kernel/arch/sparc/include/asm/pgalloc_64.h
+++ b/kernel/arch/sparc/include/asm/pgalloc_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_PGALLOC_H
 #define _SPARC64_PGALLOC_H
 
diff --git a/kernel/arch/sparc/include/asm/pgtable.h b/kernel/arch/sparc/include/asm/pgtable.h
index 59ba6f620..e48891170 100644
--- a/kernel/arch/sparc/include/asm/pgtable.h
+++ b/kernel/arch/sparc/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_PGTABLE_H
 #define ___ASM_SPARC_PGTABLE_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/pgtable_32.h b/kernel/arch/sparc/include/asm/pgtable_32.h
index cf1907283..4eebed6c6 100644
--- a/kernel/arch/sparc/include/asm/pgtable_32.h
+++ b/kernel/arch/sparc/include/asm/pgtable_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_PGTABLE_H
 #define _SPARC_PGTABLE_H
 
diff --git a/kernel/arch/sparc/include/asm/pgtable_64.h b/kernel/arch/sparc/include/asm/pgtable_64.h
index 4fefe3762..fd9d9bac7 100644
--- a/kernel/arch/sparc/include/asm/pgtable_64.h
+++ b/kernel/arch/sparc/include/asm/pgtable_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * pgtable.h: SpitFire page table operations.
  *
diff --git a/kernel/arch/sparc/include/asm/pgtsrmmu.h b/kernel/arch/sparc/include/asm/pgtsrmmu.h
index ae51a111a..32a508897 100644
--- a/kernel/arch/sparc/include/asm/pgtsrmmu.h
+++ b/kernel/arch/sparc/include/asm/pgtsrmmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * pgtsrmmu.h:  SRMMU page table defines and code.
  *
diff --git a/kernel/arch/sparc/include/asm/pil.h b/kernel/arch/sparc/include/asm/pil.h
index 522b43db2..4003c3530 100644
--- a/kernel/arch/sparc/include/asm/pil.h
+++ b/kernel/arch/sparc/include/asm/pil.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_PIL_H
 #define _SPARC64_PIL_H
 
diff --git a/kernel/arch/sparc/include/asm/processor.h b/kernel/arch/sparc/include/asm/processor.h
index 9da9646bf..18295ea62 100644
--- a/kernel/arch/sparc/include/asm/processor.h
+++ b/kernel/arch/sparc/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_PROCESSOR_H
 #define ___ASM_SPARC_PROCESSOR_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/processor_32.h b/kernel/arch/sparc/include/asm/processor_32.h
index b395e5620..192493c25 100644
--- a/kernel/arch/sparc/include/asm/processor_32.h
+++ b/kernel/arch/sparc/include/asm/processor_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* include/asm/processor.h
  *
  * Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/processor_64.h b/kernel/arch/sparc/include/asm/processor_64.h
index f04dc5a43..c7c79fe8d 100644
--- a/kernel/arch/sparc/include/asm/processor_64.h
+++ b/kernel/arch/sparc/include/asm/processor_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm/processor.h
  *
diff --git a/kernel/arch/sparc/include/asm/psr.h b/kernel/arch/sparc/include/asm/psr.h
index e71eb5794..65127ce56 100644
--- a/kernel/arch/sparc/include/asm/psr.h
+++ b/kernel/arch/sparc/include/asm/psr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * psr.h: This file holds the macros for masking off various parts of
  *        the processor status register on the Sparc. This is valid
diff --git a/kernel/arch/sparc/include/asm/ptrace.h b/kernel/arch/sparc/include/asm/ptrace.h
index d73428e43..6a339a78f 100644
--- a/kernel/arch/sparc/include/asm/ptrace.h
+++ b/kernel/arch/sparc/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_PTRACE_H
 #define __SPARC_PTRACE_H
 
diff --git a/kernel/arch/sparc/include/asm/qrwlock.h b/kernel/arch/sparc/include/asm/qrwlock.h
index d68a4b102..c27772915 100644
--- a/kernel/arch/sparc/include/asm/qrwlock.h
+++ b/kernel/arch/sparc/include/asm/qrwlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_QRWLOCK_H
 #define _ASM_SPARC_QRWLOCK_H
 
diff --git a/kernel/arch/sparc/include/asm/qspinlock.h b/kernel/arch/sparc/include/asm/qspinlock.h
index 5ae9a2802..48808f3d9 100644
--- a/kernel/arch/sparc/include/asm/qspinlock.h
+++ b/kernel/arch/sparc/include/asm/qspinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_QSPINLOCK_H
 #define _ASM_SPARC_QSPINLOCK_H
 
diff --git a/kernel/arch/sparc/include/asm/ross.h b/kernel/arch/sparc/include/asm/ross.h
index ecb6e8178..79a54d66a 100644
--- a/kernel/arch/sparc/include/asm/ross.h
+++ b/kernel/arch/sparc/include/asm/ross.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ross.h: Ross module specific definitions and defines.
  *
diff --git a/kernel/arch/sparc/include/asm/sbi.h b/kernel/arch/sparc/include/asm/sbi.h
index 5eb7f1965..4d6026c1e 100644
--- a/kernel/arch/sparc/include/asm/sbi.h
+++ b/kernel/arch/sparc/include/asm/sbi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * sbi.h:  SBI (Sbus Interface on sun4d) definitions
  *
diff --git a/kernel/arch/sparc/include/asm/scratchpad.h b/kernel/arch/sparc/include/asm/scratchpad.h
index 5e8b01fb3..958351190 100644
--- a/kernel/arch/sparc/include/asm/scratchpad.h
+++ b/kernel/arch/sparc/include/asm/scratchpad.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_SCRATCHPAD_H
 #define _SPARC64_SCRATCHPAD_H
 
diff --git a/kernel/arch/sparc/include/asm/seccomp.h b/kernel/arch/sparc/include/asm/seccomp.h
index 5ef8826d4..62d4579ef 100644
--- a/kernel/arch/sparc/include/asm/seccomp.h
+++ b/kernel/arch/sparc/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SECCOMP_H
 #define _ASM_SECCOMP_H
 
diff --git a/kernel/arch/sparc/include/asm/sections.h b/kernel/arch/sparc/include/asm/sections.h
index f300d1a9b..08f833453 100644
--- a/kernel/arch/sparc/include/asm/sections.h
+++ b/kernel/arch/sparc/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_SECTIONS_H
 #define __SPARC_SECTIONS_H
 
diff --git a/kernel/arch/sparc/include/asm/setup.h b/kernel/arch/sparc/include/asm/setup.h
index 8b3253808..72205684e 100644
--- a/kernel/arch/sparc/include/asm/setup.h
+++ b/kernel/arch/sparc/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Just a place holder.
  */
diff --git a/kernel/arch/sparc/include/asm/sfafsr.h b/kernel/arch/sparc/include/asm/sfafsr.h
index e96137b04..9c98f4fc8 100644
--- a/kernel/arch/sparc/include/asm/sfafsr.h
+++ b/kernel/arch/sparc/include/asm/sfafsr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_SFAFSR_H
 #define _SPARC64_SFAFSR_H
 
diff --git a/kernel/arch/sparc/include/asm/sfp-machine.h b/kernel/arch/sparc/include/asm/sfp-machine.h
index 4ebc3823e..4a247b405 100644
--- a/kernel/arch/sparc/include/asm/sfp-machine.h
+++ b/kernel/arch/sparc/include/asm/sfp-machine.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_SFP_MACHINE_H
 #define ___ASM_SPARC_SFP_MACHINE_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/shmparam.h b/kernel/arch/sparc/include/asm/shmparam.h
index 8bf0cfe06..951a4525f 100644
--- a/kernel/arch/sparc/include/asm/shmparam.h
+++ b/kernel/arch/sparc/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_SHMPARAM_H
 #define ___ASM_SPARC_SHMPARAM_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/shmparam_32.h b/kernel/arch/sparc/include/asm/shmparam_32.h
index 142825c8d..9767a8b30 100644
--- a/kernel/arch/sparc/include/asm/shmparam_32.h
+++ b/kernel/arch/sparc/include/asm/shmparam_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMSPARC_SHMPARAM_H
 #define _ASMSPARC_SHMPARAM_H
 
diff --git a/kernel/arch/sparc/include/asm/shmparam_64.h b/kernel/arch/sparc/include/asm/shmparam_64.h
index 1ed0d6701..c0731b571 100644
--- a/kernel/arch/sparc/include/asm/shmparam_64.h
+++ b/kernel/arch/sparc/include/asm/shmparam_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASMSPARC64_SHMPARAM_H
 #define _ASMSPARC64_SHMPARAM_H
 
diff --git a/kernel/arch/sparc/include/asm/sigcontext.h b/kernel/arch/sparc/include/asm/sigcontext.h
index f4eb630a5..ee05f9d2b 100644
--- a/kernel/arch/sparc/include/asm/sigcontext.h
+++ b/kernel/arch/sparc/include/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_SIGCONTEXT_H
 #define __SPARC_SIGCONTEXT_H
 
diff --git a/kernel/arch/sparc/include/asm/signal.h b/kernel/arch/sparc/include/asm/signal.h
index c33ce3f2b..827b73a97 100644
--- a/kernel/arch/sparc/include/asm/signal.h
+++ b/kernel/arch/sparc/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_SIGNAL_H
 #define __SPARC_SIGNAL_H
 
diff --git a/kernel/arch/sparc/include/asm/smp.h b/kernel/arch/sparc/include/asm/smp.h
index b59672d0e..dea59f6ce 100644
--- a/kernel/arch/sparc/include/asm/smp.h
+++ b/kernel/arch/sparc/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_SMP_H
 #define ___ASM_SPARC_SMP_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/smp_32.h b/kernel/arch/sparc/include/asm/smp_32.h
index 7c24e08a8..856081761 100644
--- a/kernel/arch/sparc/include/asm/smp_32.h
+++ b/kernel/arch/sparc/include/asm/smp_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* smp.h: Sparc specific SMP stuff.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/smp_64.h b/kernel/arch/sparc/include/asm/smp_64.h
index a75089285..e75783b6a 100644
--- a/kernel/arch/sparc/include/asm/smp_64.h
+++ b/kernel/arch/sparc/include/asm/smp_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* smp.h: Sparc64 specific SMP stuff.
  *
  * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/sparsemem.h b/kernel/arch/sparc/include/asm/sparsemem.h
index e5e1752d5..1dd1b6143 100644
--- a/kernel/arch/sparc/include/asm/sparsemem.h
+++ b/kernel/arch/sparc/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_SPARSEMEM_H
 #define _SPARC64_SPARSEMEM_H
 
diff --git a/kernel/arch/sparc/include/asm/spinlock.h b/kernel/arch/sparc/include/asm/spinlock.h
index f276b0036..3f4ce55bc 100644
--- a/kernel/arch/sparc/include/asm/spinlock.h
+++ b/kernel/arch/sparc/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_SPINLOCK_H
 #define ___ASM_SPARC_SPINLOCK_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/spinlock_32.h b/kernel/arch/sparc/include/asm/spinlock_32.h
index 67345b2dc..26f00ac2b 100644
--- a/kernel/arch/sparc/include/asm/spinlock_32.h
+++ b/kernel/arch/sparc/include/asm/spinlock_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* spinlock.h: 32-bit Sparc spinlock support.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/spinlock_64.h b/kernel/arch/sparc/include/asm/spinlock_64.h
index f7028f5e1..4822a7e94 100644
--- a/kernel/arch/sparc/include/asm/spinlock_64.h
+++ b/kernel/arch/sparc/include/asm/spinlock_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* spinlock.h: 64-bit Sparc spinlock support.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/include/asm/spinlock_types.h b/kernel/arch/sparc/include/asm/spinlock_types.h
index bce8ef44d..ed1d569b6 100644
--- a/kernel/arch/sparc/include/asm/spinlock_types.h
+++ b/kernel/arch/sparc/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_SPINLOCK_TYPES_H
 #define __SPARC_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/sparc/include/asm/spitfire.h b/kernel/arch/sparc/include/asm/spitfire.h
index 1b1286d05..e9b7d25b2 100644
--- a/kernel/arch/sparc/include/asm/spitfire.h
+++ b/kernel/arch/sparc/include/asm/spitfire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* spitfire.h: SpitFire/BlackBird/Cheetah inline MMU operations.
  *
  * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/stacktrace.h b/kernel/arch/sparc/include/asm/stacktrace.h
index c30d066f3..556ec5d59 100644
--- a/kernel/arch/sparc/include/asm/stacktrace.h
+++ b/kernel/arch/sparc/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_STACKTRACE_H
 #define _SPARC64_STACKTRACE_H
 
diff --git a/kernel/arch/sparc/include/asm/starfire.h b/kernel/arch/sparc/include/asm/starfire.h
index 176fa0ad1..fb1a8c499 100644
--- a/kernel/arch/sparc/include/asm/starfire.h
+++ b/kernel/arch/sparc/include/asm/starfire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * starfire.h: Group all starfire specific code together.
  *
diff --git a/kernel/arch/sparc/include/asm/string.h b/kernel/arch/sparc/include/asm/string.h
index 86f34be14..3d9cd0827 100644
--- a/kernel/arch/sparc/include/asm/string.h
+++ b/kernel/arch/sparc/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_STRING_H
 #define ___ASM_SPARC_STRING_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/string_32.h b/kernel/arch/sparc/include/asm/string_32.h
index 649412476..f488946bd 100644
--- a/kernel/arch/sparc/include/asm/string_32.h
+++ b/kernel/arch/sparc/include/asm/string_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * string.h: External definitions for optimized assembly string
  *           routines for the Linux Kernel.
diff --git a/kernel/arch/sparc/include/asm/string_64.h b/kernel/arch/sparc/include/asm/string_64.h
index 6b9ccb308..ee9ba6732 100644
--- a/kernel/arch/sparc/include/asm/string_64.h
+++ b/kernel/arch/sparc/include/asm/string_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * string.h: External definitions for optimized assembly string
  *           routines for the Linux Kernel.
diff --git a/kernel/arch/sparc/include/asm/sunbpp.h b/kernel/arch/sparc/include/asm/sunbpp.h
index d81a02eaf..55de4da70 100644
--- a/kernel/arch/sparc/include/asm/sunbpp.h
+++ b/kernel/arch/sparc/include/asm/sunbpp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/asm/sunbpp.h
  */
diff --git a/kernel/arch/sparc/include/asm/swift.h b/kernel/arch/sparc/include/asm/swift.h
index e535061bf..96f6526b9 100644
--- a/kernel/arch/sparc/include/asm/swift.h
+++ b/kernel/arch/sparc/include/asm/swift.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* swift.h: Specific definitions for the _broken_ Swift SRMMU
  *          MMU module.
  *
diff --git a/kernel/arch/sparc/include/asm/switch_to.h b/kernel/arch/sparc/include/asm/switch_to.h
index 2dc4fa5c6..7cf1c5dc7 100644
--- a/kernel/arch/sparc/include/asm/switch_to.h
+++ b/kernel/arch/sparc/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_SWITCH_TO_H
 #define ___ASM_SPARC_SWITCH_TO_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/switch_to_32.h b/kernel/arch/sparc/include/asm/switch_to_32.h
index 475dd4158..42eeafcb8 100644
--- a/kernel/arch/sparc/include/asm/switch_to_32.h
+++ b/kernel/arch/sparc/include/asm/switch_to_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_SWITCH_TO_H
 #define __SPARC_SWITCH_TO_H
 
diff --git a/kernel/arch/sparc/include/asm/switch_to_64.h b/kernel/arch/sparc/include/asm/switch_to_64.h
index 10e76332d..4ff29b140 100644
--- a/kernel/arch/sparc/include/asm/switch_to_64.h
+++ b/kernel/arch/sparc/include/asm/switch_to_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC64_SWITCH_TO_64_H
 #define __SPARC64_SWITCH_TO_64_H
 
diff --git a/kernel/arch/sparc/include/asm/syscall.h b/kernel/arch/sparc/include/asm/syscall.h
index 1757cd6c5..053989e3f 100644
--- a/kernel/arch/sparc/include/asm/syscall.h
+++ b/kernel/arch/sparc/include/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPARC_SYSCALL_H
 #define __ASM_SPARC_SYSCALL_H
 
diff --git a/kernel/arch/sparc/include/asm/syscalls.h b/kernel/arch/sparc/include/asm/syscalls.h
index b0a0db8ea..1d819f5e2 100644
--- a/kernel/arch/sparc/include/asm/syscalls.h
+++ b/kernel/arch/sparc/include/asm/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_SYSCALLS_H
 #define _SPARC64_SYSCALLS_H
 
diff --git a/kernel/arch/sparc/include/asm/termbits.h b/kernel/arch/sparc/include/asm/termbits.h
index 948067065..fa9de4a46 100644
--- a/kernel/arch/sparc/include/asm/termbits.h
+++ b/kernel/arch/sparc/include/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_TERMBITS_H
 #define _SPARC_TERMBITS_H
 
diff --git a/kernel/arch/sparc/include/asm/termios.h b/kernel/arch/sparc/include/asm/termios.h
index 0c2414ddd..4a558efdf 100644
--- a/kernel/arch/sparc/include/asm/termios.h
+++ b/kernel/arch/sparc/include/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_TERMIOS_H
 #define _SPARC_TERMIOS_H
 
diff --git a/kernel/arch/sparc/include/asm/thread_info.h b/kernel/arch/sparc/include/asm/thread_info.h
index 122d7acc0..740b1743e 100644
--- a/kernel/arch/sparc/include/asm/thread_info.h
+++ b/kernel/arch/sparc/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_THREAD_INFO_H
 #define ___ASM_SPARC_THREAD_INFO_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/thread_info_32.h b/kernel/arch/sparc/include/asm/thread_info_32.h
index 229475f0d..febaaeb1a 100644
--- a/kernel/arch/sparc/include/asm/thread_info_32.h
+++ b/kernel/arch/sparc/include/asm/thread_info_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * thread_info.h: sparc low-level thread information
  * adapted from the ppc version by Pete Zaitcev, which was
diff --git a/kernel/arch/sparc/include/asm/thread_info_64.h b/kernel/arch/sparc/include/asm/thread_info_64.h
index 38a24f257..caf915321 100644
--- a/kernel/arch/sparc/include/asm/thread_info_64.h
+++ b/kernel/arch/sparc/include/asm/thread_info_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: sparc64 low-level thread information
  *
  * Copyright (C) 2002  David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/include/asm/timer.h b/kernel/arch/sparc/include/asm/timer.h
index 612fd2779..eaf6195d1 100644
--- a/kernel/arch/sparc/include/asm/timer.h
+++ b/kernel/arch/sparc/include/asm/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_TIMER_H
 #define ___ASM_SPARC_TIMER_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/timer_32.h b/kernel/arch/sparc/include/asm/timer_32.h
index f8e708a0a..eecd26969 100644
--- a/kernel/arch/sparc/include/asm/timer_32.h
+++ b/kernel/arch/sparc/include/asm/timer_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * timer.h:  Definitions for the timer chips on the Sparc.
  *
diff --git a/kernel/arch/sparc/include/asm/timer_64.h b/kernel/arch/sparc/include/asm/timer_64.h
index 51bc3bc54..c7e4fb601 100644
--- a/kernel/arch/sparc/include/asm/timer_64.h
+++ b/kernel/arch/sparc/include/asm/timer_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* timer.h: System timer definitions for sun5.
  *
  * Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/include/asm/timex.h b/kernel/arch/sparc/include/asm/timex.h
index 70cc37b73..9aac26b1f 100644
--- a/kernel/arch/sparc/include/asm/timex.h
+++ b/kernel/arch/sparc/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_TIMEX_H
 #define ___ASM_SPARC_TIMEX_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/timex_32.h b/kernel/arch/sparc/include/asm/timex_32.h
index b6ccdb0d6..542915b46 100644
--- a/kernel/arch/sparc/include/asm/timex_32.h
+++ b/kernel/arch/sparc/include/asm/timex_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm/timex.h
  *
diff --git a/kernel/arch/sparc/include/asm/timex_64.h b/kernel/arch/sparc/include/asm/timex_64.h
index 18b30bc98..076c44f68 100644
--- a/kernel/arch/sparc/include/asm/timex_64.h
+++ b/kernel/arch/sparc/include/asm/timex_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm/timex.h
  *
diff --git a/kernel/arch/sparc/include/asm/tlb.h b/kernel/arch/sparc/include/asm/tlb.h
index 92d0393bb..7146a5772 100644
--- a/kernel/arch/sparc/include/asm/tlb.h
+++ b/kernel/arch/sparc/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_TLB_H
 #define ___ASM_SPARC_TLB_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/tlb_32.h b/kernel/arch/sparc/include/asm/tlb_32.h
index 6d02d1ce5..343cea19e 100644
--- a/kernel/arch/sparc/include/asm/tlb_32.h
+++ b/kernel/arch/sparc/include/asm/tlb_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_TLB_H
 #define _SPARC_TLB_H
 
diff --git a/kernel/arch/sparc/include/asm/tlb_64.h b/kernel/arch/sparc/include/asm/tlb_64.h
index 4cb392f75..a2f3fa61e 100644
--- a/kernel/arch/sparc/include/asm/tlb_64.h
+++ b/kernel/arch/sparc/include/asm/tlb_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_TLB_H
 #define _SPARC64_TLB_H
 
diff --git a/kernel/arch/sparc/include/asm/tlbflush.h b/kernel/arch/sparc/include/asm/tlbflush.h
index 2c9629fad..30ae3ea21 100644
--- a/kernel/arch/sparc/include/asm/tlbflush.h
+++ b/kernel/arch/sparc/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_TLBFLUSH_H
 #define ___ASM_SPARC_TLBFLUSH_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/tlbflush_32.h b/kernel/arch/sparc/include/asm/tlbflush_32.h
index a5c414213..470531991 100644
--- a/kernel/arch/sparc/include/asm/tlbflush_32.h
+++ b/kernel/arch/sparc/include/asm/tlbflush_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_TLBFLUSH_H
 #define _SPARC_TLBFLUSH_H
 
diff --git a/kernel/arch/sparc/include/asm/tlbflush_64.h b/kernel/arch/sparc/include/asm/tlbflush_64.h
index 54be88a67..8b8cdaa69 100644
--- a/kernel/arch/sparc/include/asm/tlbflush_64.h
+++ b/kernel/arch/sparc/include/asm/tlbflush_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_TLBFLUSH_H
 #define _SPARC64_TLBFLUSH_H
 
diff --git a/kernel/arch/sparc/include/asm/topology.h b/kernel/arch/sparc/include/asm/topology.h
index ee4f191d3..ba7b9d9d9 100644
--- a/kernel/arch/sparc/include/asm/topology.h
+++ b/kernel/arch/sparc/include/asm/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_TOPOLOGY_H
 #define ___ASM_SPARC_TOPOLOGY_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/topology_32.h b/kernel/arch/sparc/include/asm/topology_32.h
index ee5ac9c9d..66c4f9ff7 100644
--- a/kernel/arch/sparc/include/asm/topology_32.h
+++ b/kernel/arch/sparc/include/asm/topology_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_TOPOLOGY_H
 #define _ASM_SPARC_TOPOLOGY_H
 
diff --git a/kernel/arch/sparc/include/asm/topology_64.h b/kernel/arch/sparc/include/asm/topology_64.h
index ad5293f89..3831b1911 100644
--- a/kernel/arch/sparc/include/asm/topology_64.h
+++ b/kernel/arch/sparc/include/asm/topology_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC64_TOPOLOGY_H
 #define _ASM_SPARC64_TOPOLOGY_H
 
diff --git a/kernel/arch/sparc/include/asm/trap_block.h b/kernel/arch/sparc/include/asm/trap_block.h
index dfc538609..6a4c8652a 100644
--- a/kernel/arch/sparc/include/asm/trap_block.h
+++ b/kernel/arch/sparc/include/asm/trap_block.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_TRAP_BLOCK_H
 #define _SPARC_TRAP_BLOCK_H
 
diff --git a/kernel/arch/sparc/include/asm/traps.h b/kernel/arch/sparc/include/asm/traps.h
index 51abcb1f9..2fba2602b 100644
--- a/kernel/arch/sparc/include/asm/traps.h
+++ b/kernel/arch/sparc/include/asm/traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * traps.h:  Format of entries for the Sparc trap table.
  *
diff --git a/kernel/arch/sparc/include/asm/tsb.h b/kernel/arch/sparc/include/asm/tsb.h
index acf55063a..25b6abdb3 100644
--- a/kernel/arch/sparc/include/asm/tsb.h
+++ b/kernel/arch/sparc/include/asm/tsb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_TSB_H
 #define _SPARC64_TSB_H
 
diff --git a/kernel/arch/sparc/include/asm/tsunami.h b/kernel/arch/sparc/include/asm/tsunami.h
index 5bbd1d523..acaf014ef 100644
--- a/kernel/arch/sparc/include/asm/tsunami.h
+++ b/kernel/arch/sparc/include/asm/tsunami.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tsunami.h:  Module specific definitions for Tsunami V8 Sparcs
  *
diff --git a/kernel/arch/sparc/include/asm/ttable.h b/kernel/arch/sparc/include/asm/ttable.h
index 82e7df296..ede2b66cf 100644
--- a/kernel/arch/sparc/include/asm/ttable.h
+++ b/kernel/arch/sparc/include/asm/ttable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_TTABLE_H
 #define _SPARC64_TTABLE_H
 
diff --git a/kernel/arch/sparc/include/asm/turbosparc.h b/kernel/arch/sparc/include/asm/turbosparc.h
index 17c73282d..23df777f9 100644
--- a/kernel/arch/sparc/include/asm/turbosparc.h
+++ b/kernel/arch/sparc/include/asm/turbosparc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * turbosparc.h:  Defines specific to the TurboSparc module.
  *            This is SRMMU stuff.
diff --git a/kernel/arch/sparc/include/asm/uaccess.h b/kernel/arch/sparc/include/asm/uaccess.h
index 9e068bf90..dd85bc2c2 100644
--- a/kernel/arch/sparc/include/asm/uaccess.h
+++ b/kernel/arch/sparc/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_UACCESS_H
 #define ___ASM_SPARC_UACCESS_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/asm/uaccess_32.h b/kernel/arch/sparc/include/asm/uaccess_32.h
index bdb1447aa..de71c65b9 100644
--- a/kernel/arch/sparc/include/asm/uaccess_32.h
+++ b/kernel/arch/sparc/include/asm/uaccess_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * uaccess.h: User space memore access functions.
  *
diff --git a/kernel/arch/sparc/include/asm/uaccess_64.h b/kernel/arch/sparc/include/asm/uaccess_64.h
index 6d4c997d1..cbb308cee 100644
--- a/kernel/arch/sparc/include/asm/uaccess_64.h
+++ b/kernel/arch/sparc/include/asm/uaccess_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UACCESS_H
 #define _ASM_UACCESS_H
 
diff --git a/kernel/arch/sparc/include/asm/unaligned.h b/kernel/arch/sparc/include/asm/unaligned.h
index 11d2d5fb5..7971d89d2 100644
--- a/kernel/arch/sparc/include/asm/unaligned.h
+++ b/kernel/arch/sparc/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_SPARC_UNALIGNED_H
 #define _ASM_SPARC_UNALIGNED_H
 
diff --git a/kernel/arch/sparc/include/asm/unistd.h b/kernel/arch/sparc/include/asm/unistd.h
index 0aac1e8f2..b2a6a9551 100644
--- a/kernel/arch/sparc/include/asm/unistd.h
+++ b/kernel/arch/sparc/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * System calls under the Sparc.
  *
diff --git a/kernel/arch/sparc/include/asm/upa.h b/kernel/arch/sparc/include/asm/upa.h
index 5b1633223..782691b30 100644
--- a/kernel/arch/sparc/include/asm/upa.h
+++ b/kernel/arch/sparc/include/asm/upa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_UPA_H
 #define _SPARC64_UPA_H
 
diff --git a/kernel/arch/sparc/include/asm/vaddrs.h b/kernel/arch/sparc/include/asm/vaddrs.h
index c3dbcf902..84d054b07 100644
--- a/kernel/arch/sparc/include/asm/vaddrs.h
+++ b/kernel/arch/sparc/include/asm/vaddrs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC_VADDRS_H
 #define _SPARC_VADDRS_H
 
diff --git a/kernel/arch/sparc/include/asm/vga.h b/kernel/arch/sparc/include/asm/vga.h
index f54e8b6fb..2952d667d 100644
--- a/kernel/arch/sparc/include/asm/vga.h
+++ b/kernel/arch/sparc/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Access to VGA videoram
  *
diff --git a/kernel/arch/sparc/include/asm/viking.h b/kernel/arch/sparc/include/asm/viking.h
index 989930aeb..0bbefd184 100644
--- a/kernel/arch/sparc/include/asm/viking.h
+++ b/kernel/arch/sparc/include/asm/viking.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * viking.h:  Defines specific to the GNU/Viking MBUS module.
  *            This is SRMMU stuff.
diff --git a/kernel/arch/sparc/include/asm/vio.h b/kernel/arch/sparc/include/asm/vio.h
index f3d4ac232..059f0eb67 100644
--- a/kernel/arch/sparc/include/asm/vio.h
+++ b/kernel/arch/sparc/include/asm/vio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_VIO_H
 #define _SPARC64_VIO_H
 
diff --git a/kernel/arch/sparc/include/asm/visasm.h b/kernel/arch/sparc/include/asm/visasm.h
index 6424249d5..7903e84e0 100644
--- a/kernel/arch/sparc/include/asm/visasm.h
+++ b/kernel/arch/sparc/include/asm/visasm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_VISASM_H
 #define _SPARC64_VISASM_H
 
diff --git a/kernel/arch/sparc/include/asm/winmacro.h b/kernel/arch/sparc/include/asm/winmacro.h
index 9b7b21764..b6e911f5d 100644
--- a/kernel/arch/sparc/include/asm/winmacro.h
+++ b/kernel/arch/sparc/include/asm/winmacro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * winmacro.h: Window loading-unloading macros.
  *
diff --git a/kernel/arch/sparc/include/asm/xor.h b/kernel/arch/sparc/include/asm/xor.h
index 8ed591c7d..f4c651e20 100644
--- a/kernel/arch/sparc/include/asm/xor.h
+++ b/kernel/arch/sparc/include/asm/xor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___ASM_SPARC_XOR_H
 #define ___ASM_SPARC_XOR_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/arch/sparc/include/uapi/asm/apc.h b/kernel/arch/sparc/include/uapi/asm/apc.h
index 24e9a7d4d..aeb369b87 100644
--- a/kernel/arch/sparc/include/uapi/asm/apc.h
+++ b/kernel/arch/sparc/include/uapi/asm/apc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* apc - Driver definitions for power management functions
  * of Aurora Personality Chip (APC) on SPARCstation-4/5 and 
  * derivatives
diff --git a/kernel/arch/sparc/include/uapi/asm/asi.h b/kernel/arch/sparc/include/uapi/asm/asi.h
index 7ad7203de..d371b2695 100644
--- a/kernel/arch/sparc/include/uapi/asm/asi.h
+++ b/kernel/arch/sparc/include/uapi/asm/asi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_ASI_H
 #define _SPARC_ASI_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/bitsperlong.h b/kernel/arch/sparc/include/uapi/asm/bitsperlong.h
index 40dcaa3aa..cd9a43227 100644
--- a/kernel/arch/sparc/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/sparc/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_ALPHA_BITSPERLONG_H
 #define __ASM_ALPHA_BITSPERLONG_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/byteorder.h b/kernel/arch/sparc/include/uapi/asm/byteorder.h
index ccc1b6b7d..216b8e593 100644
--- a/kernel/arch/sparc/include/uapi/asm/byteorder.h
+++ b/kernel/arch/sparc/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_BYTEORDER_H
 #define _SPARC_BYTEORDER_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/display7seg.h b/kernel/arch/sparc/include/uapi/asm/display7seg.h
index 86d4a901d..7e9fef0c6 100644
--- a/kernel/arch/sparc/include/uapi/asm/display7seg.h
+++ b/kernel/arch/sparc/include/uapi/asm/display7seg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
  * display7seg - Driver interface for the 7-segment display
diff --git a/kernel/arch/sparc/include/uapi/asm/envctrl.h b/kernel/arch/sparc/include/uapi/asm/envctrl.h
index 624fa7e2d..cf8aa0a14 100644
--- a/kernel/arch/sparc/include/uapi/asm/envctrl.h
+++ b/kernel/arch/sparc/include/uapi/asm/envctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
  * envctrl.h: Definitions for access to the i2c environment
diff --git a/kernel/arch/sparc/include/uapi/asm/errno.h b/kernel/arch/sparc/include/uapi/asm/errno.h
index 20423e172..81a732b90 100644
--- a/kernel/arch/sparc/include/uapi/asm/errno.h
+++ b/kernel/arch/sparc/include/uapi/asm/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_ERRNO_H
 #define _SPARC_ERRNO_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/fbio.h b/kernel/arch/sparc/include/uapi/asm/fbio.h
index d6cea07af..0dafe2c1e 100644
--- a/kernel/arch/sparc/include/uapi/asm/fbio.h
+++ b/kernel/arch/sparc/include/uapi/asm/fbio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_FBIO_H
 #define _UAPI__LINUX_FBIO_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/fcntl.h b/kernel/arch/sparc/include/uapi/asm/fcntl.h
index 7e8ace5bf..67dae75e5 100644
--- a/kernel/arch/sparc/include/uapi/asm/fcntl.h
+++ b/kernel/arch/sparc/include/uapi/asm/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_FCNTL_H
 #define _SPARC_FCNTL_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/ioctl.h b/kernel/arch/sparc/include/uapi/asm/ioctl.h
index 7d6bd5132..96c598fe7 100644
--- a/kernel/arch/sparc/include/uapi/asm/ioctl.h
+++ b/kernel/arch/sparc/include/uapi/asm/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_IOCTL_H
 #define _SPARC_IOCTL_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/ioctls.h b/kernel/arch/sparc/include/uapi/asm/ioctls.h
index f5df72b93..2df52711e 100644
--- a/kernel/arch/sparc/include/uapi/asm/ioctls.h
+++ b/kernel/arch/sparc/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_SPARC_IOCTLS_H
 #define _UAPI_ASM_SPARC_IOCTLS_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/ipcbuf.h b/kernel/arch/sparc/include/uapi/asm/ipcbuf.h
index 66013b4fe..9d0d12550 100644
--- a/kernel/arch/sparc/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/sparc/include/uapi/asm/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __SPARC_IPCBUF_H
 #define __SPARC_IPCBUF_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/jsflash.h b/kernel/arch/sparc/include/uapi/asm/jsflash.h
index 0717d9e39..68c98a542 100644
--- a/kernel/arch/sparc/include/uapi/asm/jsflash.h
+++ b/kernel/arch/sparc/include/uapi/asm/jsflash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * jsflash.h: OS Flash SIMM support for JavaStations.
  *
diff --git a/kernel/arch/sparc/include/uapi/asm/kvm_para.h b/kernel/arch/sparc/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/sparc/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/sparc/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/sparc/include/uapi/asm/mman.h b/kernel/arch/sparc/include/uapi/asm/mman.h
index 9765896ec..715a2c927 100644
--- a/kernel/arch/sparc/include/uapi/asm/mman.h
+++ b/kernel/arch/sparc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SPARC_MMAN_H__
 #define _UAPI__SPARC_MMAN_H__
 
diff --git a/kernel/arch/sparc/include/uapi/asm/msgbuf.h b/kernel/arch/sparc/include/uapi/asm/msgbuf.h
index efc7cbe97..b601c4f4d 100644
--- a/kernel/arch/sparc/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/sparc/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_MSGBUF_H
 #define _SPARC_MSGBUF_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/openpromio.h b/kernel/arch/sparc/include/uapi/asm/openpromio.h
index 917fb8e9c..8817f7d1a 100644
--- a/kernel/arch/sparc/include/uapi/asm/openpromio.h
+++ b/kernel/arch/sparc/include/uapi/asm/openpromio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef	_SPARC_OPENPROMIO_H
 #define	_SPARC_OPENPROMIO_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/param.h b/kernel/arch/sparc/include/uapi/asm/param.h
index 0bc356bf8..057d7135e 100644
--- a/kernel/arch/sparc/include/uapi/asm/param.h
+++ b/kernel/arch/sparc/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASMSPARC_PARAM_H
 #define _ASMSPARC_PARAM_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/perfctr.h b/kernel/arch/sparc/include/uapi/asm/perfctr.h
index 214feefa5..316b837bc 100644
--- a/kernel/arch/sparc/include/uapi/asm/perfctr.h
+++ b/kernel/arch/sparc/include/uapi/asm/perfctr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*----------------------------------------
   PERFORMANCE INSTRUMENTATION  
   Guillaume Thouvenin           08/10/98
diff --git a/kernel/arch/sparc/include/uapi/asm/poll.h b/kernel/arch/sparc/include/uapi/asm/poll.h
index 091d3ad2e..72356c999 100644
--- a/kernel/arch/sparc/include/uapi/asm/poll.h
+++ b/kernel/arch/sparc/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __SPARC_POLL_H
 #define __SPARC_POLL_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/posix_types.h b/kernel/arch/sparc/include/uapi/asm/posix_types.h
index 156220ed9..fec499d6e 100644
--- a/kernel/arch/sparc/include/uapi/asm/posix_types.h
+++ b/kernel/arch/sparc/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is generally used by user-level software, so you need to
  * be a little careful about namespace pollution etc.  Also, we cannot
diff --git a/kernel/arch/sparc/include/uapi/asm/psr.h b/kernel/arch/sparc/include/uapi/asm/psr.h
index 2f0ed8565..e41f65f0a 100644
--- a/kernel/arch/sparc/include/uapi/asm/psr.h
+++ b/kernel/arch/sparc/include/uapi/asm/psr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * psr.h: This file holds the macros for masking off various parts of
  *        the processor status register on the Sparc. This is valid
diff --git a/kernel/arch/sparc/include/uapi/asm/psrcompat.h b/kernel/arch/sparc/include/uapi/asm/psrcompat.h
index 44b6327db..1eaffbe0d 100644
--- a/kernel/arch/sparc/include/uapi/asm/psrcompat.h
+++ b/kernel/arch/sparc/include/uapi/asm/psrcompat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC64_PSRCOMPAT_H
 #define _SPARC64_PSRCOMPAT_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/pstate.h b/kernel/arch/sparc/include/uapi/asm/pstate.h
index cf832e14a..b6999c9e7 100644
--- a/kernel/arch/sparc/include/uapi/asm/pstate.h
+++ b/kernel/arch/sparc/include/uapi/asm/pstate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC64_PSTATE_H
 #define _SPARC64_PSTATE_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/ptrace.h b/kernel/arch/sparc/include/uapi/asm/ptrace.h
index 56fe4ea73..abe640037 100644
--- a/kernel/arch/sparc/include/uapi/asm/ptrace.h
+++ b/kernel/arch/sparc/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SPARC_PTRACE_H
 #define _UAPI__SPARC_PTRACE_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/resource.h b/kernel/arch/sparc/include/uapi/asm/resource.h
index fe163cafb..cbe2de778 100644
--- a/kernel/arch/sparc/include/uapi/asm/resource.h
+++ b/kernel/arch/sparc/include/uapi/asm/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * resource.h: Resource definitions.
  *
diff --git a/kernel/arch/sparc/include/uapi/asm/sembuf.h b/kernel/arch/sparc/include/uapi/asm/sembuf.h
index faee1be08..f49b0ffa0 100644
--- a/kernel/arch/sparc/include/uapi/asm/sembuf.h
+++ b/kernel/arch/sparc/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_SEMBUF_H
 #define _SPARC_SEMBUF_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/setup.h b/kernel/arch/sparc/include/uapi/asm/setup.h
index 533768450..3c208a4dd 100644
--- a/kernel/arch/sparc/include/uapi/asm/setup.h
+++ b/kernel/arch/sparc/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	Just a place holder. 
  */
diff --git a/kernel/arch/sparc/include/uapi/asm/shmbuf.h b/kernel/arch/sparc/include/uapi/asm/shmbuf.h
index 83a160553..286631db7 100644
--- a/kernel/arch/sparc/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/sparc/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_SHMBUF_H
 #define _SPARC_SHMBUF_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/sigcontext.h b/kernel/arch/sparc/include/uapi/asm/sigcontext.h
index ae5704fa7..043dd4b92 100644
--- a/kernel/arch/sparc/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/sparc/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * There isn't anything here anymore, but the file must not be empty or patch
  * will delete it.
diff --git a/kernel/arch/sparc/include/uapi/asm/siginfo.h b/kernel/arch/sparc/include/uapi/asm/siginfo.h
index 157f46fe3..896ce447d 100644
--- a/kernel/arch/sparc/include/uapi/asm/siginfo.h
+++ b/kernel/arch/sparc/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SPARC_SIGINFO_H
 #define _UAPI__SPARC_SIGINFO_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/signal.h b/kernel/arch/sparc/include/uapi/asm/signal.h
index f387400fc..ff9505923 100644
--- a/kernel/arch/sparc/include/uapi/asm/signal.h
+++ b/kernel/arch/sparc/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SPARC_SIGNAL_H
 #define _UAPI__SPARC_SIGNAL_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/socket.h b/kernel/arch/sparc/include/uapi/asm/socket.h
index b2f5c50d0..d58520c2e 100644
--- a/kernel/arch/sparc/include/uapi/asm/socket.h
+++ b/kernel/arch/sparc/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SOCKET_H
 #define _ASM_SOCKET_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/sockios.h b/kernel/arch/sparc/include/uapi/asm/sockios.h
index 990ea7464..18a3ec14a 100644
--- a/kernel/arch/sparc/include/uapi/asm/sockios.h
+++ b/kernel/arch/sparc/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SPARC_SOCKIOS_H
 #define _ASM_SPARC_SOCKIOS_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/stat.h b/kernel/arch/sparc/include/uapi/asm/stat.h
index 2f0583a2c..b6ec4eb21 100644
--- a/kernel/arch/sparc/include/uapi/asm/stat.h
+++ b/kernel/arch/sparc/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __SPARC_STAT_H
 #define __SPARC_STAT_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/statfs.h b/kernel/arch/sparc/include/uapi/asm/statfs.h
index 55e607ad4..20c8f5bd3 100644
--- a/kernel/arch/sparc/include/uapi/asm/statfs.h
+++ b/kernel/arch/sparc/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef ___ASM_SPARC_STATFS_H
 #define ___ASM_SPARC_STATFS_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/swab.h b/kernel/arch/sparc/include/uapi/asm/swab.h
index 4c7c12d69..6b1b3f1ad 100644
--- a/kernel/arch/sparc/include/uapi/asm/swab.h
+++ b/kernel/arch/sparc/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _SPARC_SWAB_H
 #define _SPARC_SWAB_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/termbits.h b/kernel/arch/sparc/include/uapi/asm/termbits.h
index dd91642fc..ce5ad5d0f 100644
--- a/kernel/arch/sparc/include/uapi/asm/termbits.h
+++ b/kernel/arch/sparc/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_SPARC_TERMBITS_H
 #define _UAPI_SPARC_TERMBITS_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/termios.h b/kernel/arch/sparc/include/uapi/asm/termios.h
index ea6f09e51..ee86f4093 100644
--- a/kernel/arch/sparc/include/uapi/asm/termios.h
+++ b/kernel/arch/sparc/include/uapi/asm/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_SPARC_TERMIOS_H
 #define _UAPI_SPARC_TERMIOS_H
 
diff --git a/kernel/arch/sparc/include/uapi/asm/traps.h b/kernel/arch/sparc/include/uapi/asm/traps.h
index a4eceace6..930db746f 100644
--- a/kernel/arch/sparc/include/uapi/asm/traps.h
+++ b/kernel/arch/sparc/include/uapi/asm/traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * traps.h:  Format of entries for the Sparc trap table.
  *
diff --git a/kernel/arch/sparc/include/uapi/asm/uctx.h b/kernel/arch/sparc/include/uapi/asm/uctx.h
index dc937c75f..13a13198e 100644
--- a/kernel/arch/sparc/include/uapi/asm/uctx.h
+++ b/kernel/arch/sparc/include/uapi/asm/uctx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * uctx.h: Sparc64 {set,get}context() register state layouts.
  *
diff --git a/kernel/arch/sparc/include/uapi/asm/unistd.h b/kernel/arch/sparc/include/uapi/asm/unistd.h
index ae77df75b..09acf0dde 100644
--- a/kernel/arch/sparc/include/uapi/asm/unistd.h
+++ b/kernel/arch/sparc/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * System calls under the Sparc.
  *
diff --git a/kernel/arch/sparc/include/uapi/asm/utrap.h b/kernel/arch/sparc/include/uapi/asm/utrap.h
index b10e527c2..d890b7fc6 100644
--- a/kernel/arch/sparc/include/uapi/asm/utrap.h
+++ b/kernel/arch/sparc/include/uapi/asm/utrap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm/utrap.h
  *
diff --git a/kernel/arch/sparc/include/uapi/asm/watchdog.h b/kernel/arch/sparc/include/uapi/asm/watchdog.h
index 5baf2d391..497ac19a9 100644
--- a/kernel/arch/sparc/include/uapi/asm/watchdog.h
+++ b/kernel/arch/sparc/include/uapi/asm/watchdog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
  * watchdog - Driver interface for the hardware watchdog timers
diff --git a/kernel/arch/sparc/kernel/Makefile b/kernel/arch/sparc/kernel/Makefile
index aac609889..8de961758 100644
--- a/kernel/arch/sparc/kernel/Makefile
+++ b/kernel/arch/sparc/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 #
 # Makefile for the linux kernel.
diff --git a/kernel/arch/sparc/kernel/apc.c b/kernel/arch/sparc/kernel/apc.c
index c988e7fa0..ecd05bc0a 100644
--- a/kernel/arch/sparc/kernel/apc.c
+++ b/kernel/arch/sparc/kernel/apc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* apc - Driver implementation for power management functions
  * of Aurora Personality Chip (APC) on SPARCstation-4/5 and
  * derivatives.
diff --git a/kernel/arch/sparc/kernel/asm-offsets.c b/kernel/arch/sparc/kernel/asm-offsets.c
index 3f09e1c83..5784f2df4 100644
--- a/kernel/arch/sparc/kernel/asm-offsets.c
+++ b/kernel/arch/sparc/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This program is used to generate definitions needed by
  * assembly language modules.
diff --git a/kernel/arch/sparc/kernel/audit.c b/kernel/arch/sparc/kernel/audit.c
index 2585c1e14..a6e91bf34 100644
--- a/kernel/arch/sparc/kernel/audit.c
+++ b/kernel/arch/sparc/kernel/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/arch/sparc/kernel/auxio_32.c b/kernel/arch/sparc/kernel/auxio_32.c
index ae88c223e..a32d58817 100644
--- a/kernel/arch/sparc/kernel/auxio_32.c
+++ b/kernel/arch/sparc/kernel/auxio_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* auxio.c: Probing for the Sparc AUXIO register at boot time.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/kernel/auxio_64.c b/kernel/arch/sparc/kernel/auxio_64.c
index 086435c17..4e8f56c37 100644
--- a/kernel/arch/sparc/kernel/auxio_64.c
+++ b/kernel/arch/sparc/kernel/auxio_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* auxio.c: Probing for the Sparc AUXIO register at boot time.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/kernel/btext.c b/kernel/arch/sparc/kernel/btext.c
index 987f7ec49..5869773f3 100644
--- a/kernel/arch/sparc/kernel/btext.c
+++ b/kernel/arch/sparc/kernel/btext.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Procedures for drawing on the screen early on in the boot process.
  *
diff --git a/kernel/arch/sparc/kernel/central.c b/kernel/arch/sparc/kernel/central.c
index 469695829..38ae4fdc9 100644
--- a/kernel/arch/sparc/kernel/central.c
+++ b/kernel/arch/sparc/kernel/central.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* central.c: Central FHC driver for Sunfire/Starfire/Wildfire.
  *
  * Copyright (C) 1997, 1999, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/cherrs.S b/kernel/arch/sparc/kernel/cherrs.S
index 655628def..7f3d3d264 100644
--- a/kernel/arch/sparc/kernel/cherrs.S
+++ b/kernel/arch/sparc/kernel/cherrs.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	/* These get patched into the trap table at boot time
 	 * once we know we have a cheetah processor.
 	 */
diff --git a/kernel/arch/sparc/kernel/compat_audit.c b/kernel/arch/sparc/kernel/compat_audit.c
index e5611cd42..10eeb4f15 100644
--- a/kernel/arch/sparc/kernel/compat_audit.c
+++ b/kernel/arch/sparc/kernel/compat_audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define __32bit_syscall_numbers__
 #include <asm/unistd.h>
 #include "kernel.h"
diff --git a/kernel/arch/sparc/kernel/cpu.c b/kernel/arch/sparc/kernel/cpu.c
index ef4f18f7a..4401dee30 100644
--- a/kernel/arch/sparc/kernel/cpu.c
+++ b/kernel/arch/sparc/kernel/cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* cpu.c: Dinky routines to look for the kind of Sparc cpu
  *        we are on.
  *
diff --git a/kernel/arch/sparc/kernel/cpumap.c b/kernel/arch/sparc/kernel/cpumap.c
index 90d550bbf..d1d528226 100644
--- a/kernel/arch/sparc/kernel/cpumap.c
+++ b/kernel/arch/sparc/kernel/cpumap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* cpumap.c: used for optimizing CPU assignment
  *
  * Copyright (C) 2009 Hong H. Pham <hong.pham@windriver.com>
diff --git a/kernel/arch/sparc/kernel/cpumap.h b/kernel/arch/sparc/kernel/cpumap.h
index 9dac398c4..7d5b77486 100644
--- a/kernel/arch/sparc/kernel/cpumap.h
+++ b/kernel/arch/sparc/kernel/cpumap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CPUMAP_H
 #define _CPUMAP_H
 
diff --git a/kernel/arch/sparc/kernel/devices.c b/kernel/arch/sparc/kernel/devices.c
index 8d5d09f09..23b6e50d4 100644
--- a/kernel/arch/sparc/kernel/devices.c
+++ b/kernel/arch/sparc/kernel/devices.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* devices.c: Initial scan of the prom device tree for important
  *	      Sparc device nodes which we need to find.
  *
diff --git a/kernel/arch/sparc/kernel/dma.c b/kernel/arch/sparc/kernel/dma.c
index b667aa6f2..f73e7597c 100644
--- a/kernel/arch/sparc/kernel/dma.c
+++ b/kernel/arch/sparc/kernel/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-debug.h>
diff --git a/kernel/arch/sparc/kernel/dtlb_miss.S b/kernel/arch/sparc/kernel/dtlb_miss.S
index 09a6a15a7..fb9c78843 100644
--- a/kernel/arch/sparc/kernel/dtlb_miss.S
+++ b/kernel/arch/sparc/kernel/dtlb_miss.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* DTLB ** ICACHE line 1: Context 0 check and TSB load	*/
 	ldxa	[%g0] ASI_DMMU_TSB_8KB_PTR, %g1	! Get TSB 8K pointer
 	ldxa	[%g0] ASI_DMMU, %g6		! Get TAG TARGET
diff --git a/kernel/arch/sparc/kernel/dtlb_prot.S b/kernel/arch/sparc/kernel/dtlb_prot.S
index 4087a62f9..9f945771b 100644
--- a/kernel/arch/sparc/kernel/dtlb_prot.S
+++ b/kernel/arch/sparc/kernel/dtlb_prot.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * dtlb_prot.S: DTLB protection trap strategy.
  *              This is included directly into the trap table.
diff --git a/kernel/arch/sparc/kernel/ebus.c b/kernel/arch/sparc/kernel/ebus.c
index acf8314ce..264b18647 100644
--- a/kernel/arch/sparc/kernel/ebus.c
+++ b/kernel/arch/sparc/kernel/ebus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ebus.c: EBUS DMA library code.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
diff --git a/kernel/arch/sparc/kernel/entry.S b/kernel/arch/sparc/kernel/entry.S
index d85bdb999..358fe4ef0 100644
--- a/kernel/arch/sparc/kernel/entry.S
+++ b/kernel/arch/sparc/kernel/entry.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* arch/sparc/kernel/entry.S:  Sparc trap low-level entry points.
  *
  * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/entry.h b/kernel/arch/sparc/kernel/entry.h
index 0f679421b..7378567b6 100644
--- a/kernel/arch/sparc/kernel/entry.h
+++ b/kernel/arch/sparc/kernel/entry.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ENTRY_H
 #define _ENTRY_H
 
diff --git a/kernel/arch/sparc/kernel/etrap_32.S b/kernel/arch/sparc/kernel/etrap_32.S
index e3e80d65e..9f243f918 100644
--- a/kernel/arch/sparc/kernel/etrap_32.S
+++ b/kernel/arch/sparc/kernel/etrap_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * etrap.S: Sparc trap window preparation for entry into the
  *          Linux kernel.
diff --git a/kernel/arch/sparc/kernel/etrap_64.S b/kernel/arch/sparc/kernel/etrap_64.S
index 5c237467d..5c77a2e0e 100644
--- a/kernel/arch/sparc/kernel/etrap_64.S
+++ b/kernel/arch/sparc/kernel/etrap_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * etrap.S: Preparing for entry into the kernel on Sparc V9.
  *
diff --git a/kernel/arch/sparc/kernel/fpu_traps.S b/kernel/arch/sparc/kernel/fpu_traps.S
index 336d2750f..051659e29 100644
--- a/kernel/arch/sparc/kernel/fpu_traps.S
+++ b/kernel/arch/sparc/kernel/fpu_traps.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	/* This is trivial with the new code... */
 	.globl		do_fpdis
 	.type		do_fpdis,#function
diff --git a/kernel/arch/sparc/kernel/ftrace.c b/kernel/arch/sparc/kernel/ftrace.c
index cec54dc4a..915dda4ae 100644
--- a/kernel/arch/sparc/kernel/ftrace.c
+++ b/kernel/arch/sparc/kernel/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/spinlock.h>
 #include <linux/hardirq.h>
 #include <linux/ftrace.h>
diff --git a/kernel/arch/sparc/kernel/getsetcc.S b/kernel/arch/sparc/kernel/getsetcc.S
index a14d272d2..181e09fd1 100644
--- a/kernel/arch/sparc/kernel/getsetcc.S
+++ b/kernel/arch/sparc/kernel/getsetcc.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.globl		getcc
 	.type		getcc,#function
 getcc:
diff --git a/kernel/arch/sparc/kernel/head_32.S b/kernel/arch/sparc/kernel/head_32.S
index 7274e43ff..e55f2c075 100644
--- a/kernel/arch/sparc/kernel/head_32.S
+++ b/kernel/arch/sparc/kernel/head_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * head.S: The initial boot code for the Sparc port of Linux.
  *
diff --git a/kernel/arch/sparc/kernel/head_64.S b/kernel/arch/sparc/kernel/head_64.S
index 4de9fbd1a..9e293de12 100644
--- a/kernel/arch/sparc/kernel/head_64.S
+++ b/kernel/arch/sparc/kernel/head_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* head.S: Initial boot code for the Sparc64 port of Linux.
  *
  * Copyright (C) 1996, 1997, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/hvapi.c b/kernel/arch/sparc/kernel/hvapi.c
index d41ce33d8..a2bc1b295 100644
--- a/kernel/arch/sparc/kernel/hvapi.c
+++ b/kernel/arch/sparc/kernel/hvapi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* hvapi.c: Hypervisor API management.
  *
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/hvcalls.S b/kernel/arch/sparc/kernel/hvcalls.S
index e57007ff7..bdfd3d8c6 100644
--- a/kernel/arch/sparc/kernel/hvcalls.S
+++ b/kernel/arch/sparc/kernel/hvcalls.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	/* %o0: devhandle
 	 * %o1:	devino
 	 *
diff --git a/kernel/arch/sparc/kernel/hvtramp.S b/kernel/arch/sparc/kernel/hvtramp.S
index cdbfec299..f39220471 100644
--- a/kernel/arch/sparc/kernel/hvtramp.S
+++ b/kernel/arch/sparc/kernel/hvtramp.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* hvtramp.S: Hypervisor start-cpu trampoline code.
  *
  * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/idprom.c b/kernel/arch/sparc/kernel/idprom.c
index f95dd11b7..d6c46d512 100644
--- a/kernel/arch/sparc/kernel/idprom.c
+++ b/kernel/arch/sparc/kernel/idprom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * idprom.c: Routines to load the idprom into kernel addresses and
  *           interpret the data contained within.
diff --git a/kernel/arch/sparc/kernel/iommu.c b/kernel/arch/sparc/kernel/iommu.c
index fcbcc031f..b08dc3416 100644
--- a/kernel/arch/sparc/kernel/iommu.c
+++ b/kernel/arch/sparc/kernel/iommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* iommu.c: Generic sparc64 IOMMU support.
  *
  * Copyright (C) 1999, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/iommu_common.h b/kernel/arch/sparc/kernel/iommu_common.h
index 5ea5c192b..e3c02ba32 100644
--- a/kernel/arch/sparc/kernel/iommu_common.h
+++ b/kernel/arch/sparc/kernel/iommu_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* iommu_common.h: UltraSparc SBUS/PCI common iommu declarations.
  *
  * Copyright (C) 1999, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/ioport.c b/kernel/arch/sparc/kernel/ioport.c
index 12894f259..7eeef80c0 100644
--- a/kernel/arch/sparc/kernel/ioport.c
+++ b/kernel/arch/sparc/kernel/ioport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ioport.c:  Simple io mapping allocator.
  *
diff --git a/kernel/arch/sparc/kernel/irq.h b/kernel/arch/sparc/kernel/irq.h
index 70a0b8ddd..b02026ad6 100644
--- a/kernel/arch/sparc/kernel/irq.h
+++ b/kernel/arch/sparc/kernel/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/platform_device.h>
 
 #include <asm/cpu_type.h>
diff --git a/kernel/arch/sparc/kernel/irq_32.c b/kernel/arch/sparc/kernel/irq_32.c
index cac4a5554..e8452be51 100644
--- a/kernel/arch/sparc/kernel/irq_32.c
+++ b/kernel/arch/sparc/kernel/irq_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Interrupt request handling routines. On the
  * Sparc the IRQs are basically 'cast in stone'
diff --git a/kernel/arch/sparc/kernel/irq_64.c b/kernel/arch/sparc/kernel/irq_64.c
index 99dd133a0..d66dde833 100644
--- a/kernel/arch/sparc/kernel/irq_64.c
+++ b/kernel/arch/sparc/kernel/irq_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* irq.c: UltraSparc IRQ handling/init/registry.
  *
  * Copyright (C) 1997, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/itlb_miss.S b/kernel/arch/sparc/kernel/itlb_miss.S
index 5a8377b54..5a5d92482 100644
--- a/kernel/arch/sparc/kernel/itlb_miss.S
+++ b/kernel/arch/sparc/kernel/itlb_miss.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ITLB ** ICACHE line 1: Context 0 check and TSB load	*/
 	ldxa	[%g0] ASI_IMMU_TSB_8KB_PTR, %g1	! Get TSB 8K pointer
 	ldxa	[%g0] ASI_IMMU, %g6		! Get TAG TARGET
diff --git a/kernel/arch/sparc/kernel/ivec.S b/kernel/arch/sparc/kernel/ivec.S
index d29f92ebc..94ba2c3a2 100644
--- a/kernel/arch/sparc/kernel/ivec.S
+++ b/kernel/arch/sparc/kernel/ivec.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	/* The registers for cross calls will be:
 	 *
 	 * DATA 0: [low 32-bits]  Address of function to call, jmp to this
diff --git a/kernel/arch/sparc/kernel/jump_label.c b/kernel/arch/sparc/kernel/jump_label.c
index 93adde1ac..7f8eac51d 100644
--- a/kernel/arch/sparc/kernel/jump_label.c
+++ b/kernel/arch/sparc/kernel/jump_label.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/mutex.h>
diff --git a/kernel/arch/sparc/kernel/kernel.h b/kernel/arch/sparc/kernel/kernel.h
index b625db4cf..ddffd368e 100644
--- a/kernel/arch/sparc/kernel/kernel.h
+++ b/kernel/arch/sparc/kernel/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPARC_KERNEL_H
 #define __SPARC_KERNEL_H
 
diff --git a/kernel/arch/sparc/kernel/kgdb_32.c b/kernel/arch/sparc/kernel/kgdb_32.c
index 6e8e318c5..5868fc333 100644
--- a/kernel/arch/sparc/kernel/kgdb_32.c
+++ b/kernel/arch/sparc/kernel/kgdb_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* kgdb.c: KGDB support for 32-bit sparc.
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/kgdb_64.c b/kernel/arch/sparc/kernel/kgdb_64.c
index cbf21d087..d5f7dc632 100644
--- a/kernel/arch/sparc/kernel/kgdb_64.c
+++ b/kernel/arch/sparc/kernel/kgdb_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* kgdb.c: KGDB support for 64-bit sparc.
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/kprobes.c b/kernel/arch/sparc/kernel/kprobes.c
index 2d13a4fc0..ab4ba4347 100644
--- a/kernel/arch/sparc/kernel/kprobes.c
+++ b/kernel/arch/sparc/kernel/kprobes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* arch/sparc64/kernel/kprobes.c
  *
  * Copyright (C) 2004 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/kstack.h b/kernel/arch/sparc/kernel/kstack.h
index 53dfb92e0..b3c5e8f24 100644
--- a/kernel/arch/sparc/kernel/kstack.h
+++ b/kernel/arch/sparc/kernel/kstack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KSTACK_H
 #define _KSTACK_H
 
diff --git a/kernel/arch/sparc/kernel/ktlb.S b/kernel/arch/sparc/kernel/ktlb.S
index f22bec0db..1cf91c05e 100644
--- a/kernel/arch/sparc/kernel/ktlb.S
+++ b/kernel/arch/sparc/kernel/ktlb.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* arch/sparc64/kernel/ktlb.S: Kernel mapping TLB miss handling.
  *
  * Copyright (C) 1995, 1997, 2005, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/ldc.c b/kernel/arch/sparc/kernel/ldc.c
index acffbc894..86b625f9d 100644
--- a/kernel/arch/sparc/kernel/ldc.c
+++ b/kernel/arch/sparc/kernel/ldc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ldc.c: Logical Domain Channel link-layer protocol driver.
  *
  * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/leon_kernel.c b/kernel/arch/sparc/kernel/leon_kernel.c
index afcdd5e4f..84b233752 100644
--- a/kernel/arch/sparc/kernel/leon_kernel.c
+++ b/kernel/arch/sparc/kernel/leon_kernel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2009 Daniel Hellstrom (daniel@gaisler.com) Aeroflex Gaisler AB
  * Copyright (C) 2009 Konrad Eisele (konrad@gaisler.com) Aeroflex Gaisler AB
diff --git a/kernel/arch/sparc/kernel/leon_pci.c b/kernel/arch/sparc/kernel/leon_pci.c
index 98c223eda..15b59169c 100644
--- a/kernel/arch/sparc/kernel/leon_pci.c
+++ b/kernel/arch/sparc/kernel/leon_pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * leon_pci.c: LEON Host PCI support
  *
diff --git a/kernel/arch/sparc/kernel/leon_pci_grpci1.c b/kernel/arch/sparc/kernel/leon_pci_grpci1.c
index 83ba5005d..e6935d0ac 100644
--- a/kernel/arch/sparc/kernel/leon_pci_grpci1.c
+++ b/kernel/arch/sparc/kernel/leon_pci_grpci1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * leon_pci_grpci1.c: GRPCI1 Host PCI driver
  *
diff --git a/kernel/arch/sparc/kernel/leon_pci_grpci2.c b/kernel/arch/sparc/kernel/leon_pci_grpci2.c
index ff0e5c903..ca22f93d9 100644
--- a/kernel/arch/sparc/kernel/leon_pci_grpci2.c
+++ b/kernel/arch/sparc/kernel/leon_pci_grpci2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * leon_pci_grpci2.c: GRPCI2 Host PCI driver
  *
diff --git a/kernel/arch/sparc/kernel/leon_pmc.c b/kernel/arch/sparc/kernel/leon_pmc.c
index ddcf95028..065e2d4b7 100644
--- a/kernel/arch/sparc/kernel/leon_pmc.c
+++ b/kernel/arch/sparc/kernel/leon_pmc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* leon_pmc.c: LEON Power-down cpu_idle() handler
  *
  * Copyright (C) 2011 Daniel Hellstrom (daniel@gaisler.com) Aeroflex Gaisler AB
diff --git a/kernel/arch/sparc/kernel/leon_smp.c b/kernel/arch/sparc/kernel/leon_smp.c
index db7acf27b..da6f14863 100644
--- a/kernel/arch/sparc/kernel/leon_smp.c
+++ b/kernel/arch/sparc/kernel/leon_smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* leon_smp.c: Sparc-Leon SMP support.
  *
  * based on sun4m_smp.c
diff --git a/kernel/arch/sparc/kernel/mdesc.c b/kernel/arch/sparc/kernel/mdesc.c
index fa466ce45..1ef6156b1 100644
--- a/kernel/arch/sparc/kernel/mdesc.c
+++ b/kernel/arch/sparc/kernel/mdesc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* mdesc.c: Sun4V machine description handling.
  *
  * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/misctrap.S b/kernel/arch/sparc/kernel/misctrap.S
index 9276d2f0d..b5c841775 100644
--- a/kernel/arch/sparc/kernel/misctrap.S
+++ b/kernel/arch/sparc/kernel/misctrap.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_KGDB
 	.globl		arch_kgdb_breakpoint
 	.type		arch_kgdb_breakpoint,#function
diff --git a/kernel/arch/sparc/kernel/module.c b/kernel/arch/sparc/kernel/module.c
index 192a617a3..df39580f3 100644
--- a/kernel/arch/sparc/kernel/module.c
+++ b/kernel/arch/sparc/kernel/module.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Kernel module help for sparc64.
  *
  * Copyright (C) 2001 Rusty Russell.
diff --git a/kernel/arch/sparc/kernel/of_device_32.c b/kernel/arch/sparc/kernel/of_device_32.c
index 185aa96fa..3641a294e 100644
--- a/kernel/arch/sparc/kernel/of_device_32.c
+++ b/kernel/arch/sparc/kernel/of_device_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
diff --git a/kernel/arch/sparc/kernel/of_device_64.c b/kernel/arch/sparc/kernel/of_device_64.c
index 7bbdc26d9..44e4d4435 100644
--- a/kernel/arch/sparc/kernel/of_device_64.c
+++ b/kernel/arch/sparc/kernel/of_device_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/of.h>
diff --git a/kernel/arch/sparc/kernel/of_device_common.h b/kernel/arch/sparc/kernel/of_device_common.h
index cdfd23992..3d66230c6 100644
--- a/kernel/arch/sparc/kernel/of_device_common.h
+++ b/kernel/arch/sparc/kernel/of_device_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OF_DEVICE_COMMON_H
 #define _OF_DEVICE_COMMON_H
 
diff --git a/kernel/arch/sparc/kernel/pci.c b/kernel/arch/sparc/kernel/pci.c
index 3f8670c92..220d0f365 100644
--- a/kernel/arch/sparc/kernel/pci.c
+++ b/kernel/arch/sparc/kernel/pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci.c: UltraSparc PCI controller support.
  *
  * Copyright (C) 1997, 1998, 1999 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/kernel/pci_common.c b/kernel/arch/sparc/kernel/pci_common.c
index 33524c1d5..1e10fb26f 100644
--- a/kernel/arch/sparc/kernel/pci_common.c
+++ b/kernel/arch/sparc/kernel/pci_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_common.c: PCI controller common support.
  *
  * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_fire.c b/kernel/arch/sparc/kernel/pci_fire.c
index 11a1f0d28..be71ae086 100644
--- a/kernel/arch/sparc/kernel/pci_fire.c
+++ b/kernel/arch/sparc/kernel/pci_fire.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_fire.c: Sun4u platform PCI-E controller support.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_impl.h b/kernel/arch/sparc/kernel/pci_impl.h
index 37222ca84..ac172961d 100644
--- a/kernel/arch/sparc/kernel/pci_impl.h
+++ b/kernel/arch/sparc/kernel/pci_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* pci_impl.h: Helper definitions for PCI controller support.
  *
  * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_msi.c b/kernel/arch/sparc/kernel/pci_msi.c
index 84e16d81a..1994d7638 100644
--- a/kernel/arch/sparc/kernel/pci_msi.c
+++ b/kernel/arch/sparc/kernel/pci_msi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_msi.c: Sparc64 MSI support common layer.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_psycho.c b/kernel/arch/sparc/kernel/pci_psycho.c
index 7dce27b3c..f413371da 100644
--- a/kernel/arch/sparc/kernel/pci_psycho.c
+++ b/kernel/arch/sparc/kernel/pci_psycho.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_psycho.c: PSYCHO/U2P specific PCI controller support.
  *
  * Copyright (C) 1997, 1998, 1999, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_sabre.c b/kernel/arch/sparc/kernel/pci_sabre.c
index 00a616ffa..8107286be 100644
--- a/kernel/arch/sparc/kernel/pci_sabre.c
+++ b/kernel/arch/sparc/kernel/pci_sabre.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_sabre.c: Sabre specific PCI controller support.
  *
  * Copyright (C) 1997, 1998, 1999, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_schizo.c b/kernel/arch/sparc/kernel/pci_schizo.c
index c664d3e3a..934b97c72 100644
--- a/kernel/arch/sparc/kernel/pci_schizo.c
+++ b/kernel/arch/sparc/kernel/pci_schizo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_schizo.c: SCHIZO/TOMATILLO specific PCI controller support.
  *
  * Copyright (C) 2001, 2002, 2003, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_sun4v.c b/kernel/arch/sparc/kernel/pci_sun4v.c
index 9ebebf1fd..249367228 100644
--- a/kernel/arch/sparc/kernel/pci_sun4v.c
+++ b/kernel/arch/sparc/kernel/pci_sun4v.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pci_sun4v.c: SUN4V specific PCI controller support.
  *
  * Copyright (C) 2006, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_sun4v.h b/kernel/arch/sparc/kernel/pci_sun4v.h
index 22603a4e4..d47263a99 100644
--- a/kernel/arch/sparc/kernel/pci_sun4v.h
+++ b/kernel/arch/sparc/kernel/pci_sun4v.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* pci_sun4v.h: SUN4V specific PCI controller support.
  *
  * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/pci_sun4v_asm.S b/kernel/arch/sparc/kernel/pci_sun4v_asm.S
index 578f09657..2b8051871 100644
--- a/kernel/arch/sparc/kernel/pci_sun4v_asm.S
+++ b/kernel/arch/sparc/kernel/pci_sun4v_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* pci_sun4v_asm: Hypervisor calls for PCI support.
  *
  * Copyright (C) 2006, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/pcic.c b/kernel/arch/sparc/kernel/pcic.c
index 4a133c052..22f877497 100644
--- a/kernel/arch/sparc/kernel/pcic.c
+++ b/kernel/arch/sparc/kernel/pcic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * pcic.c: MicroSPARC-IIep PCI controller support
  *
diff --git a/kernel/arch/sparc/kernel/perf_event.c b/kernel/arch/sparc/kernel/perf_event.c
index 710f3278d..5c1f54758 100644
--- a/kernel/arch/sparc/kernel/perf_event.c
+++ b/kernel/arch/sparc/kernel/perf_event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Performance event support for sparc64.
  *
  * Copyright (C) 2009, 2010 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/pmc.c b/kernel/arch/sparc/kernel/pmc.c
index 3b26cf62d..b5c1eb33b 100644
--- a/kernel/arch/sparc/kernel/pmc.c
+++ b/kernel/arch/sparc/kernel/pmc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* pmc - Driver implementation for power management functions
  * of Power Management Controller (PMC) on SPARCstation-Voyager.
  *
diff --git a/kernel/arch/sparc/kernel/power.c b/kernel/arch/sparc/kernel/power.c
index 4b60f385c..92627abce 100644
--- a/kernel/arch/sparc/kernel/power.c
+++ b/kernel/arch/sparc/kernel/power.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* power.c: Power management driver.
  *
  * Copyright (C) 1999, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/process_32.c b/kernel/arch/sparc/kernel/process_32.c
index 9245f9339..d9662cf7e 100644
--- a/kernel/arch/sparc/kernel/process_32.c
+++ b/kernel/arch/sparc/kernel/process_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*  linux/arch/sparc/kernel/process.c
  *
  *  Copyright (C) 1995, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/process_64.c b/kernel/arch/sparc/kernel/process_64.c
index 44e5da405..318efd784 100644
--- a/kernel/arch/sparc/kernel/process_64.c
+++ b/kernel/arch/sparc/kernel/process_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*  arch/sparc64/kernel/process.c
  *
  *  Copyright (C) 1995, 1996, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/prom.h b/kernel/arch/sparc/kernel/prom.h
index 890281b12..26a1cca7c 100644
--- a/kernel/arch/sparc/kernel/prom.h
+++ b/kernel/arch/sparc/kernel/prom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PROM_H
 #define __PROM_H
 
diff --git a/kernel/arch/sparc/kernel/prom_irqtrans.c b/kernel/arch/sparc/kernel/prom_irqtrans.c
index 40e4936bd..f3fecac7f 100644
--- a/kernel/arch/sparc/kernel/prom_irqtrans.c
+++ b/kernel/arch/sparc/kernel/prom_irqtrans.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/init.h>
diff --git a/kernel/arch/sparc/kernel/psycho_common.c b/kernel/arch/sparc/kernel/psycho_common.c
index 8db48e808..81aa91e5c 100644
--- a/kernel/arch/sparc/kernel/psycho_common.c
+++ b/kernel/arch/sparc/kernel/psycho_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* psycho_common.c: Code common to PSYCHO and derivative PCI controllers.
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/psycho_common.h b/kernel/arch/sparc/kernel/psycho_common.h
index 05a6e30a9..6925231c5 100644
--- a/kernel/arch/sparc/kernel/psycho_common.h
+++ b/kernel/arch/sparc/kernel/psycho_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PSYCHO_COMMON_H
 #define _PSYCHO_COMMON_H
 
diff --git a/kernel/arch/sparc/kernel/ptrace_32.c b/kernel/arch/sparc/kernel/ptrace_32.c
index eca3dc767..16b50afe7 100644
--- a/kernel/arch/sparc/kernel/ptrace_32.c
+++ b/kernel/arch/sparc/kernel/ptrace_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ptrace.c: Sparc process tracing support.
  *
  * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/reboot.c b/kernel/arch/sparc/kernel/reboot.c
index eba7d9181..7933ee365 100644
--- a/kernel/arch/sparc/kernel/reboot.c
+++ b/kernel/arch/sparc/kernel/reboot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* reboot.c: reboot/shutdown/halt/poweroff handling
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/rtrap_32.S b/kernel/arch/sparc/kernel/rtrap_32.S
index 6c34de0c2..dca8ed810 100644
--- a/kernel/arch/sparc/kernel/rtrap_32.S
+++ b/kernel/arch/sparc/kernel/rtrap_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * rtrap.S: Return from Sparc trap low-level code.
  *
diff --git a/kernel/arch/sparc/kernel/rtrap_64.S b/kernel/arch/sparc/kernel/rtrap_64.S
index dff86fad0..0b21042ab 100644
--- a/kernel/arch/sparc/kernel/rtrap_64.S
+++ b/kernel/arch/sparc/kernel/rtrap_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * rtrap.S: Preparing for return from trap on Sparc V9.
  *
diff --git a/kernel/arch/sparc/kernel/sbus.c b/kernel/arch/sparc/kernel/sbus.c
index be5bdf93c..c133dfc37 100644
--- a/kernel/arch/sparc/kernel/sbus.c
+++ b/kernel/arch/sparc/kernel/sbus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sbus.c: UltraSparc SBUS controller support.
  *
diff --git a/kernel/arch/sparc/kernel/setup_32.c b/kernel/arch/sparc/kernel/setup_32.c
index 6722308d1..2e3a3e203 100644
--- a/kernel/arch/sparc/kernel/setup_32.c
+++ b/kernel/arch/sparc/kernel/setup_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/sparc/kernel/setup.c
  *
diff --git a/kernel/arch/sparc/kernel/setup_64.c b/kernel/arch/sparc/kernel/setup_64.c
index db4c4d7e2..34f7a533a 100644
--- a/kernel/arch/sparc/kernel/setup_64.c
+++ b/kernel/arch/sparc/kernel/setup_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/sparc64/kernel/setup.c
  *
diff --git a/kernel/arch/sparc/kernel/signal32.c b/kernel/arch/sparc/kernel/signal32.c
index 0e4c08c45..5c572de64 100644
--- a/kernel/arch/sparc/kernel/signal32.c
+++ b/kernel/arch/sparc/kernel/signal32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*  arch/sparc64/kernel/signal32.c
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
diff --git a/kernel/arch/sparc/kernel/signal_32.c b/kernel/arch/sparc/kernel/signal_32.c
index 62c3e255a..5665261ce 100644
--- a/kernel/arch/sparc/kernel/signal_32.c
+++ b/kernel/arch/sparc/kernel/signal_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*  linux/arch/sparc/kernel/signal.c
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
diff --git a/kernel/arch/sparc/kernel/signal_64.c b/kernel/arch/sparc/kernel/signal_64.c
index 965d50e83..20426a1c2 100644
--- a/kernel/arch/sparc/kernel/signal_64.c
+++ b/kernel/arch/sparc/kernel/signal_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/sparc64/kernel/signal.c
  *
diff --git a/kernel/arch/sparc/kernel/sigutil.h b/kernel/arch/sparc/kernel/sigutil.h
index d223aa432..21d332d8b 100644
--- a/kernel/arch/sparc/kernel/sigutil.h
+++ b/kernel/arch/sparc/kernel/sigutil.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SIGUTIL_H
 #define _SIGUTIL_H
 
diff --git a/kernel/arch/sparc/kernel/sigutil_32.c b/kernel/arch/sparc/kernel/sigutil_32.c
index e5fe8cef9..1e9fae56a 100644
--- a/kernel/arch/sparc/kernel/sigutil_32.c
+++ b/kernel/arch/sparc/kernel/sigutil_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/thread_info.h>
diff --git a/kernel/arch/sparc/kernel/sigutil_64.c b/kernel/arch/sparc/kernel/sigutil_64.c
index 36aadcbea..512e4639e 100644
--- a/kernel/arch/sparc/kernel/sigutil_64.c
+++ b/kernel/arch/sparc/kernel/sigutil_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/thread_info.h>
diff --git a/kernel/arch/sparc/kernel/smp_32.c b/kernel/arch/sparc/kernel/smp_32.c
index e80e6ba3d..e078680a1 100644
--- a/kernel/arch/sparc/kernel/smp_32.c
+++ b/kernel/arch/sparc/kernel/smp_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* smp.c: Sparc SMP support.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/kernel/arch/sparc/kernel/smp_64.c b/kernel/arch/sparc/kernel/smp_64.c
index 489832997..c50182cd2 100644
--- a/kernel/arch/sparc/kernel/smp_64.c
+++ b/kernel/arch/sparc/kernel/smp_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* smp.c: Sparc64 SMP support.
  *
  * Copyright (C) 1997, 2007, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/spiterrs.S b/kernel/arch/sparc/kernel/spiterrs.S
index d7e540842..5427af440 100644
--- a/kernel/arch/sparc/kernel/spiterrs.S
+++ b/kernel/arch/sparc/kernel/spiterrs.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	/* We need to carefully read the error status, ACK the errors,
 	 * prevent recursive traps, and pass the information on to C
 	 * code for logging.
diff --git a/kernel/arch/sparc/kernel/sstate.c b/kernel/arch/sparc/kernel/sstate.c
index 3caed4023..ac8677c38 100644
--- a/kernel/arch/sparc/kernel/sstate.c
+++ b/kernel/arch/sparc/kernel/sstate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sstate.c: System soft state support.
  *
  * Copyright (C) 2007, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/starfire.c b/kernel/arch/sparc/kernel/starfire.c
index 167fdfd9c..b8cd57d91 100644
--- a/kernel/arch/sparc/kernel/starfire.c
+++ b/kernel/arch/sparc/kernel/starfire.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * starfire.c: Starfire/E10000 support.
  *
diff --git a/kernel/arch/sparc/kernel/sun4d_irq.c b/kernel/arch/sparc/kernel/sun4d_irq.c
index a87d0e47c..d869d409f 100644
--- a/kernel/arch/sparc/kernel/sun4d_irq.c
+++ b/kernel/arch/sparc/kernel/sun4d_irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SS1000/SC2000 interrupt handling.
  *
diff --git a/kernel/arch/sparc/kernel/sun4d_smp.c b/kernel/arch/sparc/kernel/sun4d_smp.c
index af93b50e3..ff30f03be 100644
--- a/kernel/arch/sparc/kernel/sun4d_smp.c
+++ b/kernel/arch/sparc/kernel/sun4d_smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Sparc SS1000/SC2000 SMP support.
  *
  * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/kernel/sun4m_irq.c b/kernel/arch/sparc/kernel/sun4m_irq.c
index aa84da0b2..c01767a04 100644
--- a/kernel/arch/sparc/kernel/sun4m_irq.c
+++ b/kernel/arch/sparc/kernel/sun4m_irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sun4m irq support
  *
diff --git a/kernel/arch/sparc/kernel/sun4m_smp.c b/kernel/arch/sparc/kernel/sun4m_smp.c
index 5547fcb1d..228a65270 100644
--- a/kernel/arch/sparc/kernel/sun4m_smp.c
+++ b/kernel/arch/sparc/kernel/sun4m_smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  sun4m SMP support.
  *
diff --git a/kernel/arch/sparc/kernel/sun4v_ivec.S b/kernel/arch/sparc/kernel/sun4v_ivec.S
index 346319958..6478ef4f6 100644
--- a/kernel/arch/sparc/kernel/sun4v_ivec.S
+++ b/kernel/arch/sparc/kernel/sun4v_ivec.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sun4v_ivec.S: Sun4v interrupt vector handling.
  *
  * Copyright (C) 2006 <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/sun4v_tlb_miss.S b/kernel/arch/sparc/kernel/sun4v_tlb_miss.S
index c19f352f4..7ac9f3367 100644
--- a/kernel/arch/sparc/kernel/sun4v_tlb_miss.S
+++ b/kernel/arch/sparc/kernel/sun4v_tlb_miss.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sun4v_tlb_miss.S: Sun4v TLB miss handlers.
  *
  * Copyright (C) 2006 <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/sys32.S b/kernel/arch/sparc/kernel/sys32.S
index f83422420..7e7011a1e 100644
--- a/kernel/arch/sparc/kernel/sys32.S
+++ b/kernel/arch/sparc/kernel/sys32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * sys32.S: I-cache tricks for 32-bit compatibility layer simple
  *          conversions.
diff --git a/kernel/arch/sparc/kernel/sys_sparc32.c b/kernel/arch/sparc/kernel/sys_sparc32.c
index bca44f3e6..b4e147841 100644
--- a/kernel/arch/sparc/kernel/sys_sparc32.c
+++ b/kernel/arch/sparc/kernel/sys_sparc32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sys_sparc32.c: Conversion between 32bit and 64bit native syscalls.
  *
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/kernel/sys_sparc_32.c b/kernel/arch/sparc/kernel/sys_sparc_32.c
index 7aecb2396..990703b7c 100644
--- a/kernel/arch/sparc/kernel/sys_sparc_32.c
+++ b/kernel/arch/sparc/kernel/sys_sparc_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* linux/arch/sparc/kernel/sys_sparc.c
  *
  * This file contains various random system calls that
diff --git a/kernel/arch/sparc/kernel/sys_sparc_64.c b/kernel/arch/sparc/kernel/sys_sparc_64.c
index 043544d0c..55416db48 100644
--- a/kernel/arch/sparc/kernel/sys_sparc_64.c
+++ b/kernel/arch/sparc/kernel/sys_sparc_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* linux/arch/sparc64/kernel/sys_sparc.c
  *
  * This file contains various random system calls that
diff --git a/kernel/arch/sparc/kernel/syscalls.S b/kernel/arch/sparc/kernel/syscalls.S
index c4a1b5c40..c5f9ec8c5 100644
--- a/kernel/arch/sparc/kernel/syscalls.S
+++ b/kernel/arch/sparc/kernel/syscalls.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	/* SunOS's execv() call only specifies the argv argument, the
 	 * environment settings are the same as the calling processes.
 	 */
diff --git a/kernel/arch/sparc/kernel/sysfs.c b/kernel/arch/sparc/kernel/sysfs.c
index 5fd352b75..6d60d416f 100644
--- a/kernel/arch/sparc/kernel/sysfs.c
+++ b/kernel/arch/sparc/kernel/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sysfs.c: Topology sysfs support code for sparc64.
  *
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/systbls.h b/kernel/arch/sparc/kernel/systbls.h
index 2dab8236d..5a01cfe19 100644
--- a/kernel/arch/sparc/kernel/systbls.h
+++ b/kernel/arch/sparc/kernel/systbls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SYSTBLS_H
 #define _SYSTBLS_H
 
diff --git a/kernel/arch/sparc/kernel/systbls_32.S b/kernel/arch/sparc/kernel/systbls_32.S
index 5253e895b..731b25d57 100644
--- a/kernel/arch/sparc/kernel/systbls_32.S
+++ b/kernel/arch/sparc/kernel/systbls_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* systbls.S: System call entry point tables for OS compatibility.
  *            The native Linux system call table lives here also.
  *
diff --git a/kernel/arch/sparc/kernel/systbls_64.S b/kernel/arch/sparc/kernel/systbls_64.S
index 82339f6be..293c1cb31 100644
--- a/kernel/arch/sparc/kernel/systbls_64.S
+++ b/kernel/arch/sparc/kernel/systbls_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* systbls.S: System call entry point tables for OS compatibility.
  *            The native Linux system call table lives here also.
  *
diff --git a/kernel/arch/sparc/kernel/time_32.c b/kernel/arch/sparc/kernel/time_32.c
index 2ce2e7b2a..8a08830e4 100644
--- a/kernel/arch/sparc/kernel/time_32.c
+++ b/kernel/arch/sparc/kernel/time_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* linux/arch/sparc/kernel/time.c
  *
  * Copyright (C) 1995 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/time_64.c b/kernel/arch/sparc/kernel/time_64.c
index 564f0e46f..3b3970810 100644
--- a/kernel/arch/sparc/kernel/time_64.c
+++ b/kernel/arch/sparc/kernel/time_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* time.c: UltraSparc timer and TOD clock support.
  *
  * Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/trampoline_32.S b/kernel/arch/sparc/kernel/trampoline_32.S
index 3eed99fc6..82fafeeb3 100644
--- a/kernel/arch/sparc/kernel/trampoline_32.S
+++ b/kernel/arch/sparc/kernel/trampoline_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * trampoline.S: SMP cpu boot-up trampoline code.
  *
diff --git a/kernel/arch/sparc/kernel/trampoline_64.S b/kernel/arch/sparc/kernel/trampoline_64.S
index 88ede1d53..fe59122d2 100644
--- a/kernel/arch/sparc/kernel/trampoline_64.S
+++ b/kernel/arch/sparc/kernel/trampoline_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * trampoline.S: Jump start slave processors on sparc64.
  *
diff --git a/kernel/arch/sparc/kernel/traps_32.c b/kernel/arch/sparc/kernel/traps_32.c
index 581cf35ee..b1ed763e4 100644
--- a/kernel/arch/sparc/kernel/traps_32.c
+++ b/kernel/arch/sparc/kernel/traps_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sparc/kernel/traps.c
  *
diff --git a/kernel/arch/sparc/kernel/tsb.S b/kernel/arch/sparc/kernel/tsb.S
index f74115364..eaed39ce8 100644
--- a/kernel/arch/sparc/kernel/tsb.S
+++ b/kernel/arch/sparc/kernel/tsb.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* tsb.S: Sparc64 TSB table handling.
  *
  * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/ttable_32.S b/kernel/arch/sparc/kernel/ttable_32.S
index 8a7a96ca6..e79fd786f 100644
--- a/kernel/arch/sparc/kernel/ttable_32.S
+++ b/kernel/arch/sparc/kernel/ttable_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* The Sparc trap table, bootloader gives us control at _start. */
         __HEAD
 
diff --git a/kernel/arch/sparc/kernel/ttable_64.S b/kernel/arch/sparc/kernel/ttable_64.S
index efe93ab4a..18685fe69 100644
--- a/kernel/arch/sparc/kernel/ttable_64.S
+++ b/kernel/arch/sparc/kernel/ttable_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ttable.S: Sparc V9 Trap Table(s) with SpitFire/Cheetah/SUN4V extensions.
  *
  * Copyright (C) 1996, 2001, 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/una_asm_32.S b/kernel/arch/sparc/kernel/una_asm_32.S
index 8f096e84a..f8bf83928 100644
--- a/kernel/arch/sparc/kernel/una_asm_32.S
+++ b/kernel/arch/sparc/kernel/una_asm_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* una_asm.S: Kernel unaligned trap assembler helpers.
  *
  * Copyright (C) 1996,2005,2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/una_asm_64.S b/kernel/arch/sparc/kernel/una_asm_64.S
index 1c8d33228..e256f395e 100644
--- a/kernel/arch/sparc/kernel/una_asm_64.S
+++ b/kernel/arch/sparc/kernel/una_asm_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* una_asm.S: Kernel unaligned trap assembler helpers.
  *
  * Copyright (C) 1996,2005 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/unaligned_32.c b/kernel/arch/sparc/kernel/unaligned_32.c
index 8367dce5f..7642d7e4f 100644
--- a/kernel/arch/sparc/kernel/unaligned_32.c
+++ b/kernel/arch/sparc/kernel/unaligned_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * unaligned.c: Unaligned load/store trap handling with special
  *              cases for the kernel to do them more quickly.
diff --git a/kernel/arch/sparc/kernel/unaligned_64.c b/kernel/arch/sparc/kernel/unaligned_64.c
index cda7fd367..23db2efda 100644
--- a/kernel/arch/sparc/kernel/unaligned_64.c
+++ b/kernel/arch/sparc/kernel/unaligned_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * unaligned.c: Unaligned load/store trap handling with special
  *              cases for the kernel to do them more quickly.
diff --git a/kernel/arch/sparc/kernel/urtt_fill.S b/kernel/arch/sparc/kernel/urtt_fill.S
index 364af3250..44183aa59 100644
--- a/kernel/arch/sparc/kernel/urtt_fill.S
+++ b/kernel/arch/sparc/kernel/urtt_fill.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/thread_info.h>
 #include <asm/trap_block.h>
 #include <asm/spitfire.h>
diff --git a/kernel/arch/sparc/kernel/utrap.S b/kernel/arch/sparc/kernel/utrap.S
index c731e8023..7a2d9a9be 100644
--- a/kernel/arch/sparc/kernel/utrap.S
+++ b/kernel/arch/sparc/kernel/utrap.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.globl		utrap_trap
 	.type		utrap_trap,#function
 utrap_trap:		/* %g3=handler,%g4=level */
diff --git a/kernel/arch/sparc/kernel/vio.c b/kernel/arch/sparc/kernel/vio.c
index da1ac3f22..1a0fa10cb 100644
--- a/kernel/arch/sparc/kernel/vio.c
+++ b/kernel/arch/sparc/kernel/vio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* vio.c: Virtual I/O channel devices probing infrastructure.
  *
  *    Copyright (c) 2003-2005 IBM Corp.
diff --git a/kernel/arch/sparc/kernel/viohs.c b/kernel/arch/sparc/kernel/viohs.c
index dcd278f29..c858f5f3c 100644
--- a/kernel/arch/sparc/kernel/viohs.c
+++ b/kernel/arch/sparc/kernel/viohs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* viohs.c: LDOM Virtual I/O handshake helper layer.
  *
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/kernel/visemul.c b/kernel/arch/sparc/kernel/visemul.c
index 8f35eea21..64ed80ed6 100644
--- a/kernel/arch/sparc/kernel/visemul.c
+++ b/kernel/arch/sparc/kernel/visemul.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* visemul.c: Emulation of VIS instructions.
  *
  * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/vmlinux.lds.S b/kernel/arch/sparc/kernel/vmlinux.lds.S
index d78847d56..5a2344574 100644
--- a/kernel/arch/sparc/kernel/vmlinux.lds.S
+++ b/kernel/arch/sparc/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ld script for sparc32/sparc64 kernel */
 
 #include <asm-generic/vmlinux.lds.h>
diff --git a/kernel/arch/sparc/kernel/windows.c b/kernel/arch/sparc/kernel/windows.c
index 435a467b0..69a6ba6e9 100644
--- a/kernel/arch/sparc/kernel/windows.c
+++ b/kernel/arch/sparc/kernel/windows.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* windows.c: Routines to deal with register window management
  *            at the C-code level.
  *
diff --git a/kernel/arch/sparc/kernel/winfixup.S b/kernel/arch/sparc/kernel/winfixup.S
index 1ee173cc3..448accee0 100644
--- a/kernel/arch/sparc/kernel/winfixup.S
+++ b/kernel/arch/sparc/kernel/winfixup.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* winfixup.S: Handle cases where user stack pointer is found to be bogus.
  *
  * Copyright (C) 1997, 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/kernel/wof.S b/kernel/arch/sparc/kernel/wof.S
index 28a7bc69f..96a3a1124 100644
--- a/kernel/arch/sparc/kernel/wof.S
+++ b/kernel/arch/sparc/kernel/wof.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * wof.S: Sparc window overflow handler.
  *
diff --git a/kernel/arch/sparc/kernel/wuf.S b/kernel/arch/sparc/kernel/wuf.S
index 2c21cc596..1a4ca490e 100644
--- a/kernel/arch/sparc/kernel/wuf.S
+++ b/kernel/arch/sparc/kernel/wuf.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * wuf.S: Window underflow trap handler for the Sparc.
  *
diff --git a/kernel/arch/sparc/lib/GENbzero.S b/kernel/arch/sparc/lib/GENbzero.S
index 2fbf6297d..63d618857 100644
--- a/kernel/arch/sparc/lib/GENbzero.S
+++ b/kernel/arch/sparc/lib/GENbzero.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* GENbzero.S: Generic sparc64 memset/clear_user.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/GENcopy_from_user.S b/kernel/arch/sparc/lib/GENcopy_from_user.S
index 8aa16ef11..6891a5678 100644
--- a/kernel/arch/sparc/lib/GENcopy_from_user.S
+++ b/kernel/arch/sparc/lib/GENcopy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* GENcopy_from_user.S: Generic sparc64 copy from userspace.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/GENcopy_to_user.S b/kernel/arch/sparc/lib/GENcopy_to_user.S
index 311c8fa5e..df75b532a 100644
--- a/kernel/arch/sparc/lib/GENcopy_to_user.S
+++ b/kernel/arch/sparc/lib/GENcopy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* GENcopy_to_user.S: Generic sparc64 copy to userspace.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/GENmemcpy.S b/kernel/arch/sparc/lib/GENmemcpy.S
index 059ea24ad..114340a0d 100644
--- a/kernel/arch/sparc/lib/GENmemcpy.S
+++ b/kernel/arch/sparc/lib/GENmemcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* GENmemcpy.S: Generic sparc64 memcpy.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/GENpage.S b/kernel/arch/sparc/lib/GENpage.S
index 2ef9d05f2..c143c4d1d 100644
--- a/kernel/arch/sparc/lib/GENpage.S
+++ b/kernel/arch/sparc/lib/GENpage.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* GENpage.S: Generic clear and copy page.
  *
  * Copyright (C) 2007 (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/GENpatch.S b/kernel/arch/sparc/lib/GENpatch.S
index 95e2f1f9e..1ec1f02c8 100644
--- a/kernel/arch/sparc/lib/GENpatch.S
+++ b/kernel/arch/sparc/lib/GENpatch.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* GENpatch.S: Patch Ultra-I routines with generic variant.
  *
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/lib/Makefile b/kernel/arch/sparc/lib/Makefile
index a1a2d39ec..44829a8dc 100644
--- a/kernel/arch/sparc/lib/Makefile
+++ b/kernel/arch/sparc/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for Sparc library files..
 #
 
diff --git a/kernel/arch/sparc/lib/NG2copy_from_user.S b/kernel/arch/sparc/lib/NG2copy_from_user.S
index 0d8a01811..e57bc514f 100644
--- a/kernel/arch/sparc/lib/NG2copy_from_user.S
+++ b/kernel/arch/sparc/lib/NG2copy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG2copy_from_user.S: Niagara-2 optimized copy from userspace.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG2copy_to_user.S b/kernel/arch/sparc/lib/NG2copy_to_user.S
index a7a0ea0d8..367c0bf01 100644
--- a/kernel/arch/sparc/lib/NG2copy_to_user.S
+++ b/kernel/arch/sparc/lib/NG2copy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG2copy_to_user.S: Niagara-2 optimized copy to userspace.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG2memcpy.S b/kernel/arch/sparc/lib/NG2memcpy.S
index 64dcd6cdb..bcb21b3a8 100644
--- a/kernel/arch/sparc/lib/NG2memcpy.S
+++ b/kernel/arch/sparc/lib/NG2memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG2memcpy.S: Niagara-2 optimized memcpy.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG2patch.S b/kernel/arch/sparc/lib/NG2patch.S
index 56ccc19ad..72431b244 100644
--- a/kernel/arch/sparc/lib/NG2patch.S
+++ b/kernel/arch/sparc/lib/NG2patch.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG2patch.S: Patch Ultra-I routines with Niagara-2 variant.
  *
  * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/lib/NG4clear_page.S b/kernel/arch/sparc/lib/NG4clear_page.S
index e16c88204..97e2678d0 100644
--- a/kernel/arch/sparc/lib/NG4clear_page.S
+++ b/kernel/arch/sparc/lib/NG4clear_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4copy_page.S: Niagara-4 optimized clear page.
  *
  * Copyright (C) 2012 (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG4copy_from_user.S b/kernel/arch/sparc/lib/NG4copy_from_user.S
index 5bb506bd6..0cac15a6d 100644
--- a/kernel/arch/sparc/lib/NG4copy_from_user.S
+++ b/kernel/arch/sparc/lib/NG4copy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4copy_from_user.S: Niagara-4 optimized copy from userspace.
  *
  * Copyright (C) 2012 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG4copy_page.S b/kernel/arch/sparc/lib/NG4copy_page.S
index 28504e88c..581062f8b 100644
--- a/kernel/arch/sparc/lib/NG4copy_page.S
+++ b/kernel/arch/sparc/lib/NG4copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4copy_page.S: Niagara-4 optimized copy page.
  *
  * Copyright (C) 2012 (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG4copy_to_user.S b/kernel/arch/sparc/lib/NG4copy_to_user.S
index a82d4d45f..c5c9abb3c 100644
--- a/kernel/arch/sparc/lib/NG4copy_to_user.S
+++ b/kernel/arch/sparc/lib/NG4copy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4copy_to_user.S: Niagara-4 optimized copy to userspace.
  *
  * Copyright (C) 2012 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG4memcpy.S b/kernel/arch/sparc/lib/NG4memcpy.S
index b5dacd1d2..7ad58ebe0 100644
--- a/kernel/arch/sparc/lib/NG4memcpy.S
+++ b/kernel/arch/sparc/lib/NG4memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4memcpy.S: Niagara-4 optimized memcpy.
  *
  * Copyright (C) 2012 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG4memset.S b/kernel/arch/sparc/lib/NG4memset.S
index 7c0c81f18..f81ee5419 100644
--- a/kernel/arch/sparc/lib/NG4memset.S
+++ b/kernel/arch/sparc/lib/NG4memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4memset.S: Niagara-4 optimized memset/bzero.
  *
  * Copyright (C) 2012 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NG4patch.S b/kernel/arch/sparc/lib/NG4patch.S
index 3cc0f8cc9..aa58ab39f 100644
--- a/kernel/arch/sparc/lib/NG4patch.S
+++ b/kernel/arch/sparc/lib/NG4patch.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NG4patch.S: Patch Ultra-I routines with Niagara-4 variant.
  *
  * Copyright (C) 2012 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/lib/NGbzero.S b/kernel/arch/sparc/lib/NGbzero.S
index 33053bdf3..19327614d 100644
--- a/kernel/arch/sparc/lib/NGbzero.S
+++ b/kernel/arch/sparc/lib/NGbzero.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NGbzero.S: Niagara optimized memset/clear_user.
  *
  * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NGcopy_from_user.S b/kernel/arch/sparc/lib/NGcopy_from_user.S
index 2333b6f3e..9abc49fcd 100644
--- a/kernel/arch/sparc/lib/NGcopy_from_user.S
+++ b/kernel/arch/sparc/lib/NGcopy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NGcopy_from_user.S: Niagara optimized copy from userspace.
  *
  * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NGcopy_to_user.S b/kernel/arch/sparc/lib/NGcopy_to_user.S
index 07ba20bc4..9cbe2f18e 100644
--- a/kernel/arch/sparc/lib/NGcopy_to_user.S
+++ b/kernel/arch/sparc/lib/NGcopy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NGcopy_to_user.S: Niagara optimized copy to userspace.
  *
  * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NGmemcpy.S b/kernel/arch/sparc/lib/NGmemcpy.S
index cd654a719..8e4d22a6b 100644
--- a/kernel/arch/sparc/lib/NGmemcpy.S
+++ b/kernel/arch/sparc/lib/NGmemcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NGmemcpy.S: Niagara optimized memcpy.
  *
  * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NGpage.S b/kernel/arch/sparc/lib/NGpage.S
index 423d46e22..88fec7818 100644
--- a/kernel/arch/sparc/lib/NGpage.S
+++ b/kernel/arch/sparc/lib/NGpage.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NGpage.S: Niagara optimize clear and copy page.
  *
  * Copyright (C) 2006 (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/NGpatch.S b/kernel/arch/sparc/lib/NGpatch.S
index 62ccda7e7..e9f843f10 100644
--- a/kernel/arch/sparc/lib/NGpatch.S
+++ b/kernel/arch/sparc/lib/NGpatch.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* NGpatch.S: Patch Ultra-I routines with Niagara variant.
  *
  * Copyright (C) 2006 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/lib/PeeCeeI.c b/kernel/arch/sparc/lib/PeeCeeI.c
index e6d183675..cde4c9a51 100644
--- a/kernel/arch/sparc/lib/PeeCeeI.c
+++ b/kernel/arch/sparc/lib/PeeCeeI.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PeeCeeI.c: The emerging standard...
  *
diff --git a/kernel/arch/sparc/lib/U1copy_from_user.S b/kernel/arch/sparc/lib/U1copy_from_user.S
index 9a6e68a9b..bf08d1c78 100644
--- a/kernel/arch/sparc/lib/U1copy_from_user.S
+++ b/kernel/arch/sparc/lib/U1copy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U1copy_from_user.S: UltraSparc-I/II/IIi/IIe optimized copy from userspace.
  *
  * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/U1copy_to_user.S b/kernel/arch/sparc/lib/U1copy_to_user.S
index d7b28491e..15169851e 100644
--- a/kernel/arch/sparc/lib/U1copy_to_user.S
+++ b/kernel/arch/sparc/lib/U1copy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U1copy_to_user.S: UltraSparc-I/II/IIi/IIe optimized copy to userspace.
  *
  * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/U1memcpy.S b/kernel/arch/sparc/lib/U1memcpy.S
index 4f0d50b33..a6f4ee391 100644
--- a/kernel/arch/sparc/lib/U1memcpy.S
+++ b/kernel/arch/sparc/lib/U1memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U1memcpy.S: UltraSPARC-I/II/IIi/IIe optimized memcpy.
  *
  * Copyright (C) 1997, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/U3copy_from_user.S b/kernel/arch/sparc/lib/U3copy_from_user.S
index db73010a1..9c891e9ed 100644
--- a/kernel/arch/sparc/lib/U3copy_from_user.S
+++ b/kernel/arch/sparc/lib/U3copy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U3copy_from_user.S: UltraSparc-III optimized copy from userspace.
  *
  * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/U3copy_to_user.S b/kernel/arch/sparc/lib/U3copy_to_user.S
index f48fb87fe..da4246082 100644
--- a/kernel/arch/sparc/lib/U3copy_to_user.S
+++ b/kernel/arch/sparc/lib/U3copy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U3copy_to_user.S: UltraSparc-III optimized copy to userspace.
  *
  * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/U3memcpy.S b/kernel/arch/sparc/lib/U3memcpy.S
index f9b42b3c6..9248d59c7 100644
--- a/kernel/arch/sparc/lib/U3memcpy.S
+++ b/kernel/arch/sparc/lib/U3memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U3memcpy.S: UltraSparc-III optimized memcpy.
  *
  * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/U3patch.S b/kernel/arch/sparc/lib/U3patch.S
index 91cd6539b..9a888088f 100644
--- a/kernel/arch/sparc/lib/U3patch.S
+++ b/kernel/arch/sparc/lib/U3patch.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* U3patch.S: Patch Ultra-I routines with Ultra-III variant.
  *
  * Copyright (C) 2004 David S. Miller <davem@redhat.com>
diff --git a/kernel/arch/sparc/lib/VISsave.S b/kernel/arch/sparc/lib/VISsave.S
index 1c7b6a39b..9c8eb2017 100644
--- a/kernel/arch/sparc/lib/VISsave.S
+++ b/kernel/arch/sparc/lib/VISsave.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * VISsave.S: Code for saving FPU register state for
  *            VIS routines. One should not call this directly,
diff --git a/kernel/arch/sparc/lib/ashldi3.S b/kernel/arch/sparc/lib/ashldi3.S
index c8b1cf71b..2d72de88a 100644
--- a/kernel/arch/sparc/lib/ashldi3.S
+++ b/kernel/arch/sparc/lib/ashldi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ashldi3.S:	GCC emits these for certain drivers playing
  *		with long longs.
diff --git a/kernel/arch/sparc/lib/ashrdi3.S b/kernel/arch/sparc/lib/ashrdi3.S
index 4310256e7..05dfda9f5 100644
--- a/kernel/arch/sparc/lib/ashrdi3.S
+++ b/kernel/arch/sparc/lib/ashrdi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ashrdi3.S:	The filesystem code creates all kinds of references to
  *              this little routine on the sparc with gcc.
diff --git a/kernel/arch/sparc/lib/atomic32.c b/kernel/arch/sparc/lib/atomic32.c
index 2c373329d..5010df497 100644
--- a/kernel/arch/sparc/lib/atomic32.c
+++ b/kernel/arch/sparc/lib/atomic32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * atomic32.c: 32-bit atomic_t implementation
  *
diff --git a/kernel/arch/sparc/lib/atomic_64.S b/kernel/arch/sparc/lib/atomic_64.S
index ce17c3094..456b65a30 100644
--- a/kernel/arch/sparc/lib/atomic_64.S
+++ b/kernel/arch/sparc/lib/atomic_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* atomic.S: These things are too big to do inline.
  *
  * Copyright (C) 1999, 2007 2012 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/bitext.c b/kernel/arch/sparc/lib/bitext.c
index 8ec4e9c02..32a5c1d94 100644
--- a/kernel/arch/sparc/lib/bitext.c
+++ b/kernel/arch/sparc/lib/bitext.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bitext.c: kernel little helper (of bit shuffling variety).
  *
diff --git a/kernel/arch/sparc/lib/bitops.S b/kernel/arch/sparc/lib/bitops.S
index 7031bf158..9d647f977 100644
--- a/kernel/arch/sparc/lib/bitops.S
+++ b/kernel/arch/sparc/lib/bitops.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* bitops.S: Sparc64 atomic bit operations.
  *
  * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/blockops.S b/kernel/arch/sparc/lib/blockops.S
index 1f2692d59..76ddd1ff6 100644
--- a/kernel/arch/sparc/lib/blockops.S
+++ b/kernel/arch/sparc/lib/blockops.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * blockops.S: Common block zero optimized routines.
  *
diff --git a/kernel/arch/sparc/lib/bzero.S b/kernel/arch/sparc/lib/bzero.S
index 3bb1914c4..87fec4cbe 100644
--- a/kernel/arch/sparc/lib/bzero.S
+++ b/kernel/arch/sparc/lib/bzero.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* bzero.S: Simple prefetching memset, bzero, and clear_user
  *          implementations.
  *
diff --git a/kernel/arch/sparc/lib/checksum_32.S b/kernel/arch/sparc/lib/checksum_32.S
index c9d8b6232..6a5469c97 100644
--- a/kernel/arch/sparc/lib/checksum_32.S
+++ b/kernel/arch/sparc/lib/checksum_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* checksum.S: Sparc optimized checksum code.
  *
  *  Copyright(C) 1995 Linus Torvalds
diff --git a/kernel/arch/sparc/lib/checksum_64.S b/kernel/arch/sparc/lib/checksum_64.S
index 6cfa521f4..9700ef173 100644
--- a/kernel/arch/sparc/lib/checksum_64.S
+++ b/kernel/arch/sparc/lib/checksum_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* checksum.S: Sparc V9 optimized checksum code.
  *
  *  Copyright(C) 1995 Linus Torvalds
diff --git a/kernel/arch/sparc/lib/clear_page.S b/kernel/arch/sparc/lib/clear_page.S
index f30d6b78a..8a6c783a6 100644
--- a/kernel/arch/sparc/lib/clear_page.S
+++ b/kernel/arch/sparc/lib/clear_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* clear_page.S: UltraSparc optimized clear page.
  *
  * Copyright (C) 1996, 1998, 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/cmpdi2.c b/kernel/arch/sparc/lib/cmpdi2.c
index 8c1306437..333367fe7 100644
--- a/kernel/arch/sparc/lib/cmpdi2.c
+++ b/kernel/arch/sparc/lib/cmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 
 #include "libgcc.h"
diff --git a/kernel/arch/sparc/lib/copy_in_user.S b/kernel/arch/sparc/lib/copy_in_user.S
index 1b73bb80a..66e90bf52 100644
--- a/kernel/arch/sparc/lib/copy_in_user.S
+++ b/kernel/arch/sparc/lib/copy_in_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* copy_in_user.S: Copy from userspace to userspace.
  *
  * Copyright (C) 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/copy_page.S b/kernel/arch/sparc/lib/copy_page.S
index 7197b7250..c088e871e 100644
--- a/kernel/arch/sparc/lib/copy_page.S
+++ b/kernel/arch/sparc/lib/copy_page.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* clear_page.S: UltraSparc optimized copy page.
  *
  * Copyright (C) 1996, 1998, 1999, 2000, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/copy_user.S b/kernel/arch/sparc/lib/copy_user.S
index bc243ee80..dc72f2b97 100644
--- a/kernel/arch/sparc/lib/copy_user.S
+++ b/kernel/arch/sparc/lib/copy_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* copy_user.S: Sparc optimized copy_from_user and copy_to_user code.
  *
  *  Copyright(C) 1995 Linus Torvalds
diff --git a/kernel/arch/sparc/lib/csum_copy.S b/kernel/arch/sparc/lib/csum_copy.S
index b1051e77c..26c644ba3 100644
--- a/kernel/arch/sparc/lib/csum_copy.S
+++ b/kernel/arch/sparc/lib/csum_copy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* csum_copy.S: Checksum+copy code for sparc64
  *
  * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/lib/csum_copy_from_user.S b/kernel/arch/sparc/lib/csum_copy_from_user.S
index e0304e6a2..d20b9594f 100644
--- a/kernel/arch/sparc/lib/csum_copy_from_user.S
+++ b/kernel/arch/sparc/lib/csum_copy_from_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* csum_copy_from_user.S: Checksum+copy from userspace.
  *
  * Copyright (C) 2005 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/csum_copy_to_user.S b/kernel/arch/sparc/lib/csum_copy_to_user.S
index afd01acc5..d71c0c81e 100644
--- a/kernel/arch/sparc/lib/csum_copy_to_user.S
+++ b/kernel/arch/sparc/lib/csum_copy_to_user.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* csum_copy_to_user.S: Checksum+copy to userspace.
  *
  * Copyright (C) 2005 David S. Miller (davem@davemloft.net)
diff --git a/kernel/arch/sparc/lib/ffs.S b/kernel/arch/sparc/lib/ffs.S
index 23aab144d..5a11d864f 100644
--- a/kernel/arch/sparc/lib/ffs.S
+++ b/kernel/arch/sparc/lib/ffs.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/export.h>
 
diff --git a/kernel/arch/sparc/lib/hweight.S b/kernel/arch/sparc/lib/hweight.S
index d21cf20e5..e5547b22c 100644
--- a/kernel/arch/sparc/lib/hweight.S
+++ b/kernel/arch/sparc/lib/hweight.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/export.h>
 
diff --git a/kernel/arch/sparc/lib/iomap.c b/kernel/arch/sparc/lib/iomap.c
index c4d42a50e..c9da9f139 100644
--- a/kernel/arch/sparc/lib/iomap.c
+++ b/kernel/arch/sparc/lib/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement the sparc iomap interfaces
  */
diff --git a/kernel/arch/sparc/lib/ipcsum.S b/kernel/arch/sparc/lib/ipcsum.S
index 5d61648b5..531d89c9d 100644
--- a/kernel/arch/sparc/lib/ipcsum.S
+++ b/kernel/arch/sparc/lib/ipcsum.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/export.h>
 
diff --git a/kernel/arch/sparc/lib/libgcc.h b/kernel/arch/sparc/lib/libgcc.h
index b84fd797f..79845c941 100644
--- a/kernel/arch/sparc/lib/libgcc.h
+++ b/kernel/arch/sparc/lib/libgcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_LIBGCC_H
 #define __ASM_LIBGCC_H
 
diff --git a/kernel/arch/sparc/lib/locks.S b/kernel/arch/sparc/lib/locks.S
index f38c4e59d..9a1289a3f 100644
--- a/kernel/arch/sparc/lib/locks.S
+++ b/kernel/arch/sparc/lib/locks.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * locks.S: SMP low-level lock primitives on Sparc.
  *
diff --git a/kernel/arch/sparc/lib/lshrdi3.S b/kernel/arch/sparc/lib/lshrdi3.S
index c9b9373f8..509ca6682 100644
--- a/kernel/arch/sparc/lib/lshrdi3.S
+++ b/kernel/arch/sparc/lib/lshrdi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/export.h>
 
diff --git a/kernel/arch/sparc/lib/mcount.S b/kernel/arch/sparc/lib/mcount.S
index 194f38361..deba6fa0b 100644
--- a/kernel/arch/sparc/lib/mcount.S
+++ b/kernel/arch/sparc/lib/mcount.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2000 Anton Blanchard (anton@linuxcare.com)
  *
diff --git a/kernel/arch/sparc/lib/memcmp.S b/kernel/arch/sparc/lib/memcmp.S
index cee7f30db..a18076ef5 100644
--- a/kernel/arch/sparc/lib/memcmp.S
+++ b/kernel/arch/sparc/lib/memcmp.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Sparc optimized memcmp code.
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/lib/memcpy.S b/kernel/arch/sparc/lib/memcpy.S
index 8913feaa7..ee823d8c9 100644
--- a/kernel/arch/sparc/lib/memcpy.S
+++ b/kernel/arch/sparc/lib/memcpy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* memcpy.S: Sparc optimized memcpy and memmove code
  * Hand optimized from GNU libc's memcpy and memmove
  * Copyright (C) 1991,1996 Free Software Foundation
diff --git a/kernel/arch/sparc/lib/memmove.S b/kernel/arch/sparc/lib/memmove.S
index 012cdb6ca..3132b6316 100644
--- a/kernel/arch/sparc/lib/memmove.S
+++ b/kernel/arch/sparc/lib/memmove.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* memmove.S: Simple memmove implementation.
  *
  * Copyright (C) 1997, 2004 David S. Miller (davem@redhat.com)
diff --git a/kernel/arch/sparc/lib/memscan_32.S b/kernel/arch/sparc/lib/memscan_32.S
index 51ce690c4..c4c2d5b3a 100644
--- a/kernel/arch/sparc/lib/memscan_32.S
+++ b/kernel/arch/sparc/lib/memscan_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * memscan.S: Optimized memscan for the Sparc.
  *
diff --git a/kernel/arch/sparc/lib/memscan_64.S b/kernel/arch/sparc/lib/memscan_64.S
index 5efee1f4b..36dd63890 100644
--- a/kernel/arch/sparc/lib/memscan_64.S
+++ b/kernel/arch/sparc/lib/memscan_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * memscan.S: Optimized memscan for Sparc64.
  *
diff --git a/kernel/arch/sparc/lib/memset.S b/kernel/arch/sparc/lib/memset.S
index e23338dbf..b89d42b29 100644
--- a/kernel/arch/sparc/lib/memset.S
+++ b/kernel/arch/sparc/lib/memset.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/arch/sparc/lib/memset.S: Sparc optimized memset, bzero and clear_user code
  * Copyright (C) 1991,1996 Free Software Foundation
  * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/lib/multi3.S b/kernel/arch/sparc/lib/multi3.S
index 703127aaf..2f187b299 100644
--- a/kernel/arch/sparc/lib/multi3.S
+++ b/kernel/arch/sparc/lib/multi3.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/export.h>
 
diff --git a/kernel/arch/sparc/lib/strlen.S b/kernel/arch/sparc/lib/strlen.S
index ca0e7077e..dd111bbad 100644
--- a/kernel/arch/sparc/lib/strlen.S
+++ b/kernel/arch/sparc/lib/strlen.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* strlen.S: Sparc optimized strlen code
  * Hand optimized from GNU libc's strlen
  * Copyright (C) 1991,1996 Free Software Foundation
diff --git a/kernel/arch/sparc/lib/strncmp_32.S b/kernel/arch/sparc/lib/strncmp_32.S
index e3fe01481..794733f03 100644
--- a/kernel/arch/sparc/lib/strncmp_32.S
+++ b/kernel/arch/sparc/lib/strncmp_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * strncmp.S: Hand optimized Sparc assembly of GCC output from GNU libc
  *            generic strncmp routine.
diff --git a/kernel/arch/sparc/lib/strncmp_64.S b/kernel/arch/sparc/lib/strncmp_64.S
index efb5f8843..3d37d65f6 100644
--- a/kernel/arch/sparc/lib/strncmp_64.S
+++ b/kernel/arch/sparc/lib/strncmp_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Sparc64 optimized strncmp code.
  *
diff --git a/kernel/arch/sparc/lib/ucmpdi2.c b/kernel/arch/sparc/lib/ucmpdi2.c
index 1e06ed500..82c1cccb1 100644
--- a/kernel/arch/sparc/lib/ucmpdi2.c
+++ b/kernel/arch/sparc/lib/ucmpdi2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include "libgcc.h"
 
diff --git a/kernel/arch/sparc/lib/xor.S b/kernel/arch/sparc/lib/xor.S
index 45a49cb61..f6af7c7ee 100644
--- a/kernel/arch/sparc/lib/xor.S
+++ b/kernel/arch/sparc/lib/xor.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/sparc64/lib/xor.S
  *
diff --git a/kernel/arch/sparc/math-emu/math_32.c b/kernel/arch/sparc/math-emu/math_32.c
index 4d7e0fff0..72e560ef4 100644
--- a/kernel/arch/sparc/math-emu/math_32.c
+++ b/kernel/arch/sparc/math-emu/math_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sparc/math-emu/math.c
  *
diff --git a/kernel/arch/sparc/math-emu/math_64.c b/kernel/arch/sparc/math-emu/math_64.c
index 964705185..1379dee26 100644
--- a/kernel/arch/sparc/math-emu/math_64.c
+++ b/kernel/arch/sparc/math-emu/math_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sparc64/math-emu/math.c
  *
diff --git a/kernel/arch/sparc/math-emu/sfp-util_32.h b/kernel/arch/sparc/math-emu/sfp-util_32.h
index bb587d5f3..b57375ff2 100644
--- a/kernel/arch/sparc/math-emu/sfp-util_32.h
+++ b/kernel/arch/sparc/math-emu/sfp-util_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
diff --git a/kernel/arch/sparc/math-emu/sfp-util_64.h b/kernel/arch/sparc/math-emu/sfp-util_64.h
index 51320a861..8fdb55aae 100644
--- a/kernel/arch/sparc/math-emu/sfp-util_64.h
+++ b/kernel/arch/sparc/math-emu/sfp-util_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/sparc64/math-emu/sfp-util.h
  *
diff --git a/kernel/arch/sparc/mm/Makefile b/kernel/arch/sparc/mm/Makefile
index 30c3eccfd..d39075b1e 100644
--- a/kernel/arch/sparc/mm/Makefile
+++ b/kernel/arch/sparc/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the linux Sparc-specific parts of the memory manager.
 #
 
diff --git a/kernel/arch/sparc/mm/extable.c b/kernel/arch/sparc/mm/extable.c
index 2422511dc..241b40641 100644
--- a/kernel/arch/sparc/mm/extable.c
+++ b/kernel/arch/sparc/mm/extable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/sparc/mm/extable.c
  */
diff --git a/kernel/arch/sparc/mm/fault_32.c b/kernel/arch/sparc/mm/fault_32.c
index 4714061d6..be3136f14 100644
--- a/kernel/arch/sparc/mm/fault_32.c
+++ b/kernel/arch/sparc/mm/fault_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fault.c:  Page fault handlers for the Sparc.
  *
diff --git a/kernel/arch/sparc/mm/fault_64.c b/kernel/arch/sparc/mm/fault_64.c
index b84c4dd14..815c03d7a 100644
--- a/kernel/arch/sparc/mm/fault_64.c
+++ b/kernel/arch/sparc/mm/fault_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc.
  *
diff --git a/kernel/arch/sparc/mm/gup.c b/kernel/arch/sparc/mm/gup.c
index d809099ff..5335ba3c8 100644
--- a/kernel/arch/sparc/mm/gup.c
+++ b/kernel/arch/sparc/mm/gup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Lockless get_user_pages_fast for sparc, cribbed from powerpc
  *
diff --git a/kernel/arch/sparc/mm/highmem.c b/kernel/arch/sparc/mm/highmem.c
index a454ec5ff..86bc2a58d 100644
--- a/kernel/arch/sparc/mm/highmem.c
+++ b/kernel/arch/sparc/mm/highmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  highmem.c: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/sparc/mm/hugetlbpage.c b/kernel/arch/sparc/mm/hugetlbpage.c
index bcd8cdbc3..5078b7f68 100644
--- a/kernel/arch/sparc/mm/hugetlbpage.c
+++ b/kernel/arch/sparc/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SPARC64 Huge TLB page support.
  *
diff --git a/kernel/arch/sparc/mm/hypersparc.S b/kernel/arch/sparc/mm/hypersparc.S
index 969f96450..66885a8dc 100644
--- a/kernel/arch/sparc/mm/hypersparc.S
+++ b/kernel/arch/sparc/mm/hypersparc.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * hypersparc.S: High speed Hypersparc mmu/cache operations.
  *
diff --git a/kernel/arch/sparc/mm/init_32.c b/kernel/arch/sparc/mm/init_32.c
index 3bd0d513b..95fe4f081 100644
--- a/kernel/arch/sparc/mm/init_32.c
+++ b/kernel/arch/sparc/mm/init_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/sparc/mm/init.c
  *
diff --git a/kernel/arch/sparc/mm/init_64.c b/kernel/arch/sparc/mm/init_64.c
index b2ba410b2..61bdc1270 100644
--- a/kernel/arch/sparc/mm/init_64.c
+++ b/kernel/arch/sparc/mm/init_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/sparc64/mm/init.c
  *
diff --git a/kernel/arch/sparc/mm/init_64.h b/kernel/arch/sparc/mm/init_64.h
index a4c09603b..d920a75b5 100644
--- a/kernel/arch/sparc/mm/init_64.h
+++ b/kernel/arch/sparc/mm/init_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPARC64_MM_INIT_H
 #define _SPARC64_MM_INIT_H
 
diff --git a/kernel/arch/sparc/mm/io-unit.c b/kernel/arch/sparc/mm/io-unit.c
index 338fb7153..c8cb27d3e 100644
--- a/kernel/arch/sparc/mm/io-unit.c
+++ b/kernel/arch/sparc/mm/io-unit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * io-unit.c:  IO-UNIT specific routines for memory management.
  *
diff --git a/kernel/arch/sparc/mm/iommu.c b/kernel/arch/sparc/mm/iommu.c
index 491511d37..2c5f8a648 100644
--- a/kernel/arch/sparc/mm/iommu.c
+++ b/kernel/arch/sparc/mm/iommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * iommu.c:  IOMMU specific routines for memory management.
  *
diff --git a/kernel/arch/sparc/mm/leon_mm.c b/kernel/arch/sparc/mm/leon_mm.c
index 3b17b6f78..ec61ff1f9 100644
--- a/kernel/arch/sparc/mm/leon_mm.c
+++ b/kernel/arch/sparc/mm/leon_mm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/sparc/mm/leon_m.c
  *
diff --git a/kernel/arch/sparc/mm/mm_32.h b/kernel/arch/sparc/mm/mm_32.h
index a6c27ca9a..0d0b06e95 100644
--- a/kernel/arch/sparc/mm/mm_32.h
+++ b/kernel/arch/sparc/mm/mm_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* fault_32.c - visible as they are called from assembler */
 asmlinkage int lookup_fault(unsigned long pc, unsigned long ret_pc,
                             unsigned long address);
diff --git a/kernel/arch/sparc/mm/srmmu.c b/kernel/arch/sparc/mm/srmmu.c
index 8e76ebba2..1d70c3f6d 100644
--- a/kernel/arch/sparc/mm/srmmu.c
+++ b/kernel/arch/sparc/mm/srmmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * srmmu.c:  SRMMU specific routines for memory management.
  *
diff --git a/kernel/arch/sparc/mm/srmmu_access.S b/kernel/arch/sparc/mm/srmmu_access.S
index d0a67b2c2..d8d2e644a 100644
--- a/kernel/arch/sparc/mm/srmmu_access.S
+++ b/kernel/arch/sparc/mm/srmmu_access.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Assembler variants of srmmu access functions.
  * Implemented in assembler to allow run-time patching.
  * LEON uses a different ASI for MMUREGS than SUN.
diff --git a/kernel/arch/sparc/mm/swift.S b/kernel/arch/sparc/mm/swift.S
index 5d2b88d39..f414bfd8d 100644
--- a/kernel/arch/sparc/mm/swift.S
+++ b/kernel/arch/sparc/mm/swift.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * swift.S: MicroSparc-II mmu/cache operations.
  *
diff --git a/kernel/arch/sparc/mm/tlb.c b/kernel/arch/sparc/mm/tlb.c
index ee8066c3d..4ae86bc0d 100644
--- a/kernel/arch/sparc/mm/tlb.c
+++ b/kernel/arch/sparc/mm/tlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* arch/sparc64/mm/tlb.c
  *
  * Copyright (C) 2004 David S. Miller <davem@redhat.com>
diff --git a/kernel/arch/sparc/mm/tsb.c b/kernel/arch/sparc/mm/tsb.c
index 0d4b998c7..75a04c1a2 100644
--- a/kernel/arch/sparc/mm/tsb.c
+++ b/kernel/arch/sparc/mm/tsb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* arch/sparc64/mm/tsb.c
  *
  * Copyright (C) 2006, 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/arch/sparc/mm/tsunami.S b/kernel/arch/sparc/mm/tsunami.S
index bf10a345f..62b742df6 100644
--- a/kernel/arch/sparc/mm/tsunami.S
+++ b/kernel/arch/sparc/mm/tsunami.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tsunami.S: High speed MicroSparc-I mmu/cache operations.
  *
diff --git a/kernel/arch/sparc/mm/ultra.S b/kernel/arch/sparc/mm/ultra.S
index fcf4d27a3..d245f89d1 100644
--- a/kernel/arch/sparc/mm/ultra.S
+++ b/kernel/arch/sparc/mm/ultra.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ultra.S: Don't expand these all over the place...
  *
diff --git a/kernel/arch/sparc/mm/viking.S b/kernel/arch/sparc/mm/viking.S
index 852257fcc..adaef6e7b 100644
--- a/kernel/arch/sparc/mm/viking.S
+++ b/kernel/arch/sparc/mm/viking.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * viking.S: High speed Viking cache/mmu operations
  *
diff --git a/kernel/arch/sparc/net/bpf_jit_32.h b/kernel/arch/sparc/net/bpf_jit_32.h
index d5c069bff..cfd6a8be0 100644
--- a/kernel/arch/sparc/net/bpf_jit_32.h
+++ b/kernel/arch/sparc/net/bpf_jit_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BPF_JIT_H
 #define _BPF_JIT_H
 
diff --git a/kernel/arch/sparc/net/bpf_jit_64.h b/kernel/arch/sparc/net/bpf_jit_64.h
index 74abd4579..428f7fd19 100644
--- a/kernel/arch/sparc/net/bpf_jit_64.h
+++ b/kernel/arch/sparc/net/bpf_jit_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BPF_JIT_H
 #define _BPF_JIT_H
 
diff --git a/kernel/arch/sparc/net/bpf_jit_asm_32.S b/kernel/arch/sparc/net/bpf_jit_asm_32.S
index dcc402f57..a2e28e046 100644
--- a/kernel/arch/sparc/net/bpf_jit_asm_32.S
+++ b/kernel/arch/sparc/net/bpf_jit_asm_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/ptrace.h>
 
 #include "bpf_jit_32.h"
diff --git a/kernel/arch/sparc/net/bpf_jit_asm_64.S b/kernel/arch/sparc/net/bpf_jit_asm_64.S
index 3b3f14655..717786705 100644
--- a/kernel/arch/sparc/net/bpf_jit_asm_64.S
+++ b/kernel/arch/sparc/net/bpf_jit_asm_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/ptrace.h>
 
 #include "bpf_jit_64.h"
diff --git a/kernel/arch/sparc/net/bpf_jit_comp_32.c b/kernel/arch/sparc/net/bpf_jit_comp_32.c
index d19374854..09e318eb3 100644
--- a/kernel/arch/sparc/net/bpf_jit_comp_32.c
+++ b/kernel/arch/sparc/net/bpf_jit_comp_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/moduleloader.h>
 #include <linux/workqueue.h>
 #include <linux/netdevice.h>
diff --git a/kernel/arch/sparc/net/bpf_jit_comp_64.c b/kernel/arch/sparc/net/bpf_jit_comp_64.c
index c340af7b1..5765e7e71 100644
--- a/kernel/arch/sparc/net/bpf_jit_comp_64.c
+++ b/kernel/arch/sparc/net/bpf_jit_comp_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/moduleloader.h>
 #include <linux/workqueue.h>
 #include <linux/netdevice.h>
diff --git a/kernel/arch/sparc/power/hibernate.c b/kernel/arch/sparc/power/hibernate.c
index df707a8ad..47b06f4af 100644
--- a/kernel/arch/sparc/power/hibernate.c
+++ b/kernel/arch/sparc/power/hibernate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * hibernate.c:  Hibernaton support specific for sparc64.
  *
diff --git a/kernel/arch/sparc/power/hibernate_asm.S b/kernel/arch/sparc/power/hibernate_asm.S
index d7d9017dc..8cfaf5b6a 100644
--- a/kernel/arch/sparc/power/hibernate_asm.S
+++ b/kernel/arch/sparc/power/hibernate_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * hibernate_asm.S:  Hibernaton support specific for sparc64.
  *
diff --git a/kernel/arch/sparc/prom/Makefile b/kernel/arch/sparc/prom/Makefile
index 020300b18..397b79af7 100644
--- a/kernel/arch/sparc/prom/Makefile
+++ b/kernel/arch/sparc/prom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Sun Boot PROM interface library under
 # Linux.
 #
diff --git a/kernel/arch/sparc/prom/bootstr_32.c b/kernel/arch/sparc/prom/bootstr_32.c
index d2b49d236..e3b731ff0 100644
--- a/kernel/arch/sparc/prom/bootstr_32.c
+++ b/kernel/arch/sparc/prom/bootstr_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bootstr.c:  Boot string/argument acquisition from the PROM.
  *
diff --git a/kernel/arch/sparc/prom/bootstr_64.c b/kernel/arch/sparc/prom/bootstr_64.c
index 7149e7771..f1cc34d99 100644
--- a/kernel/arch/sparc/prom/bootstr_64.c
+++ b/kernel/arch/sparc/prom/bootstr_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bootstr.c:  Boot string/argument acquisition from the PROM.
  *
diff --git a/kernel/arch/sparc/prom/cif.S b/kernel/arch/sparc/prom/cif.S
index 8050f381f..dd06bb1fb 100644
--- a/kernel/arch/sparc/prom/cif.S
+++ b/kernel/arch/sparc/prom/cif.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* cif.S: PROM entry/exit assembler trampolines.
  *
  * Copyright (C) 1996, 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
diff --git a/kernel/arch/sparc/prom/console_32.c b/kernel/arch/sparc/prom/console_32.c
index 1cfb50f4c..6404e5bbb 100644
--- a/kernel/arch/sparc/prom/console_32.c
+++ b/kernel/arch/sparc/prom/console_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
diff --git a/kernel/arch/sparc/prom/console_64.c b/kernel/arch/sparc/prom/console_64.c
index f95edcc54..86dace787 100644
--- a/kernel/arch/sparc/prom/console_64.c
+++ b/kernel/arch/sparc/prom/console_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
  *
diff --git a/kernel/arch/sparc/prom/init_32.c b/kernel/arch/sparc/prom/init_32.c
index 9ac30c2b7..d20470166 100644
--- a/kernel/arch/sparc/prom/init_32.c
+++ b/kernel/arch/sparc/prom/init_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
diff --git a/kernel/arch/sparc/prom/init_64.c b/kernel/arch/sparc/prom/init_64.c
index 110b0d78b..103aa9104 100644
--- a/kernel/arch/sparc/prom/init_64.c
+++ b/kernel/arch/sparc/prom/init_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
diff --git a/kernel/arch/sparc/prom/memory.c b/kernel/arch/sparc/prom/memory.c
index 3f263a648..269d6ab5e 100644
--- a/kernel/arch/sparc/prom/memory.c
+++ b/kernel/arch/sparc/prom/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* memory.c: Prom routine for acquiring various bits of information
  *           about RAM on the machine, both virtual and physical.
  *
diff --git a/kernel/arch/sparc/prom/misc_32.c b/kernel/arch/sparc/prom/misc_32.c
index 8dc0b6b27..625750924 100644
--- a/kernel/arch/sparc/prom/misc_32.c
+++ b/kernel/arch/sparc/prom/misc_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
diff --git a/kernel/arch/sparc/prom/misc_64.c b/kernel/arch/sparc/prom/misc_64.c
index 53a696d3e..aed94cd4a 100644
--- a/kernel/arch/sparc/prom/misc_64.c
+++ b/kernel/arch/sparc/prom/misc_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c:  Miscellaneous prom functions that don't belong
  *          anywhere else.
diff --git a/kernel/arch/sparc/prom/mp.c b/kernel/arch/sparc/prom/mp.c
index 0da8256cf..67cf0e957 100644
--- a/kernel/arch/sparc/prom/mp.c
+++ b/kernel/arch/sparc/prom/mp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mp.c:  OpenBoot Prom Multiprocessor support routines.  Don't call
  *        these on a UP or else you will halt and catch fire. ;)
diff --git a/kernel/arch/sparc/prom/p1275.c b/kernel/arch/sparc/prom/p1275.c
index 545d8bb79..889aa602f 100644
--- a/kernel/arch/sparc/prom/p1275.c
+++ b/kernel/arch/sparc/prom/p1275.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * p1275.c: Sun IEEE 1275 PROM low level interface routines
  *
diff --git a/kernel/arch/sparc/prom/printf.c b/kernel/arch/sparc/prom/printf.c
index d9682f06b..dcee3dfa6 100644
--- a/kernel/arch/sparc/prom/printf.c
+++ b/kernel/arch/sparc/prom/printf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * printf.c:  Internal prom library printf facility.
  *
diff --git a/kernel/arch/sparc/prom/ranges.c b/kernel/arch/sparc/prom/ranges.c
index 6d8dc2aa9..20cb828bc 100644
--- a/kernel/arch/sparc/prom/ranges.c
+++ b/kernel/arch/sparc/prom/ranges.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ranges.c: Handle ranges in newer proms for obio/sbus.
  *
diff --git a/kernel/arch/sparc/prom/tree_32.c b/kernel/arch/sparc/prom/tree_32.c
index f30e8d038..0fed89375 100644
--- a/kernel/arch/sparc/prom/tree_32.c
+++ b/kernel/arch/sparc/prom/tree_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * tree.c: Basic device tree traversal/scanning for the Linux
  *         prom library.
diff --git a/kernel/arch/sparc/prom/tree_64.c b/kernel/arch/sparc/prom/tree_64.c
index bd1b2a3ac..989e7992d 100644
--- a/kernel/arch/sparc/prom/tree_64.c
+++ b/kernel/arch/sparc/prom/tree_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * tree.c: Basic device tree traversal/scanning for the Linux
  *         prom library.
diff --git a/kernel/arch/tile/Kconfig b/kernel/arch/tile/Kconfig
index 4583c0320..02f269cfa 100644
--- a/kernel/arch/tile/Kconfig
+++ b/kernel/arch/tile/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
 
diff --git a/kernel/arch/tile/Kconfig.debug b/kernel/arch/tile/Kconfig.debug
index 19734d3ab..9f665d1a8 100644
--- a/kernel/arch/tile/Kconfig.debug
+++ b/kernel/arch/tile/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/tile/Makefile b/kernel/arch/tile/Makefile
index 4dc380a51..8fa0befba 100644
--- a/kernel/arch/tile/Makefile
+++ b/kernel/arch/tile/Makefile
@@ -51,6 +51,8 @@ else
 BITS := 32
 endif
 
+CHECKFLAGS	+= -m$(BITS)
+
 head-y		:= arch/tile/kernel/head_$(BITS).o
 
 libs-y		+= arch/tile/lib/
diff --git a/kernel/arch/tile/gxio/Kconfig b/kernel/arch/tile/gxio/Kconfig
index d4e10d580..903c8646b 100644
--- a/kernel/arch/tile/gxio/Kconfig
+++ b/kernel/arch/tile/gxio/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Support direct access to TILE-Gx hardware from user space, via the
 # gxio library, or from kernel space, via kernel IORPC support.
 config TILE_GXIO
diff --git a/kernel/arch/tile/gxio/Makefile b/kernel/arch/tile/gxio/Makefile
index 26ae2c727..fcc903c4c 100644
--- a/kernel/arch/tile/gxio/Makefile
+++ b/kernel/arch/tile/gxio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Tile-Gx device access support.
 #
diff --git a/kernel/arch/tile/include/asm/div64.h b/kernel/arch/tile/include/asm/div64.h
index 9f765cdf0..a0a798344 100644
--- a/kernel/arch/tile/include/asm/div64.h
+++ b/kernel/arch/tile/include/asm/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_TILE_DIV64_H
 #define _ASM_TILE_DIV64_H
 
diff --git a/kernel/arch/tile/include/asm/irq_work.h b/kernel/arch/tile/include/asm/irq_work.h
index 48af33a61..78d3b6a7b 100644
--- a/kernel/arch/tile/include/asm/irq_work.h
+++ b/kernel/arch/tile/include/asm/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IRQ_WORK_H
 #define __ASM_IRQ_WORK_H
 
diff --git a/kernel/arch/tile/include/asm/word-at-a-time.h b/kernel/arch/tile/include/asm/word-at-a-time.h
index b66a693c2..2f2515867 100644
--- a/kernel/arch/tile/include/asm/word-at-a-time.h
+++ b/kernel/arch/tile/include/asm/word-at-a-time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_WORD_AT_A_TIME_H
 #define _ASM_WORD_AT_A_TIME_H
 
diff --git a/kernel/arch/tile/include/uapi/arch/abi.h b/kernel/arch/tile/include/uapi/arch/abi.h
index 328e62260..df161a484 100644
--- a/kernel/arch/tile/include/uapi/arch/abi.h
+++ b/kernel/arch/tile/include/uapi/arch/abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/chip.h b/kernel/arch/tile/include/uapi/arch/chip.h
index 4c91f90b9..7f55c6856 100644
--- a/kernel/arch/tile/include/uapi/arch/chip.h
+++ b/kernel/arch/tile/include/uapi/arch/chip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/chip_tilegx.h b/kernel/arch/tile/include/uapi/arch/chip_tilegx.h
index ea8e4f2c9..c2a71a43b 100644
--- a/kernel/arch/tile/include/uapi/arch/chip_tilegx.h
+++ b/kernel/arch/tile/include/uapi/arch/chip_tilegx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/chip_tilepro.h b/kernel/arch/tile/include/uapi/arch/chip_tilepro.h
index 70017699a..a8a3ed144 100644
--- a/kernel/arch/tile/include/uapi/arch/chip_tilepro.h
+++ b/kernel/arch/tile/include/uapi/arch/chip_tilepro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/icache.h b/kernel/arch/tile/include/uapi/arch/icache.h
index 762eafa8a..ff85a5d77 100644
--- a/kernel/arch/tile/include/uapi/arch/icache.h
+++ b/kernel/arch/tile/include/uapi/arch/icache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/interrupts.h b/kernel/arch/tile/include/uapi/arch/interrupts.h
index 20f8f07d2..c288b5d82 100644
--- a/kernel/arch/tile/include/uapi/arch/interrupts.h
+++ b/kernel/arch/tile/include/uapi/arch/interrupts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/interrupts_32.h b/kernel/arch/tile/include/uapi/arch/interrupts_32.h
index 2efe3f68b..a748752ce 100644
--- a/kernel/arch/tile/include/uapi/arch/interrupts_32.h
+++ b/kernel/arch/tile/include/uapi/arch/interrupts_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/interrupts_64.h b/kernel/arch/tile/include/uapi/arch/interrupts_64.h
index 13c9f9182..142eaff3c 100644
--- a/kernel/arch/tile/include/uapi/arch/interrupts_64.h
+++ b/kernel/arch/tile/include/uapi/arch/interrupts_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/intreg.h b/kernel/arch/tile/include/uapi/arch/intreg.h
index 1cf2fbf74..5387fb645 100644
--- a/kernel/arch/tile/include/uapi/arch/intreg.h
+++ b/kernel/arch/tile/include/uapi/arch/intreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2017 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/opcode.h b/kernel/arch/tile/include/uapi/arch/opcode.h
index 92d15229e..a9ce5961a 100644
--- a/kernel/arch/tile/include/uapi/arch/opcode.h
+++ b/kernel/arch/tile/include/uapi/arch/opcode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/opcode_tilegx.h b/kernel/arch/tile/include/uapi/arch/opcode_tilegx.h
index 9e46eaa84..948ea5445 100644
--- a/kernel/arch/tile/include/uapi/arch/opcode_tilegx.h
+++ b/kernel/arch/tile/include/uapi/arch/opcode_tilegx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* TILE-Gx opcode information.
  *
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
diff --git a/kernel/arch/tile/include/uapi/arch/opcode_tilepro.h b/kernel/arch/tile/include/uapi/arch/opcode_tilepro.h
index 4451cff1a..0d633688d 100644
--- a/kernel/arch/tile/include/uapi/arch/opcode_tilepro.h
+++ b/kernel/arch/tile/include/uapi/arch/opcode_tilepro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* TILEPro opcode information.
  *
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
diff --git a/kernel/arch/tile/include/uapi/arch/sim.h b/kernel/arch/tile/include/uapi/arch/sim.h
index e54b7b052..c4183dcd2 100644
--- a/kernel/arch/tile/include/uapi/arch/sim.h
+++ b/kernel/arch/tile/include/uapi/arch/sim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/sim_def.h b/kernel/arch/tile/include/uapi/arch/sim_def.h
index 1c069537a..f74f99437 100644
--- a/kernel/arch/tile/include/uapi/arch/sim_def.h
+++ b/kernel/arch/tile/include/uapi/arch/sim_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/spr_def.h b/kernel/arch/tile/include/uapi/arch/spr_def.h
index c250c5adb..743428615 100644
--- a/kernel/arch/tile/include/uapi/arch/spr_def.h
+++ b/kernel/arch/tile/include/uapi/arch/spr_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/spr_def_32.h b/kernel/arch/tile/include/uapi/arch/spr_def_32.h
index 78daa3146..64122d616 100644
--- a/kernel/arch/tile/include/uapi/arch/spr_def_32.h
+++ b/kernel/arch/tile/include/uapi/arch/spr_def_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/arch/spr_def_64.h b/kernel/arch/tile/include/uapi/arch/spr_def_64.h
index 67a6c1751..d183cbb31 100644
--- a/kernel/arch/tile/include/uapi/arch/spr_def_64.h
+++ b/kernel/arch/tile/include/uapi/arch/spr_def_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/auxvec.h b/kernel/arch/tile/include/uapi/asm/auxvec.h
index f497123ed..922383ce8 100644
--- a/kernel/arch/tile/include/uapi/asm/auxvec.h
+++ b/kernel/arch/tile/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/bitsperlong.h b/kernel/arch/tile/include/uapi/asm/bitsperlong.h
index 58c771f2a..57cca78c0 100644
--- a/kernel/arch/tile/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/tile/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/byteorder.h b/kernel/arch/tile/include/uapi/asm/byteorder.h
index 6b8fa2e1c..d508e61c1 100644
--- a/kernel/arch/tile/include/uapi/asm/byteorder.h
+++ b/kernel/arch/tile/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/cachectl.h b/kernel/arch/tile/include/uapi/asm/cachectl.h
index 572ddcad2..ed8bac28a 100644
--- a/kernel/arch/tile/include/uapi/asm/cachectl.h
+++ b/kernel/arch/tile/include/uapi/asm/cachectl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/hardwall.h b/kernel/arch/tile/include/uapi/asm/hardwall.h
index c2169d4f4..f02e9132a 100644
--- a/kernel/arch/tile/include/uapi/asm/hardwall.h
+++ b/kernel/arch/tile/include/uapi/asm/hardwall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/kvm_para.h b/kernel/arch/tile/include/uapi/asm/kvm_para.h
index 14fab8f0b..baacc4996 100644
--- a/kernel/arch/tile/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/tile/include/uapi/asm/kvm_para.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/kvm_para.h>
diff --git a/kernel/arch/tile/include/uapi/asm/mman.h b/kernel/arch/tile/include/uapi/asm/mman.h
index 63ee13faf..9b7add959 100644
--- a/kernel/arch/tile/include/uapi/asm/mman.h
+++ b/kernel/arch/tile/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/ptrace.h b/kernel/arch/tile/include/uapi/asm/ptrace.h
index d03b82985..667ed742f 100644
--- a/kernel/arch/tile/include/uapi/asm/ptrace.h
+++ b/kernel/arch/tile/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/setup.h b/kernel/arch/tile/include/uapi/asm/setup.h
index e6f7da265..6d1dfddda 100644
--- a/kernel/arch/tile/include/uapi/asm/setup.h
+++ b/kernel/arch/tile/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/sigcontext.h b/kernel/arch/tile/include/uapi/asm/sigcontext.h
index 39ff5d1a2..4003d5cc9 100644
--- a/kernel/arch/tile/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/tile/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/siginfo.h b/kernel/arch/tile/include/uapi/asm/siginfo.h
index e83f931aa..f234d24ff 100644
--- a/kernel/arch/tile/include/uapi/asm/siginfo.h
+++ b/kernel/arch/tile/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/signal.h b/kernel/arch/tile/include/uapi/asm/signal.h
index ef0d32d84..7b3c814e0 100644
--- a/kernel/arch/tile/include/uapi/asm/signal.h
+++ b/kernel/arch/tile/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/stat.h b/kernel/arch/tile/include/uapi/asm/stat.h
index c0db34d56..ea03de7d6 100644
--- a/kernel/arch/tile/include/uapi/asm/stat.h
+++ b/kernel/arch/tile/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #if defined(__KERNEL__) && defined(CONFIG_COMPAT)
 #define __ARCH_WANT_STAT64	/* Used for compat_sys_stat64() etc. */
 #endif
diff --git a/kernel/arch/tile/include/uapi/asm/swab.h b/kernel/arch/tile/include/uapi/asm/swab.h
index 7c37b38f6..36952353a 100644
--- a/kernel/arch/tile/include/uapi/asm/swab.h
+++ b/kernel/arch/tile/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/include/uapi/asm/unistd.h b/kernel/arch/tile/include/uapi/asm/unistd.h
index 24e9187e8..1a169ec92 100644
--- a/kernel/arch/tile/include/uapi/asm/unistd.h
+++ b/kernel/arch/tile/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/arch/tile/kernel/Makefile b/kernel/arch/tile/kernel/Makefile
index 09936d0bc..3e43d7873 100644
--- a/kernel/arch/tile/kernel/Makefile
+++ b/kernel/arch/tile/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/TILE kernel.
 #
diff --git a/kernel/arch/tile/kernel/hvglue.S b/kernel/arch/tile/kernel/hvglue.S
index d78ee2ad6..70c661448 100644
--- a/kernel/arch/tile/kernel/hvglue.S
+++ b/kernel/arch/tile/kernel/hvglue.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Hypervisor call vector addresses; see <hv/hypervisor.h> */
 .macro gensym sym, val, size
 .org \val
diff --git a/kernel/arch/tile/kernel/time.c b/kernel/arch/tile/kernel/time.c
index 6643ffbc0..f95d65f31 100644
--- a/kernel/arch/tile/kernel/time.c
+++ b/kernel/arch/tile/kernel/time.c
@@ -162,6 +162,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
 	.set_next_event = tile_timer_set_next_event,
 	.set_state_shutdown = tile_timer_shutdown,
 	.set_state_oneshot = tile_timer_shutdown,
+	.set_state_oneshot_stopped = tile_timer_shutdown,
 	.tick_resume = tile_timer_shutdown,
 };
 
diff --git a/kernel/arch/tile/kernel/vdso/Makefile b/kernel/arch/tile/kernel/vdso/Makefile
index 71d5f5d71..b596a7396 100644
--- a/kernel/arch/tile/kernel/vdso/Makefile
+++ b/kernel/arch/tile/kernel/vdso/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Symbols present in the vdso
 vdso-syms = rt_sigreturn gettimeofday
 
diff --git a/kernel/arch/tile/kernel/vmlinux.lds.S b/kernel/arch/tile/kernel/vmlinux.lds.S
index e1baf094f..3558d981e 100644
--- a/kernel/arch/tile/kernel/vmlinux.lds.S
+++ b/kernel/arch/tile/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
 #include <asm/cache.h>
diff --git a/kernel/arch/tile/kvm/Kconfig b/kernel/arch/tile/kvm/Kconfig
index 1e968f755..efce89a84 100644
--- a/kernel/arch/tile/kvm/Kconfig
+++ b/kernel/arch/tile/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/tile/lib/Makefile b/kernel/arch/tile/lib/Makefile
index c4211cbb2..815a1fdeb 100644
--- a/kernel/arch/tile/lib/Makefile
+++ b/kernel/arch/tile/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for TILE-specific library files..
 #
diff --git a/kernel/arch/um/Kconfig.char b/kernel/arch/um/Kconfig.char
index f10738d68..f184bde70 100644
--- a/kernel/arch/um/Kconfig.char
+++ b/kernel/arch/um/Kconfig.char
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "UML Character Devices"
 
 config STDERR_CONSOLE
diff --git a/kernel/arch/um/Kconfig.common b/kernel/arch/um/Kconfig.common
index 85f6dd204..d9280482a 100644
--- a/kernel/arch/um/Kconfig.common
+++ b/kernel/arch/um/Kconfig.common
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config UML
 	bool
 	default y
diff --git a/kernel/arch/um/Kconfig.debug b/kernel/arch/um/Kconfig.debug
index 68205fd3b..967d31096 100644
--- a/kernel/arch/um/Kconfig.debug
+++ b/kernel/arch/um/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/um/Kconfig.net b/kernel/arch/um/Kconfig.net
index 820a56f00..e871af24d 100644
--- a/kernel/arch/um/Kconfig.net
+++ b/kernel/arch/um/Kconfig.net
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 menu "UML Network Devices"
 	depends on NET
diff --git a/kernel/arch/um/Kconfig.rest b/kernel/arch/um/Kconfig.rest
index 567eb5fc2..08327b9c0 100644
--- a/kernel/arch/um/Kconfig.rest
+++ b/kernel/arch/um/Kconfig.rest
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/kernel/arch/um/Kconfig.um b/kernel/arch/um/Kconfig.um
index e26376ab5..3e7f228b2 100644
--- a/kernel/arch/um/Kconfig.um
+++ b/kernel/arch/um/Kconfig.um
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config STATIC_LINK
 	bool "Force a static link"
 	default n
diff --git a/kernel/arch/um/drivers/cow.h b/kernel/arch/um/drivers/cow.h
index 6673508f3..760c507dd 100644
--- a/kernel/arch/um/drivers/cow.h
+++ b/kernel/arch/um/drivers/cow.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __COW_H__
 #define __COW_H__
 
diff --git a/kernel/arch/um/drivers/cow_sys.h b/kernel/arch/um/drivers/cow_sys.h
index 67cbee63e..916811ef5 100644
--- a/kernel/arch/um/drivers/cow_sys.h
+++ b/kernel/arch/um/drivers/cow_sys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __COW_SYS_H__
 #define __COW_SYS_H__
 
diff --git a/kernel/arch/um/drivers/slip.h b/kernel/arch/um/drivers/slip.h
index c64f8c61d..0f3b7ca99 100644
--- a/kernel/arch/um/drivers/slip.h
+++ b/kernel/arch/um/drivers/slip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SLIP_H
 #define __UM_SLIP_H
 
diff --git a/kernel/arch/um/drivers/slip_common.c b/kernel/arch/um/drivers/slip_common.c
index f597fa7c9..20fe4f427 100644
--- a/kernel/arch/um/drivers/slip_common.c
+++ b/kernel/arch/um/drivers/slip_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "slip_common.h"
 #include <net_user.h>
diff --git a/kernel/arch/um/drivers/slip_common.h b/kernel/arch/um/drivers/slip_common.h
index d574e0a9d..d3798b5ca 100644
--- a/kernel/arch/um/drivers/slip_common.h
+++ b/kernel/arch/um/drivers/slip_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SLIP_COMMON_H
 #define __UM_SLIP_COMMON_H
 
diff --git a/kernel/arch/um/drivers/slirp.h b/kernel/arch/um/drivers/slirp.h
index 89ccf83b7..4aef2b882 100644
--- a/kernel/arch/um/drivers/slirp.h
+++ b/kernel/arch/um/drivers/slirp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SLIRP_H
 #define __UM_SLIRP_H
 
diff --git a/kernel/arch/um/drivers/stderr_console.c b/kernel/arch/um/drivers/stderr_console.c
index d07a97f8b..ecc3a5814 100644
--- a/kernel/arch/um/drivers/stderr_console.c
+++ b/kernel/arch/um/drivers/stderr_console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/console.h>
diff --git a/kernel/arch/um/include/asm/bugs.h b/kernel/arch/um/include/asm/bugs.h
index 6a72e240d..4473942a0 100644
--- a/kernel/arch/um/include/asm/bugs.h
+++ b/kernel/arch/um/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_BUGS_H
 #define __UM_BUGS_H
 
diff --git a/kernel/arch/um/include/asm/cache.h b/kernel/arch/um/include/asm/cache.h
index 19e1bdd67..5c1562734 100644
--- a/kernel/arch/um/include/asm/cache.h
+++ b/kernel/arch/um/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_CACHE_H
 #define __UM_CACHE_H
 
diff --git a/kernel/arch/um/include/asm/common.lds.S b/kernel/arch/um/include/asm/common.lds.S
index 9e6d5997c..b30d73ca2 100644
--- a/kernel/arch/um/include/asm/common.lds.S
+++ b/kernel/arch/um/include/asm/common.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 
   .fini      : { *(.fini)    } =0x9090
diff --git a/kernel/arch/um/include/asm/dma.h b/kernel/arch/um/include/asm/dma.h
index f88c58605..fdc53642c 100644
--- a/kernel/arch/um/include/asm/dma.h
+++ b/kernel/arch/um/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_DMA_H
 #define __UM_DMA_H
 
diff --git a/kernel/arch/um/include/asm/fixmap.h b/kernel/arch/um/include/asm/fixmap.h
index 1761fd75b..2c697a145 100644
--- a/kernel/arch/um/include/asm/fixmap.h
+++ b/kernel/arch/um/include/asm/fixmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_FIXMAP_H
 #define __UM_FIXMAP_H
 
diff --git a/kernel/arch/um/include/asm/hardirq.h b/kernel/arch/um/include/asm/hardirq.h
index 756f0778e..b426796d2 100644
--- a/kernel/arch/um/include/asm/hardirq.h
+++ b/kernel/arch/um/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_UM_HARDIRQ_H
 #define __ASM_UM_HARDIRQ_H
 
diff --git a/kernel/arch/um/include/asm/io.h b/kernel/arch/um/include/asm/io.h
index 8f35d574f..96f77b523 100644
--- a/kernel/arch/um/include/asm/io.h
+++ b/kernel/arch/um/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UM_IO_H
 #define _ASM_UM_IO_H
 
diff --git a/kernel/arch/um/include/asm/irq.h b/kernel/arch/um/include/asm/irq.h
index 4a2037f82..b5cdd3f91 100644
--- a/kernel/arch/um/include/asm/irq.h
+++ b/kernel/arch/um/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_IRQ_H
 #define __UM_IRQ_H
 
diff --git a/kernel/arch/um/include/asm/irqflags.h b/kernel/arch/um/include/asm/irqflags.h
index 3bb221e1d..cbc6c0013 100644
--- a/kernel/arch/um/include/asm/irqflags.h
+++ b/kernel/arch/um/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_IRQFLAGS_H
 #define __UM_IRQFLAGS_H
 
diff --git a/kernel/arch/um/include/asm/sections.h b/kernel/arch/um/include/asm/sections.h
index cafcf684d..a3c1fb6ed 100644
--- a/kernel/arch/um/include/asm/sections.h
+++ b/kernel/arch/um/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SECTIONS_H
 #define __UM_SECTIONS_H
 
diff --git a/kernel/arch/um/include/asm/setup.h b/kernel/arch/um/include/asm/setup.h
index 99f086301..80ada899f 100644
--- a/kernel/arch/um/include/asm/setup.h
+++ b/kernel/arch/um/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SETUP_H_INCLUDED
 #define SETUP_H_INCLUDED
 
diff --git a/kernel/arch/um/include/asm/smp.h b/kernel/arch/um/include/asm/smp.h
index 9c3be355e..a8cc1d46d 100644
--- a/kernel/arch/um/include/asm/smp.h
+++ b/kernel/arch/um/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SMP_H
 #define __UM_SMP_H
 
diff --git a/kernel/arch/um/include/asm/stacktrace.h b/kernel/arch/um/include/asm/stacktrace.h
index 9a864328c..436b55952 100644
--- a/kernel/arch/um/include/asm/stacktrace.h
+++ b/kernel/arch/um/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UML_STACKTRACE_H
 #define _ASM_UML_STACKTRACE_H
 
diff --git a/kernel/arch/um/include/asm/sysrq.h b/kernel/arch/um/include/asm/sysrq.h
index c8d332b56..8fc8c65cd 100644
--- a/kernel/arch/um/include/asm/sysrq.h
+++ b/kernel/arch/um/include/asm/sysrq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SYSRQ_H
 #define __UM_SYSRQ_H
 
diff --git a/kernel/arch/um/include/asm/timex.h b/kernel/arch/um/include/asm/timex.h
index 0f4ada08f..e392a9a5b 100644
--- a/kernel/arch/um/include/asm/timex.h
+++ b/kernel/arch/um/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_TIMEX_H
 #define __UM_TIMEX_H
 
diff --git a/kernel/arch/um/include/asm/tlb.h b/kernel/arch/um/include/asm/tlb.h
index 344d95619..dce6db147 100644
--- a/kernel/arch/um/include/asm/tlb.h
+++ b/kernel/arch/um/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_TLB_H
 #define __UM_TLB_H
 
diff --git a/kernel/arch/um/include/shared/common-offsets.h b/kernel/arch/um/include/shared/common-offsets.h
index c92306809..4e99fe055 100644
--- a/kernel/arch/um/include/shared/common-offsets.h
+++ b/kernel/arch/um/include/shared/common-offsets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* for use by sys-$SUBARCH/kernel-offsets.c */
 
 DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
diff --git a/kernel/arch/um/include/shared/init.h b/kernel/arch/um/include/shared/init.h
index 233e2593e..390572daa 100644
--- a/kernel/arch/um/include/shared/init.h
+++ b/kernel/arch/um/include/shared/init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UML_INIT_H
 #define _LINUX_UML_INIT_H
 
diff --git a/kernel/arch/um/include/shared/longjmp.h b/kernel/arch/um/include/shared/longjmp.h
index 9bdddf4c4..b3315c1f1 100644
--- a/kernel/arch/um/include/shared/longjmp.h
+++ b/kernel/arch/um/include/shared/longjmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UML_LONGJMP_H
 #define __UML_LONGJMP_H
 
diff --git a/kernel/arch/um/kernel/dyn.lds.S b/kernel/arch/um/kernel/dyn.lds.S
index 4fdbcf958..d417e3899 100644
--- a/kernel/arch/um/kernel/dyn.lds.S
+++ b/kernel/arch/um/kernel/dyn.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
 
diff --git a/kernel/arch/um/kernel/kmsg_dump.c b/kernel/arch/um/kernel/kmsg_dump.c
index 407d49251..98bdf69e4 100644
--- a/kernel/arch/um/kernel/kmsg_dump.c
+++ b/kernel/arch/um/kernel/kmsg_dump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kmsg_dump.h>
 #include <linux/console.h>
 #include <shared/init.h>
diff --git a/kernel/arch/um/kernel/uml.lds.S b/kernel/arch/um/kernel/uml.lds.S
index 1840f55ed..3d6ed6ba5 100644
--- a/kernel/arch/um/kernel/uml.lds.S
+++ b/kernel/arch/um/kernel/uml.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
 
diff --git a/kernel/arch/um/os-Linux/elf_aux.c b/kernel/arch/um/os-Linux/elf_aux.c
index 1a365ddc4..77a932137 100644
--- a/kernel/arch/um/os-Linux/elf_aux.c
+++ b/kernel/arch/um/os-Linux/elf_aux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  arch/um/kernel/elf_aux.c
  *
diff --git a/kernel/arch/um/os-Linux/user_syms.c b/kernel/arch/um/os-Linux/user_syms.c
index db4a034ae..715594fe5 100644
--- a/kernel/arch/um/os-Linux/user_syms.c
+++ b/kernel/arch/um/os-Linux/user_syms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/module.h>
 
diff --git a/kernel/arch/um/scripts/Makefile.rules b/kernel/arch/um/scripts/Makefile.rules
index 15889df9b..a4dfa7d76 100644
--- a/kernel/arch/um/scripts/Makefile.rules
+++ b/kernel/arch/um/scripts/Makefile.rules
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ===========================================================================
 # arch/um: Generic definitions
 # ===========================================================================
diff --git a/kernel/arch/unicore32/Kconfig b/kernel/arch/unicore32/Kconfig
index 076906692..d39f0bc6a 100644
--- a/kernel/arch/unicore32/Kconfig
+++ b/kernel/arch/unicore32/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config UNICORE32
 	def_bool y
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
diff --git a/kernel/arch/unicore32/Kconfig.debug b/kernel/arch/unicore32/Kconfig.debug
index f075bbe1d..de8dae3ab 100644
--- a/kernel/arch/unicore32/Kconfig.debug
+++ b/kernel/arch/unicore32/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/unicore32/include/mach/regs-ac97.h b/kernel/arch/unicore32/include/mach/regs-ac97.h
index b7563e9d6..85c601898 100644
--- a/kernel/arch/unicore32/include/mach/regs-ac97.h
+++ b/kernel/arch/unicore32/include/mach/regs-ac97.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity AC97 Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-dmac.h b/kernel/arch/unicore32/include/mach/regs-dmac.h
index 66de9e7d1..bbdc52d06 100644
--- a/kernel/arch/unicore32/include/mach/regs-dmac.h
+++ b/kernel/arch/unicore32/include/mach/regs-dmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Direct Memory Access Controller (DMAC)
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-gpio.h b/kernel/arch/unicore32/include/mach/regs-gpio.h
index 0273b861e..806350e1c 100644
--- a/kernel/arch/unicore32/include/mach/regs-gpio.h
+++ b/kernel/arch/unicore32/include/mach/regs-gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity General-Purpose Input/Output (GPIO) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-i2c.h b/kernel/arch/unicore32/include/mach/regs-i2c.h
index 463d108f8..b41aa7c92 100644
--- a/kernel/arch/unicore32/include/mach/regs-i2c.h
+++ b/kernel/arch/unicore32/include/mach/regs-i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Inter-integrated Circuit (I2C) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-intc.h b/kernel/arch/unicore32/include/mach/regs-intc.h
index 25648f89c..4eb1b5b57 100644
--- a/kernel/arch/unicore32/include/mach/regs-intc.h
+++ b/kernel/arch/unicore32/include/mach/regs-intc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUNITY Interrupt Controller (INTC) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-nand.h b/kernel/arch/unicore32/include/mach/regs-nand.h
index a7c5563bb..7f2993925 100644
--- a/kernel/arch/unicore32/include/mach/regs-nand.h
+++ b/kernel/arch/unicore32/include/mach/regs-nand.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity NAND Controller Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-ost.h b/kernel/arch/unicore32/include/mach/regs-ost.h
index 4a85fb463..6c63e7b75 100644
--- a/kernel/arch/unicore32/include/mach/regs-ost.h
+++ b/kernel/arch/unicore32/include/mach/regs-ost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Operating System Timer (OST) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-pci.h b/kernel/arch/unicore32/include/mach/regs-pci.h
index 6a9341686..25bb307b8 100644
--- a/kernel/arch/unicore32/include/mach/regs-pci.h
+++ b/kernel/arch/unicore32/include/mach/regs-pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity AHB-PCI Bridge Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-pm.h b/kernel/arch/unicore32/include/mach/regs-pm.h
index 854844aa8..777b1ace3 100644
--- a/kernel/arch/unicore32/include/mach/regs-pm.h
+++ b/kernel/arch/unicore32/include/mach/regs-pm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUNITY Power Manager (PM) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-ps2.h b/kernel/arch/unicore32/include/mach/regs-ps2.h
index 17d4e6dc0..d539d7482 100644
--- a/kernel/arch/unicore32/include/mach/regs-ps2.h
+++ b/kernel/arch/unicore32/include/mach/regs-ps2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity PS2 Controller Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-resetc.h b/kernel/arch/unicore32/include/mach/regs-resetc.h
index 39900cf4c..5f2b9d77a 100644
--- a/kernel/arch/unicore32/include/mach/regs-resetc.h
+++ b/kernel/arch/unicore32/include/mach/regs-resetc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Reset Controller (RC) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-rtc.h b/kernel/arch/unicore32/include/mach/regs-rtc.h
index e94ca1932..f2f7f47eb 100644
--- a/kernel/arch/unicore32/include/mach/regs-rtc.h
+++ b/kernel/arch/unicore32/include/mach/regs-rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Real-Time Clock (RTC) control registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-sdc.h b/kernel/arch/unicore32/include/mach/regs-sdc.h
index 1303ecf66..658bfaf4c 100644
--- a/kernel/arch/unicore32/include/mach/regs-sdc.h
+++ b/kernel/arch/unicore32/include/mach/regs-sdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Multi-Media Card and Security Digital Card (MMC/SD) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-spi.h b/kernel/arch/unicore32/include/mach/regs-spi.h
index de16895e2..3460647a9 100644
--- a/kernel/arch/unicore32/include/mach/regs-spi.h
+++ b/kernel/arch/unicore32/include/mach/regs-spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Serial Peripheral Interface (SPI) Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-umal.h b/kernel/arch/unicore32/include/mach/regs-umal.h
index aa22df74e..7023089c6 100644
--- a/kernel/arch/unicore32/include/mach/regs-umal.h
+++ b/kernel/arch/unicore32/include/mach/regs-umal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity Ultra Media Access Layer (UMAL) Ethernet MAC Registers
  */
diff --git a/kernel/arch/unicore32/include/mach/regs-unigfx.h b/kernel/arch/unicore32/include/mach/regs-unigfx.h
index faf8b287f..553d1157c 100644
--- a/kernel/arch/unicore32/include/mach/regs-unigfx.h
+++ b/kernel/arch/unicore32/include/mach/regs-unigfx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PKUnity UNIGFX Registers
  */
diff --git a/kernel/arch/unicore32/include/uapi/asm/byteorder.h b/kernel/arch/unicore32/include/uapi/asm/byteorder.h
index ebe1b3fef..864fe4814 100644
--- a/kernel/arch/unicore32/include/uapi/asm/byteorder.h
+++ b/kernel/arch/unicore32/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/arch/unicore32/include/asm/byteorder.h
  *
diff --git a/kernel/arch/unicore32/include/uapi/asm/ptrace.h b/kernel/arch/unicore32/include/uapi/asm/ptrace.h
index 187aa2e98..2820de83e 100644
--- a/kernel/arch/unicore32/include/uapi/asm/ptrace.h
+++ b/kernel/arch/unicore32/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/arch/unicore32/include/asm/ptrace.h
  *
diff --git a/kernel/arch/unicore32/include/uapi/asm/sigcontext.h b/kernel/arch/unicore32/include/uapi/asm/sigcontext.h
index 6a2d7671c..79e56f28e 100644
--- a/kernel/arch/unicore32/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/unicore32/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/arch/unicore32/include/asm/sigcontext.h
  *
diff --git a/kernel/arch/unicore32/include/uapi/asm/unistd.h b/kernel/arch/unicore32/include/uapi/asm/unistd.h
index 1f63c4765..65856eaab 100644
--- a/kernel/arch/unicore32/include/uapi/asm/unistd.h
+++ b/kernel/arch/unicore32/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/arch/unicore32/include/asm/unistd.h
  *
diff --git a/kernel/arch/unicore32/kernel/Makefile b/kernel/arch/unicore32/kernel/Makefile
index 607a72f2a..2f79aa567 100644
--- a/kernel/arch/unicore32/kernel/Makefile
+++ b/kernel/arch/unicore32/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/unicore32/kernel/ksyms.h b/kernel/arch/unicore32/kernel/ksyms.h
index 31472ad94..5d2d5ba32 100644
--- a/kernel/arch/unicore32/kernel/ksyms.h
+++ b/kernel/arch/unicore32/kernel/ksyms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * libgcc functions - functions that are used internally by the
  * compiler...  (prototypes are not correct though, but that
diff --git a/kernel/arch/unicore32/lib/Makefile b/kernel/arch/unicore32/lib/Makefile
index 87229a558..098981a01 100644
--- a/kernel/arch/unicore32/lib/Makefile
+++ b/kernel/arch/unicore32/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/unicore32/lib/Makefile
 #
diff --git a/kernel/arch/unicore32/mm/Kconfig b/kernel/arch/unicore32/mm/Kconfig
index 5f77fb3c6..c256460cd 100644
--- a/kernel/arch/unicore32/mm/Kconfig
+++ b/kernel/arch/unicore32/mm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 comment "Processor Type"
 
 # Select CPU types depending on the architecture selected.  This selects
diff --git a/kernel/arch/unicore32/mm/Makefile b/kernel/arch/unicore32/mm/Makefile
index 46c166699..681c0ef5e 100644
--- a/kernel/arch/unicore32/mm/Makefile
+++ b/kernel/arch/unicore32/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux unicore-specific parts of the memory manager.
 #
diff --git a/kernel/arch/x86/Kconfig b/kernel/arch/x86/Kconfig
index 971feac13..2fdb23313 100644
--- a/kernel/arch/x86/Kconfig
+++ b/kernel/arch/x86/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Select 32 or 64 bit
 config 64BIT
 	bool "64-bit kernel" if ARCH = "x86"
diff --git a/kernel/arch/x86/Kconfig.cpu b/kernel/arch/x86/Kconfig.cpu
index 3ba5ff2f2..65a9a4716 100644
--- a/kernel/arch/x86/Kconfig.cpu
+++ b/kernel/arch/x86/Kconfig.cpu
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Put here option for CPU selection and depending optimization
 choice
 	prompt "Processor family"
diff --git a/kernel/arch/x86/Kconfig.debug b/kernel/arch/x86/Kconfig.debug
index 71a48a30f..90b123056 100644
--- a/kernel/arch/x86/Kconfig.debug
+++ b/kernel/arch/x86/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 config TRACE_IRQFLAGS_SUPPORT
diff --git a/kernel/arch/x86/Makefile b/kernel/arch/x86/Makefile
index 627657225..a20eacd9c 100644
--- a/kernel/arch/x86/Makefile
+++ b/kernel/arch/x86/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Unified Makefile for i386 and x86_64
 
 # select defconfig based on actual architecture
diff --git a/kernel/arch/x86/Makefile.um b/kernel/arch/x86/Makefile.um
index 5b7e898ff..45af19921 100644
--- a/kernel/arch/x86/Makefile.um
+++ b/kernel/arch/x86/Makefile.um
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 core-y += arch/x86/crypto/
 
 ifeq ($(CONFIG_X86_32),y)
diff --git a/kernel/arch/x86/Makefile_32.cpu b/kernel/arch/x86/Makefile_32.cpu
index f3717d367..1f5faf860 100644
--- a/kernel/arch/x86/Makefile_32.cpu
+++ b/kernel/arch/x86/Makefile_32.cpu
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # CPU tuning section - shared with UML.
 # Must change only cflags-y (or [yn]), not CFLAGS! That makes a difference for UML.
 
diff --git a/kernel/arch/x86/boot/code16gcc.h b/kernel/arch/x86/boot/code16gcc.h
index 5ff426535..e19fd7536 100644
--- a/kernel/arch/x86/boot/code16gcc.h
+++ b/kernel/arch/x86/boot/code16gcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #
 # code16gcc.h
 #
diff --git a/kernel/arch/x86/boot/compressed/Makefile b/kernel/arch/x86/boot/compressed/Makefile
index 8a958274b..4b7575b00 100644
--- a/kernel/arch/x86/boot/compressed/Makefile
+++ b/kernel/arch/x86/boot/compressed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/arch/x86/boot/compressed/Makefile
 #
diff --git a/kernel/arch/x86/boot/compressed/cmdline.c b/kernel/arch/x86/boot/compressed/cmdline.c
index 9dc1ce6ba..0cb325734 100644
--- a/kernel/arch/x86/boot/compressed/cmdline.c
+++ b/kernel/arch/x86/boot/compressed/cmdline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "misc.h"
 
 #if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE
diff --git a/kernel/arch/x86/boot/compressed/cpuflags.c b/kernel/arch/x86/boot/compressed/cpuflags.c
index aa3134661..6448a8196 100644
--- a/kernel/arch/x86/boot/compressed/cpuflags.c
+++ b/kernel/arch/x86/boot/compressed/cpuflags.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifdef CONFIG_RANDOMIZE_BASE
 
 #include "../cpuflags.c"
diff --git a/kernel/arch/x86/boot/compressed/eboot.h b/kernel/arch/x86/boot/compressed/eboot.h
index c0223f1a8..e799dc5c6 100644
--- a/kernel/arch/x86/boot/compressed/eboot.h
+++ b/kernel/arch/x86/boot/compressed/eboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOOT_COMPRESSED_EBOOT_H
 #define BOOT_COMPRESSED_EBOOT_H
 
diff --git a/kernel/arch/x86/boot/compressed/efi_stub_32.S b/kernel/arch/x86/boot/compressed/efi_stub_32.S
index a53440e81..257e341fd 100644
--- a/kernel/arch/x86/boot/compressed/efi_stub_32.S
+++ b/kernel/arch/x86/boot/compressed/efi_stub_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * EFI call stub for IA32.
  *
diff --git a/kernel/arch/x86/boot/compressed/efi_thunk_64.S b/kernel/arch/x86/boot/compressed/efi_thunk_64.S
index 630384a4c..bff9ab7c6 100644
--- a/kernel/arch/x86/boot/compressed/efi_thunk_64.S
+++ b/kernel/arch/x86/boot/compressed/efi_thunk_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2014, 2015 Intel Corporation; author Matt Fleming
  *
diff --git a/kernel/arch/x86/boot/compressed/error.c b/kernel/arch/x86/boot/compressed/error.c
index 31922023d..c881878e5 100644
--- a/kernel/arch/x86/boot/compressed/error.c
+++ b/kernel/arch/x86/boot/compressed/error.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Callers outside of misc.c need access to the error reporting routines,
  * but the *_putstr() functions need to stay in misc.c because of how
diff --git a/kernel/arch/x86/boot/compressed/error.h b/kernel/arch/x86/boot/compressed/error.h
index d732e608e..1de582118 100644
--- a/kernel/arch/x86/boot/compressed/error.h
+++ b/kernel/arch/x86/boot/compressed/error.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOOT_COMPRESSED_ERROR_H
 #define BOOT_COMPRESSED_ERROR_H
 
diff --git a/kernel/arch/x86/boot/compressed/head_32.S b/kernel/arch/x86/boot/compressed/head_32.S
index 11c68cf53..37380c0d5 100644
--- a/kernel/arch/x86/boot/compressed/head_32.S
+++ b/kernel/arch/x86/boot/compressed/head_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/boot/head.S
  *
diff --git a/kernel/arch/x86/boot/compressed/head_64.S b/kernel/arch/x86/boot/compressed/head_64.S
index b4a5d2843..beb255b66 100644
--- a/kernel/arch/x86/boot/compressed/head_64.S
+++ b/kernel/arch/x86/boot/compressed/head_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/boot/head.S
  *
diff --git a/kernel/arch/x86/boot/compressed/kaslr.c b/kernel/arch/x86/boot/compressed/kaslr.c
index 17818ba69..a63fbc25c 100644
--- a/kernel/arch/x86/boot/compressed/kaslr.c
+++ b/kernel/arch/x86/boot/compressed/kaslr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kaslr.c
  *
diff --git a/kernel/arch/x86/boot/compressed/misc.c b/kernel/arch/x86/boot/compressed/misc.c
index c14217cd0..b50c42455 100644
--- a/kernel/arch/x86/boot/compressed/misc.c
+++ b/kernel/arch/x86/boot/compressed/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * misc.c
  *
diff --git a/kernel/arch/x86/boot/compressed/misc.h b/kernel/arch/x86/boot/compressed/misc.h
index 766a5211f..32d4ec2e0 100644
--- a/kernel/arch/x86/boot/compressed/misc.h
+++ b/kernel/arch/x86/boot/compressed/misc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOOT_COMPRESSED_MISC_H
 #define BOOT_COMPRESSED_MISC_H
 
diff --git a/kernel/arch/x86/boot/compressed/pagetable.c b/kernel/arch/x86/boot/compressed/pagetable.c
index f1aa43854..972319ff5 100644
--- a/kernel/arch/x86/boot/compressed/pagetable.c
+++ b/kernel/arch/x86/boot/compressed/pagetable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This code is used on x86_64 to create page table identity mappings on
  * demand by building up a new set of page tables (or appending to the
diff --git a/kernel/arch/x86/boot/compressed/string.c b/kernel/arch/x86/boot/compressed/string.c
index cea140ce6..19dbbcdd1 100644
--- a/kernel/arch/x86/boot/compressed/string.c
+++ b/kernel/arch/x86/boot/compressed/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This provides an optimized implementation of memcpy, and a simplified
  * implementation of memset and memmove. These are used here because the
diff --git a/kernel/arch/x86/boot/compressed/vmlinux.lds.S b/kernel/arch/x86/boot/compressed/vmlinux.lds.S
index e24e0a0c9..f491bbde8 100644
--- a/kernel/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/kernel/arch/x86/boot/compressed/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/vmlinux.lds.h>
 
 OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
diff --git a/kernel/arch/x86/boot/cpuflags.c b/kernel/arch/x86/boot/cpuflags.c
index 9e77c23c2..a0b75f73d 100644
--- a/kernel/arch/x86/boot/cpuflags.c
+++ b/kernel/arch/x86/boot/cpuflags.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include "bitops.h"
 
diff --git a/kernel/arch/x86/boot/cpuflags.h b/kernel/arch/x86/boot/cpuflags.h
index 15ad56a3f..2e20814d3 100644
--- a/kernel/arch/x86/boot/cpuflags.h
+++ b/kernel/arch/x86/boot/cpuflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOOT_CPUFLAGS_H
 #define BOOT_CPUFLAGS_H
 
diff --git a/kernel/arch/x86/boot/ctype.h b/kernel/arch/x86/boot/ctype.h
index 020f137df..8f5ef2994 100644
--- a/kernel/arch/x86/boot/ctype.h
+++ b/kernel/arch/x86/boot/ctype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOOT_CTYPE_H
 #define BOOT_CTYPE_H
 
diff --git a/kernel/arch/x86/boot/early_serial_console.c b/kernel/arch/x86/boot/early_serial_console.c
index f0b8d6d93..b25c53527 100644
--- a/kernel/arch/x86/boot/early_serial_console.c
+++ b/kernel/arch/x86/boot/early_serial_console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Serial port routines for use during early boot reporting. This code is
  * included from both the compressed kernel and the regular kernel.
diff --git a/kernel/arch/x86/boot/header.S b/kernel/arch/x86/boot/header.S
index 1bb08ecff..9c7ea597e 100644
--- a/kernel/arch/x86/boot/header.S
+++ b/kernel/arch/x86/boot/header.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	header.S
  *
diff --git a/kernel/arch/x86/boot/string.h b/kernel/arch/x86/boot/string.h
index f274a50db..3d78e2707 100644
--- a/kernel/arch/x86/boot/string.h
+++ b/kernel/arch/x86/boot/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BOOT_STRING_H
 #define BOOT_STRING_H
 
diff --git a/kernel/arch/x86/boot/tools/build.c b/kernel/arch/x86/boot/tools/build.c
index 0702d2531..d4e6cd457 100644
--- a/kernel/arch/x86/boot/tools/build.c
+++ b/kernel/arch/x86/boot/tools/build.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 1997 Martin Mares
diff --git a/kernel/arch/x86/crypto/Makefile b/kernel/arch/x86/crypto/Makefile
index 9e32d40d7..5f07333bb 100644
--- a/kernel/arch/x86/crypto/Makefile
+++ b/kernel/arch/x86/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific CryptoAPI modules.
 #
diff --git a/kernel/arch/x86/crypto/chacha20-avx2-x86_64.S b/kernel/arch/x86/crypto/chacha20-avx2-x86_64.S
index 3a2dc3dc6..f3cd26f48 100644
--- a/kernel/arch/x86/crypto/chacha20-avx2-x86_64.S
+++ b/kernel/arch/x86/crypto/chacha20-avx2-x86_64.S
@@ -45,7 +45,7 @@ ENTRY(chacha20_8block_xor_avx2)
 
 	vzeroupper
 	# 4 * 32 byte stack, 32-byte aligned
-	mov		%rsp, %r8
+	lea		8(%rsp),%r10
 	and		$~31, %rsp
 	sub		$0x80, %rsp
 
@@ -443,6 +443,6 @@ ENTRY(chacha20_8block_xor_avx2)
 	vmovdqu		%ymm15,0x01e0(%rsi)
 
 	vzeroupper
-	mov		%r8,%rsp
+	lea		-8(%r10),%rsp
 	ret
 ENDPROC(chacha20_8block_xor_avx2)
diff --git a/kernel/arch/x86/crypto/chacha20-ssse3-x86_64.S b/kernel/arch/x86/crypto/chacha20-ssse3-x86_64.S
index 3f511a7d7..512a2b500 100644
--- a/kernel/arch/x86/crypto/chacha20-ssse3-x86_64.S
+++ b/kernel/arch/x86/crypto/chacha20-ssse3-x86_64.S
@@ -160,7 +160,7 @@ ENTRY(chacha20_4block_xor_ssse3)
 	# done with the slightly better performing SSSE3 byte shuffling,
 	# 7/12-bit word rotation uses traditional shift+OR.
 
-	mov		%rsp,%r11
+	lea		8(%rsp),%r10
 	sub		$0x80,%rsp
 	and		$~63,%rsp
 
@@ -625,6 +625,6 @@ ENTRY(chacha20_4block_xor_ssse3)
 	pxor		%xmm1,%xmm15
 	movdqu		%xmm15,0xf0(%rsi)
 
-	mov		%r11,%rsp
+	lea		-8(%r10),%rsp
 	ret
 ENDPROC(chacha20_4block_xor_ssse3)
diff --git a/kernel/arch/x86/crypto/salsa20-x86_64-asm_64.S b/kernel/arch/x86/crypto/salsa20-x86_64-asm_64.S
index 9279e0b2d..10db30d58 100644
--- a/kernel/arch/x86/crypto/salsa20-x86_64-asm_64.S
+++ b/kernel/arch/x86/crypto/salsa20-x86_64-asm_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 # enter salsa20_encrypt_bytes
diff --git a/kernel/arch/x86/crypto/sha1-mb/Makefile b/kernel/arch/x86/crypto/sha1-mb/Makefile
index 2e14acc3d..815ded3ba 100644
--- a/kernel/arch/x86/crypto/sha1-mb/Makefile
+++ b/kernel/arch/x86/crypto/sha1-mb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific CryptoAPI modules.
 #
diff --git a/kernel/arch/x86/crypto/sha256-mb/Makefile b/kernel/arch/x86/crypto/sha256-mb/Makefile
index 45b4fca6c..53ad6e7db 100644
--- a/kernel/arch/x86/crypto/sha256-mb/Makefile
+++ b/kernel/arch/x86/crypto/sha256-mb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific CryptoAPI modules.
 #
diff --git a/kernel/arch/x86/crypto/sha512-mb/Makefile b/kernel/arch/x86/crypto/sha512-mb/Makefile
index 0a57e2103..90f1ef691 100644
--- a/kernel/arch/x86/crypto/sha512-mb/Makefile
+++ b/kernel/arch/x86/crypto/sha512-mb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Arch-specific CryptoAPI modules.
 #
diff --git a/kernel/arch/x86/entry/Makefile b/kernel/arch/x86/entry/Makefile
index af28a8a24..06fc70cf5 100644
--- a/kernel/arch/x86/entry/Makefile
+++ b/kernel/arch/x86/entry/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the x86 low level entry code
 #
diff --git a/kernel/arch/x86/entry/calling.h b/kernel/arch/x86/entry/calling.h
index 640aafebd..6e160031c 100644
--- a/kernel/arch/x86/entry/calling.h
+++ b/kernel/arch/x86/entry/calling.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/jump_label.h>
 #include <asm/unwind_hints.h>
 
diff --git a/kernel/arch/x86/entry/entry_32.S b/kernel/arch/x86/entry/entry_32.S
index 50e0d2bc4..4838037f9 100644
--- a/kernel/arch/x86/entry/entry_32.S
+++ b/kernel/arch/x86/entry/entry_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 1991,1992  Linus Torvalds
  *
diff --git a/kernel/arch/x86/entry/entry_64.S b/kernel/arch/x86/entry/entry_64.S
index f6cdb7a14..bcfc5668d 100644
--- a/kernel/arch/x86/entry/entry_64.S
+++ b/kernel/arch/x86/entry/entry_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/x86_64/entry.S
  *
diff --git a/kernel/arch/x86/entry/entry_64_compat.S b/kernel/arch/x86/entry/entry_64_compat.S
index e26c25ca7..b5c7a56ed 100644
--- a/kernel/arch/x86/entry/entry_64_compat.S
+++ b/kernel/arch/x86/entry/entry_64_compat.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Compatibility mode system call entry point for x86-64.
  *
diff --git a/kernel/arch/x86/entry/syscall_32.c b/kernel/arch/x86/entry/syscall_32.c
index 8f895ee13..95c294963 100644
--- a/kernel/arch/x86/entry/syscall_32.c
+++ b/kernel/arch/x86/entry/syscall_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* System call table for i386. */
 
 #include <linux/linkage.h>
diff --git a/kernel/arch/x86/entry/syscall_64.c b/kernel/arch/x86/entry/syscall_64.c
index 9dbc5abb6..9c09775e5 100644
--- a/kernel/arch/x86/entry/syscall_64.c
+++ b/kernel/arch/x86/entry/syscall_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* System call table for x86-64. */
 
 #include <linux/linkage.h>
diff --git a/kernel/arch/x86/entry/syscalls/Makefile b/kernel/arch/x86/entry/syscalls/Makefile
index 57aa59fd1..331f1dca5 100644
--- a/kernel/arch/x86/entry/syscalls/Makefile
+++ b/kernel/arch/x86/entry/syscalls/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 out := $(obj)/../../include/generated/asm
 uapi := $(obj)/../../include/generated/uapi/asm
 
diff --git a/kernel/arch/x86/entry/syscalls/syscallhdr.sh b/kernel/arch/x86/entry/syscalls/syscallhdr.sh
index 31fd5f1f3..12fbbcfe7 100644
--- a/kernel/arch/x86/entry/syscalls/syscallhdr.sh
+++ b/kernel/arch/x86/entry/syscalls/syscallhdr.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 in="$1"
 out="$2"
diff --git a/kernel/arch/x86/entry/syscalls/syscalltbl.sh b/kernel/arch/x86/entry/syscalls/syscalltbl.sh
index 751d1f992..d71ef4bd3 100644
--- a/kernel/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/kernel/arch/x86/entry/syscalls/syscalltbl.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 in="$1"
 out="$2"
diff --git a/kernel/arch/x86/entry/vdso/Makefile b/kernel/arch/x86/entry/vdso/Makefile
index d5409660f..c366c0ade 100644
--- a/kernel/arch/x86/entry/vdso/Makefile
+++ b/kernel/arch/x86/entry/vdso/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Building vDSO images for x86.
 #
diff --git a/kernel/arch/x86/entry/vdso/vdso-layout.lds.S b/kernel/arch/x86/entry/vdso/vdso-layout.lds.S
index 8ebb4b645..acfd5ba7d 100644
--- a/kernel/arch/x86/entry/vdso/vdso-layout.lds.S
+++ b/kernel/arch/x86/entry/vdso/vdso-layout.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/vdso.h>
 
 /*
diff --git a/kernel/arch/x86/entry/vdso/vdso.lds.S b/kernel/arch/x86/entry/vdso/vdso.lds.S
index 680793264..d3a2dce4c 100644
--- a/kernel/arch/x86/entry/vdso/vdso.lds.S
+++ b/kernel/arch/x86/entry/vdso/vdso.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for 64-bit vDSO.
  * We #include the file to define the layout details.
diff --git a/kernel/arch/x86/entry/vdso/vdso2c.h b/kernel/arch/x86/entry/vdso/vdso2c.h
index 3dab75f2a..fa847a620 100644
--- a/kernel/arch/x86/entry/vdso/vdso2c.h
+++ b/kernel/arch/x86/entry/vdso/vdso2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file is included twice from vdso2c.c.  It generates code for 32-bit
  * and 64-bit vDSOs.  We need both for 64-bit builds, since 32-bit vDSOs
diff --git a/kernel/arch/x86/entry/vdso/vdso32-setup.c b/kernel/arch/x86/entry/vdso/vdso32-setup.c
index 3f9d1a838..42d4c89f9 100644
--- a/kernel/arch/x86/entry/vdso/vdso32-setup.c
+++ b/kernel/arch/x86/entry/vdso/vdso32-setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) Copyright 2002 Linus Torvalds
  * Portions based on the vdso-randomization code from exec-shield:
diff --git a/kernel/arch/x86/entry/vdso/vdso32/note.S b/kernel/arch/x86/entry/vdso/vdso32/note.S
index c83f25734..9fd51f206 100644
--- a/kernel/arch/x86/entry/vdso/vdso32/note.S
+++ b/kernel/arch/x86/entry/vdso/vdso32/note.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
  * Here we can supply some information useful to userland.
diff --git a/kernel/arch/x86/entry/vdso/vdso32/sigreturn.S b/kernel/arch/x86/entry/vdso/vdso32/sigreturn.S
index 20633e026..c3233ee98 100644
--- a/kernel/arch/x86/entry/vdso/vdso32/sigreturn.S
+++ b/kernel/arch/x86/entry/vdso/vdso32/sigreturn.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/unistd_32.h>
 #include <asm/asm-offsets.h>
diff --git a/kernel/arch/x86/entry/vdso/vdso32/system_call.S b/kernel/arch/x86/entry/vdso/vdso32/system_call.S
index ed4bc9731..263d7433d 100644
--- a/kernel/arch/x86/entry/vdso/vdso32/system_call.S
+++ b/kernel/arch/x86/entry/vdso/vdso32/system_call.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * AT_SYSINFO entry point
 */
diff --git a/kernel/arch/x86/entry/vdso/vdso32/vclock_gettime.c b/kernel/arch/x86/entry/vdso/vdso32/vclock_gettime.c
index 87a86e017..7780bbfb0 100644
--- a/kernel/arch/x86/entry/vdso/vdso32/vclock_gettime.c
+++ b/kernel/arch/x86/entry/vdso/vdso32/vclock_gettime.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define BUILD_VDSO32
 
 #ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE
diff --git a/kernel/arch/x86/entry/vdso/vdso32/vdso32.lds.S b/kernel/arch/x86/entry/vdso/vdso32/vdso32.lds.S
index 31056cf29..422764a81 100644
--- a/kernel/arch/x86/entry/vdso/vdso32/vdso32.lds.S
+++ b/kernel/arch/x86/entry/vdso/vdso32/vdso32.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for 32-bit vDSO.
  * We #include the file to define the layout details.
diff --git a/kernel/arch/x86/entry/vdso/vdsox32.lds.S b/kernel/arch/x86/entry/vdso/vdsox32.lds.S
index 697c11ece..05cd1c5c4 100644
--- a/kernel/arch/x86/entry/vdso/vdsox32.lds.S
+++ b/kernel/arch/x86/entry/vdso/vdsox32.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for x32 vDSO.
  * We #include the file to define the layout details.
diff --git a/kernel/arch/x86/entry/vsyscall/vsyscall_64.c b/kernel/arch/x86/entry/vsyscall/vsyscall_64.c
index ce1d7534f..f279ba264 100644
--- a/kernel/arch/x86/entry/vsyscall/vsyscall_64.c
+++ b/kernel/arch/x86/entry/vsyscall/vsyscall_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2012-2014 Andy Lutomirski <luto@amacapital.net>
  *
diff --git a/kernel/arch/x86/entry/vsyscall/vsyscall_gtod.c b/kernel/arch/x86/entry/vsyscall/vsyscall_gtod.c
index 0fb3a104a..e1216dd95 100644
--- a/kernel/arch/x86/entry/vsyscall/vsyscall_gtod.c
+++ b/kernel/arch/x86/entry/vsyscall/vsyscall_gtod.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE
  *  Copyright 2003 Andi Kleen, SuSE Labs.
diff --git a/kernel/arch/x86/entry/vsyscall/vsyscall_trace.h b/kernel/arch/x86/entry/vsyscall/vsyscall_trace.h
index 9dd7359a3..3c3f9765a 100644
--- a/kernel/arch/x86/entry/vsyscall/vsyscall_trace.h
+++ b/kernel/arch/x86/entry/vsyscall/vsyscall_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vsyscall
 
diff --git a/kernel/arch/x86/events/Kconfig b/kernel/arch/x86/events/Kconfig
index 98397db5c..9a7a1446c 100644
--- a/kernel/arch/x86/events/Kconfig
+++ b/kernel/arch/x86/events/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Performance monitoring"
 
 config PERF_EVENTS_INTEL_UNCORE
diff --git a/kernel/arch/x86/events/amd/Makefile b/kernel/arch/x86/events/amd/Makefile
index b1da46f39..fe8795a67 100644
--- a/kernel/arch/x86/events/amd/Makefile
+++ b/kernel/arch/x86/events/amd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CPU_SUP_AMD)		+= core.o uncore.o
 obj-$(CONFIG_PERF_EVENTS_AMD_POWER)	+= power.o
 obj-$(CONFIG_X86_LOCAL_APIC)		+= ibs.o
diff --git a/kernel/arch/x86/events/intel/Makefile b/kernel/arch/x86/events/intel/Makefile
index e9d8520a8..3468b0c1d 100644
--- a/kernel/arch/x86/events/intel/Makefile
+++ b/kernel/arch/x86/events/intel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CPU_SUP_INTEL)		+= core.o bts.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= ds.o knc.o
 obj-$(CONFIG_CPU_SUP_INTEL)		+= lbr.o p4.o p6.o pt.o
diff --git a/kernel/arch/x86/events/intel/ds.c b/kernel/arch/x86/events/intel/ds.c
index e1965e5ff..3674a4b6f 100644
--- a/kernel/arch/x86/events/intel/ds.c
+++ b/kernel/arch/x86/events/intel/ds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/x86/events/intel/knc.c b/kernel/arch/x86/events/intel/knc.c
index 548d5f774..618001c20 100644
--- a/kernel/arch/x86/events/intel/knc.c
+++ b/kernel/arch/x86/events/intel/knc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Driver for Intel Xeon Phi "Knights Corner" PMU */
 
 #include <linux/perf_event.h>
diff --git a/kernel/arch/x86/events/intel/lbr.c b/kernel/arch/x86/events/intel/lbr.c
index 8a6bbacd1..ae64d0b69 100644
--- a/kernel/arch/x86/events/intel/lbr.c
+++ b/kernel/arch/x86/events/intel/lbr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/perf_event.h>
 #include <linux/types.h>
 
diff --git a/kernel/arch/x86/events/intel/p6.c b/kernel/arch/x86/events/intel/p6.c
index 1f5c47ab4..a5604c352 100644
--- a/kernel/arch/x86/events/intel/p6.c
+++ b/kernel/arch/x86/events/intel/p6.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/perf_event.h>
 #include <linux/types.h>
 
diff --git a/kernel/arch/x86/events/intel/uncore.h b/kernel/arch/x86/events/intel/uncore.h
index df5989f27..4364191e7 100644
--- a/kernel/arch/x86/events/intel/uncore.h
+++ b/kernel/arch/x86/events/intel/uncore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <asm/apicdef.h>
diff --git a/kernel/arch/x86/events/intel/uncore_nhmex.c b/kernel/arch/x86/events/intel/uncore_nhmex.c
index 6a5cbe90f..93e7a8397 100644
--- a/kernel/arch/x86/events/intel/uncore_nhmex.c
+++ b/kernel/arch/x86/events/intel/uncore_nhmex.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Nehalem-EX/Westmere-EX uncore support */
 #include "uncore.h"
 
diff --git a/kernel/arch/x86/events/intel/uncore_snb.c b/kernel/arch/x86/events/intel/uncore_snb.c
index db1127ce6..aee5e8496 100644
--- a/kernel/arch/x86/events/intel/uncore_snb.c
+++ b/kernel/arch/x86/events/intel/uncore_snb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Nehalem/SandBridge/Haswell/Broadwell/Skylake uncore support */
 #include "uncore.h"
 
diff --git a/kernel/arch/x86/events/intel/uncore_snbep.c b/kernel/arch/x86/events/intel/uncore_snbep.c
index a71968184..95cb19f4e 100644
--- a/kernel/arch/x86/events/intel/uncore_snbep.c
+++ b/kernel/arch/x86/events/intel/uncore_snbep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* SandyBridge-EP/IvyTown uncore support */
 #include "uncore.h"
 
diff --git a/kernel/arch/x86/events/msr.c b/kernel/arch/x86/events/msr.c
index 06723671a..14efaa0e8 100644
--- a/kernel/arch/x86/events/msr.c
+++ b/kernel/arch/x86/events/msr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/perf_event.h>
 #include <asm/intel-family.h>
 
diff --git a/kernel/arch/x86/ia32/audit.c b/kernel/arch/x86/ia32/audit.c
index 2eccc8932..3d21eab7a 100644
--- a/kernel/arch/x86/ia32/audit.c
+++ b/kernel/arch/x86/ia32/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/unistd_32.h>
 
 unsigned ia32_dir_class[] = {
diff --git a/kernel/arch/x86/ia32/ia32_signal.c b/kernel/arch/x86/ia32/ia32_signal.c
index 0e2a5edbc..41c671854 100644
--- a/kernel/arch/x86/ia32/ia32_signal.c
+++ b/kernel/arch/x86/ia32/ia32_signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/x86_64/ia32/ia32_signal.c
  *
diff --git a/kernel/arch/x86/ia32/sys_ia32.c b/kernel/arch/x86/ia32/sys_ia32.c
index 47956c6a4..96cd33bbf 100644
--- a/kernel/arch/x86/ia32/sys_ia32.c
+++ b/kernel/arch/x86/ia32/sys_ia32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sys_ia32.c: Conversion between 32bit and 64bit native syscalls. Based on
  *             sys_sparc32
diff --git a/kernel/arch/x86/include/asm/acpi.h b/kernel/arch/x86/include/asm/acpi.h
index 72d867f6b..8d0ec9df1 100644
--- a/kernel/arch/x86/include/asm/acpi.h
+++ b/kernel/arch/x86/include/asm/acpi.h
@@ -150,6 +150,8 @@ static inline void disable_acpi(void) { }
 extern int x86_acpi_numa_init(void);
 #endif /* CONFIG_ACPI_NUMA */
 
+#define acpi_unlazy_tlb(x)	leave_mm(x)
+
 #ifdef CONFIG_ACPI_APEI
 static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr)
 {
diff --git a/kernel/arch/x86/include/asm/agp.h b/kernel/arch/x86/include/asm/agp.h
index eec2a70d4..8e25bf4f3 100644
--- a/kernel/arch/x86/include/asm/agp.h
+++ b/kernel/arch/x86/include/asm/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_AGP_H
 #define _ASM_X86_AGP_H
 
diff --git a/kernel/arch/x86/include/asm/alternative-asm.h b/kernel/arch/x86/include/asm/alternative-asm.h
index 6c98821fe..31b627b43 100644
--- a/kernel/arch/x86/include/asm/alternative-asm.h
+++ b/kernel/arch/x86/include/asm/alternative-asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ALTERNATIVE_ASM_H
 #define _ASM_X86_ALTERNATIVE_ASM_H
 
diff --git a/kernel/arch/x86/include/asm/alternative.h b/kernel/arch/x86/include/asm/alternative.h
index ccbe24e69..dbfd08546 100644
--- a/kernel/arch/x86/include/asm/alternative.h
+++ b/kernel/arch/x86/include/asm/alternative.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ALTERNATIVE_H
 #define _ASM_X86_ALTERNATIVE_H
 
diff --git a/kernel/arch/x86/include/asm/amd_nb.h b/kernel/arch/x86/include/asm/amd_nb.h
index da181ad1d..fddb6d262 100644
--- a/kernel/arch/x86/include/asm/amd_nb.h
+++ b/kernel/arch/x86/include/asm/amd_nb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_AMD_NB_H
 #define _ASM_X86_AMD_NB_H
 
diff --git a/kernel/arch/x86/include/asm/apic_flat_64.h b/kernel/arch/x86/include/asm/apic_flat_64.h
index a2d312796..d3a2b3876 100644
--- a/kernel/arch/x86/include/asm/apic_flat_64.h
+++ b/kernel/arch/x86/include/asm/apic_flat_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_APIC_FLAT_64_H
 #define _ASM_X86_APIC_FLAT_64_H
 
diff --git a/kernel/arch/x86/include/asm/apicdef.h b/kernel/arch/x86/include/asm/apicdef.h
index c46bb99d5..05e694ed8 100644
--- a/kernel/arch/x86/include/asm/apicdef.h
+++ b/kernel/arch/x86/include/asm/apicdef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_APICDEF_H
 #define _ASM_X86_APICDEF_H
 
diff --git a/kernel/arch/x86/include/asm/apm.h b/kernel/arch/x86/include/asm/apm.h
index 93eebc636..4d4015ddc 100644
--- a/kernel/arch/x86/include/asm/apm.h
+++ b/kernel/arch/x86/include/asm/apm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Machine specific APM BIOS functions for generic.
  *  Split out from apm.c by Osamu Tomita <tomita@cinet.co.jp>
diff --git a/kernel/arch/x86/include/asm/arch_hweight.h b/kernel/arch/x86/include/asm/arch_hweight.h
index e7cd63175..34a10b2d5 100644
--- a/kernel/arch/x86/include/asm/arch_hweight.h
+++ b/kernel/arch/x86/include/asm/arch_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HWEIGHT_H
 #define _ASM_X86_HWEIGHT_H
 
diff --git a/kernel/arch/x86/include/asm/asm-prototypes.h b/kernel/arch/x86/include/asm/asm-prototypes.h
index 830b19dbf..ff700d81e 100644
--- a/kernel/arch/x86/include/asm/asm-prototypes.h
+++ b/kernel/arch/x86/include/asm/asm-prototypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/ftrace.h>
 #include <linux/uaccess.h>
 #include <asm/string.h>
diff --git a/kernel/arch/x86/include/asm/asm.h b/kernel/arch/x86/include/asm/asm.h
index b0dc91f4b..219faaec5 100644
--- a/kernel/arch/x86/include/asm/asm.h
+++ b/kernel/arch/x86/include/asm/asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ASM_H
 #define _ASM_X86_ASM_H
 
diff --git a/kernel/arch/x86/include/asm/atomic.h b/kernel/arch/x86/include/asm/atomic.h
index 0874ebda3..72759f131 100644
--- a/kernel/arch/x86/include/asm/atomic.h
+++ b/kernel/arch/x86/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ATOMIC_H
 #define _ASM_X86_ATOMIC_H
 
diff --git a/kernel/arch/x86/include/asm/atomic64_32.h b/kernel/arch/x86/include/asm/atomic64_32.h
index 9e206f31c..97c46b816 100644
--- a/kernel/arch/x86/include/asm/atomic64_32.h
+++ b/kernel/arch/x86/include/asm/atomic64_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ATOMIC64_32_H
 #define _ASM_X86_ATOMIC64_32_H
 
diff --git a/kernel/arch/x86/include/asm/atomic64_64.h b/kernel/arch/x86/include/asm/atomic64_64.h
index 5d9de36a2..738495caf 100644
--- a/kernel/arch/x86/include/asm/atomic64_64.h
+++ b/kernel/arch/x86/include/asm/atomic64_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ATOMIC64_64_H
 #define _ASM_X86_ATOMIC64_64_H
 
diff --git a/kernel/arch/x86/include/asm/barrier.h b/kernel/arch/x86/include/asm/barrier.h
index bfb28caf9..01727dbc2 100644
--- a/kernel/arch/x86/include/asm/barrier.h
+++ b/kernel/arch/x86/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BARRIER_H
 #define _ASM_X86_BARRIER_H
 
diff --git a/kernel/arch/x86/include/asm/bios_ebda.h b/kernel/arch/x86/include/asm/bios_ebda.h
index 4b7b8e716..4d5a17e2f 100644
--- a/kernel/arch/x86/include/asm/bios_ebda.h
+++ b/kernel/arch/x86/include/asm/bios_ebda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BIOS_EBDA_H
 #define _ASM_X86_BIOS_EBDA_H
 
diff --git a/kernel/arch/x86/include/asm/bitops.h b/kernel/arch/x86/include/asm/bitops.h
index 854022772..2bcf47314 100644
--- a/kernel/arch/x86/include/asm/bitops.h
+++ b/kernel/arch/x86/include/asm/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BITOPS_H
 #define _ASM_X86_BITOPS_H
 
diff --git a/kernel/arch/x86/include/asm/boot.h b/kernel/arch/x86/include/asm/boot.h
index abd06b19d..680c32036 100644
--- a/kernel/arch/x86/include/asm/boot.h
+++ b/kernel/arch/x86/include/asm/boot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BOOT_H
 #define _ASM_X86_BOOT_H
 
diff --git a/kernel/arch/x86/include/asm/bootparam_utils.h b/kernel/arch/x86/include/asm/bootparam_utils.h
index 4a8cb8d7c..a07ffd23e 100644
--- a/kernel/arch/x86/include/asm/bootparam_utils.h
+++ b/kernel/arch/x86/include/asm/bootparam_utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BOOTPARAM_UTILS_H
 #define _ASM_X86_BOOTPARAM_UTILS_H
 
diff --git a/kernel/arch/x86/include/asm/bug.h b/kernel/arch/x86/include/asm/bug.h
index aa6b2023d..34d99af43 100644
--- a/kernel/arch/x86/include/asm/bug.h
+++ b/kernel/arch/x86/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BUG_H
 #define _ASM_X86_BUG_H
 
diff --git a/kernel/arch/x86/include/asm/bugs.h b/kernel/arch/x86/include/asm/bugs.h
index 5490bbaf7..542509b53 100644
--- a/kernel/arch/x86/include/asm/bugs.h
+++ b/kernel/arch/x86/include/asm/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BUGS_H
 #define _ASM_X86_BUGS_H
 
diff --git a/kernel/arch/x86/include/asm/cache.h b/kernel/arch/x86/include/asm/cache.h
index 48f99f154..abe08690a 100644
--- a/kernel/arch/x86/include/asm/cache.h
+++ b/kernel/arch/x86/include/asm/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CACHE_H
 #define _ASM_X86_CACHE_H
 
diff --git a/kernel/arch/x86/include/asm/cacheflush.h b/kernel/arch/x86/include/asm/cacheflush.h
index cb9a1af10..63feaf2a5 100644
--- a/kernel/arch/x86/include/asm/cacheflush.h
+++ b/kernel/arch/x86/include/asm/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CACHEFLUSH_H
 #define _ASM_X86_CACHEFLUSH_H
 
diff --git a/kernel/arch/x86/include/asm/ce4100.h b/kernel/arch/x86/include/asm/ce4100.h
index e656ad8c0..2930f560d 100644
--- a/kernel/arch/x86/include/asm/ce4100.h
+++ b/kernel/arch/x86/include/asm/ce4100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_CE4100_H_
 #define _ASM_CE4100_H_
 
diff --git a/kernel/arch/x86/include/asm/checksum.h b/kernel/arch/x86/include/asm/checksum.h
index 5f5bb0f97..d79d1e622 100644
--- a/kernel/arch/x86/include/asm/checksum.h
+++ b/kernel/arch/x86/include/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_X86_32
 # include <asm/checksum_32.h>
 #else
diff --git a/kernel/arch/x86/include/asm/checksum_32.h b/kernel/arch/x86/include/asm/checksum_32.h
index 7b53743ed..7a659c74c 100644
--- a/kernel/arch/x86/include/asm/checksum_32.h
+++ b/kernel/arch/x86/include/asm/checksum_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CHECKSUM_32_H
 #define _ASM_X86_CHECKSUM_32_H
 
diff --git a/kernel/arch/x86/include/asm/checksum_64.h b/kernel/arch/x86/include/asm/checksum_64.h
index 08e7efb2c..3ec6d3267 100644
--- a/kernel/arch/x86/include/asm/checksum_64.h
+++ b/kernel/arch/x86/include/asm/checksum_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CHECKSUM_64_H
 #define _ASM_X86_CHECKSUM_64_H
 
diff --git a/kernel/arch/x86/include/asm/clocksource.h b/kernel/arch/x86/include/asm/clocksource.h
index 47bea8cad..dc4cfc888 100644
--- a/kernel/arch/x86/include/asm/clocksource.h
+++ b/kernel/arch/x86/include/asm/clocksource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* x86-specific clocksource additions */
 
 #ifndef _ASM_X86_CLOCKSOURCE_H
diff --git a/kernel/arch/x86/include/asm/cmdline.h b/kernel/arch/x86/include/asm/cmdline.h
index 84ae170bc..6faaf27e8 100644
--- a/kernel/arch/x86/include/asm/cmdline.h
+++ b/kernel/arch/x86/include/asm/cmdline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CMDLINE_H
 #define _ASM_X86_CMDLINE_H
 
diff --git a/kernel/arch/x86/include/asm/cmpxchg.h b/kernel/arch/x86/include/asm/cmpxchg.h
index b5069e802..56bd436ed 100644
--- a/kernel/arch/x86/include/asm/cmpxchg.h
+++ b/kernel/arch/x86/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_CMPXCHG_H
 #define ASM_X86_CMPXCHG_H
 
diff --git a/kernel/arch/x86/include/asm/cmpxchg_32.h b/kernel/arch/x86/include/asm/cmpxchg_32.h
index e4959d023..1732704f0 100644
--- a/kernel/arch/x86/include/asm/cmpxchg_32.h
+++ b/kernel/arch/x86/include/asm/cmpxchg_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CMPXCHG_32_H
 #define _ASM_X86_CMPXCHG_32_H
 
diff --git a/kernel/arch/x86/include/asm/cmpxchg_64.h b/kernel/arch/x86/include/asm/cmpxchg_64.h
index caa23a34c..03cad196a 100644
--- a/kernel/arch/x86/include/asm/cmpxchg_64.h
+++ b/kernel/arch/x86/include/asm/cmpxchg_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CMPXCHG_64_H
 #define _ASM_X86_CMPXCHG_64_H
 
diff --git a/kernel/arch/x86/include/asm/compat.h b/kernel/arch/x86/include/asm/compat.h
index 5343c1981..9eef9cc64 100644
--- a/kernel/arch/x86/include/asm/compat.h
+++ b/kernel/arch/x86/include/asm/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_COMPAT_H
 #define _ASM_X86_COMPAT_H
 
diff --git a/kernel/arch/x86/include/asm/cpu.h b/kernel/arch/x86/include/asm/cpu.h
index 9b7fa6313..adc6cc86b 100644
--- a/kernel/arch/x86/include/asm/cpu.h
+++ b/kernel/arch/x86/include/asm/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CPU_H
 #define _ASM_X86_CPU_H
 
diff --git a/kernel/arch/x86/include/asm/cpu_device_id.h b/kernel/arch/x86/include/asm/cpu_device_id.h
index ff501e511..baeba0567 100644
--- a/kernel/arch/x86/include/asm/cpu_device_id.h
+++ b/kernel/arch/x86/include/asm/cpu_device_id.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CPU_DEVICE_ID
 #define _CPU_DEVICE_ID 1
 
diff --git a/kernel/arch/x86/include/asm/cpufeature.h b/kernel/arch/x86/include/asm/cpufeature.h
index d59c15c3d..0dfa68438 100644
--- a/kernel/arch/x86/include/asm/cpufeature.h
+++ b/kernel/arch/x86/include/asm/cpufeature.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CPUFEATURE_H
 #define _ASM_X86_CPUFEATURE_H
 
diff --git a/kernel/arch/x86/include/asm/cpufeatures.h b/kernel/arch/x86/include/asm/cpufeatures.h
index 2519c6c80..793690fbd 100644
--- a/kernel/arch/x86/include/asm/cpufeatures.h
+++ b/kernel/arch/x86/include/asm/cpufeatures.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CPUFEATURES_H
 #define _ASM_X86_CPUFEATURES_H
 
diff --git a/kernel/arch/x86/include/asm/cpumask.h b/kernel/arch/x86/include/asm/cpumask.h
index 61c852fa3..6722ffcef 100644
--- a/kernel/arch/x86/include/asm/cpumask.h
+++ b/kernel/arch/x86/include/asm/cpumask.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CPUMASK_H
 #define _ASM_X86_CPUMASK_H
 #ifndef __ASSEMBLY__
diff --git a/kernel/arch/x86/include/asm/crash.h b/kernel/arch/x86/include/asm/crash.h
index f498411f2..a7adb2bfb 100644
--- a/kernel/arch/x86/include/asm/crash.h
+++ b/kernel/arch/x86/include/asm/crash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CRASH_H
 #define _ASM_X86_CRASH_H
 
diff --git a/kernel/arch/x86/include/asm/crypto/aes.h b/kernel/arch/x86/include/asm/crypto/aes.h
index 80545a1cb..c508521dd 100644
--- a/kernel/arch/x86/include/asm/crypto/aes.h
+++ b/kernel/arch/x86/include/asm/crypto/aes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_AES_H
 #define ASM_X86_AES_H
 
diff --git a/kernel/arch/x86/include/asm/crypto/camellia.h b/kernel/arch/x86/include/asm/crypto/camellia.h
index bb93333d9..10f8d590b 100644
--- a/kernel/arch/x86/include/asm/crypto/camellia.h
+++ b/kernel/arch/x86/include/asm/crypto/camellia.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_CAMELLIA_H
 #define ASM_X86_CAMELLIA_H
 
diff --git a/kernel/arch/x86/include/asm/crypto/glue_helper.h b/kernel/arch/x86/include/asm/crypto/glue_helper.h
index ed8b66de5..553a03de5 100644
--- a/kernel/arch/x86/include/asm/crypto/glue_helper.h
+++ b/kernel/arch/x86/include/asm/crypto/glue_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared glue code for 128bit block ciphers
  */
diff --git a/kernel/arch/x86/include/asm/crypto/serpent-avx.h b/kernel/arch/x86/include/asm/crypto/serpent-avx.h
index 33c2b8a43..c958b7bd0 100644
--- a/kernel/arch/x86/include/asm/crypto/serpent-avx.h
+++ b/kernel/arch/x86/include/asm/crypto/serpent-avx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_SERPENT_AVX_H
 #define ASM_X86_SERPENT_AVX_H
 
diff --git a/kernel/arch/x86/include/asm/crypto/serpent-sse2.h b/kernel/arch/x86/include/asm/crypto/serpent-sse2.h
index e6e77dffb..1a345e8a7 100644
--- a/kernel/arch/x86/include/asm/crypto/serpent-sse2.h
+++ b/kernel/arch/x86/include/asm/crypto/serpent-sse2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_SERPENT_SSE2_H
 #define ASM_X86_SERPENT_SSE2_H
 
diff --git a/kernel/arch/x86/include/asm/crypto/twofish.h b/kernel/arch/x86/include/asm/crypto/twofish.h
index 878c51cee..65bb80adb 100644
--- a/kernel/arch/x86/include/asm/crypto/twofish.h
+++ b/kernel/arch/x86/include/asm/crypto/twofish.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_TWOFISH_H
 #define ASM_X86_TWOFISH_H
 
diff --git a/kernel/arch/x86/include/asm/current.h b/kernel/arch/x86/include/asm/current.h
index 9476c04ee..3e204e614 100644
--- a/kernel/arch/x86/include/asm/current.h
+++ b/kernel/arch/x86/include/asm/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CURRENT_H
 #define _ASM_X86_CURRENT_H
 
diff --git a/kernel/arch/x86/include/asm/debugreg.h b/kernel/arch/x86/include/asm/debugreg.h
index 12cb66f6d..4505ac273 100644
--- a/kernel/arch/x86/include/asm/debugreg.h
+++ b/kernel/arch/x86/include/asm/debugreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DEBUGREG_H
 #define _ASM_X86_DEBUGREG_H
 
diff --git a/kernel/arch/x86/include/asm/delay.h b/kernel/arch/x86/include/asm/delay.h
index 36a760bda..de9e7841f 100644
--- a/kernel/arch/x86/include/asm/delay.h
+++ b/kernel/arch/x86/include/asm/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DELAY_H
 #define _ASM_X86_DELAY_H
 
diff --git a/kernel/arch/x86/include/asm/desc.h b/kernel/arch/x86/include/asm/desc.h
index 9d0e13738..0a3e808b9 100644
--- a/kernel/arch/x86/include/asm/desc.h
+++ b/kernel/arch/x86/include/asm/desc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DESC_H
 #define _ASM_X86_DESC_H
 
diff --git a/kernel/arch/x86/include/asm/desc_defs.h b/kernel/arch/x86/include/asm/desc_defs.h
index 346d25202..a91f3b6e4 100644
--- a/kernel/arch/x86/include/asm/desc_defs.h
+++ b/kernel/arch/x86/include/asm/desc_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Written 2000 by Andi Kleen */
 #ifndef _ASM_X86_DESC_DEFS_H
 #define _ASM_X86_DESC_DEFS_H
diff --git a/kernel/arch/x86/include/asm/device.h b/kernel/arch/x86/include/asm/device.h
index 1b3ef26e7..5e12c63b4 100644
--- a/kernel/arch/x86/include/asm/device.h
+++ b/kernel/arch/x86/include/asm/device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DEVICE_H
 #define _ASM_X86_DEVICE_H
 
diff --git a/kernel/arch/x86/include/asm/div64.h b/kernel/arch/x86/include/asm/div64.h
index af95c47d5..20a46150e 100644
--- a/kernel/arch/x86/include/asm/div64.h
+++ b/kernel/arch/x86/include/asm/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DIV64_H
 #define _ASM_X86_DIV64_H
 
diff --git a/kernel/arch/x86/include/asm/dma-mapping.h b/kernel/arch/x86/include/asm/dma-mapping.h
index 1387dafdb..836ca1178 100644
--- a/kernel/arch/x86/include/asm/dma-mapping.h
+++ b/kernel/arch/x86/include/asm/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DMA_MAPPING_H
 #define _ASM_X86_DMA_MAPPING_H
 
diff --git a/kernel/arch/x86/include/asm/dma.h b/kernel/arch/x86/include/asm/dma.h
index fe884e18f..00f7cf45e 100644
--- a/kernel/arch/x86/include/asm/dma.h
+++ b/kernel/arch/x86/include/asm/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm/dma.h: Defines for using and allocating dma channels.
  * Written by Hennus Bergman, 1992.
diff --git a/kernel/arch/x86/include/asm/dmi.h b/kernel/arch/x86/include/asm/dmi.h
index a8e15b045..0ab2ab27a 100644
--- a/kernel/arch/x86/include/asm/dmi.h
+++ b/kernel/arch/x86/include/asm/dmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DMI_H
 #define _ASM_X86_DMI_H
 
diff --git a/kernel/arch/x86/include/asm/dwarf2.h b/kernel/arch/x86/include/asm/dwarf2.h
index b7a1ab865..ae391f609 100644
--- a/kernel/arch/x86/include/asm/dwarf2.h
+++ b/kernel/arch/x86/include/asm/dwarf2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_DWARF2_H
 #define _ASM_X86_DWARF2_H
 
diff --git a/kernel/arch/x86/include/asm/e820/api.h b/kernel/arch/x86/include/asm/e820/api.h
index cd266d830..62be73b23 100644
--- a/kernel/arch/x86/include/asm/e820/api.h
+++ b/kernel/arch/x86/include/asm/e820/api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_E820_API_H
 #define _ASM_E820_API_H
 
diff --git a/kernel/arch/x86/include/asm/e820/types.h b/kernel/arch/x86/include/asm/e820/types.h
index 4adeed03a..c3aa4b5e4 100644
--- a/kernel/arch/x86/include/asm/e820/types.h
+++ b/kernel/arch/x86/include/asm/e820/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_E820_TYPES_H
 #define _ASM_E820_TYPES_H
 
diff --git a/kernel/arch/x86/include/asm/edac.h b/kernel/arch/x86/include/asm/edac.h
index cf8fdf83b..426fc53ff 100644
--- a/kernel/arch/x86/include/asm/edac.h
+++ b/kernel/arch/x86/include/asm/edac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_EDAC_H
 #define _ASM_X86_EDAC_H
 
diff --git a/kernel/arch/x86/include/asm/efi.h b/kernel/arch/x86/include/asm/efi.h
index 796ff6c1a..85f6ccb80 100644
--- a/kernel/arch/x86/include/asm/efi.h
+++ b/kernel/arch/x86/include/asm/efi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_EFI_H
 #define _ASM_X86_EFI_H
 
diff --git a/kernel/arch/x86/include/asm/elf.h b/kernel/arch/x86/include/asm/elf.h
index 04330c8d9..c1a125e47 100644
--- a/kernel/arch/x86/include/asm/elf.h
+++ b/kernel/arch/x86/include/asm/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ELF_H
 #define _ASM_X86_ELF_H
 
diff --git a/kernel/arch/x86/include/asm/emergency-restart.h b/kernel/arch/x86/include/asm/emergency-restart.h
index 77a99ac06..2abde717d 100644
--- a/kernel/arch/x86/include/asm/emergency-restart.h
+++ b/kernel/arch/x86/include/asm/emergency-restart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_EMERGENCY_RESTART_H
 #define _ASM_X86_EMERGENCY_RESTART_H
 
diff --git a/kernel/arch/x86/include/asm/entry_arch.h b/kernel/arch/x86/include/asm/entry_arch.h
index aa15d1f7e..416422762 100644
--- a/kernel/arch/x86/include/asm/entry_arch.h
+++ b/kernel/arch/x86/include/asm/entry_arch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file is designed to contain the BUILD_INTERRUPT specifications for
  * all of the extra named interrupt vectors used by the architecture.
diff --git a/kernel/arch/x86/include/asm/espfix.h b/kernel/arch/x86/include/asm/espfix.h
index ca3ce9ab9..021102907 100644
--- a/kernel/arch/x86/include/asm/espfix.h
+++ b/kernel/arch/x86/include/asm/espfix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_ESPFIX_H
 #define _ASM_X86_ESPFIX_H
 
diff --git a/kernel/arch/x86/include/asm/export.h b/kernel/arch/x86/include/asm/export.h
index 138de56b1..2a51d6668 100644
--- a/kernel/arch/x86/include/asm/export.h
+++ b/kernel/arch/x86/include/asm/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_64BIT
 #define KSYM_ALIGN 16
 #endif
diff --git a/kernel/arch/x86/include/asm/extable.h b/kernel/arch/x86/include/asm/extable.h
index c66d19e3c..f9c3a5d50 100644
--- a/kernel/arch/x86/include/asm/extable.h
+++ b/kernel/arch/x86/include/asm/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_EXTABLE_H
 #define _ASM_X86_EXTABLE_H
 /*
diff --git a/kernel/arch/x86/include/asm/fb.h b/kernel/arch/x86/include/asm/fb.h
index c3dd5e71f..ab4c96014 100644
--- a/kernel/arch/x86/include/asm/fb.h
+++ b/kernel/arch/x86/include/asm/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_FB_H
 #define _ASM_X86_FB_H
 
diff --git a/kernel/arch/x86/include/asm/fpu/api.h b/kernel/arch/x86/include/asm/fpu/api.h
index 0877ae018..a9caac9d4 100644
--- a/kernel/arch/x86/include/asm/fpu/api.h
+++ b/kernel/arch/x86/include/asm/fpu/api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1994 Linus Torvalds
  *
diff --git a/kernel/arch/x86/include/asm/fpu/internal.h b/kernel/arch/x86/include/asm/fpu/internal.h
index e3221ffa3..a38bf5a1e 100644
--- a/kernel/arch/x86/include/asm/fpu/internal.h
+++ b/kernel/arch/x86/include/asm/fpu/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1994 Linus Torvalds
  *
diff --git a/kernel/arch/x86/include/asm/fpu/regset.h b/kernel/arch/x86/include/asm/fpu/regset.h
index 39d3107ac..d5bdffb9d 100644
--- a/kernel/arch/x86/include/asm/fpu/regset.h
+++ b/kernel/arch/x86/include/asm/fpu/regset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * FPU regset handling methods:
  */
diff --git a/kernel/arch/x86/include/asm/fpu/signal.h b/kernel/arch/x86/include/asm/fpu/signal.h
index 20a1fbf7f..4df2754ef 100644
--- a/kernel/arch/x86/include/asm/fpu/signal.h
+++ b/kernel/arch/x86/include/asm/fpu/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * x86 FPU signal frame handling methods:
  */
diff --git a/kernel/arch/x86/include/asm/fpu/types.h b/kernel/arch/x86/include/asm/fpu/types.h
index a1520575d..202c53918 100644
--- a/kernel/arch/x86/include/asm/fpu/types.h
+++ b/kernel/arch/x86/include/asm/fpu/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * FPU data structures:
  */
diff --git a/kernel/arch/x86/include/asm/fpu/xstate.h b/kernel/arch/x86/include/asm/fpu/xstate.h
index 83fee2469..48581988d 100644
--- a/kernel/arch/x86/include/asm/fpu/xstate.h
+++ b/kernel/arch/x86/include/asm/fpu/xstate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_X86_XSAVE_H
 #define __ASM_X86_XSAVE_H
 
diff --git a/kernel/arch/x86/include/asm/frame.h b/kernel/arch/x86/include/asm/frame.h
index 6e4d17072..5cbce6fbb 100644
--- a/kernel/arch/x86/include/asm/frame.h
+++ b/kernel/arch/x86/include/asm/frame.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_FRAME_H
 #define _ASM_X86_FRAME_H
 
diff --git a/kernel/arch/x86/include/asm/ftrace.h b/kernel/arch/x86/include/asm/ftrace.h
index eccd0ac6b..09ad88572 100644
--- a/kernel/arch/x86/include/asm/ftrace.h
+++ b/kernel/arch/x86/include/asm/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_FTRACE_H
 #define _ASM_X86_FTRACE_H
 
diff --git a/kernel/arch/x86/include/asm/futex.h b/kernel/arch/x86/include/asm/futex.h
index f4dc9b63b..de4d68852 100644
--- a/kernel/arch/x86/include/asm/futex.h
+++ b/kernel/arch/x86/include/asm/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_FUTEX_H
 #define _ASM_X86_FUTEX_H
 
diff --git a/kernel/arch/x86/include/asm/gart.h b/kernel/arch/x86/include/asm/gart.h
index 1d268098a..318556574 100644
--- a/kernel/arch/x86/include/asm/gart.h
+++ b/kernel/arch/x86/include/asm/gart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_GART_H
 #define _ASM_X86_GART_H
 
diff --git a/kernel/arch/x86/include/asm/hardirq.h b/kernel/arch/x86/include/asm/hardirq.h
index ad1ed531f..51cc979dd 100644
--- a/kernel/arch/x86/include/asm/hardirq.h
+++ b/kernel/arch/x86/include/asm/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HARDIRQ_H
 #define _ASM_X86_HARDIRQ_H
 
diff --git a/kernel/arch/x86/include/asm/highmem.h b/kernel/arch/x86/include/asm/highmem.h
index 1c0b43724..a80599300 100644
--- a/kernel/arch/x86/include/asm/highmem.h
+++ b/kernel/arch/x86/include/asm/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * highmem.h: virtual kernel memory mappings for high memory
  *
diff --git a/kernel/arch/x86/include/asm/hpet.h b/kernel/arch/x86/include/asm/hpet.h
index cc285ec4b..67385d56d 100644
--- a/kernel/arch/x86/include/asm/hpet.h
+++ b/kernel/arch/x86/include/asm/hpet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HPET_H
 #define _ASM_X86_HPET_H
 
diff --git a/kernel/arch/x86/include/asm/hugetlb.h b/kernel/arch/x86/include/asm/hugetlb.h
index 535af0f2d..5ed826da5 100644
--- a/kernel/arch/x86/include/asm/hugetlb.h
+++ b/kernel/arch/x86/include/asm/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HUGETLB_H
 #define _ASM_X86_HUGETLB_H
 
diff --git a/kernel/arch/x86/include/asm/hw_breakpoint.h b/kernel/arch/x86/include/asm/hw_breakpoint.h
index 6c98be864..f59c39835 100644
--- a/kernel/arch/x86/include/asm/hw_breakpoint.h
+++ b/kernel/arch/x86/include/asm/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	_I386_HW_BREAKPOINT_H
 #define	_I386_HW_BREAKPOINT_H
 
diff --git a/kernel/arch/x86/include/asm/hw_irq.h b/kernel/arch/x86/include/asm/hw_irq.h
index 6dfe366a8..8ec99a55e 100644
--- a/kernel/arch/x86/include/asm/hw_irq.h
+++ b/kernel/arch/x86/include/asm/hw_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HW_IRQ_H
 #define _ASM_X86_HW_IRQ_H
 
diff --git a/kernel/arch/x86/include/asm/hypertransport.h b/kernel/arch/x86/include/asm/hypertransport.h
index 334b1a885..5d55df352 100644
--- a/kernel/arch/x86/include/asm/hypertransport.h
+++ b/kernel/arch/x86/include/asm/hypertransport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HYPERTRANSPORT_H
 #define _ASM_X86_HYPERTRANSPORT_H
 
diff --git a/kernel/arch/x86/include/asm/i8259.h b/kernel/arch/x86/include/asm/i8259.h
index 39bcefc20..c8376b40e 100644
--- a/kernel/arch/x86/include/asm/i8259.h
+++ b/kernel/arch/x86/include/asm/i8259.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_I8259_H
 #define _ASM_X86_I8259_H
 
diff --git a/kernel/arch/x86/include/asm/ia32.h b/kernel/arch/x86/include/asm/ia32.h
index a9bdf5569..2c5f7861d 100644
--- a/kernel/arch/x86/include/asm/ia32.h
+++ b/kernel/arch/x86/include/asm/ia32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IA32_H
 #define _ASM_X86_IA32_H
 
diff --git a/kernel/arch/x86/include/asm/ia32_unistd.h b/kernel/arch/x86/include/asm/ia32_unistd.h
index b0d5716ca..aa065c94c 100644
--- a/kernel/arch/x86/include/asm/ia32_unistd.h
+++ b/kernel/arch/x86/include/asm/ia32_unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IA32_UNISTD_H
 #define _ASM_X86_IA32_UNISTD_H
 
diff --git a/kernel/arch/x86/include/asm/init.h b/kernel/arch/x86/include/asm/init.h
index 05c4aa00c..5f1d3c421 100644
--- a/kernel/arch/x86/include/asm/init.h
+++ b/kernel/arch/x86/include/asm/init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INIT_H
 #define _ASM_X86_INIT_H
 
diff --git a/kernel/arch/x86/include/asm/inst.h b/kernel/arch/x86/include/asm/inst.h
index 3e115273e..f5a796da0 100644
--- a/kernel/arch/x86/include/asm/inst.h
+++ b/kernel/arch/x86/include/asm/inst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generate .byte code for some instructions not supported by old
  * binutils.
diff --git a/kernel/arch/x86/include/asm/intel-family.h b/kernel/arch/x86/include/asm/intel-family.h
index 75b748a1d..35a6bc4da 100644
--- a/kernel/arch/x86/include/asm/intel-family.h
+++ b/kernel/arch/x86/include/asm/intel-family.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_FAMILY_H
 #define _ASM_X86_INTEL_FAMILY_H
 
diff --git a/kernel/arch/x86/include/asm/intel_mid_vrtc.h b/kernel/arch/x86/include/asm/intel_mid_vrtc.h
index 86ff4685c..35555016b 100644
--- a/kernel/arch/x86/include/asm/intel_mid_vrtc.h
+++ b/kernel/arch/x86/include/asm/intel_mid_vrtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INTEL_MID_VRTC_H
 #define _INTEL_MID_VRTC_H
 
diff --git a/kernel/arch/x86/include/asm/intel_pmc_ipc.h b/kernel/arch/x86/include/asm/intel_pmc_ipc.h
index fac89eb78..528ed4be4 100644
--- a/kernel/arch/x86/include/asm/intel_pmc_ipc.h
+++ b/kernel/arch/x86/include/asm/intel_pmc_ipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_PMC_IPC_H_
 #define  _ASM_X86_INTEL_PMC_IPC_H_
 
diff --git a/kernel/arch/x86/include/asm/intel_pt.h b/kernel/arch/x86/include/asm/intel_pt.h
index e1a411786..b523f51c5 100644
--- a/kernel/arch/x86/include/asm/intel_pt.h
+++ b/kernel/arch/x86/include/asm/intel_pt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_PT_H
 #define _ASM_X86_INTEL_PT_H
 
diff --git a/kernel/arch/x86/include/asm/intel_punit_ipc.h b/kernel/arch/x86/include/asm/intel_punit_ipc.h
index 201eb9dce..ce16da719 100644
--- a/kernel/arch/x86/include/asm/intel_punit_ipc.h
+++ b/kernel/arch/x86/include/asm/intel_punit_ipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_PUNIT_IPC_H_
 #define  _ASM_X86_INTEL_PUNIT_IPC_H_
 
diff --git a/kernel/arch/x86/include/asm/intel_rdt_sched.h b/kernel/arch/x86/include/asm/intel_rdt_sched.h
index b4bbf8b21..9acb06b6f 100644
--- a/kernel/arch/x86/include/asm/intel_rdt_sched.h
+++ b/kernel/arch/x86/include/asm/intel_rdt_sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_RDT_SCHED_H
 #define _ASM_X86_INTEL_RDT_SCHED_H
 
diff --git a/kernel/arch/x86/include/asm/intel_scu_ipc.h b/kernel/arch/x86/include/asm/intel_scu_ipc.h
index 81d3d8776..4a8c6e817 100644
--- a/kernel/arch/x86/include/asm/intel_scu_ipc.h
+++ b/kernel/arch/x86/include/asm/intel_scu_ipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_SCU_IPC_H_
 #define  _ASM_X86_INTEL_SCU_IPC_H_
 
diff --git a/kernel/arch/x86/include/asm/io.h b/kernel/arch/x86/include/asm/io.h
index c40a95c33..11398d55a 100644
--- a/kernel/arch/x86/include/asm/io.h
+++ b/kernel/arch/x86/include/asm/io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IO_H
 #define _ASM_X86_IO_H
 
diff --git a/kernel/arch/x86/include/asm/io_apic.h b/kernel/arch/x86/include/asm/io_apic.h
index 6cbf2cfb3..5c27e146a 100644
--- a/kernel/arch/x86/include/asm/io_apic.h
+++ b/kernel/arch/x86/include/asm/io_apic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IO_APIC_H
 #define _ASM_X86_IO_APIC_H
 
diff --git a/kernel/arch/x86/include/asm/iommu.h b/kernel/arch/x86/include/asm/iommu.h
index fca144a10..1e5d5d92e 100644
--- a/kernel/arch/x86/include/asm/iommu.h
+++ b/kernel/arch/x86/include/asm/iommu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IOMMU_H
 #define _ASM_X86_IOMMU_H
 
diff --git a/kernel/arch/x86/include/asm/iommu_table.h b/kernel/arch/x86/include/asm/iommu_table.h
index e37d6b3ad..1fb3fd1a8 100644
--- a/kernel/arch/x86/include/asm/iommu_table.h
+++ b/kernel/arch/x86/include/asm/iommu_table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IOMMU_TABLE_H
 #define _ASM_X86_IOMMU_TABLE_H
 
diff --git a/kernel/arch/x86/include/asm/iosf_mbi.h b/kernel/arch/x86/include/asm/iosf_mbi.h
index c313cac36..7d87437bd 100644
--- a/kernel/arch/x86/include/asm/iosf_mbi.h
+++ b/kernel/arch/x86/include/asm/iosf_mbi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Intel OnChip System Fabric MailBox access support
  */
diff --git a/kernel/arch/x86/include/asm/irq.h b/kernel/arch/x86/include/asm/irq.h
index 9958ceea2..d8632f8fa 100644
--- a/kernel/arch/x86/include/asm/irq.h
+++ b/kernel/arch/x86/include/asm/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IRQ_H
 #define _ASM_X86_IRQ_H
 /*
diff --git a/kernel/arch/x86/include/asm/irq_regs.h b/kernel/arch/x86/include/asm/irq_regs.h
index d82250b1d..8f3bee821 100644
--- a/kernel/arch/x86/include/asm/irq_regs.h
+++ b/kernel/arch/x86/include/asm/irq_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Per-cpu current frame pointer - the location of the last exception frame on
  * the stack, stored in the per-cpu area.
diff --git a/kernel/arch/x86/include/asm/irq_vectors.h b/kernel/arch/x86/include/asm/irq_vectors.h
index aaf8d28b5..c20ffca8f 100644
--- a/kernel/arch/x86/include/asm/irq_vectors.h
+++ b/kernel/arch/x86/include/asm/irq_vectors.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_IRQ_VECTORS_H
 #define _ASM_X86_IRQ_VECTORS_H
 
diff --git a/kernel/arch/x86/include/asm/irq_work.h b/kernel/arch/x86/include/asm/irq_work.h
index ddbb8ea0f..800ffce0d 100644
--- a/kernel/arch/x86/include/asm/irq_work.h
+++ b/kernel/arch/x86/include/asm/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IRQ_WORK_H
 #define _ASM_IRQ_WORK_H
 
diff --git a/kernel/arch/x86/include/asm/irqdomain.h b/kernel/arch/x86/include/asm/irqdomain.h
index d26075b52..423e112c1 100644
--- a/kernel/arch/x86/include/asm/irqdomain.h
+++ b/kernel/arch/x86/include/asm/irqdomain.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_IRQDOMAIN_H
 #define _ASM_IRQDOMAIN_H
 
diff --git a/kernel/arch/x86/include/asm/irqflags.h b/kernel/arch/x86/include/asm/irqflags.h
index ac7692dcf..c8ef23f2c 100644
--- a/kernel/arch/x86/include/asm/irqflags.h
+++ b/kernel/arch/x86/include/asm/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _X86_IRQFLAGS_H_
 #define _X86_IRQFLAGS_H_
 
diff --git a/kernel/arch/x86/include/asm/jump_label.h b/kernel/arch/x86/include/asm/jump_label.h
index adc54c12c..8c0de4282 100644
--- a/kernel/arch/x86/include/asm/jump_label.h
+++ b/kernel/arch/x86/include/asm/jump_label.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_JUMP_LABEL_H
 #define _ASM_X86_JUMP_LABEL_H
 
diff --git a/kernel/arch/x86/include/asm/kasan.h b/kernel/arch/x86/include/asm/kasan.h
index f527b02a0..b577dd091 100644
--- a/kernel/arch/x86/include/asm/kasan.h
+++ b/kernel/arch/x86/include/asm/kasan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KASAN_H
 #define _ASM_X86_KASAN_H
 
diff --git a/kernel/arch/x86/include/asm/kaslr.h b/kernel/arch/x86/include/asm/kaslr.h
index 1052a797d..460991e3b 100644
--- a/kernel/arch/x86/include/asm/kaslr.h
+++ b/kernel/arch/x86/include/asm/kaslr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KASLR_H_
 #define _ASM_KASLR_H_
 
diff --git a/kernel/arch/x86/include/asm/kbdleds.h b/kernel/arch/x86/include/asm/kbdleds.h
index f27ac5ff5..197ea4fed 100644
--- a/kernel/arch/x86/include/asm/kbdleds.h
+++ b/kernel/arch/x86/include/asm/kbdleds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KBDLEDS_H
 #define _ASM_X86_KBDLEDS_H
 
diff --git a/kernel/arch/x86/include/asm/kdebug.h b/kernel/arch/x86/include/asm/kdebug.h
index 29a594a3b..f86a8caa5 100644
--- a/kernel/arch/x86/include/asm/kdebug.h
+++ b/kernel/arch/x86/include/asm/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KDEBUG_H
 #define _ASM_X86_KDEBUG_H
 
diff --git a/kernel/arch/x86/include/asm/kexec-bzimage64.h b/kernel/arch/x86/include/asm/kexec-bzimage64.h
index d1b5d194e..9f07cff43 100644
--- a/kernel/arch/x86/include/asm/kexec-bzimage64.h
+++ b/kernel/arch/x86/include/asm/kexec-bzimage64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_KEXEC_BZIMAGE64_H
 #define _ASM_KEXEC_BZIMAGE64_H
 
diff --git a/kernel/arch/x86/include/asm/kexec.h b/kernel/arch/x86/include/asm/kexec.h
index 942c1f444..f327236f0 100644
--- a/kernel/arch/x86/include/asm/kexec.h
+++ b/kernel/arch/x86/include/asm/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KEXEC_H
 #define _ASM_X86_KEXEC_H
 
diff --git a/kernel/arch/x86/include/asm/kgdb.h b/kernel/arch/x86/include/asm/kgdb.h
index 22a8537eb..aacaf2502 100644
--- a/kernel/arch/x86/include/asm/kgdb.h
+++ b/kernel/arch/x86/include/asm/kgdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KGDB_H
 #define _ASM_X86_KGDB_H
 
diff --git a/kernel/arch/x86/include/asm/kmap_types.h b/kernel/arch/x86/include/asm/kmap_types.h
index 9e00a731a..04ab8266e 100644
--- a/kernel/arch/x86/include/asm/kmap_types.h
+++ b/kernel/arch/x86/include/asm/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KMAP_TYPES_H
 #define _ASM_X86_KMAP_TYPES_H
 
diff --git a/kernel/arch/x86/include/asm/kmemcheck.h b/kernel/arch/x86/include/asm/kmemcheck.h
index ed01518f2..945a0337f 100644
--- a/kernel/arch/x86/include/asm/kmemcheck.h
+++ b/kernel/arch/x86/include/asm/kmemcheck.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_X86_KMEMCHECK_H
 #define ASM_X86_KMEMCHECK_H
 
diff --git a/kernel/arch/x86/include/asm/kvm_emulate.h b/kernel/arch/x86/include/asm/kvm_emulate.h
index fa2558e12..ee23a4338 100644
--- a/kernel/arch/x86/include/asm/kvm_emulate.h
+++ b/kernel/arch/x86/include/asm/kvm_emulate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * x86_emulate.h
  *
diff --git a/kernel/arch/x86/include/asm/kvm_guest.h b/kernel/arch/x86/include/asm/kvm_guest.h
index a92b1763c..46185263d 100644
--- a/kernel/arch/x86/include/asm/kvm_guest.h
+++ b/kernel/arch/x86/include/asm/kvm_guest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KVM_GUEST_H
 #define _ASM_X86_KVM_GUEST_H
 
diff --git a/kernel/arch/x86/include/asm/kvm_page_track.h b/kernel/arch/x86/include/asm/kvm_page_track.h
index c4eda791f..172f9749d 100644
--- a/kernel/arch/x86/include/asm/kvm_page_track.h
+++ b/kernel/arch/x86/include/asm/kvm_page_track.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KVM_PAGE_TRACK_H
 #define _ASM_X86_KVM_PAGE_TRACK_H
 
diff --git a/kernel/arch/x86/include/asm/kvm_para.h b/kernel/arch/x86/include/asm/kvm_para.h
index 59ad3d132..c373e4404 100644
--- a/kernel/arch/x86/include/asm/kvm_para.h
+++ b/kernel/arch/x86/include/asm/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KVM_PARA_H
 #define _ASM_X86_KVM_PARA_H
 
diff --git a/kernel/arch/x86/include/asm/kvmclock.h b/kernel/arch/x86/include/asm/kvmclock.h
index f260bef63..eceea9299 100644
--- a/kernel/arch/x86/include/asm/kvmclock.h
+++ b/kernel/arch/x86/include/asm/kvmclock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_KVM_CLOCK_H
 #define _ASM_X86_KVM_CLOCK_H
 
diff --git a/kernel/arch/x86/include/asm/linkage.h b/kernel/arch/x86/include/asm/linkage.h
index 0ccb26dda..14caa9d9f 100644
--- a/kernel/arch/x86/include/asm/linkage.h
+++ b/kernel/arch/x86/include/asm/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_LINKAGE_H
 #define _ASM_X86_LINKAGE_H
 
diff --git a/kernel/arch/x86/include/asm/local.h b/kernel/arch/x86/include/asm/local.h
index 751197809..c91083c59 100644
--- a/kernel/arch/x86/include/asm/local.h
+++ b/kernel/arch/x86/include/asm/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_LOCAL_H
 #define _ASM_X86_LOCAL_H
 
diff --git a/kernel/arch/x86/include/asm/mach_timer.h b/kernel/arch/x86/include/asm/mach_timer.h
index 88d0c3c74..044daf6fb 100644
--- a/kernel/arch/x86/include/asm/mach_timer.h
+++ b/kernel/arch/x86/include/asm/mach_timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Machine specific calibrate_tsc() for generic.
  *  Split out from timer_tsc.c by Osamu Tomita <tomita@cinet.co.jp>
diff --git a/kernel/arch/x86/include/asm/mach_traps.h b/kernel/arch/x86/include/asm/mach_traps.h
index a01e7ec7d..e39a51746 100644
--- a/kernel/arch/x86/include/asm/mach_traps.h
+++ b/kernel/arch/x86/include/asm/mach_traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Machine specific NMI handling for generic.
  *  Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
diff --git a/kernel/arch/x86/include/asm/math_emu.h b/kernel/arch/x86/include/asm/math_emu.h
index 0d9b14f60..3c4274308 100644
--- a/kernel/arch/x86/include/asm/math_emu.h
+++ b/kernel/arch/x86/include/asm/math_emu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MATH_EMU_H
 #define _ASM_X86_MATH_EMU_H
 
diff --git a/kernel/arch/x86/include/asm/mc146818rtc.h b/kernel/arch/x86/include/asm/mc146818rtc.h
index 24acd9ba7..1775a32f7 100644
--- a/kernel/arch/x86/include/asm/mc146818rtc.h
+++ b/kernel/arch/x86/include/asm/mc146818rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Machine dependent access functions for RTC registers.
  */
diff --git a/kernel/arch/x86/include/asm/mce.h b/kernel/arch/x86/include/asm/mce.h
index 8edac1de2..b1e8d8db9 100644
--- a/kernel/arch/x86/include/asm/mce.h
+++ b/kernel/arch/x86/include/asm/mce.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MCE_H
 #define _ASM_X86_MCE_H
 
diff --git a/kernel/arch/x86/include/asm/microcode.h b/kernel/arch/x86/include/asm/microcode.h
index daadeeea0..55520cec8 100644
--- a/kernel/arch/x86/include/asm/microcode.h
+++ b/kernel/arch/x86/include/asm/microcode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MICROCODE_H
 #define _ASM_X86_MICROCODE_H
 
diff --git a/kernel/arch/x86/include/asm/microcode_amd.h b/kernel/arch/x86/include/asm/microcode_amd.h
index 3d57009e1..209492849 100644
--- a/kernel/arch/x86/include/asm/microcode_amd.h
+++ b/kernel/arch/x86/include/asm/microcode_amd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MICROCODE_AMD_H
 #define _ASM_X86_MICROCODE_AMD_H
 
diff --git a/kernel/arch/x86/include/asm/microcode_intel.h b/kernel/arch/x86/include/asm/microcode_intel.h
index e793fc9a9..d85a07d71 100644
--- a/kernel/arch/x86/include/asm/microcode_intel.h
+++ b/kernel/arch/x86/include/asm/microcode_intel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MICROCODE_INTEL_H
 #define _ASM_X86_MICROCODE_INTEL_H
 
diff --git a/kernel/arch/x86/include/asm/misc.h b/kernel/arch/x86/include/asm/misc.h
index 475f5bbc7..bb049cca3 100644
--- a/kernel/arch/x86/include/asm/misc.h
+++ b/kernel/arch/x86/include/asm/misc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MISC_H
 #define _ASM_X86_MISC_H
 
diff --git a/kernel/arch/x86/include/asm/mmconfig.h b/kernel/arch/x86/include/asm/mmconfig.h
index 04a3fed22..976486447 100644
--- a/kernel/arch/x86/include/asm/mmconfig.h
+++ b/kernel/arch/x86/include/asm/mmconfig.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MMCONFIG_H
 #define _ASM_X86_MMCONFIG_H
 
diff --git a/kernel/arch/x86/include/asm/mmu.h b/kernel/arch/x86/include/asm/mmu.h
index bb8c597c2..9ea26f167 100644
--- a/kernel/arch/x86/include/asm/mmu.h
+++ b/kernel/arch/x86/include/asm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MMU_H
 #define _ASM_X86_MMU_H
 
diff --git a/kernel/arch/x86/include/asm/mmu_context.h b/kernel/arch/x86/include/asm/mmu_context.h
index 3c856a15b..6699fc441 100644
--- a/kernel/arch/x86/include/asm/mmu_context.h
+++ b/kernel/arch/x86/include/asm/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MMU_CONTEXT_H
 #define _ASM_X86_MMU_CONTEXT_H
 
diff --git a/kernel/arch/x86/include/asm/mmx.h b/kernel/arch/x86/include/asm/mmx.h
index 5cbf3135b..f572d0f94 100644
--- a/kernel/arch/x86/include/asm/mmx.h
+++ b/kernel/arch/x86/include/asm/mmx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MMX_H
 #define _ASM_X86_MMX_H
 
diff --git a/kernel/arch/x86/include/asm/mmzone.h b/kernel/arch/x86/include/asm/mmzone.h
index d497bc425..c41b41edd 100644
--- a/kernel/arch/x86/include/asm/mmzone.h
+++ b/kernel/arch/x86/include/asm/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_X86_32
 # include <asm/mmzone_32.h>
 #else
diff --git a/kernel/arch/x86/include/asm/mmzone_32.h b/kernel/arch/x86/include/asm/mmzone_32.h
index 1ec990bd7..73d8dd14d 100644
--- a/kernel/arch/x86/include/asm/mmzone_32.h
+++ b/kernel/arch/x86/include/asm/mmzone_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Written by Pat Gaughen (gone@us.ibm.com) Mar 2002
  *
diff --git a/kernel/arch/x86/include/asm/mmzone_64.h b/kernel/arch/x86/include/asm/mmzone_64.h
index 129d9aa3c..0c585046f 100644
--- a/kernel/arch/x86/include/asm/mmzone_64.h
+++ b/kernel/arch/x86/include/asm/mmzone_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* K8 NUMA support */
 /* Copyright 2002,2003 by Andi Kleen, SuSE Labs */
 /* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */
diff --git a/kernel/arch/x86/include/asm/module.h b/kernel/arch/x86/include/asm/module.h
index 9eb7c718a..8546fafa2 100644
--- a/kernel/arch/x86/include/asm/module.h
+++ b/kernel/arch/x86/include/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MODULE_H
 #define _ASM_X86_MODULE_H
 
diff --git a/kernel/arch/x86/include/asm/mpspec.h b/kernel/arch/x86/include/asm/mpspec.h
index c471ca1f9..606cbaebd 100644
--- a/kernel/arch/x86/include/asm/mpspec.h
+++ b/kernel/arch/x86/include/asm/mpspec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MPSPEC_H
 #define _ASM_X86_MPSPEC_H
 
diff --git a/kernel/arch/x86/include/asm/mpspec_def.h b/kernel/arch/x86/include/asm/mpspec_def.h
index b31f8c098..9492893ae 100644
--- a/kernel/arch/x86/include/asm/mpspec_def.h
+++ b/kernel/arch/x86/include/asm/mpspec_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MPSPEC_DEF_H
 #define _ASM_X86_MPSPEC_DEF_H
 
diff --git a/kernel/arch/x86/include/asm/mpx.h b/kernel/arch/x86/include/asm/mpx.h
index 7d7404756..61eb4b63c 100644
--- a/kernel/arch/x86/include/asm/mpx.h
+++ b/kernel/arch/x86/include/asm/mpx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MPX_H
 #define _ASM_X86_MPX_H
 
diff --git a/kernel/arch/x86/include/asm/mshyperv.h b/kernel/arch/x86/include/asm/mshyperv.h
index 530f448fd..581bb54dd 100644
--- a/kernel/arch/x86/include/asm/mshyperv.h
+++ b/kernel/arch/x86/include/asm/mshyperv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MSHYPER_H
 #define _ASM_X86_MSHYPER_H
 
diff --git a/kernel/arch/x86/include/asm/msi.h b/kernel/arch/x86/include/asm/msi.h
index eb4b09b41..25ddd0916 100644
--- a/kernel/arch/x86/include/asm/msi.h
+++ b/kernel/arch/x86/include/asm/msi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MSI_H
 #define _ASM_X86_MSI_H
 #include <asm/hw_irq.h>
diff --git a/kernel/arch/x86/include/asm/msidef.h b/kernel/arch/x86/include/asm/msidef.h
index 4cc48af23..ee2f8ccc3 100644
--- a/kernel/arch/x86/include/asm/msidef.h
+++ b/kernel/arch/x86/include/asm/msidef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MSIDEF_H
 #define _ASM_X86_MSIDEF_H
 
diff --git a/kernel/arch/x86/include/asm/msr-index.h b/kernel/arch/x86/include/asm/msr-index.h
index 17f5c12e1..ab022618a 100644
--- a/kernel/arch/x86/include/asm/msr-index.h
+++ b/kernel/arch/x86/include/asm/msr-index.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MSR_INDEX_H
 #define _ASM_X86_MSR_INDEX_H
 
diff --git a/kernel/arch/x86/include/asm/msr-trace.h b/kernel/arch/x86/include/asm/msr-trace.h
index 756722574..f6adbe968 100644
--- a/kernel/arch/x86/include/asm/msr-trace.h
+++ b/kernel/arch/x86/include/asm/msr-trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM msr
 
diff --git a/kernel/arch/x86/include/asm/msr.h b/kernel/arch/x86/include/asm/msr.h
index 898dba2e2..07962f5f6 100644
--- a/kernel/arch/x86/include/asm/msr.h
+++ b/kernel/arch/x86/include/asm/msr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MSR_H
 #define _ASM_X86_MSR_H
 
diff --git a/kernel/arch/x86/include/asm/mwait.h b/kernel/arch/x86/include/asm/mwait.h
index bda3c27f0..39a2fb293 100644
--- a/kernel/arch/x86/include/asm/mwait.h
+++ b/kernel/arch/x86/include/asm/mwait.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_MWAIT_H
 #define _ASM_X86_MWAIT_H
 
diff --git a/kernel/arch/x86/include/asm/nmi.h b/kernel/arch/x86/include/asm/nmi.h
index 5f2fc4441..75ded1d13 100644
--- a/kernel/arch/x86/include/asm/nmi.h
+++ b/kernel/arch/x86/include/asm/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_NMI_H
 #define _ASM_X86_NMI_H
 
diff --git a/kernel/arch/x86/include/asm/nops.h b/kernel/arch/x86/include/asm/nops.h
index aff2b3356..12f12b5cf 100644
--- a/kernel/arch/x86/include/asm/nops.h
+++ b/kernel/arch/x86/include/asm/nops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_NOPS_H
 #define _ASM_X86_NOPS_H
 
diff --git a/kernel/arch/x86/include/asm/numa.h b/kernel/arch/x86/include/asm/numa.h
index 01b493e5a..bbfde3d26 100644
--- a/kernel/arch/x86/include/asm/numa.h
+++ b/kernel/arch/x86/include/asm/numa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_NUMA_H
 #define _ASM_X86_NUMA_H
 
diff --git a/kernel/arch/x86/include/asm/numa_32.h b/kernel/arch/x86/include/asm/numa_32.h
index e7d6b8254..9c8e9e85b 100644
--- a/kernel/arch/x86/include/asm/numa_32.h
+++ b/kernel/arch/x86/include/asm/numa_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_NUMA_32_H
 #define _ASM_X86_NUMA_32_H
 
diff --git a/kernel/arch/x86/include/asm/olpc.h b/kernel/arch/x86/include/asm/olpc.h
index 72f9adf6e..c2bf1de5d 100644
--- a/kernel/arch/x86/include/asm/olpc.h
+++ b/kernel/arch/x86/include/asm/olpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* OLPC machine specific definitions */
 
 #ifndef _ASM_X86_OLPC_H
diff --git a/kernel/arch/x86/include/asm/olpc_ofw.h b/kernel/arch/x86/include/asm/olpc_ofw.h
index 24487712e..8c2a1daf7 100644
--- a/kernel/arch/x86/include/asm/olpc_ofw.h
+++ b/kernel/arch/x86/include/asm/olpc_ofw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_OLPC_OFW_H
 #define _ASM_X86_OLPC_OFW_H
 
diff --git a/kernel/arch/x86/include/asm/page.h b/kernel/arch/x86/include/asm/page.h
index cf8f619b3..7555b4880 100644
--- a/kernel/arch/x86/include/asm/page.h
+++ b/kernel/arch/x86/include/asm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAGE_H
 #define _ASM_X86_PAGE_H
 
diff --git a/kernel/arch/x86/include/asm/page_32.h b/kernel/arch/x86/include/asm/page_32.h
index 904f528cc..94dbd51df 100644
--- a/kernel/arch/x86/include/asm/page_32.h
+++ b/kernel/arch/x86/include/asm/page_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAGE_32_H
 #define _ASM_X86_PAGE_32_H
 
diff --git a/kernel/arch/x86/include/asm/page_32_types.h b/kernel/arch/x86/include/asm/page_32_types.h
index 3bae4969a..aa30c3241 100644
--- a/kernel/arch/x86/include/asm/page_32_types.h
+++ b/kernel/arch/x86/include/asm/page_32_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAGE_32_DEFS_H
 #define _ASM_X86_PAGE_32_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/page_64.h b/kernel/arch/x86/include/asm/page_64.h
index b50df06ad..4baa6bceb 100644
--- a/kernel/arch/x86/include/asm/page_64.h
+++ b/kernel/arch/x86/include/asm/page_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAGE_64_H
 #define _ASM_X86_PAGE_64_H
 
diff --git a/kernel/arch/x86/include/asm/page_64_types.h b/kernel/arch/x86/include/asm/page_64_types.h
index 3f5f08b01..e1407312c 100644
--- a/kernel/arch/x86/include/asm/page_64_types.h
+++ b/kernel/arch/x86/include/asm/page_64_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAGE_64_DEFS_H
 #define _ASM_X86_PAGE_64_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/page_types.h b/kernel/arch/x86/include/asm/page_types.h
index b98ed9d14..1e53560a8 100644
--- a/kernel/arch/x86/include/asm/page_types.h
+++ b/kernel/arch/x86/include/asm/page_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAGE_DEFS_H
 #define _ASM_X86_PAGE_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/paravirt.h b/kernel/arch/x86/include/asm/paravirt.h
index 12deec722..fd81228e8 100644
--- a/kernel/arch/x86/include/asm/paravirt.h
+++ b/kernel/arch/x86/include/asm/paravirt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PARAVIRT_H
 #define _ASM_X86_PARAVIRT_H
 /* Various instructions on x86 need to be replaced for
diff --git a/kernel/arch/x86/include/asm/paravirt_types.h b/kernel/arch/x86/include/asm/paravirt_types.h
index 280d94c36..10cc3b970 100644
--- a/kernel/arch/x86/include/asm/paravirt_types.h
+++ b/kernel/arch/x86/include/asm/paravirt_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PARAVIRT_TYPES_H
 #define _ASM_X86_PARAVIRT_TYPES_H
 
diff --git a/kernel/arch/x86/include/asm/parport.h b/kernel/arch/x86/include/asm/parport.h
index 0d2d3b291..163f78259 100644
--- a/kernel/arch/x86/include/asm/parport.h
+++ b/kernel/arch/x86/include/asm/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PARPORT_H
 #define _ASM_X86_PARPORT_H
 
diff --git a/kernel/arch/x86/include/asm/pat.h b/kernel/arch/x86/include/asm/pat.h
index fffb2794d..8a3ee355b 100644
--- a/kernel/arch/x86/include/asm/pat.h
+++ b/kernel/arch/x86/include/asm/pat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PAT_H
 #define _ASM_X86_PAT_H
 
diff --git a/kernel/arch/x86/include/asm/pci-direct.h b/kernel/arch/x86/include/asm/pci-direct.h
index b1e7a45d8..e1084f71a 100644
--- a/kernel/arch/x86/include/asm/pci-direct.h
+++ b/kernel/arch/x86/include/asm/pci-direct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PCI_DIRECT_H
 #define _ASM_X86_PCI_DIRECT_H
 
diff --git a/kernel/arch/x86/include/asm/pci-functions.h b/kernel/arch/x86/include/asm/pci-functions.h
index ed0bab427..1bbc10812 100644
--- a/kernel/arch/x86/include/asm/pci-functions.h
+++ b/kernel/arch/x86/include/asm/pci-functions.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	PCI BIOS function numbering for conventional PCI BIOS 
  *	systems
diff --git a/kernel/arch/x86/include/asm/pci.h b/kernel/arch/x86/include/asm/pci.h
index 473a7295a..09c06b0fb 100644
--- a/kernel/arch/x86/include/asm/pci.h
+++ b/kernel/arch/x86/include/asm/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PCI_H
 #define _ASM_X86_PCI_H
 
diff --git a/kernel/arch/x86/include/asm/pci_64.h b/kernel/arch/x86/include/asm/pci_64.h
index fe15cfb21..f5411de0a 100644
--- a/kernel/arch/x86/include/asm/pci_64.h
+++ b/kernel/arch/x86/include/asm/pci_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PCI_64_H
 #define _ASM_X86_PCI_64_H
 
diff --git a/kernel/arch/x86/include/asm/pci_x86.h b/kernel/arch/x86/include/asm/pci_x86.h
index 9f1b21f37..7a5d6695a 100644
--- a/kernel/arch/x86/include/asm/pci_x86.h
+++ b/kernel/arch/x86/include/asm/pci_x86.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Low-Level PCI Access for i386 machines.
  *
diff --git a/kernel/arch/x86/include/asm/percpu.h b/kernel/arch/x86/include/asm/percpu.h
index 9fa03604b..377f1ffd1 100644
--- a/kernel/arch/x86/include/asm/percpu.h
+++ b/kernel/arch/x86/include/asm/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PERCPU_H
 #define _ASM_X86_PERCPU_H
 
diff --git a/kernel/arch/x86/include/asm/perf_event.h b/kernel/arch/x86/include/asm/perf_event.h
index f353061bb..12f54082f 100644
--- a/kernel/arch/x86/include/asm/perf_event.h
+++ b/kernel/arch/x86/include/asm/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PERF_EVENT_H
 #define _ASM_X86_PERF_EVENT_H
 
diff --git a/kernel/arch/x86/include/asm/perf_event_p4.h b/kernel/arch/x86/include/asm/perf_event_p4.h
index d725382c2..94de1a05a 100644
--- a/kernel/arch/x86/include/asm/perf_event_p4.h
+++ b/kernel/arch/x86/include/asm/perf_event_p4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Netburst Performance Events (P4, old Xeon)
  */
diff --git a/kernel/arch/x86/include/asm/pgalloc.h b/kernel/arch/x86/include/asm/pgalloc.h
index b2d0cd828..4b5e1eafa 100644
--- a/kernel/arch/x86/include/asm/pgalloc.h
+++ b/kernel/arch/x86/include/asm/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGALLOC_H
 #define _ASM_X86_PGALLOC_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable-2level.h b/kernel/arch/x86/include/asm/pgtable-2level.h
index a8b96e708..685ffe8a0 100644
--- a/kernel/arch/x86/include/asm/pgtable-2level.h
+++ b/kernel/arch/x86/include/asm/pgtable-2level.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_2LEVEL_H
 #define _ASM_X86_PGTABLE_2LEVEL_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable-2level_types.h b/kernel/arch/x86/include/asm/pgtable-2level_types.h
index 373ab1de9..f982ef808 100644
--- a/kernel/arch/x86/include/asm/pgtable-2level_types.h
+++ b/kernel/arch/x86/include/asm/pgtable-2level_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_2LEVEL_DEFS_H
 #define _ASM_X86_PGTABLE_2LEVEL_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable-3level.h b/kernel/arch/x86/include/asm/pgtable-3level.h
index c8821bab9..bc4af5453 100644
--- a/kernel/arch/x86/include/asm/pgtable-3level.h
+++ b/kernel/arch/x86/include/asm/pgtable-3level.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_3LEVEL_H
 #define _ASM_X86_PGTABLE_3LEVEL_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable-3level_types.h b/kernel/arch/x86/include/asm/pgtable-3level_types.h
index b8a4341fa..876b4c77d 100644
--- a/kernel/arch/x86/include/asm/pgtable-3level_types.h
+++ b/kernel/arch/x86/include/asm/pgtable-3level_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_3LEVEL_DEFS_H
 #define _ASM_X86_PGTABLE_3LEVEL_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable.h b/kernel/arch/x86/include/asm/pgtable.h
index b71493451..f735c3016 100644
--- a/kernel/arch/x86/include/asm/pgtable.h
+++ b/kernel/arch/x86/include/asm/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_H
 #define _ASM_X86_PGTABLE_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable_32.h b/kernel/arch/x86/include/asm/pgtable_32.h
index bfab55675..e67c0620a 100644
--- a/kernel/arch/x86/include/asm/pgtable_32.h
+++ b/kernel/arch/x86/include/asm/pgtable_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_32_H
 #define _ASM_X86_PGTABLE_32_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable_32_types.h b/kernel/arch/x86/include/asm/pgtable_32_types.h
index 9fb2f2bc8..f2ca9b28f 100644
--- a/kernel/arch/x86/include/asm/pgtable_32_types.h
+++ b/kernel/arch/x86/include/asm/pgtable_32_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_32_DEFS_H
 #define _ASM_X86_PGTABLE_32_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable_64.h b/kernel/arch/x86/include/asm/pgtable_64.h
index 972a4698c..e9f05331e 100644
--- a/kernel/arch/x86/include/asm/pgtable_64.h
+++ b/kernel/arch/x86/include/asm/pgtable_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_64_H
 #define _ASM_X86_PGTABLE_64_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable_64_types.h b/kernel/arch/x86/include/asm/pgtable_64_types.h
index 06470da15..6d5f45dcd 100644
--- a/kernel/arch/x86/include/asm/pgtable_64_types.h
+++ b/kernel/arch/x86/include/asm/pgtable_64_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_64_DEFS_H
 #define _ASM_X86_PGTABLE_64_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/pgtable_types.h b/kernel/arch/x86/include/asm/pgtable_types.h
index f1492473f..59df7b47a 100644
--- a/kernel/arch/x86/include/asm/pgtable_types.h
+++ b/kernel/arch/x86/include/asm/pgtable_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PGTABLE_DEFS_H
 #define _ASM_X86_PGTABLE_DEFS_H
 
diff --git a/kernel/arch/x86/include/asm/pkeys.h b/kernel/arch/x86/include/asm/pkeys.h
index b3b09b988..a0ba1ffda 100644
--- a/kernel/arch/x86/include/asm/pkeys.h
+++ b/kernel/arch/x86/include/asm/pkeys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PKEYS_H
 #define _ASM_X86_PKEYS_H
 
diff --git a/kernel/arch/x86/include/asm/pm-trace.h b/kernel/arch/x86/include/asm/pm-trace.h
index 7b7ac42c3..bfa32aa42 100644
--- a/kernel/arch/x86/include/asm/pm-trace.h
+++ b/kernel/arch/x86/include/asm/pm-trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PM_TRACE_H
 #define _ASM_X86_PM_TRACE_H
 
diff --git a/kernel/arch/x86/include/asm/posix_types.h b/kernel/arch/x86/include/asm/posix_types.h
index f565f6dd5..374336e21 100644
--- a/kernel/arch/x86/include/asm/posix_types.h
+++ b/kernel/arch/x86/include/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 # ifdef CONFIG_X86_32
 #  include <asm/posix_types_32.h>
 # else
diff --git a/kernel/arch/x86/include/asm/preempt.h b/kernel/arch/x86/include/asm/preempt.h
index 4f44505db..7f2dbd91f 100644
--- a/kernel/arch/x86/include/asm/preempt.h
+++ b/kernel/arch/x86/include/asm/preempt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PREEMPT_H
 #define __ASM_PREEMPT_H
 
diff --git a/kernel/arch/x86/include/asm/probe_roms.h b/kernel/arch/x86/include/asm/probe_roms.h
index 4950a0b1d..1c7f3815b 100644
--- a/kernel/arch/x86/include/asm/probe_roms.h
+++ b/kernel/arch/x86/include/asm/probe_roms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PROBE_ROMS_H_
 #define _PROBE_ROMS_H_
 struct pci_dev;
diff --git a/kernel/arch/x86/include/asm/processor-cyrix.h b/kernel/arch/x86/include/asm/processor-cyrix.h
index 1198f2a0e..aaedd73ea 100644
--- a/kernel/arch/x86/include/asm/processor-cyrix.h
+++ b/kernel/arch/x86/include/asm/processor-cyrix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NSC/Cyrix CPU indexed register access. Must be inlined instead of
  * macros to ensure correct access ordering
diff --git a/kernel/arch/x86/include/asm/processor-flags.h b/kernel/arch/x86/include/asm/processor-flags.h
index dc723b64a..43212a43e 100644
--- a/kernel/arch/x86/include/asm/processor-flags.h
+++ b/kernel/arch/x86/include/asm/processor-flags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PROCESSOR_FLAGS_H
 #define _ASM_X86_PROCESSOR_FLAGS_H
 
diff --git a/kernel/arch/x86/include/asm/processor.h b/kernel/arch/x86/include/asm/processor.h
index b390ff76e..bdac19ab2 100644
--- a/kernel/arch/x86/include/asm/processor.h
+++ b/kernel/arch/x86/include/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PROCESSOR_H
 #define _ASM_X86_PROCESSOR_H
 
diff --git a/kernel/arch/x86/include/asm/proto.h b/kernel/arch/x86/include/asm/proto.h
index b408b1886..6e81788a3 100644
--- a/kernel/arch/x86/include/asm/proto.h
+++ b/kernel/arch/x86/include/asm/proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PROTO_H
 #define _ASM_X86_PROTO_H
 
diff --git a/kernel/arch/x86/include/asm/ptrace.h b/kernel/arch/x86/include/asm/ptrace.h
index 91c04c8e6..c0e3c45cf 100644
--- a/kernel/arch/x86/include/asm/ptrace.h
+++ b/kernel/arch/x86/include/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PTRACE_H
 #define _ASM_X86_PTRACE_H
 
diff --git a/kernel/arch/x86/include/asm/purgatory.h b/kernel/arch/x86/include/asm/purgatory.h
index d7da27299..92c34e517 100644
--- a/kernel/arch/x86/include/asm/purgatory.h
+++ b/kernel/arch/x86/include/asm/purgatory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PURGATORY_H
 #define _ASM_X86_PURGATORY_H
 
diff --git a/kernel/arch/x86/include/asm/pvclock-abi.h b/kernel/arch/x86/include/asm/pvclock-abi.h
index 67f082301..1436226ef 100644
--- a/kernel/arch/x86/include/asm/pvclock-abi.h
+++ b/kernel/arch/x86/include/asm/pvclock-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PVCLOCK_ABI_H
 #define _ASM_X86_PVCLOCK_ABI_H
 #ifndef __ASSEMBLY__
diff --git a/kernel/arch/x86/include/asm/pvclock.h b/kernel/arch/x86/include/asm/pvclock.h
index 448cfe1b4..3e4ed8fb5 100644
--- a/kernel/arch/x86/include/asm/pvclock.h
+++ b/kernel/arch/x86/include/asm/pvclock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PVCLOCK_H
 #define _ASM_X86_PVCLOCK_H
 
diff --git a/kernel/arch/x86/include/asm/qrwlock.h b/kernel/arch/x86/include/asm/qrwlock.h
index c537cbb03..8656b5a6e 100644
--- a/kernel/arch/x86/include/asm/qrwlock.h
+++ b/kernel/arch/x86/include/asm/qrwlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_QRWLOCK_H
 #define _ASM_X86_QRWLOCK_H
 
diff --git a/kernel/arch/x86/include/asm/qspinlock.h b/kernel/arch/x86/include/asm/qspinlock.h
index 48a706f64..9982dd96f 100644
--- a/kernel/arch/x86/include/asm/qspinlock.h
+++ b/kernel/arch/x86/include/asm/qspinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_QSPINLOCK_H
 #define _ASM_X86_QSPINLOCK_H
 
diff --git a/kernel/arch/x86/include/asm/qspinlock_paravirt.h b/kernel/arch/x86/include/asm/qspinlock_paravirt.h
index 9d55f9b6e..923307ea1 100644
--- a/kernel/arch/x86/include/asm/qspinlock_paravirt.h
+++ b/kernel/arch/x86/include/asm/qspinlock_paravirt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_QSPINLOCK_PARAVIRT_H
 #define __ASM_QSPINLOCK_PARAVIRT_H
 
diff --git a/kernel/arch/x86/include/asm/realmode.h b/kernel/arch/x86/include/asm/realmode.h
index 90d91520c..63b3393bd 100644
--- a/kernel/arch/x86/include/asm/realmode.h
+++ b/kernel/arch/x86/include/asm/realmode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_X86_REALMODE_H
 #define _ARCH_X86_REALMODE_H
 
diff --git a/kernel/arch/x86/include/asm/reboot.h b/kernel/arch/x86/include/asm/reboot.h
index fc62ba8dc..a671a1145 100644
--- a/kernel/arch/x86/include/asm/reboot.h
+++ b/kernel/arch/x86/include/asm/reboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_REBOOT_H
 #define _ASM_X86_REBOOT_H
 
diff --git a/kernel/arch/x86/include/asm/reboot_fixups.h b/kernel/arch/x86/include/asm/reboot_fixups.h
index 765debe4c..96515658c 100644
--- a/kernel/arch/x86/include/asm/reboot_fixups.h
+++ b/kernel/arch/x86/include/asm/reboot_fixups.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_REBOOT_FIXUPS_H
 #define _ASM_X86_REBOOT_FIXUPS_H
 
diff --git a/kernel/arch/x86/include/asm/rio.h b/kernel/arch/x86/include/asm/rio.h
index 97bab6388..0a21986d2 100644
--- a/kernel/arch/x86/include/asm/rio.h
+++ b/kernel/arch/x86/include/asm/rio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Derived from include/asm-x86/mach-summit/mach_mpparse.h
  *          and include/asm-x86/mach-default/bios_ebda.h
diff --git a/kernel/arch/x86/include/asm/rmwcc.h b/kernel/arch/x86/include/asm/rmwcc.h
index 045f99211..d8f3a6ae9 100644
--- a/kernel/arch/x86/include/asm/rmwcc.h
+++ b/kernel/arch/x86/include/asm/rmwcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_RMWcc
 #define _ASM_X86_RMWcc
 
diff --git a/kernel/arch/x86/include/asm/rwsem.h b/kernel/arch/x86/include/asm/rwsem.h
index 7116b7931..4d38d85a1 100644
--- a/kernel/arch/x86/include/asm/rwsem.h
+++ b/kernel/arch/x86/include/asm/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* rwsem.h: R/W semaphores implemented using XADD/CMPXCHG for i486+
  *
  * Written by David Howells (dhowells@redhat.com).
diff --git a/kernel/arch/x86/include/asm/seccomp.h b/kernel/arch/x86/include/asm/seccomp.h
index 0c8c7c886..2bd1338de 100644
--- a/kernel/arch/x86/include/asm/seccomp.h
+++ b/kernel/arch/x86/include/asm/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SECCOMP_H
 #define _ASM_X86_SECCOMP_H
 
diff --git a/kernel/arch/x86/include/asm/sections.h b/kernel/arch/x86/include/asm/sections.h
index 2f75f30cb..d6baf2378 100644
--- a/kernel/arch/x86/include/asm/sections.h
+++ b/kernel/arch/x86/include/asm/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SECTIONS_H
 #define _ASM_X86_SECTIONS_H
 
diff --git a/kernel/arch/x86/include/asm/segment.h b/kernel/arch/x86/include/asm/segment.h
index 066aaf813..b20f9d623 100644
--- a/kernel/arch/x86/include/asm/segment.h
+++ b/kernel/arch/x86/include/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SEGMENT_H
 #define _ASM_X86_SEGMENT_H
 
diff --git a/kernel/arch/x86/include/asm/serial.h b/kernel/arch/x86/include/asm/serial.h
index bb658211e..ece8299d2 100644
--- a/kernel/arch/x86/include/asm/serial.h
+++ b/kernel/arch/x86/include/asm/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SERIAL_H
 #define _ASM_X86_SERIAL_H
 
diff --git a/kernel/arch/x86/include/asm/set_memory.h b/kernel/arch/x86/include/asm/set_memory.h
index cd71273ec..bd0903672 100644
--- a/kernel/arch/x86/include/asm/set_memory.h
+++ b/kernel/arch/x86/include/asm/set_memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SET_MEMORY_H
 #define _ASM_X86_SET_MEMORY_H
 
diff --git a/kernel/arch/x86/include/asm/setup.h b/kernel/arch/x86/include/asm/setup.h
index a65cf5446..ae13bc974 100644
--- a/kernel/arch/x86/include/asm/setup.h
+++ b/kernel/arch/x86/include/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SETUP_H
 #define _ASM_X86_SETUP_H
 
diff --git a/kernel/arch/x86/include/asm/shmparam.h b/kernel/arch/x86/include/asm/shmparam.h
index 0880cf091..c4041819c 100644
--- a/kernel/arch/x86/include/asm/shmparam.h
+++ b/kernel/arch/x86/include/asm/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SHMPARAM_H
 #define _ASM_X86_SHMPARAM_H
 
diff --git a/kernel/arch/x86/include/asm/sigcontext.h b/kernel/arch/x86/include/asm/sigcontext.h
index e6cd2c489..140d890c2 100644
--- a/kernel/arch/x86/include/asm/sigcontext.h
+++ b/kernel/arch/x86/include/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SIGCONTEXT_H
 #define _ASM_X86_SIGCONTEXT_H
 
diff --git a/kernel/arch/x86/include/asm/sigframe.h b/kernel/arch/x86/include/asm/sigframe.h
index 34edd1650..f176114c0 100644
--- a/kernel/arch/x86/include/asm/sigframe.h
+++ b/kernel/arch/x86/include/asm/sigframe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SIGFRAME_H
 #define _ASM_X86_SIGFRAME_H
 
diff --git a/kernel/arch/x86/include/asm/sighandling.h b/kernel/arch/x86/include/asm/sighandling.h
index 452c88b8a..bd2683472 100644
--- a/kernel/arch/x86/include/asm/sighandling.h
+++ b/kernel/arch/x86/include/asm/sighandling.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SIGHANDLING_H
 #define _ASM_X86_SIGHANDLING_H
 
diff --git a/kernel/arch/x86/include/asm/signal.h b/kernel/arch/x86/include/asm/signal.h
index 8af22be0f..5f9012ff5 100644
--- a/kernel/arch/x86/include/asm/signal.h
+++ b/kernel/arch/x86/include/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SIGNAL_H
 #define _ASM_X86_SIGNAL_H
 
diff --git a/kernel/arch/x86/include/asm/simd.h b/kernel/arch/x86/include/asm/simd.h
index 6c8a7ed13..a341c878e 100644
--- a/kernel/arch/x86/include/asm/simd.h
+++ b/kernel/arch/x86/include/asm/simd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <asm/fpu/api.h>
 
diff --git a/kernel/arch/x86/include/asm/smp.h b/kernel/arch/x86/include/asm/smp.h
index 47103eca3..461f53d27 100644
--- a/kernel/arch/x86/include/asm/smp.h
+++ b/kernel/arch/x86/include/asm/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SMP_H
 #define _ASM_X86_SMP_H
 #ifndef __ASSEMBLY__
diff --git a/kernel/arch/x86/include/asm/sparsemem.h b/kernel/arch/x86/include/asm/sparsemem.h
index 1f5bee2c2..4fc1e9d3c 100644
--- a/kernel/arch/x86/include/asm/sparsemem.h
+++ b/kernel/arch/x86/include/asm/sparsemem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SPARSEMEM_H
 #define _ASM_X86_SPARSEMEM_H
 
diff --git a/kernel/arch/x86/include/asm/special_insns.h b/kernel/arch/x86/include/asm/special_insns.h
index a24dfcf79..317fc59b5 100644
--- a/kernel/arch/x86/include/asm/special_insns.h
+++ b/kernel/arch/x86/include/asm/special_insns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SPECIAL_INSNS_H
 #define _ASM_X86_SPECIAL_INSNS_H
 
diff --git a/kernel/arch/x86/include/asm/spinlock.h b/kernel/arch/x86/include/asm/spinlock.h
index 6d391909e..b34625796 100644
--- a/kernel/arch/x86/include/asm/spinlock.h
+++ b/kernel/arch/x86/include/asm/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SPINLOCK_H
 #define _ASM_X86_SPINLOCK_H
 
diff --git a/kernel/arch/x86/include/asm/spinlock_types.h b/kernel/arch/x86/include/asm/spinlock_types.h
index 25311ebb4..bf3e34b25 100644
--- a/kernel/arch/x86/include/asm/spinlock_types.h
+++ b/kernel/arch/x86/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SPINLOCK_TYPES_H
 #define _ASM_X86_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/x86/include/asm/sta2x11.h b/kernel/arch/x86/include/asm/sta2x11.h
index e9d32df89..e0975e9c4 100644
--- a/kernel/arch/x86/include/asm/sta2x11.h
+++ b/kernel/arch/x86/include/asm/sta2x11.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Header file for STMicroelectronics ConneXt (STA2X11) IOHub
  */
diff --git a/kernel/arch/x86/include/asm/stackprotector.h b/kernel/arch/x86/include/asm/stackprotector.h
index 8abedf1d6..371b3a4af 100644
--- a/kernel/arch/x86/include/asm/stackprotector.h
+++ b/kernel/arch/x86/include/asm/stackprotector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * GCC stack protector support.
  *
diff --git a/kernel/arch/x86/include/asm/stacktrace.h b/kernel/arch/x86/include/asm/stacktrace.h
index 2e41c50dd..8da111b3c 100644
--- a/kernel/arch/x86/include/asm/stacktrace.h
+++ b/kernel/arch/x86/include/asm/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
diff --git a/kernel/arch/x86/include/asm/string.h b/kernel/arch/x86/include/asm/string.h
index 09224d7a5..c3c2c1914 100644
--- a/kernel/arch/x86/include/asm/string.h
+++ b/kernel/arch/x86/include/asm/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_X86_32
 # include <asm/string_32.h>
 #else
diff --git a/kernel/arch/x86/include/asm/string_32.h b/kernel/arch/x86/include/asm/string_32.h
index e371e7229..076502241 100644
--- a/kernel/arch/x86/include/asm/string_32.h
+++ b/kernel/arch/x86/include/asm/string_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_STRING_32_H
 #define _ASM_X86_STRING_32_H
 
diff --git a/kernel/arch/x86/include/asm/string_64.h b/kernel/arch/x86/include/asm/string_64.h
index f372a70a5..0b1b4445f 100644
--- a/kernel/arch/x86/include/asm/string_64.h
+++ b/kernel/arch/x86/include/asm/string_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_STRING_64_H
 #define _ASM_X86_STRING_64_H
 
diff --git a/kernel/arch/x86/include/asm/suspend.h b/kernel/arch/x86/include/asm/suspend.h
index 2fab6c2c3..ecffe81ff 100644
--- a/kernel/arch/x86/include/asm/suspend.h
+++ b/kernel/arch/x86/include/asm/suspend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_X86_32
 # include <asm/suspend_32.h>
 #else
diff --git a/kernel/arch/x86/include/asm/suspend_32.h b/kernel/arch/x86/include/asm/suspend_32.h
index 8e9dbe7b7..982c325da 100644
--- a/kernel/arch/x86/include/asm/suspend_32.h
+++ b/kernel/arch/x86/include/asm/suspend_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2001-2002 Pavel Machek <pavel@suse.cz>
  * Based on code
diff --git a/kernel/arch/x86/include/asm/suspend_64.h b/kernel/arch/x86/include/asm/suspend_64.h
index 2bd96b4df..7306e911f 100644
--- a/kernel/arch/x86/include/asm/suspend_64.h
+++ b/kernel/arch/x86/include/asm/suspend_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2001-2003 Pavel Machek <pavel@suse.cz>
  * Based on code
diff --git a/kernel/arch/x86/include/asm/svm.h b/kernel/arch/x86/include/asm/svm.h
index 14835dd20..78dd9df88 100644
--- a/kernel/arch/x86/include/asm/svm.h
+++ b/kernel/arch/x86/include/asm/svm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SVM_H
 #define __SVM_H
 
diff --git a/kernel/arch/x86/include/asm/swiotlb.h b/kernel/arch/x86/include/asm/swiotlb.h
index d2f69b9ff..bdf9aed40 100644
--- a/kernel/arch/x86/include/asm/swiotlb.h
+++ b/kernel/arch/x86/include/asm/swiotlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SWIOTLB_H
 #define _ASM_X86_SWIOTLB_H
 
diff --git a/kernel/arch/x86/include/asm/switch_to.h b/kernel/arch/x86/include/asm/switch_to.h
index fcc5cd387..899084b70 100644
--- a/kernel/arch/x86/include/asm/switch_to.h
+++ b/kernel/arch/x86/include/asm/switch_to.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SWITCH_TO_H
 #define _ASM_X86_SWITCH_TO_H
 
diff --git a/kernel/arch/x86/include/asm/sync_bitops.h b/kernel/arch/x86/include/asm/sync_bitops.h
index cbf8847d0..2fe745356 100644
--- a/kernel/arch/x86/include/asm/sync_bitops.h
+++ b/kernel/arch/x86/include/asm/sync_bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SYNC_BITOPS_H
 #define _ASM_X86_SYNC_BITOPS_H
 
diff --git a/kernel/arch/x86/include/asm/text-patching.h b/kernel/arch/x86/include/asm/text-patching.h
index 903950633..2ecd34e2d 100644
--- a/kernel/arch/x86/include/asm/text-patching.h
+++ b/kernel/arch/x86/include/asm/text-patching.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TEXT_PATCHING_H
 #define _ASM_X86_TEXT_PATCHING_H
 
diff --git a/kernel/arch/x86/include/asm/thread_info.h b/kernel/arch/x86/include/asm/thread_info.h
index 89e7eeb5c..70f425947 100644
--- a/kernel/arch/x86/include/asm/thread_info.h
+++ b/kernel/arch/x86/include/asm/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: low-level thread information
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)
diff --git a/kernel/arch/x86/include/asm/time.h b/kernel/arch/x86/include/asm/time.h
index 92b8aec06..cef818b16 100644
--- a/kernel/arch/x86/include/asm/time.h
+++ b/kernel/arch/x86/include/asm/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TIME_H
 #define _ASM_X86_TIME_H
 
diff --git a/kernel/arch/x86/include/asm/timer.h b/kernel/arch/x86/include/asm/timer.h
index 201696210..47457ab97 100644
--- a/kernel/arch/x86/include/asm/timer.h
+++ b/kernel/arch/x86/include/asm/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TIMER_H
 #define _ASM_X86_TIMER_H
 #include <linux/pm.h>
diff --git a/kernel/arch/x86/include/asm/timex.h b/kernel/arch/x86/include/asm/timex.h
index 1375cfc93..a4a8b1b16 100644
--- a/kernel/arch/x86/include/asm/timex.h
+++ b/kernel/arch/x86/include/asm/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TIMEX_H
 #define _ASM_X86_TIMEX_H
 
diff --git a/kernel/arch/x86/include/asm/tlb.h b/kernel/arch/x86/include/asm/tlb.h
index 79a4ca6a9..cb0a1f470 100644
--- a/kernel/arch/x86/include/asm/tlb.h
+++ b/kernel/arch/x86/include/asm/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TLB_H
 #define _ASM_X86_TLB_H
 
diff --git a/kernel/arch/x86/include/asm/tlbbatch.h b/kernel/arch/x86/include/asm/tlbbatch.h
index f4a6ff352..1ad56eb3e 100644
--- a/kernel/arch/x86/include/asm/tlbbatch.h
+++ b/kernel/arch/x86/include/asm/tlbbatch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_X86_TLBBATCH_H
 #define _ARCH_X86_TLBBATCH_H
 
diff --git a/kernel/arch/x86/include/asm/tlbflush.h b/kernel/arch/x86/include/asm/tlbflush.h
index c4aed0de5..509046cfa 100644
--- a/kernel/arch/x86/include/asm/tlbflush.h
+++ b/kernel/arch/x86/include/asm/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TLBFLUSH_H
 #define _ASM_X86_TLBFLUSH_H
 
diff --git a/kernel/arch/x86/include/asm/trace/exceptions.h b/kernel/arch/x86/include/asm/trace/exceptions.h
index 5665bf205..69615e387 100644
--- a/kernel/arch/x86/include/asm/trace/exceptions.h
+++ b/kernel/arch/x86/include/asm/trace/exceptions.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM exceptions
 
diff --git a/kernel/arch/x86/include/asm/trace/fpu.h b/kernel/arch/x86/include/asm/trace/fpu.h
index 39f7a27be..fa60398bb 100644
--- a/kernel/arch/x86/include/asm/trace/fpu.h
+++ b/kernel/arch/x86/include/asm/trace/fpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM x86_fpu
 
diff --git a/kernel/arch/x86/include/asm/trace/irq_vectors.h b/kernel/arch/x86/include/asm/trace/irq_vectors.h
index 1599d394c..8eb139ed1 100644
--- a/kernel/arch/x86/include/asm/trace/irq_vectors.h
+++ b/kernel/arch/x86/include/asm/trace/irq_vectors.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq_vectors
 
diff --git a/kernel/arch/x86/include/asm/trace/mpx.h b/kernel/arch/x86/include/asm/trace/mpx.h
index 0f492fc50..7bd92db09 100644
--- a/kernel/arch/x86/include/asm/trace/mpx.h
+++ b/kernel/arch/x86/include/asm/trace/mpx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mpx
 
diff --git a/kernel/arch/x86/include/asm/trace_clock.h b/kernel/arch/x86/include/asm/trace_clock.h
index beab86cc2..7061a5650 100644
--- a/kernel/arch/x86/include/asm/trace_clock.h
+++ b/kernel/arch/x86/include/asm/trace_clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TRACE_CLOCK_H
 #define _ASM_X86_TRACE_CLOCK_H
 
diff --git a/kernel/arch/x86/include/asm/traps.h b/kernel/arch/x86/include/asm/traps.h
index 5545f6459..b0cced97a 100644
--- a/kernel/arch/x86/include/asm/traps.h
+++ b/kernel/arch/x86/include/asm/traps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TRAPS_H
 #define _ASM_X86_TRAPS_H
 
diff --git a/kernel/arch/x86/include/asm/tsc.h b/kernel/arch/x86/include/asm/tsc.h
index f5e6f1c41..8da0efb13 100644
--- a/kernel/arch/x86/include/asm/tsc.h
+++ b/kernel/arch/x86/include/asm/tsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * x86 TSC related functions
  */
diff --git a/kernel/arch/x86/include/asm/uaccess.h b/kernel/arch/x86/include/asm/uaccess.h
index 4b892917e..574dff4d2 100644
--- a/kernel/arch/x86/include/asm/uaccess.h
+++ b/kernel/arch/x86/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UACCESS_H
 #define _ASM_X86_UACCESS_H
 /*
diff --git a/kernel/arch/x86/include/asm/uaccess_32.h b/kernel/arch/x86/include/asm/uaccess_32.h
index aeda9bb8a..72950401b 100644
--- a/kernel/arch/x86/include/asm/uaccess_32.h
+++ b/kernel/arch/x86/include/asm/uaccess_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UACCESS_32_H
 #define _ASM_X86_UACCESS_32_H
 
diff --git a/kernel/arch/x86/include/asm/uaccess_64.h b/kernel/arch/x86/include/asm/uaccess_64.h
index b16f6a1d8..f07ef3c57 100644
--- a/kernel/arch/x86/include/asm/uaccess_64.h
+++ b/kernel/arch/x86/include/asm/uaccess_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UACCESS_64_H
 #define _ASM_X86_UACCESS_64_H
 
diff --git a/kernel/arch/x86/include/asm/unaligned.h b/kernel/arch/x86/include/asm/unaligned.h
index a7bd416b4..9c754a744 100644
--- a/kernel/arch/x86/include/asm/unaligned.h
+++ b/kernel/arch/x86/include/asm/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UNALIGNED_H
 #define _ASM_X86_UNALIGNED_H
 
diff --git a/kernel/arch/x86/include/asm/unistd.h b/kernel/arch/x86/include/asm/unistd.h
index 1ba1536f6..51c4eee00 100644
--- a/kernel/arch/x86/include/asm/unistd.h
+++ b/kernel/arch/x86/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UNISTD_H
 #define _ASM_X86_UNISTD_H 1
 
diff --git a/kernel/arch/x86/include/asm/unwind.h b/kernel/arch/x86/include/asm/unwind.h
index e9f793e2d..87adc0d38 100644
--- a/kernel/arch/x86/include/asm/unwind.h
+++ b/kernel/arch/x86/include/asm/unwind.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UNWIND_H
 #define _ASM_X86_UNWIND_H
 
diff --git a/kernel/arch/x86/include/asm/user.h b/kernel/arch/x86/include/asm/user.h
index 59a54e869..413c91746 100644
--- a/kernel/arch/x86/include/asm/user.h
+++ b/kernel/arch/x86/include/asm/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_USER_H
 #define _ASM_X86_USER_H
 
diff --git a/kernel/arch/x86/include/asm/user32.h b/kernel/arch/x86/include/asm/user32.h
index 14cbb73eb..fa577312f 100644
--- a/kernel/arch/x86/include/asm/user32.h
+++ b/kernel/arch/x86/include/asm/user32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_USER32_H
 #define _ASM_X86_USER32_H
 
diff --git a/kernel/arch/x86/include/asm/user_32.h b/kernel/arch/x86/include/asm/user_32.h
index bebfd8644..d72c3d66e 100644
--- a/kernel/arch/x86/include/asm/user_32.h
+++ b/kernel/arch/x86/include/asm/user_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_USER_32_H
 #define _ASM_X86_USER_32_H
 
diff --git a/kernel/arch/x86/include/asm/user_64.h b/kernel/arch/x86/include/asm/user_64.h
index faf2cd3e0..db9099236 100644
--- a/kernel/arch/x86/include/asm/user_64.h
+++ b/kernel/arch/x86/include/asm/user_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_USER_64_H
 #define _ASM_X86_USER_64_H
 
diff --git a/kernel/arch/x86/include/asm/uv/uv.h b/kernel/arch/x86/include/asm/uv/uv.h
index b5a32231a..a80c06737 100644
--- a/kernel/arch/x86/include/asm/uv/uv.h
+++ b/kernel/arch/x86/include/asm/uv/uv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_UV_UV_H
 #define _ASM_X86_UV_UV_H
 
diff --git a/kernel/arch/x86/include/asm/vdso.h b/kernel/arch/x86/include/asm/vdso.h
index bccdf4938..27566e57e 100644
--- a/kernel/arch/x86/include/asm/vdso.h
+++ b/kernel/arch/x86/include/asm/vdso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_VDSO_H
 #define _ASM_X86_VDSO_H
 
diff --git a/kernel/arch/x86/include/asm/vga.h b/kernel/arch/x86/include/asm/vga.h
index 9f42beefc..46f9b2dea 100644
--- a/kernel/arch/x86/include/asm/vga.h
+++ b/kernel/arch/x86/include/asm/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Access to VGA videoram
  *
diff --git a/kernel/arch/x86/include/asm/vgtod.h b/kernel/arch/x86/include/asm/vgtod.h
index 022e59714..52250681f 100644
--- a/kernel/arch/x86/include/asm/vgtod.h
+++ b/kernel/arch/x86/include/asm/vgtod.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_VGTOD_H
 #define _ASM_X86_VGTOD_H
 
diff --git a/kernel/arch/x86/include/asm/vm86.h b/kernel/arch/x86/include/asm/vm86.h
index 1e491f3af..26efbec94 100644
--- a/kernel/arch/x86/include/asm/vm86.h
+++ b/kernel/arch/x86/include/asm/vm86.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_VM86_H
 #define _ASM_X86_VM86_H
 
diff --git a/kernel/arch/x86/include/asm/vsyscall.h b/kernel/arch/x86/include/asm/vsyscall.h
index 6ba66ee79..d9a7c6590 100644
--- a/kernel/arch/x86/include/asm/vsyscall.h
+++ b/kernel/arch/x86/include/asm/vsyscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_VSYSCALL_H
 #define _ASM_X86_VSYSCALL_H
 
diff --git a/kernel/arch/x86/include/asm/word-at-a-time.h b/kernel/arch/x86/include/asm/word-at-a-time.h
index 5b2389815..06006b035 100644
--- a/kernel/arch/x86/include/asm/word-at-a-time.h
+++ b/kernel/arch/x86/include/asm/word-at-a-time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_WORD_AT_A_TIME_H
 #define _ASM_WORD_AT_A_TIME_H
 
diff --git a/kernel/arch/x86/include/asm/x2apic.h b/kernel/arch/x86/include/asm/x2apic.h
index f90f0a587..78ccf28d1 100644
--- a/kernel/arch/x86/include/asm/x2apic.h
+++ b/kernel/arch/x86/include/asm/x2apic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common bits for X2APIC cluster/physical modes.
  */
diff --git a/kernel/arch/x86/include/asm/x86_init.h b/kernel/arch/x86/include/asm/x86_init.h
index 7ba7e90a9..8a1ebf954 100644
--- a/kernel/arch/x86/include/asm/x86_init.h
+++ b/kernel/arch/x86/include/asm/x86_init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_PLATFORM_H
 #define _ASM_X86_PLATFORM_H
 
diff --git a/kernel/arch/x86/include/asm/xen/events.h b/kernel/arch/x86/include/asm/xen/events.h
index e6911caf5..d383140e1 100644
--- a/kernel/arch/x86/include/asm/xen/events.h
+++ b/kernel/arch/x86/include/asm/xen/events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_XEN_EVENTS_H
 #define _ASM_X86_XEN_EVENTS_H
 
diff --git a/kernel/arch/x86/include/asm/xen/interface_32.h b/kernel/arch/x86/include/asm/xen/interface_32.h
index 8413688b2..dc40578ab 100644
--- a/kernel/arch/x86/include/asm/xen/interface_32.h
+++ b/kernel/arch/x86/include/asm/xen/interface_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * arch-x86_32.h
  *
diff --git a/kernel/arch/x86/include/asm/xen/interface_64.h b/kernel/arch/x86/include/asm/xen/interface_64.h
index 839a4811c..c599ec269 100644
--- a/kernel/arch/x86/include/asm/xen/interface_64.h
+++ b/kernel/arch/x86/include/asm/xen/interface_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_XEN_INTERFACE_64_H
 #define _ASM_X86_XEN_INTERFACE_64_H
 
diff --git a/kernel/arch/x86/include/asm/xen/page-coherent.h b/kernel/arch/x86/include/asm/xen/page-coherent.h
index f02f025ff..116777e7f 100644
--- a/kernel/arch/x86/include/asm/xen/page-coherent.h
+++ b/kernel/arch/x86/include/asm/xen/page-coherent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_XEN_PAGE_COHERENT_H
 #define _ASM_X86_XEN_PAGE_COHERENT_H
 
diff --git a/kernel/arch/x86/include/asm/xen/page.h b/kernel/arch/x86/include/asm/xen/page.h
index 07b653181..c6b84245e 100644
--- a/kernel/arch/x86/include/asm/xen/page.h
+++ b/kernel/arch/x86/include/asm/xen/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_XEN_PAGE_H
 #define _ASM_X86_XEN_PAGE_H
 
diff --git a/kernel/arch/x86/include/asm/xen/pci.h b/kernel/arch/x86/include/asm/xen/pci.h
index f320ee32d..3506d8c59 100644
--- a/kernel/arch/x86/include/asm/xen/pci.h
+++ b/kernel/arch/x86/include/asm/xen/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_XEN_PCI_H
 #define _ASM_X86_XEN_PCI_H
 
diff --git a/kernel/arch/x86/include/asm/xen/swiotlb-xen.h b/kernel/arch/x86/include/asm/xen/swiotlb-xen.h
index ee52fcac6..6b56d0d45 100644
--- a/kernel/arch/x86/include/asm/xen/swiotlb-xen.h
+++ b/kernel/arch/x86/include/asm/xen/swiotlb-xen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SWIOTLB_XEN_H
 #define _ASM_X86_SWIOTLB_XEN_H
 
diff --git a/kernel/arch/x86/include/asm/xen/trace_types.h b/kernel/arch/x86/include/asm/xen/trace_types.h
index 21e1874c0..2aad0abd6 100644
--- a/kernel/arch/x86/include/asm/xen/trace_types.h
+++ b/kernel/arch/x86/include/asm/xen/trace_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_XEN_TRACE_TYPES_H
 #define _ASM_XEN_TRACE_TYPES_H
 
diff --git a/kernel/arch/x86/include/asm/xor_64.h b/kernel/arch/x86/include/asm/xor_64.h
index 546f1e3b8..0307e4ec5 100644
--- a/kernel/arch/x86/include/asm/xor_64.h
+++ b/kernel/arch/x86/include/asm/xor_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_XOR_64_H
 #define _ASM_X86_XOR_64_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/a.out.h b/kernel/arch/x86/include/uapi/asm/a.out.h
index 4684f97a5..094c49d8e 100644
--- a/kernel/arch/x86/include/uapi/asm/a.out.h
+++ b/kernel/arch/x86/include/uapi/asm/a.out.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_A_OUT_H
 #define _ASM_X86_A_OUT_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/auxvec.h b/kernel/arch/x86/include/uapi/asm/auxvec.h
index 77203ac35..580e3c567 100644
--- a/kernel/arch/x86/include/uapi/asm/auxvec.h
+++ b/kernel/arch/x86/include/uapi/asm/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_AUXVEC_H
 #define _ASM_X86_AUXVEC_H
 /*
diff --git a/kernel/arch/x86/include/uapi/asm/bitsperlong.h b/kernel/arch/x86/include/uapi/asm/bitsperlong.h
index 217909b4d..5d72c8458 100644
--- a/kernel/arch/x86/include/uapi/asm/bitsperlong.h
+++ b/kernel/arch/x86/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_X86_BITSPERLONG_H
 #define __ASM_X86_BITSPERLONG_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/boot.h b/kernel/arch/x86/include/uapi/asm/boot.h
index 94292c4c8..88ffc5aee 100644
--- a/kernel/arch/x86/include/uapi/asm/boot.h
+++ b/kernel/arch/x86/include/uapi/asm/boot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_BOOT_H
 #define _UAPI_ASM_X86_BOOT_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/bootparam.h b/kernel/arch/x86/include/uapi/asm/bootparam.h
index 66b8f9333..afdd5ae0f 100644
--- a/kernel/arch/x86/include/uapi/asm/bootparam.h
+++ b/kernel/arch/x86/include/uapi/asm/bootparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_BOOTPARAM_H
 #define _ASM_X86_BOOTPARAM_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/byteorder.h b/kernel/arch/x86/include/uapi/asm/byteorder.h
index b13a7a88f..484e3cfd7 100644
--- a/kernel/arch/x86/include/uapi/asm/byteorder.h
+++ b/kernel/arch/x86/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_BYTEORDER_H
 #define _ASM_X86_BYTEORDER_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/debugreg.h b/kernel/arch/x86/include/uapi/asm/debugreg.h
index 3c0874dd9..d95d080b3 100644
--- a/kernel/arch/x86/include/uapi/asm/debugreg.h
+++ b/kernel/arch/x86/include/uapi/asm/debugreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_DEBUGREG_H
 #define _UAPI_ASM_X86_DEBUGREG_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/e820.h b/kernel/arch/x86/include/uapi/asm/e820.h
index 9dafe59cf..2f491efe3 100644
--- a/kernel/arch/x86/include/uapi/asm/e820.h
+++ b/kernel/arch/x86/include/uapi/asm/e820.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_E820_H
 #define _UAPI_ASM_X86_E820_H
 #define E820MAP	0x2d0		/* our map */
diff --git a/kernel/arch/x86/include/uapi/asm/hw_breakpoint.h b/kernel/arch/x86/include/uapi/asm/hw_breakpoint.h
index 79a9626b5..6789884c7 100644
--- a/kernel/arch/x86/include/uapi/asm/hw_breakpoint.h
+++ b/kernel/arch/x86/include/uapi/asm/hw_breakpoint.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* */
diff --git a/kernel/arch/x86/include/uapi/asm/hwcap2.h b/kernel/arch/x86/include/uapi/asm/hwcap2.h
index 0bd2be5c7..6ebaae90e 100644
--- a/kernel/arch/x86/include/uapi/asm/hwcap2.h
+++ b/kernel/arch/x86/include/uapi/asm/hwcap2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_HWCAP2_H
 #define _ASM_X86_HWCAP2_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/hyperv.h b/kernel/arch/x86/include/uapi/asm/hyperv.h
index f65d12504..1a5bfead9 100644
--- a/kernel/arch/x86/include/uapi/asm/hyperv.h
+++ b/kernel/arch/x86/include/uapi/asm/hyperv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_HYPERV_H
 #define _ASM_X86_HYPERV_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/ist.h b/kernel/arch/x86/include/uapi/asm/ist.h
index bad9f5ea4..eac5b2079 100644
--- a/kernel/arch/x86/include/uapi/asm/ist.h
+++ b/kernel/arch/x86/include/uapi/asm/ist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Include file for the interface to IST BIOS
  * Copyright 2002 Andy Grover <andrew.grover@intel.com>
diff --git a/kernel/arch/x86/include/uapi/asm/kvm.h b/kernel/arch/x86/include/uapi/asm/kvm.h
index c2824d02b..f3a960488 100644
--- a/kernel/arch/x86/include/uapi/asm/kvm.h
+++ b/kernel/arch/x86/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_KVM_H
 #define _ASM_X86_KVM_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/kvm_para.h b/kernel/arch/x86/include/uapi/asm/kvm_para.h
index a965e5b0d..554aa8f24 100644
--- a/kernel/arch/x86/include/uapi/asm/kvm_para.h
+++ b/kernel/arch/x86/include/uapi/asm/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_KVM_PARA_H
 #define _UAPI_ASM_X86_KVM_PARA_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/kvm_perf.h b/kernel/arch/x86/include/uapi/asm/kvm_perf.h
index 3bb964f88..125cf5cdf 100644
--- a/kernel/arch/x86/include/uapi/asm/kvm_perf.h
+++ b/kernel/arch/x86/include/uapi/asm/kvm_perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_KVM_PERF_H
 #define _ASM_X86_KVM_PERF_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/ldt.h b/kernel/arch/x86/include/uapi/asm/ldt.h
index 6e1aaf738..d62ac5db0 100644
--- a/kernel/arch/x86/include/uapi/asm/ldt.h
+++ b/kernel/arch/x86/include/uapi/asm/ldt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ldt.h
  *
diff --git a/kernel/arch/x86/include/uapi/asm/mce.h b/kernel/arch/x86/include/uapi/asm/mce.h
index eb6247a70..91723461d 100644
--- a/kernel/arch/x86/include/uapi/asm/mce.h
+++ b/kernel/arch/x86/include/uapi/asm/mce.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_MCE_H
 #define _UAPI_ASM_X86_MCE_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/mman.h b/kernel/arch/x86/include/uapi/asm/mman.h
index 3be08f076..d4a8d0424 100644
--- a/kernel/arch/x86/include/uapi/asm/mman.h
+++ b/kernel/arch/x86/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_MMAN_H
 #define _ASM_X86_MMAN_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/msr.h b/kernel/arch/x86/include/uapi/asm/msr.h
index c41f4fe25..e7516b402 100644
--- a/kernel/arch/x86/include/uapi/asm/msr.h
+++ b/kernel/arch/x86/include/uapi/asm/msr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_MSR_H
 #define _UAPI_ASM_X86_MSR_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/mtrr.h b/kernel/arch/x86/include/uapi/asm/mtrr.h
index 7528dcf59..376563f2b 100644
--- a/kernel/arch/x86/include/uapi/asm/mtrr.h
+++ b/kernel/arch/x86/include/uapi/asm/mtrr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
 /*  Generic MTRR (Memory Type Range Register) ioctls.
 
     Copyright (C) 1997-1999  Richard Gooch
diff --git a/kernel/arch/x86/include/uapi/asm/perf_regs.h b/kernel/arch/x86/include/uapi/asm/perf_regs.h
index 3f2207bfd..f3329cabc 100644
--- a/kernel/arch/x86/include/uapi/asm/perf_regs.h
+++ b/kernel/arch/x86/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_PERF_REGS_H
 #define _ASM_X86_PERF_REGS_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/posix_types.h b/kernel/arch/x86/include/uapi/asm/posix_types.h
index 85506b383..c661e95f0 100644
--- a/kernel/arch/x86/include/uapi/asm/posix_types.h
+++ b/kernel/arch/x86/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __KERNEL__
 # ifdef __i386__
 #  include <asm/posix_types_32.h>
diff --git a/kernel/arch/x86/include/uapi/asm/posix_types_32.h b/kernel/arch/x86/include/uapi/asm/posix_types_32.h
index 8e525059e..840659f4b 100644
--- a/kernel/arch/x86/include/uapi/asm/posix_types_32.h
+++ b/kernel/arch/x86/include/uapi/asm/posix_types_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_POSIX_TYPES_32_H
 #define _ASM_X86_POSIX_TYPES_32_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/posix_types_64.h b/kernel/arch/x86/include/uapi/asm/posix_types_64.h
index cba0c1ead..515afb805 100644
--- a/kernel/arch/x86/include/uapi/asm/posix_types_64.h
+++ b/kernel/arch/x86/include/uapi/asm/posix_types_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_POSIX_TYPES_64_H
 #define _ASM_X86_POSIX_TYPES_64_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/posix_types_x32.h b/kernel/arch/x86/include/uapi/asm/posix_types_x32.h
index 85f9bdafa..f60479b07 100644
--- a/kernel/arch/x86/include/uapi/asm/posix_types_x32.h
+++ b/kernel/arch/x86/include/uapi/asm/posix_types_x32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_POSIX_TYPES_X32_H
 #define _ASM_X86_POSIX_TYPES_X32_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/prctl.h b/kernel/arch/x86/include/uapi/asm/prctl.h
index c45765517..5a6aac9fa 100644
--- a/kernel/arch/x86/include/uapi/asm/prctl.h
+++ b/kernel/arch/x86/include/uapi/asm/prctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_PRCTL_H
 #define _ASM_X86_PRCTL_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/processor-flags.h b/kernel/arch/x86/include/uapi/asm/processor-flags.h
index 185f3d10c..6f3355399 100644
--- a/kernel/arch/x86/include/uapi/asm/processor-flags.h
+++ b/kernel/arch/x86/include/uapi/asm/processor-flags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_PROCESSOR_FLAGS_H
 #define _UAPI_ASM_X86_PROCESSOR_FLAGS_H
 /* Various flags defined: can be included from assembler. */
diff --git a/kernel/arch/x86/include/uapi/asm/ptrace-abi.h b/kernel/arch/x86/include/uapi/asm/ptrace-abi.h
index 580aee307..16074b9c9 100644
--- a/kernel/arch/x86/include/uapi/asm/ptrace-abi.h
+++ b/kernel/arch/x86/include/uapi/asm/ptrace-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_PTRACE_ABI_H
 #define _ASM_X86_PTRACE_ABI_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/ptrace.h b/kernel/arch/x86/include/uapi/asm/ptrace.h
index bc16115af..85165c0ed 100644
--- a/kernel/arch/x86/include/uapi/asm/ptrace.h
+++ b/kernel/arch/x86/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_PTRACE_H
 #define _UAPI_ASM_X86_PTRACE_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/sembuf.h b/kernel/arch/x86/include/uapi/asm/sembuf.h
index cc2d6a3ae..cabd7476b 100644
--- a/kernel/arch/x86/include/uapi/asm/sembuf.h
+++ b/kernel/arch/x86/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_SEMBUF_H
 #define _ASM_X86_SEMBUF_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/sigcontext.h b/kernel/arch/x86/include/uapi/asm/sigcontext.h
index 62d4111c1..844d60eb1 100644
--- a/kernel/arch/x86/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/x86/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_SIGCONTEXT_H
 #define _UAPI_ASM_X86_SIGCONTEXT_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/sigcontext32.h b/kernel/arch/x86/include/uapi/asm/sigcontext32.h
index a92b0f0dc..6b18e88de 100644
--- a/kernel/arch/x86/include/uapi/asm/sigcontext32.h
+++ b/kernel/arch/x86/include/uapi/asm/sigcontext32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_SIGCONTEXT32_H
 #define _ASM_X86_SIGCONTEXT32_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/siginfo.h b/kernel/arch/x86/include/uapi/asm/siginfo.h
index 34c47b334..b3d157957 100644
--- a/kernel/arch/x86/include/uapi/asm/siginfo.h
+++ b/kernel/arch/x86/include/uapi/asm/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_SIGINFO_H
 #define _ASM_X86_SIGINFO_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/signal.h b/kernel/arch/x86/include/uapi/asm/signal.h
index 8264f47cf..e5745d593 100644
--- a/kernel/arch/x86/include/uapi/asm/signal.h
+++ b/kernel/arch/x86/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_SIGNAL_H
 #define _UAPI_ASM_X86_SIGNAL_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/stat.h b/kernel/arch/x86/include/uapi/asm/stat.h
index bc03eb5d6..9e3982d95 100644
--- a/kernel/arch/x86/include/uapi/asm/stat.h
+++ b/kernel/arch/x86/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_STAT_H
 #define _ASM_X86_STAT_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/statfs.h b/kernel/arch/x86/include/uapi/asm/statfs.h
index 2d0adbf99..13c2464cd 100644
--- a/kernel/arch/x86/include/uapi/asm/statfs.h
+++ b/kernel/arch/x86/include/uapi/asm/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_STATFS_H
 #define _ASM_X86_STATFS_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/svm.h b/kernel/arch/x86/include/uapi/asm/svm.h
index 3725e145a..a9731f8a4 100644
--- a/kernel/arch/x86/include/uapi/asm/svm.h
+++ b/kernel/arch/x86/include/uapi/asm/svm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SVM_H
 #define _UAPI__SVM_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/swab.h b/kernel/arch/x86/include/uapi/asm/swab.h
index 7f235c710..cd3fd8ddb 100644
--- a/kernel/arch/x86/include/uapi/asm/swab.h
+++ b/kernel/arch/x86/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_SWAB_H
 #define _ASM_X86_SWAB_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/types.h b/kernel/arch/x86/include/uapi/asm/types.h
index 8e8c23fef..df55e1ddb 100644
--- a/kernel/arch/x86/include/uapi/asm/types.h
+++ b/kernel/arch/x86/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_TYPES_H
 #define _ASM_X86_TYPES_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/ucontext.h b/kernel/arch/x86/include/uapi/asm/ucontext.h
index e3d1ec906..5657b7a49 100644
--- a/kernel/arch/x86/include/uapi/asm/ucontext.h
+++ b/kernel/arch/x86/include/uapi/asm/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_UCONTEXT_H
 #define _ASM_X86_UCONTEXT_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/unistd.h b/kernel/arch/x86/include/uapi/asm/unistd.h
index a26df0d75..30d7d04d7 100644
--- a/kernel/arch/x86/include/uapi/asm/unistd.h
+++ b/kernel/arch/x86/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_UNISTD_H
 #define _UAPI_ASM_X86_UNISTD_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/vm86.h b/kernel/arch/x86/include/uapi/asm/vm86.h
index e0b243e9d..d2ee4e307 100644
--- a/kernel/arch/x86/include/uapi/asm/vm86.h
+++ b/kernel/arch/x86/include/uapi/asm/vm86.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_VM86_H
 #define _UAPI_ASM_X86_VM86_H
 
diff --git a/kernel/arch/x86/include/uapi/asm/vmx.h b/kernel/arch/x86/include/uapi/asm/vmx.h
index 690a2dcf4..f0b0c90dd 100644
--- a/kernel/arch/x86/include/uapi/asm/vmx.h
+++ b/kernel/arch/x86/include/uapi/asm/vmx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * vmx.h: VMX Architecture related definitions
  * Copyright (c) 2004, Intel Corporation.
diff --git a/kernel/arch/x86/include/uapi/asm/vsyscall.h b/kernel/arch/x86/include/uapi/asm/vsyscall.h
index b97dd6e26..75275f547 100644
--- a/kernel/arch/x86/include/uapi/asm/vsyscall.h
+++ b/kernel/arch/x86/include/uapi/asm/vsyscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_VSYSCALL_H
 #define _UAPI_ASM_X86_VSYSCALL_H
 
diff --git a/kernel/arch/x86/kernel/Makefile b/kernel/arch/x86/kernel/Makefile
index fd0a7895b..5f7004434 100644
--- a/kernel/arch/x86/kernel/Makefile
+++ b/kernel/arch/x86/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/arch/x86/kernel/acpi/Makefile b/kernel/arch/x86/kernel/acpi/Makefile
index 85a9e17e0..f1bb57b0e 100644
--- a/kernel/arch/x86/kernel/acpi/Makefile
+++ b/kernel/arch/x86/kernel/acpi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OBJECT_FILES_NON_STANDARD_wakeup_$(BITS).o := y
 
 obj-$(CONFIG_ACPI)		+= boot.o
diff --git a/kernel/arch/x86/kernel/acpi/sleep.c b/kernel/arch/x86/kernel/acpi/sleep.c
index ed014814e..7188aea91 100644
--- a/kernel/arch/x86/kernel/acpi/sleep.c
+++ b/kernel/arch/x86/kernel/acpi/sleep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sleep.c - x86-specific ACPI sleep support.
  *
diff --git a/kernel/arch/x86/kernel/acpi/sleep.h b/kernel/arch/x86/kernel/acpi/sleep.h
index 65c7b606b..fbb60ca42 100644
--- a/kernel/arch/x86/kernel/acpi/sleep.h
+++ b/kernel/arch/x86/kernel/acpi/sleep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Variables and functions used by the code in sleep.c
  */
diff --git a/kernel/arch/x86/kernel/aperture_64.c b/kernel/arch/x86/kernel/aperture_64.c
index ef2859f9f..f5d92bc3b 100644
--- a/kernel/arch/x86/kernel/aperture_64.c
+++ b/kernel/arch/x86/kernel/aperture_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Firmware replacement code.
  *
diff --git a/kernel/arch/x86/kernel/apic/Makefile b/kernel/arch/x86/kernel/apic/Makefile
index 8e63ebdcb..2fb7309c6 100644
--- a/kernel/arch/x86/kernel/apic/Makefile
+++ b/kernel/arch/x86/kernel/apic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for local APIC drivers and for the IO-APIC code
 #
diff --git a/kernel/arch/x86/kernel/apic/apic_noop.c b/kernel/arch/x86/kernel/apic/apic_noop.c
index 6599f437b..c8d211277 100644
--- a/kernel/arch/x86/kernel/apic/apic_noop.c
+++ b/kernel/arch/x86/kernel/apic/apic_noop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NOOP APIC driver.
  *
diff --git a/kernel/arch/x86/kernel/apic/bigsmp_32.c b/kernel/arch/x86/kernel/apic/bigsmp_32.c
index 456e45e8b..e12fbcfc9 100644
--- a/kernel/arch/x86/kernel/apic/bigsmp_32.c
+++ b/kernel/arch/x86/kernel/apic/bigsmp_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * APIC driver for "bigsmp" xAPIC machines with more than 8 virtual CPUs.
  *
diff --git a/kernel/arch/x86/kernel/apic/hw_nmi.c b/kernel/arch/x86/kernel/apic/hw_nmi.c
index d6f387780..d1fc62a67 100644
--- a/kernel/arch/x86/kernel/apic/hw_nmi.c
+++ b/kernel/arch/x86/kernel/apic/hw_nmi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  HW NMI watchdog support
  *
diff --git a/kernel/arch/x86/kernel/apic/io_apic.c b/kernel/arch/x86/kernel/apic/io_apic.c
index 70e48aa6a..3b89b2794 100644
--- a/kernel/arch/x86/kernel/apic/io_apic.c
+++ b/kernel/arch/x86/kernel/apic/io_apic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Intel IO-APIC support for multi-Pentium hosts.
  *
diff --git a/kernel/arch/x86/kernel/apic/ipi.c b/kernel/arch/x86/kernel/apic/ipi.c
index 3a205d4a1..82f9244fe 100644
--- a/kernel/arch/x86/kernel/apic/ipi.c
+++ b/kernel/arch/x86/kernel/apic/ipi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cpumask.h>
 #include <linux/interrupt.h>
 
diff --git a/kernel/arch/x86/kernel/apic/x2apic_cluster.c b/kernel/arch/x86/kernel/apic/x2apic_cluster.c
index 481237cb1..e216cf3d6 100644
--- a/kernel/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/kernel/arch/x86/kernel/apic/x2apic_cluster.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/string.h>
diff --git a/kernel/arch/x86/kernel/apic/x2apic_phys.c b/kernel/arch/x86/kernel/apic/x2apic_phys.c
index 3baf0c3dc..b94d35320 100644
--- a/kernel/arch/x86/kernel/apic/x2apic_phys.c
+++ b/kernel/arch/x86/kernel/apic/x2apic_phys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/string.h>
diff --git a/kernel/arch/x86/kernel/asm-offsets.c b/kernel/arch/x86/kernel/asm-offsets.c
index de827d6ac..8ea782754 100644
--- a/kernel/arch/x86/kernel/asm-offsets.c
+++ b/kernel/arch/x86/kernel/asm-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by assembly language modules.
  * This code generates raw asm output which is post-processed to extract
diff --git a/kernel/arch/x86/kernel/asm-offsets_32.c b/kernel/arch/x86/kernel/asm-offsets_32.c
index 710edab9e..dedf428b2 100644
--- a/kernel/arch/x86/kernel/asm-offsets_32.c
+++ b/kernel/arch/x86/kernel/asm-offsets_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef __LINUX_KBUILD_H
 # error "Please do not build this file directly, build asm-offsets.c instead"
 #endif
diff --git a/kernel/arch/x86/kernel/asm-offsets_64.c b/kernel/arch/x86/kernel/asm-offsets_64.c
index cf4220692..630212fa9 100644
--- a/kernel/arch/x86/kernel/asm-offsets_64.c
+++ b/kernel/arch/x86/kernel/asm-offsets_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef __LINUX_KBUILD_H
 # error "Please do not build this file directly, build asm-offsets.c instead"
 #endif
diff --git a/kernel/arch/x86/kernel/audit_64.c b/kernel/arch/x86/kernel/audit_64.c
index f3672508b..e1efe44eb 100644
--- a/kernel/arch/x86/kernel/audit_64.c
+++ b/kernel/arch/x86/kernel/audit_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/arch/x86/kernel/bootflag.c b/kernel/arch/x86/kernel/bootflag.c
index 52c8e3c77..3fed7ae58 100644
--- a/kernel/arch/x86/kernel/bootflag.c
+++ b/kernel/arch/x86/kernel/bootflag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Implement 'Simple Boot Flag Specification 2.0'
  */
diff --git a/kernel/arch/x86/kernel/check.c b/kernel/arch/x86/kernel/check.c
index 145863d4d..333994267 100644
--- a/kernel/arch/x86/kernel/check.c
+++ b/kernel/arch/x86/kernel/check.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
diff --git a/kernel/arch/x86/kernel/cpu/Makefile b/kernel/arch/x86/kernel/cpu/Makefile
index e17942c13..236999c54 100644
--- a/kernel/arch/x86/kernel/cpu/Makefile
+++ b/kernel/arch/x86/kernel/cpu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for x86-compatible CPU details, features and quirks
 #
@@ -21,7 +22,7 @@ obj-y			+= common.o
 obj-y			+= rdrand.o
 obj-y			+= match.o
 obj-y			+= bugs.o
-obj-$(CONFIG_CPU_FREQ)	+= aperfmperf.o
+obj-y			+= aperfmperf.o
 
 obj-$(CONFIG_PROC_FS)	+= proc.o
 obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o
diff --git a/kernel/arch/x86/kernel/cpu/aperfmperf.c b/kernel/arch/x86/kernel/cpu/aperfmperf.c
index 0ee83321a..957813e01 100644
--- a/kernel/arch/x86/kernel/cpu/aperfmperf.c
+++ b/kernel/arch/x86/kernel/cpu/aperfmperf.c
@@ -42,10 +42,6 @@ static void aperfmperf_snapshot_khz(void *dummy)
 	s64 time_delta = ktime_ms_delta(now, s->time);
 	unsigned long flags;
 
-	/* Don't bother re-computing within the cache threshold time. */
-	if (time_delta < APERFMPERF_CACHE_THRESHOLD_MS)
-		return;
-
 	local_irq_save(flags);
 	rdmsrl(MSR_IA32_APERF, aperf);
 	rdmsrl(MSR_IA32_MPERF, mperf);
@@ -74,6 +70,7 @@ static void aperfmperf_snapshot_khz(void *dummy)
 
 unsigned int arch_freq_get_on_cpu(int cpu)
 {
+	s64 time_delta;
 	unsigned int khz;
 
 	if (!cpu_khz)
@@ -82,6 +79,12 @@ unsigned int arch_freq_get_on_cpu(int cpu)
 	if (!static_cpu_has(X86_FEATURE_APERFMPERF))
 		return 0;
 
+	/* Don't bother re-computing within the cache threshold time. */
+	time_delta = ktime_ms_delta(ktime_get(), per_cpu(samples.time, cpu));
+	khz = per_cpu(samples.khz, cpu);
+	if (khz && time_delta < APERFMPERF_CACHE_THRESHOLD_MS)
+		return khz;
+
 	smp_call_function_single(cpu, aperfmperf_snapshot_khz, NULL, 1);
 	khz = per_cpu(samples.khz, cpu);
 	if (khz)
diff --git a/kernel/arch/x86/kernel/cpu/bugs.c b/kernel/arch/x86/kernel/cpu/bugs.c
index 0af86d924..ba0b2424c 100644
--- a/kernel/arch/x86/kernel/cpu/bugs.c
+++ b/kernel/arch/x86/kernel/cpu/bugs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1994  Linus Torvalds
  *
diff --git a/kernel/arch/x86/kernel/cpu/centaur.c b/kernel/arch/x86/kernel/cpu/centaur.c
index 44207b71f..68bc6d9b3 100644
--- a/kernel/arch/x86/kernel/cpu/centaur.c
+++ b/kernel/arch/x86/kernel/cpu/centaur.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/sched.h>
 #include <linux/sched/clock.h>
diff --git a/kernel/arch/x86/kernel/cpu/cpu.h b/kernel/arch/x86/kernel/cpu/cpu.h
index 2584265d4..f52a370b6 100644
--- a/kernel/arch/x86/kernel/cpu/cpu.h
+++ b/kernel/arch/x86/kernel/cpu/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_X86_CPU_H
 #define ARCH_X86_CPU_H
 
diff --git a/kernel/arch/x86/kernel/cpu/cyrix.c b/kernel/arch/x86/kernel/cpu/cyrix.c
index 6f0774456..6b4bb3356 100644
--- a/kernel/arch/x86/kernel/cpu/cyrix.c
+++ b/kernel/arch/x86/kernel/cpu/cyrix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
diff --git a/kernel/arch/x86/kernel/cpu/intel.c b/kernel/arch/x86/kernel/cpu/intel.c
index dfa90a3a5..b720dacac 100644
--- a/kernel/arch/x86/kernel/cpu/intel.c
+++ b/kernel/arch/x86/kernel/cpu/intel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 
 #include <linux/string.h>
diff --git a/kernel/arch/x86/kernel/cpu/intel_cacheinfo.c b/kernel/arch/x86/kernel/cpu/intel_cacheinfo.c
index 9990a71e3..54d04d574 100644
--- a/kernel/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/kernel/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Routines to identify caches on Intel CPU.
  *
diff --git a/kernel/arch/x86/kernel/cpu/intel_rdt.h b/kernel/arch/x86/kernel/cpu/intel_rdt.h
index ebaddaeef..a43a72d8e 100644
--- a/kernel/arch/x86/kernel/cpu/intel_rdt.h
+++ b/kernel/arch/x86/kernel/cpu/intel_rdt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_INTEL_RDT_H
 #define _ASM_X86_INTEL_RDT_H
 
diff --git a/kernel/arch/x86/kernel/cpu/match.c b/kernel/arch/x86/kernel/cpu/match.c
index e42117d5f..3fed38812 100644
--- a/kernel/arch/x86/kernel/cpu/match.c
+++ b/kernel/arch/x86/kernel/cpu/match.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/cpu_device_id.h>
 #include <asm/cpufeature.h>
 #include <linux/cpu.h>
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/Makefile b/kernel/arch/x86/kernel/cpu/mcheck/Makefile
index 43051f077..bcc7c54c7 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/Makefile
+++ b/kernel/arch/x86/kernel/cpu/mcheck/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				=  mce.o mce-severity.o mce-genpool.o
 
 obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/dev-mcelog.c b/kernel/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
index 10cec43aa..7f85b76f4 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
+++ b/kernel/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
@@ -24,14 +24,6 @@ static DEFINE_MUTEX(mce_chrdev_read_mutex);
 static char mce_helper[128];
 static char *mce_helper_argv[2] = { mce_helper, NULL };
 
-#define mce_log_get_idx_check(p) \
-({ \
-	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
-			 !lockdep_is_held(&mce_chrdev_read_mutex), \
-			 "suspicious mce_log_get_idx_check() usage"); \
-	smp_load_acquire(&(p)); \
-})
-
 /*
  * Lockless MCE logging infrastructure.
  * This avoids deadlocks on printk locks without having to break locks. Also
@@ -53,43 +45,32 @@ static int dev_mce_log(struct notifier_block *nb, unsigned long val,
 				void *data)
 {
 	struct mce *mce = (struct mce *)data;
-	unsigned int next, entry;
+	unsigned int entry;
 
-	wmb();
-	for (;;) {
-		entry = mce_log_get_idx_check(mcelog.next);
-		for (;;) {
+	mutex_lock(&mce_chrdev_read_mutex);
 
-			/*
-			 * When the buffer fills up discard new entries.
-			 * Assume that the earlier errors are the more
-			 * interesting ones:
-			 */
-			if (entry >= MCE_LOG_LEN) {
-				set_bit(MCE_OVERFLOW,
-					(unsigned long *)&mcelog.flags);
-				return NOTIFY_OK;
-			}
-			/* Old left over entry. Skip: */
-			if (mcelog.entry[entry].finished) {
-				entry++;
-				continue;
-			}
-			break;
-		}
-		smp_rmb();
-		next = entry + 1;
-		if (cmpxchg(&mcelog.next, entry, next) == entry)
-			break;
+	entry = mcelog.next;
+
+	/*
+	 * When the buffer fills up discard new entries. Assume that the
+	 * earlier errors are the more interesting ones:
+	 */
+	if (entry >= MCE_LOG_LEN) {
+		set_bit(MCE_OVERFLOW, (unsigned long *)&mcelog.flags);
+		goto unlock;
 	}
+
+	mcelog.next = entry + 1;
+
 	memcpy(mcelog.entry + entry, mce, sizeof(struct mce));
-	wmb();
 	mcelog.entry[entry].finished = 1;
-	wmb();
 
 	/* wake processes polling /dev/mcelog */
 	wake_up_interruptible(&mce_chrdev_wait);
 
+unlock:
+	mutex_unlock(&mce_chrdev_read_mutex);
+
 	return NOTIFY_OK;
 }
 
@@ -177,13 +158,6 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static void collect_tscs(void *data)
-{
-	unsigned long *cpu_tsc = (unsigned long *)data;
-
-	cpu_tsc[smp_processor_id()] = rdtsc();
-}
-
 static int mce_apei_read_done;
 
 /* Collect MCE record of previous boot in persistent storage via APEI ERST. */
@@ -231,14 +205,9 @@ static ssize_t mce_chrdev_read(struct file *filp, char __user *ubuf,
 				size_t usize, loff_t *off)
 {
 	char __user *buf = ubuf;
-	unsigned long *cpu_tsc;
-	unsigned prev, next;
+	unsigned next;
 	int i, err;
 
-	cpu_tsc = kmalloc(nr_cpu_ids * sizeof(long), GFP_KERNEL);
-	if (!cpu_tsc)
-		return -ENOMEM;
-
 	mutex_lock(&mce_chrdev_read_mutex);
 
 	if (!mce_apei_read_done) {
@@ -247,65 +216,29 @@ static ssize_t mce_chrdev_read(struct file *filp, char __user *ubuf,
 			goto out;
 	}
 
-	next = mce_log_get_idx_check(mcelog.next);
-
 	/* Only supports full reads right now */
 	err = -EINVAL;
 	if (*off != 0 || usize < MCE_LOG_LEN*sizeof(struct mce))
 		goto out;
 
+	next = mcelog.next;
 	err = 0;
-	prev = 0;
-	do {
-		for (i = prev; i < next; i++) {
-			unsigned long start = jiffies;
-			struct mce *m = &mcelog.entry[i];
 
-			while (!m->finished) {
-				if (time_after_eq(jiffies, start + 2)) {
-					memset(m, 0, sizeof(*m));
-					goto timeout;
-				}
-				cpu_relax();
-			}
-			smp_rmb();
-			err |= copy_to_user(buf, m, sizeof(*m));
-			buf += sizeof(*m);
-timeout:
-			;
-		}
-
-		memset(mcelog.entry + prev, 0,
-		       (next - prev) * sizeof(struct mce));
-		prev = next;
-		next = cmpxchg(&mcelog.next, prev, 0);
-	} while (next != prev);
-
-	synchronize_sched();
-
-	/*
-	 * Collect entries that were still getting written before the
-	 * synchronize.
-	 */
-	on_each_cpu(collect_tscs, cpu_tsc, 1);
-
-	for (i = next; i < MCE_LOG_LEN; i++) {
+	for (i = 0; i < next; i++) {
 		struct mce *m = &mcelog.entry[i];
 
-		if (m->finished && m->tsc < cpu_tsc[m->cpu]) {
-			err |= copy_to_user(buf, m, sizeof(*m));
-			smp_rmb();
-			buf += sizeof(*m);
-			memset(m, 0, sizeof(*m));
-		}
+		err |= copy_to_user(buf, m, sizeof(*m));
+		buf += sizeof(*m);
 	}
 
+	memset(mcelog.entry, 0, next * sizeof(struct mce));
+	mcelog.next = 0;
+
 	if (err)
 		err = -EFAULT;
 
 out:
 	mutex_unlock(&mce_chrdev_read_mutex);
-	kfree(cpu_tsc);
 
 	return err ? err : buf - ubuf;
 }
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/mce-internal.h b/kernel/arch/x86/kernel/cpu/mcheck/mce-internal.h
index debb974fd..aa0d5df9d 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/kernel/arch/x86/kernel/cpu/mcheck/mce-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __X86_MCE_INTERNAL_H__
 #define __X86_MCE_INTERNAL_H__
 
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/mce_intel.c b/kernel/arch/x86/kernel/cpu/mcheck/mce_intel.c
index e84db79ef..d05be307d 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/kernel/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel specific MCE features.
  * Copyright 2004 Zwane Mwaikambo <zwane@linuxpower.ca>
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/p5.c b/kernel/arch/x86/kernel/cpu/mcheck/p5.c
index 2a0717bf8..5cddf8317 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/kernel/arch/x86/kernel/cpu/mcheck/p5.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * P5 specific Machine Check Exception Reporting
  * (C) Copyright 2002 Alan Cox <alan@lxorguk.ukuu.org.uk>
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/threshold.c b/kernel/arch/x86/kernel/cpu/mcheck/threshold.c
index 5e7249e42..2b584b319 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/threshold.c
+++ b/kernel/arch/x86/kernel/cpu/mcheck/threshold.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common corrected MCE threshold handler code:
  */
diff --git a/kernel/arch/x86/kernel/cpu/mcheck/winchip.c b/kernel/arch/x86/kernel/cpu/mcheck/winchip.c
index c6a722e1d..3b45b270a 100644
--- a/kernel/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/kernel/arch/x86/kernel/cpu/mcheck/winchip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IDT Winchip specific Machine Check Exception Reporting
  * (C) Copyright 2002 Alan Cox <alan@lxorguk.ukuu.org.uk>
diff --git a/kernel/arch/x86/kernel/cpu/mkcapflags.sh b/kernel/arch/x86/kernel/cpu/mkcapflags.sh
index 6988c7440..d0dfb892c 100644
--- a/kernel/arch/x86/kernel/cpu/mkcapflags.sh
+++ b/kernel/arch/x86/kernel/cpu/mkcapflags.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h
 #
diff --git a/kernel/arch/x86/kernel/cpu/mtrr/amd.c b/kernel/arch/x86/kernel/cpu/mtrr/amd.c
index 92ba9cd31..a65a02720 100644
--- a/kernel/arch/x86/kernel/cpu/mtrr/amd.c
+++ b/kernel/arch/x86/kernel/cpu/mtrr/amd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <asm/mtrr.h>
diff --git a/kernel/arch/x86/kernel/cpu/mtrr/centaur.c b/kernel/arch/x86/kernel/cpu/mtrr/centaur.c
index 3d689937f..f27177816 100644
--- a/kernel/arch/x86/kernel/cpu/mtrr/centaur.c
+++ b/kernel/arch/x86/kernel/cpu/mtrr/centaur.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/mm.h>
 
diff --git a/kernel/arch/x86/kernel/cpu/mtrr/cyrix.c b/kernel/arch/x86/kernel/cpu/mtrr/cyrix.c
index b1086f79e..4296c702a 100644
--- a/kernel/arch/x86/kernel/cpu/mtrr/cyrix.c
+++ b/kernel/arch/x86/kernel/cpu/mtrr/cyrix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/mm.h>
diff --git a/kernel/arch/x86/kernel/cpu/mtrr/if.c b/kernel/arch/x86/kernel/cpu/mtrr/if.c
index 6d9b45549..558444b23 100644
--- a/kernel/arch/x86/kernel/cpu/mtrr/if.c
+++ b/kernel/arch/x86/kernel/cpu/mtrr/if.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/capability.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/x86/kernel/cpu/mtrr/mtrr.h b/kernel/arch/x86/kernel/cpu/mtrr/mtrr.h
index ad8bd763e..2ac99e561 100644
--- a/kernel/arch/x86/kernel/cpu/mtrr/mtrr.h
+++ b/kernel/arch/x86/kernel/cpu/mtrr/mtrr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * local MTRR defines.
  */
diff --git a/kernel/arch/x86/kernel/cpu/perfctr-watchdog.c b/kernel/arch/x86/kernel/cpu/perfctr-watchdog.c
index 181eabeca..d38908333 100644
--- a/kernel/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/kernel/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * local apic based NMI watchdog for various CPUs.
  *
diff --git a/kernel/arch/x86/kernel/cpu/powerflags.c b/kernel/arch/x86/kernel/cpu/powerflags.c
index 1dd8294fd..fd6ec2aa0 100644
--- a/kernel/arch/x86/kernel/cpu/powerflags.c
+++ b/kernel/arch/x86/kernel/cpu/powerflags.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Strings for the various x86 power flags
  *
diff --git a/kernel/arch/x86/kernel/cpu/proc.c b/kernel/arch/x86/kernel/cpu/proc.c
index 218f79825..4378a729b 100644
--- a/kernel/arch/x86/kernel/cpu/proc.c
+++ b/kernel/arch/x86/kernel/cpu/proc.c
@@ -1,7 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/smp.h>
 #include <linux/timex.h>
 #include <linux/string.h>
 #include <linux/seq_file.h>
+#include <linux/cpufreq.h>
 
 /*
  *	Get CPU information for use by the procfs.
@@ -75,9 +77,16 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	if (c->microcode)
 		seq_printf(m, "microcode\t: 0x%x\n", c->microcode);
 
-	if (cpu_has(c, X86_FEATURE_TSC))
+	if (cpu_has(c, X86_FEATURE_TSC)) {
+		unsigned int freq = arch_freq_get_on_cpu(cpu);
+
+		if (!freq)
+			freq = cpufreq_quick_get(cpu);
+		if (!freq)
+			freq = cpu_khz;
 		seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
-			   cpu_khz / 1000, (cpu_khz % 1000));
+			   freq / 1000, (freq % 1000));
+	}
 
 	/* Cache size */
 	if (c->x86_cache_size >= 0)
diff --git a/kernel/arch/x86/kernel/cpu/topology.c b/kernel/arch/x86/kernel/cpu/topology.c
index cd531355e..b099024d3 100644
--- a/kernel/arch/x86/kernel/cpu/topology.c
+++ b/kernel/arch/x86/kernel/cpu/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Check for extended topology enumeration cpuid leaf 0xb and if it
  * exists, use it for populating initial_apicid and cpu topology
diff --git a/kernel/arch/x86/kernel/cpu/transmeta.c b/kernel/arch/x86/kernel/cpu/transmeta.c
index d77d07ab3..42c939827 100644
--- a/kernel/arch/x86/kernel/cpu/transmeta.c
+++ b/kernel/arch/x86/kernel/cpu/transmeta.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/sched/clock.h>
diff --git a/kernel/arch/x86/kernel/cpu/umc.c b/kernel/arch/x86/kernel/cpu/umc.c
index ef9c2a007..65a58a390 100644
--- a/kernel/arch/x86/kernel/cpu/umc.c
+++ b/kernel/arch/x86/kernel/cpu/umc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <asm/processor.h>
 #include "cpu.h"
diff --git a/kernel/arch/x86/kernel/crash_dump_32.c b/kernel/arch/x86/kernel/crash_dump_32.c
index 538fedea9..33ee47670 100644
--- a/kernel/arch/x86/kernel/crash_dump_32.c
+++ b/kernel/arch/x86/kernel/crash_dump_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Memory preserving reboot related code.
  *
diff --git a/kernel/arch/x86/kernel/crash_dump_64.c b/kernel/arch/x86/kernel/crash_dump_64.c
index afa64adb7..4f2e0778f 100644
--- a/kernel/arch/x86/kernel/crash_dump_64.c
+++ b/kernel/arch/x86/kernel/crash_dump_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Memory preserving reboot related code.
  *
diff --git a/kernel/arch/x86/kernel/devicetree.c b/kernel/arch/x86/kernel/devicetree.c
index cbf1f6ba3..76e07698e 100644
--- a/kernel/arch/x86/kernel/devicetree.c
+++ b/kernel/arch/x86/kernel/devicetree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Architecture specific OF callbacks.
  */
diff --git a/kernel/arch/x86/kernel/doublefault.c b/kernel/arch/x86/kernel/doublefault.c
index f9c324e08..0e662c55a 100644
--- a/kernel/arch/x86/kernel/doublefault.c
+++ b/kernel/arch/x86/kernel/doublefault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/sched/debug.h>
diff --git a/kernel/arch/x86/kernel/dumpstack_32.c b/kernel/arch/x86/kernel/dumpstack_32.c
index 4f0481474..daefae83a 100644
--- a/kernel/arch/x86/kernel/dumpstack_32.c
+++ b/kernel/arch/x86/kernel/dumpstack_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
diff --git a/kernel/arch/x86/kernel/dumpstack_64.c b/kernel/arch/x86/kernel/dumpstack_64.c
index 225af4184..88ce2ffdb 100644
--- a/kernel/arch/x86/kernel/dumpstack_64.c
+++ b/kernel/arch/x86/kernel/dumpstack_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
diff --git a/kernel/arch/x86/kernel/early-quirks.c b/kernel/arch/x86/kernel/early-quirks.c
index 927abeaf6..1e82f787c 100644
--- a/kernel/arch/x86/kernel/early-quirks.c
+++ b/kernel/arch/x86/kernel/early-quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Various workarounds for chipset bugs.
    This code runs very early and can't use the regular PCI subsystem
    The entries are keyed to PCI bridges which usually identify chipsets
diff --git a/kernel/arch/x86/kernel/early_printk.c b/kernel/arch/x86/kernel/early_printk.c
index 0f0840304..5e801c8c8 100644
--- a/kernel/arch/x86/kernel/early_printk.c
+++ b/kernel/arch/x86/kernel/early_printk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/console.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/kernel/arch/x86/kernel/ebda.c b/kernel/arch/x86/kernel/ebda.c
index 4312f8ae7..38e7d597b 100644
--- a/kernel/arch/x86/kernel/ebda.c
+++ b/kernel/arch/x86/kernel/ebda.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/memblock.h>
diff --git a/kernel/arch/x86/kernel/fpu/bugs.c b/kernel/arch/x86/kernel/fpu/bugs.c
index d913047f8..2954fab15 100644
--- a/kernel/arch/x86/kernel/fpu/bugs.c
+++ b/kernel/arch/x86/kernel/fpu/bugs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * x86 FPU bug checks:
  */
diff --git a/kernel/arch/x86/kernel/fpu/regset.c b/kernel/arch/x86/kernel/fpu/regset.c
index 3ea151372..bc02f5144 100644
--- a/kernel/arch/x86/kernel/fpu/regset.c
+++ b/kernel/arch/x86/kernel/fpu/regset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * FPU register's regset abstraction, for ptrace, core dumps, etc.
  */
diff --git a/kernel/arch/x86/kernel/fpu/signal.c b/kernel/arch/x86/kernel/fpu/signal.c
index fb639e700..23f169167 100644
--- a/kernel/arch/x86/kernel/fpu/signal.c
+++ b/kernel/arch/x86/kernel/fpu/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * FPU signal frame handling routines.
  */
diff --git a/kernel/arch/x86/kernel/ftrace.c b/kernel/arch/x86/kernel/ftrace.c
index 9bef1bbeb..01ebcb6f2 100644
--- a/kernel/arch/x86/kernel/ftrace.c
+++ b/kernel/arch/x86/kernel/ftrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dynamic function tracing support.
  *
diff --git a/kernel/arch/x86/kernel/ftrace_32.S b/kernel/arch/x86/kernel/ftrace_32.S
index 722a145b4..b6c6468e1 100644
--- a/kernel/arch/x86/kernel/ftrace_32.S
+++ b/kernel/arch/x86/kernel/ftrace_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 2017  Steven Rostedt, VMware Inc.
  */
diff --git a/kernel/arch/x86/kernel/ftrace_64.S b/kernel/arch/x86/kernel/ftrace_64.S
index 1dfac634b..c832291d9 100644
--- a/kernel/arch/x86/kernel/ftrace_64.S
+++ b/kernel/arch/x86/kernel/ftrace_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 2014  Steven Rostedt, Red Hat Inc
  */
diff --git a/kernel/arch/x86/kernel/head32.c b/kernel/arch/x86/kernel/head32.c
index 2902ca4d5..ec6fefbfd 100644
--- a/kernel/arch/x86/kernel/head32.c
+++ b/kernel/arch/x86/kernel/head32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/i386/kernel/head32.c -- prepare to run common code
  *
diff --git a/kernel/arch/x86/kernel/head64.c b/kernel/arch/x86/kernel/head64.c
index bab4fa579..6a5d757b9 100644
--- a/kernel/arch/x86/kernel/head64.c
+++ b/kernel/arch/x86/kernel/head64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  prepare to run common code
  *
diff --git a/kernel/arch/x86/kernel/head_32.S b/kernel/arch/x86/kernel/head_32.S
index 9ed3074d0..f1d528bb6 100644
--- a/kernel/arch/x86/kernel/head_32.S
+++ b/kernel/arch/x86/kernel/head_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
diff --git a/kernel/arch/x86/kernel/head_64.S b/kernel/arch/x86/kernel/head_64.S
index 513cbb012..6dde3f3fc 100644
--- a/kernel/arch/x86/kernel/head_64.S
+++ b/kernel/arch/x86/kernel/head_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/x86/kernel/head_64.S -- start in 32bit and switch to 64bit
  *
diff --git a/kernel/arch/x86/kernel/i8253.c b/kernel/arch/x86/kernel/i8253.c
index 6ebe00cb4..0d307a657 100644
--- a/kernel/arch/x86/kernel/i8253.c
+++ b/kernel/arch/x86/kernel/i8253.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 8253/PIT functions
  *
diff --git a/kernel/arch/x86/kernel/i8259.c b/kernel/arch/x86/kernel/i8259.c
index 4e3b8a587..8f5cb2c70 100644
--- a/kernel/arch/x86/kernel/i8259.c
+++ b/kernel/arch/x86/kernel/i8259.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/linkage.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
diff --git a/kernel/arch/x86/kernel/io_delay.c b/kernel/arch/x86/kernel/io_delay.c
index 7ebcc4a74..805b7a341 100644
--- a/kernel/arch/x86/kernel/io_delay.c
+++ b/kernel/arch/x86/kernel/io_delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * I/O delay strategies for inb_p/outb_p
  *
diff --git a/kernel/arch/x86/kernel/ioport.c b/kernel/arch/x86/kernel/ioport.c
index 9c3cf0944..3feb64878 100644
--- a/kernel/arch/x86/kernel/ioport.c
+++ b/kernel/arch/x86/kernel/ioport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This contains the io-permission bitmap code - written by obz, with changes
  * by Linus. 32/64 bits code unification by Miguel Botón.
diff --git a/kernel/arch/x86/kernel/irq_32.c b/kernel/arch/x86/kernel/irq_32.c
index d4eb45014..a83b3346a 100644
--- a/kernel/arch/x86/kernel/irq_32.c
+++ b/kernel/arch/x86/kernel/irq_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
  *
diff --git a/kernel/arch/x86/kernel/irq_64.c b/kernel/arch/x86/kernel/irq_64.c
index 3be74fbde..020efbf57 100644
--- a/kernel/arch/x86/kernel/irq_64.c
+++ b/kernel/arch/x86/kernel/irq_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
  *
diff --git a/kernel/arch/x86/kernel/irq_work.c b/kernel/arch/x86/kernel/irq_work.c
index 70dee056f..80bee7695 100644
--- a/kernel/arch/x86/kernel/irq_work.c
+++ b/kernel/arch/x86/kernel/irq_work.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * x86 specific code for irq_work
  *
diff --git a/kernel/arch/x86/kernel/irqinit.c b/kernel/arch/x86/kernel/irqinit.c
index 1add9e08e..1e4094eba 100644
--- a/kernel/arch/x86/kernel/irqinit.c
+++ b/kernel/arch/x86/kernel/irqinit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/linkage.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
diff --git a/kernel/arch/x86/kernel/jump_label.c b/kernel/arch/x86/kernel/jump_label.c
index ab4f491da..e56c95be2 100644
--- a/kernel/arch/x86/kernel/jump_label.c
+++ b/kernel/arch/x86/kernel/jump_label.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * jump label x86 support
  *
diff --git a/kernel/arch/x86/kernel/kprobes/common.h b/kernel/arch/x86/kernel/kprobes/common.h
index 3fc0f9a79..615105cf7 100644
--- a/kernel/arch/x86/kernel/kprobes/common.h
+++ b/kernel/arch/x86/kernel/kprobes/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __X86_KERNEL_KPROBES_COMMON_H
 #define __X86_KERNEL_KPROBES_COMMON_H
 
diff --git a/kernel/arch/x86/kernel/kvmclock.c b/kernel/arch/x86/kernel/kvmclock.c
index d88967659..5b609e28c 100644
--- a/kernel/arch/x86/kernel/kvmclock.c
+++ b/kernel/arch/x86/kernel/kvmclock.c
@@ -79,7 +79,7 @@ static void kvm_get_wallclock(struct timespec *now)
 
 static int kvm_set_wallclock(const struct timespec *now)
 {
-	return -1;
+	return -ENODEV;
 }
 
 static u64 kvm_clock_read(void)
diff --git a/kernel/arch/x86/kernel/ldt.c b/kernel/arch/x86/kernel/ldt.c
index f0e64db18..4d17bacf4 100644
--- a/kernel/arch/x86/kernel/ldt.c
+++ b/kernel/arch/x86/kernel/ldt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
  * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
diff --git a/kernel/arch/x86/kernel/mmconf-fam10h_64.c b/kernel/arch/x86/kernel/mmconf-fam10h_64.c
index f4c886d91..b5cb49e57 100644
--- a/kernel/arch/x86/kernel/mmconf-fam10h_64.c
+++ b/kernel/arch/x86/kernel/mmconf-fam10h_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * AMD Family 10h mmconfig enablement
  */
diff --git a/kernel/arch/x86/kernel/module.c b/kernel/arch/x86/kernel/module.c
index 62e7d70aa..da0c160e5 100644
--- a/kernel/arch/x86/kernel/module.c
+++ b/kernel/arch/x86/kernel/module.c
@@ -172,19 +172,27 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 		case R_X86_64_NONE:
 			break;
 		case R_X86_64_64:
+			if (*(u64 *)loc != 0)
+				goto invalid_relocation;
 			*(u64 *)loc = val;
 			break;
 		case R_X86_64_32:
+			if (*(u32 *)loc != 0)
+				goto invalid_relocation;
 			*(u32 *)loc = val;
 			if (val != *(u32 *)loc)
 				goto overflow;
 			break;
 		case R_X86_64_32S:
+			if (*(s32 *)loc != 0)
+				goto invalid_relocation;
 			*(s32 *)loc = val;
 			if ((s64)val != *(s32 *)loc)
 				goto overflow;
 			break;
 		case R_X86_64_PC32:
+			if (*(u32 *)loc != 0)
+				goto invalid_relocation;
 			val -= (u64)loc;
 			*(u32 *)loc = val;
 #if 0
@@ -200,6 +208,11 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 	}
 	return 0;
 
+invalid_relocation:
+	pr_err("x86/modules: Skipping invalid relocation target, existing value is nonzero for type %d, loc %p, val %Lx\n",
+	       (int)ELF64_R_TYPE(rel[i].r_info), loc, val);
+	return -ENOEXEC;
+
 overflow:
 	pr_err("overflow in relocation type %d val %Lx\n",
 	       (int)ELF64_R_TYPE(rel[i].r_info), val);
diff --git a/kernel/arch/x86/kernel/mpparse.c b/kernel/arch/x86/kernel/mpparse.c
index 5cbb3177e..410c5dadc 100644
--- a/kernel/arch/x86/kernel/mpparse.c
+++ b/kernel/arch/x86/kernel/mpparse.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Intel Multiprocessor Specification 1.1 and 1.4
  *	compliant MP-table parsing routines.
diff --git a/kernel/arch/x86/kernel/nmi_selftest.c b/kernel/arch/x86/kernel/nmi_selftest.c
index d27f8d84c..a1a96df3d 100644
--- a/kernel/arch/x86/kernel/nmi_selftest.c
+++ b/kernel/arch/x86/kernel/nmi_selftest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/x86/kernel/nmi-selftest.c
  *
diff --git a/kernel/arch/x86/kernel/paravirt-spinlocks.c b/kernel/arch/x86/kernel/paravirt-spinlocks.c
index 8f2d1c9d4..71f2d1125 100644
--- a/kernel/arch/x86/kernel/paravirt-spinlocks.c
+++ b/kernel/arch/x86/kernel/paravirt-spinlocks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Split spinlock implementation out into its own file, so it can be
  * compiled in a FTRACE-compatible way.
diff --git a/kernel/arch/x86/kernel/paravirt_patch_32.c b/kernel/arch/x86/kernel/paravirt_patch_32.c
index 553acbbb4..758e69d72 100644
--- a/kernel/arch/x86/kernel/paravirt_patch_32.c
+++ b/kernel/arch/x86/kernel/paravirt_patch_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/paravirt.h>
 
 DEF_NATIVE(pv_irq_ops, irq_disable, "cli");
diff --git a/kernel/arch/x86/kernel/paravirt_patch_64.c b/kernel/arch/x86/kernel/paravirt_patch_64.c
index 11aaf1eaa..ac0be8283 100644
--- a/kernel/arch/x86/kernel/paravirt_patch_64.c
+++ b/kernel/arch/x86/kernel/paravirt_patch_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/paravirt.h>
 #include <asm/asm-offsets.h>
 #include <linux/stringify.h>
diff --git a/kernel/arch/x86/kernel/pci-dma.c b/kernel/arch/x86/kernel/pci-dma.c
index 0accc2404..599d7462e 100644
--- a/kernel/arch/x86/kernel/pci-dma.c
+++ b/kernel/arch/x86/kernel/pci-dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/dma-mapping.h>
 #include <linux/dma-debug.h>
 #include <linux/dmar.h>
diff --git a/kernel/arch/x86/kernel/pci-iommu_table.c b/kernel/arch/x86/kernel/pci-iommu_table.c
index f712dfdf1..4dfd90a75 100644
--- a/kernel/arch/x86/kernel/pci-iommu_table.c
+++ b/kernel/arch/x86/kernel/pci-iommu_table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/dma-mapping.h>
 #include <asm/iommu_table.h>
 #include <linux/string.h>
diff --git a/kernel/arch/x86/kernel/pci-nommu.c b/kernel/arch/x86/kernel/pci-nommu.c
index 4fc3cb60e..b0caae27e 100644
--- a/kernel/arch/x86/kernel/pci-nommu.c
+++ b/kernel/arch/x86/kernel/pci-nommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Fallback functions when the main IOMMU code is not compiled in. This
    code is roughly equivalent to i386. */
 #include <linux/dma-mapping.h>
diff --git a/kernel/arch/x86/kernel/pci-swiotlb.c b/kernel/arch/x86/kernel/pci-swiotlb.c
index 677077510..53bd05ea9 100644
--- a/kernel/arch/x86/kernel/pci-swiotlb.c
+++ b/kernel/arch/x86/kernel/pci-swiotlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Glue code to lib/swiotlb.c */
 
 #include <linux/pci.h>
diff --git a/kernel/arch/x86/kernel/pcspeaker.c b/kernel/arch/x86/kernel/pcspeaker.c
index a311ffcaa..da5190a1e 100644
--- a/kernel/arch/x86/kernel/pcspeaker.c
+++ b/kernel/arch/x86/kernel/pcspeaker.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/platform_device.h>
 #include <linux/err.h>
 #include <linux/init.h>
diff --git a/kernel/arch/x86/kernel/perf_regs.c b/kernel/arch/x86/kernel/perf_regs.c
index 587d887f7..e47b2dbbd 100644
--- a/kernel/arch/x86/kernel/perf_regs.c
+++ b/kernel/arch/x86/kernel/perf_regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
diff --git a/kernel/arch/x86/kernel/platform-quirks.c b/kernel/arch/x86/kernel/platform-quirks.c
index 502a77d0a..39a59299b 100644
--- a/kernel/arch/x86/kernel/platform-quirks.c
+++ b/kernel/arch/x86/kernel/platform-quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 
diff --git a/kernel/arch/x86/kernel/pmem.c b/kernel/arch/x86/kernel/pmem.c
index 0c5315d32..3fe690067 100644
--- a/kernel/arch/x86/kernel/pmem.c
+++ b/kernel/arch/x86/kernel/pmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015, Christoph Hellwig.
  * Copyright (c) 2015, Intel Corporation.
diff --git a/kernel/arch/x86/kernel/probe_roms.c b/kernel/arch/x86/kernel/probe_roms.c
index 963e3fb56..ee0286390 100644
--- a/kernel/arch/x86/kernel/probe_roms.c
+++ b/kernel/arch/x86/kernel/probe_roms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/uaccess.h>
diff --git a/kernel/arch/x86/kernel/process.c b/kernel/arch/x86/kernel/process.c
index bd6b85fac..c67685337 100644
--- a/kernel/arch/x86/kernel/process.c
+++ b/kernel/arch/x86/kernel/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/errno.h>
diff --git a/kernel/arch/x86/kernel/quirks.c b/kernel/arch/x86/kernel/quirks.c
index eaa591cfd..697a4ce04 100644
--- a/kernel/arch/x86/kernel/quirks.c
+++ b/kernel/arch/x86/kernel/quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains work-arounds for x86 and x86_64 platform bugs.
  */
diff --git a/kernel/arch/x86/kernel/reboot.c b/kernel/arch/x86/kernel/reboot.c
index add33f600..2126b9d27 100644
--- a/kernel/arch/x86/kernel/reboot.c
+++ b/kernel/arch/x86/kernel/reboot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/export.h>
diff --git a/kernel/arch/x86/kernel/reboot_fixups_32.c b/kernel/arch/x86/kernel/reboot_fixups_32.c
index c8e41e90f..b7c0f142d 100644
--- a/kernel/arch/x86/kernel/reboot_fixups_32.c
+++ b/kernel/arch/x86/kernel/reboot_fixups_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is a good place to put board specific reboot fixups.
  *
diff --git a/kernel/arch/x86/kernel/resource.c b/kernel/arch/x86/kernel/resource.c
index 5ab389551..9b9fb7882 100644
--- a/kernel/arch/x86/kernel/resource.c
+++ b/kernel/arch/x86/kernel/resource.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ioport.h>
 #include <asm/e820/api.h>
 
diff --git a/kernel/arch/x86/kernel/rtc.c b/kernel/arch/x86/kernel/rtc.c
index 5b21cb7d8..69ac9cb9c 100644
--- a/kernel/arch/x86/kernel/rtc.c
+++ b/kernel/arch/x86/kernel/rtc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * RTC related functions
  */
diff --git a/kernel/arch/x86/kernel/setup_percpu.c b/kernel/arch/x86/kernel/setup_percpu.c
index 28dafed6c..497aa766f 100644
--- a/kernel/arch/x86/kernel/setup_percpu.c
+++ b/kernel/arch/x86/kernel/setup_percpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
diff --git a/kernel/arch/x86/kernel/signal.c b/kernel/arch/x86/kernel/signal.c
index 4e188fda5..b9e00e8f1 100644
--- a/kernel/arch/x86/kernel/signal.c
+++ b/kernel/arch/x86/kernel/signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 2000, 2001, 2002 Andi Kleen SuSE Labs
diff --git a/kernel/arch/x86/kernel/signal_compat.c b/kernel/arch/x86/kernel/signal_compat.c
index ab9feb588..8c6da1a64 100644
--- a/kernel/arch/x86/kernel/signal_compat.c
+++ b/kernel/arch/x86/kernel/signal_compat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compat.h>
 #include <linux/uaccess.h>
 #include <linux/ptrace.h>
diff --git a/kernel/arch/x86/kernel/step.c b/kernel/arch/x86/kernel/step.c
index 5ee663836..60d2c3798 100644
--- a/kernel/arch/x86/kernel/step.c
+++ b/kernel/arch/x86/kernel/step.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * x86 single-step support code, common to 32-bit and 64-bit.
  */
diff --git a/kernel/arch/x86/kernel/sys_x86_64.c b/kernel/arch/x86/kernel/sys_x86_64.c
index 73e4d2811..a63fe77b3 100644
--- a/kernel/arch/x86/kernel/sys_x86_64.c
+++ b/kernel/arch/x86/kernel/sys_x86_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/sched/mm.h>
diff --git a/kernel/arch/x86/kernel/time.c b/kernel/arch/x86/kernel/time.c
index e0754cdba..879af864d 100644
--- a/kernel/arch/x86/kernel/time.c
+++ b/kernel/arch/x86/kernel/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (c) 1991,1992,1995  Linus Torvalds
  *  Copyright (c) 1994  Alan Modra
diff --git a/kernel/arch/x86/kernel/tls.c b/kernel/arch/x86/kernel/tls.c
index a106b9719..9a9c9b076 100644
--- a/kernel/arch/x86/kernel/tls.c
+++ b/kernel/arch/x86/kernel/tls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
diff --git a/kernel/arch/x86/kernel/trace_clock.c b/kernel/arch/x86/kernel/trace_clock.c
index 80bb24d9b..b8e7abe00 100644
--- a/kernel/arch/x86/kernel/trace_clock.c
+++ b/kernel/arch/x86/kernel/trace_clock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * X86 trace clocks
  */
diff --git a/kernel/arch/x86/kernel/tracepoint.c b/kernel/arch/x86/kernel/tracepoint.c
index c6636d1f6..5bd30c442 100644
--- a/kernel/arch/x86/kernel/tracepoint.c
+++ b/kernel/arch/x86/kernel/tracepoint.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Code for supporting irq vector tracepoints.
  *
diff --git a/kernel/arch/x86/kernel/tsc_sync.c b/kernel/arch/x86/kernel/tsc_sync.c
index 7842371bc..e76a98813 100644
--- a/kernel/arch/x86/kernel/tsc_sync.c
+++ b/kernel/arch/x86/kernel/tsc_sync.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * check TSC synchronization.
  *
diff --git a/kernel/arch/x86/kernel/vm86_32.c b/kernel/arch/x86/kernel/vm86_32.c
index 7924a5356..68244742e 100644
--- a/kernel/arch/x86/kernel/vm86_32.c
+++ b/kernel/arch/x86/kernel/vm86_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1994  Linus Torvalds
  *
diff --git a/kernel/arch/x86/kernel/vmlinux.lds.S b/kernel/arch/x86/kernel/vmlinux.lds.S
index f05f00aca..a4009fb9b 100644
--- a/kernel/arch/x86/kernel/vmlinux.lds.S
+++ b/kernel/arch/x86/kernel/vmlinux.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ld script for the x86 kernel
  *
diff --git a/kernel/arch/x86/kvm/Kconfig b/kernel/arch/x86/kvm/Kconfig
index 3c48bc8bf..3df51c287 100644
--- a/kernel/arch/x86/kvm/Kconfig
+++ b/kernel/arch/x86/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # KVM configuration
 #
diff --git a/kernel/arch/x86/kvm/Makefile b/kernel/arch/x86/kvm/Makefile
index 09d4b17be..dc4f2fdf5 100644
--- a/kernel/arch/x86/kvm/Makefile
+++ b/kernel/arch/x86/kvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-y += -Iarch/x86/kvm
 
diff --git a/kernel/arch/x86/kvm/cpuid.h b/kernel/arch/x86/kvm/cpuid.h
index 0bc5c1315..cdc70a3a6 100644
--- a/kernel/arch/x86/kvm/cpuid.h
+++ b/kernel/arch/x86/kvm/cpuid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_X86_KVM_CPUID_H
 #define ARCH_X86_KVM_CPUID_H
 
diff --git a/kernel/arch/x86/kvm/i8254.h b/kernel/arch/x86/kvm/i8254.h
index 600bee9dc..394d9527d 100644
--- a/kernel/arch/x86/kvm/i8254.h
+++ b/kernel/arch/x86/kvm/i8254.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __I8254_H
 #define __I8254_H
 
diff --git a/kernel/arch/x86/kvm/ioapic.h b/kernel/arch/x86/kvm/ioapic.h
index 29ce19732..ea1a4e029 100644
--- a/kernel/arch/x86/kvm/ioapic.h
+++ b/kernel/arch/x86/kvm/ioapic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KVM_IO_APIC_H
 #define __KVM_IO_APIC_H
 
diff --git a/kernel/arch/x86/kvm/kvm_cache_regs.h b/kernel/arch/x86/kvm/kvm_cache_regs.h
index 9add410f1..f500293da 100644
--- a/kernel/arch/x86/kvm/kvm_cache_regs.h
+++ b/kernel/arch/x86/kvm/kvm_cache_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASM_KVM_CACHE_REGS_H
 #define ASM_KVM_CACHE_REGS_H
 
diff --git a/kernel/arch/x86/kvm/lapic.c b/kernel/arch/x86/kvm/lapic.c
index 69c5612be..36c90d631 100644
--- a/kernel/arch/x86/kvm/lapic.c
+++ b/kernel/arch/x86/kvm/lapic.c
@@ -1992,6 +1992,11 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event)
 				vcpu->arch.apic_base | MSR_IA32_APICBASE_BSP);
 	vcpu->arch.pv_eoi.msr_val = 0;
 	apic_update_ppr(apic);
+	if (vcpu->arch.apicv_active) {
+		kvm_x86_ops->apicv_post_state_restore(vcpu);
+		kvm_x86_ops->hwapic_irr_update(vcpu, -1);
+		kvm_x86_ops->hwapic_isr_update(vcpu, -1);
+	}
 
 	vcpu->arch.apic_arb_prio = 0;
 	vcpu->arch.apic_attention = 0;
diff --git a/kernel/arch/x86/kvm/lapic.h b/kernel/arch/x86/kvm/lapic.h
index 215721e14..4b9935a38 100644
--- a/kernel/arch/x86/kvm/lapic.h
+++ b/kernel/arch/x86/kvm/lapic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KVM_X86_LAPIC_H
 #define __KVM_X86_LAPIC_H
 
diff --git a/kernel/arch/x86/kvm/mmu.h b/kernel/arch/x86/kvm/mmu.h
index 64a2dbd2b..efc857615 100644
--- a/kernel/arch/x86/kvm/mmu.h
+++ b/kernel/arch/x86/kvm/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KVM_X86_MMU_H
 #define __KVM_X86_MMU_H
 
diff --git a/kernel/arch/x86/kvm/mmutrace.h b/kernel/arch/x86/kvm/mmutrace.h
index 8b97a6cba..c73bf4e49 100644
--- a/kernel/arch/x86/kvm/mmutrace.h
+++ b/kernel/arch/x86/kvm/mmutrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVMMMU_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVMMMU_H
 
diff --git a/kernel/arch/x86/kvm/pmu.h b/kernel/arch/x86/kvm/pmu.h
index f96e1f962..a9a62b9a7 100644
--- a/kernel/arch/x86/kvm/pmu.h
+++ b/kernel/arch/x86/kvm/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KVM_X86_PMU_H
 #define __KVM_X86_PMU_H
 
diff --git a/kernel/arch/x86/kvm/trace.h b/kernel/arch/x86/kvm/trace.h
index 8a202c49e..9807c314c 100644
--- a/kernel/arch/x86/kvm/trace.h
+++ b/kernel/arch/x86/kvm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_H
 
diff --git a/kernel/arch/x86/kvm/tss.h b/kernel/arch/x86/kvm/tss.h
index 622aa10f6..3f9150125 100644
--- a/kernel/arch/x86/kvm/tss.h
+++ b/kernel/arch/x86/kvm/tss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TSS_SEGMENT_H
 #define __TSS_SEGMENT_H
 
diff --git a/kernel/arch/x86/kvm/vmx.c b/kernel/arch/x86/kvm/vmx.c
index 95a01609d..a6f4f095f 100644
--- a/kernel/arch/x86/kvm/vmx.c
+++ b/kernel/arch/x86/kvm/vmx.c
@@ -5619,9 +5619,6 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
 
 	kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);
 
-	if (kvm_vcpu_apicv_active(vcpu))
-		memset(&vmx->pi_desc, 0, sizeof(struct pi_desc));
-
 	if (vmx->vpid != 0)
 		vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid);
 
diff --git a/kernel/arch/x86/kvm/x86.h b/kernel/arch/x86/kvm/x86.h
index 51e349cf5..d0b95b7a9 100644
--- a/kernel/arch/x86/kvm/x86.h
+++ b/kernel/arch/x86/kvm/x86.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_X86_KVM_X86_H
 #define ARCH_X86_KVM_X86_H
 
diff --git a/kernel/arch/x86/lib/Makefile b/kernel/arch/x86/lib/Makefile
index 34a74131a..457f681ef 100644
--- a/kernel/arch/x86/lib/Makefile
+++ b/kernel/arch/x86/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for x86 specific library files.
 #
diff --git a/kernel/arch/x86/lib/cache-smp.c b/kernel/arch/x86/lib/cache-smp.c
index 216a629a4..1811fa4a1 100644
--- a/kernel/arch/x86/lib/cache-smp.c
+++ b/kernel/arch/x86/lib/cache-smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/smp.h>
 #include <linux/export.h>
 
diff --git a/kernel/arch/x86/lib/copy_page_64.S b/kernel/arch/x86/lib/copy_page_64.S
index e8508156c..fd2d09afa 100644
--- a/kernel/arch/x86/lib/copy_page_64.S
+++ b/kernel/arch/x86/lib/copy_page_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Written 2003 by Andi Kleen, based on a kernel by Evandro Menezes */
 
 #include <linux/linkage.h>
diff --git a/kernel/arch/x86/lib/csum-partial_64.c b/kernel/arch/x86/lib/csum-partial_64.c
index 378e5d5bf..9baca3e05 100644
--- a/kernel/arch/x86/lib/csum-partial_64.c
+++ b/kernel/arch/x86/lib/csum-partial_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * arch/x86_64/lib/csum-partial.c
  *
diff --git a/kernel/arch/x86/lib/delay.c b/kernel/arch/x86/lib/delay.c
index 29df077cb..553f8fd23 100644
--- a/kernel/arch/x86/lib/delay.c
+++ b/kernel/arch/x86/lib/delay.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Precise Delay Loops for i386
  *
diff --git a/kernel/arch/x86/lib/getuser.S b/kernel/arch/x86/lib/getuser.S
index 37b62d412..c97d935a2 100644
--- a/kernel/arch/x86/lib/getuser.S
+++ b/kernel/arch/x86/lib/getuser.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * __get_user functions.
  *
diff --git a/kernel/arch/x86/lib/hweight.S b/kernel/arch/x86/lib/hweight.S
index 23d893cbc..a14f9939c 100644
--- a/kernel/arch/x86/lib/hweight.S
+++ b/kernel/arch/x86/lib/hweight.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/export.h>
 
diff --git a/kernel/arch/x86/lib/kaslr.c b/kernel/arch/x86/lib/kaslr.c
index ab2d1d73e..79778ab20 100644
--- a/kernel/arch/x86/lib/kaslr.c
+++ b/kernel/arch/x86/lib/kaslr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Entropy functions used on early boot for KASLR base and memory
  * randomization. The base randomization is done in the compressed
diff --git a/kernel/arch/x86/lib/memcpy_32.c b/kernel/arch/x86/lib/memcpy_32.c
index 2eab7d0bf..e565d1c90 100644
--- a/kernel/arch/x86/lib/memcpy_32.c
+++ b/kernel/arch/x86/lib/memcpy_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/export.h>
 
diff --git a/kernel/arch/x86/lib/memmove_64.S b/kernel/arch/x86/lib/memmove_64.S
index 15de86cd1..bbec69d82 100644
--- a/kernel/arch/x86/lib/memmove_64.S
+++ b/kernel/arch/x86/lib/memmove_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Normally compiler builtins are used, but sometimes the compiler calls out
  * of line code. Based on asm-i386/string.h.
diff --git a/kernel/arch/x86/lib/memset_64.S b/kernel/arch/x86/lib/memset_64.S
index 55b95db30..9bc861c71 100644
--- a/kernel/arch/x86/lib/memset_64.S
+++ b/kernel/arch/x86/lib/memset_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright 2002 Andi Kleen, SuSE Labs */
 
 #include <linux/linkage.h>
diff --git a/kernel/arch/x86/lib/misc.c b/kernel/arch/x86/lib/misc.c
index 76b373af0..a018ec4fb 100644
--- a/kernel/arch/x86/lib/misc.c
+++ b/kernel/arch/x86/lib/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Count the digits of @val including a possible sign.
  *
diff --git a/kernel/arch/x86/lib/mmx_32.c b/kernel/arch/x86/lib/mmx_32.c
index c2311a678..4321fa02e 100644
--- a/kernel/arch/x86/lib/mmx_32.c
+++ b/kernel/arch/x86/lib/mmx_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	MMX 3DNow! library helper functions
  *
diff --git a/kernel/arch/x86/lib/msr-reg-export.c b/kernel/arch/x86/lib/msr-reg-export.c
index ff29e8d39..876b4168a 100644
--- a/kernel/arch/x86/lib/msr-reg-export.c
+++ b/kernel/arch/x86/lib/msr-reg-export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <asm/msr.h>
 
diff --git a/kernel/arch/x86/lib/msr-reg.S b/kernel/arch/x86/lib/msr-reg.S
index 10ffa7e85..ed33cbab3 100644
--- a/kernel/arch/x86/lib/msr-reg.S
+++ b/kernel/arch/x86/lib/msr-reg.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <linux/errno.h>
 #include <asm/asm.h>
diff --git a/kernel/arch/x86/lib/msr-smp.c b/kernel/arch/x86/lib/msr-smp.c
index ce68b6a9d..693cce0be 100644
--- a/kernel/arch/x86/lib/msr-smp.c
+++ b/kernel/arch/x86/lib/msr-smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/preempt.h>
 #include <linux/smp.h>
diff --git a/kernel/arch/x86/lib/msr.c b/kernel/arch/x86/lib/msr.c
index 07764255b..3bd905e10 100644
--- a/kernel/arch/x86/lib/msr.c
+++ b/kernel/arch/x86/lib/msr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/percpu.h>
 #include <linux/preempt.h>
diff --git a/kernel/arch/x86/lib/putuser.S b/kernel/arch/x86/lib/putuser.S
index cd5d716d2..96dce5fe2 100644
--- a/kernel/arch/x86/lib/putuser.S
+++ b/kernel/arch/x86/lib/putuser.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * __put_user functions.
  *
diff --git a/kernel/arch/x86/lib/string_32.c b/kernel/arch/x86/lib/string_32.c
index dc0ad12f8..d15fdae96 100644
--- a/kernel/arch/x86/lib/string_32.c
+++ b/kernel/arch/x86/lib/string_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Most of the string-functions are rather heavily hand-optimized,
  * see especially strsep,strstr,str[c]spn. They should work, but are not
diff --git a/kernel/arch/x86/lib/strstr_32.c b/kernel/arch/x86/lib/strstr_32.c
index a03b1c750..38f37df05 100644
--- a/kernel/arch/x86/lib/strstr_32.c
+++ b/kernel/arch/x86/lib/strstr_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/export.h>
 
diff --git a/kernel/arch/x86/lib/usercopy_32.c b/kernel/arch/x86/lib/usercopy_32.c
index bd057a4ff..1b377f734 100644
--- a/kernel/arch/x86/lib/usercopy_32.c
+++ b/kernel/arch/x86/lib/usercopy_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * User address space access functions.
  * The non inlined parts of asm-i386/uaccess.h are here.
diff --git a/kernel/arch/x86/math-emu/Makefile b/kernel/arch/x86/math-emu/Makefile
index 1b2dac174..02211fc6f 100644
--- a/kernel/arch/x86/math-emu/Makefile
+++ b/kernel/arch/x86/math-emu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 #               Makefile for wm-FPU-emu
 #
diff --git a/kernel/arch/x86/math-emu/control_w.h b/kernel/arch/x86/math-emu/control_w.h
index ae2274dbd..60f4dcc5e 100644
--- a/kernel/arch/x86/math-emu/control_w.h
+++ b/kernel/arch/x86/math-emu/control_w.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  control_w.h                                                              |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/div_Xsig.S b/kernel/arch/x86/math-emu/div_Xsig.S
index 066996dba..ee08449d2 100644
--- a/kernel/arch/x86/math-emu/div_Xsig.S
+++ b/kernel/arch/x86/math-emu/div_Xsig.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"div_Xsig.S"
 /*---------------------------------------------------------------------------+
  |  div_Xsig.S                                                               |
diff --git a/kernel/arch/x86/math-emu/div_small.S b/kernel/arch/x86/math-emu/div_small.S
index 2c71527bd..8f5025c80 100644
--- a/kernel/arch/x86/math-emu/div_small.S
+++ b/kernel/arch/x86/math-emu/div_small.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"div_small.S"
 /*---------------------------------------------------------------------------+
  |  div_small.S                                                              |
diff --git a/kernel/arch/x86/math-emu/errors.c b/kernel/arch/x86/math-emu/errors.c
index 2ccc424a5..6b468517a 100644
--- a/kernel/arch/x86/math-emu/errors.c
+++ b/kernel/arch/x86/math-emu/errors.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  errors.c                                                                 |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/exception.h b/kernel/arch/x86/math-emu/exception.h
index 67f43a468..75230b977 100644
--- a/kernel/arch/x86/math-emu/exception.h
+++ b/kernel/arch/x86/math-emu/exception.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  exception.h                                                              |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_arith.c b/kernel/arch/x86/math-emu/fpu_arith.c
index aeab24e08..09006dc47 100644
--- a/kernel/arch/x86/math-emu/fpu_arith.c
+++ b/kernel/arch/x86/math-emu/fpu_arith.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  fpu_arith.c                                                              |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_asm.h b/kernel/arch/x86/math-emu/fpu_asm.h
index 955b93273..a83353d52 100644
--- a/kernel/arch/x86/math-emu/fpu_asm.h
+++ b/kernel/arch/x86/math-emu/fpu_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  fpu_asm.h                                                                |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_aux.c b/kernel/arch/x86/math-emu/fpu_aux.c
index 024f6e971..034748459 100644
--- a/kernel/arch/x86/math-emu/fpu_aux.c
+++ b/kernel/arch/x86/math-emu/fpu_aux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  fpu_aux.c                                                                |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_emu.h b/kernel/arch/x86/math-emu/fpu_emu.h
index c9c320dcc..a5a41ec58 100644
--- a/kernel/arch/x86/math-emu/fpu_emu.h
+++ b/kernel/arch/x86/math-emu/fpu_emu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  fpu_emu.h                                                                |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_entry.c b/kernel/arch/x86/math-emu/fpu_entry.c
index 220638a4c..9e2ba7e66 100644
--- a/kernel/arch/x86/math-emu/fpu_entry.c
+++ b/kernel/arch/x86/math-emu/fpu_entry.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  fpu_entry.c                                                              |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_etc.c b/kernel/arch/x86/math-emu/fpu_etc.c
index 233e5af56..1b118fd93 100644
--- a/kernel/arch/x86/math-emu/fpu_etc.c
+++ b/kernel/arch/x86/math-emu/fpu_etc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  fpu_etc.c                                                                |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_proto.h b/kernel/arch/x86/math-emu/fpu_proto.h
index caff438b9..70d35c200 100644
--- a/kernel/arch/x86/math-emu/fpu_proto.h
+++ b/kernel/arch/x86/math-emu/fpu_proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FPU_PROTO_H
 #define _FPU_PROTO_H
 
diff --git a/kernel/arch/x86/math-emu/fpu_system.h b/kernel/arch/x86/math-emu/fpu_system.h
index 699f329f1..c8b1b31ed 100644
--- a/kernel/arch/x86/math-emu/fpu_system.h
+++ b/kernel/arch/x86/math-emu/fpu_system.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  fpu_system.h                                                             |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_tags.c b/kernel/arch/x86/math-emu/fpu_tags.c
index d9c657cd7..bff95d4e7 100644
--- a/kernel/arch/x86/math-emu/fpu_tags.c
+++ b/kernel/arch/x86/math-emu/fpu_tags.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  fpu_tags.c                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/fpu_trig.c b/kernel/arch/x86/math-emu/fpu_trig.c
index ecd066805..783c509f9 100644
--- a/kernel/arch/x86/math-emu/fpu_trig.c
+++ b/kernel/arch/x86/math-emu/fpu_trig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  fpu_trig.c                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/get_address.c b/kernel/arch/x86/math-emu/get_address.c
index c48967c6a..b82ca14ba 100644
--- a/kernel/arch/x86/math-emu/get_address.c
+++ b/kernel/arch/x86/math-emu/get_address.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  get_address.c                                                            |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/load_store.c b/kernel/arch/x86/math-emu/load_store.c
index 164305476..f821a9cd7 100644
--- a/kernel/arch/x86/math-emu/load_store.c
+++ b/kernel/arch/x86/math-emu/load_store.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  load_store.c                                                             |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/mul_Xsig.S b/kernel/arch/x86/math-emu/mul_Xsig.S
index 22e0631bb..3e489122a 100644
--- a/kernel/arch/x86/math-emu/mul_Xsig.S
+++ b/kernel/arch/x86/math-emu/mul_Xsig.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  mul_Xsig.S                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/poly.h b/kernel/arch/x86/math-emu/poly.h
index 168eb44c9..fc1c887ca 100644
--- a/kernel/arch/x86/math-emu/poly.h
+++ b/kernel/arch/x86/math-emu/poly.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  poly.h                                                                   |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/poly_2xm1.c b/kernel/arch/x86/math-emu/poly_2xm1.c
index b00e9e10c..aa33006ba 100644
--- a/kernel/arch/x86/math-emu/poly_2xm1.c
+++ b/kernel/arch/x86/math-emu/poly_2xm1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  poly_2xm1.c                                                              |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/poly_atan.c b/kernel/arch/x86/math-emu/poly_atan.c
index 20c28e58e..7e7412c5a 100644
--- a/kernel/arch/x86/math-emu/poly_atan.c
+++ b/kernel/arch/x86/math-emu/poly_atan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  poly_atan.c                                                              |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/poly_l2.c b/kernel/arch/x86/math-emu/poly_l2.c
index 8e2ff4b28..98b6949bb 100644
--- a/kernel/arch/x86/math-emu/poly_l2.c
+++ b/kernel/arch/x86/math-emu/poly_l2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  poly_l2.c                                                                |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/poly_sin.c b/kernel/arch/x86/math-emu/poly_sin.c
index b862039c7..c192fba51 100644
--- a/kernel/arch/x86/math-emu/poly_sin.c
+++ b/kernel/arch/x86/math-emu/poly_sin.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  poly_sin.c                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/poly_tan.c b/kernel/arch/x86/math-emu/poly_tan.c
index 1875763e0..1f5b1d712 100644
--- a/kernel/arch/x86/math-emu/poly_tan.c
+++ b/kernel/arch/x86/math-emu/poly_tan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  poly_tan.c                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/polynom_Xsig.S b/kernel/arch/x86/math-emu/polynom_Xsig.S
index a9aaf4141..604f0b2d1 100644
--- a/kernel/arch/x86/math-emu/polynom_Xsig.S
+++ b/kernel/arch/x86/math-emu/polynom_Xsig.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  polynomial_Xsig.S                                                        |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_add_sub.c b/kernel/arch/x86/math-emu/reg_add_sub.c
index deea48b9f..29451dd07 100644
--- a/kernel/arch/x86/math-emu/reg_add_sub.c
+++ b/kernel/arch/x86/math-emu/reg_add_sub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_add_sub.c                                                            |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_compare.c b/kernel/arch/x86/math-emu/reg_compare.c
index 19b33b50a..eacb5128f 100644
--- a/kernel/arch/x86/math-emu/reg_compare.c
+++ b/kernel/arch/x86/math-emu/reg_compare.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_compare.c                                                            |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_constant.c b/kernel/arch/x86/math-emu/reg_constant.c
index 005483549..8dc9095ba 100644
--- a/kernel/arch/x86/math-emu/reg_constant.c
+++ b/kernel/arch/x86/math-emu/reg_constant.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_constant.c                                                           |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_constant.h b/kernel/arch/x86/math-emu/reg_constant.h
index 1bffaec3a..f2fdd344d 100644
--- a/kernel/arch/x86/math-emu/reg_constant.h
+++ b/kernel/arch/x86/math-emu/reg_constant.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  reg_constant.h                                                           |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_convert.c b/kernel/arch/x86/math-emu/reg_convert.c
index 108060779..251180623 100644
--- a/kernel/arch/x86/math-emu/reg_convert.c
+++ b/kernel/arch/x86/math-emu/reg_convert.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_convert.c                                                            |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_divide.c b/kernel/arch/x86/math-emu/reg_divide.c
index 6827012db..08c2f6de0 100644
--- a/kernel/arch/x86/math-emu/reg_divide.c
+++ b/kernel/arch/x86/math-emu/reg_divide.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_divide.c                                                             |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_ld_str.c b/kernel/arch/x86/math-emu/reg_ld_str.c
index 2c98965a6..d40ff4549 100644
--- a/kernel/arch/x86/math-emu/reg_ld_str.c
+++ b/kernel/arch/x86/math-emu/reg_ld_str.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_ld_str.c                                                             |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_mul.c b/kernel/arch/x86/math-emu/reg_mul.c
index 36c37f71f..d69618572 100644
--- a/kernel/arch/x86/math-emu/reg_mul.c
+++ b/kernel/arch/x86/math-emu/reg_mul.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*---------------------------------------------------------------------------+
  |  reg_mul.c                                                                |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_norm.S b/kernel/arch/x86/math-emu/reg_norm.S
index 53ac1a343..7f6b4392a 100644
--- a/kernel/arch/x86/math-emu/reg_norm.S
+++ b/kernel/arch/x86/math-emu/reg_norm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  reg_norm.S                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/reg_round.S b/kernel/arch/x86/math-emu/reg_round.S
index 41af5b208..04563421e 100644
--- a/kernel/arch/x86/math-emu/reg_round.S
+++ b/kernel/arch/x86/math-emu/reg_round.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file "reg_round.S"
 /*---------------------------------------------------------------------------+
  |  reg_round.S                                                              |
diff --git a/kernel/arch/x86/math-emu/reg_u_add.S b/kernel/arch/x86/math-emu/reg_u_add.S
index 3b1bc5e9b..50fe9f8c8 100644
--- a/kernel/arch/x86/math-emu/reg_u_add.S
+++ b/kernel/arch/x86/math-emu/reg_u_add.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"reg_u_add.S"
 /*---------------------------------------------------------------------------+
  |  reg_u_add.S                                                              |
diff --git a/kernel/arch/x86/math-emu/reg_u_div.S b/kernel/arch/x86/math-emu/reg_u_div.S
index 796eb5ab9..94d545e11 100644
--- a/kernel/arch/x86/math-emu/reg_u_div.S
+++ b/kernel/arch/x86/math-emu/reg_u_div.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"reg_u_div.S"
 /*---------------------------------------------------------------------------+
  |  reg_u_div.S                                                              |
diff --git a/kernel/arch/x86/math-emu/reg_u_mul.S b/kernel/arch/x86/math-emu/reg_u_mul.S
index 6196f68cf..21cde47fb 100644
--- a/kernel/arch/x86/math-emu/reg_u_mul.S
+++ b/kernel/arch/x86/math-emu/reg_u_mul.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"reg_u_mul.S"
 /*---------------------------------------------------------------------------+
  |  reg_u_mul.S                                                              |
diff --git a/kernel/arch/x86/math-emu/reg_u_sub.S b/kernel/arch/x86/math-emu/reg_u_sub.S
index d115b9009..f05dea7de 100644
--- a/kernel/arch/x86/math-emu/reg_u_sub.S
+++ b/kernel/arch/x86/math-emu/reg_u_sub.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"reg_u_sub.S"
 /*---------------------------------------------------------------------------+
  |  reg_u_sub.S                                                              |
diff --git a/kernel/arch/x86/math-emu/round_Xsig.S b/kernel/arch/x86/math-emu/round_Xsig.S
index 87c99749a..226a51e99 100644
--- a/kernel/arch/x86/math-emu/round_Xsig.S
+++ b/kernel/arch/x86/math-emu/round_Xsig.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  round_Xsig.S                                                             |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/shr_Xsig.S b/kernel/arch/x86/math-emu/shr_Xsig.S
index c8552edee..96f4779aa 100644
--- a/kernel/arch/x86/math-emu/shr_Xsig.S
+++ b/kernel/arch/x86/math-emu/shr_Xsig.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"shr_Xsig.S"
 /*---------------------------------------------------------------------------+
  |  shr_Xsig.S                                                               |
diff --git a/kernel/arch/x86/math-emu/status_w.h b/kernel/arch/x86/math-emu/status_w.h
index 54a3f2269..b77bafec9 100644
--- a/kernel/arch/x86/math-emu/status_w.h
+++ b/kernel/arch/x86/math-emu/status_w.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*---------------------------------------------------------------------------+
  |  status_w.h                                                               |
  |                                                                           |
diff --git a/kernel/arch/x86/math-emu/wm_shrx.S b/kernel/arch/x86/math-emu/wm_shrx.S
index 340dd6897..d588874eb 100644
--- a/kernel/arch/x86/math-emu/wm_shrx.S
+++ b/kernel/arch/x86/math-emu/wm_shrx.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"wm_shrx.S"
 /*---------------------------------------------------------------------------+
  |  wm_shrx.S                                                                |
diff --git a/kernel/arch/x86/math-emu/wm_sqrt.S b/kernel/arch/x86/math-emu/wm_sqrt.S
index 695afae38..f031c0e19 100644
--- a/kernel/arch/x86/math-emu/wm_sqrt.S
+++ b/kernel/arch/x86/math-emu/wm_sqrt.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.file	"wm_sqrt.S"
 /*---------------------------------------------------------------------------+
  |  wm_sqrt.S                                                                |
diff --git a/kernel/arch/x86/mm/Makefile b/kernel/arch/x86/mm/Makefile
index e1f095884..7ba7f3d7f 100644
--- a/kernel/arch/x86/mm/Makefile
+++ b/kernel/arch/x86/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Kernel does not boot with instrumentation of tlb.c and mem_encrypt.c
 KCOV_INSTRUMENT_tlb.o		:= n
 KCOV_INSTRUMENT_mem_encrypt.o	:= n
diff --git a/kernel/arch/x86/mm/amdtopology.c b/kernel/arch/x86/mm/amdtopology.c
index 91f501b2d..048c761d9 100644
--- a/kernel/arch/x86/mm/amdtopology.c
+++ b/kernel/arch/x86/mm/amdtopology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * AMD NUMA support.
  * Discover the memory map and associated nodes.
diff --git a/kernel/arch/x86/mm/fault.c b/kernel/arch/x86/mm/fault.c
index e2baeaa05..b0ff37865 100644
--- a/kernel/arch/x86/mm/fault.c
+++ b/kernel/arch/x86/mm/fault.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1995  Linus Torvalds
  *  Copyright (C) 2001, 2002 Andi Kleen, SuSE Labs.
@@ -1440,7 +1441,17 @@ good_area:
 	 * make sure we exit gracefully rather than endlessly redo
 	 * the fault.  Since we never set FAULT_FLAG_RETRY_NOWAIT, if
 	 * we get VM_FAULT_RETRY back, the mmap_sem has been unlocked.
+	 *
+	 * Note that handle_userfault() may also release and reacquire mmap_sem
+	 * (and not return with VM_FAULT_RETRY), when returning to userland to
+	 * repeat the page fault later with a VM_FAULT_NOPAGE retval
+	 * (potentially after handling any pending signal during the return to
+	 * userland). The return to userland is identified whenever
+	 * FAULT_FLAG_USER|FAULT_FLAG_KILLABLE are both set in flags.
+	 * Thus we have to be careful about not touching vma after handling the
+	 * fault, so we read the pkey beforehand.
 	 */
+	pkey = vma_pkey(vma);
 	fault = handle_mm_fault(vma, address, flags);
 	major |= fault & VM_FAULT_MAJOR;
 
@@ -1467,7 +1478,6 @@ good_area:
 		return;
 	}
 
-	pkey = vma_pkey(vma);
 	up_read(&mm->mmap_sem);
 	if (unlikely(fault & VM_FAULT_ERROR)) {
 		mm_fault_error(regs, error_code, address, &pkey, fault);
diff --git a/kernel/arch/x86/mm/hugetlbpage.c b/kernel/arch/x86/mm/hugetlbpage.c
index 6d06cf33e..8ae0000cb 100644
--- a/kernel/arch/x86/mm/hugetlbpage.c
+++ b/kernel/arch/x86/mm/hugetlbpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IA-32 Huge TLB Page Support for Kernel.
  *
diff --git a/kernel/arch/x86/mm/ident_map.c b/kernel/arch/x86/mm/ident_map.c
index 31cea988f..ab33a32df 100644
--- a/kernel/arch/x86/mm/ident_map.c
+++ b/kernel/arch/x86/mm/ident_map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Helper routines for building identity mapping page tables. This is
  * included by both the compressed kernel and the regular kernel.
diff --git a/kernel/arch/x86/mm/kasan_init_64.c b/kernel/arch/x86/mm/kasan_init_64.c
index bc84b7368..8f5be3eb4 100644
--- a/kernel/arch/x86/mm/kasan_init_64.c
+++ b/kernel/arch/x86/mm/kasan_init_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define DISABLE_BRANCH_PROFILING
 #define pr_fmt(fmt) "kasan: " fmt
 #include <linux/bootmem.h>
diff --git a/kernel/arch/x86/mm/kaslr.c b/kernel/arch/x86/mm/kaslr.c
index af599167f..879ef930e 100644
--- a/kernel/arch/x86/mm/kaslr.c
+++ b/kernel/arch/x86/mm/kaslr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file implements KASLR memory randomization for x86_64. It randomizes
  * the virtual address space of kernel memory regions (physical memory
diff --git a/kernel/arch/x86/mm/kmemcheck/error.c b/kernel/arch/x86/mm/kmemcheck/error.c
index dab41876c..872ec4159 100644
--- a/kernel/arch/x86/mm/kmemcheck/error.c
+++ b/kernel/arch/x86/mm/kmemcheck/error.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/interrupt.h>
 #include <linux/kdebug.h>
 #include <linux/kmemcheck.h>
diff --git a/kernel/arch/x86/mm/kmemcheck/error.h b/kernel/arch/x86/mm/kmemcheck/error.h
index 0efc2e8d0..39f80d7a8 100644
--- a/kernel/arch/x86/mm/kmemcheck/error.h
+++ b/kernel/arch/x86/mm/kmemcheck/error.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH__X86__MM__KMEMCHECK__ERROR_H
 #define ARCH__X86__MM__KMEMCHECK__ERROR_H
 
diff --git a/kernel/arch/x86/mm/kmemcheck/opcode.c b/kernel/arch/x86/mm/kmemcheck/opcode.c
index 324aa3f07..df8109ddf 100644
--- a/kernel/arch/x86/mm/kmemcheck/opcode.c
+++ b/kernel/arch/x86/mm/kmemcheck/opcode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 
 #include "opcode.h"
diff --git a/kernel/arch/x86/mm/kmemcheck/opcode.h b/kernel/arch/x86/mm/kmemcheck/opcode.h
index 6956aad66..51a1ce94c 100644
--- a/kernel/arch/x86/mm/kmemcheck/opcode.h
+++ b/kernel/arch/x86/mm/kmemcheck/opcode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH__X86__MM__KMEMCHECK__OPCODE_H
 #define ARCH__X86__MM__KMEMCHECK__OPCODE_H
 
diff --git a/kernel/arch/x86/mm/kmemcheck/pte.c b/kernel/arch/x86/mm/kmemcheck/pte.c
index 4ead26eea..8a03be902 100644
--- a/kernel/arch/x86/mm/kmemcheck/pte.c
+++ b/kernel/arch/x86/mm/kmemcheck/pte.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 
 #include <asm/pgtable.h>
diff --git a/kernel/arch/x86/mm/kmemcheck/pte.h b/kernel/arch/x86/mm/kmemcheck/pte.h
index 9f5966456..b59561238 100644
--- a/kernel/arch/x86/mm/kmemcheck/pte.h
+++ b/kernel/arch/x86/mm/kmemcheck/pte.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH__X86__MM__KMEMCHECK__PTE_H
 #define ARCH__X86__MM__KMEMCHECK__PTE_H
 
diff --git a/kernel/arch/x86/mm/kmemcheck/selftest.c b/kernel/arch/x86/mm/kmemcheck/selftest.c
index aef7140c0..7ce0be1f9 100644
--- a/kernel/arch/x86/mm/kmemcheck/selftest.c
+++ b/kernel/arch/x86/mm/kmemcheck/selftest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/kernel.h>
 
diff --git a/kernel/arch/x86/mm/kmemcheck/selftest.h b/kernel/arch/x86/mm/kmemcheck/selftest.h
index 8fed4fe11..8d759aae4 100644
--- a/kernel/arch/x86/mm/kmemcheck/selftest.h
+++ b/kernel/arch/x86/mm/kmemcheck/selftest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_X86_MM_KMEMCHECK_SELFTEST_H
 #define ARCH_X86_MM_KMEMCHECK_SELFTEST_H
 
diff --git a/kernel/arch/x86/mm/kmemcheck/shadow.h b/kernel/arch/x86/mm/kmemcheck/shadow.h
index ff0b2f70f..49768dc18 100644
--- a/kernel/arch/x86/mm/kmemcheck/shadow.h
+++ b/kernel/arch/x86/mm/kmemcheck/shadow.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH__X86__MM__KMEMCHECK__SHADOW_H
 #define ARCH__X86__MM__KMEMCHECK__SHADOW_H
 
diff --git a/kernel/arch/x86/mm/kmmio.c b/kernel/arch/x86/mm/kmmio.c
index afc47f5c9..c21c2ed04 100644
--- a/kernel/arch/x86/mm/kmmio.c
+++ b/kernel/arch/x86/mm/kmmio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Support for MMIO probes.
  * Benfit many code from kprobes
  * (C) 2002 Louis Zhuang <louis.zhuang@intel.com>.
diff --git a/kernel/arch/x86/mm/mm_internal.h b/kernel/arch/x86/mm/mm_internal.h
index 62474ba66..4e1f6e1b8 100644
--- a/kernel/arch/x86/mm/mm_internal.h
+++ b/kernel/arch/x86/mm/mm_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __X86_MM_INTERNAL_H
 #define __X86_MM_INTERNAL_H
 
diff --git a/kernel/arch/x86/mm/mpx.c b/kernel/arch/x86/mm/mpx.c
index 9ceaa955d..7eb06701a 100644
--- a/kernel/arch/x86/mm/mpx.c
+++ b/kernel/arch/x86/mm/mpx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mpx.c - Memory Protection eXtensions
  *
diff --git a/kernel/arch/x86/mm/numa_64.c b/kernel/arch/x86/mm/numa_64.c
index 9405ffc91..066f3511d 100644
--- a/kernel/arch/x86/mm/numa_64.c
+++ b/kernel/arch/x86/mm/numa_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic VM initialization for x86-64 NUMA setups.
  * Copyright 2002,2003 Andi Kleen, SuSE Labs.
diff --git a/kernel/arch/x86/mm/numa_emulation.c b/kernel/arch/x86/mm/numa_emulation.c
index d805162e6..34a2a3bfd 100644
--- a/kernel/arch/x86/mm/numa_emulation.c
+++ b/kernel/arch/x86/mm/numa_emulation.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NUMA emulation
  */
diff --git a/kernel/arch/x86/mm/numa_internal.h b/kernel/arch/x86/mm/numa_internal.h
index ad86ec91e..86860f279 100644
--- a/kernel/arch/x86/mm/numa_internal.h
+++ b/kernel/arch/x86/mm/numa_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __X86_MM_NUMA_INTERNAL_H
 #define __X86_MM_NUMA_INTERNAL_H
 
diff --git a/kernel/arch/x86/mm/pageattr-test.c b/kernel/arch/x86/mm/pageattr-test.c
index 5f169d5d7..a25588ad7 100644
--- a/kernel/arch/x86/mm/pageattr-test.c
+++ b/kernel/arch/x86/mm/pageattr-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * self test for change_page_attr.
  *
diff --git a/kernel/arch/x86/mm/pat_internal.h b/kernel/arch/x86/mm/pat_internal.h
index a739bfc40..eeb5caeb0 100644
--- a/kernel/arch/x86/mm/pat_internal.h
+++ b/kernel/arch/x86/mm/pat_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PAT_INTERNAL_H_
 #define __PAT_INTERNAL_H_
 
diff --git a/kernel/arch/x86/mm/pat_rbtree.c b/kernel/arch/x86/mm/pat_rbtree.c
index d76485b22..fa16036fa 100644
--- a/kernel/arch/x86/mm/pat_rbtree.c
+++ b/kernel/arch/x86/mm/pat_rbtree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Handle caching attributes in page tables (PAT)
  *
diff --git a/kernel/arch/x86/mm/pgtable.c b/kernel/arch/x86/mm/pgtable.c
index b372f3442..17ebc5a97 100644
--- a/kernel/arch/x86/mm/pgtable.c
+++ b/kernel/arch/x86/mm/pgtable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/gfp.h>
 #include <asm/pgalloc.h>
diff --git a/kernel/arch/x86/mm/pgtable_32.c b/kernel/arch/x86/mm/pgtable_32.c
index b9bd5b8b1..6b9bf023a 100644
--- a/kernel/arch/x86/mm/pgtable_32.c
+++ b/kernel/arch/x86/mm/pgtable_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/kernel/arch/x86/mm/physaddr.c b/kernel/arch/x86/mm/physaddr.c
index cfc3b9121..7f9acb683 100644
--- a/kernel/arch/x86/mm/physaddr.c
+++ b/kernel/arch/x86/mm/physaddr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bootmem.h>
 #include <linux/mmdebug.h>
 #include <linux/export.h>
diff --git a/kernel/arch/x86/mm/physaddr.h b/kernel/arch/x86/mm/physaddr.h
index a3cd5a0c9..9f6419caf 100644
--- a/kernel/arch/x86/mm/physaddr.h
+++ b/kernel/arch/x86/mm/physaddr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/processor.h>
 
 static inline int phys_addr_valid(resource_size_t addr)
diff --git a/kernel/arch/x86/mm/setup_nx.c b/kernel/arch/x86/mm/setup_nx.c
index f65a33f50..adb3c5784 100644
--- a/kernel/arch/x86/mm/setup_nx.c
+++ b/kernel/arch/x86/mm/setup_nx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/init.h>
diff --git a/kernel/arch/x86/mm/srat.c b/kernel/arch/x86/mm/srat.c
index 3ea20d61b..dac07e4f5 100644
--- a/kernel/arch/x86/mm/srat.c
+++ b/kernel/arch/x86/mm/srat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ACPI 3.0 based NUMA setup
  * Copyright 2004 Andi Kleen, SuSE Labs.
diff --git a/kernel/arch/x86/mm/tlb.c b/kernel/arch/x86/mm/tlb.c
index 0f3d0cea4..3118392cd 100644
--- a/kernel/arch/x86/mm/tlb.c
+++ b/kernel/arch/x86/mm/tlb.c
@@ -85,6 +85,7 @@ void leave_mm(int cpu)
 
 	switch_mm(NULL, &init_mm, NULL);
 }
+EXPORT_SYMBOL_GPL(leave_mm);
 
 void switch_mm(struct mm_struct *prev, struct mm_struct *next,
 	       struct task_struct *tsk)
@@ -195,12 +196,22 @@ void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,
 			this_cpu_write(cpu_tlbstate.ctxs[new_asid].ctx_id, next->context.ctx_id);
 			this_cpu_write(cpu_tlbstate.ctxs[new_asid].tlb_gen, next_tlb_gen);
 			write_cr3(build_cr3(next, new_asid));
-			trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH,
-					TLB_FLUSH_ALL);
+
+			/*
+			 * NB: This gets called via leave_mm() in the idle path
+			 * where RCU functions differently.  Tracing normally
+			 * uses RCU, so we need to use the _rcuidle variant.
+			 *
+			 * (There is no good reason for this.  The idle code should
+			 *  be rearranged to call this before rcu_idle_enter().)
+			 */
+			trace_tlb_flush_rcuidle(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
 		} else {
 			/* The new ASID is already up to date. */
 			write_cr3(build_cr3_noflush(next, new_asid));
-			trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, 0);
+
+			/* See above wrt _rcuidle. */
+			trace_tlb_flush_rcuidle(TLB_FLUSH_ON_TASK_SWITCH, 0);
 		}
 
 		this_cpu_write(cpu_tlbstate.loaded_mm, next);
diff --git a/kernel/arch/x86/oprofile/Makefile b/kernel/arch/x86/oprofile/Makefile
index 1599f568f..4d49b5a27 100644
--- a/kernel/arch/x86/oprofile/Makefile
+++ b/kernel/arch/x86/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/arch/x86/pci/Makefile b/kernel/arch/x86/pci/Makefile
index 5c6fc3577..c806b57d3 100644
--- a/kernel/arch/x86/pci/Makefile
+++ b/kernel/arch/x86/pci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y				:= i386.o init.o
 
 obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
diff --git a/kernel/arch/x86/pci/acpi.c b/kernel/arch/x86/pci/acpi.c
index 3961103e9..7df49c406 100644
--- a/kernel/arch/x86/pci/acpi.c
+++ b/kernel/arch/x86/pci/acpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/init.h>
diff --git a/kernel/arch/x86/pci/amd_bus.c b/kernel/arch/x86/pci/amd_bus.c
index ae387e5ee..649bdde63 100644
--- a/kernel/arch/x86/pci/amd_bus.c
+++ b/kernel/arch/x86/pci/amd_bus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/topology.h>
diff --git a/kernel/arch/x86/pci/bus_numa.c b/kernel/arch/x86/pci/bus_numa.c
index 6eb3c8af9..2752c02e3 100644
--- a/kernel/arch/x86/pci/bus_numa.c
+++ b/kernel/arch/x86/pci/bus_numa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/range.h>
diff --git a/kernel/arch/x86/pci/bus_numa.h b/kernel/arch/x86/pci/bus_numa.h
index ff8f65b04..697dd841b 100644
--- a/kernel/arch/x86/pci/bus_numa.h
+++ b/kernel/arch/x86/pci/bus_numa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BUS_NUMA_H
 #define __BUS_NUMA_H
 /*
diff --git a/kernel/arch/x86/pci/direct.c b/kernel/arch/x86/pci/direct.c
index 15460590b..2d9503323 100644
--- a/kernel/arch/x86/pci/direct.c
+++ b/kernel/arch/x86/pci/direct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * direct.c - Low-level direct PCI config space access
  */
diff --git a/kernel/arch/x86/pci/early.c b/kernel/arch/x86/pci/early.c
index d1067d539..f0114007e 100644
--- a/kernel/arch/x86/pci/early.c
+++ b/kernel/arch/x86/pci/early.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <asm/pci-direct.h>
diff --git a/kernel/arch/x86/pci/fixup.c b/kernel/arch/x86/pci/fixup.c
index f2228b150..4210da7b4 100644
--- a/kernel/arch/x86/pci/fixup.c
+++ b/kernel/arch/x86/pci/fixup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Exceptions for specific devices. Usually work-arounds for fatal design flaws.
  */
diff --git a/kernel/arch/x86/pci/i386.c b/kernel/arch/x86/pci/i386.c
index 7b4307163..ed4ac2153 100644
--- a/kernel/arch/x86/pci/i386.c
+++ b/kernel/arch/x86/pci/i386.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Low-Level PCI Access for i386 machines
  *
diff --git a/kernel/arch/x86/pci/init.c b/kernel/arch/x86/pci/init.c
index adb62aaa7..5fc617edf 100644
--- a/kernel/arch/x86/pci/init.c
+++ b/kernel/arch/x86/pci/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <asm/pci_x86.h>
diff --git a/kernel/arch/x86/pci/intel_mid_pci.c b/kernel/arch/x86/pci/intel_mid_pci.c
index b901ece27..1012a5f0f 100644
--- a/kernel/arch/x86/pci/intel_mid_pci.c
+++ b/kernel/arch/x86/pci/intel_mid_pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel MID PCI support
  *   Copyright (c) 2008 Intel Corporation
diff --git a/kernel/arch/x86/pci/irq.c b/kernel/arch/x86/pci/irq.c
index 0f5f60b14..045262914 100644
--- a/kernel/arch/x86/pci/irq.c
+++ b/kernel/arch/x86/pci/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Low-Level PCI Support for PC -- Routing of Interrupts
  *
diff --git a/kernel/arch/x86/pci/mmconfig-shared.c b/kernel/arch/x86/pci/mmconfig-shared.c
index d1b47d5bc..96684d0ad 100644
--- a/kernel/arch/x86/pci/mmconfig-shared.c
+++ b/kernel/arch/x86/pci/mmconfig-shared.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mmconfig-shared.c - Low-level direct PCI config space access via
  *                     MMCONFIG - common code between i386 and x86-64.
diff --git a/kernel/arch/x86/pci/mmconfig_64.c b/kernel/arch/x86/pci/mmconfig_64.c
index f1c1aa043..887d181b7 100644
--- a/kernel/arch/x86/pci/mmconfig_64.c
+++ b/kernel/arch/x86/pci/mmconfig_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mmconfig.c - Low-level direct PCI config space access via MMCONFIG
  *
diff --git a/kernel/arch/x86/pci/pcbios.c b/kernel/arch/x86/pci/pcbios.c
index 76595408f..9c97d8141 100644
--- a/kernel/arch/x86/pci/pcbios.c
+++ b/kernel/arch/x86/pci/pcbios.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * BIOS32 and PCI BIOS handling.
  */
diff --git a/kernel/arch/x86/platform/Makefile b/kernel/arch/x86/platform/Makefile
index 184842ef3..d0e835470 100644
--- a/kernel/arch/x86/platform/Makefile
+++ b/kernel/arch/x86/platform/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Platform specific code goes here
 obj-y	+= atom/
 obj-y	+= ce4100/
diff --git a/kernel/arch/x86/platform/efi/Makefile b/kernel/arch/x86/platform/efi/Makefile
index 2f56e1ed6..e4dc3862d 100644
--- a/kernel/arch/x86/platform/efi/Makefile
+++ b/kernel/arch/x86/platform/efi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OBJECT_FILES_NON_STANDARD_efi_thunk_$(BITS).o := y
 OBJECT_FILES_NON_STANDARD_efi_stub_$(BITS).o := y
 
diff --git a/kernel/arch/x86/platform/efi/efi.c b/kernel/arch/x86/platform/efi/efi.c
index 928b6dcee..9061babfb 100644
--- a/kernel/arch/x86/platform/efi/efi.c
+++ b/kernel/arch/x86/platform/efi/efi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common EFI (Extensible Firmware Interface) support functions
  * Based on Extensible Firmware Interface Specification version 1.0
diff --git a/kernel/arch/x86/platform/efi/efi_32.c b/kernel/arch/x86/platform/efi/efi_32.c
index 52f7faa15..324b93328 100644
--- a/kernel/arch/x86/platform/efi/efi_32.c
+++ b/kernel/arch/x86/platform/efi/efi_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Extensible Firmware Interface
  *
diff --git a/kernel/arch/x86/platform/efi/efi_64.c b/kernel/arch/x86/platform/efi/efi_64.c
index 12e83888e..20fb31579 100644
--- a/kernel/arch/x86/platform/efi/efi_64.c
+++ b/kernel/arch/x86/platform/efi/efi_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * x86_64 specific EFI support functions
  * Based on Extensible Firmware Interface Specification version 1.0
diff --git a/kernel/arch/x86/platform/efi/efi_stub_32.S b/kernel/arch/x86/platform/efi/efi_stub_32.S
index 040192b50..ab2e91e76 100644
--- a/kernel/arch/x86/platform/efi/efi_stub_32.S
+++ b/kernel/arch/x86/platform/efi/efi_stub_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * EFI call stub for IA32.
  *
diff --git a/kernel/arch/x86/platform/efi/efi_stub_64.S b/kernel/arch/x86/platform/efi/efi_stub_64.S
index cd9507594..74628ec78 100644
--- a/kernel/arch/x86/platform/efi/efi_stub_64.S
+++ b/kernel/arch/x86/platform/efi/efi_stub_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Function calling ABI conversion from Linux to EFI for x86_64
  *
diff --git a/kernel/arch/x86/platform/efi/efi_thunk_64.S b/kernel/arch/x86/platform/efi/efi_thunk_64.S
index ff85d28c5..189b218da 100644
--- a/kernel/arch/x86/platform/efi/efi_thunk_64.S
+++ b/kernel/arch/x86/platform/efi/efi_thunk_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2014 Intel Corporation; author Matt Fleming
  *
diff --git a/kernel/arch/x86/platform/intel-mid/device_libs/Makefile b/kernel/arch/x86/platform/intel-mid/device_libs/Makefile
index 53e0235e3..480fed21c 100644
--- a/kernel/arch/x86/platform/intel-mid/device_libs/Makefile
+++ b/kernel/arch/x86/platform/intel-mid/device_libs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Family-Level Interface Shim (FLIS)
 obj-$(subst m,y,$(CONFIG_PINCTRL_MERRIFIELD)) += platform_mrfld_pinctrl.o
 # SDHCI Devices
diff --git a/kernel/arch/x86/platform/intel-quark/imr_selftest.c b/kernel/arch/x86/platform/intel-quark/imr_selftest.c
index b8f562049..42f879b75 100644
--- a/kernel/arch/x86/platform/intel-quark/imr_selftest.c
+++ b/kernel/arch/x86/platform/intel-quark/imr_selftest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * imr_selftest.c -- Intel Isolated Memory Region self-test driver
  *
diff --git a/kernel/arch/x86/platform/olpc/Makefile b/kernel/arch/x86/platform/olpc/Makefile
index fd332c533..049f92a93 100644
--- a/kernel/arch/x86/platform/olpc/Makefile
+++ b/kernel/arch/x86/platform/olpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OLPC)		+= olpc.o olpc_ofw.o olpc_dt.o
 obj-$(CONFIG_OLPC_XO1_PM)		+= olpc-xo1-pm.o xo1-wakeup.o
 obj-$(CONFIG_OLPC_XO1_RTC)	+= olpc-xo1-rtc.o
diff --git a/kernel/arch/x86/platform/olpc/xo1-wakeup.S b/kernel/arch/x86/platform/olpc/xo1-wakeup.S
index 948deb289..5fee3a2c2 100644
--- a/kernel/arch/x86/platform/olpc/xo1-wakeup.S
+++ b/kernel/arch/x86/platform/olpc/xo1-wakeup.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 .text
 #include <linux/linkage.h>
 #include <asm/segment.h>
diff --git a/kernel/arch/x86/power/Makefile b/kernel/arch/x86/power/Makefile
index 05041871a..a47013895 100644
--- a/kernel/arch/x86/power/Makefile
+++ b/kernel/arch/x86/power/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OBJECT_FILES_NON_STANDARD_hibernate_asm_$(BITS).o := y
 
 # __restore_processor_state() restores %gs after S3 resume and so should not
diff --git a/kernel/arch/x86/power/hibernate_asm_32.S b/kernel/arch/x86/power/hibernate_asm_32.S
index 1d0fa0e24..6e56815e1 100644
--- a/kernel/arch/x86/power/hibernate_asm_32.S
+++ b/kernel/arch/x86/power/hibernate_asm_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This may not use any stack, nor any variable that is not "NoSave":
  *
diff --git a/kernel/arch/x86/purgatory/Makefile b/kernel/arch/x86/purgatory/Makefile
index 7dbdb7802..2f15a2ac4 100644
--- a/kernel/arch/x86/purgatory/Makefile
+++ b/kernel/arch/x86/purgatory/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OBJECT_FILES_NON_STANDARD := y
 
 purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string.o
diff --git a/kernel/arch/x86/ras/Kconfig b/kernel/arch/x86/ras/Kconfig
index bb026699a..a9c3db125 100644
--- a/kernel/arch/x86/ras/Kconfig
+++ b/kernel/arch/x86/ras/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config RAS_CEC
 	bool "Correctable Errors Collector"
 	depends on X86_MCE && MEMORY_FAILURE && DEBUG_FS
diff --git a/kernel/arch/x86/realmode/init.c b/kernel/arch/x86/realmode/init.c
index 1f71980fc..ed84d3917 100644
--- a/kernel/arch/x86/realmode/init.c
+++ b/kernel/arch/x86/realmode/init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/memblock.h>
diff --git a/kernel/arch/x86/realmode/rm/header.S b/kernel/arch/x86/realmode/rm/header.S
index a28221d94..30b0d30d8 100644
--- a/kernel/arch/x86/realmode/rm/header.S
+++ b/kernel/arch/x86/realmode/rm/header.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Real-mode blob header; this should match realmode.h and be
  * readonly; for mutable data instead add pointers into the .data
diff --git a/kernel/arch/x86/realmode/rm/realmode.h b/kernel/arch/x86/realmode/rm/realmode.h
index d74cff635..c76041a35 100644
--- a/kernel/arch/x86/realmode/rm/realmode.h
+++ b/kernel/arch/x86/realmode/rm/realmode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_X86_REALMODE_RM_REALMODE_H
 #define ARCH_X86_REALMODE_RM_REALMODE_H
 
diff --git a/kernel/arch/x86/realmode/rm/realmode.lds.S b/kernel/arch/x86/realmode/rm/realmode.lds.S
index 86b2e8d6b..df8e11e26 100644
--- a/kernel/arch/x86/realmode/rm/realmode.lds.S
+++ b/kernel/arch/x86/realmode/rm/realmode.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * realmode.lds.S
  *
diff --git a/kernel/arch/x86/realmode/rm/reboot.S b/kernel/arch/x86/realmode/rm/reboot.S
index d66c607bd..cd2f97b96 100644
--- a/kernel/arch/x86/realmode/rm/reboot.S
+++ b/kernel/arch/x86/realmode/rm/reboot.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
diff --git a/kernel/arch/x86/realmode/rm/stack.S b/kernel/arch/x86/realmode/rm/stack.S
index 867ae87ad..8d4cb6479 100644
--- a/kernel/arch/x86/realmode/rm/stack.S
+++ b/kernel/arch/x86/realmode/rm/stack.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common heap and stack allocations
  */
diff --git a/kernel/arch/x86/realmode/rm/trampoline_32.S b/kernel/arch/x86/realmode/rm/trampoline_32.S
index 48ddd76bc..2dd866c9e 100644
--- a/kernel/arch/x86/realmode/rm/trampoline_32.S
+++ b/kernel/arch/x86/realmode/rm/trampoline_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *	Trampoline.S	Derived from Setup.S by Linus Torvalds
diff --git a/kernel/arch/x86/realmode/rm/trampoline_64.S b/kernel/arch/x86/realmode/rm/trampoline_64.S
index 614fd7064..de53bd15d 100644
--- a/kernel/arch/x86/realmode/rm/trampoline_64.S
+++ b/kernel/arch/x86/realmode/rm/trampoline_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *	Trampoline.S	Derived from Setup.S by Linus Torvalds
diff --git a/kernel/arch/x86/realmode/rm/trampoline_common.S b/kernel/arch/x86/realmode/rm/trampoline_common.S
index b1ecdb969..7c706772a 100644
--- a/kernel/arch/x86/realmode/rm/trampoline_common.S
+++ b/kernel/arch/x86/realmode/rm/trampoline_common.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	.section ".rodata","a"
 	.balign	16
 tr_idt: .fill 1, 6, 0
diff --git a/kernel/arch/x86/realmode/rm/wakemain.c b/kernel/arch/x86/realmode/rm/wakemain.c
index 91405d515..1d6437e6d 100644
--- a/kernel/arch/x86/realmode/rm/wakemain.c
+++ b/kernel/arch/x86/realmode/rm/wakemain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "wakeup.h"
 #include "boot.h"
 
diff --git a/kernel/arch/x86/realmode/rm/wakeup.h b/kernel/arch/x86/realmode/rm/wakeup.h
index 7dd86a419..0e4fd08ae 100644
--- a/kernel/arch/x86/realmode/rm/wakeup.h
+++ b/kernel/arch/x86/realmode/rm/wakeup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for the wakeup data structure at the head of the
  * wakeup code.
diff --git a/kernel/arch/x86/realmode/rm/wakeup_asm.S b/kernel/arch/x86/realmode/rm/wakeup_asm.S
index 9e7e14797..05ac9c17c 100644
--- a/kernel/arch/x86/realmode/rm/wakeup_asm.S
+++ b/kernel/arch/x86/realmode/rm/wakeup_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ACPI wakeup real mode startup stub
  */
diff --git a/kernel/arch/x86/realmode/rmpiggy.S b/kernel/arch/x86/realmode/rmpiggy.S
index 204c6ece0..c078dba40 100644
--- a/kernel/arch/x86/realmode/rmpiggy.S
+++ b/kernel/arch/x86/realmode/rmpiggy.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Wrapper script for the realmode binary as a transport object
  * before copying to low memory.
diff --git a/kernel/arch/x86/tools/Makefile b/kernel/arch/x86/tools/Makefile
index 604a37efd..972b8e8d9 100644
--- a/kernel/arch/x86/tools/Makefile
+++ b/kernel/arch/x86/tools/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 PHONY += posttest
 
 ifeq ($(KBUILD_VERBOSE),1)
diff --git a/kernel/arch/x86/tools/distill.awk b/kernel/arch/x86/tools/distill.awk
index c13c0ee48..e0edeccc1 100644
--- a/kernel/arch/x86/tools/distill.awk
+++ b/kernel/arch/x86/tools/distill.awk
@@ -1,4 +1,5 @@
 #!/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 # Usage: objdump -d a.out | awk -f distill.awk | ./test_get_len
 # Distills the disassembly as follows:
 # - Removes all lines except the disassembled instructions.
diff --git a/kernel/arch/x86/tools/gen-insn-attr-x86.awk b/kernel/arch/x86/tools/gen-insn-attr-x86.awk
index a3d2c62fd..b02a36b2c 100644
--- a/kernel/arch/x86/tools/gen-insn-attr-x86.awk
+++ b/kernel/arch/x86/tools/gen-insn-attr-x86.awk
@@ -1,4 +1,5 @@
 #!/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 # gen-insn-attr-x86.awk: Instruction attribute table generator
 # Written by Masami Hiramatsu <mhiramat@redhat.com>
 #
diff --git a/kernel/arch/x86/tools/relocs.c b/kernel/arch/x86/tools/relocs.c
index 73eb7fd4a..5d73c443e 100644
--- a/kernel/arch/x86/tools/relocs.c
+++ b/kernel/arch/x86/tools/relocs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* This is included from relocs_32/64.c */
 
 #define ElfW(type)		_ElfW(ELF_BITS, type)
diff --git a/kernel/arch/x86/tools/relocs.h b/kernel/arch/x86/tools/relocs.h
index 1d23bf953..43c83c0fd 100644
--- a/kernel/arch/x86/tools/relocs.h
+++ b/kernel/arch/x86/tools/relocs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RELOCS_H
 #define RELOCS_H
 
diff --git a/kernel/arch/x86/tools/relocs_32.c b/kernel/arch/x86/tools/relocs_32.c
index b2ade2bb4..9442ff78b 100644
--- a/kernel/arch/x86/tools/relocs_32.c
+++ b/kernel/arch/x86/tools/relocs_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "relocs.h"
 
 #define ELF_BITS 32
diff --git a/kernel/arch/x86/tools/relocs_64.c b/kernel/arch/x86/tools/relocs_64.c
index 56b61b743..9029cb619 100644
--- a/kernel/arch/x86/tools/relocs_64.c
+++ b/kernel/arch/x86/tools/relocs_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "relocs.h"
 
 #define ELF_BITS 64
diff --git a/kernel/arch/x86/tools/relocs_common.c b/kernel/arch/x86/tools/relocs_common.c
index acab636bc..6634352a2 100644
--- a/kernel/arch/x86/tools/relocs_common.c
+++ b/kernel/arch/x86/tools/relocs_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "relocs.h"
 
 void die(char *fmt, ...)
diff --git a/kernel/arch/x86/um/Kconfig b/kernel/arch/x86/um/Kconfig
index ed56a1c4a..13ed827c7 100644
--- a/kernel/arch/x86/um/Kconfig
+++ b/kernel/arch/x86/um/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 mainmenu "User Mode Linux/$SUBARCH $KERNELVERSION Kernel Configuration"
 
 source "arch/um/Kconfig.common"
diff --git a/kernel/arch/x86/um/Makefile b/kernel/arch/x86/um/Makefile
index 46cbbfe03..c2d3d7c51 100644
--- a/kernel/arch/x86/um/Makefile
+++ b/kernel/arch/x86/um/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 #
diff --git a/kernel/arch/x86/um/asm/arch_hweight.h b/kernel/arch/x86/um/asm/arch_hweight.h
index c656cf443..0d2d5fbb3 100644
--- a/kernel/arch/x86/um/asm/arch_hweight.h
+++ b/kernel/arch/x86/um/asm/arch_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UM_HWEIGHT_H
 #define _ASM_UM_HWEIGHT_H
 
diff --git a/kernel/arch/x86/um/asm/barrier.h b/kernel/arch/x86/um/asm/barrier.h
index 00c319048..b7d73400e 100644
--- a/kernel/arch/x86/um/asm/barrier.h
+++ b/kernel/arch/x86/um/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_UM_BARRIER_H_
 #define _ASM_UM_BARRIER_H_
 
diff --git a/kernel/arch/x86/um/asm/checksum.h b/kernel/arch/x86/um/asm/checksum.h
index 54d96f1e3..2a56cac64 100644
--- a/kernel/arch/x86/um/asm/checksum.h
+++ b/kernel/arch/x86/um/asm/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_CHECKSUM_H
 #define __UM_CHECKSUM_H
 
diff --git a/kernel/arch/x86/um/asm/desc.h b/kernel/arch/x86/um/asm/desc.h
index 4ec34a51b..34de4e93d 100644
--- a/kernel/arch/x86/um/asm/desc.h
+++ b/kernel/arch/x86/um/asm/desc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_DESC_H
 #define __UM_DESC_H
 
diff --git a/kernel/arch/x86/um/asm/module.h b/kernel/arch/x86/um/asm/module.h
index 61af80e93..a3b061d66 100644
--- a/kernel/arch/x86/um/asm/module.h
+++ b/kernel/arch/x86/um/asm/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_MODULE_H
 #define __UM_MODULE_H
 
diff --git a/kernel/arch/x86/um/asm/processor.h b/kernel/arch/x86/um/asm/processor.h
index c77db2288..593d5f390 100644
--- a/kernel/arch/x86/um/asm/processor.h
+++ b/kernel/arch/x86/um/asm/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_PROCESSOR_H
 #define __UM_PROCESSOR_H
 
diff --git a/kernel/arch/x86/um/asm/ptrace.h b/kernel/arch/x86/um/asm/ptrace.h
index b291ca5cf..83822fd42 100644
--- a/kernel/arch/x86/um/asm/ptrace.h
+++ b/kernel/arch/x86/um/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_X86_PTRACE_H
 #define __UM_X86_PTRACE_H
 
diff --git a/kernel/arch/x86/um/asm/segment.h b/kernel/arch/x86/um/asm/segment.h
index 41dd5e1f3..453db3771 100644
--- a/kernel/arch/x86/um/asm/segment.h
+++ b/kernel/arch/x86/um/asm/segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_SEGMENT_H
 #define __UM_SEGMENT_H
 
diff --git a/kernel/arch/x86/um/asm/syscall.h b/kernel/arch/x86/um/asm/syscall.h
index 11ab90dc5..ef898af10 100644
--- a/kernel/arch/x86/um/asm/syscall.h
+++ b/kernel/arch/x86/um/asm/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_ASM_SYSCALL_H
 #define __UM_ASM_SYSCALL_H
 
diff --git a/kernel/arch/x86/um/elfcore.c b/kernel/arch/x86/um/elfcore.c
index 7bb89a27a..48a3eb09d 100644
--- a/kernel/arch/x86/um/elfcore.c
+++ b/kernel/arch/x86/um/elfcore.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/elf.h>
 #include <linux/coredump.h>
 #include <linux/fs.h>
diff --git a/kernel/arch/x86/um/mem_64.c b/kernel/arch/x86/um/mem_64.c
index 7642e2e2a..c027e93d1 100644
--- a/kernel/arch/x86/um/mem_64.c
+++ b/kernel/arch/x86/um/mem_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <asm/elf.h>
 
diff --git a/kernel/arch/x86/um/os-Linux/mcontext.c b/kernel/arch/x86/um/os-Linux/mcontext.c
index 1d33d72c6..49c3744ca 100644
--- a/kernel/arch/x86/um/os-Linux/mcontext.c
+++ b/kernel/arch/x86/um/os-Linux/mcontext.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/ucontext.h>
 #define __FRAME_OFFSETS
 #include <asm/ptrace.h>
diff --git a/kernel/arch/x86/um/os-Linux/task_size.c b/kernel/arch/x86/um/os-Linux/task_size.c
index 5adb6a2fd..e62174638 100644
--- a/kernel/arch/x86/um/os-Linux/task_size.c
+++ b/kernel/arch/x86/um/os-Linux/task_size.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
diff --git a/kernel/arch/x86/um/os-Linux/tls.c b/kernel/arch/x86/um/os-Linux/tls.c
index ed8ea9096..3e1b1bf6a 100644
--- a/kernel/arch/x86/um/os-Linux/tls.c
+++ b/kernel/arch/x86/um/os-Linux/tls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <linux/unistd.h>
 
diff --git a/kernel/arch/x86/um/setjmp_32.S b/kernel/arch/x86/um/setjmp_32.S
index 390531929..62eaf8c80 100644
--- a/kernel/arch/x86/um/setjmp_32.S
+++ b/kernel/arch/x86/um/setjmp_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #
 # arch/i386/setjmp.S
 #
diff --git a/kernel/arch/x86/um/setjmp_64.S b/kernel/arch/x86/um/setjmp_64.S
index c56942e1a..1b5d40d4f 100644
--- a/kernel/arch/x86/um/setjmp_64.S
+++ b/kernel/arch/x86/um/setjmp_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #
 # arch/x86_64/setjmp.S
 #
diff --git a/kernel/arch/x86/um/shared/sysdep/archsetjmp.h b/kernel/arch/x86/um/shared/sysdep/archsetjmp.h
index ff7766d28..166cedbab 100644
--- a/kernel/arch/x86/um/shared/sysdep/archsetjmp.h
+++ b/kernel/arch/x86/um/shared/sysdep/archsetjmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __i386__
 #include "archsetjmp_32.h"
 #else
diff --git a/kernel/arch/x86/um/shared/sysdep/archsetjmp_32.h b/kernel/arch/x86/um/shared/sysdep/archsetjmp_32.h
index 0f312085c..fb08f2576 100644
--- a/kernel/arch/x86/um/shared/sysdep/archsetjmp_32.h
+++ b/kernel/arch/x86/um/shared/sysdep/archsetjmp_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/um/include/sysdep-i386/archsetjmp.h
  */
diff --git a/kernel/arch/x86/um/shared/sysdep/archsetjmp_64.h b/kernel/arch/x86/um/shared/sysdep/archsetjmp_64.h
index 2af8f12ca..9b499e457 100644
--- a/kernel/arch/x86/um/shared/sysdep/archsetjmp_64.h
+++ b/kernel/arch/x86/um/shared/sysdep/archsetjmp_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * arch/um/include/sysdep-x86_64/archsetjmp.h
  */
diff --git a/kernel/arch/x86/um/shared/sysdep/faultinfo.h b/kernel/arch/x86/um/shared/sysdep/faultinfo.h
index 862ecb1c7..4390803e0 100644
--- a/kernel/arch/x86/um/shared/sysdep/faultinfo.h
+++ b/kernel/arch/x86/um/shared/sysdep/faultinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __i386__
 #include "faultinfo_32.h"
 #else
diff --git a/kernel/arch/x86/um/shared/sysdep/kernel-offsets.h b/kernel/arch/x86/um/shared/sysdep/kernel-offsets.h
index 7e1d35b6a..a004bffb7 100644
--- a/kernel/arch/x86/um/shared/sysdep/kernel-offsets.h
+++ b/kernel/arch/x86/um/shared/sysdep/kernel-offsets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/elf.h>
diff --git a/kernel/arch/x86/um/shared/sysdep/ptrace.h b/kernel/arch/x86/um/shared/sysdep/ptrace.h
index eb9356904..6ca4ecabc 100644
--- a/kernel/arch/x86/um/shared/sysdep/ptrace.h
+++ b/kernel/arch/x86/um/shared/sysdep/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SYSDEP_X86_PTRACE_H
 #define __SYSDEP_X86_PTRACE_H
 
diff --git a/kernel/arch/x86/um/shared/sysdep/ptrace_user.h b/kernel/arch/x86/um/shared/sysdep/ptrace_user.h
index 16cd6b5e7..44782bbad 100644
--- a/kernel/arch/x86/um/shared/sysdep/ptrace_user.h
+++ b/kernel/arch/x86/um/shared/sysdep/ptrace_user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <generated/user_constants.h>
 
 #define PT_OFFSET(r) ((r) * sizeof(long))
diff --git a/kernel/arch/x86/um/shared/sysdep/stub.h b/kernel/arch/x86/um/shared/sysdep/stub.h
index 3f55e5bd3..ce0ca46ad 100644
--- a/kernel/arch/x86/um/shared/sysdep/stub.h
+++ b/kernel/arch/x86/um/shared/sysdep/stub.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm/unistd.h>
 #include <sys/mman.h>
 #include <signal.h>
diff --git a/kernel/arch/x86/um/shared/sysdep/syscalls.h b/kernel/arch/x86/um/shared/sysdep/syscalls.h
index bd9a89b67..b2060ac70 100644
--- a/kernel/arch/x86/um/shared/sysdep/syscalls.h
+++ b/kernel/arch/x86/um/shared/sysdep/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __i386__
 #include "syscalls_32.h"
 #else
diff --git a/kernel/arch/x86/um/shared/sysdep/tls.h b/kernel/arch/x86/um/shared/sysdep/tls.h
index a682db13d..b968016aa 100644
--- a/kernel/arch/x86/um/shared/sysdep/tls.h
+++ b/kernel/arch/x86/um/shared/sysdep/tls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SYSDEP_TLS_H
 #define _SYSDEP_TLS_H
 
diff --git a/kernel/arch/x86/um/stub_32.S b/kernel/arch/x86/um/stub_32.S
index 98816804e..a193e8853 100644
--- a/kernel/arch/x86/um/stub_32.S
+++ b/kernel/arch/x86/um/stub_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <as-layout.h>
 
 .section .__syscall_stub, "ax"
diff --git a/kernel/arch/x86/um/stub_64.S b/kernel/arch/x86/um/stub_64.S
index ba914b3b8..8a95c5b2e 100644
--- a/kernel/arch/x86/um/stub_64.S
+++ b/kernel/arch/x86/um/stub_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <as-layout.h>
 
 .section .__syscall_stub, "ax"
diff --git a/kernel/arch/x86/um/sys_call_table_32.c b/kernel/arch/x86/um/sys_call_table_32.c
index bfce503df..9649b5ad2 100644
--- a/kernel/arch/x86/um/sys_call_table_32.c
+++ b/kernel/arch/x86/um/sys_call_table_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * System call table for UML/i386, copied from arch/x86/kernel/syscall_*.c
  * with some changes for UML.
diff --git a/kernel/arch/x86/um/sys_call_table_64.c b/kernel/arch/x86/um/sys_call_table_64.c
index f306413d3..c8bc7fb8c 100644
--- a/kernel/arch/x86/um/sys_call_table_64.c
+++ b/kernel/arch/x86/um/sys_call_table_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * System call table for UML/x86-64, copied from arch/x86/kernel/syscall_*.c
  * with some changes for UML.
diff --git a/kernel/arch/x86/um/syscalls_32.c b/kernel/arch/x86/um/syscalls_32.c
index 627d68836..5c65254c8 100644
--- a/kernel/arch/x86/um/syscalls_32.c
+++ b/kernel/arch/x86/um/syscalls_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/syscalls.h>
 #include <os.h>
 
diff --git a/kernel/arch/x86/um/tls_64.c b/kernel/arch/x86/um/tls_64.c
index 3ad714373..3a621e0d3 100644
--- a/kernel/arch/x86/um/tls_64.c
+++ b/kernel/arch/x86/um/tls_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched.h>
 #include <asm/ptrace-abi.h>
 
diff --git a/kernel/arch/x86/um/user-offsets.c b/kernel/arch/x86/um/user-offsets.c
index 3099c2095..5b37b7f95 100644
--- a/kernel/arch/x86/um/user-offsets.c
+++ b/kernel/arch/x86/um/user-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stddef.h>
 #include <signal.h>
diff --git a/kernel/arch/x86/um/vdso/Makefile b/kernel/arch/x86/um/vdso/Makefile
index 329406224..10003359e 100644
--- a/kernel/arch/x86/um/vdso/Makefile
+++ b/kernel/arch/x86/um/vdso/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Building vDSO images for x86.
 #
diff --git a/kernel/arch/x86/um/vdso/checkundef.sh b/kernel/arch/x86/um/vdso/checkundef.sh
index 7ee90a9b5..8e3ea6bb9 100644
--- a/kernel/arch/x86/um/vdso/checkundef.sh
+++ b/kernel/arch/x86/um/vdso/checkundef.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 nm="$1"
 file="$2"
 $nm "$file" | grep '^ *U' > /dev/null 2>&1
diff --git a/kernel/arch/x86/um/vdso/vdso-layout.lds.S b/kernel/arch/x86/um/vdso/vdso-layout.lds.S
index 634a2cf62..439b790df 100644
--- a/kernel/arch/x86/um/vdso/vdso-layout.lds.S
+++ b/kernel/arch/x86/um/vdso/vdso-layout.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for vDSO.  This is an ELF shared object prelinked to
  * its virtual address, and with only one read-only segment.
diff --git a/kernel/arch/x86/um/vdso/vdso.S b/kernel/arch/x86/um/vdso/vdso.S
index 1cb468ada..a4a3870dc 100644
--- a/kernel/arch/x86/um/vdso/vdso.S
+++ b/kernel/arch/x86/um/vdso/vdso.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 
 __INITDATA
diff --git a/kernel/arch/x86/um/vdso/vdso.lds.S b/kernel/arch/x86/um/vdso/vdso.lds.S
index b96b2677c..73c508587 100644
--- a/kernel/arch/x86/um/vdso/vdso.lds.S
+++ b/kernel/arch/x86/um/vdso/vdso.lds.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linker script for 64-bit vDSO.
  * We #include the file to define the layout details.
diff --git a/kernel/arch/x86/xen/Kconfig b/kernel/arch/x86/xen/Kconfig
index 1ecd41981..f605825a0 100644
--- a/kernel/arch/x86/xen/Kconfig
+++ b/kernel/arch/x86/xen/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # This Kconfig describes xen options
 #
diff --git a/kernel/arch/x86/xen/Makefile b/kernel/arch/x86/xen/Makefile
index bced7a369..d83cb5478 100644
--- a/kernel/arch/x86/xen/Makefile
+++ b/kernel/arch/x86/xen/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OBJECT_FILES_NON_STANDARD_xen-asm_$(BITS).o := y
 OBJECT_FILES_NON_STANDARD_xen-pvh.o := y
 
diff --git a/kernel/arch/x86/xen/apic.c b/kernel/arch/x86/xen/apic.c
index b5e48da7f..30434b870 100644
--- a/kernel/arch/x86/xen/apic.c
+++ b/kernel/arch/x86/xen/apic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 
 #include <asm/x86_init.h>
diff --git a/kernel/arch/x86/xen/debugfs.c b/kernel/arch/x86/xen/debugfs.c
index 1daff5545..13da87918 100644
--- a/kernel/arch/x86/xen/debugfs.c
+++ b/kernel/arch/x86/xen/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/x86/xen/debugfs.h b/kernel/arch/x86/xen/debugfs.h
index 12ebf3325..6b813ad10 100644
--- a/kernel/arch/x86/xen/debugfs.h
+++ b/kernel/arch/x86/xen/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_DEBUGFS_H
 #define _XEN_DEBUGFS_H
 
diff --git a/kernel/arch/x86/xen/enlighten_pv.c b/kernel/arch/x86/xen/enlighten_pv.c
index 69b9deff7..d4396e27b 100644
--- a/kernel/arch/x86/xen/enlighten_pv.c
+++ b/kernel/arch/x86/xen/enlighten_pv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Core of Xen paravirt_ops implementation.
  *
diff --git a/kernel/arch/x86/xen/enlighten_pvh.c b/kernel/arch/x86/xen/enlighten_pvh.c
index 98ab17673..7bd3ee083 100644
--- a/kernel/arch/x86/xen/enlighten_pvh.c
+++ b/kernel/arch/x86/xen/enlighten_pvh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/acpi.h>
 
 #include <xen/hvc-console.h>
diff --git a/kernel/arch/x86/xen/irq.c b/kernel/arch/x86/xen/irq.c
index d4eff5676..74179852e 100644
--- a/kernel/arch/x86/xen/irq.c
+++ b/kernel/arch/x86/xen/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/hardirq.h>
 
 #include <asm/x86_init.h>
diff --git a/kernel/arch/x86/xen/mmu.h b/kernel/arch/x86/xen/mmu.h
index 3fe2b3292..a7e47cf7e 100644
--- a/kernel/arch/x86/xen/mmu.h
+++ b/kernel/arch/x86/xen/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_MMU_H
 
 #include <linux/linkage.h>
diff --git a/kernel/arch/x86/xen/mmu_hvm.c b/kernel/arch/x86/xen/mmu_hvm.c
index 1c57f1cd5..2cfcfe4f6 100644
--- a/kernel/arch/x86/xen/mmu_hvm.c
+++ b/kernel/arch/x86/xen/mmu_hvm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/crash_dump.h>
 
diff --git a/kernel/arch/x86/xen/multicalls.c b/kernel/arch/x86/xen/multicalls.c
index ea54a08d8..dc502ca82 100644
--- a/kernel/arch/x86/xen/multicalls.c
+++ b/kernel/arch/x86/xen/multicalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xen hypercall batching.
  *
diff --git a/kernel/arch/x86/xen/multicalls.h b/kernel/arch/x86/xen/multicalls.h
index 9c2e74f90..1c51b2c87 100644
--- a/kernel/arch/x86/xen/multicalls.h
+++ b/kernel/arch/x86/xen/multicalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_MULTICALLS_H
 #define _XEN_MULTICALLS_H
 
diff --git a/kernel/arch/x86/xen/pmu.c b/kernel/arch/x86/xen/pmu.c
index b9fc52556..7d00d4ad4 100644
--- a/kernel/arch/x86/xen/pmu.c
+++ b/kernel/arch/x86/xen/pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/interrupt.h>
 
diff --git a/kernel/arch/x86/xen/pmu.h b/kernel/arch/x86/xen/pmu.h
index 4be5355b5..0e83a1605 100644
--- a/kernel/arch/x86/xen/pmu.h
+++ b/kernel/arch/x86/xen/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __XEN_PMU_H
 #define __XEN_PMU_H
 
diff --git a/kernel/arch/x86/xen/setup.c b/kernel/arch/x86/xen/setup.c
index ac55c02f9..c114ca767 100644
--- a/kernel/arch/x86/xen/setup.c
+++ b/kernel/arch/x86/xen/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Machine specific setup for xen
  *
diff --git a/kernel/arch/x86/xen/smp.c b/kernel/arch/x86/xen/smp.c
index e7f02eb73..77c959cf8 100644
--- a/kernel/arch/x86/xen/smp.c
+++ b/kernel/arch/x86/xen/smp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/smp.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
diff --git a/kernel/arch/x86/xen/smp.h b/kernel/arch/x86/xen/smp.h
index 87d3c76cb..bd02f9d50 100644
--- a/kernel/arch/x86/xen/smp.h
+++ b/kernel/arch/x86/xen/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_SMP_H
 
 #ifdef CONFIG_SMP
diff --git a/kernel/arch/x86/xen/smp_hvm.c b/kernel/arch/x86/xen/smp_hvm.c
index fd60abedf..f8d39440b 100644
--- a/kernel/arch/x86/xen/smp_hvm.c
+++ b/kernel/arch/x86/xen/smp_hvm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/smp.h>
 
 #include <xen/events.h>
diff --git a/kernel/arch/x86/xen/smp_pv.c b/kernel/arch/x86/xen/smp_pv.c
index 51471408f..05f91ce9b 100644
--- a/kernel/arch/x86/xen/smp_pv.c
+++ b/kernel/arch/x86/xen/smp_pv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xen SMP support
  *
diff --git a/kernel/arch/x86/xen/spinlock.c b/kernel/arch/x86/xen/spinlock.c
index 25a7c4302..08324c640 100644
--- a/kernel/arch/x86/xen/spinlock.c
+++ b/kernel/arch/x86/xen/spinlock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Split spinlock implementation out into its own file, so it can be
  * compiled in a FTRACE-compatible way.
diff --git a/kernel/arch/x86/xen/suspend.c b/kernel/arch/x86/xen/suspend.c
index d6b168069..92bf5ecb6 100644
--- a/kernel/arch/x86/xen/suspend.c
+++ b/kernel/arch/x86/xen/suspend.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/tick.h>
 
diff --git a/kernel/arch/x86/xen/suspend_hvm.c b/kernel/arch/x86/xen/suspend_hvm.c
index 484999416..e666b614c 100644
--- a/kernel/arch/x86/xen/suspend_hvm.c
+++ b/kernel/arch/x86/xen/suspend_hvm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 
 #include <xen/xen.h>
diff --git a/kernel/arch/x86/xen/suspend_pv.c b/kernel/arch/x86/xen/suspend_pv.c
index 3abe4f07f..a2e0f110a 100644
--- a/kernel/arch/x86/xen/suspend_pv.c
+++ b/kernel/arch/x86/xen/suspend_pv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 
 #include <asm/fixmap.h>
diff --git a/kernel/arch/x86/xen/time.c b/kernel/arch/x86/xen/time.c
index 1ecb05db3..80c2a4bdf 100644
--- a/kernel/arch/x86/xen/time.c
+++ b/kernel/arch/x86/xen/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xen time implementation.
  *
diff --git a/kernel/arch/x86/xen/trace.c b/kernel/arch/x86/xen/trace.c
index a702ec2f5..329f60eb9 100644
--- a/kernel/arch/x86/xen/trace.c
+++ b/kernel/arch/x86/xen/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ftrace.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/xen-mca.h>
diff --git a/kernel/arch/x86/xen/vga.c b/kernel/arch/x86/xen/vga.c
index 6722e3733..e336f223f 100644
--- a/kernel/arch/x86/xen/vga.c
+++ b/kernel/arch/x86/xen/vga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/screen_info.h>
 #include <linux/init.h>
 
diff --git a/kernel/arch/x86/xen/xen-asm.S b/kernel/arch/x86/xen/xen-asm.S
index dcd31fa39..8019edd01 100644
--- a/kernel/arch/x86/xen/xen-asm.S
+++ b/kernel/arch/x86/xen/xen-asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Asm versions of Xen pv-ops, suitable for direct use.
  *
diff --git a/kernel/arch/x86/xen/xen-asm_32.S b/kernel/arch/x86/xen/xen-asm_32.S
index 1200e262a..c15db060a 100644
--- a/kernel/arch/x86/xen/xen-asm_32.S
+++ b/kernel/arch/x86/xen/xen-asm_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Asm versions of Xen pv-ops, suitable for direct use.
  *
diff --git a/kernel/arch/x86/xen/xen-asm_64.S b/kernel/arch/x86/xen/xen-asm_64.S
index dae2cc33a..c98a48c86 100644
--- a/kernel/arch/x86/xen/xen-asm_64.S
+++ b/kernel/arch/x86/xen/xen-asm_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Asm versions of Xen pv-ops, suitable for direct use.
  *
diff --git a/kernel/arch/x86/xen/xen-head.S b/kernel/arch/x86/xen/xen-head.S
index a7525e95d..b5b8d7f43 100644
--- a/kernel/arch/x86/xen/xen-head.S
+++ b/kernel/arch/x86/xen/xen-head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Xen-specific pieces of head.S, intended to be included in the right
 	place in head.S */
 
diff --git a/kernel/arch/x86/xen/xen-ops.h b/kernel/arch/x86/xen/xen-ops.h
index c8a6d224f..f377e1820 100644
--- a/kernel/arch/x86/xen/xen-ops.h
+++ b/kernel/arch/x86/xen/xen-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef XEN_OPS_H
 #define XEN_OPS_H
 
diff --git a/kernel/arch/xtensa/Kconfig b/kernel/arch/xtensa/Kconfig
index 7ad6d77b2..eb1f196c3 100644
--- a/kernel/arch/xtensa/Kconfig
+++ b/kernel/arch/xtensa/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ZONE_DMA
 	def_bool y
 
diff --git a/kernel/arch/xtensa/Kconfig.debug b/kernel/arch/xtensa/Kconfig.debug
index 8430af27d..f64c14ada 100644
--- a/kernel/arch/xtensa/Kconfig.debug
+++ b/kernel/arch/xtensa/Kconfig.debug
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
diff --git a/kernel/arch/xtensa/boot/boot-redboot/bootstrap.S b/kernel/arch/xtensa/boot/boot-redboot/bootstrap.S
index 86c34dbc9..bf7fabe63 100644
--- a/kernel/arch/xtensa/boot/boot-redboot/bootstrap.S
+++ b/kernel/arch/xtensa/boot/boot-redboot/bootstrap.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <variant/core.h>
 #include <asm/regs.h>
 #include <asm/asmmacro.h>
diff --git a/kernel/arch/xtensa/boot/dts/csp.dts b/kernel/arch/xtensa/boot/dts/csp.dts
index 4082f2671..885495460 100644
--- a/kernel/arch/xtensa/boot/dts/csp.dts
+++ b/kernel/arch/xtensa/boot/dts/csp.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
 / {
diff --git a/kernel/arch/xtensa/boot/dts/kc705.dts b/kernel/arch/xtensa/boot/dts/kc705.dts
index 6106bdc09..6887ff090 100644
--- a/kernel/arch/xtensa/boot/dts/kc705.dts
+++ b/kernel/arch/xtensa/boot/dts/kc705.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /include/ "xtfpga.dtsi"
 /include/ "xtfpga-flash-128m.dtsi"
diff --git a/kernel/arch/xtensa/boot/dts/kc705_nommu.dts b/kernel/arch/xtensa/boot/dts/kc705_nommu.dts
index 65f3d741b..d8e194a0f 100644
--- a/kernel/arch/xtensa/boot/dts/kc705_nommu.dts
+++ b/kernel/arch/xtensa/boot/dts/kc705_nommu.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /include/ "xtfpga.dtsi"
 /include/ "xtfpga-flash-128m.dtsi"
diff --git a/kernel/arch/xtensa/boot/dts/lx200mx.dts b/kernel/arch/xtensa/boot/dts/lx200mx.dts
index 249822b99..974a8d904 100644
--- a/kernel/arch/xtensa/boot/dts/lx200mx.dts
+++ b/kernel/arch/xtensa/boot/dts/lx200mx.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /include/ "xtfpga.dtsi"
 /include/ "xtfpga-flash-16m.dtsi"
diff --git a/kernel/arch/xtensa/boot/dts/lx60.dts b/kernel/arch/xtensa/boot/dts/lx60.dts
index a0f8b8ad3..7c203c1c7 100644
--- a/kernel/arch/xtensa/boot/dts/lx60.dts
+++ b/kernel/arch/xtensa/boot/dts/lx60.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /include/ "xtfpga.dtsi"
 /include/ "xtfpga-flash-4m.dtsi"
diff --git a/kernel/arch/xtensa/boot/dts/ml605.dts b/kernel/arch/xtensa/boot/dts/ml605.dts
index 905c3a503..08e5c8d47 100644
--- a/kernel/arch/xtensa/boot/dts/ml605.dts
+++ b/kernel/arch/xtensa/boot/dts/ml605.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /include/ "xtfpga.dtsi"
 /include/ "xtfpga-flash-16m.dtsi"
diff --git a/kernel/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi b/kernel/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi
index d3a88e029..9bf8bad1d 100644
--- a/kernel/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi
+++ b/kernel/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	soc {
 		flash: flash@00000000 {
diff --git a/kernel/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi b/kernel/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
index 1d97203c1..40c2f81f7 100644
--- a/kernel/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
+++ b/kernel/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	soc {
 		flash: flash@08000000 {
diff --git a/kernel/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi b/kernel/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
index d1c621ca8..fb8d3a9f3 100644
--- a/kernel/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
+++ b/kernel/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	soc {
 		flash: flash@08000000 {
diff --git a/kernel/arch/xtensa/boot/dts/xtfpga.dtsi b/kernel/arch/xtensa/boot/dts/xtfpga.dtsi
index 91616a9d7..109052882 100644
--- a/kernel/arch/xtensa/boot/dts/xtfpga.dtsi
+++ b/kernel/arch/xtensa/boot/dts/xtfpga.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 / {
 	compatible = "cdns,xtensa-xtfpga";
 	#address-cells = <1>;
diff --git a/kernel/arch/xtensa/boot/lib/Makefile b/kernel/arch/xtensa/boot/lib/Makefile
index 6868f2ca6..d2a7f4856 100644
--- a/kernel/arch/xtensa/boot/lib/Makefile
+++ b/kernel/arch/xtensa/boot/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for some libs needed by zImage.
 #
diff --git a/kernel/arch/xtensa/boot/lib/zmem.c b/kernel/arch/xtensa/boot/lib/zmem.c
index d9862aa8c..e3ecd743c 100644
--- a/kernel/arch/xtensa/boot/lib/zmem.c
+++ b/kernel/arch/xtensa/boot/lib/zmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/zlib.h>
 
 /* bits taken from ppc */
diff --git a/kernel/arch/xtensa/include/asm/flat.h b/kernel/arch/xtensa/include/asm/flat.h
index 60e0d6a45..b8532d787 100644
--- a/kernel/arch/xtensa/include/asm/flat.h
+++ b/kernel/arch/xtensa/include/asm/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_XTENSA_FLAT_H
 #define __ASM_XTENSA_FLAT_H
 
diff --git a/kernel/arch/xtensa/include/asm/nommu_context.h b/kernel/arch/xtensa/include/asm/nommu_context.h
index 22984fd1d..2cebdbbdb 100644
--- a/kernel/arch/xtensa/include/asm/nommu_context.h
+++ b/kernel/arch/xtensa/include/asm/nommu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static inline void init_mmu(void)
 {
 }
diff --git a/kernel/arch/xtensa/include/asm/spinlock_types.h b/kernel/arch/xtensa/include/asm/spinlock_types.h
index 7ec5ce10c..bb1fe6c18 100644
--- a/kernel/arch/xtensa/include/asm/spinlock_types.h
+++ b/kernel/arch/xtensa/include/asm/spinlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SPINLOCK_TYPES_H
 #define __ASM_SPINLOCK_TYPES_H
 
diff --git a/kernel/arch/xtensa/include/asm/unistd.h b/kernel/arch/xtensa/include/asm/unistd.h
index cb4c2ce8d..ed66db3bc 100644
--- a/kernel/arch/xtensa/include/asm/unistd.h
+++ b/kernel/arch/xtensa/include/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XTENSA_UNISTD_H
 #define _XTENSA_UNISTD_H
 
diff --git a/kernel/arch/xtensa/include/uapi/asm/byteorder.h b/kernel/arch/xtensa/include/uapi/asm/byteorder.h
index 54eb63153..5b9f832c2 100644
--- a/kernel/arch/xtensa/include/uapi/asm/byteorder.h
+++ b/kernel/arch/xtensa/include/uapi/asm/byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XTENSA_BYTEORDER_H
 #define _XTENSA_BYTEORDER_H
 
diff --git a/kernel/arch/xtensa/include/uapi/asm/ioctls.h b/kernel/arch/xtensa/include/uapi/asm/ioctls.h
index 47d82c09b..ec43609cb 100644
--- a/kernel/arch/xtensa/include/uapi/asm/ioctls.h
+++ b/kernel/arch/xtensa/include/uapi/asm/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/ioctls.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/ipcbuf.h b/kernel/arch/xtensa/include/uapi/asm/ipcbuf.h
index c33aa6a42..a57afa0b6 100644
--- a/kernel/arch/xtensa/include/uapi/asm/ipcbuf.h
+++ b/kernel/arch/xtensa/include/uapi/asm/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/ipcbuf.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/mman.h b/kernel/arch/xtensa/include/uapi/asm/mman.h
index b15b278aa..2bfe59069 100644
--- a/kernel/arch/xtensa/include/uapi/asm/mman.h
+++ b/kernel/arch/xtensa/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/mman.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/msgbuf.h b/kernel/arch/xtensa/include/uapi/asm/msgbuf.h
index 693c96755..36e2e103c 100644
--- a/kernel/arch/xtensa/include/uapi/asm/msgbuf.h
+++ b/kernel/arch/xtensa/include/uapi/asm/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/msgbuf.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/param.h b/kernel/arch/xtensa/include/uapi/asm/param.h
index 87bc2eae6..e6feb4ee0 100644
--- a/kernel/arch/xtensa/include/uapi/asm/param.h
+++ b/kernel/arch/xtensa/include/uapi/asm/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/param.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/poll.h b/kernel/arch/xtensa/include/uapi/asm/poll.h
index 9d2d5993f..4d249040b 100644
--- a/kernel/arch/xtensa/include/uapi/asm/poll.h
+++ b/kernel/arch/xtensa/include/uapi/asm/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/poll.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/posix_types.h b/kernel/arch/xtensa/include/uapi/asm/posix_types.h
index 6e96be0d0..1dc675928 100644
--- a/kernel/arch/xtensa/include/uapi/asm/posix_types.h
+++ b/kernel/arch/xtensa/include/uapi/asm/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/posix_types.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/ptrace.h b/kernel/arch/xtensa/include/uapi/asm/ptrace.h
index 8853a0d54..a10b42963 100644
--- a/kernel/arch/xtensa/include/uapi/asm/ptrace.h
+++ b/kernel/arch/xtensa/include/uapi/asm/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/ptrace.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/sembuf.h b/kernel/arch/xtensa/include/uapi/asm/sembuf.h
index c15870493..f61b6331a 100644
--- a/kernel/arch/xtensa/include/uapi/asm/sembuf.h
+++ b/kernel/arch/xtensa/include/uapi/asm/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/sembuf.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/setup.h b/kernel/arch/xtensa/include/uapi/asm/setup.h
index 9fa8ad979..57e6c210e 100644
--- a/kernel/arch/xtensa/include/uapi/asm/setup.h
+++ b/kernel/arch/xtensa/include/uapi/asm/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/setup.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/shmbuf.h b/kernel/arch/xtensa/include/uapi/asm/shmbuf.h
index ad4b01217..26550bdc8 100644
--- a/kernel/arch/xtensa/include/uapi/asm/shmbuf.h
+++ b/kernel/arch/xtensa/include/uapi/asm/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/shmbuf.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/sigcontext.h b/kernel/arch/xtensa/include/uapi/asm/sigcontext.h
index 03383af8c..9cbf39e63 100644
--- a/kernel/arch/xtensa/include/uapi/asm/sigcontext.h
+++ b/kernel/arch/xtensa/include/uapi/asm/sigcontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/sigcontext.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/signal.h b/kernel/arch/xtensa/include/uapi/asm/signal.h
index 586756ee2..005dec5bf 100644
--- a/kernel/arch/xtensa/include/uapi/asm/signal.h
+++ b/kernel/arch/xtensa/include/uapi/asm/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/signal.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/socket.h b/kernel/arch/xtensa/include/uapi/asm/socket.h
index 220059999..75a07b811 100644
--- a/kernel/arch/xtensa/include/uapi/asm/socket.h
+++ b/kernel/arch/xtensa/include/uapi/asm/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/socket.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/sockios.h b/kernel/arch/xtensa/include/uapi/asm/sockios.h
index efe0af379..fb8ac3607 100644
--- a/kernel/arch/xtensa/include/uapi/asm/sockios.h
+++ b/kernel/arch/xtensa/include/uapi/asm/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/sockios.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/stat.h b/kernel/arch/xtensa/include/uapi/asm/stat.h
index c4992038c..7b4d90d6d 100644
--- a/kernel/arch/xtensa/include/uapi/asm/stat.h
+++ b/kernel/arch/xtensa/include/uapi/asm/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/stat.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/swab.h b/kernel/arch/xtensa/include/uapi/asm/swab.h
index 226a39162..e677cf4cc 100644
--- a/kernel/arch/xtensa/include/uapi/asm/swab.h
+++ b/kernel/arch/xtensa/include/uapi/asm/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/swab.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/termbits.h b/kernel/arch/xtensa/include/uapi/asm/termbits.h
index 0d6c8715b..d4206a7c5 100644
--- a/kernel/arch/xtensa/include/uapi/asm/termbits.h
+++ b/kernel/arch/xtensa/include/uapi/asm/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/termbits.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/types.h b/kernel/arch/xtensa/include/uapi/asm/types.h
index 2efc92150..12db8ac38 100644
--- a/kernel/arch/xtensa/include/uapi/asm/types.h
+++ b/kernel/arch/xtensa/include/uapi/asm/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/asm-xtensa/types.h
  *
diff --git a/kernel/arch/xtensa/include/uapi/asm/unistd.h b/kernel/arch/xtensa/include/uapi/asm/unistd.h
index 6be7eb27f..bc3f62db5 100644
--- a/kernel/arch/xtensa/include/uapi/asm/unistd.h
+++ b/kernel/arch/xtensa/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #if !defined(_UAPI_XTENSA_UNISTD_H) || defined(__SYSCALL)
 #define _UAPI_XTENSA_UNISTD_H
 
diff --git a/kernel/arch/xtensa/kernel/Makefile b/kernel/arch/xtensa/kernel/Makefile
index 264fb89c4..bb8d55775 100644
--- a/kernel/arch/xtensa/kernel/Makefile
+++ b/kernel/arch/xtensa/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux/Xtensa kernel.
 #
diff --git a/kernel/arch/xtensa/kernel/irq.c b/kernel/arch/xtensa/kernel/irq.c
index 99341028c..18e4ef34a 100644
--- a/kernel/arch/xtensa/kernel/irq.c
+++ b/kernel/arch/xtensa/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/xtensa/kernel/irq.c
  *
diff --git a/kernel/arch/xtensa/mm/mmu.c b/kernel/arch/xtensa/mm/mmu.c
index abe4513eb..358d748d9 100644
--- a/kernel/arch/xtensa/mm/mmu.c
+++ b/kernel/arch/xtensa/mm/mmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xtensa mmu stuff
  *
diff --git a/kernel/arch/xtensa/oprofile/Makefile b/kernel/arch/xtensa/oprofile/Makefile
index 69ffbe80f..f559b9ffb 100644
--- a/kernel/arch/xtensa/oprofile/Makefile
+++ b/kernel/arch/xtensa/oprofile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPROFILE) += oprofile.o
 
 DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
diff --git a/kernel/block/Kconfig b/kernel/block/Kconfig
index 3ab42bbb0..28ec55752 100644
--- a/kernel/block/Kconfig
+++ b/kernel/block/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Block layer core configuration
 #
diff --git a/kernel/block/Kconfig.iosched b/kernel/block/Kconfig.iosched
index fd2cefa47..a4a8914bf 100644
--- a/kernel/block/Kconfig.iosched
+++ b/kernel/block/Kconfig.iosched
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 if BLOCK
 
 menu "IO Schedulers"
diff --git a/kernel/block/Makefile b/kernel/block/Makefile
index 9396ebc85..6a56303b9 100644
--- a/kernel/block/Makefile
+++ b/kernel/block/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel block layer
 #
diff --git a/kernel/block/blk-ioc.c b/kernel/block/blk-ioc.c
index 63898d229..f23311e4b 100644
--- a/kernel/block/blk-ioc.c
+++ b/kernel/block/blk-ioc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to io context handling
  */
diff --git a/kernel/block/blk-lib.c b/kernel/block/blk-lib.c
index 62240f883..63fb971d6 100644
--- a/kernel/block/blk-lib.c
+++ b/kernel/block/blk-lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to generic helpers functions
  */
diff --git a/kernel/block/blk-map.c b/kernel/block/blk-map.c
index 2547016aa..d5251edcc 100644
--- a/kernel/block/blk-map.c
+++ b/kernel/block/blk-map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to mapping data to requests
  */
diff --git a/kernel/block/blk-merge.c b/kernel/block/blk-merge.c
index aa524cad5..f5dedd57d 100644
--- a/kernel/block/blk-merge.c
+++ b/kernel/block/blk-merge.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to segment and merge handling
  */
diff --git a/kernel/block/blk-mq-debugfs.h b/kernel/block/blk-mq-debugfs.h
index a182e6f97..b9d366e57 100644
--- a/kernel/block/blk-mq-debugfs.h
+++ b/kernel/block/blk-mq-debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef INT_BLK_MQ_DEBUGFS_H
 #define INT_BLK_MQ_DEBUGFS_H
 
diff --git a/kernel/block/blk-mq-sched.h b/kernel/block/blk-mq-sched.h
index 9267d0b7c..ba1d1418a 100644
--- a/kernel/block/blk-mq-sched.h
+++ b/kernel/block/blk-mq-sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BLK_MQ_SCHED_H
 #define BLK_MQ_SCHED_H
 
diff --git a/kernel/block/blk-mq-tag.h b/kernel/block/blk-mq-tag.h
index 5cb51e53c..c190165d9 100644
--- a/kernel/block/blk-mq-tag.h
+++ b/kernel/block/blk-mq-tag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef INT_BLK_MQ_TAG_H
 #define INT_BLK_MQ_TAG_H
 
diff --git a/kernel/block/blk-mq.h b/kernel/block/blk-mq.h
index ef15b3414..4933af9d6 100644
--- a/kernel/block/blk-mq.h
+++ b/kernel/block/blk-mq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef INT_BLK_MQ_H
 #define INT_BLK_MQ_H
 
diff --git a/kernel/block/blk-softirq.c b/kernel/block/blk-softirq.c
index 07125e794..01e2b353a 100644
--- a/kernel/block/blk-softirq.c
+++ b/kernel/block/blk-softirq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to softirq rq completions
  */
diff --git a/kernel/block/blk-stat.h b/kernel/block/blk-stat.h
index 2fb20d1a3..2dd363472 100644
--- a/kernel/block/blk-stat.h
+++ b/kernel/block/blk-stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BLK_STAT_H
 #define BLK_STAT_H
 
diff --git a/kernel/block/blk-sysfs.c b/kernel/block/blk-sysfs.c
index b8362c0df..e54be4028 100644
--- a/kernel/block/blk-sysfs.c
+++ b/kernel/block/blk-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to sysfs handling
  */
diff --git a/kernel/block/blk-tag.c b/kernel/block/blk-tag.c
index e1a9c15eb..09f19c6c5 100644
--- a/kernel/block/blk-tag.c
+++ b/kernel/block/blk-tag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to tagged command queuing
  */
diff --git a/kernel/block/blk-throttle.c b/kernel/block/blk-throttle.c
index 17816a028..863176386 100644
--- a/kernel/block/blk-throttle.c
+++ b/kernel/block/blk-throttle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Interface for controlling IO bandwidth on a request queue
  *
diff --git a/kernel/block/blk-wbt.h b/kernel/block/blk-wbt.h
index df6de50c5..a232c98fb 100644
--- a/kernel/block/blk-wbt.h
+++ b/kernel/block/blk-wbt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef WB_THROTTLE_H
 #define WB_THROTTLE_H
 
diff --git a/kernel/block/blk.h b/kernel/block/blk.h
index fcb9775b9..85be8b232 100644
--- a/kernel/block/blk.h
+++ b/kernel/block/blk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BLK_INTERNAL_H
 #define BLK_INTERNAL_H
 
diff --git a/kernel/block/bounce.c b/kernel/block/bounce.c
index 5793c2dc1..fceb1a964 100644
--- a/kernel/block/bounce.c
+++ b/kernel/block/bounce.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* bounce buffer handling for block devices
  *
  * - Split from highmem.c
diff --git a/kernel/block/cmdline-parser.c b/kernel/block/cmdline-parser.c
index 9dbc67e42..f2a145718 100644
--- a/kernel/block/cmdline-parser.c
+++ b/kernel/block/cmdline-parser.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Parse command line, get partition information
  *
diff --git a/kernel/block/compat_ioctl.c b/kernel/block/compat_ioctl.c
index abaf9d78a..6ca015f92 100644
--- a/kernel/block/compat_ioctl.c
+++ b/kernel/block/compat_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/blktrace_api.h>
diff --git a/kernel/block/partition-generic.c b/kernel/block/partition-generic.c
index 88c555db4..91622db9a 100644
--- a/kernel/block/partition-generic.c
+++ b/kernel/block/partition-generic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Code extracted from drivers/block/genhd.c
  *  Copyright (C) 1991-1998  Linus Torvalds
diff --git a/kernel/block/partitions/Kconfig b/kernel/block/partitions/Kconfig
index 9b29a996c..37b9710cc 100644
--- a/kernel/block/partitions/Kconfig
+++ b/kernel/block/partitions/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Partition configuration
 #
diff --git a/kernel/block/partitions/Makefile b/kernel/block/partitions/Makefile
index 37a952705..2f276b677 100644
--- a/kernel/block/partitions/Makefile
+++ b/kernel/block/partitions/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/block/partitions/acorn.h b/kernel/block/partitions/acorn.h
index ede828529..67b06601c 100644
--- a/kernel/block/partitions/acorn.h
+++ b/kernel/block/partitions/acorn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/partitions/acorn.h
  *
diff --git a/kernel/block/partitions/aix.c b/kernel/block/partitions/aix.c
index f3ed7b2d8..007f95eea 100644
--- a/kernel/block/partitions/aix.c
+++ b/kernel/block/partitions/aix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/aix.c
  *
diff --git a/kernel/block/partitions/amiga.c b/kernel/block/partitions/amiga.c
index 2b13533d6..560936617 100644
--- a/kernel/block/partitions/amiga.c
+++ b/kernel/block/partitions/amiga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/amiga.c
  *
diff --git a/kernel/block/partitions/atari.c b/kernel/block/partitions/atari.c
index ff1fb9371..2305840c8 100644
--- a/kernel/block/partitions/atari.c
+++ b/kernel/block/partitions/atari.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/atari.c
  *
diff --git a/kernel/block/partitions/atari.h b/kernel/block/partitions/atari.h
index f2ec43bfe..01c2b9457 100644
--- a/kernel/block/partitions/atari.h
+++ b/kernel/block/partitions/atari.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/atari.h
  *  Moved by Russell King from:
diff --git a/kernel/block/partitions/check.c b/kernel/block/partitions/check.c
index 16118d11d..720145c49 100644
--- a/kernel/block/partitions/check.c
+++ b/kernel/block/partitions/check.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/check.c
  *
diff --git a/kernel/block/partitions/check.h b/kernel/block/partitions/check.h
index eade17ea9..6042f7694 100644
--- a/kernel/block/partitions/check.h
+++ b/kernel/block/partitions/check.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/pagemap.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
diff --git a/kernel/block/partitions/cmdline.c b/kernel/block/partitions/cmdline.c
index 5141b563a..e333583ab 100644
--- a/kernel/block/partitions/cmdline.c
+++ b/kernel/block/partitions/cmdline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013 HUAWEI
  * Author: Cai Zhiyong <caizhiyong@huawei.com>
diff --git a/kernel/block/partitions/cmdline.h b/kernel/block/partitions/cmdline.h
index 26e0f8da1..e64a31636 100644
--- a/kernel/block/partitions/cmdline.h
+++ b/kernel/block/partitions/cmdline.h
@@ -1,2 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 int cmdline_partition(struct parsed_partitions *state);
diff --git a/kernel/block/partitions/ibm.c b/kernel/block/partitions/ibm.c
index 14b081af8..a5d480f80 100644
--- a/kernel/block/partitions/ibm.c
+++ b/kernel/block/partitions/ibm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *                  Volker Sameske <sameske@de.ibm.com>
diff --git a/kernel/block/partitions/karma.c b/kernel/block/partitions/karma.c
index 9721fa589..59812d705 100644
--- a/kernel/block/partitions/karma.c
+++ b/kernel/block/partitions/karma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/karma.c
  *  Rio Karma partition info.
diff --git a/kernel/block/partitions/mac.c b/kernel/block/partitions/mac.c
index 621317ac4..b60953356 100644
--- a/kernel/block/partitions/mac.c
+++ b/kernel/block/partitions/mac.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/mac.c
  *
diff --git a/kernel/block/partitions/mac.h b/kernel/block/partitions/mac.h
index 3c7d98436..453ed2964 100644
--- a/kernel/block/partitions/mac.h
+++ b/kernel/block/partitions/mac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/mac.h
  */
diff --git a/kernel/block/partitions/msdos.c b/kernel/block/partitions/msdos.c
index 5610cd537..0af3a3db6 100644
--- a/kernel/block/partitions/msdos.c
+++ b/kernel/block/partitions/msdos.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/msdos.c
  *
diff --git a/kernel/block/partitions/osf.c b/kernel/block/partitions/osf.c
index 764b86a01..4b873973d 100644
--- a/kernel/block/partitions/osf.c
+++ b/kernel/block/partitions/osf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/osf.c
  *
diff --git a/kernel/block/partitions/sgi.c b/kernel/block/partitions/sgi.c
index ea8a86dce..d7b421c6e 100644
--- a/kernel/block/partitions/sgi.c
+++ b/kernel/block/partitions/sgi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/sgi.c
  *
diff --git a/kernel/block/partitions/sun.c b/kernel/block/partitions/sun.c
index b5b6fcfb3..90f36724e 100644
--- a/kernel/block/partitions/sun.c
+++ b/kernel/block/partitions/sun.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/sun.c
  *
diff --git a/kernel/block/partitions/sysv68.c b/kernel/block/partitions/sysv68.c
index 9627ccffc..92e810826 100644
--- a/kernel/block/partitions/sysv68.c
+++ b/kernel/block/partitions/sysv68.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/sysv68.c
  *
diff --git a/kernel/block/partitions/ultrix.c b/kernel/block/partitions/ultrix.c
index 8dbaf9f77..ecd0d7346 100644
--- a/kernel/block/partitions/ultrix.c
+++ b/kernel/block/partitions/ultrix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/partitions/ultrix.c
  *
diff --git a/kernel/certs/Kconfig b/kernel/certs/Kconfig
index 6ce51ede9..5f7663df6 100644
--- a/kernel/certs/Kconfig
+++ b/kernel/certs/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Certificates for signature checking"
 
 config MODULE_SIG_KEY
diff --git a/kernel/certs/Makefile b/kernel/certs/Makefile
index 847361ce1..5d0999b9e 100644
--- a/kernel/certs/Makefile
+++ b/kernel/certs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel signature checking certificates.
 #
diff --git a/kernel/certs/blacklist_hashes.c b/kernel/certs/blacklist_hashes.c
index 5bd449f7d..344892337 100644
--- a/kernel/certs/blacklist_hashes.c
+++ b/kernel/certs/blacklist_hashes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "blacklist.h"
 
 const char __initdata *const blacklist_hashes[] = {
diff --git a/kernel/certs/blacklist_nohashes.c b/kernel/certs/blacklist_nohashes.c
index 851de1070..73fd99098 100644
--- a/kernel/certs/blacklist_nohashes.c
+++ b/kernel/certs/blacklist_nohashes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "blacklist.h"
 
 const char __initdata *const blacklist_hashes[] = {
diff --git a/kernel/certs/system_certificates.S b/kernel/certs/system_certificates.S
index c9ceb71a4..3918ff723 100644
--- a/kernel/certs/system_certificates.S
+++ b/kernel/certs/system_certificates.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/export.h>
 #include <linux/init.h>
 
diff --git a/kernel/crypto/Kconfig b/kernel/crypto/Kconfig
index 0a121f9dd..ac5fb37e6 100644
--- a/kernel/crypto/Kconfig
+++ b/kernel/crypto/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Generic algorithms support
 #
diff --git a/kernel/crypto/Makefile b/kernel/crypto/Makefile
index d41f0331b..da190be60 100644
--- a/kernel/crypto/Makefile
+++ b/kernel/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Cryptographic API
 #
diff --git a/kernel/crypto/asymmetric_keys/Kconfig b/kernel/crypto/asymmetric_keys/Kconfig
index 331f6baf2..f3702e533 100644
--- a/kernel/crypto/asymmetric_keys/Kconfig
+++ b/kernel/crypto/asymmetric_keys/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ASYMMETRIC_KEY_TYPE
 	bool "Asymmetric (public-key cryptographic) key type"
 	depends on KEYS
diff --git a/kernel/crypto/asymmetric_keys/Makefile b/kernel/crypto/asymmetric_keys/Makefile
index 6516855be..4719aad5d 100644
--- a/kernel/crypto/asymmetric_keys/Makefile
+++ b/kernel/crypto/asymmetric_keys/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for asymmetric cryptographic keys
 #
diff --git a/kernel/crypto/async_tx/Kconfig b/kernel/crypto/async_tx/Kconfig
index f38a58aef..89bafa2ef 100644
--- a/kernel/crypto/async_tx/Kconfig
+++ b/kernel/crypto/async_tx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ASYNC_CORE
 	tristate
 
diff --git a/kernel/crypto/async_tx/Makefile b/kernel/crypto/async_tx/Makefile
index 462e4abbf..056e48245 100644
--- a/kernel/crypto/async_tx/Makefile
+++ b/kernel/crypto/async_tx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ASYNC_CORE) += async_tx.o
 obj-$(CONFIG_ASYNC_MEMCPY) += async_memcpy.o
 obj-$(CONFIG_ASYNC_XOR) += async_xor.o
diff --git a/kernel/crypto/ecc_curve_defs.h b/kernel/crypto/ecc_curve_defs.h
index 03ae5f714..b80f45da8 100644
--- a/kernel/crypto/ecc_curve_defs.h
+++ b/kernel/crypto/ecc_curve_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYTO_ECC_CURVE_DEFS_H
 #define _CRYTO_ECC_CURVE_DEFS_H
 
diff --git a/kernel/crypto/ripemd.h b/kernel/crypto/ripemd.h
index c57a2d4ce..93edbf521 100644
--- a/kernel/crypto/ripemd.h
+++ b/kernel/crypto/ripemd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for RIPEMD algorithms
  */
diff --git a/kernel/drivers/Kconfig b/kernel/drivers/Kconfig
index 505c676fa..1d7af3c2f 100644
--- a/kernel/drivers/Kconfig
+++ b/kernel/drivers/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Device Drivers"
 
 source "drivers/amba/Kconfig"
diff --git a/kernel/drivers/Makefile b/kernel/drivers/Makefile
index d90fdc413..d242d3514 100644
--- a/kernel/drivers/Makefile
+++ b/kernel/drivers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux kernel device drivers.
 #
diff --git a/kernel/drivers/accessibility/Kconfig b/kernel/drivers/accessibility/Kconfig
index ef3b65bfd..00f7512c9 100644
--- a/kernel/drivers/accessibility/Kconfig
+++ b/kernel/drivers/accessibility/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig ACCESSIBILITY
 	bool "Accessibility support"
 	---help---
diff --git a/kernel/drivers/acpi/Kconfig b/kernel/drivers/acpi/Kconfig
index 1ce52f84d..5b1938f4b 100644
--- a/kernel/drivers/acpi/Kconfig
+++ b/kernel/drivers/acpi/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # ACPI Configuration
 #
diff --git a/kernel/drivers/acpi/Makefile b/kernel/drivers/acpi/Makefile
index 90265ab44..cd1abc9bc 100644
--- a/kernel/drivers/acpi/Makefile
+++ b/kernel/drivers/acpi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux ACPI interpreter
 #
diff --git a/kernel/drivers/acpi/acpica/Makefile b/kernel/drivers/acpi/acpica/Makefile
index 1709551bc..e05232da0 100644
--- a/kernel/drivers/acpi/acpica/Makefile
+++ b/kernel/drivers/acpi/acpica/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ACPICA Core interpreter
 #
diff --git a/kernel/drivers/acpi/apei/Kconfig b/kernel/drivers/acpi/apei/Kconfig
index de14d49a5..52ae5438e 100644
--- a/kernel/drivers/acpi/apei/Kconfig
+++ b/kernel/drivers/acpi/apei/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config HAVE_ACPI_APEI
 	bool
 
diff --git a/kernel/drivers/acpi/apei/Makefile b/kernel/drivers/acpi/apei/Makefile
index e50573de2..4dfac2128 100644
--- a/kernel/drivers/acpi/apei/Makefile
+++ b/kernel/drivers/acpi/apei/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ACPI_APEI)		+= apei.o
 obj-$(CONFIG_ACPI_APEI_GHES)	+= ghes.o
 obj-$(CONFIG_ACPI_APEI_EINJ)	+= einj.o
diff --git a/kernel/drivers/acpi/apei/apei-internal.h b/kernel/drivers/acpi/apei/apei-internal.h
index cb4126051..1d6ef9654 100644
--- a/kernel/drivers/acpi/apei/apei-internal.h
+++ b/kernel/drivers/acpi/apei/apei-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * apei-internal.h - ACPI Platform Error Interface internal
  * definitions.
diff --git a/kernel/drivers/acpi/battery.h b/kernel/drivers/acpi/battery.h
index 6c0849769..225f493d4 100644
--- a/kernel/drivers/acpi/battery.h
+++ b/kernel/drivers/acpi/battery.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACPI_BATTERY_H
 #define __ACPI_BATTERY_H
 
diff --git a/kernel/drivers/acpi/dptf/Kconfig b/kernel/drivers/acpi/dptf/Kconfig
index ac0a6ed0c..90a2fd979 100644
--- a/kernel/drivers/acpi/dptf/Kconfig
+++ b/kernel/drivers/acpi/dptf/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config DPTF_POWER
 	tristate "DPTF Platform Power Participant"
 	depends on X86
diff --git a/kernel/drivers/acpi/event.c b/kernel/drivers/acpi/event.c
index 7fceb3b46..5a127f3f2 100644
--- a/kernel/drivers/acpi/event.c
+++ b/kernel/drivers/acpi/event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * event.c - exporting ACPI events via procfs
  *
diff --git a/kernel/drivers/acpi/nfit/Kconfig b/kernel/drivers/acpi/nfit/Kconfig
index 929ba4da0..f7c57e334 100644
--- a/kernel/drivers/acpi/nfit/Kconfig
+++ b/kernel/drivers/acpi/nfit/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ACPI_NFIT
 	tristate "ACPI NVDIMM Firmware Interface Table (NFIT)"
 	depends on PHYS_ADDR_T_64BIT
diff --git a/kernel/drivers/acpi/pmic/intel_pmic.h b/kernel/drivers/acpi/pmic/intel_pmic.h
index e8bfa7b86..095afc969 100644
--- a/kernel/drivers/acpi/pmic/intel_pmic.h
+++ b/kernel/drivers/acpi/pmic/intel_pmic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INTEL_PMIC_H
 #define __INTEL_PMIC_H
 
diff --git a/kernel/drivers/acpi/proc.c b/kernel/drivers/acpi/proc.c
index 85ac848ac..652f19e6c 100644
--- a/kernel/drivers/acpi/proc.c
+++ b/kernel/drivers/acpi/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/export.h>
diff --git a/kernel/drivers/acpi/processor_idle.c b/kernel/drivers/acpi/processor_idle.c
index 2736e25e9..d50a7b6cc 100644
--- a/kernel/drivers/acpi/processor_idle.c
+++ b/kernel/drivers/acpi/processor_idle.c
@@ -710,6 +710,8 @@ static DEFINE_RAW_SPINLOCK(c3_lock);
 static void acpi_idle_enter_bm(struct acpi_processor *pr,
 			       struct acpi_processor_cx *cx, bool timer_bc)
 {
+	acpi_unlazy_tlb(smp_processor_id());
+
 	/*
 	 * Must be done before busmaster disable as we might need to
 	 * access HPET !
diff --git a/kernel/drivers/acpi/processor_pdc.c b/kernel/drivers/acpi/processor_pdc.c
index 74f738cb6..813f1b78c 100644
--- a/kernel/drivers/acpi/processor_pdc.c
+++ b/kernel/drivers/acpi/processor_pdc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005 Intel Corporation
  * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
diff --git a/kernel/drivers/acpi/reboot.c b/kernel/drivers/acpi/reboot.c
index a6c77e8b3..71769fd68 100644
--- a/kernel/drivers/acpi/reboot.c
+++ b/kernel/drivers/acpi/reboot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/pci.h>
 #include <linux/acpi.h>
diff --git a/kernel/drivers/acpi/sbshc.h b/kernel/drivers/acpi/sbshc.h
index a57b0762d..06372a37d 100644
--- a/kernel/drivers/acpi/sbshc.h
+++ b/kernel/drivers/acpi/sbshc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 struct acpi_smb_hc;
 enum acpi_smb_protocol {
 	SMBUS_WRITE_QUICK = 2,
diff --git a/kernel/drivers/acpi/sleep.h b/kernel/drivers/acpi/sleep.h
index a82ff74fa..41675d24a 100644
--- a/kernel/drivers/acpi/sleep.h
+++ b/kernel/drivers/acpi/sleep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 extern void acpi_enable_wakeup_devices(u8 sleep_state);
 extern void acpi_disable_wakeup_devices(u8 sleep_state);
diff --git a/kernel/drivers/acpi/sysfs.c b/kernel/drivers/acpi/sysfs.c
index 78a5a2301..0fd57bf33 100644
--- a/kernel/drivers/acpi/sysfs.c
+++ b/kernel/drivers/acpi/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sysfs.c - ACPI sysfs interface to userspace.
  */
diff --git a/kernel/drivers/acpi/wakeup.c b/kernel/drivers/acpi/wakeup.c
index 1638401ab..9614126bf 100644
--- a/kernel/drivers/acpi/wakeup.c
+++ b/kernel/drivers/acpi/wakeup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * wakeup.c - support wakeup devices
  * Copyright (C) 2004 Li Shaohua <shaohua.li@intel.com>
diff --git a/kernel/drivers/amba/Kconfig b/kernel/drivers/amba/Kconfig
index 294ba6f36..fb6c7e0b4 100644
--- a/kernel/drivers/amba/Kconfig
+++ b/kernel/drivers/amba/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ARM_AMBA
 	bool
 
diff --git a/kernel/drivers/android/Kconfig b/kernel/drivers/android/Kconfig
index 9801d852b..7dce3795b 100644
--- a/kernel/drivers/android/Kconfig
+++ b/kernel/drivers/android/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Android"
 
 config ANDROID
diff --git a/kernel/drivers/ata/Kconfig b/kernel/drivers/ata/Kconfig
index 488c93724..cb5339166 100644
--- a/kernel/drivers/ata/Kconfig
+++ b/kernel/drivers/ata/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # SATA/PATA driver configuration
 #
diff --git a/kernel/drivers/ata/Makefile b/kernel/drivers/ata/Makefile
index ff9cd2e37..8daec3e65 100644
--- a/kernel/drivers/ata/Makefile
+++ b/kernel/drivers/ata/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_ATA)		+= libata.o
 
diff --git a/kernel/drivers/ata/libata-transport.h b/kernel/drivers/ata/libata-transport.h
index 2820cf864..08a57fb9d 100644
--- a/kernel/drivers/ata/libata-transport.h
+++ b/kernel/drivers/ata/libata-transport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBATA_TRANSPORT_H
 #define _LIBATA_TRANSPORT_H
 
diff --git a/kernel/drivers/ata/libata-zpodd.c b/kernel/drivers/ata/libata-zpodd.c
index 23a62e401..de4ddd0e8 100644
--- a/kernel/drivers/ata/libata-zpodd.c
+++ b/kernel/drivers/ata/libata-zpodd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/libata.h>
 #include <linux/cdrom.h>
 #include <linux/pm_runtime.h>
diff --git a/kernel/drivers/ata/sata_gemini.h b/kernel/drivers/ata/sata_gemini.h
index ca1837a39..6f6e691d6 100644
--- a/kernel/drivers/ata/sata_gemini.h
+++ b/kernel/drivers/ata/sata_gemini.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Header for the Gemini SATA bridge */
 #ifndef SATA_GEMINI_H
 #define SATA_GEMINI_H
diff --git a/kernel/drivers/ata/sis.h b/kernel/drivers/ata/sis.h
index f7f3eebe6..0be49691f 100644
--- a/kernel/drivers/ata/sis.h
+++ b/kernel/drivers/ata/sis.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 struct ata_port_info;
 
diff --git a/kernel/drivers/atm/Kconfig b/kernel/drivers/atm/Kconfig
index 31c60101a..2e2efa577 100644
--- a/kernel/drivers/atm/Kconfig
+++ b/kernel/drivers/atm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # ATM device configuration
 #
diff --git a/kernel/drivers/atm/Makefile b/kernel/drivers/atm/Makefile
index c6c9ee9f5..aa191616a 100644
--- a/kernel/drivers/atm/Makefile
+++ b/kernel/drivers/atm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux network (ATM) device drivers.
 #
diff --git a/kernel/drivers/atm/eni.h b/kernel/drivers/atm/eni.h
index 565e53a5c..de1ed802c 100644
--- a/kernel/drivers/atm/eni.h
+++ b/kernel/drivers/atm/eni.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/eni.h - Efficient Networks ENI155P device driver declarations */
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/drivers/atm/fore200e.h b/kernel/drivers/atm/fore200e.h
index ba34a02b7..c8a02c8fb 100644
--- a/kernel/drivers/atm/fore200e.h
+++ b/kernel/drivers/atm/fore200e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FORE200E_H
 #define _FORE200E_H
 
diff --git a/kernel/drivers/atm/idt77105.h b/kernel/drivers/atm/idt77105.h
index 3fd2bc899..8dfea9e36 100644
--- a/kernel/drivers/atm/idt77105.h
+++ b/kernel/drivers/atm/idt77105.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/idt77105.h - IDT77105 (PHY) declarations */
  
 /* Written 1999 by Greg Banks, NEC Australia <gnb@linuxfan.com>. Based on suni.h */
diff --git a/kernel/drivers/atm/idt77252_tables.h b/kernel/drivers/atm/idt77252_tables.h
index b6c8ee512..12b81e046 100644
--- a/kernel/drivers/atm/idt77252_tables.h
+++ b/kernel/drivers/atm/idt77252_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Do not edit, automatically generated by `./genrtbl'.
  *
  * Cell Line Rate: 353207.55 (155520000 bps)
diff --git a/kernel/drivers/atm/midway.h b/kernel/drivers/atm/midway.h
index d8bec0f2a..d47307adc 100644
--- a/kernel/drivers/atm/midway.h
+++ b/kernel/drivers/atm/midway.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/midway.h - Efficient Networks Midway (SAR) description */
  
 /* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/drivers/atm/nicstar.h b/kernel/drivers/atm/nicstar.h
index 9bc27ea50..1b7f1dfc1 100644
--- a/kernel/drivers/atm/nicstar.h
+++ b/kernel/drivers/atm/nicstar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * nicstar.h
  *
diff --git a/kernel/drivers/atm/nicstarmac.c b/kernel/drivers/atm/nicstarmac.c
index f594526f8..e0dda9062 100644
--- a/kernel/drivers/atm/nicstarmac.c
+++ b/kernel/drivers/atm/nicstarmac.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * this file included by nicstar.c
  */
diff --git a/kernel/drivers/atm/solos-attrlist.c b/kernel/drivers/atm/solos-attrlist.c
index 9a676ee30..1830d1b86 100644
--- a/kernel/drivers/atm/solos-attrlist.c
+++ b/kernel/drivers/atm/solos-attrlist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 SOLOS_ATTR_RO(DriverVersion)
 SOLOS_ATTR_RO(APIVersion)
 SOLOS_ATTR_RO(FirmwareVersion)
diff --git a/kernel/drivers/atm/suni.h b/kernel/drivers/atm/suni.h
index 7e3e656b3..d28a50d47 100644
--- a/kernel/drivers/atm/suni.h
+++ b/kernel/drivers/atm/suni.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * drivers/atm/suni.h - S/UNI PHY driver
  */
diff --git a/kernel/drivers/atm/tonga.h b/kernel/drivers/atm/tonga.h
index 672da9624..771b3f952 100644
--- a/kernel/drivers/atm/tonga.h
+++ b/kernel/drivers/atm/tonga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/tonga.h - Efficient Networks Tonga (PCI bridge) declarations */
  
 /* Written 1995 by Werner Almesberger, EPFL LRC */
diff --git a/kernel/drivers/atm/uPD98401.h b/kernel/drivers/atm/uPD98401.h
index 0ab36503a..f766a5ef0 100644
--- a/kernel/drivers/atm/uPD98401.h
+++ b/kernel/drivers/atm/uPD98401.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/uPD98401.h - NEC uPD98401 (SAR) declarations */
  
 /* Written 1995 by Werner Almesberger, EPFL LRC */
diff --git a/kernel/drivers/atm/uPD98402.h b/kernel/drivers/atm/uPD98402.h
index c947214db..437cfaa20 100644
--- a/kernel/drivers/atm/uPD98402.h
+++ b/kernel/drivers/atm/uPD98402.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/uPD98402.h - NEC uPD98402 (PHY) declarations */
  
 /* Written 1995 by Werner Almesberger, EPFL LRC */
diff --git a/kernel/drivers/atm/zatm.h b/kernel/drivers/atm/zatm.h
index ae9165ce1..8204369fe 100644
--- a/kernel/drivers/atm/zatm.h
+++ b/kernel/drivers/atm/zatm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/zatm.h - ZeitNet ZN122x device driver declarations */
 
 /* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/drivers/atm/zeprom.h b/kernel/drivers/atm/zeprom.h
index 019bb8249..88e01f808 100644
--- a/kernel/drivers/atm/zeprom.h
+++ b/kernel/drivers/atm/zeprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* drivers/atm/zeprom.h - ZeitNet ZN122x EEPROM (NM93C46) declarations */
 
 /* Written 1995,1996 by Werner Almesberger, EPFL LRC */
diff --git a/kernel/drivers/auxdisplay/Kconfig b/kernel/drivers/auxdisplay/Kconfig
index 9ae6681c9..d7d21118d 100644
--- a/kernel/drivers/auxdisplay/Kconfig
+++ b/kernel/drivers/auxdisplay/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # For a description of the syntax of this configuration file,
 # see Documentation/kbuild/kconfig-language.txt.
diff --git a/kernel/drivers/auxdisplay/Makefile b/kernel/drivers/auxdisplay/Makefile
index 2b8af3dc5..7ac6776ca 100644
--- a/kernel/drivers/auxdisplay/Makefile
+++ b/kernel/drivers/auxdisplay/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel auxiliary displays device drivers.
 #
diff --git a/kernel/drivers/auxdisplay/img-ascii-lcd.c b/kernel/drivers/auxdisplay/img-ascii-lcd.c
index 25306fa27..a9020f82e 100644
--- a/kernel/drivers/auxdisplay/img-ascii-lcd.c
+++ b/kernel/drivers/auxdisplay/img-ascii-lcd.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/drivers/base/Kconfig b/kernel/drivers/base/Kconfig
index 1a5f6a157..2f6614c9a 100644
--- a/kernel/drivers/base/Kconfig
+++ b/kernel/drivers/base/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menu "Generic Driver Options"
 
 config UEVENT_HELPER
diff --git a/kernel/drivers/base/Makefile b/kernel/drivers/base/Makefile
index 397e5c344..e32a52490 100644
--- a/kernel/drivers/base/Makefile
+++ b/kernel/drivers/base/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux device tree
 
 obj-y			:= component.o core.o bus.o dd.o syscore.o \
diff --git a/kernel/drivers/base/base.h b/kernel/drivers/base/base.h
index 539432a14..d800de650 100644
--- a/kernel/drivers/base/base.h
+++ b/kernel/drivers/base/base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/notifier.h>
 
 /**
diff --git a/kernel/drivers/base/cpu.c b/kernel/drivers/base/cpu.c
index 227bac5f1..321cd7b4d 100644
--- a/kernel/drivers/base/cpu.c
+++ b/kernel/drivers/base/cpu.c
@@ -377,8 +377,7 @@ int register_cpu(struct cpu *cpu, int num)
 
 	per_cpu(cpu_sys_devices, num) = &cpu->dev;
 	register_cpu_under_node(num, cpu_to_node(num));
-	dev_pm_qos_expose_latency_limit(&cpu->dev,
-					PM_QOS_RESUME_LATENCY_NO_CONSTRAINT);
+	dev_pm_qos_expose_latency_limit(&cpu->dev, 0);
 
 	return 0;
 }
diff --git a/kernel/drivers/base/devtmpfs.c b/kernel/drivers/base/devtmpfs.c
index d2fb9c8ed..50025d795 100644
--- a/kernel/drivers/base/devtmpfs.c
+++ b/kernel/drivers/base/devtmpfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * devtmpfs - kernel-maintained tmpfs-based /dev
  *
diff --git a/kernel/drivers/base/dma-coherent.c b/kernel/drivers/base/dma-coherent.c
index 744f64f43..1e6396bb8 100644
--- a/kernel/drivers/base/dma-coherent.c
+++ b/kernel/drivers/base/dma-coherent.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Coherent per-device memory handling.
  * Borrowed from i386
diff --git a/kernel/drivers/base/memory.c b/kernel/drivers/base/memory.c
index 4e3b61cda..1d60b58a8 100644
--- a/kernel/drivers/base/memory.c
+++ b/kernel/drivers/base/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Memory subsystem support
  *
diff --git a/kernel/drivers/base/node.c b/kernel/drivers/base/node.c
index aae2402f3..ee090ab91 100644
--- a/kernel/drivers/base/node.c
+++ b/kernel/drivers/base/node.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Basic Node interface support
  */
diff --git a/kernel/drivers/base/power/Makefile b/kernel/drivers/base/power/Makefile
index 5998c5328..29cd71d8b 100644
--- a/kernel/drivers/base/power/Makefile
+++ b/kernel/drivers/base/power/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PM)	+= sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o
 obj-$(CONFIG_PM_SLEEP)	+= main.o wakeup.o
 obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o
diff --git a/kernel/drivers/base/power/domain_governor.c b/kernel/drivers/base/power/domain_governor.c
index 51751cc8c..281f949c5 100644
--- a/kernel/drivers/base/power/domain_governor.c
+++ b/kernel/drivers/base/power/domain_governor.c
@@ -14,20 +14,23 @@
 static int dev_update_qos_constraint(struct device *dev, void *data)
 {
 	s64 *constraint_ns_p = data;
-	s64 constraint_ns = -1;
+	s32 constraint_ns = -1;
 
 	if (dev->power.subsys_data && dev->power.subsys_data->domain_data)
 		constraint_ns = dev_gpd_data(dev)->td.effective_constraint_ns;
 
-	if (constraint_ns < 0)
+	if (constraint_ns < 0) {
 		constraint_ns = dev_pm_qos_read_value(dev);
-
-	if (constraint_ns == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
+		constraint_ns *= NSEC_PER_USEC;
+	}
+	if (constraint_ns == 0)
 		return 0;
 
-	constraint_ns *= NSEC_PER_USEC;
-
-	if (constraint_ns < *constraint_ns_p || *constraint_ns_p < 0)
+	/*
+	 * constraint_ns cannot be negative here, because the device has been
+	 * suspended.
+	 */
+	if (constraint_ns < *constraint_ns_p || *constraint_ns_p == 0)
 		*constraint_ns_p = constraint_ns;
 
 	return 0;
@@ -60,14 +63,10 @@ static bool default_suspend_ok(struct device *dev)
 
 	spin_unlock_irqrestore(&dev->power.lock, flags);
 
-	if (constraint_ns == 0)
+	if (constraint_ns < 0)
 		return false;
 
-	if (constraint_ns == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
-		constraint_ns = -1;
-	else
-		constraint_ns *= NSEC_PER_USEC;
-
+	constraint_ns *= NSEC_PER_USEC;
 	/*
 	 * We can walk the children without any additional locking, because
 	 * they all have been suspended at this point and their
@@ -77,19 +76,14 @@ static bool default_suspend_ok(struct device *dev)
 		device_for_each_child(dev, &constraint_ns,
 				      dev_update_qos_constraint);
 
-	if (constraint_ns < 0) {
-		/* The children have no constraints. */
-		td->effective_constraint_ns = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
-		td->cached_suspend_ok = true;
-	} else {
-		constraint_ns -= td->suspend_latency_ns + td->resume_latency_ns;
-		if (constraint_ns > 0) {
-			td->effective_constraint_ns = constraint_ns;
-			td->cached_suspend_ok = true;
-		} else {
-			td->effective_constraint_ns = 0;
-		}
+	if (constraint_ns > 0) {
+		constraint_ns -= td->suspend_latency_ns +
+				td->resume_latency_ns;
+		if (constraint_ns == 0)
+			return false;
 	}
+	td->effective_constraint_ns = constraint_ns;
+	td->cached_suspend_ok = constraint_ns >= 0;
 
 	/*
 	 * The children have been suspended already, so we don't need to take
@@ -151,14 +145,13 @@ static bool __default_power_down_ok(struct dev_pm_domain *pd,
 		td = &to_gpd_data(pdd)->td;
 		constraint_ns = td->effective_constraint_ns;
 		/* default_suspend_ok() need not be called before us. */
-		if (constraint_ns < 0)
+		if (constraint_ns < 0) {
 			constraint_ns = dev_pm_qos_read_value(pdd->dev);
-
-		if (constraint_ns == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
+			constraint_ns *= NSEC_PER_USEC;
+		}
+		if (constraint_ns == 0)
 			continue;
 
-		constraint_ns *= NSEC_PER_USEC;
-
 		/*
 		 * constraint_ns cannot be negative here, because the device has
 		 * been suspended.
diff --git a/kernel/drivers/base/power/power.h b/kernel/drivers/base/power/power.h
index a46e97e51..7beee7539 100644
--- a/kernel/drivers/base/power/power.h
+++ b/kernel/drivers/base/power/power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/pm_qos.h>
 
 static inline void device_pm_init_common(struct device *dev)
diff --git a/kernel/drivers/base/power/qos.c b/kernel/drivers/base/power/qos.c
index 7d29286d9..277d43a83 100644
--- a/kernel/drivers/base/power/qos.c
+++ b/kernel/drivers/base/power/qos.c
@@ -189,7 +189,7 @@ static int dev_pm_qos_constraints_allocate(struct device *dev)
 	plist_head_init(&c->list);
 	c->target_value = PM_QOS_RESUME_LATENCY_DEFAULT_VALUE;
 	c->default_value = PM_QOS_RESUME_LATENCY_DEFAULT_VALUE;
-	c->no_constraint_value = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
+	c->no_constraint_value = PM_QOS_RESUME_LATENCY_DEFAULT_VALUE;
 	c->type = PM_QOS_MIN;
 	c->notifiers = n;
 
diff --git a/kernel/drivers/base/power/runtime.c b/kernel/drivers/base/power/runtime.c
index 13e015905..7bcf80fa9 100644
--- a/kernel/drivers/base/power/runtime.c
+++ b/kernel/drivers/base/power/runtime.c
@@ -253,7 +253,7 @@ static int rpm_check_suspend_allowed(struct device *dev)
 	    || (dev->power.request_pending
 			&& dev->power.request == RPM_REQ_RESUME))
 		retval = -EAGAIN;
-	else if (__dev_pm_qos_read_value(dev) == 0)
+	else if (__dev_pm_qos_read_value(dev) < 0)
 		retval = -EPERM;
 	else if (dev->power.runtime_status == RPM_SUSPENDED)
 		retval = 1;
diff --git a/kernel/drivers/base/power/sysfs.c b/kernel/drivers/base/power/sysfs.c
index 632077f05..156ab57bc 100644
--- a/kernel/drivers/base/power/sysfs.c
+++ b/kernel/drivers/base/power/sysfs.c
@@ -218,14 +218,7 @@ static ssize_t pm_qos_resume_latency_show(struct device *dev,
 					  struct device_attribute *attr,
 					  char *buf)
 {
-	s32 value = dev_pm_qos_requested_resume_latency(dev);
-
-	if (value == 0)
-		return sprintf(buf, "n/a\n");
-	else if (value == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
-		value = 0;
-
-	return sprintf(buf, "%d\n", value);
+	return sprintf(buf, "%d\n", dev_pm_qos_requested_resume_latency(dev));
 }
 
 static ssize_t pm_qos_resume_latency_store(struct device *dev,
@@ -235,21 +228,11 @@ static ssize_t pm_qos_resume_latency_store(struct device *dev,
 	s32 value;
 	int ret;
 
-	if (!kstrtos32(buf, 0, &value)) {
-		/*
-		 * Prevent users from writing negative or "no constraint" values
-		 * directly.
-		 */
-		if (value < 0 || value == PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
-			return -EINVAL;
-
-		if (value == 0)
-			value = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
-	} else if (!strcmp(buf, "n/a") || !strcmp(buf, "n/a\n")) {
-		value = 0;
-	} else {
+	if (kstrtos32(buf, 0, &value))
+		return -EINVAL;
+
+	if (value < 0)
 		return -EINVAL;
-	}
 
 	ret = dev_pm_qos_update_request(dev->power.qos->resume_latency_req,
 					value);
diff --git a/kernel/drivers/base/regmap/Kconfig b/kernel/drivers/base/regmap/Kconfig
index 073c0b77e..0368fd7b3 100644
--- a/kernel/drivers/base/regmap/Kconfig
+++ b/kernel/drivers/base/regmap/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Generic register map support.  There are no user servicable options here,
 # this is an API intended to be used by other kernel subsystems.  These
 # subsystems should select the appropriate symbols.
diff --git a/kernel/drivers/base/regmap/Makefile b/kernel/drivers/base/regmap/Makefile
index 0cf4abc8f..0d298c446 100644
--- a/kernel/drivers/base/regmap/Makefile
+++ b/kernel/drivers/base/regmap/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # For include/trace/define_trace.h to include trace.h
 CFLAGS_regmap.o := -I$(src)
 
diff --git a/kernel/drivers/base/regmap/trace.h b/kernel/drivers/base/regmap/trace.h
index 64586a1c5..d4066fa07 100644
--- a/kernel/drivers/base/regmap/trace.h
+++ b/kernel/drivers/base/regmap/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regmap
 
diff --git a/kernel/drivers/base/test/Kconfig b/kernel/drivers/base/test/Kconfig
index 9aa0d45a6..86e85daa8 100644
--- a/kernel/drivers/base/test/Kconfig
+++ b/kernel/drivers/base/test/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config TEST_ASYNC_DRIVER_PROBE
 	tristate "Build kernel module to test asynchronous driver probing"
 	depends on m
diff --git a/kernel/drivers/bcma/Kconfig b/kernel/drivers/bcma/Kconfig
index 54f81c554..a2df1ad03 100644
--- a/kernel/drivers/bcma/Kconfig
+++ b/kernel/drivers/bcma/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config BCMA_POSSIBLE
 	bool
 	depends on HAS_IOMEM && HAS_DMA
diff --git a/kernel/drivers/bcma/Makefile b/kernel/drivers/bcma/Makefile
index 087948a1d..f8c37de35 100644
--- a/kernel/drivers/bcma/Makefile
+++ b/kernel/drivers/bcma/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 bcma-y					+= main.o scan.o core.o sprom.o
 bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
 bcma-y					+= driver_chipcommon_b.o
diff --git a/kernel/drivers/bcma/bcma_private.h b/kernel/drivers/bcma/bcma_private.h
index 168fa175d..a4aac370f 100644
--- a/kernel/drivers/bcma/bcma_private.h
+++ b/kernel/drivers/bcma/bcma_private.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_PRIVATE_H_
 #define LINUX_BCMA_PRIVATE_H_
 
diff --git a/kernel/drivers/bcma/scan.h b/kernel/drivers/bcma/scan.h
index 30eb475e4..e53079a3d 100644
--- a/kernel/drivers/bcma/scan.h
+++ b/kernel/drivers/bcma/scan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCMA_SCAN_H_
 #define BCMA_SCAN_H_
 
diff --git a/kernel/drivers/block/Kconfig b/kernel/drivers/block/Kconfig
index 2dfe99b32..7b2df7a54 100644
--- a/kernel/drivers/block/Kconfig
+++ b/kernel/drivers/block/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Block device driver configuration
 #
diff --git a/kernel/drivers/block/Makefile b/kernel/drivers/block/Makefile
index 1f456d86a..dc061158b 100644
--- a/kernel/drivers/block/Makefile
+++ b/kernel/drivers/block/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel block device drivers.
 #
diff --git a/kernel/drivers/block/drbd/Kconfig b/kernel/drivers/block/drbd/Kconfig
index 7845bd6ee..87aab6910 100644
--- a/kernel/drivers/block/drbd/Kconfig
+++ b/kernel/drivers/block/drbd/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # DRBD device driver configuration
 #
diff --git a/kernel/drivers/block/drbd/Makefile b/kernel/drivers/block/drbd/Makefile
index 4464e353c..8bd534697 100644
--- a/kernel/drivers/block/drbd/Makefile
+++ b/kernel/drivers/block/drbd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 drbd-y := drbd_bitmap.o drbd_proc.o
 drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o
 drbd-y += drbd_main.o drbd_strings.o drbd_nl.o
diff --git a/kernel/drivers/block/drbd/drbd_debugfs.c b/kernel/drivers/block/drbd/drbd_debugfs.c
index 494837e59..ab21976a8 100644
--- a/kernel/drivers/block/drbd/drbd_debugfs.c
+++ b/kernel/drivers/block/drbd/drbd_debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) "drbd debugfs: " fmt
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/kernel/drivers/block/drbd/drbd_debugfs.h b/kernel/drivers/block/drbd/drbd_debugfs.h
index 8bee21340..4ecfbb335 100644
--- a/kernel/drivers/block/drbd/drbd_debugfs.h
+++ b/kernel/drivers/block/drbd/drbd_debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/debugfs.h>
diff --git a/kernel/drivers/block/drbd/drbd_interval.c b/kernel/drivers/block/drbd/drbd_interval.c
index 51b25ad85..c58986556 100644
--- a/kernel/drivers/block/drbd/drbd_interval.c
+++ b/kernel/drivers/block/drbd/drbd_interval.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/bug.h>
 #include <linux/rbtree_augmented.h>
 #include "drbd_interval.h"
diff --git a/kernel/drivers/block/drbd/drbd_interval.h b/kernel/drivers/block/drbd/drbd_interval.h
index 23c5a9442..b8c2dee5e 100644
--- a/kernel/drivers/block/drbd/drbd_interval.h
+++ b/kernel/drivers/block/drbd/drbd_interval.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRBD_INTERVAL_H
 #define __DRBD_INTERVAL_H
 
diff --git a/kernel/drivers/block/drbd/drbd_nla.c b/kernel/drivers/block/drbd/drbd_nla.c
index 6bf806df6..8e261cb51 100644
--- a/kernel/drivers/block/drbd/drbd_nla.c
+++ b/kernel/drivers/block/drbd/drbd_nla.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <net/netlink.h>
 #include <linux/drbd_genl_api.h>
diff --git a/kernel/drivers/block/drbd/drbd_nla.h b/kernel/drivers/block/drbd/drbd_nla.h
index 679c2d5b4..f5eaffb64 100644
--- a/kernel/drivers/block/drbd/drbd_nla.h
+++ b/kernel/drivers/block/drbd/drbd_nla.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRBD_NLA_H
 #define __DRBD_NLA_H
 
diff --git a/kernel/drivers/block/drbd/drbd_protocol.h b/kernel/drivers/block/drbd/drbd_protocol.h
index 4d296800f..c3081f930 100644
--- a/kernel/drivers/block/drbd/drbd_protocol.h
+++ b/kernel/drivers/block/drbd/drbd_protocol.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRBD_PROTOCOL_H
 #define __DRBD_PROTOCOL_H
 
diff --git a/kernel/drivers/block/drbd/drbd_state.h b/kernel/drivers/block/drbd/drbd_state.h
index 0276c98fb..ea58301d0 100644
--- a/kernel/drivers/block/drbd/drbd_state.h
+++ b/kernel/drivers/block/drbd/drbd_state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DRBD_STATE_H
 #define DRBD_STATE_H
 
diff --git a/kernel/drivers/block/drbd/drbd_state_change.h b/kernel/drivers/block/drbd/drbd_state_change.h
index 9e503a1a0..ba80f612d 100644
--- a/kernel/drivers/block/drbd/drbd_state_change.h
+++ b/kernel/drivers/block/drbd/drbd_state_change.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DRBD_STATE_CHANGE_H
 #define DRBD_STATE_CHANGE_H
 
diff --git a/kernel/drivers/block/drbd/drbd_strings.h b/kernel/drivers/block/drbd/drbd_strings.h
index f9923cc88..87b94a273 100644
--- a/kernel/drivers/block/drbd/drbd_strings.h
+++ b/kernel/drivers/block/drbd/drbd_strings.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRBD_STRINGS_H
 #define __DRBD_STRINGS_H
 
diff --git a/kernel/drivers/block/mtip32xx/Kconfig b/kernel/drivers/block/mtip32xx/Kconfig
index 0ba837fc6..bf2213585 100644
--- a/kernel/drivers/block/mtip32xx/Kconfig
+++ b/kernel/drivers/block/mtip32xx/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # mtip32xx device driver configuration
 #
diff --git a/kernel/drivers/block/paride/Kconfig b/kernel/drivers/block/paride/Kconfig
index 3a1524794..b226835a9 100644
--- a/kernel/drivers/block/paride/Kconfig
+++ b/kernel/drivers/block/paride/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # PARIDE configuration
 #
diff --git a/kernel/drivers/block/paride/Makefile b/kernel/drivers/block/paride/Makefile
index a539e004b..cf1742a84 100644
--- a/kernel/drivers/block/paride/Makefile
+++ b/kernel/drivers/block/paride/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Parallel port IDE device drivers.
 #
diff --git a/kernel/drivers/block/paride/mkd b/kernel/drivers/block/paride/mkd
index 971f099b4..6d0d80247 100644
--- a/kernel/drivers/block/paride/mkd
+++ b/kernel/drivers/block/paride/mkd
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # mkd -- a script to create the device special files for the PARIDE subsystem
 #
diff --git a/kernel/drivers/block/virtio_blk.c b/kernel/drivers/block/virtio_blk.c
index 34e17ee79..68846897d 100644
--- a/kernel/drivers/block/virtio_blk.c
+++ b/kernel/drivers/block/virtio_blk.c
@@ -593,10 +593,22 @@ static int virtblk_map_queues(struct blk_mq_tag_set *set)
 	return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
 }
 
+#ifdef CONFIG_VIRTIO_BLK_SCSI
+static void virtblk_initialize_rq(struct request *req)
+{
+	struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
+
+	scsi_req_init(&vbr->sreq);
+}
+#endif
+
 static const struct blk_mq_ops virtio_mq_ops = {
 	.queue_rq	= virtio_queue_rq,
 	.complete	= virtblk_request_done,
 	.init_request	= virtblk_init_request,
+#ifdef CONFIG_VIRTIO_BLK_SCSI
+	.initialize_rq_fn = virtblk_initialize_rq,
+#endif
 	.map_queues	= virtblk_map_queues,
 };
 
diff --git a/kernel/drivers/block/zram/Kconfig b/kernel/drivers/block/zram/Kconfig
index 7cd4a8ec3..ac3a31d43 100644
--- a/kernel/drivers/block/zram/Kconfig
+++ b/kernel/drivers/block/zram/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config ZRAM
 	tristate "Compressed RAM block device support"
 	depends on BLOCK && SYSFS && ZSMALLOC && CRYPTO
diff --git a/kernel/drivers/bluetooth/Kconfig b/kernel/drivers/bluetooth/Kconfig
index fae5a74dc..98a60db8e 100644
--- a/kernel/drivers/bluetooth/Kconfig
+++ b/kernel/drivers/bluetooth/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 menu "Bluetooth device drivers"
 	depends on BT
diff --git a/kernel/drivers/bluetooth/Makefile b/kernel/drivers/bluetooth/Makefile
index e693ca6ee..4e4e44d09 100644
--- a/kernel/drivers/bluetooth/Makefile
+++ b/kernel/drivers/bluetooth/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Bluetooth HCI device drivers.
 #
diff --git a/kernel/drivers/bus/Kconfig b/kernel/drivers/bus/Kconfig
index ae3d8f344..3e66f4cc1 100644
--- a/kernel/drivers/bus/Kconfig
+++ b/kernel/drivers/bus/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Bus Devices
 #
diff --git a/kernel/drivers/bus/Makefile b/kernel/drivers/bus/Makefile
index cc6364bec..3ae96cffa 100644
--- a/kernel/drivers/bus/Makefile
+++ b/kernel/drivers/bus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the bus drivers.
 #
diff --git a/kernel/drivers/cdrom/Makefile b/kernel/drivers/cdrom/Makefile
index 8ffde4f8a..a95566ff4 100644
--- a/kernel/drivers/cdrom/Makefile
+++ b/kernel/drivers/cdrom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the kernel cdrom device drivers.
 #
 # 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
diff --git a/kernel/drivers/char/Kconfig b/kernel/drivers/char/Kconfig
index 623714344..c28dca0c6 100644
--- a/kernel/drivers/char/Kconfig
+++ b/kernel/drivers/char/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Character device configuration
 #
diff --git a/kernel/drivers/char/Makefile b/kernel/drivers/char/Makefile
index 53e337208..7dc3abe66 100644
--- a/kernel/drivers/char/Makefile
+++ b/kernel/drivers/char/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel character device drivers.
 #
diff --git a/kernel/drivers/char/agp/Kconfig b/kernel/drivers/char/agp/Kconfig
index c528f96ee..6231714ef 100644
--- a/kernel/drivers/char/agp/Kconfig
+++ b/kernel/drivers/char/agp/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 menuconfig AGP
 	tristate "/dev/agpgart (AGP Support)"
 	depends on ALPHA || IA64 || PARISC || PPC || X86
diff --git a/kernel/drivers/char/agp/Makefile b/kernel/drivers/char/agp/Makefile
index 604489bcd..4a786ffd9 100644
--- a/kernel/drivers/char/agp/Makefile
+++ b/kernel/drivers/char/agp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 agpgart-y := backend.o frontend.o generic.o isoch.o
 
 agpgart-$(CONFIG_COMPAT)	+= compat_ioctl.o
diff --git a/kernel/drivers/char/agp/intel-agp.h b/kernel/drivers/char/agp/intel-agp.h
index fda073dcd..164bf6519 100644
--- a/kernel/drivers/char/agp/intel-agp.h
+++ b/kernel/drivers/char/agp/intel-agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common Intel AGPGART and GTT definitions.
  */
diff --git a/kernel/drivers/char/agp/isoch.c b/kernel/drivers/char/agp/isoch.c
index c73385cc4..fc8e1bc33 100644
--- a/kernel/drivers/char/agp/isoch.c
+++ b/kernel/drivers/char/agp/isoch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Setup routines for AGP 3.5 compliant bridges.
  */
diff --git a/kernel/drivers/char/applicom.h b/kernel/drivers/char/applicom.h
index 35530b3d9..282e08f15 100644
--- a/kernel/drivers/char/applicom.h
+++ b/kernel/drivers/char/applicom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: applicom.h,v 1.2 1999/08/28 15:09:49 dwmw2 Exp $ */
 
 
diff --git a/kernel/drivers/char/ds1302.c b/kernel/drivers/char/ds1302.c
index c614a56e6..8e16ad5d6 100644
--- a/kernel/drivers/char/ds1302.c
+++ b/kernel/drivers/char/ds1302.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*!***************************************************************************
 *!
 *! FILE NAME  : ds1302.c
diff --git a/kernel/drivers/char/hw_random/Makefile b/kernel/drivers/char/hw_random/Makefile
index 39a67defa..f3728d008 100644
--- a/kernel/drivers/char/hw_random/Makefile
+++ b/kernel/drivers/char/hw_random/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for HW Random Number Generator (RNG) device drivers.
 #
diff --git a/kernel/drivers/char/hw_random/n2-asm.S b/kernel/drivers/char/hw_random/n2-asm.S
index 9b6eb5cd5..c205df43d 100644
--- a/kernel/drivers/char/hw_random/n2-asm.S
+++ b/kernel/drivers/char/hw_random/n2-asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* n2-asm.S: Niagara2 RNG hypervisor call assembler.
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/drivers/char/hw_random/n2rng.h b/kernel/drivers/char/hw_random/n2rng.h
index 6bad6cc63..9a870f5dc 100644
--- a/kernel/drivers/char/hw_random/n2rng.h
+++ b/kernel/drivers/char/hw_random/n2rng.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* n2rng.h: Niagara2 RNG defines.
  *
  * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
diff --git a/kernel/drivers/char/ipmi/Makefile b/kernel/drivers/char/ipmi/Makefile
index eefb0b301..43b7d86cc 100644
--- a/kernel/drivers/char/ipmi/Makefile
+++ b/kernel/drivers/char/ipmi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ipmi drivers.
 #
diff --git a/kernel/drivers/char/ipmi/ipmi_dmi.c b/kernel/drivers/char/ipmi/ipmi_dmi.c
index 2a84401de..2059f79d6 100644
--- a/kernel/drivers/char/ipmi/ipmi_dmi.c
+++ b/kernel/drivers/char/ipmi/ipmi_dmi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * A hack to create a platform device from a DMI entry.  This will
  * allow autoloading of the IPMI drive based on SMBIOS entries.
diff --git a/kernel/drivers/char/ipmi/ipmi_dmi.h b/kernel/drivers/char/ipmi/ipmi_dmi.h
index 0a1afe5ce..ea990a8e3 100644
--- a/kernel/drivers/char/ipmi/ipmi_dmi.h
+++ b/kernel/drivers/char/ipmi/ipmi_dmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * DMI defines for use by IPMI
  */
diff --git a/kernel/drivers/char/mem.c b/kernel/drivers/char/mem.c
index 593a8818a..970e1242a 100644
--- a/kernel/drivers/char/mem.c
+++ b/kernel/drivers/char/mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/drivers/char/mem.c
  *
diff --git a/kernel/drivers/char/misc.c b/kernel/drivers/char/misc.c
index c9cd1ea68..1bb9e7cc8 100644
--- a/kernel/drivers/char/misc.c
+++ b/kernel/drivers/char/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/drivers/char/misc.c
  *
diff --git a/kernel/drivers/char/nwbutton.h b/kernel/drivers/char/nwbutton.h
index c3ebc16ce..abee3ca74 100644
--- a/kernel/drivers/char/nwbutton.h
+++ b/kernel/drivers/char/nwbutton.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NWBUTTON_H
 #define __NWBUTTON_H
 
diff --git a/kernel/drivers/char/pcmcia/cm4040_cs.h b/kernel/drivers/char/pcmcia/cm4040_cs.h
index 9a8b805c5..e2ffff995 100644
--- a/kernel/drivers/char/pcmcia/cm4040_cs.h
+++ b/kernel/drivers/char/pcmcia/cm4040_cs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	_CM4040_H_
 #define	_CM4040_H_
 
diff --git a/kernel/drivers/char/tpm/Makefile b/kernel/drivers/char/tpm/Makefile
index 23681f01f..34b4bcf46 100644
--- a/kernel/drivers/char/tpm/Makefile
+++ b/kernel/drivers/char/tpm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel tpm device drivers.
 #
diff --git a/kernel/drivers/char/tpm/st33zp24/Makefile b/kernel/drivers/char/tpm/st33zp24/Makefile
index 74a722e5e..649e41107 100644
--- a/kernel/drivers/char/tpm/st33zp24/Makefile
+++ b/kernel/drivers/char/tpm/st33zp24/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ST33ZP24 TPM 1.2 driver
 #
diff --git a/kernel/drivers/char/tpm/tpm-dev.h b/kernel/drivers/char/tpm/tpm-dev.h
index ff15cf719..ba3b6f9da 100644
--- a/kernel/drivers/char/tpm/tpm-dev.h
+++ b/kernel/drivers/char/tpm/tpm-dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TPM_DEV_H
 #define _TPM_DEV_H
 
diff --git a/kernel/drivers/char/tpm/tpm_eventlog.h b/kernel/drivers/char/tpm/tpm_eventlog.h
index b4b549559..204466cc4 100644
--- a/kernel/drivers/char/tpm/tpm_eventlog.h
+++ b/kernel/drivers/char/tpm/tpm_eventlog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __TPM_EVENTLOG_H__
 #define __TPM_EVENTLOG_H__
diff --git a/kernel/drivers/clk/Makefile b/kernel/drivers/clk/Makefile
index c99f36382..f7f761b02 100644
--- a/kernel/drivers/clk/Makefile
+++ b/kernel/drivers/clk/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # common clock types
 obj-$(CONFIG_HAVE_CLK)		+= clk-devres.o clk-bulk.o
 obj-$(CONFIG_CLKDEV_LOOKUP)	+= clkdev.o
diff --git a/kernel/drivers/clk/at91/Makefile b/kernel/drivers/clk/at91/Makefile
index c68947b65..082596f37 100644
--- a/kernel/drivers/clk/at91/Makefile
+++ b/kernel/drivers/clk/at91/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for at91 specific clk
 #
diff --git a/kernel/drivers/clk/bcm/Makefile b/kernel/drivers/clk/bcm/Makefile
index a0c14fa4a..e3f0cb0d9 100644
--- a/kernel/drivers/clk/bcm/Makefile
+++ b/kernel/drivers/clk/bcm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CLK_BCM_63XX)	+= clk-bcm63xx.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona.o
 obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona-setup.o
diff --git a/kernel/drivers/clk/clk-gemini.c b/kernel/drivers/clk/clk-gemini.c
index f940e5af8..5e66e6c02 100644
--- a/kernel/drivers/clk/clk-gemini.c
+++ b/kernel/drivers/clk/clk-gemini.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cortina Gemini SoC Clock Controller driver
  * Copyright (c) 2017 Linus Walleij <linus.walleij@linaro.org>
diff --git a/kernel/drivers/clk/clk-tango4.c b/kernel/drivers/clk/clk-tango4.c
index eef75e305..34b22b793 100644
--- a/kernel/drivers/clk/clk-tango4.c
+++ b/kernel/drivers/clk/clk-tango4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/clk-provider.h>
 #include <linux/of_address.h>
diff --git a/kernel/drivers/clk/h8300/clk-div.c b/kernel/drivers/clk/h8300/clk-div.c
index 715b88220..4ae624425 100644
--- a/kernel/drivers/clk/h8300/clk-div.c
+++ b/kernel/drivers/clk/h8300/clk-div.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * H8/300 divide clock driver
  *
diff --git a/kernel/drivers/clk/h8300/clk-h8s2678.c b/kernel/drivers/clk/h8300/clk-h8s2678.c
index a26312460..fc24b0b55 100644
--- a/kernel/drivers/clk/h8300/clk-h8s2678.c
+++ b/kernel/drivers/clk/h8300/clk-h8s2678.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * H8S2678 clock driver
  *
diff --git a/kernel/drivers/clk/hisilicon/Makefile b/kernel/drivers/clk/hisilicon/Makefile
index 1e4c3ddba..0e5561211 100644
--- a/kernel/drivers/clk/hisilicon/Makefile
+++ b/kernel/drivers/clk/hisilicon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Hisilicon Clock specific Makefile
 #
diff --git a/kernel/drivers/clk/imgtec/clk-boston.c b/kernel/drivers/clk/imgtec/clk-boston.c
index f18f10351..15af423cc 100644
--- a/kernel/drivers/clk/imgtec/clk-boston.c
+++ b/kernel/drivers/clk/imgtec/clk-boston.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016-2017 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/drivers/clk/imx/Makefile b/kernel/drivers/clk/imx/Makefile
index 1ada68abb..f91f2b2e1 100644
--- a/kernel/drivers/clk/imx/Makefile
+++ b/kernel/drivers/clk/imx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-y += \
 	clk.o \
diff --git a/kernel/drivers/clk/imx/clk-imx27.c b/kernel/drivers/clk/imx/clk-imx27.c
index cf5cf75a4..0a0ab95d1 100644
--- a/kernel/drivers/clk/imx/clk-imx27.c
+++ b/kernel/drivers/clk/imx/clk-imx27.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
diff --git a/kernel/drivers/clk/imx/clk-pllv1.c b/kernel/drivers/clk/imx/clk-pllv1.c
index 82fe3662b..e47a1c2fe 100644
--- a/kernel/drivers/clk/imx/clk-pllv1.c
+++ b/kernel/drivers/clk/imx/clk-pllv1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/clk/imx/clk-pllv2.c b/kernel/drivers/clk/imx/clk-pllv2.c
index 4aeda56ce..9842d657e 100644
--- a/kernel/drivers/clk/imx/clk-pllv2.c
+++ b/kernel/drivers/clk/imx/clk-pllv2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/clk.h>
 #include <linux/io.h>
diff --git a/kernel/drivers/clk/imx/clk.c b/kernel/drivers/clk/imx/clk.c
index a634b1185..9074e6974 100644
--- a/kernel/drivers/clk/imx/clk.c
+++ b/kernel/drivers/clk/imx/clk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/of.h>
diff --git a/kernel/drivers/clk/imx/clk.h b/kernel/drivers/clk/imx/clk.h
index d54f0720a..d69c4bbf3 100644
--- a/kernel/drivers/clk/imx/clk.h
+++ b/kernel/drivers/clk/imx/clk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_IMX_CLK_H
 #define __MACH_IMX_CLK_H
 
diff --git a/kernel/drivers/clk/ingenic/cgu.c b/kernel/drivers/clk/ingenic/cgu.c
index e8248f918..ab393637f 100644
--- a/kernel/drivers/clk/ingenic/cgu.c
+++ b/kernel/drivers/clk/ingenic/cgu.c
@@ -2,7 +2,7 @@
  * Ingenic SoC CGU driver
  *
  * Copyright (c) 2013-2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/kernel/drivers/clk/ingenic/cgu.h b/kernel/drivers/clk/ingenic/cgu.h
index 09700b2c5..e78b58653 100644
--- a/kernel/drivers/clk/ingenic/cgu.h
+++ b/kernel/drivers/clk/ingenic/cgu.h
@@ -2,7 +2,7 @@
  * Ingenic SoC CGU driver
  *
  * Copyright (c) 2013-2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/kernel/drivers/clk/ingenic/jz4740-cgu.c b/kernel/drivers/clk/ingenic/jz4740-cgu.c
index 510fe7e0c..32fcc75f6 100644
--- a/kernel/drivers/clk/ingenic/jz4740-cgu.c
+++ b/kernel/drivers/clk/ingenic/jz4740-cgu.c
@@ -2,7 +2,7 @@
  * Ingenic JZ4740 SoC CGU driver
  *
  * Copyright (c) 2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/kernel/drivers/clk/ingenic/jz4780-cgu.c b/kernel/drivers/clk/ingenic/jz4780-cgu.c
index b35d6d9dd..ac3585ed8 100644
--- a/kernel/drivers/clk/ingenic/jz4780-cgu.c
+++ b/kernel/drivers/clk/ingenic/jz4780-cgu.c
@@ -2,7 +2,7 @@
  * Ingenic JZ4780 SoC CGU driver
  *
  * Copyright (c) 2013-2015 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/kernel/drivers/clk/mediatek/Makefile b/kernel/drivers/clk/mediatek/Makefile
index 2a755b5fb..ba2a07076 100644
--- a/kernel/drivers/clk/mediatek/Makefile
+++ b/kernel/drivers/clk/mediatek/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_COMMON_CLK_MEDIATEK) += clk-mtk.o clk-pll.o clk-gate.o clk-apmixed.o clk-cpumux.o
 obj-$(CONFIG_RESET_CONTROLLER) += reset.o
 obj-$(CONFIG_COMMON_CLK_MT6797) += clk-mt6797.o
diff --git a/kernel/drivers/clk/mmp/Makefile b/kernel/drivers/clk/mmp/Makefile
index 9d4bc41e4..7bc7ac693 100644
--- a/kernel/drivers/clk/mmp/Makefile
+++ b/kernel/drivers/clk/mmp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for mmp specific clk
 #
diff --git a/kernel/drivers/clk/mmp/clk.c b/kernel/drivers/clk/mmp/clk.c
index 089927e4c..ad8d483a3 100644
--- a/kernel/drivers/clk/mmp/clk.c
+++ b/kernel/drivers/clk/mmp/clk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/io.h>
 #include <linux/clk-provider.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/clk/mmp/clk.h b/kernel/drivers/clk/mmp/clk.h
index adf9b711b..70bb73257 100644
--- a/kernel/drivers/clk/mmp/clk.h
+++ b/kernel/drivers/clk/mmp/clk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_MMP_CLK_H
 #define __MACH_MMP_CLK_H
 
diff --git a/kernel/drivers/clk/mmp/reset.c b/kernel/drivers/clk/mmp/reset.c
index b4e4d6aa2..ded7e391c 100644
--- a/kernel/drivers/clk/mmp/reset.c
+++ b/kernel/drivers/clk/mmp/reset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/of.h>
diff --git a/kernel/drivers/clk/mmp/reset.h b/kernel/drivers/clk/mmp/reset.h
index be8b1a700..3d0470ca3 100644
--- a/kernel/drivers/clk/mmp/reset.h
+++ b/kernel/drivers/clk/mmp/reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_MMP_CLK_RESET_H
 #define __MACH_MMP_CLK_RESET_H
 
diff --git a/kernel/drivers/clk/mvebu/Makefile b/kernel/drivers/clk/mvebu/Makefile
index d71c7fd5d..93ac36852 100644
--- a/kernel/drivers/clk/mvebu/Makefile
+++ b/kernel/drivers/clk/mvebu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MVEBU_CLK_COMMON)	+= common.o
 obj-$(CONFIG_MVEBU_CLK_CPU) 	+= clk-cpu.o
 obj-$(CONFIG_MVEBU_CLK_COREDIV)	+= clk-corediv.o
diff --git a/kernel/drivers/clk/mvebu/dove-divider.c b/kernel/drivers/clk/mvebu/dove-divider.c
index 4091f3cfe..7e35c891e 100644
--- a/kernel/drivers/clk/mvebu/dove-divider.c
+++ b/kernel/drivers/clk/mvebu/dove-divider.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell Dove PMU Core PLL divider driver
  *
diff --git a/kernel/drivers/clk/mvebu/dove-divider.h b/kernel/drivers/clk/mvebu/dove-divider.h
index 4f2f718de..38ea37308 100644
--- a/kernel/drivers/clk/mvebu/dove-divider.h
+++ b/kernel/drivers/clk/mvebu/dove-divider.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DOVE_DIVIDER_H
 #define DOVE_DIVIDER_H
 
diff --git a/kernel/drivers/clk/qcom/Makefile b/kernel/drivers/clk/qcom/Makefile
index 3f3aff229..26410d314 100644
--- a/kernel/drivers/clk/qcom/Makefile
+++ b/kernel/drivers/clk/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_COMMON_CLK_QCOM) += clk-qcom.o
 
 clk-qcom-y += common.o
diff --git a/kernel/drivers/clk/renesas/Makefile b/kernel/drivers/clk/renesas/Makefile
index 9bda3ec5b..cbbb081e2 100644
--- a/kernel/drivers/clk/renesas/Makefile
+++ b/kernel/drivers/clk/renesas/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # SoC
 obj-$(CONFIG_CLK_EMEV2)			+= clk-emev2.o
 obj-$(CONFIG_CLK_RZA1)			+= clk-rz.o
diff --git a/kernel/drivers/clk/renesas/clk-div6.h b/kernel/drivers/clk/renesas/clk-div6.h
index 567b31d2b..065dfb49a 100644
--- a/kernel/drivers/clk/renesas/clk-div6.h
+++ b/kernel/drivers/clk/renesas/clk-div6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RENESAS_CLK_DIV6_H__
 #define __RENESAS_CLK_DIV6_H__
 
diff --git a/kernel/drivers/clk/rockchip/Makefile b/kernel/drivers/clk/rockchip/Makefile
index 6f19826cc..59b8d3209 100644
--- a/kernel/drivers/clk/rockchip/Makefile
+++ b/kernel/drivers/clk/rockchip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Rockchip Clock specific Makefile
 #
diff --git a/kernel/drivers/clk/samsung/Makefile b/kernel/drivers/clk/samsung/Makefile
index 7afc21dc3..23835001e 100644
--- a/kernel/drivers/clk/samsung/Makefile
+++ b/kernel/drivers/clk/samsung/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Samsung Clock specific Makefile
 #
diff --git a/kernel/drivers/clk/sirf/atlas6.h b/kernel/drivers/clk/sirf/atlas6.h
index 376217f3b..cb871e30a 100644
--- a/kernel/drivers/clk/sirf/atlas6.h
+++ b/kernel/drivers/clk/sirf/atlas6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define SIRFSOC_CLKC_CLK_EN0    0x0000
 #define SIRFSOC_CLKC_CLK_EN1    0x0004
 #define SIRFSOC_CLKC_REF_CFG    0x0020
diff --git a/kernel/drivers/clk/sirf/prima2.h b/kernel/drivers/clk/sirf/prima2.h
index 01bc3854a..2fb569417 100644
--- a/kernel/drivers/clk/sirf/prima2.h
+++ b/kernel/drivers/clk/sirf/prima2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define SIRFSOC_CLKC_CLK_EN0    0x0000
 #define SIRFSOC_CLKC_CLK_EN1    0x0004
 #define SIRFSOC_CLKC_REF_CFG    0x0014
diff --git a/kernel/drivers/clk/socfpga/Makefile b/kernel/drivers/clk/socfpga/Makefile
index d8bb23975..9146c20fe 100644
--- a/kernel/drivers/clk/socfpga/Makefile
+++ b/kernel/drivers/clk/socfpga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += clk.o
 obj-y += clk-gate.o
 obj-y += clk-pll.o
diff --git a/kernel/drivers/clk/spear/Makefile b/kernel/drivers/clk/spear/Makefile
index cdb425d3b..d7e75d2d4 100644
--- a/kernel/drivers/clk/spear/Makefile
+++ b/kernel/drivers/clk/spear/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # SPEAr Clock specific Makefile
 #
diff --git a/kernel/drivers/clk/st/clkgen.h b/kernel/drivers/clk/st/clkgen.h
index f7ec2d913..44302fc7c 100644
--- a/kernel/drivers/clk/st/clkgen.h
+++ b/kernel/drivers/clk/st/clkgen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /************************************************************************
 File  : Clock H/w specific Information
 
diff --git a/kernel/drivers/clk/sunxi-ng/Makefile b/kernel/drivers/clk/sunxi-ng/Makefile
index 85a0633c1..d1c2fa93d 100644
--- a/kernel/drivers/clk/sunxi-ng/Makefile
+++ b/kernel/drivers/clk/sunxi-ng/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Common objects
 lib-$(CONFIG_SUNXI_CCU)		+= ccu_common.o
 lib-$(CONFIG_SUNXI_CCU)		+= ccu_mmc_timing.o
diff --git a/kernel/drivers/clk/sunxi-ng/ccu_mult.h b/kernel/drivers/clk/sunxi-ng/ccu_mult.h
index f9c37b987..6b30b0c10 100644
--- a/kernel/drivers/clk/sunxi-ng/ccu_mult.h
+++ b/kernel/drivers/clk/sunxi-ng/ccu_mult.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CCU_MULT_H_
 #define _CCU_MULT_H_
 
diff --git a/kernel/drivers/clk/sunxi-ng/ccu_mux.h b/kernel/drivers/clk/sunxi-ng/ccu_mux.h
index f20c0bd62..f165395ef 100644
--- a/kernel/drivers/clk/sunxi-ng/ccu_mux.h
+++ b/kernel/drivers/clk/sunxi-ng/ccu_mux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CCU_MUX_H_
 #define _CCU_MUX_H_
 
diff --git a/kernel/drivers/clk/sunxi/Makefile b/kernel/drivers/clk/sunxi/Makefile
index 39d2044a1..be88368b4 100644
--- a/kernel/drivers/clk/sunxi/Makefile
+++ b/kernel/drivers/clk/sunxi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for sunxi specific clk
 #
diff --git a/kernel/drivers/clk/sunxi/clk-factors.h b/kernel/drivers/clk/sunxi/clk-factors.h
index 1e63c5b2d..824f746b2 100644
--- a/kernel/drivers/clk/sunxi/clk-factors.h
+++ b/kernel/drivers/clk/sunxi/clk-factors.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_SUNXI_CLK_FACTORS_H
 #define __MACH_SUNXI_CLK_FACTORS_H
 
diff --git a/kernel/drivers/clk/sunxi/clk-sun9i-cpus.c b/kernel/drivers/clk/sunxi/clk-sun9i-cpus.c
index 7626d2194..4d5e14142 100644
--- a/kernel/drivers/clk/sunxi/clk-sun9i-cpus.c
+++ b/kernel/drivers/clk/sunxi/clk-sun9i-cpus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015 Chen-Yu Tsai
  *
diff --git a/kernel/drivers/clk/tegra/Makefile b/kernel/drivers/clk/tegra/Makefile
index 4be8af28e..b71692391 100644
--- a/kernel/drivers/clk/tegra/Makefile
+++ b/kernel/drivers/clk/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y					+= clk.o
 obj-y					+= clk-audio-sync.o
 obj-y					+= clk-dfll.o
diff --git a/kernel/drivers/clk/tegra/clk-id.h b/kernel/drivers/clk/tegra/clk-id.h
index 689f34437..11ee5f9ce 100644
--- a/kernel/drivers/clk/tegra/clk-id.h
+++ b/kernel/drivers/clk/tegra/clk-id.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides IDs for clocks common between several Tegra SoCs
  */
diff --git a/kernel/drivers/clk/ti/Makefile b/kernel/drivers/clk/ti/Makefile
index edb9f471e..a2293ee09 100644
--- a/kernel/drivers/clk/ti/Makefile
+++ b/kernel/drivers/clk/ti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifeq ($(CONFIG_ARCH_OMAP2PLUS), y)
 
 obj-y					+= clk.o autoidle.o clockdomain.o
diff --git a/kernel/drivers/clk/uniphier/Makefile b/kernel/drivers/clk/uniphier/Makefile
index 665d1d65a..e5715abef 100644
--- a/kernel/drivers/clk/uniphier/Makefile
+++ b/kernel/drivers/clk/uniphier/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y	+= clk-uniphier-core.o
 
 obj-y	+= clk-uniphier-cpugear.o
diff --git a/kernel/drivers/clk/uniphier/clk-uniphier-sys.c b/kernel/drivers/clk/uniphier/clk-uniphier-sys.c
index 0e396f3da..07f3b91a7 100644
--- a/kernel/drivers/clk/uniphier/clk-uniphier-sys.c
+++ b/kernel/drivers/clk/uniphier/clk-uniphier-sys.c
@@ -233,9 +233,9 @@ const struct uniphier_clk_data uniphier_pxs3_sys_clk_data[] = {
 	UNIPHIER_LD20_SYS_CLK_SD,
 	UNIPHIER_LD11_SYS_CLK_NAND(2),
 	UNIPHIER_LD11_SYS_CLK_EMMC(4),
-	UNIPHIER_CLK_GATE("usb30", 12, NULL, 0x2104, 4),	/* =GIO0 */
-	UNIPHIER_CLK_GATE("usb31-0", 13, NULL, 0x2104, 5),	/* =GIO1 */
-	UNIPHIER_CLK_GATE("usb31-1", 14, NULL, 0x2104, 6),	/* =GIO1-1 */
+	UNIPHIER_CLK_GATE("usb30", 12, NULL, 0x210c, 4),	/* =GIO0 */
+	UNIPHIER_CLK_GATE("usb31-0", 13, NULL, 0x210c, 5),	/* =GIO1 */
+	UNIPHIER_CLK_GATE("usb31-1", 14, NULL, 0x210c, 6),	/* =GIO1-1 */
 	UNIPHIER_CLK_GATE("usb30-phy0", 16, NULL, 0x210c, 16),
 	UNIPHIER_CLK_GATE("usb30-phy1", 17, NULL, 0x210c, 18),
 	UNIPHIER_CLK_GATE("usb30-phy2", 18, NULL, 0x210c, 20),
diff --git a/kernel/drivers/clk/ux500/Makefile b/kernel/drivers/clk/ux500/Makefile
index f3baef298..fedc083dc 100644
--- a/kernel/drivers/clk/ux500/Makefile
+++ b/kernel/drivers/clk/ux500/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ux500 clocks
 #
diff --git a/kernel/drivers/clk/versatile/clk-icst.h b/kernel/drivers/clk/versatile/clk-icst.h
index 5add02ebe..e36ca1a20 100644
--- a/kernel/drivers/clk/versatile/clk-icst.h
+++ b/kernel/drivers/clk/versatile/clk-icst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
  * struct clk_icst_desc - descriptor for the ICST VCO
  * @params: ICST parameters
diff --git a/kernel/drivers/clocksource/Makefile b/kernel/drivers/clocksource/Makefile
index dbc1ad145..72711f149 100644
--- a/kernel/drivers/clocksource/Makefile
+++ b/kernel/drivers/clocksource/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TIMER_OF)		+= timer-of.o
 obj-$(CONFIG_TIMER_PROBE)	+= timer-probe.o
 obj-$(CONFIG_ATMEL_PIT)		+= timer-atmel-pit.o
diff --git a/kernel/drivers/clocksource/h8300_timer16.c b/kernel/drivers/clocksource/h8300_timer16.c
index dfbd4f805..86ca91451 100644
--- a/kernel/drivers/clocksource/h8300_timer16.c
+++ b/kernel/drivers/clocksource/h8300_timer16.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  H8/300 16bit Timer driver
  *
diff --git a/kernel/drivers/clocksource/h8300_timer8.c b/kernel/drivers/clocksource/h8300_timer8.c
index f6ffb0cef..1d740a8c4 100644
--- a/kernel/drivers/clocksource/h8300_timer8.c
+++ b/kernel/drivers/clocksource/h8300_timer8.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/arch/h8300/kernel/cpu/timer/timer8.c
  *
diff --git a/kernel/drivers/clocksource/h8300_tpu.c b/kernel/drivers/clocksource/h8300_tpu.c
index 45a8d17da..17d4ab0f6 100644
--- a/kernel/drivers/clocksource/h8300_tpu.c
+++ b/kernel/drivers/clocksource/h8300_tpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  H8S TPU Driver
  *
diff --git a/kernel/drivers/clocksource/i8253.c b/kernel/drivers/clocksource/i8253.c
index 64f649074..9c3889554 100644
--- a/kernel/drivers/clocksource/i8253.c
+++ b/kernel/drivers/clocksource/i8253.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * i8253 PIT clocksource
  */
diff --git a/kernel/drivers/clocksource/tango_xtal.c b/kernel/drivers/clocksource/tango_xtal.c
index 6a8d9838c..3f94e454e 100644
--- a/kernel/drivers/clocksource/tango_xtal.c
+++ b/kernel/drivers/clocksource/tango_xtal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/clocksource.h>
 #include <linux/sched_clock.h>
 #include <linux/of_address.h>
diff --git a/kernel/drivers/clocksource/tcb_clksrc.c b/kernel/drivers/clocksource/tcb_clksrc.c
index 59e8aee0e..9de47d4d2 100644
--- a/kernel/drivers/clocksource/tcb_clksrc.c
+++ b/kernel/drivers/clocksource/tcb_clksrc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
diff --git a/kernel/drivers/clocksource/timer-fttmr010.c b/kernel/drivers/clocksource/timer-fttmr010.c
index 66dd90996..cdf23b628 100644
--- a/kernel/drivers/clocksource/timer-fttmr010.c
+++ b/kernel/drivers/clocksource/timer-fttmr010.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Faraday Technology FTTMR010 timer driver
  * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
diff --git a/kernel/drivers/clocksource/timer-of.h b/kernel/drivers/clocksource/timer-of.h
index e0d727255..c6d995ab9 100644
--- a/kernel/drivers/clocksource/timer-of.h
+++ b/kernel/drivers/clocksource/timer-of.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TIMER_OF_H__
 #define __TIMER_OF_H__
 
diff --git a/kernel/drivers/clocksource/timer-sp.h b/kernel/drivers/clocksource/timer-sp.h
index 050d88561..b2037eb94 100644
--- a/kernel/drivers/clocksource/timer-sp.h
+++ b/kernel/drivers/clocksource/timer-sp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ARM timer implementation, found in Integrator, Versatile and Realview
  * platforms.  Not all platforms support all registers and bits in these
diff --git a/kernel/drivers/cpufreq/Makefile b/kernel/drivers/cpufreq/Makefile
index c7af9b2a2..812f9e0d0 100644
--- a/kernel/drivers/cpufreq/Makefile
+++ b/kernel/drivers/cpufreq/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # CPUfreq core
 obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o freq_table.o
 
diff --git a/kernel/drivers/cpufreq/cris-artpec3-cpufreq.c b/kernel/drivers/cpufreq/cris-artpec3-cpufreq.c
index 601b88c49..455b4fb78 100644
--- a/kernel/drivers/cpufreq/cris-artpec3-cpufreq.c
+++ b/kernel/drivers/cpufreq/cris-artpec3-cpufreq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/cpufreq.h>
diff --git a/kernel/drivers/cpufreq/cris-etraxfs-cpufreq.c b/kernel/drivers/cpufreq/cris-etraxfs-cpufreq.c
index 22b2cdde7..4c4b5dd68 100644
--- a/kernel/drivers/cpufreq/cris-etraxfs-cpufreq.c
+++ b/kernel/drivers/cpufreq/cris-etraxfs-cpufreq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/cpufreq.h>
diff --git a/kernel/drivers/cpufreq/ppc_cbe_cpufreq.h b/kernel/drivers/cpufreq/ppc_cbe_cpufreq.h
index 3eace725c..9d973519d 100644
--- a/kernel/drivers/cpufreq/ppc_cbe_cpufreq.h
+++ b/kernel/drivers/cpufreq/ppc_cbe_cpufreq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ppc_cbe_cpufreq.h
  *
diff --git a/kernel/drivers/cpuidle/Makefile b/kernel/drivers/cpuidle/Makefile
index 0b67a05a7..9d7176cee 100644
--- a/kernel/drivers/cpuidle/Makefile
+++ b/kernel/drivers/cpuidle/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for cpuidle.
 #
diff --git a/kernel/drivers/cpuidle/cpuidle-cps.c b/kernel/drivers/cpuidle/cpuidle-cps.c
index 72b5e4728..dac8ff639 100644
--- a/kernel/drivers/cpuidle/cpuidle-cps.c
+++ b/kernel/drivers/cpuidle/cpuidle-cps.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
diff --git a/kernel/drivers/cpuidle/cpuidle-powernv.c b/kernel/drivers/cpuidle/cpuidle-powernv.c
index 42896a67a..ed6531f07 100644
--- a/kernel/drivers/cpuidle/cpuidle-powernv.c
+++ b/kernel/drivers/cpuidle/cpuidle-powernv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  cpuidle-powernv - idle state cpuidle driver.
  *  Adapted from drivers/cpuidle/cpuidle-pseries
diff --git a/kernel/drivers/cpuidle/cpuidle-pseries.c b/kernel/drivers/cpuidle/cpuidle-pseries.c
index e9b3853d9..a187a39fb 100644
--- a/kernel/drivers/cpuidle/cpuidle-pseries.c
+++ b/kernel/drivers/cpuidle/cpuidle-pseries.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  cpuidle-pseries - idle state cpuidle driver.
  *  Adapted from drivers/idle/intel_idle.c and
diff --git a/kernel/drivers/cpuidle/cpuidle.h b/kernel/drivers/cpuidle/cpuidle.h
index f87f399b0..2965ab32a 100644
--- a/kernel/drivers/cpuidle/cpuidle.h
+++ b/kernel/drivers/cpuidle/cpuidle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * cpuidle.h - The internal header file
  */
diff --git a/kernel/drivers/cpuidle/dt_idle_states.h b/kernel/drivers/cpuidle/dt_idle_states.h
index 4818134bc..14ae88cef 100644
--- a/kernel/drivers/cpuidle/dt_idle_states.h
+++ b/kernel/drivers/cpuidle/dt_idle_states.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_IDLE_STATES
 #define __DT_IDLE_STATES
 
diff --git a/kernel/drivers/cpuidle/governors/menu.c b/kernel/drivers/cpuidle/governors/menu.c
index aa390404e..48eaf2879 100644
--- a/kernel/drivers/cpuidle/governors/menu.c
+++ b/kernel/drivers/cpuidle/governors/menu.c
@@ -298,8 +298,8 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
 		data->needs_update = 0;
 	}
 
-	if (resume_latency < latency_req &&
-	    resume_latency != PM_QOS_RESUME_LATENCY_NO_CONSTRAINT)
+	/* resume_latency is 0 means no restriction */
+	if (resume_latency && resume_latency < latency_req)
 		latency_req = resume_latency;
 
 	/* Special case when user has set very strict latency requirement */
diff --git a/kernel/drivers/crypto/Makefile b/kernel/drivers/crypto/Makefile
index 808432b44..c00708d04 100644
--- a/kernel/drivers/crypto/Makefile
+++ b/kernel/drivers/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_ATMEL_AES) += atmel-aes.o
 obj-$(CONFIG_CRYPTO_DEV_ATMEL_SHA) += atmel-sha.o
 obj-$(CONFIG_CRYPTO_DEV_ATMEL_TDES) += atmel-tdes.o
diff --git a/kernel/drivers/crypto/atmel-aes-regs.h b/kernel/drivers/crypto/atmel-aes-regs.h
index 769467980..62f9d3038 100644
--- a/kernel/drivers/crypto/atmel-aes-regs.h
+++ b/kernel/drivers/crypto/atmel-aes-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATMEL_AES_REGS_H__
 #define __ATMEL_AES_REGS_H__
 
diff --git a/kernel/drivers/crypto/atmel-sha-regs.h b/kernel/drivers/crypto/atmel-sha-regs.h
index 1b0eba4a2..b2b5e634e 100644
--- a/kernel/drivers/crypto/atmel-sha-regs.h
+++ b/kernel/drivers/crypto/atmel-sha-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATMEL_SHA_REGS_H__
 #define __ATMEL_SHA_REGS_H__
 
diff --git a/kernel/drivers/crypto/atmel-tdes-regs.h b/kernel/drivers/crypto/atmel-tdes-regs.h
index f86734d0f..fbd905720 100644
--- a/kernel/drivers/crypto/atmel-tdes-regs.h
+++ b/kernel/drivers/crypto/atmel-tdes-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATMEL_TDES_REGS_H__
 #define __ATMEL_TDES_REGS_H__
 
diff --git a/kernel/drivers/crypto/caam/Makefile b/kernel/drivers/crypto/caam/Makefile
index 9e2e98856..cb652ee7d 100644
--- a/kernel/drivers/crypto/caam/Makefile
+++ b/kernel/drivers/crypto/caam/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the CAAM backend and dependent components
 #
diff --git a/kernel/drivers/crypto/caam/caamalg_desc.h b/kernel/drivers/crypto/caam/caamalg_desc.h
index 8731e4a7f..e412ec8f7 100644
--- a/kernel/drivers/crypto/caam/caamalg_desc.h
+++ b/kernel/drivers/crypto/caam/caamalg_desc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared descriptors for aead, ablkcipher algorithms
  *
diff --git a/kernel/drivers/crypto/caam/caampkc.h b/kernel/drivers/crypto/caam/caampkc.h
index 87ab75e9d..fd145c46e 100644
--- a/kernel/drivers/crypto/caam/caampkc.h
+++ b/kernel/drivers/crypto/caam/caampkc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * caam - Freescale FSL CAAM support for Public Key Cryptography descriptors
  *
diff --git a/kernel/drivers/crypto/caam/compat.h b/kernel/drivers/crypto/caam/compat.h
index 7149cd249..5f2f1b288 100644
--- a/kernel/drivers/crypto/caam/compat.h
+++ b/kernel/drivers/crypto/caam/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  */
diff --git a/kernel/drivers/crypto/caam/ctrl.h b/kernel/drivers/crypto/caam/ctrl.h
index 7e7bf68c9..be693a2cc 100644
--- a/kernel/drivers/crypto/caam/ctrl.h
+++ b/kernel/drivers/crypto/caam/ctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM control-plane driver backend public-level include definitions
  *
diff --git a/kernel/drivers/crypto/caam/desc.h b/kernel/drivers/crypto/caam/desc.h
index 2e6766a15..6633fbb80 100644
--- a/kernel/drivers/crypto/caam/desc.h
+++ b/kernel/drivers/crypto/caam/desc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM descriptor composition header
  * Definitions to support CAAM descriptor instruction generation
diff --git a/kernel/drivers/crypto/caam/desc_constr.h b/kernel/drivers/crypto/caam/desc_constr.h
index d8e83ca10..ba1ca0806 100644
--- a/kernel/drivers/crypto/caam/desc_constr.h
+++ b/kernel/drivers/crypto/caam/desc_constr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * caam descriptor construction helper functions
  *
diff --git a/kernel/drivers/crypto/caam/error.c b/kernel/drivers/crypto/caam/error.c
index 3d639f3b4..8da88beb1 100644
--- a/kernel/drivers/crypto/caam/error.c
+++ b/kernel/drivers/crypto/caam/error.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CAAM Error Reporting
  *
diff --git a/kernel/drivers/crypto/caam/error.h b/kernel/drivers/crypto/caam/error.h
index 250e1a21c..5aa332bac 100644
--- a/kernel/drivers/crypto/caam/error.h
+++ b/kernel/drivers/crypto/caam/error.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM Error Reporting code header
  *
diff --git a/kernel/drivers/crypto/caam/intern.h b/kernel/drivers/crypto/caam/intern.h
index a52361258..91f110727 100644
--- a/kernel/drivers/crypto/caam/intern.h
+++ b/kernel/drivers/crypto/caam/intern.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM/SEC 4.x driver backend
  * Private/internal definitions between modules
diff --git a/kernel/drivers/crypto/caam/jr.h b/kernel/drivers/crypto/caam/jr.h
index 97113a6d6..eab611530 100644
--- a/kernel/drivers/crypto/caam/jr.h
+++ b/kernel/drivers/crypto/caam/jr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM public-level include definitions for the JobR backend
  *
diff --git a/kernel/drivers/crypto/caam/key_gen.c b/kernel/drivers/crypto/caam/key_gen.c
index c425d4ada..8c79c3a15 100644
--- a/kernel/drivers/crypto/caam/key_gen.c
+++ b/kernel/drivers/crypto/caam/key_gen.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CAAM/SEC 4.x functions for handling key-generation jobs
  *
diff --git a/kernel/drivers/crypto/caam/key_gen.h b/kernel/drivers/crypto/caam/key_gen.h
index 4628f389e..5db055c25 100644
--- a/kernel/drivers/crypto/caam/key_gen.h
+++ b/kernel/drivers/crypto/caam/key_gen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM/SEC 4.x definitions for handling key-generation jobs
  *
diff --git a/kernel/drivers/crypto/caam/pdb.h b/kernel/drivers/crypto/caam/pdb.h
index 31e59963f..810f0bef0 100644
--- a/kernel/drivers/crypto/caam/pdb.h
+++ b/kernel/drivers/crypto/caam/pdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM Protocol Data Block (PDB) definition header file
  *
diff --git a/kernel/drivers/crypto/caam/pkc_desc.c b/kernel/drivers/crypto/caam/pkc_desc.c
index 9e2ce6fe2..2a8d87ea9 100644
--- a/kernel/drivers/crypto/caam/pkc_desc.c
+++ b/kernel/drivers/crypto/caam/pkc_desc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * caam - Freescale FSL CAAM support for Public Key Cryptography descriptors
  *
diff --git a/kernel/drivers/crypto/caam/qi.c b/kernel/drivers/crypto/caam/qi.c
index e4cf00014..f9a44f485 100644
--- a/kernel/drivers/crypto/caam/qi.c
+++ b/kernel/drivers/crypto/caam/qi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CAAM/SEC 4.x QI transport/backend driver
  * Queue Interface backend functionality
diff --git a/kernel/drivers/crypto/caam/qi.h b/kernel/drivers/crypto/caam/qi.h
index ecb21f207..357b69f57 100644
--- a/kernel/drivers/crypto/caam/qi.h
+++ b/kernel/drivers/crypto/caam/qi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Public definitions for the CAAM/QI (Queue Interface) backend.
  *
diff --git a/kernel/drivers/crypto/caam/regs.h b/kernel/drivers/crypto/caam/regs.h
index 17cfd23a3..fee363865 100644
--- a/kernel/drivers/crypto/caam/regs.h
+++ b/kernel/drivers/crypto/caam/regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM hardware register-level view
  *
diff --git a/kernel/drivers/crypto/caam/sg_sw_sec4.h b/kernel/drivers/crypto/caam/sg_sw_sec4.h
index 936b1b630..e586ffab8 100644
--- a/kernel/drivers/crypto/caam/sg_sw_sec4.h
+++ b/kernel/drivers/crypto/caam/sg_sw_sec4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * CAAM/SEC 4.x functions for using scatterlists in caam driver
  *
diff --git a/kernel/drivers/crypto/cavium/nitrox/Makefile b/kernel/drivers/crypto/cavium/nitrox/Makefile
index 5af2e4368..45b7379e8 100644
--- a/kernel/drivers/crypto/cavium/nitrox/Makefile
+++ b/kernel/drivers/crypto/cavium/nitrox/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_NITROX_CNN55XX) += n5pf.o
 
 n5pf-objs := nitrox_main.o \
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_algs.c b/kernel/drivers/crypto/cavium/nitrox/nitrox_algs.c
index ce330278e..2ae6124e5 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_algs.c
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_algs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/crypto.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_common.h b/kernel/drivers/crypto/cavium/nitrox/nitrox_common.h
index 4888c7823..312f72801 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_common.h
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NITROX_COMMON_H
 #define __NITROX_COMMON_H
 
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_csr.h b/kernel/drivers/crypto/cavium/nitrox/nitrox_csr.h
index 30b04c4c6..9dcb7fdbe 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_csr.h
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_csr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NITROX_CSR_H
 #define __NITROX_CSR_H
 
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_dev.h b/kernel/drivers/crypto/cavium/nitrox/nitrox_dev.h
index 57858b04f..9a476bb6d 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_dev.h
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NITROX_DEV_H
 #define __NITROX_DEV_H
 
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_hal.c b/kernel/drivers/crypto/cavium/nitrox/nitrox_hal.c
index f0655f82f..bf9900bc4 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_hal.c
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_hal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/delay.h>
 
 #include "nitrox_dev.h"
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_isr.c b/kernel/drivers/crypto/cavium/nitrox/nitrox_isr.c
index 71f934871..dbead5f45 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_isr.c
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_isr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci.h>
 #include <linux/printk.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_lib.c b/kernel/drivers/crypto/cavium/nitrox/nitrox_lib.c
index b4a391adb..4fdc921ba 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_lib.c
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cpumask.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_req.h b/kernel/drivers/crypto/cavium/nitrox/nitrox_req.h
index 74f4c20dc..d091b6f5f 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_req.h
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_req.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NITROX_REQ_H
 #define __NITROX_REQ_H
 
diff --git a/kernel/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c b/kernel/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
index 4bb4377c5..4addc238a 100644
--- a/kernel/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
+++ b/kernel/drivers/crypto/cavium/nitrox/nitrox_reqmgr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <crypto/internal/skcipher.h>
diff --git a/kernel/drivers/crypto/cavium/zip/Makefile b/kernel/drivers/crypto/cavium/zip/Makefile
index b2f3baaff..020d189d7 100644
--- a/kernel/drivers/crypto/cavium/zip/Makefile
+++ b/kernel/drivers/crypto/cavium/zip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Cavium's ZIP Driver.
 #
diff --git a/kernel/drivers/crypto/ccp/Makefile b/kernel/drivers/crypto/ccp/Makefile
index 57f8debfc..c4ce726b9 100644
--- a/kernel/drivers/crypto/ccp/Makefile
+++ b/kernel/drivers/crypto/ccp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_CCP_DD) += ccp.o
 ccp-objs  := sp-dev.o sp-platform.o
 ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \
diff --git a/kernel/drivers/crypto/marvell/cesa.h b/kernel/drivers/crypto/marvell/cesa.h
index b7872f62f..0032e3bf4 100644
--- a/kernel/drivers/crypto/marvell/cesa.h
+++ b/kernel/drivers/crypto/marvell/cesa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MARVELL_CESA_H__
 #define __MARVELL_CESA_H__
 
diff --git a/kernel/drivers/crypto/mv_cesa.h b/kernel/drivers/crypto/mv_cesa.h
index 9249d3ed1..0be3f0aa4 100644
--- a/kernel/drivers/crypto/mv_cesa.h
+++ b/kernel/drivers/crypto/mv_cesa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MV_CRYPTO_H__
 #define __MV_CRYPTO_H__
 
diff --git a/kernel/drivers/crypto/n2_asm.S b/kernel/drivers/crypto/n2_asm.S
index f7c793745..9a67dbf34 100644
--- a/kernel/drivers/crypto/n2_asm.S
+++ b/kernel/drivers/crypto/n2_asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* n2_asm.S: Hypervisor calls for NCS support.
  *
  * Copyright (C) 2009 David S. Miller <davem@davemloft.net>
diff --git a/kernel/drivers/crypto/n2_core.h b/kernel/drivers/crypto/n2_core.h
index 4bcbbeae9..2406763b0 100644
--- a/kernel/drivers/crypto/n2_core.h
+++ b/kernel/drivers/crypto/n2_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _N2_CORE_H
 #define _N2_CORE_H
 
diff --git a/kernel/drivers/crypto/nx/Makefile b/kernel/drivers/crypto/nx/Makefile
index b727821c8..015155da5 100644
--- a/kernel/drivers/crypto/nx/Makefile
+++ b/kernel/drivers/crypto/nx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_NX_ENCRYPT) += nx-crypto.o
 nx-crypto-objs := nx.o \
 		  nx_debugfs.o \
diff --git a/kernel/drivers/crypto/nx/nx-842.h b/kernel/drivers/crypto/nx/nx-842.h
index bb2f31792..b66f19ac6 100644
--- a/kernel/drivers/crypto/nx/nx-842.h
+++ b/kernel/drivers/crypto/nx/nx-842.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __NX_842_H__
 #define __NX_842_H__
diff --git a/kernel/drivers/crypto/nx/nx.h b/kernel/drivers/crypto/nx/nx.h
index 9347878d4..c3e54af18 100644
--- a/kernel/drivers/crypto/nx/nx.h
+++ b/kernel/drivers/crypto/nx/nx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __NX_H__
 #define __NX_H__
diff --git a/kernel/drivers/crypto/nx/nx_csbcpb.h b/kernel/drivers/crypto/nx/nx_csbcpb.h
index a304f956d..493f8490f 100644
--- a/kernel/drivers/crypto/nx/nx_csbcpb.h
+++ b/kernel/drivers/crypto/nx/nx_csbcpb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __NX_CSBCPB_H__
 #define __NX_CSBCPB_H__
diff --git a/kernel/drivers/crypto/qat/Makefile b/kernel/drivers/crypto/qat/Makefile
index 8265106f1..7dd15e751 100644
--- a/kernel/drivers/crypto/qat/Makefile
+++ b/kernel/drivers/crypto/qat/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_QAT) += qat_common/
 obj-$(CONFIG_CRYPTO_DEV_QAT_DH895xCC) += qat_dh895xcc/
 obj-$(CONFIG_CRYPTO_DEV_QAT_C3XXX) += qat_c3xxx/
diff --git a/kernel/drivers/crypto/qat/qat_common/Makefile b/kernel/drivers/crypto/qat/qat_common/Makefile
index 92fb6ffdc..47a8e3d8b 100644
--- a/kernel/drivers/crypto/qat/qat_common/Makefile
+++ b/kernel/drivers/crypto/qat/qat_common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o
 intel_qat-objs := adf_cfg.o \
 	adf_isr.o \
diff --git a/kernel/drivers/crypto/qce/Makefile b/kernel/drivers/crypto/qce/Makefile
index 348dc3173..19a7f899a 100644
--- a/kernel/drivers/crypto/qce/Makefile
+++ b/kernel/drivers/crypto/qce/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_QCE) += qcrypto.o
 qcrypto-objs := core.o \
 		common.o \
diff --git a/kernel/drivers/crypto/rockchip/rk3288_crypto.h b/kernel/drivers/crypto/rockchip/rk3288_crypto.h
index ab6a1b4c4..d5fb4013f 100644
--- a/kernel/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/kernel/drivers/crypto/rockchip/rk3288_crypto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RK3288_CRYPTO_H__
 #define __RK3288_CRYPTO_H__
 
diff --git a/kernel/drivers/crypto/virtio/Makefile b/kernel/drivers/crypto/virtio/Makefile
index dd342c947..cbfccccfa 100644
--- a/kernel/drivers/crypto/virtio/Makefile
+++ b/kernel/drivers/crypto/virtio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio_crypto.o
 virtio_crypto-objs := \
 	virtio_crypto_algs.o \
diff --git a/kernel/drivers/crypto/vmx/Makefile b/kernel/drivers/crypto/vmx/Makefile
index 55f7c3925..cab32cfec 100644
--- a/kernel/drivers/crypto/vmx/Makefile
+++ b/kernel/drivers/crypto/vmx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o
 vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o
 
diff --git a/kernel/drivers/crypto/vmx/aesp8-ppc.h b/kernel/drivers/crypto/vmx/aesp8-ppc.h
index 01972e16a..349646b73 100644
--- a/kernel/drivers/crypto/vmx/aesp8-ppc.h
+++ b/kernel/drivers/crypto/vmx/aesp8-ppc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/types.h>
 #include <crypto/aes.h>
 
diff --git a/kernel/drivers/crypto/vmx/ppc-xlate.pl b/kernel/drivers/crypto/vmx/ppc-xlate.pl
index b18e67d0e..36db2ef09 100644
--- a/kernel/drivers/crypto/vmx/ppc-xlate.pl
+++ b/kernel/drivers/crypto/vmx/ppc-xlate.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 
 # PowerPC assembler distiller by <appro>.
 
diff --git a/kernel/drivers/dax/Makefile b/kernel/drivers/dax/Makefile
index dc7422530..574286fac 100644
--- a/kernel/drivers/dax/Makefile
+++ b/kernel/drivers/dax/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DAX) += dax.o
 obj-$(CONFIG_DEV_DAX) += device_dax.o
 obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o
diff --git a/kernel/drivers/devfreq/Makefile b/kernel/drivers/devfreq/Makefile
index fbff40a50..32b8d4d3f 100644
--- a/kernel/drivers/devfreq/Makefile
+++ b/kernel/drivers/devfreq/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PM_DEVFREQ)	+= devfreq.o
 obj-$(CONFIG_PM_DEVFREQ_EVENT)	+= devfreq-event.o
 obj-$(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)	+= governor_simpleondemand.o
diff --git a/kernel/drivers/dio/dio.c b/kernel/drivers/dio/dio.c
index 0d0677f23..92e78d16b 100644
--- a/kernel/drivers/dio/dio.c
+++ b/kernel/drivers/dio/dio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Code to support devices on the DIO and DIO-II bus
  * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk>
  * Copyright (C) 2004 Jochen Friedrich <jochen@scram.de>
diff --git a/kernel/drivers/dma-buf/sync_trace.h b/kernel/drivers/dma-buf/sync_trace.h
index d13d59ff1..06e468a21 100644
--- a/kernel/drivers/dma-buf/sync_trace.h
+++ b/kernel/drivers/dma-buf/sync_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_INCLUDE_PATH ../../drivers/dma-buf
 #define TRACE_SYSTEM sync_trace
diff --git a/kernel/drivers/dma/Makefile b/kernel/drivers/dma/Makefile
index f08f8de1b..9d0156b50 100644
--- a/kernel/drivers/dma/Makefile
+++ b/kernel/drivers/dma/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #dmaengine debug flags
 subdir-ccflags-$(CONFIG_DMADEVICES_DEBUG)  := -DDEBUG
 subdir-ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
diff --git a/kernel/drivers/dma/bestcomm/Makefile b/kernel/drivers/dma/bestcomm/Makefile
index aed2df2a6..8d1b33a2f 100644
--- a/kernel/drivers/dma/bestcomm/Makefile
+++ b/kernel/drivers/dma/bestcomm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for BestComm & co
 #
diff --git a/kernel/drivers/dma/dmaengine.h b/kernel/drivers/dma/dmaengine.h
index 882ff9448..501c0b063 100644
--- a/kernel/drivers/dma/dmaengine.h
+++ b/kernel/drivers/dma/dmaengine.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The contents of this file are private to DMA engine drivers, and is not
  * part of the API to be used by DMA engine users.
diff --git a/kernel/drivers/dma/dw/Makefile b/kernel/drivers/dma/dw/Makefile
index 3eebd1ce2..2b949c2e4 100644
--- a/kernel/drivers/dma/dw/Makefile
+++ b/kernel/drivers/dma/dw/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DW_DMAC_CORE)	+= dw_dmac_core.o
 dw_dmac_core-objs	:= core.o
 
diff --git a/kernel/drivers/dma/qcom/Makefile b/kernel/drivers/dma/qcom/Makefile
index 4bfc38b45..1ae92da88 100644
--- a/kernel/drivers/dma/qcom/Makefile
+++ b/kernel/drivers/dma/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o
 obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mgmt.o
 hdma_mgmt-objs	 := hidma_mgmt.o hidma_mgmt_sys.o
diff --git a/kernel/drivers/dma/sh/Makefile b/kernel/drivers/dma/sh/Makefile
index f1e2fd64f..7d7c9491a 100644
--- a/kernel/drivers/dma/sh/Makefile
+++ b/kernel/drivers/dma/sh/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # DMA Engine Helpers
 #
diff --git a/kernel/drivers/edac/amd64_edac_dbg.c b/kernel/drivers/edac/amd64_edac_dbg.c
index 4709c6079..393be3351 100644
--- a/kernel/drivers/edac/amd64_edac_dbg.c
+++ b/kernel/drivers/edac/amd64_edac_dbg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "amd64_edac.h"
 
 #define EDAC_DCT_ATTR_SHOW(reg)						\
diff --git a/kernel/drivers/edac/amd64_edac_inj.c b/kernel/drivers/edac/amd64_edac_inj.c
index e14977ff9..d96d6116f 100644
--- a/kernel/drivers/edac/amd64_edac_inj.c
+++ b/kernel/drivers/edac/amd64_edac_inj.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "amd64_edac.h"
 
 static ssize_t amd64_inject_section_show(struct device *dev,
diff --git a/kernel/drivers/edac/edac_module.h b/kernel/drivers/edac/edac_module.h
index 014871e16..dec88dcea 100644
--- a/kernel/drivers/edac/edac_module.h
+++ b/kernel/drivers/edac/edac_module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  * edac_module.h
diff --git a/kernel/drivers/edac/mce_amd.h b/kernel/drivers/edac/mce_amd.h
index 0b6a68673..4e9c5e596 100644
--- a/kernel/drivers/edac/mce_amd.h
+++ b/kernel/drivers/edac/mce_amd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _EDAC_MCE_AMD_H
 #define _EDAC_MCE_AMD_H
 
diff --git a/kernel/drivers/eisa/Makefile b/kernel/drivers/eisa/Makefile
index 5369ce957..a1dd0eaec 100644
--- a/kernel/drivers/eisa/Makefile
+++ b/kernel/drivers/eisa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux device tree
 
 obj-$(CONFIG_EISA)	        += eisa-bus.o
diff --git a/kernel/drivers/extcon/Makefile b/kernel/drivers/extcon/Makefile
index a73624e76..0888fdede 100644
--- a/kernel/drivers/extcon/Makefile
+++ b/kernel/drivers/extcon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # Makefile for external connector class (extcon) devices
 #
diff --git a/kernel/drivers/extcon/extcon.h b/kernel/drivers/extcon/extcon.h
index dddddcfa0..61358479b 100644
--- a/kernel/drivers/extcon/extcon.h
+++ b/kernel/drivers/extcon/extcon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_EXTCON_INTERNAL_H__
 #define __LINUX_EXTCON_INTERNAL_H__
 
diff --git a/kernel/drivers/firewire/Makefile b/kernel/drivers/firewire/Makefile
index e3870d5c4..e58c8c794 100644
--- a/kernel/drivers/firewire/Makefile
+++ b/kernel/drivers/firewire/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux IEEE 1394 implementation
 #
diff --git a/kernel/drivers/firewire/core.h b/kernel/drivers/firewire/core.h
index c07962ead..0f0bed3a4 100644
--- a/kernel/drivers/firewire/core.h
+++ b/kernel/drivers/firewire/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FIREWIRE_CORE_H
 #define _FIREWIRE_CORE_H
 
diff --git a/kernel/drivers/firewire/nosy-user.h b/kernel/drivers/firewire/nosy-user.h
index e48aa6200..3446c5b77 100644
--- a/kernel/drivers/firewire/nosy-user.h
+++ b/kernel/drivers/firewire/nosy-user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __nosy_user_h
 #define __nosy_user_h
 
diff --git a/kernel/drivers/firewire/nosy.h b/kernel/drivers/firewire/nosy.h
index 078ff27f4..4078d69e9 100644
--- a/kernel/drivers/firewire/nosy.h
+++ b/kernel/drivers/firewire/nosy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Chip register definitions for PCILynx chipset.  Based on pcilynx.h
  * from the Linux 1394 drivers, but modified a bit so the names here
diff --git a/kernel/drivers/firewire/ohci.h b/kernel/drivers/firewire/ohci.h
index ef5e7336d..c4d005a99 100644
--- a/kernel/drivers/firewire/ohci.h
+++ b/kernel/drivers/firewire/ohci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FIREWIRE_OHCI_H
 #define _FIREWIRE_OHCI_H
 
diff --git a/kernel/drivers/firmware/Makefile b/kernel/drivers/firmware/Makefile
index a37f12e8d..feaa89019 100644
--- a/kernel/drivers/firmware/Makefile
+++ b/kernel/drivers/firmware/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/drivers/firmware/efi/Makefile b/kernel/drivers/firmware/efi/Makefile
index 0329d319d..269501dfb 100644
--- a/kernel/drivers/firmware/efi/Makefile
+++ b/kernel/drivers/firmware/efi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for linux kernel
 #
diff --git a/kernel/drivers/firmware/efi/libstub/Makefile b/kernel/drivers/firmware/efi/libstub/Makefile
index dedf9bde4..adaa4a964 100644
--- a/kernel/drivers/firmware/efi/libstub/Makefile
+++ b/kernel/drivers/firmware/efi/libstub/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # The stub may be linked into the kernel proper or into a separate boot binary,
 # but in either case, it executes before the kernel does (with MMU disabled) so
@@ -33,13 +34,14 @@ lib-y				:= efi-stub-helper.o gop.o secureboot.o
 lib-$(CONFIG_RESET_ATTACK_MITIGATION) += tpm.o
 
 # include the stub's generic dependencies from lib/ when building for ARM/arm64
-arm-deps := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c sort.c
+arm-deps-y := fdt_rw.c fdt_ro.c fdt_wip.c fdt.c fdt_empty_tree.c fdt_sw.c
+arm-deps-$(CONFIG_ARM64) += sort.c
 
 $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE
 	$(call if_changed_rule,cc_o_c)
 
 lib-$(CONFIG_EFI_ARMSTUB)	+= arm-stub.o fdt.o string.o random.o \
-				   $(patsubst %.c,lib-%.o,$(arm-deps))
+				   $(patsubst %.c,lib-%.o,$(arm-deps-y))
 
 lib-$(CONFIG_ARM)		+= arm32-stub.o
 lib-$(CONFIG_ARM64)		+= arm64-stub.o
@@ -90,5 +92,4 @@ quiet_cmd_stubcopy = STUBCPY $@
 # explicitly by the decompressor linker script.
 #
 STUBCOPY_FLAGS-$(CONFIG_ARM)	+= --rename-section .data=.data.efistub
-STUBCOPY_RM-$(CONFIG_ARM)	+= -R ___ksymtab+sort -R ___kcrctab+sort
 STUBCOPY_RELOC-$(CONFIG_ARM)	:= R_ARM_ABS
diff --git a/kernel/drivers/firmware/efi/libstub/arm-stub.c b/kernel/drivers/firmware/efi/libstub/arm-stub.c
index a94601d59..01a9d78ee 100644
--- a/kernel/drivers/firmware/efi/libstub/arm-stub.c
+++ b/kernel/drivers/firmware/efi/libstub/arm-stub.c
@@ -350,7 +350,9 @@ void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size,
 	 * The easiest way to find adjacent regions is to sort the memory map
 	 * before traversing it.
 	 */
-	sort(memory_map, map_size / desc_size, desc_size, cmp_mem_desc, NULL);
+	if (IS_ENABLED(CONFIG_ARM64))
+		sort(memory_map, map_size / desc_size, desc_size, cmp_mem_desc,
+		     NULL);
 
 	for (l = 0; l < map_size; l += desc_size, prev = in) {
 		u64 paddr, size;
@@ -367,7 +369,8 @@ void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size,
 		 * a 4k page size kernel to kexec a 64k page size kernel and
 		 * vice versa.
 		 */
-		if (!regions_are_adjacent(prev, in) ||
+		if ((IS_ENABLED(CONFIG_ARM64) &&
+		     !regions_are_adjacent(prev, in)) ||
 		    !regions_have_compatible_memory_type_attrs(prev, in)) {
 
 			paddr = round_down(in->phys_addr, SZ_64K);
diff --git a/kernel/drivers/firmware/efi/libstub/efistub.h b/kernel/drivers/firmware/efi/libstub/efistub.h
index 83f268c05..f59564b72 100644
--- a/kernel/drivers/firmware/efi/libstub/efistub.h
+++ b/kernel/drivers/firmware/efi/libstub/efistub.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _DRIVERS_FIRMWARE_EFI_EFISTUB_H
 #define _DRIVERS_FIRMWARE_EFI_EFISTUB_H
diff --git a/kernel/drivers/firmware/efi/libstub/string.c b/kernel/drivers/firmware/efi/libstub/string.c
index 09d5a0894..ed10e3f60 100644
--- a/kernel/drivers/firmware/efi/libstub/string.c
+++ b/kernel/drivers/firmware/efi/libstub/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Taken from:
  *  linux/lib/string.c
diff --git a/kernel/drivers/firmware/efi/memmap.c b/kernel/drivers/firmware/efi/memmap.c
index 78686443c..5fc70520e 100644
--- a/kernel/drivers/firmware/efi/memmap.c
+++ b/kernel/drivers/firmware/efi/memmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common EFI memory map functions.
  */
diff --git a/kernel/drivers/firmware/efi/reboot.c b/kernel/drivers/firmware/efi/reboot.c
index 22874544d..7effff969 100644
--- a/kernel/drivers/firmware/efi/reboot.c
+++ b/kernel/drivers/firmware/efi/reboot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Intel Corporation; author Matt Fleming
  * Copyright (c) 2014 Red Hat, Inc., Mark Salter <msalter@redhat.com>
diff --git a/kernel/drivers/firmware/efi/test/efi_test.h b/kernel/drivers/firmware/efi/test/efi_test.h
index a33a6c633..9812c6a02 100644
--- a/kernel/drivers/firmware/efi/test/efi_test.h
+++ b/kernel/drivers/firmware/efi/test/efi_test.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * EFI Test driver Header
  *
diff --git a/kernel/drivers/firmware/google/Makefile b/kernel/drivers/firmware/google/Makefile
index bc4de0220..dcd3675ef 100644
--- a/kernel/drivers/firmware/google/Makefile
+++ b/kernel/drivers/firmware/google/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_GOOGLE_SMI)		+= gsmi.o
 obj-$(CONFIG_GOOGLE_COREBOOT_TABLE)        += coreboot_table.o
diff --git a/kernel/drivers/fmc/Makefile b/kernel/drivers/fmc/Makefile
index e809322e1..e3da6192c 100644
--- a/kernel/drivers/fmc/Makefile
+++ b/kernel/drivers/fmc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_FMC) += fmc.o
 
diff --git a/kernel/drivers/fpga/Makefile b/kernel/drivers/fpga/Makefile
index e09895f05..f98dcf1d8 100644
--- a/kernel/drivers/fpga/Makefile
+++ b/kernel/drivers/fpga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the fpga framework and fpga manager drivers.
 #
diff --git a/kernel/drivers/gpio/Makefile b/kernel/drivers/gpio/Makefile
index aeb70e9de..8a2dfba3b 100644
--- a/kernel/drivers/gpio/Makefile
+++ b/kernel/drivers/gpio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # generic gpio support: platform drivers, dedicated expander chips, etc
 
 ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBUG
diff --git a/kernel/drivers/gpio/gpio-etraxfs.c b/kernel/drivers/gpio/gpio-etraxfs.c
index 14c6aac26..94db1bf4b 100644
--- a/kernel/drivers/gpio/gpio-etraxfs.c
+++ b/kernel/drivers/gpio/gpio-etraxfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio/driver.h>
diff --git a/kernel/drivers/gpio/gpio-ftgpio010.c b/kernel/drivers/gpio/gpio-ftgpio010.c
index e9386f8b6..139f73d3f 100644
--- a/kernel/drivers/gpio/gpio-ftgpio010.c
+++ b/kernel/drivers/gpio/gpio-ftgpio010.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Faraday Technolog FTGPIO010 gpiochip and interrupt routines
  * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
diff --git a/kernel/drivers/gpu/drm/Makefile b/kernel/drivers/gpu/drm/Makefile
index a8acc197d..8ce07039b 100644
--- a/kernel/drivers/gpu/drm/Makefile
+++ b/kernel/drivers/gpu/drm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/amd/amdgpu/Makefile b/kernel/drivers/gpu/drm/amd/amdgpu/Makefile
index 658bac0cd..567b0377e 100644
--- a/kernel/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/kernel/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index 1c88bd5e2..34c99a3c8 100644
--- a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_AMDGPU_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _AMDGPU_TRACE_H_
 
diff --git a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c
index 385b7e1d7..89680d554 100644
--- a/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c
+++ b/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Copyright Red Hat Inc 2010.
  * Author : Dave Airlie <airlied@redhat.com>
  */
diff --git a/kernel/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/kernel/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 430a6b4df..62cd16a23 100644
--- a/kernel/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/kernel/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -93,6 +93,10 @@ static int uvd_v6_0_early_init(void *handle)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+	if (!(adev->flags & AMD_IS_APU) &&
+	    (RREG32_SMC(ixCC_HARVEST_FUSES) & CC_HARVEST_FUSES__UVD_DISABLE_MASK))
+		return -ENOENT;
+
 	uvd_v6_0_set_ring_funcs(adev);
 	uvd_v6_0_set_irq_funcs(adev);
 
diff --git a/kernel/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/kernel/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 90332f55c..cf81065e3 100644
--- a/kernel/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/kernel/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -365,15 +365,10 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
 {
 	u32 tmp;
 
-	/* Fiji, Stoney, Polaris10, Polaris11, Polaris12 are single pipe */
 	if ((adev->asic_type == CHIP_FIJI) ||
-	    (adev->asic_type == CHIP_STONEY) ||
-	    (adev->asic_type == CHIP_POLARIS10) ||
-	    (adev->asic_type == CHIP_POLARIS11) ||
-	    (adev->asic_type == CHIP_POLARIS12))
+	    (adev->asic_type == CHIP_STONEY))
 		return AMDGPU_VCE_HARVEST_VCE1;
 
-	/* Tonga and CZ are dual or single pipe */
 	if (adev->flags & AMD_IS_APU)
 		tmp = (RREG32_SMC(ixVCE_HARVEST_FUSE_MACRO__ADDRESS) &
 		       VCE_HARVEST_FUSE_MACRO__MASK) >>
@@ -391,6 +386,11 @@ static unsigned vce_v3_0_get_harvest_config(struct amdgpu_device *adev)
 	case 3:
 		return AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1;
 	default:
+		if ((adev->asic_type == CHIP_POLARIS10) ||
+		    (adev->asic_type == CHIP_POLARIS11) ||
+		    (adev->asic_type == CHIP_POLARIS12))
+			return AMDGPU_VCE_HARVEST_VCE1;
+
 		return 0;
 	}
 }
diff --git a/kernel/drivers/gpu/drm/amd/amdkfd/Makefile b/kernel/drivers/gpu/drm/amd/amdkfd/Makefile
index b400d5664..7bb0bc0ca 100644
--- a/kernel/drivers/gpu/drm/amd/amdkfd/Makefile
+++ b/kernel/drivers/gpu/drm/amd/amdkfd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Heterogenous System Architecture support for AMD GPU devices
 #
diff --git a/kernel/drivers/gpu/drm/amd/powerplay/Makefile b/kernel/drivers/gpu/drm/amd/powerplay/Makefile
index 4e132b936..72d5f5050 100644
--- a/kernel/drivers/gpu/drm/amd/powerplay/Makefile
+++ b/kernel/drivers/gpu/drm/amd/powerplay/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 subdir-ccflags-y += \
 		-I$(FULL_AMD_PATH)/powerplay/inc/  \
diff --git a/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile b/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
index f0277c16c..d13fdadbb 100644
--- a/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
+++ b/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the 'hw manager' sub-component of powerplay.
 # It provides the hardware management services for the driver.
diff --git a/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c b/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c
index d09f25485..e0766c5e3 100644
--- a/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c
+++ b/kernel/drivers/gpu/drm/amd/powerplay/hwmgr/pp_overdriver.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "pp_overdriver.h"
 #include <linux/errno.h>
 
diff --git a/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72.h b/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72.h
index b73d6b59a..08cd70c75 100644
--- a/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72.h
+++ b/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SMU72_H
 #define SMU72_H
 
diff --git a/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h b/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h
index 98f76e925..b2edbc0c3 100644
--- a/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h
+++ b/kernel/drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SMU72_DISCRETE_H
 #define SMU72_DISCRETE_H
 
diff --git a/kernel/drivers/gpu/drm/amd/powerplay/smumgr/Makefile b/kernel/drivers/gpu/drm/amd/powerplay/smumgr/Makefile
index 1703bbefb..e7ad45297 100644
--- a/kernel/drivers/gpu/drm/amd/powerplay/smumgr/Makefile
+++ b/kernel/drivers/gpu/drm/amd/powerplay/smumgr/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the 'smu manager' sub-component of powerplay.
 # It provides the smu management services for the driver.
diff --git a/kernel/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h b/kernel/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
index 8bd38102b..283a0dc25 100644
--- a/kernel/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
+++ b/kernel/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _GPU_SCHED_TRACE_H_
 
diff --git a/kernel/drivers/gpu/drm/arm/hdlcd_drv.h b/kernel/drivers/gpu/drm/arm/hdlcd_drv.h
index e3950a071..56f34dfff 100644
--- a/kernel/drivers/gpu/drm/arm/hdlcd_drv.h
+++ b/kernel/drivers/gpu/drm/arm/hdlcd_drv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ARM HDLCD Controller register definition
  */
diff --git a/kernel/drivers/gpu/drm/armada/Makefile b/kernel/drivers/gpu/drm/armada/Makefile
index 64c0b4546..1ab4cf863 100644
--- a/kernel/drivers/gpu/drm/armada/Makefile
+++ b/kernel/drivers/gpu/drm/armada/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 armada-y	:= armada_crtc.o armada_drv.o armada_fb.o armada_fbdev.o \
 		   armada_gem.o armada_overlay.o armada_trace.o
 armada-y	+= armada_510.o
diff --git a/kernel/drivers/gpu/drm/armada/armada_trace.c b/kernel/drivers/gpu/drm/armada/armada_trace.c
index 068b336ba..c64cce325 100644
--- a/kernel/drivers/gpu/drm/armada/armada_trace.c
+++ b/kernel/drivers/gpu/drm/armada/armada_trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
 #include "armada_trace.h"
diff --git a/kernel/drivers/gpu/drm/armada/armada_trace.h b/kernel/drivers/gpu/drm/armada/armada_trace.h
index dc0cba70f..1e9f55fc8 100644
--- a/kernel/drivers/gpu/drm/armada/armada_trace.h
+++ b/kernel/drivers/gpu/drm/armada/armada_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(ARMADA_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define ARMADA_TRACE_H
 
diff --git a/kernel/drivers/gpu/drm/ast/ast_dp501.c b/kernel/drivers/gpu/drm/ast/ast_dp501.c
index 749646ae3..4c7375b45 100644
--- a/kernel/drivers/gpu/drm/ast/ast_dp501.c
+++ b/kernel/drivers/gpu/drm/ast/ast_dp501.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/firmware.h>
 #include <drm/drmP.h>
diff --git a/kernel/drivers/gpu/drm/ast/ast_dram_tables.h b/kernel/drivers/gpu/drm/ast/ast_dram_tables.h
index 1d9c4e75d..1e9ac9d6d 100644
--- a/kernel/drivers/gpu/drm/ast/ast_dram_tables.h
+++ b/kernel/drivers/gpu/drm/ast/ast_dram_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AST_DRAM_TABLES_H
 #define AST_DRAM_TABLES_H
 
diff --git a/kernel/drivers/gpu/drm/atmel-hlcdc/Makefile b/kernel/drivers/gpu/drm/atmel-hlcdc/Makefile
index bb5f8507a..49dc89f36 100644
--- a/kernel/drivers/gpu/drm/atmel-hlcdc/Makefile
+++ b/kernel/drivers/gpu/drm/atmel-hlcdc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 atmel-hlcdc-dc-y := atmel_hlcdc_crtc.o \
 		atmel_hlcdc_dc.o \
 		atmel_hlcdc_output.o \
diff --git a/kernel/drivers/gpu/drm/bochs/bochs.h b/kernel/drivers/gpu/drm/bochs/bochs.h
index 76c490c3c..375bf92cd 100644
--- a/kernel/drivers/gpu/drm/bochs/bochs.h
+++ b/kernel/drivers/gpu/drm/bochs/bochs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/io.h>
 #include <linux/console.h>
 
diff --git a/kernel/drivers/gpu/drm/bridge/Makefile b/kernel/drivers/gpu/drm/bridge/Makefile
index defcf1e7c..60dab87e4 100644
--- a/kernel/drivers/gpu/drm/bridge/Makefile
+++ b/kernel/drivers/gpu/drm/bridge/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o
 obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o
 obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o
diff --git a/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
index fd1f745c6..63b5756f4 100644
--- a/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
+++ b/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DW_HDMI_AUDIO_H
 #define DW_HDMI_AUDIO_H
 
diff --git a/kernel/drivers/gpu/drm/drm_trace.h b/kernel/drivers/gpu/drm/drm_trace.h
index 14c5a7776..a8370775e 100644
--- a/kernel/drivers/gpu/drm/drm_trace.h
+++ b/kernel/drivers/gpu/drm/drm_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_DRM_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
 #define _DRM_TRACE_H_
 
diff --git a/kernel/drivers/gpu/drm/etnaviv/Makefile b/kernel/drivers/gpu/drm/etnaviv/Makefile
index 4f76c9920..ab3f55183 100644
--- a/kernel/drivers/gpu/drm/etnaviv/Makefile
+++ b/kernel/drivers/gpu/drm/etnaviv/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 etnaviv-y := \
 	etnaviv_buffer.o \
 	etnaviv_cmd_parser.o \
diff --git a/kernel/drivers/gpu/drm/etnaviv/state.xml.h b/kernel/drivers/gpu/drm/etnaviv/state.xml.h
index 368218304..c27c1484c 100644
--- a/kernel/drivers/gpu/drm/etnaviv/state.xml.h
+++ b/kernel/drivers/gpu/drm/etnaviv/state.xml.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef STATE_XML
 #define STATE_XML
 
diff --git a/kernel/drivers/gpu/drm/etnaviv/state_3d.xml.h b/kernel/drivers/gpu/drm/etnaviv/state_3d.xml.h
index d7146fd13..73a97d35c 100644
--- a/kernel/drivers/gpu/drm/etnaviv/state_3d.xml.h
+++ b/kernel/drivers/gpu/drm/etnaviv/state_3d.xml.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef STATE_3D_XML
 #define STATE_3D_XML
 
diff --git a/kernel/drivers/gpu/drm/etnaviv/state_hi.xml.h b/kernel/drivers/gpu/drm/etnaviv/state_hi.xml.h
index 43c73e2ed..60808daf7 100644
--- a/kernel/drivers/gpu/drm/etnaviv/state_hi.xml.h
+++ b/kernel/drivers/gpu/drm/etnaviv/state_hi.xml.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef STATE_HI_XML
 #define STATE_HI_XML
 
diff --git a/kernel/drivers/gpu/drm/exynos/Makefile b/kernel/drivers/gpu/drm/exynos/Makefile
index f663490e9..bdf4212dd 100644
--- a/kernel/drivers/gpu/drm/exynos/Makefile
+++ b/kernel/drivers/gpu/drm/exynos/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/fsl-dcu/Makefile b/kernel/drivers/gpu/drm/fsl-dcu/Makefile
index aca34f656..b55c4482d 100644
--- a/kernel/drivers/gpu/drm/fsl-dcu/Makefile
+++ b/kernel/drivers/gpu/drm/fsl-dcu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 fsl-dcu-drm-y := fsl_dcu_drm_drv.o \
 		 fsl_dcu_drm_kms.o \
 		 fsl_dcu_drm_rgb.o \
diff --git a/kernel/drivers/gpu/drm/gma500/Makefile b/kernel/drivers/gpu/drm/gma500/Makefile
index c1c8dc18a..c8f2c89be 100644
--- a/kernel/drivers/gpu/drm/gma500/Makefile
+++ b/kernel/drivers/gpu/drm/gma500/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 #	KMS driver for the GMA500
 #
diff --git a/kernel/drivers/gpu/drm/i2c/Makefile b/kernel/drivers/gpu/drm/i2c/Makefile
index a77acfc18..b20100c18 100644
--- a/kernel/drivers/gpu/drm/i2c/Makefile
+++ b/kernel/drivers/gpu/drm/i2c/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
 
diff --git a/kernel/drivers/gpu/drm/i915/Makefile b/kernel/drivers/gpu/drm/i915/Makefile
index da59c6a7c..635b8c666 100644
--- a/kernel/drivers/gpu/drm/i915/Makefile
+++ b/kernel/drivers/gpu/drm/i915/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/i915/gvt/Makefile b/kernel/drivers/gpu/drm/i915/gvt/Makefile
index f5486cb94..2641ba510 100644
--- a/kernel/drivers/gpu/drm/i915/gvt/Makefile
+++ b/kernel/drivers/gpu/drm/i915/gvt/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 GVT_DIR := gvt
 GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \
 	interrupt.o gtt.o cfg_space.o opregion.o mmio.o display.o edid.o \
diff --git a/kernel/drivers/gpu/drm/i915/i915_gem.c b/kernel/drivers/gpu/drm/i915/i915_gem.c
index ee42a5f69..a558aab31 100644
--- a/kernel/drivers/gpu/drm/i915/i915_gem.c
+++ b/kernel/drivers/gpu/drm/i915/i915_gem.c
@@ -2214,8 +2214,10 @@ static void __i915_gem_object_reset_page_iter(struct drm_i915_gem_object *obj)
 	struct radix_tree_iter iter;
 	void __rcu **slot;
 
+	rcu_read_lock();
 	radix_tree_for_each_slot(slot, &obj->mm.get_page.radix, &iter, 0)
 		radix_tree_delete(&obj->mm.get_page.radix, iter.index);
+	rcu_read_unlock();
 }
 
 void __i915_gem_object_put_pages(struct drm_i915_gem_object *obj,
diff --git a/kernel/drivers/gpu/drm/i915/i915_gem_context.c b/kernel/drivers/gpu/drm/i915/i915_gem_context.c
index 0d1470407..00871aa29 100644
--- a/kernel/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/kernel/drivers/gpu/drm/i915/i915_gem_context.c
@@ -104,6 +104,7 @@ static void lut_close(struct i915_gem_context *ctx)
 		kmem_cache_free(ctx->i915->luts, lut);
 	}
 
+	rcu_read_lock();
 	radix_tree_for_each_slot(slot, &ctx->handles_vma, &iter, 0) {
 		struct i915_vma *vma = rcu_dereference_raw(*slot);
 		struct drm_i915_gem_object *obj = vma->obj;
@@ -115,6 +116,7 @@ static void lut_close(struct i915_gem_context *ctx)
 
 		__i915_gem_object_release_unless_active(obj);
 	}
+	rcu_read_unlock();
 }
 
 static void i915_gem_context_free(struct i915_gem_context *ctx)
diff --git a/kernel/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/kernel/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 92437f455..4ac454ae5 100644
--- a/kernel/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/kernel/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -337,6 +337,10 @@ eb_vma_misplaced(const struct drm_i915_gem_exec_object2 *entry,
 	    (vma->node.start + vma->node.size - 1) >> 32)
 		return true;
 
+	if (flags & __EXEC_OBJECT_NEEDS_MAP &&
+	    !i915_vma_is_map_and_fenceable(vma))
+		return true;
+
 	return false;
 }
 
diff --git a/kernel/drivers/gpu/drm/i915/i915_trace.h b/kernel/drivers/gpu/drm/i915/i915_trace.h
index 6fd5c57e2..ef72da74b 100644
--- a/kernel/drivers/gpu/drm/i915/i915_trace.h
+++ b/kernel/drivers/gpu/drm/i915/i915_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
 #define _I915_TRACE_H_
 
diff --git a/kernel/drivers/gpu/drm/i915/i915_trace_points.c b/kernel/drivers/gpu/drm/i915/i915_trace_points.c
index f1df2bd4e..463a71779 100644
--- a/kernel/drivers/gpu/drm/i915/i915_trace_points.c
+++ b/kernel/drivers/gpu/drm/i915/i915_trace_points.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright © 2009 Intel Corporation
  *
diff --git a/kernel/drivers/gpu/drm/i915/intel_acpi.c b/kernel/drivers/gpu/drm/i915/intel_acpi.c
index 42fb436f6..d1abf4bb7 100644
--- a/kernel/drivers/gpu/drm/i915/intel_acpi.c
+++ b/kernel/drivers/gpu/drm/i915/intel_acpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intel ACPI functions
  *
diff --git a/kernel/drivers/gpu/drm/i915/intel_display.c b/kernel/drivers/gpu/drm/i915/intel_display.c
index 5c7828c52..5ebdb6333 100644
--- a/kernel/drivers/gpu/drm/i915/intel_display.c
+++ b/kernel/drivers/gpu/drm/i915/intel_display.c
@@ -15227,6 +15227,23 @@ void intel_connector_unregister(struct drm_connector *connector)
 	intel_panel_destroy_backlight(connector);
 }
 
+static void intel_hpd_poll_fini(struct drm_device *dev)
+{
+	struct intel_connector *connector;
+	struct drm_connector_list_iter conn_iter;
+
+	/* First disable polling... */
+	drm_kms_helper_poll_fini(dev);
+
+	/* Then kill the work that may have been queued by hpd. */
+	drm_connector_list_iter_begin(dev, &conn_iter);
+	for_each_intel_connector_iter(connector, &conn_iter) {
+		if (connector->modeset_retry_work.func)
+			cancel_work_sync(&connector->modeset_retry_work);
+	}
+	drm_connector_list_iter_end(&conn_iter);
+}
+
 void intel_modeset_cleanup(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -15247,7 +15264,7 @@ void intel_modeset_cleanup(struct drm_device *dev)
 	 * Due to the hpd irq storm handling the hotplug work can re-arm the
 	 * poll handlers. Hence disable polling after hpd handling is shut down.
 	 */
-	drm_kms_helper_poll_fini(dev);
+	intel_hpd_poll_fini(dev);
 
 	/* poll work can call into fbdev, hence clean that up afterwards */
 	intel_fbdev_fini(dev_priv);
diff --git a/kernel/drivers/gpu/drm/i915/intel_dp.c b/kernel/drivers/gpu/drm/i915/intel_dp.c
index 203198659..09f274419 100644
--- a/kernel/drivers/gpu/drm/i915/intel_dp.c
+++ b/kernel/drivers/gpu/drm/i915/intel_dp.c
@@ -3731,9 +3731,16 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)
 
 	}
 
-	/* Read the eDP Display control capabilities registers */
-	if ((intel_dp->dpcd[DP_EDP_CONFIGURATION_CAP] & DP_DPCD_DISPLAY_CONTROL_CAPABLE) &&
-	    drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,
+	/*
+	 * Read the eDP display control registers.
+	 *
+	 * Do this independent of DP_DPCD_DISPLAY_CONTROL_CAPABLE bit in
+	 * DP_EDP_CONFIGURATION_CAP, because some buggy displays do not have it
+	 * set, but require eDP 1.4+ detection (e.g. for supported link rates
+	 * method). The display control registers should read zero if they're
+	 * not supported anyway.
+	 */
+	if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,
 			     intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) ==
 			     sizeof(intel_dp->edp_dpcd))
 		DRM_DEBUG_KMS("EDP DPCD : %*ph\n", (int) sizeof(intel_dp->edp_dpcd),
diff --git a/kernel/drivers/gpu/drm/i915/intel_drv.h b/kernel/drivers/gpu/drm/i915/intel_drv.h
index fa4728591..79fbaf78f 100644
--- a/kernel/drivers/gpu/drm/i915/intel_drv.h
+++ b/kernel/drivers/gpu/drm/i915/intel_drv.h
@@ -496,7 +496,6 @@ struct intel_crtc_scaler_state {
 
 struct intel_pipe_wm {
 	struct intel_wm_level wm[5];
-	struct intel_wm_level raw_wm[5];
 	uint32_t linetime;
 	bool fbc_wm_enabled;
 	bool pipe_enabled;
diff --git a/kernel/drivers/gpu/drm/i915/intel_pm.c b/kernel/drivers/gpu/drm/i915/intel_pm.c
index 0a09f8ff6..cb950752c 100644
--- a/kernel/drivers/gpu/drm/i915/intel_pm.c
+++ b/kernel/drivers/gpu/drm/i915/intel_pm.c
@@ -2716,9 +2716,9 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv,
 				 const struct intel_crtc *intel_crtc,
 				 int level,
 				 struct intel_crtc_state *cstate,
-				 struct intel_plane_state *pristate,
-				 struct intel_plane_state *sprstate,
-				 struct intel_plane_state *curstate,
+				 const struct intel_plane_state *pristate,
+				 const struct intel_plane_state *sprstate,
+				 const struct intel_plane_state *curstate,
 				 struct intel_wm_level *result)
 {
 	uint16_t pri_latency = dev_priv->wm.pri_latency[level];
@@ -3038,28 +3038,24 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
 	struct intel_pipe_wm *pipe_wm;
 	struct drm_device *dev = state->dev;
 	const struct drm_i915_private *dev_priv = to_i915(dev);
-	struct intel_plane *intel_plane;
-	struct intel_plane_state *pristate = NULL;
-	struct intel_plane_state *sprstate = NULL;
-	struct intel_plane_state *curstate = NULL;
+	struct drm_plane *plane;
+	const struct drm_plane_state *plane_state;
+	const struct intel_plane_state *pristate = NULL;
+	const struct intel_plane_state *sprstate = NULL;
+	const struct intel_plane_state *curstate = NULL;
 	int level, max_level = ilk_wm_max_level(dev_priv), usable_level;
 	struct ilk_wm_maximums max;
 
 	pipe_wm = &cstate->wm.ilk.optimal;
 
-	for_each_intel_plane_on_crtc(dev, intel_crtc, intel_plane) {
-		struct intel_plane_state *ps;
+	drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, &cstate->base) {
+		const struct intel_plane_state *ps = to_intel_plane_state(plane_state);
 
-		ps = intel_atomic_get_existing_plane_state(state,
-							   intel_plane);
-		if (!ps)
-			continue;
-
-		if (intel_plane->base.type == DRM_PLANE_TYPE_PRIMARY)
+		if (plane->type == DRM_PLANE_TYPE_PRIMARY)
 			pristate = ps;
-		else if (intel_plane->base.type == DRM_PLANE_TYPE_OVERLAY)
+		else if (plane->type == DRM_PLANE_TYPE_OVERLAY)
 			sprstate = ps;
-		else if (intel_plane->base.type == DRM_PLANE_TYPE_CURSOR)
+		else if (plane->type == DRM_PLANE_TYPE_CURSOR)
 			curstate = ps;
 	}
 
@@ -3081,11 +3077,9 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
 	if (pipe_wm->sprites_scaled)
 		usable_level = 0;
 
-	ilk_compute_wm_level(dev_priv, intel_crtc, 0, cstate,
-			     pristate, sprstate, curstate, &pipe_wm->raw_wm[0]);
-
 	memset(&pipe_wm->wm, 0, sizeof(pipe_wm->wm));
-	pipe_wm->wm[0] = pipe_wm->raw_wm[0];
+	ilk_compute_wm_level(dev_priv, intel_crtc, 0, cstate,
+			     pristate, sprstate, curstate, &pipe_wm->wm[0]);
 
 	if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
 		pipe_wm->linetime = hsw_compute_linetime_wm(cstate);
@@ -3095,8 +3089,8 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
 
 	ilk_compute_wm_reg_maximums(dev_priv, 1, &max);
 
-	for (level = 1; level <= max_level; level++) {
-		struct intel_wm_level *wm = &pipe_wm->raw_wm[level];
+	for (level = 1; level <= usable_level; level++) {
+		struct intel_wm_level *wm = &pipe_wm->wm[level];
 
 		ilk_compute_wm_level(dev_priv, intel_crtc, level, cstate,
 				     pristate, sprstate, curstate, wm);
@@ -3106,13 +3100,10 @@ static int ilk_compute_pipe_wm(struct intel_crtc_state *cstate)
 		 * register maximums since such watermarks are
 		 * always invalid.
 		 */
-		if (level > usable_level)
-			continue;
-
-		if (ilk_validate_wm_level(level, &max, wm))
-			pipe_wm->wm[level] = *wm;
-		else
-			usable_level = level;
+		if (!ilk_validate_wm_level(level, &max, wm)) {
+			memset(wm, 0, sizeof(*wm));
+			break;
+		}
 	}
 
 	return 0;
diff --git a/kernel/drivers/gpu/drm/i915/intel_ringbuffer.h b/kernel/drivers/gpu/drm/i915/intel_ringbuffer.h
index 02d8974bf..6b2067f10 100644
--- a/kernel/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/kernel/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INTEL_RINGBUFFER_H_
 #define _INTEL_RINGBUFFER_H_
 
diff --git a/kernel/drivers/gpu/drm/i915/selftests/i915_live_selftests.h b/kernel/drivers/gpu/drm/i915/selftests/i915_live_selftests.h
index 18b174d85..1519f1b78 100644
--- a/kernel/drivers/gpu/drm/i915/selftests/i915_live_selftests.h
+++ b/kernel/drivers/gpu/drm/i915/selftests/i915_live_selftests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* List each unit test as selftest(name, function)
  *
  * The name is used as both an enum and expanded as subtest__name to create
diff --git a/kernel/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h b/kernel/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
index fc7468750..e5a9e5dcf 100644
--- a/kernel/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
+++ b/kernel/drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* List each unit test as selftest(name, function)
  *
  * The name is used as both an enum and expanded as subtest__name to create
diff --git a/kernel/drivers/gpu/drm/i915/selftests/mock_gem_device.h b/kernel/drivers/gpu/drm/i915/selftests/mock_gem_device.h
index 4cca4d57f..b5dc4e394 100644
--- a/kernel/drivers/gpu/drm/i915/selftests/mock_gem_device.h
+++ b/kernel/drivers/gpu/drm/i915/selftests/mock_gem_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MOCK_GEM_DEVICE_H__
 #define __MOCK_GEM_DEVICE_H__
 
diff --git a/kernel/drivers/gpu/drm/i915/selftests/mock_gem_object.h b/kernel/drivers/gpu/drm/i915/selftests/mock_gem_object.h
index 9fbf67321..20acdbee7 100644
--- a/kernel/drivers/gpu/drm/i915/selftests/mock_gem_object.h
+++ b/kernel/drivers/gpu/drm/i915/selftests/mock_gem_object.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MOCK_GEM_OBJECT_H__
 #define __MOCK_GEM_OBJECT_H__
 
diff --git a/kernel/drivers/gpu/drm/imx/Makefile b/kernel/drivers/gpu/drm/imx/Makefile
index 16ecef33e..ab6c83cac 100644
--- a/kernel/drivers/gpu/drm/imx/Makefile
+++ b/kernel/drivers/gpu/drm/imx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 imxdrm-objs := imx-drm-core.o ipuv3-crtc.o ipuv3-plane.o
 
diff --git a/kernel/drivers/gpu/drm/imx/imx-drm.h b/kernel/drivers/gpu/drm/imx/imx-drm.h
index f6dd64be9..f0b7556c0 100644
--- a/kernel/drivers/gpu/drm/imx/imx-drm.h
+++ b/kernel/drivers/gpu/drm/imx/imx-drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IMX_DRM_H_
 #define _IMX_DRM_H_
 
diff --git a/kernel/drivers/gpu/drm/imx/ipuv3-plane.h b/kernel/drivers/gpu/drm/imx/ipuv3-plane.h
index 596b24ddb..e563ea17a 100644
--- a/kernel/drivers/gpu/drm/imx/ipuv3-plane.h
+++ b/kernel/drivers/gpu/drm/imx/ipuv3-plane.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IPUV3_PLANE_H__
 #define __IPUV3_PLANE_H__
 
diff --git a/kernel/drivers/gpu/drm/lib/drm_random.c b/kernel/drivers/gpu/drm/lib/drm_random.c
index a78c4b483..eeb155826 100644
--- a/kernel/drivers/gpu/drm/lib/drm_random.c
+++ b/kernel/drivers/gpu/drm/lib/drm_random.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/kernel.h>
 #include <linux/random.h>
diff --git a/kernel/drivers/gpu/drm/lib/drm_random.h b/kernel/drivers/gpu/drm/lib/drm_random.h
index a78644bea..4a3e94dfa 100644
--- a/kernel/drivers/gpu/drm/lib/drm_random.h
+++ b/kernel/drivers/gpu/drm/lib/drm_random.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRM_RANDOM_H__
 #define __DRM_RANDOM_H__
 
diff --git a/kernel/drivers/gpu/drm/mediatek/Makefile b/kernel/drivers/gpu/drm/mediatek/Makefile
index e37b55a23..ce83c396a 100644
--- a/kernel/drivers/gpu/drm/mediatek/Makefile
+++ b/kernel/drivers/gpu/drm/mediatek/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 mediatek-drm-y := mtk_disp_color.o \
 		  mtk_disp_ovl.o \
 		  mtk_disp_rdma.o \
diff --git a/kernel/drivers/gpu/drm/mgag200/mgag200_reg.h b/kernel/drivers/gpu/drm/mgag200/mgag200_reg.h
index 3ae442a64..c096a9d6b 100644
--- a/kernel/drivers/gpu/drm/mgag200/mgag200_reg.h
+++ b/kernel/drivers/gpu/drm/mgag200/mgag200_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * MGA Millennium (MGA2064W) functions
  * MGA Mystique (MGA1064SG) functions
diff --git a/kernel/drivers/gpu/drm/msm/Makefile b/kernel/drivers/gpu/drm/msm/Makefile
index 33008fa1b..ced70783b 100644
--- a/kernel/drivers/gpu/drm/msm/Makefile
+++ b/kernel/drivers/gpu/drm/msm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Idrivers/gpu/drm/msm
 ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi
 
diff --git a/kernel/drivers/gpu/drm/nouveau/dispnv04/cursor.c b/kernel/drivers/gpu/drm/nouveau/dispnv04/cursor.c
index f26e44ea7..ebf860bd5 100644
--- a/kernel/drivers/gpu/drm/nouveau/dispnv04/cursor.c
+++ b/kernel/drivers/gpu/drm/nouveau/dispnv04/cursor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <drm/drmP.h>
 #include <drm/drm_mode.h>
 #include "nouveau_drv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.h b/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.h
index 74a8795c2..f74f1f2b1 100644
--- a/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.h
+++ b/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV04_DISPLAY_H__
 #define __NV04_DISPLAY_H__
 #include <subdev/bios.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0002.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0002.h
index 6d72ed38d..1a8b45b46 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0002.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0002.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL0002_H__
 #define __NVIF_CL0002_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0046.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0046.h
index a6a71f4ad..c0d5eba4f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0046.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0046.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL0046_H__
 #define __NVIF_CL0046_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl006b.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl006b.h
index 309ab8a3d..d0e8f35d9 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl006b.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl006b.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL006B_H__
 #define __NVIF_CL006B_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0080.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0080.h
index 287a7d6fa..2740278d2 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0080.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl0080.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL0080_H__
 #define __NVIF_CL0080_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506e.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506e.h
index aa94b8cf9..b4cd58093 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506e.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL506E_H__
 #define __NVIF_CL506E_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506f.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506f.h
index 3b7101966..14d20c813 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506f.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl506f.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL506F_H__
 #define __NVIF_CL506F_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl5070.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl5070.h
index 542d95145..7cdf53615 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl5070.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl5070.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL5070_H__
 #define __NVIF_CL5070_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507a.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507a.h
index 12e0643b7..36e537218 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507a.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507a.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL507A_H__
 #define __NVIF_CL507A_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507b.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507b.h
index 99e9d8c47..3e643b752 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507b.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507b.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL507B_H__
 #define __NVIF_CL507B_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507c.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507c.h
index 6af70dbdf..fd9e336d0 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507c.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL507C_H__
 #define __NVIF_CL507C_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507d.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507d.h
index 5ab0c9e4c..e994c6894 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507d.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL507D_H__
 #define __NVIF_CL507D_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507e.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507e.h
index c06209f3c..8082d2fde 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507e.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl507e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL507E_H__
 #define __NVIF_CL507E_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826e.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
index 91e33db21..36944ff09 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826e.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL826E_H__
 #define __NVIF_CL826E_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826f.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826f.h
index e34efd4ec..df09a5081 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826f.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl826f.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL826F_H__
 #define __NVIF_CL826F_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl906f.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl906f.h
index a2d5410a4..6d16a3a2e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl906f.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl906f.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL906F_H__
 #define __NVIF_CL906F_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl9097.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl9097.h
index 4057676d2..e4c8de6d0 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cl9097.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cl9097.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CL9097_H__
 #define __NVIF_CL9097_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/cla06f.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
index 2efa3d048..597ebb52d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CLA06F_H__
 #define __NVIF_CLA06F_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/class.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/class.h
index d08da82ba..e3a2ea8bd 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/class.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CLASS_H__
 #define __NVIF_CLASS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/client.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/client.h
index b52a8eadc..f5df8b30c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/client.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_CLIENT_H__
 #define __NVIF_CLIENT_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/device.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/device.h
index bcb981711..09439b037 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/device.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_DEVICE_H__
 #define __NVIF_DEVICE_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/driver.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/driver.h
index 0c6f48d81..93bccd45a 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/driver.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_DRIVER_H__
 #define __NVIF_DRIVER_H__
 #include <nvif/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/event.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/event.h
index 21764499b..ec5c924f5 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/event.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_EVENT_H__
 #define __NVIF_EVENT_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0000.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0000.h
index c2c0fc41e..30ecd31db 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0000.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IF0000_H__
 #define __NVIF_IF0000_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0001.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0001.h
index bd5b64125..ca9215262 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0001.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0001.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IF0001_H__
 #define __NVIF_IF0001_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0002.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0002.h
index c04c91d0b..d9235c011 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0002.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0002.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IF0002_H__
 #define __NVIF_IF0002_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0003.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0003.h
index 0cd03efb8..ae30b8261 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0003.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0003.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IF0003_H__
 #define __NVIF_IF0003_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0004.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0004.h
index bd5cd428c..b35547c8e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0004.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0004.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IF0004_H__
 #define __NVIF_IF0004_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0005.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0005.h
index abfd373bb..8ed0ae101 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/if0005.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/if0005.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IF0005_H__
 #define __NVIF_IF0005_H__
 #define NV10_NVSW_NTFY_UEVENT                                              0x00
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/ioctl.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/ioctl.h
index c5f5eb83a..688c4bcd9 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/ioctl.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_IOCTL_H__
 #define __NVIF_IOCTL_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/notify.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/notify.h
index 51e2eb580..4ed169230 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/notify.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/notify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_NOTIFY_H__
 #define __NVIF_NOTIFY_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/object.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/object.h
index 9e58b305b..6912b8cff 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/object.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/object.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_OBJECT_H__
 #define __NVIF_OBJECT_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/os.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/os.h
index 9fcab67c8..6b16ab6b2 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/os.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/os.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_OS_H__
 #define __NOUVEAU_OS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvif/unpack.h b/kernel/drivers/gpu/drm/nouveau/include/nvif/unpack.h
index 751bcf493..7f0d9f6cc 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvif/unpack.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvif/unpack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVIF_UNPACK_H__
 #define __NVIF_UNPACK_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
index e876634da..ca23230d5 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CLIENT_H__
 #define __NVKM_CLIENT_H__
 #define nvkm_client(p) container_of((p), struct nvkm_client, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h
index c59fd4e2a..966d1822d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEBUG_H__
 #define __NVKM_DEBUG_H__
 #define NV_DBG_FATAL    0
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index bb4c214f1..d7ecb65ba 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVICE_H__
 #define __NVKM_DEVICE_H__
 #include <core/event.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
index d4cd2fbfd..c6bcd8a64 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_ENGINE_H__
 #define __NVKM_ENGINE_H__
 #define nvkm_engine(p) container_of((p), struct nvkm_engine, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
index 40429a82f..38acbde2d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/enum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_ENUM_H__
 #define __NVKM_ENUM_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/event.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/event.h
index b98fe2de5..d3c45e90a 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/event.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_EVENT_H__
 #define __NVKM_EVENT_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h
index a626ce378..ff0fa38ae 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/firmware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FIRMWARE_H__
 #define __NVKM_FIRMWARE_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
index c23da4f05..473ba0b9a 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GPUOBJ_H__
 #define __NVKM_GPUOBJ_H__
 #include <core/object.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h
index 88971eb37..e2d39192f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_IOCTL_H__
 #define __NVKM_IOCTL_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h
index 33ca67692..affba21fc 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MEMORY_H__
 #define __NVKM_MEMORY_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h
index 7bd4897a8..2002a4da9 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MM_H__
 #define __NVKM_MM_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h
index 753d08c17..4eb82bc56 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/notify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_NOTIFY_H__
 #define __NVKM_NOTIFY_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/object.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
index 96dda350a..3f13ff1d4 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/object.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_OBJECT_H__
 #define __NVKM_OBJECT_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h
index bd52236cc..d950d5ee1 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_OPROXY_H__
 #define __NVKM_OPROXY_H__
 #define nvkm_oproxy(p) container_of((p), struct nvkm_oproxy, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/option.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/option.h
index 80fdc146e..a34a79bac 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/option.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/option.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_OPTION_H__
 #define __NVKM_OPTION_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/os.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/os.h
index cd57e238d..fc9e8cd36 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/os.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/os.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_OS_H__
 #define __NVKM_OS_H__
 #include <nvif/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h
index 78d41be20..4c7f647d2 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVICE_PCI_H__
 #define __NVKM_DEVICE_PCI_H__
 #include <core/device.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
index 5ee629899..674a38408 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_RAMHT_H__
 #define __NVKM_RAMHT_H__
 #include <core/gpuobj.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
index ca9ed3d68..38f51ff7a 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SUBDEV_H__
 #define __NVKM_SUBDEV_H__
 #include <core/device.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
index 7c7d91cad..5c102d020 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVICE_TEGRA_H__
 #define __NVKM_DEVICE_TEGRA_H__
 #include <core/device.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h
index 904820558..40613983f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BSP_H__
 #define __NVKM_BSP_H__
 #include <engine/xtensa.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
index b93f4c1a9..553245994 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CE_H__
 #define __NVKM_CE_H__
 #include <engine/falcon.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h
index 03fa57a7c..72b9da2de 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CIPHER_H__
 #define __NVKM_CIPHER_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h
index 05f9c13ab..e83193d3c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_H__
 #define __NVKM_DISP_H__
 #define nvkm_disp(p) container_of((p), struct nvkm_disp, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
index d2a6532ce..5f5cae7c4 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DMA_H__
 #define __NVKM_DMA_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
index e1a854e2a..5a51842bc 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FALCON_H__
 #define __NVKM_FALCON_H__
 #define nvkm_falcon(p) container_of((p), struct nvkm_falcon, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
index f00527b36..025f400c9 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FIFO_H__
 #define __NVKM_FIFO_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
index c7944b19b..fb18f105f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GR_H__
 #define __NVKM_GR_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h
index 257738eff..4ef3d4c5e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MPEG_H__
 #define __NVKM_MPEG_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h
index 748ea9b7e..985fc9490 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msenc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSENC_H__
 #define __NVKM_MSENC_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h
index 08516ca82..e03f33472 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/mspdec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSPDEC_H__
 #define __NVKM_MSPDEC_H__
 #include <engine/falcon.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
index 85fd30602..760bf17ea 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msppp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSPPP_H__
 #define __NVKM_MSPPP_H__
 #include <engine/falcon.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h
index 99757ed96..281866d25 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSVLD_H__
 #define __NVKM_MSVLD_H__
 #include <engine/falcon.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
index 00b2b227f..fe716859d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvdec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_NVDEC_H__
 #define __NVKM_NVDEC_H__
 #define nvkm_nvdec(p) container_of((p), struct nvkm_nvdec, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
index 8a8193280..cdd68a8ba 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_NVENC_H__
 #define __NVKM_NVENC_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
index 240855ad8..6cce8502f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PM_H__
 #define __NVKM_PM_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h
index 7317ef4c0..b206b918c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SEC_H__
 #define __NVKM_SEC_H__
 #include <engine/falcon.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h
index d3db1b1e7..f7d89822b 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SEC2_H__
 #define __NVKM_SEC2_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
index 096e7dbd1..83a17c4e1 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SW_H__
 #define __NVKM_SW_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h
index 2b0dc4c69..9b7d4877c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_VIC_H__
 #define __NVKM_VIC_H__
 #include <core/engine.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h
index 616ea91e0..53bf8aed4 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/vp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_VP_H__
 #define __NVKM_VP_H__
 #include <engine/xtensa.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
index b1fcc4167..13c00ce6d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_XTENSA_H__
 #define __NVKM_XTENSA_H__
 #define nvkm_xtensa(p) container_of((p), struct nvkm_xtensa, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
index d3071b5a4..91f1e0efe 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BAR_H__
 #define __NVKM_BAR_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
index a72f32905..979e9a144 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BIOS_H__
 #define __NVKM_BIOS_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h
index cf202c793..703a5b524 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0203.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_M0203_H__
 #define __NVBIOS_M0203_H__
 struct nvbios_M0203T {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h
index d34608ff2..b4e14e45a 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0205.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_M0205_H__
 #define __NVBIOS_M0205_H__
 struct nvbios_M0205T {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h
index c7ff8d952..c09376894 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/M0209.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_M0209_H__
 #define __NVBIOS_M0209_H__
 u32 nvbios_M0209Te(struct nvkm_bios *,
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h
index 1c1c52eac..901d94ef1 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/P0260.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_P0260_H__
 #define __NVBIOS_P0260_H__
 u32 nvbios_P0260Te(struct nvkm_bios *,
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h
index 6711732b7..d068586f3 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_BIT_H__
 #define __NVBIOS_BIT_H__
 struct bit_entry {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h
index 3f0c7c414..9a3f9483e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/bmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_BMP_H__
 #define __NVBIOS_BMP_H__
 static inline u16
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h
index 2ff64a20c..a1c48c6b2 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_BOOST_H__
 #define __NVBIOS_BOOST_H__
 u32 nvbios_boostTe(struct nvkm_bios *, u8 *, u8 *, u8 *, u8 *, u8 *, u8 *);
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
index deb477282..ed9e0a6a0 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_CONN_H__
 #define __NVBIOS_CONN_H__
 enum dcb_connector_type {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h
index 76fe7d50a..49343d276 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/cstep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_CSTEP_H__
 #define __NVBIOS_CSTEP_H__
 u32 nvbios_cstepTe(struct nvkm_bios *,
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
index 903d11760..63ddc6ed8 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_DCB_H__
 #define __NVBIOS_DCB_H__
 enum dcb_output_type {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
index c5a6ebd5a..423d92de0 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/disp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_DISP_H__
 #define __NVBIOS_DISP_H__
 u16 nvbios_disp_table(struct nvkm_bios *,
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h
index b4d39df70..df34b4183 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_DP_H__
 #define __NVBIOS_DP_H__
 struct nvbios_dpout {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h
index bb49bd5f8..f93e4f951 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/extdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_EXTDEV_H__
 #define __NVBIOS_EXTDEV_H__
 enum nvbios_extdev_type {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h
index a7513e840..09c1d3b9d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/fan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_FAN_H__
 #define __NVBIOS_FAN_H__
 #include <subdev/bios/therm.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
index b7a54e605..b71a3555c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_GPIO_H__
 #define __NVBIOS_GPIO_H__
 enum dcb_gpio_func_name {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h
index 85c529ecf..ae1f7483d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_I2C_H__
 #define __NVBIOS_I2C_H__
 enum dcb_i2c_type {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h
index e933d3eed..e220a1ac1 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/iccsense.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_ICCSENSE_H__
 #define __NVBIOS_ICCSENSE_H__
 struct pwr_rail_resistor_t {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h
index e15d63b9a..893288b06 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/image.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_IMAGE_H__
 #define __NVBIOS_IMAGE_H__
 struct nvbios_image {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
index 06ab48052..744b1868e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_INIT_H__
 #define __NVBIOS_INIT_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h
index 4e31b64c5..327bf9c4b 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/mxm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_MXM_H__
 #define __NVBIOS_MXM_H__
 u16 mxm_table(struct nvkm_bios *, u8 *ver, u8 *hdr);
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h
index 64a59549b..ee5419b7b 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/npde.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_NPDE_H__
 #define __NVBIOS_NPDE_H__
 struct nvbios_npdeT {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h
index e85931541..1dffe8d6c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pcir.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_PCIR_H__
 #define __NVBIOS_PCIR_H__
 struct nvbios_pcirT {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h
index 478b1c0d2..0ee84ea6d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_PERF_H__
 #define __NVBIOS_PERF_H__
 u32 nvbios_perf_table(struct nvkm_bios *, u8 *ver, u8 *hdr,
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h
index 5a69978d1..ab964e085 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_PLL_H__
 #define __NVBIOS_PLL_H__
 /*XXX: kill me */
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h
index 3a643df6d..fb41ecab8 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_PMU_H__
 #define __NVBIOS_PMU_H__
 struct nvbios_pmuT {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
index f5f4a14c4..ff12d810d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_POWER_BUDGET_H__
 #define __NVBIOS_POWER_BUDGET_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h
index dca6c060a..2b87a38ad 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/ramcfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_RAMCFG_H__
 #define __NVBIOS_RAMCFG_H__
 struct nvbios_ramcfg {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h
index 8d8ee1372..471eef434 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/rammap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_RAMMAP_H__
 #define __NVBIOS_RAMMAP_H__
 #include <subdev/bios/ramcfg.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h
index dd3ba960e..46a3b15e1 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/therm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_THERM_H__
 #define __NVBIOS_THERM_H__
 struct nvbios_therm_threshold {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
index 38188d4c9..40ceabf37 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_TIMING_H__
 #define __NVBIOS_TIMING_H__
 #include <subdev/bios/ramcfg.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h
index bea31cdd1..67419bad5 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_VMAP_H__
 #define __NVBIOS_VMAP_H__
 struct nvbios_vmap {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h
index f0baa2c7d..6b36d5ecb 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/volt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_VOLT_H__
 #define __NVBIOS_VOLT_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h
index 87f804fc3..36f3028d5 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/vpstate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_VPSTATE_H__
 #define __NVBIOS_VPSTATE_H__
 struct nvbios_vpstate_header {
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
index 0c0fe234f..d1bb5d044 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/xpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVBIOS_XPIO_H__
 #define __NVBIOS_XPIO_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h
index 33a057c33..7695f7f77 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BUS_H__
 #define __NVKM_BUS_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
index e5275f742..15db75ef0 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CLK_H__
 #define __NVKM_CLK_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
index 709d786f1..40558064d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVINIT_H__
 #define __NVKM_DEVINIT_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index 28d513fbf..4da68dd52 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FB_H__
 #define __NVKM_FB_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h
index ae201e388..092193b7f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FUSE_H__
 #define __NVKM_FUSE_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h
index 9b9c6d2f9..ee5489907 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GPIO_H__
 #define __NVKM_GPIO_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
index ce23cc6c6..eef54e9b5 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_I2C_H__
 #define __NVKM_I2C_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h
index 6e2b70bd2..919653c1d 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_IBUS_H__
 #define __NVKM_IBUS_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h
index b7a9b041e..be9475cd9 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/iccsense.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_ICCSENSE_H__
 #define __NVKM_ICCSENSE_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
index 40f845e31..91126fd29 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/instmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_INSTMEM_H__
 #define __NVKM_INSTMEM_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
index cd755baf9..63b7ad1f9 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_LTC_H__
 #define __NVKM_LTC_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
index 58f10890c..61c93c86e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MC_H__
 #define __NVKM_MC_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
index dcd3deff2..0fdfc610c 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MMU_H__
 #define __NVKM_MMU_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
index ed0250139..0fd6d6f8e 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/mxm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MXM_H__
 #define __NVKM_MXM_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h
index ac2a69596..23803cc85 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PCI_H__
 #define __NVKM_PCI_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
index e7f04732a..4bc938404 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PMU_H__
 #define __NVKM_PMU_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
index 1bfd93b85..98fe1d0fd 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_THERM_H__
 #define __NVKM_THERM_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
index ff0709652..e9b074682 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_TIMER_H__
 #define __NVKM_TIMER_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
index d23209b62..f7d3eb647 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_TOP_H__
 #define __NVKM_TOP_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h
index ce5636fe2..312933ad7 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_VGA_H__
 #define __NOUVEAU_VGA_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h
index 08ef9983c..8a0f85f5f 100644
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_VOLT_H__
 #define __NVKM_VOLT_H__
 #include <core/subdev.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_abi16.h b/kernel/drivers/gpu/drm/nouveau/nouveau_abi16.h
index 841cc556f..441100aa2 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_abi16.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_abi16.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_ABI16_H__
 #define __NOUVEAU_ABI16_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.c b/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.c
index 7459ef994..5ffcb6683 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.h b/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.h
index 2f03653af..b86294fc9 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_acpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_ACPI_H__
 #define __NOUVEAU_ACPI_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_bo.h b/kernel/drivers/gpu/drm/nouveau/nouveau_bo.h
index b06a5385d..4caade5de 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_bo.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_bo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_BO_H__
 #define __NOUVEAU_BO_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h b/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
index 46b947ba1..9463a7861 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_CHAN_H__
 #define __NOUVEAU_CHAN_H__
 #include <nvif/object.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/kernel/drivers/gpu/drm/nouveau/nouveau_debugfs.h
index b799f8dfb..1d01a82d4 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_debugfs.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_DEBUGFS_H__
 #define __NOUVEAU_DEBUGFS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_display.h b/kernel/drivers/gpu/drm/nouveau/nouveau_display.h
index 201aec2ea..34cd14468 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_DISPLAY_H__
 #define __NOUVEAU_DISPLAY_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_drv.h b/kernel/drivers/gpu/drm/nouveau/nouveau_drv.h
index 822fe1d4d..77dea95c1 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_DRV_H__
 #define __NOUVEAU_DRV_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_fence.h b/kernel/drivers/gpu/drm/nouveau/nouveau_fence.h
index d5e58a38f..c9b399ad8 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_fence.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_fence.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_FENCE_H__
 #define __NOUVEAU_FENCE_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_gem.h b/kernel/drivers/gpu/drm/nouveau/nouveau_gem.h
index 8fa6ed9dd..0456c94a5 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_gem.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_gem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_GEM_H__
 #define __NOUVEAU_GEM_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_ioctl.h b/kernel/drivers/gpu/drm/nouveau/nouveau_ioctl.h
index 3b9f2e546..380ede268 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_ioctl.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_IOCTL_H__
 #define __NOUVEAU_IOCTL_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_reg.h b/kernel/drivers/gpu/drm/nouveau/nouveau_reg.h
index 7226f1f60..b5b5fe407 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_reg.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #define NV04_PFB_BOOT_0						0x00100000
 #	define NV04_PFB_BOOT_0_RAM_AMOUNT			0x00000003
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/kernel/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index b7ab268f7..fde11ce46 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pagemap.h>
 #include <linux/slab.h>
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_ttm.h b/kernel/drivers/gpu/drm/nouveau/nouveau_ttm.h
index 25b0de413..96082b696 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_ttm.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_ttm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_TTM_H__
 #define __NOUVEAU_TTM_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_usif.h b/kernel/drivers/gpu/drm/nouveau/nouveau_usif.h
index c037e3ae8..c68f1c65a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_usif.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_usif.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_USIF_H__
 #define __NOUVEAU_USIF_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_vga.c b/kernel/drivers/gpu/drm/nouveau/nouveau_vga.c
index 48393a4f6..52e52a360 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_vga.c
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_vga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/vgaarb.h>
 #include <linux/vga_switcheroo.h>
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_vga.h b/kernel/drivers/gpu/drm/nouveau/nouveau_vga.h
index ea3ad6974..6a3000c88 100644
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_vga.h
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NOUVEAU_VGA_H__
 #define __NOUVEAU_VGA_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nv10_fence.h b/kernel/drivers/gpu/drm/nouveau/nv10_fence.h
index b7a508585..7616c6680 100644
--- a/kernel/drivers/gpu/drm/nouveau/nv10_fence.h
+++ b/kernel/drivers/gpu/drm/nouveau/nv10_fence.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV10_FENCE_H_
 #define __NV10_FENCE_H_
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nv50_display.c b/kernel/drivers/gpu/drm/nouveau/nv50_display.c
index e4751f92b..fb47d4605 100644
--- a/kernel/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/kernel/drivers/gpu/drm/nouveau/nv50_display.c
@@ -4099,7 +4099,7 @@ nv50_disp_atomic_commit(struct drm_device *dev,
 {
 	struct nouveau_drm *drm = nouveau_drm(dev);
 	struct nv50_disp *disp = nv50_disp(dev);
-	struct drm_plane_state *old_plane_state;
+	struct drm_plane_state *new_plane_state;
 	struct drm_plane *plane;
 	struct drm_crtc *crtc;
 	bool active = false;
@@ -4129,8 +4129,8 @@ nv50_disp_atomic_commit(struct drm_device *dev,
 	if (ret)
 		goto err_cleanup;
 
-	for_each_old_plane_in_state(state, plane, old_plane_state, i) {
-		struct nv50_wndw_atom *asyw = nv50_wndw_atom(old_plane_state);
+	for_each_new_plane_in_state(state, plane, new_plane_state, i) {
+		struct nv50_wndw_atom *asyw = nv50_wndw_atom(new_plane_state);
 		struct nv50_wndw *wndw = nv50_wndw(plane);
 
 		if (asyw->set.image) {
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
index d9ca9636a..da130f505 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf100_ce_data[] = {
 /* 0x0000: ctx_object */
 	0x00000000,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h
index f0a1cf31c..0b92eb325 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gt215_ce_data[] = {
 /* 0x0000: ctx_object */
 	0x00000000,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h
index 2dce40597..0e3d08f11 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CE_PRIV_H__
 #define __NVKM_CE_PRIV_H__
 #include <engine/ce.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h
index 1bbe76e07..6a62021e9 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/acpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVICE_ACPI_H__
 #define __NVKM_DEVICE_ACPI_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h
index 20249d8e4..f279162f4 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVICE_CTRL_H__
 #define __NVKM_DEVICE_CTRL_H__
 #define nvkm_control(p) container_of((p), struct nvkm_control, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
index 6c16f3835..08d0bf605 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVICE_PRIV_H__
 #define __NVKM_DEVICE_PRIV_H__
 #include <core/device.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
index 737b38f6f..5701b3221 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_DISP_CHAN_H__
 #define __NV50_DISP_CHAN_H__
 #define nv50_disp_chan(p) container_of((p), struct nv50_disp_chan, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h
index de962b7b0..090e869ae 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_CONN_H__
 #define __NVKM_DISP_CONN_H__
 #include <engine/disp.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h
index ea4a0d062..f9b98211d 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_DISP_DMAC_H__
 #define __NV50_DISP_DMAC_H__
 #define nv50_disp_dmac(p) container_of((p), struct nv50_disp_dmac, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
index 59173c290..495f665a0 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_DP_H__
 #define __NVKM_DISP_DP_H__
 #define nvkm_dp(p) container_of((p), struct nvkm_dp, outp)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
index e82c68f18..d131cca99 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "hdmi.h"
 
 void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
index 528f5621a..45094c6e1 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_HDMI_H__
 #define __NVKM_DISP_HDMI_H__
 #include "ior.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h
index b04c49d2e..57030b3a4 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_HEAD_H__
 #define __NVKM_DISP_HEAD_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
index a1e8bf48b..cd6dd8742 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_IOR_H__
 #define __NVKM_DISP_IOR_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
index 6ea19466f..eb0b8acb1 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_DISP_H__
 #define __NV50_DISP_H__
 #define nv50_disp(p) container_of((p), struct nv50_disp, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h
index 146d101d4..ea84d7d57 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_OUTP_H__
 #define __NVKM_DISP_OUTP_H__
 #include <engine/disp.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h
index 5772f0094..6c9bfff6d 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DISP_PRIV_H__
 #define __NVKM_DISP_PRIV_H__
 #include <engine/disp.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
index b147cf5b3..4818fa69a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_DISP_ROOT_H__
 #define __NV50_DISP_ROOT_H__
 #define nv50_disp_root(p) container_of((p), struct nv50_disp_root, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
index deb37ee55..4307cbecd 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DMA_PRIV_H__
 #define __NVKM_DMA_PRIV_H__
 #define nvkm_dma(p) container_of((p), struct nvkm_dma, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h
index 69a7f1034..4bbac8a21 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DMA_USER_H__
 #define __NVKM_DMA_USER_H__
 #define nvkm_dmaobj(p) container_of((p), struct nvkm_dmaobj, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
index d8019bdac..3ffef2361 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FIFO_CHAN_H__
 #define __NVKM_FIFO_CHAN_H__
 #define nvkm_fifo_chan(p) container_of((p), struct nvkm_fifo_chan, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
index 7d697e2dc..27002caba 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changf100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GF100_FIFO_CHAN_H__
 #define __GF100_FIFO_CHAN_H__
 #define gf100_fifo_chan(p) container_of((p), struct gf100_fifo_chan, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h
index 230f64e5f..ec10be298 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/changk104.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GK104_FIFO_CHAN_H__
 #define __GK104_FIFO_CHAN_H__
 #define gk104_fifo_chan(p) container_of((p), struct gk104_fifo_chan, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h
index 3361a1fd0..15b06bdf5 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV04_FIFO_CHAN_H__
 #define __NV04_FIFO_CHAN_H__
 #define nv04_fifo_chan(p) container_of((p), struct nv04_fifo_chan, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h
index 4b9da469b..ad9aa157e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/channv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_FIFO_CHAN_H__
 #define __NV50_FIFO_CHAN_H__
 #define nv50_fifo_chan(p) container_of((p), struct nv50_fifo_chan, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h
index 70db58eab..571a6edb3 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GF100_FIFO_H__
 #define __GF100_FIFO_H__
 #define gf100_fifo(p) container_of((p), struct gf100_fifo, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
index 44bff98d6..0506c5290 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GK104_FIFO_H__
 #define __GK104_FIFO_H__
 #define gk104_fifo(p) container_of((p), struct gk104_fifo, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h
index 03f60004b..1d7054255 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV04_FIFO_H__
 #define __NV04_FIFO_H__
 #define nv04_fifo(p) container_of((p), struct nv04_fifo, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h
index 8ab53948c..a3994e8db 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_FIFO_H__
 #define __NV50_FIFO_H__
 #define nv50_fifo(p) container_of((p), struct nv50_fifo, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
index f889b13b5..ae76b1aac 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FIFO_PRIV_H__
 #define __NVKM_FIFO_PRIV_H__
 #define nvkm_fifo(p) container_of((p), struct nvkm_fifo, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h
index 92d562211..49892a5e7 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/regsnv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV04_FIFO_REGS_H__
 #define __NV04_FIFO_REGS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
index 017180d14..2812ca511 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GRCTX_NVC0_H__
 #define __NVKM_GRCTX_NVC0_H__
 #include "gf100.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
index 50e808e9f..4d67d9026 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GRCTX_H__
 #define __NVKM_GRCTX_H__
 #include <core/gpuobj.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
index 12a703fe3..0323acb73 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf100_grgpc_data[] = {
 /* 0x0000: gpc_mmio_list_head */
 	0x00000064,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
index ffbfc5120..1bb265917 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf117_grgpc_data[] = {
 /* 0x0000: gpc_mmio_list_head */
 	0x0000006c,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
index 357f662de..cf8343a69 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk104_grgpc_data[] = {
 /* 0x0000: gpc_mmio_list_head */
 	0x0000006c,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
index 4ffc8212a..f4bfa109e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk110_grgpc_data[] = {
 /* 0x0000: gpc_mmio_list_head */
 	0x0000006c,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
index 09196206c..59a3e1b29 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk208_grgpc_data[] = {
 /* 0x0000: gpc_mmio_list_head */
 	0x0000006c,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
index 6d7d00436..8daa05167 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gm107_grgpc_data[] = {
 /* 0x0000: gpc_mmio_list_head */
 	0x0000006c,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
index 7538404b8..cbf2351f8 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf100_grhub_data[] = {
 /* 0x0000: hub_mmio_list_head */
 	0x00000300,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
index ce000a47e..70830036f 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf117_grhub_data[] = {
 /* 0x0000: hub_mmio_list_head */
 	0x00000300,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
index 1f26cb6a2..7f2fd84d0 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk104_grhub_data[] = {
 /* 0x0000: hub_mmio_list_head */
 	0x00000300,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
index 70436d93e..560063789 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk110_grhub_data[] = {
 /* 0x0000: hub_mmio_list_head */
 	0x00000300,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
index e0933a074..71e85784b 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk208_grhub_data[] = {
 /* 0x0000: hub_mmio_list_head */
 	0x00000300,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
index 9b432823b..d85eac6d1 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gm107_grhub_data[] = {
 /* 0x0000: hub_mmio_list_head */
 	0x00000300,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h
index 1718ae4e8..f87693809 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/os.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GRAPH_OS_H__
 #define __NVKM_GRAPH_OS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h
index d7c3d86cc..d5a376c4d 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV10_GR_H__
 #define __NV10_GR_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
index d1dc92999..df2cd8641 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "nv20.h"
 #include "regs.h"
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h
index cdf4501e3..ad7e53bb7 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV20_GR_H__
 #define __NV20_GR_H__
 #define nv20_gr(p) container_of((p), struct nv20_gr, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
index 6c4a00819..e59a28a26 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "nv20.h"
 #include "regs.h"
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
index 3cad26dbc..e113b2d4c 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "nv20.h"
 #include "regs.h"
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
index b4e3c50ba..4aac2c224 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "nv20.h"
 #include "regs.h"
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
index e7ed04b93..301556503 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "nv20.h"
 #include "regs.h"
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
index 5e8abacba..5d6926611 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "nv20.h"
 #include "regs.h"
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
index 2812ed11f..89b773233 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV40_GR_H__
 #define __NV40_GR_H__
 #define nv40_gr(p) container_of((p), struct nv40_gr, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h
index 45eec83a5..567fa4f3e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_GR_H__
 #define __NV50_GR_H__
 #define nv50_gr(p) container_of((p), struct nv50_gr, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
index 2a52d9f02..66359c23c 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GR_PRIV_H__
 #define __NVKM_GR_PRIV_H__
 #define nvkm_gr(p) container_of((p), struct nvkm_gr, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h
index 90a9873ce..dc4f93667 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GR_REGS_H__
 #define __NVKM_GR_REGS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h
index d3bb34fcd..1ac2b4558 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV31_MPEG_H__
 #define __NV31_MPEG_H__
 #define nv31_mpeg(p) container_of((p), struct nv31_mpeg, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h
index d5753103f..26f9d1415 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MPEG_PRIV_H__
 #define __NVKM_MPEG_PRIV_H__
 #include <engine/mpeg.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h
index d518af4bc..db305072a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/mspdec/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSPDEC_PRIV_H__
 #define __NVKM_MSPDEC_PRIV_H__
 #include <engine/mspdec.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h
index 37a91f9d9..7708e52c9 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msppp/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSPPP_PRIV_H__
 #define __NVKM_MSPPP_PRIV_H__
 #include <engine/msppp.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h
index 9dc1da67d..66c36049a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/msvld/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MSVLD_PRIV_H__
 #define __NVKM_MSVLD_PRIV_H__
 #include <engine/msvld.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h
index 353b94f51..6c300739f 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_NVDEC_PRIV_H__
 #define __NVKM_NVDEC_PRIV_H__
 #include <engine/nvdec.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h
index 56d034485..c74fd4557 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PM_NVC0_H__
 #define __NVKM_PM_NVC0_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
index da481abe8..3f37b7139 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PM_NV40_H__
 #define __NVKM_PM_NV40_H__
 #define nv40_pm(p) container_of((p), struct nv40_pm, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
index d7b81cbf8..17240d54b 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PM_PRIV_H__
 #define __NVKM_PM_PRIV_H__
 #define nvkm_pm(p) container_of((p), struct nvkm_pm, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h
index 4b57f8814..6278a0c5f 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec/fuc/g98.fuc0s.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t g98_sec_data[] = {
 /* 0x0000: ctx_dma */
 /* 0x0000: ctx_dma_query */
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h
index 7ecc9d472..2f97c806a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SEC2_PRIV_H__
 #define __NVKM_SEC2_PRIV_H__
 #include <engine/sec2.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h
index 6608bf6c6..b1fa69314 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SW_CHAN_H__
 #define __NVKM_SW_CHAN_H__
 #define nvkm_sw_chan(p) container_of((p), struct nvkm_sw_chan, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h
index 25cdfdef2..459afd30a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SW_NV50_H__
 #define __NVKM_SW_NV50_H__
 #define nv50_sw_chan(p) container_of((p), struct nv50_sw_chan, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
index 943ef4c10..7050a9e49 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_NVSW_H__
 #define __NVKM_NVSW_H__
 #define nvkm_nvsw(p) container_of((p), struct nvkm_nvsw, object)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h
index 0ef1318dc..4aca1791a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_SW_PRIV_H__
 #define __NVKM_SW_PRIV_H__
 #define nvkm_sw(p) container_of((p), struct nvkm_sw, engine)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h
index 97b56f759..d515ad994 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/falcon/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FALCON_PRIV_H__
 #define __NVKM_FALCON_PRIV_H__
 #include <engine/falcon.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
index 20a525536..9accd7923 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GF100_BAR_H__
 #define __GF100_BAR_H__
 #define gf100_bar(p) container_of((p), struct gf100_bar, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h
index 1eb764f22..ce9ab9110 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_BAR_H__
 #define __NV50_BAR_H__
 #define nv50_bar(p) container_of((p), struct nv50_bar, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
index d834ef20d..63d111c8a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BAR_PRIV_H__
 #define __NVKM_BAR_PRIV_H__
 #define nvkm_bar(p) container_of((p), struct nvkm_bar, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h
index 7d1d3c6b4..33435ca16 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BIOS_PRIV_H__
 #define __NVKM_BIOS_PRIV_H__
 #define nvkm_bios(p) container_of((p), struct nvkm_bios, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h
index 54ec3b131..17ac1812a 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BUS_HWSQ_H__
 #define __NVKM_BUS_HWSQ_H__
 #include <subdev/bus.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h
index a130f2c64..ef01e5693 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bus/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_BUS_PRIV_H__
 #define __NVKM_BUS_PRIV_H__
 #define nvkm_bus(p) container_of((p), struct nvkm_bus, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h
index 8865b59fe..1ea886a43 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CLK_NVA3_H__
 #define __NVKM_CLK_NVA3_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h
index d3c7fb6ef..f134d979d 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_CLK_H__
 #define __NV50_CLK_H__
 #define nv50_clk(p) container_of((p), struct nv50_clk, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h
index 44020a30d..9a39f1fd2 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/pll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PLL_H__
 #define __NVKM_PLL_H__
 #include <core/os.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h
index 51eafc00c..b65617792 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CLK_PRIV_H__
 #define __NVKM_CLK_PRIV_H__
 #define nvkm_clk(p) container_of((p), struct nvkm_clk, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h
index d717e8b8f..d0715fe84 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/clk/seq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_CLK_SEQ_H__
 #define __NVKM_CLK_SEQ_H__
 #include <subdev/bus/hwsq.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h
index 4a87c8c2b..b18e49847 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV04_DEVINIT_H__
 #define __NV04_DEVINIT_H__
 #define nv04_devinit(p) container_of((p), struct nv04_devinit, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
index 25d2ae3af..315ebaff1 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV50_DEVINIT_H__
 #define __NV50_DEVINIT_H__
 #define nv50_devinit(p) container_of((p), struct nv50_devinit, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h
index e1f6ae58f..5b3097a58 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_DEVINIT_PRIV_H__
 #define __NVKM_DEVINIT_PRIV_H__
 #define nvkm_devinit(p) container_of((p), struct nvkm_devinit, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h
index 412eb8983..1756f7b02 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_RAM_NVC0_H__
 #define __NVKM_RAM_NVC0_H__
 #define gf100_fb(p) container_of((p), struct gf100_fb, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
index faa88c8c6..a37758c76 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv50.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FB_NV50_H__
 #define __NVKM_FB_NV50_H__
 #define nv50_fb(p) container_of((p), struct nv50_fb, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
index e905d44fa..8e87b887d 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FB_PRIV_H__
 #define __NVKM_FB_PRIV_H__
 #define nvkm_fb(p) container_of((p), struct nvkm_fb, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
index fac7e73c3..b2122d261 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FB_RAM_PRIV_H__
 #define __NVKM_FB_RAM_PRIV_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
index 9ef9d6aa3..a65fa5586 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FBRAM_FUC_H__
 #define __NVKM_FBRAM_FUC_H__
 #include <subdev/fb.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h
index 8a0524566..8549fdf24 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV40_FB_RAM_H__
 #define __NV40_FB_RAM_H__
 #define nv40_ram(p) container_of((p), struct nv40_ram, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h
index 8df7306d5..d8f5053e8 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FBRAM_SEQ_H__
 #define __NVKM_FBRAM_SEQ_H__
 #include <subdev/bus/hwsq.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h
index 1f865f615..ad26fcbe9 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fb/regsnv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FB_REGS_04_H__
 #define __NVKM_FB_REGS_04_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h
index b0390b540..3a5595a9e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fuse/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_FUSE_PRIV_H__
 #define __NVKM_FUSE_PRIV_H__
 #define nvkm_fuse(p) container_of((p), struct nvkm_fuse, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h
index 371bcdbbe..9759f1344 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_GPIO_PRIV_H__
 #define __NVKM_GPIO_PRIV_H__
 #define nvkm_gpio(p) container_of((p), struct nvkm_gpio, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
index 9587ab456..7d56c4ba6 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_I2C_AUX_H__
 #define __NVKM_I2C_AUX_H__
 #include "pad.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
index e1be14c23..bea0dd339 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_I2C_BUS_H__
 #define __NVKM_I2C_BUS_H__
 #include "pad.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h
index 316c4536f..33f0c809e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/pad.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_I2C_PAD_H__
 #define __NVKM_I2C_PAD_H__
 #include <subdev/i2c.h>
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h
index bf655a66e..f476a69b6 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_I2C_PRIV_H__
 #define __NVKM_I2C_PRIV_H__
 #define nvkm_i2c(p) container_of((p), struct nvkm_i2c, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h
index 01caf798c..504a6d37e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_IBUS_PRIV_H__
 #define __NVKM_IBUS_PRIV_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h
index e90e0f6ed..bd599b825 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_ICCSENSE_PRIV_H__
 #define __NVKM_ICCSENSE_PRIV_H__
 #define nvkm_iccsense(p) container_of((p), struct nvkm_iccsense, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h
index ace447186..021e7a1f3 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_INSTMEM_PRIV_H__
 #define __NVKM_INSTMEM_PRIV_H__
 #define nvkm_instmem(p) container_of((p), struct nvkm_instmem, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h
index 8b95f96e3..e71cc25cc 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_LTC_PRIV_H__
 #define __NVKM_LTC_PRIV_H__
 #define nvkm_ltc(p) container_of((p), struct nvkm_ltc, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
index 3be412644..8869d79c2 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MC_PRIV_H__
 #define __NVKM_MC_PRIV_H__
 #define nvkm_mc(p) container_of((p), struct nvkm_mc, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
index 363e33b29..9c35c4363 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV04_MMU_PRIV__
 #define __NV04_MMU_PRIV__
 #define nv04_mmu(p) container_of((p), struct nv04_mmu, base)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
index 27cedc60b..bf37f313b 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MMU_PRIV_H__
 #define __NVKM_MMU_PRIV_H__
 #define nvkm_mmu(p) container_of((p), struct nvkm_mmu, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
index 333e0c015..011a67fe4 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/mxms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVMXM_MXMS_H__
 #define __NVMXM_MXMS_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h
index 7d970157a..6767c2279 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_MXM_PRIV_H__
 #define __NVKM_MXM_PRIV_H__
 #define nvkm_mxm(p) container_of((p), struct nvkm_mxm, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h
index df2dd0836..edb7f00f0 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "priv.h"
 #if defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))
 #ifndef __NVKM_PCI_AGP_H__
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h
index 86921ec96..c17f6063c 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PCI_PRIV_H__
 #define __NVKM_PCI_PRIV_H__
 #define nvkm_pci(p) container_of((p), struct nvkm_pci, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h
index 0bcf0b307..53d01fb00 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf100_pmu_data[] = {
 /* 0x0000: proc_kern */
 	0x52544e49,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h
index fe8905666..e1e981966 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gf119.fuc4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gf119_pmu_data[] = {
 /* 0x0000: proc_kern */
 	0x52544e49,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
index 9cf4e6fc7..c4edbc79e 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gk208_pmu_data[] = {
 /* 0x0000: proc_kern */
 	0x52544e49,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h
index 5d692425b..6a2572e89 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static uint32_t gt215_pmu_data[] = {
 /* 0x0000: proc_kern */
 	0x52544e49,
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h
index c8b06cb77..30d9480b9 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/os.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PWR_OS_H__
 #define __NVKM_PWR_OS_H__
 
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
index e6f741682..11b28b086 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef __NVKM_PMU_MEMX_H__
 #define __NVKM_PMU_MEMX_H__
 #include "priv.h"
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
index a4c48a10c..e9c6f9725 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_PMU_PRIV_H__
 #define __NVKM_PMU_PRIV_H__
 #define nvkm_pmu(p) container_of((p), struct nvkm_pmu, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h
index f820ca2ae..3b8878486 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_TIMER_PRIV_H__
 #define __NVKM_TIMER_PRIV_H__
 #define nvkm_timer(p) container_of((p), struct nvkm_timer, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h
index 10bef85b4..23d07f5f4 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/timer/regsnv04.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define NV04_PTIMER_INTR_0      0x009100
 #define NV04_PTIMER_INTR_EN_0   0x009140
 #define NV04_PTIMER_NUMERATOR   0x009200
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
index adb3ed03d..4f49b0aca 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/top/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_TOP_PRIV_H__
 #define __NVKM_TOP_PRIV_H__
 #define nvkm_top(p) container_of((p), struct nvkm_top, subdev)
diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h
index 354bafe4b..1a8ad5603 100644
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVKM_VOLT_PRIV_H__
 #define __NVKM_VOLT_PRIV_H__
 #define nvkm_volt(p) container_of((p), struct nvkm_volt, subdev)
diff --git a/kernel/drivers/gpu/drm/omapdrm/Makefile b/kernel/drivers/gpu/drm/omapdrm/Makefile
index b391be7ec..f11525311 100644
--- a/kernel/drivers/gpu/drm/omapdrm/Makefile
+++ b/kernel/drivers/gpu/drm/omapdrm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI)
diff --git a/kernel/drivers/gpu/drm/omapdrm/displays/Makefile b/kernel/drivers/gpu/drm/omapdrm/displays/Makefile
index 46baafb1a..d99659e13 100644
--- a/kernel/drivers/gpu/drm/omapdrm/displays/Makefile
+++ b/kernel/drivers/gpu/drm/omapdrm/displays/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DRM_OMAP_ENCODER_OPA362) += encoder-opa362.o
 obj-$(CONFIG_DRM_OMAP_ENCODER_TFP410) += encoder-tfp410.o
 obj-$(CONFIG_DRM_OMAP_ENCODER_TPD12S015) += encoder-tpd12s015.o
diff --git a/kernel/drivers/gpu/drm/omapdrm/dss/Makefile b/kernel/drivers/gpu/drm/omapdrm/dss/Makefile
index 142ce5a02..62d5b4f45 100644
--- a/kernel/drivers/gpu/drm/omapdrm/dss/Makefile
+++ b/kernel/drivers/gpu/drm/omapdrm/dss/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o
 
 obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o
diff --git a/kernel/drivers/gpu/drm/omapdrm/dss/hdmi_common.c b/kernel/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
index 4dfb67fe5..3ecde23ac 100644
--- a/kernel/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
+++ b/kernel/drivers/gpu/drm/omapdrm/dss/hdmi_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #define DSS_SUBSYS_NAME "HDMI"
 
diff --git a/kernel/drivers/gpu/drm/panel/Makefile b/kernel/drivers/gpu/drm/panel/Makefile
index 9f6610d08..d73d3e661 100644
--- a/kernel/drivers/gpu/drm/panel/Makefile
+++ b/kernel/drivers/gpu/drm/panel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o
 obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o
 obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o
diff --git a/kernel/drivers/gpu/drm/pl111/Makefile b/kernel/drivers/gpu/drm/pl111/Makefile
index 59483d610..f2874bbda 100644
--- a/kernel/drivers/gpu/drm/pl111/Makefile
+++ b/kernel/drivers/gpu/drm/pl111/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 pl111_drm-y +=	pl111_connector.o \
 		pl111_display.o \
 		pl111_drv.o
diff --git a/kernel/drivers/gpu/drm/radeon/Makefile b/kernel/drivers/gpu/drm/radeon/Makefile
index 4acbb944b..0ad8244b5 100644
--- a/kernel/drivers/gpu/drm/radeon/Makefile
+++ b/kernel/drivers/gpu/drm/radeon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/radeon/mkregtable.c b/kernel/drivers/gpu/drm/radeon/mkregtable.c
index b928c17bd..c21d8fa59 100644
--- a/kernel/drivers/gpu/drm/radeon/mkregtable.c
+++ b/kernel/drivers/gpu/drm/radeon/mkregtable.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* utility to create the register check tables
  * this includes inlined list.h safe for userspace.
  *
diff --git a/kernel/drivers/gpu/drm/radeon/r100_track.h b/kernel/drivers/gpu/drm/radeon/r100_track.h
index eb40888bd..ad16a925f 100644
--- a/kernel/drivers/gpu/drm/radeon/r100_track.h
+++ b/kernel/drivers/gpu/drm/radeon/r100_track.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #define R100_TRACK_MAX_TEXTURE 3
 #define R200_TRACK_MAX_TEXTURE 6
diff --git a/kernel/drivers/gpu/drm/radeon/radeon_dp_mst.c b/kernel/drivers/gpu/drm/radeon/radeon_dp_mst.c
index ebdf1b859..2917ea1b6 100644
--- a/kernel/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/kernel/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <drm/drmP.h>
 #include <drm/drm_dp_mst_helper.h>
diff --git a/kernel/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/kernel/drivers/gpu/drm/radeon/radeon_legacy_tv.c
index 49750d07a..611cf934b 100644
--- a/kernel/drivers/gpu/drm/radeon/radeon_legacy_tv.c
+++ b/kernel/drivers/gpu/drm/radeon/radeon_legacy_tv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 #include "radeon.h"
diff --git a/kernel/drivers/gpu/drm/radeon/radeon_trace.h b/kernel/drivers/gpu/drm/radeon/radeon_trace.h
index fdce40629..db8f079e4 100644
--- a/kernel/drivers/gpu/drm/radeon/radeon_trace.h
+++ b/kernel/drivers/gpu/drm/radeon/radeon_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_RADEON_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _RADEON_TRACE_H_
 
diff --git a/kernel/drivers/gpu/drm/radeon/radeon_trace_points.c b/kernel/drivers/gpu/drm/radeon/radeon_trace_points.c
index e51d35759..66b3d5084 100644
--- a/kernel/drivers/gpu/drm/radeon/radeon_trace_points.c
+++ b/kernel/drivers/gpu/drm/radeon/radeon_trace_points.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Copyright Red Hat Inc 2010.
  * Author : Dave Airlie <airlied@redhat.com>
  */
diff --git a/kernel/drivers/gpu/drm/rcar-du/Makefile b/kernel/drivers/gpu/drm/rcar-du/Makefile
index 2131e722d..0cf5c1103 100644
--- a/kernel/drivers/gpu/drm/rcar-du/Makefile
+++ b/kernel/drivers/gpu/drm/rcar-du/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rcar-du-drm-y := rcar_du_crtc.o \
 		 rcar_du_drv.o \
 		 rcar_du_encoder.o \
diff --git a/kernel/drivers/gpu/drm/rockchip/Makefile b/kernel/drivers/gpu/drm/rockchip/Makefile
index fa8dc9d9a..305409818 100644
--- a/kernel/drivers/gpu/drm/rockchip/Makefile
+++ b/kernel/drivers/gpu/drm/rockchip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/selftests/drm_mm_selftests.h b/kernel/drivers/gpu/drm/selftests/drm_mm_selftests.h
index 37bbdac52..54acc1175 100644
--- a/kernel/drivers/gpu/drm/selftests/drm_mm_selftests.h
+++ b/kernel/drivers/gpu/drm/selftests/drm_mm_selftests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* List each unit test as selftest(name, function)
  *
  * The name is used as both an enum and expanded as igt__name to create
diff --git a/kernel/drivers/gpu/drm/shmobile/Makefile b/kernel/drivers/gpu/drm/shmobile/Makefile
index 4c3eeb355..861edafed 100644
--- a/kernel/drivers/gpu/drm/shmobile/Makefile
+++ b/kernel/drivers/gpu/drm/shmobile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 shmob-drm-y := shmob_drm_backlight.o \
 	       shmob_drm_crtc.o \
 	       shmob_drm_drv.o \
diff --git a/kernel/drivers/gpu/drm/sti/Makefile b/kernel/drivers/gpu/drm/sti/Makefile
index c35db1243..f203ac551 100644
--- a/kernel/drivers/gpu/drm/sti/Makefile
+++ b/kernel/drivers/gpu/drm/sti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 sti-drm-y := \
 	sti_mixer.o \
 	sti_gdp.o \
diff --git a/kernel/drivers/gpu/drm/sun4i/Makefile b/kernel/drivers/gpu/drm/sun4i/Makefile
index 43c753caf..55b32368f 100644
--- a/kernel/drivers/gpu/drm/sun4i/Makefile
+++ b/kernel/drivers/gpu/drm/sun4i/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 sun4i-drm-y += sun4i_drv.o
 sun4i-drm-y += sun4i_framebuffer.o
 
diff --git a/kernel/drivers/gpu/drm/tegra/Makefile b/kernel/drivers/gpu/drm/tegra/Makefile
index 892778439..46d65d392 100644
--- a/kernel/drivers/gpu/drm/tegra/Makefile
+++ b/kernel/drivers/gpu/drm/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG
 
 tegra-drm-y := \
diff --git a/kernel/drivers/gpu/drm/tilcdc/Makefile b/kernel/drivers/gpu/drm/tilcdc/Makefile
index 55ebd5167..b9e1108e5 100644
--- a/kernel/drivers/gpu/drm/tilcdc/Makefile
+++ b/kernel/drivers/gpu/drm/tilcdc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
 	ccflags-y += -Werror
 endif
diff --git a/kernel/drivers/gpu/drm/ttm/Makefile b/kernel/drivers/gpu/drm/ttm/Makefile
index 4d0c938ff..a60e56080 100644
--- a/kernel/drivers/gpu/drm/ttm/Makefile
+++ b/kernel/drivers/gpu/drm/ttm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 
diff --git a/kernel/drivers/gpu/drm/vc4/Makefile b/kernel/drivers/gpu/drm/vc4/Makefile
index 25bd5d304..837c82757 100644
--- a/kernel/drivers/gpu/drm/vc4/Makefile
+++ b/kernel/drivers/gpu/drm/vc4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Please keep these build lists sorted!
 
 # core driver code
diff --git a/kernel/drivers/gpu/drm/virtio/Makefile b/kernel/drivers/gpu/drm/virtio/Makefile
index 7684f613b..f29deec83 100644
--- a/kernel/drivers/gpu/drm/virtio/Makefile
+++ b/kernel/drivers/gpu/drm/virtio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
diff --git a/kernel/drivers/gpu/drm/vmwgfx/Makefile b/kernel/drivers/gpu/drm/vmwgfx/Makefile
index a365330bb..ad80211e1 100644
--- a/kernel/drivers/gpu/drm/vmwgfx/Makefile
+++ b/kernel/drivers/gpu/drm/vmwgfx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_kms.o vmwgfx_drv.o \
 	    vmwgfx_fb.o vmwgfx_ioctl.o vmwgfx_resource.o vmwgfx_buffer.o \
 	    vmwgfx_fifo.o vmwgfx_irq.o vmwgfx_ldu.o vmwgfx_ttm_glue.o \
diff --git a/kernel/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h b/kernel/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h
index 120eab830..3a195e810 100644
--- a/kernel/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h
+++ b/kernel/drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VM_BASIC_TYPES_H_
 #define _VM_BASIC_TYPES_H_
 #include <linux/kernel.h>
diff --git a/kernel/drivers/gpu/drm/zte/Makefile b/kernel/drivers/gpu/drm/zte/Makefile
index 9df7766a7..b6d966d84 100644
--- a/kernel/drivers/gpu/drm/zte/Makefile
+++ b/kernel/drivers/gpu/drm/zte/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 zxdrm-y := \
 	zx_drm_drv.o \
 	zx_hdmi.o \
diff --git a/kernel/drivers/gpu/host1x/Makefile b/kernel/drivers/gpu/host1x/Makefile
index a1d9974cf..c0b802441 100644
--- a/kernel/drivers/gpu/host1x/Makefile
+++ b/kernel/drivers/gpu/host1x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 host1x-y = \
 	bus.o \
 	syncpt.o \
diff --git a/kernel/drivers/gpu/ipu-v3/Makefile b/kernel/drivers/gpu/ipu-v3/Makefile
index 8cdf9e4ae..7cc8b47e4 100644
--- a/kernel/drivers/gpu/ipu-v3/Makefile
+++ b/kernel/drivers/gpu/ipu-v3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o
 
 imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-csi.o ipu-dc.o ipu-di.o \
diff --git a/kernel/drivers/hid/Makefile b/kernel/drivers/hid/Makefile
index 8659d7e63..235bd2a7b 100644
--- a/kernel/drivers/hid/Makefile
+++ b/kernel/drivers/hid/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the HID driver
 #
diff --git a/kernel/drivers/hid/hid-lg.h b/kernel/drivers/hid/hid-lg.h
index 10dd8f024..3d8902ba1 100644
--- a/kernel/drivers/hid/hid-lg.h
+++ b/kernel/drivers/hid/hid-lg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HID_LG_H
 #define __HID_LG_H
 
diff --git a/kernel/drivers/hid/hid-lg4ff.h b/kernel/drivers/hid/hid-lg4ff.h
index de1f350e0..e5c55d515 100644
--- a/kernel/drivers/hid/hid-lg4ff.h
+++ b/kernel/drivers/hid/hid-lg4ff.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HID_LG4FF_H
 #define __HID_LG4FF_H
 
diff --git a/kernel/drivers/hid/intel-ish-hid/Makefile b/kernel/drivers/hid/intel-ish-hid/Makefile
index 8c08b0b35..825b70af6 100644
--- a/kernel/drivers/hid/intel-ish-hid/Makefile
+++ b/kernel/drivers/hid/intel-ish-hid/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - Intel ISH HID drivers
 # Copyright (c) 2014-2016, Intel Corporation.
diff --git a/kernel/drivers/hid/usbhid/Makefile b/kernel/drivers/hid/usbhid/Makefile
index 890f2914a..0ff227d0c 100644
--- a/kernel/drivers/hid/usbhid/Makefile
+++ b/kernel/drivers/hid/usbhid/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the USB input drivers
 #
diff --git a/kernel/drivers/hsi/Makefile b/kernel/drivers/hsi/Makefile
index 96944783d..53c3bcdbf 100644
--- a/kernel/drivers/hsi/Makefile
+++ b/kernel/drivers/hsi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for HSI
 #
diff --git a/kernel/drivers/hv/Makefile b/kernel/drivers/hv/Makefile
index 39c9b2c08..e7b1d796b 100644
--- a/kernel/drivers/hv/Makefile
+++ b/kernel/drivers/hv/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_HYPERV)		+= hv_vmbus.o
 obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
 obj-$(CONFIG_HYPERV_BALLOON)	+= hv_balloon.o
diff --git a/kernel/drivers/hwmon/Makefile b/kernel/drivers/hwmon/Makefile
index c84d9784b..23e195a5a 100644
--- a/kernel/drivers/hwmon/Makefile
+++ b/kernel/drivers/hwmon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for sensor chip drivers.
 #
diff --git a/kernel/drivers/hwmon/adt7x10.h b/kernel/drivers/hwmon/adt7x10.h
index d491c6985..21ad15ce3 100644
--- a/kernel/drivers/hwmon/adt7x10.h
+++ b/kernel/drivers/hwmon/adt7x10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HWMON_ADT7X10_H__
 #define __HWMON_ADT7X10_H__
 
diff --git a/kernel/drivers/hwmon/pmbus/Makefile b/kernel/drivers/hwmon/pmbus/Makefile
index 459a6be33..e9364420a 100644
--- a/kernel/drivers/hwmon/pmbus/Makefile
+++ b/kernel/drivers/hwmon/pmbus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for PMBus chip drivers.
 #
diff --git a/kernel/drivers/hwspinlock/Makefile b/kernel/drivers/hwspinlock/Makefile
index 14928aa7c..b87c01a50 100644
--- a/kernel/drivers/hwspinlock/Makefile
+++ b/kernel/drivers/hwspinlock/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Generic Hardware Spinlock framework
 #
diff --git a/kernel/drivers/hwtracing/coresight/Makefile b/kernel/drivers/hwtracing/coresight/Makefile
index 5bae90ce7..61db9dd0d 100644
--- a/kernel/drivers/hwtracing/coresight/Makefile
+++ b/kernel/drivers/hwtracing/coresight/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for CoreSight drivers.
 #
diff --git a/kernel/drivers/hwtracing/intel_th/Makefile b/kernel/drivers/hwtracing/intel_th/Makefile
index 81d42fe91..880c9b5e8 100644
--- a/kernel/drivers/hwtracing/intel_th/Makefile
+++ b/kernel/drivers/hwtracing/intel_th/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INTEL_TH)		+= intel_th.o
 intel_th-y			:= core.o
 intel_th-$(CONFIG_INTEL_TH_DEBUG) += debug.o
diff --git a/kernel/drivers/hwtracing/stm/Makefile b/kernel/drivers/hwtracing/stm/Makefile
index 3abd84ce1..effc19e51 100644
--- a/kernel/drivers/hwtracing/stm/Makefile
+++ b/kernel/drivers/hwtracing/stm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_STM)	+= stm_core.o
 
 stm_core-y		:= core.o policy.o
diff --git a/kernel/drivers/i2c/Makefile b/kernel/drivers/i2c/Makefile
index 7bb65a436..72c94c60f 100644
--- a/kernel/drivers/i2c/Makefile
+++ b/kernel/drivers/i2c/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the i2c core.
 #
diff --git a/kernel/drivers/i2c/busses/Makefile b/kernel/drivers/i2c/busses/Makefile
index 47f3ac9a6..2ce857654 100644
--- a/kernel/drivers/i2c/busses/Makefile
+++ b/kernel/drivers/i2c/busses/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the i2c bus drivers.
 #
diff --git a/kernel/drivers/i2c/busses/i2c-octeon-core.h b/kernel/drivers/i2c/busses/i2c-octeon-core.h
index aa3c8f477..a7ef19855 100644
--- a/kernel/drivers/i2c/busses/i2c-octeon-core.h
+++ b/kernel/drivers/i2c/busses/i2c-octeon-core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/atomic.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/kernel/drivers/i2c/muxes/Makefile b/kernel/drivers/i2c/muxes/Makefile
index 4a67d3199..6d9d865e8 100644
--- a/kernel/drivers/i2c/muxes/Makefile
+++ b/kernel/drivers/i2c/muxes/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for multiplexer I2C chip drivers.
 
diff --git a/kernel/drivers/ide/Makefile b/kernel/drivers/ide/Makefile
index 2a8c417d4..9f617a779 100644
--- a/kernel/drivers/ide/Makefile
+++ b/kernel/drivers/ide/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # link order is important here
 #
diff --git a/kernel/drivers/ide/ide-acpi.c b/kernel/drivers/ide/ide-acpi.c
index 968038482..7d4e5c08f 100644
--- a/kernel/drivers/ide/ide-acpi.c
+++ b/kernel/drivers/ide/ide-acpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Provides ACPI support for IDE drives.
  *
diff --git a/kernel/drivers/ide/ide-cd.c b/kernel/drivers/ide/ide-cd.c
index 81e18f962..a7355ab3b 100644
--- a/kernel/drivers/ide/ide-cd.c
+++ b/kernel/drivers/ide/ide-cd.c
@@ -1328,6 +1328,7 @@ static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq)
 	unsigned long blocks = blk_rq_sectors(rq) / (hard_sect >> 9);
 	struct scsi_request *req = scsi_req(rq);
 
+	scsi_req_init(req);
 	memset(req->cmd, 0, BLK_MAX_CDB);
 
 	if (rq_data_dir(rq) == READ)
diff --git a/kernel/drivers/ide/ide-cd.h b/kernel/drivers/ide/ide-cd.h
index eea60c986..264e822eb 100644
--- a/kernel/drivers/ide/ide-cd.h
+++ b/kernel/drivers/ide/ide-cd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 1996-98  Erik Andersen
  *  Copyright (C) 1998-2000 Jens Axboe
diff --git a/kernel/drivers/ide/ide-cd_ioctl.c b/kernel/drivers/ide/ide-cd_ioctl.c
index 9d26c9737..2acca12b9 100644
--- a/kernel/drivers/ide/ide-cd_ioctl.c
+++ b/kernel/drivers/ide/ide-cd_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cdrom.c IOCTLs handling for ide-cd driver.
  *
diff --git a/kernel/drivers/ide/ide-cd_verbose.c b/kernel/drivers/ide/ide-cd_verbose.c
index 58a6feb74..5ecd5b2f0 100644
--- a/kernel/drivers/ide/ide-cd_verbose.c
+++ b/kernel/drivers/ide/ide-cd_verbose.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Verbose error logging for ATAPI CD/DVD devices.
  *
diff --git a/kernel/drivers/ide/ide-devsets.c b/kernel/drivers/ide/ide-devsets.c
index ef7c8c43a..4e20747af 100644
--- a/kernel/drivers/ide/ide-devsets.c
+++ b/kernel/drivers/ide/ide-devsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/kernel.h>
 #include <linux/gfp.h>
diff --git a/kernel/drivers/ide/ide-disk.c b/kernel/drivers/ide/ide-disk.c
index 241983da5..188d1b037 100644
--- a/kernel/drivers/ide/ide-disk.c
+++ b/kernel/drivers/ide/ide-disk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1994-1998	   Linus Torvalds & authors (see below)
  *  Copyright (C) 1998-2002	   Linux ATA Development
diff --git a/kernel/drivers/ide/ide-disk.h b/kernel/drivers/ide/ide-disk.h
index d511dab7c..0e8cc18bf 100644
--- a/kernel/drivers/ide/ide-disk.h
+++ b/kernel/drivers/ide/ide-disk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IDE_DISK_H
 #define __IDE_DISK_H
 
diff --git a/kernel/drivers/ide/ide-disk_ioctl.c b/kernel/drivers/ide/ide-disk_ioctl.c
index da36f729f..2c45616cf 100644
--- a/kernel/drivers/ide/ide-disk_ioctl.c
+++ b/kernel/drivers/ide/ide-disk_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/ide.h>
 #include <linux/hdreg.h>
diff --git a/kernel/drivers/ide/ide-disk_proc.c b/kernel/drivers/ide/ide-disk_proc.c
index 0d1fae6cb..82a36ced4 100644
--- a/kernel/drivers/ide/ide-disk_proc.c
+++ b/kernel/drivers/ide/ide-disk_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/ide.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/ide/ide-floppy.c b/kernel/drivers/ide/ide-floppy.c
index 3ddd88219..5bd2aafc3 100644
--- a/kernel/drivers/ide/ide-floppy.c
+++ b/kernel/drivers/ide/ide-floppy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IDE ATAPI floppy driver.
  *
diff --git a/kernel/drivers/ide/ide-floppy.h b/kernel/drivers/ide/ide-floppy.h
index 6dd2beb48..13c9b4b6d 100644
--- a/kernel/drivers/ide/ide-floppy.h
+++ b/kernel/drivers/ide/ide-floppy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IDE_FLOPPY_H
 #define __IDE_FLOPPY_H
 
diff --git a/kernel/drivers/ide/ide-floppy_ioctl.c b/kernel/drivers/ide/ide-floppy_ioctl.c
index a22ca8467..40a2ebe34 100644
--- a/kernel/drivers/ide/ide-floppy_ioctl.c
+++ b/kernel/drivers/ide/ide-floppy_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ide-floppy IOCTLs handling.
  */
diff --git a/kernel/drivers/ide/ide-floppy_proc.c b/kernel/drivers/ide/ide-floppy_proc.c
index e7a25ea75..471457ebe 100644
--- a/kernel/drivers/ide/ide-floppy_proc.c
+++ b/kernel/drivers/ide/ide-floppy_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <linux/ide.h>
diff --git a/kernel/drivers/ide/ide-gd.h b/kernel/drivers/ide/ide-gd.h
index 55970772b..af3fe1880 100644
--- a/kernel/drivers/ide/ide-gd.h
+++ b/kernel/drivers/ide/ide-gd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IDE_GD_H
 #define __IDE_GD_H
 
diff --git a/kernel/drivers/ide/ide-park.c b/kernel/drivers/ide/ide-park.c
index 1f264d5d3..6465bcc7c 100644
--- a/kernel/drivers/ide/ide-park.c
+++ b/kernel/drivers/ide/ide-park.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/gfp.h>
 #include <linux/ide.h>
diff --git a/kernel/drivers/ide/ide-pio-blacklist.c b/kernel/drivers/ide/ide-pio-blacklist.c
index 40e683a84..1fd24798e 100644
--- a/kernel/drivers/ide/ide-pio-blacklist.c
+++ b/kernel/drivers/ide/ide-pio-blacklist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PIO blacklist.  Some drives incorrectly report their maximal PIO mode,
  * at least in respect to CMD640.  Here we keep info on some known drives.
diff --git a/kernel/drivers/ide/ide-pm.c b/kernel/drivers/ide/ide-pm.c
index 544f02d67..dccdca9ed 100644
--- a/kernel/drivers/ide/ide-pm.c
+++ b/kernel/drivers/ide/ide-pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/gfp.h>
 #include <linux/ide.h>
diff --git a/kernel/drivers/ide/ide-sysfs.c b/kernel/drivers/ide/ide-sysfs.c
index 84a6a9e08..b9dfeb2e8 100644
--- a/kernel/drivers/ide/ide-sysfs.c
+++ b/kernel/drivers/ide/ide-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/ide.h>
 
diff --git a/kernel/drivers/ide/qd65xx.h b/kernel/drivers/ide/qd65xx.h
index 1fba2a5f2..01a43ab45 100644
--- a/kernel/drivers/ide/qd65xx.h
+++ b/kernel/drivers/ide/qd65xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2000	Linus Torvalds & authors
  */
diff --git a/kernel/drivers/idle/intel_idle.c b/kernel/drivers/idle/intel_idle.c
index 5dc7ea4b6..f0b06b14e 100644
--- a/kernel/drivers/idle/intel_idle.c
+++ b/kernel/drivers/idle/intel_idle.c
@@ -913,15 +913,16 @@ static __cpuidle int intel_idle(struct cpuidle_device *dev,
 	struct cpuidle_state *state = &drv->states[index];
 	unsigned long eax = flg2MWAIT(state->flags);
 	unsigned int cstate;
+	int cpu = smp_processor_id();
 
 	cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1;
 
 	/*
-	 * NB: if CPUIDLE_FLAG_TLB_FLUSHED is set, this idle transition
-	 * will probably flush the TLB.  It's not guaranteed to flush
-	 * the TLB, though, so it's not clear that we can do anything
-	 * useful with this knowledge.
+	 * leave_mm() to avoid costly and often unnecessary wakeups
+	 * for flushing the user TLB's associated with the active mm.
 	 */
+	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED)
+		leave_mm(cpu);
 
 	if (!(lapic_timer_reliable_states & (1 << (cstate))))
 		tick_broadcast_enter();
diff --git a/kernel/drivers/iio/Makefile b/kernel/drivers/iio/Makefile
index 93c769cd9..b16b2e9dd 100644
--- a/kernel/drivers/iio/Makefile
+++ b/kernel/drivers/iio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the industrial I/O core.
 #
diff --git a/kernel/drivers/iio/accel/Makefile b/kernel/drivers/iio/accel/Makefile
index 31fba1974..703e7c21f 100644
--- a/kernel/drivers/iio/accel/Makefile
+++ b/kernel/drivers/iio/accel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O accelerometer drivers
 #
diff --git a/kernel/drivers/iio/accel/bmc150-accel.h b/kernel/drivers/iio/accel/bmc150-accel.h
index 38a8b11f8..ae6118ae1 100644
--- a/kernel/drivers/iio/accel/bmc150-accel.h
+++ b/kernel/drivers/iio/accel/bmc150-accel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BMC150_ACCEL_H_
 #define _BMC150_ACCEL_H_
 
diff --git a/kernel/drivers/iio/accel/kxsd9-i2c.c b/kernel/drivers/iio/accel/kxsd9-i2c.c
index 95e20855d..98fbb628d 100644
--- a/kernel/drivers/iio/accel/kxsd9-i2c.c
+++ b/kernel/drivers/iio/accel/kxsd9-i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/kernel/drivers/iio/accel/kxsd9.h b/kernel/drivers/iio/accel/kxsd9.h
index 7e8a28168..5e3ca212f 100644
--- a/kernel/drivers/iio/accel/kxsd9.h
+++ b/kernel/drivers/iio/accel/kxsd9.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/device.h>
 #include <linux/kernel.h>
 
diff --git a/kernel/drivers/iio/adc/Makefile b/kernel/drivers/iio/adc/Makefile
index 9874e05f5..9572c1090 100644
--- a/kernel/drivers/iio/adc/Makefile
+++ b/kernel/drivers/iio/adc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for IIO ADC drivers
 #
diff --git a/kernel/drivers/iio/adc/qcom-vadc-common.c b/kernel/drivers/iio/adc/qcom-vadc-common.c
index 102fc51b1..47d24ae54 100644
--- a/kernel/drivers/iio/adc/qcom-vadc-common.c
+++ b/kernel/drivers/iio/adc/qcom-vadc-common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
diff --git a/kernel/drivers/iio/adc/qcom-vadc-common.h b/kernel/drivers/iio/adc/qcom-vadc-common.h
index 63c872a70..1d5354ff5 100644
--- a/kernel/drivers/iio/adc/qcom-vadc-common.h
+++ b/kernel/drivers/iio/adc/qcom-vadc-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Code shared between the different Qualcomm PMIC voltage ADCs
  */
diff --git a/kernel/drivers/iio/buffer/Makefile b/kernel/drivers/iio/buffer/Makefile
index 85beaae83..95f9f41c5 100644
--- a/kernel/drivers/iio/buffer/Makefile
+++ b/kernel/drivers/iio/buffer/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the industrial I/O buffer implementations
 #
diff --git a/kernel/drivers/iio/common/Makefile b/kernel/drivers/iio/common/Makefile
index 6fa760e1b..4bc30bb54 100644
--- a/kernel/drivers/iio/common/Makefile
+++ b/kernel/drivers/iio/common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the IIO common modules.
 # Common modules contains modules, which can be shared among multiple
diff --git a/kernel/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h b/kernel/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
index 541c6590d..4528ab55e 100644
--- a/kernel/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
+++ b/kernel/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SSP_IIO_SENSOR_H__
 #define __SSP_IIO_SENSOR_H__
 
diff --git a/kernel/drivers/iio/common/st_sensors/Makefile b/kernel/drivers/iio/common/st_sensors/Makefile
index 9f3e24f30..f7fb3b79b 100644
--- a/kernel/drivers/iio/common/st_sensors/Makefile
+++ b/kernel/drivers/iio/common/st_sensors/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the STMicroelectronics sensor common modules.
 #
diff --git a/kernel/drivers/iio/common/st_sensors/st_sensors_core.h b/kernel/drivers/iio/common/st_sensors/st_sensors_core.h
index cd88098ff..e8894be55 100644
--- a/kernel/drivers/iio/common/st_sensors/st_sensors_core.h
+++ b/kernel/drivers/iio/common/st_sensors/st_sensors_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Local functions in the ST Sensors core
  */
diff --git a/kernel/drivers/iio/dac/Makefile b/kernel/drivers/iio/dac/Makefile
index 603587cc2..993511ba4 100644
--- a/kernel/drivers/iio/dac/Makefile
+++ b/kernel/drivers/iio/dac/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O DAC drivers
 #
diff --git a/kernel/drivers/iio/dummy/Makefile b/kernel/drivers/iio/dummy/Makefile
index 0765e93d7..f14fe20f3 100644
--- a/kernel/drivers/iio/dummy/Makefile
+++ b/kernel/drivers/iio/dummy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the IIO Dummy Driver
 #
diff --git a/kernel/drivers/iio/dummy/iio_dummy_evgen.h b/kernel/drivers/iio/dummy/iio_dummy_evgen.h
index d044b946e..e0bf64fe9 100644
--- a/kernel/drivers/iio/dummy/iio_dummy_evgen.h
+++ b/kernel/drivers/iio/dummy/iio_dummy_evgen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IIO_DUMMY_EVGEN_H_
 #define _IIO_DUMMY_EVGEN_H_
 
diff --git a/kernel/drivers/iio/gyro/Makefile b/kernel/drivers/iio/gyro/Makefile
index f0e149a60..295ec780c 100644
--- a/kernel/drivers/iio/gyro/Makefile
+++ b/kernel/drivers/iio/gyro/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O gyroscope sensor drivers
 #
diff --git a/kernel/drivers/iio/gyro/bmg160.h b/kernel/drivers/iio/gyro/bmg160.h
index 72db723c8..6bcff6562 100644
--- a/kernel/drivers/iio/gyro/bmg160.h
+++ b/kernel/drivers/iio/gyro/bmg160.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BMG160_H_
 #define BMG160_H_
 
diff --git a/kernel/drivers/iio/gyro/mpu3050.h b/kernel/drivers/iio/gyro/mpu3050.h
index bef87a714..835b0249c 100644
--- a/kernel/drivers/iio/gyro/mpu3050.h
+++ b/kernel/drivers/iio/gyro/mpu3050.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/iio/iio.h>
 #include <linux/mutex.h>
 #include <linux/regmap.h>
diff --git a/kernel/drivers/iio/humidity/Makefile b/kernel/drivers/iio/humidity/Makefile
index be0dedeb8..ae4204995 100644
--- a/kernel/drivers/iio/humidity/Makefile
+++ b/kernel/drivers/iio/humidity/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for IIO humidity sensor drivers
 #
diff --git a/kernel/drivers/iio/imu/Makefile b/kernel/drivers/iio/imu/Makefile
index 8b563c332..68629c68b 100644
--- a/kernel/drivers/iio/imu/Makefile
+++ b/kernel/drivers/iio/imu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Inertial Measurement Units
 #
diff --git a/kernel/drivers/iio/imu/adis16400_buffer.c b/kernel/drivers/iio/imu/adis16400_buffer.c
index 90c24a23c..e70a5339a 100644
--- a/kernel/drivers/iio/imu/adis16400_buffer.c
+++ b/kernel/drivers/iio/imu/adis16400_buffer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
diff --git a/kernel/drivers/iio/imu/bmi160/bmi160.h b/kernel/drivers/iio/imu/bmi160/bmi160.h
index d2ae6ed70..e7b11e74f 100644
--- a/kernel/drivers/iio/imu/bmi160/bmi160.h
+++ b/kernel/drivers/iio/imu/bmi160/bmi160.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BMI160_H_
 #define BMI160_H_
 
diff --git a/kernel/drivers/iio/imu/inv_mpu6050/Makefile b/kernel/drivers/iio/imu/inv_mpu6050/Makefile
index 734af5e6c..70ffe0d13 100644
--- a/kernel/drivers/iio/imu/inv_mpu6050/Makefile
+++ b/kernel/drivers/iio/imu/inv_mpu6050/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Invensense MPU6050 device.
 #
diff --git a/kernel/drivers/iio/light/Makefile b/kernel/drivers/iio/light/Makefile
index fa32fa459..c263469b7 100644
--- a/kernel/drivers/iio/light/Makefile
+++ b/kernel/drivers/iio/light/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for IIO Light sensors
 #
diff --git a/kernel/drivers/iio/magnetometer/Makefile b/kernel/drivers/iio/magnetometer/Makefile
index b86d6cb7f..664b2f866 100644
--- a/kernel/drivers/iio/magnetometer/Makefile
+++ b/kernel/drivers/iio/magnetometer/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O Magnetometer sensor drivers
 #
diff --git a/kernel/drivers/iio/magnetometer/bmc150_magn.h b/kernel/drivers/iio/magnetometer/bmc150_magn.h
index 9a8e26812..3b69232af 100644
--- a/kernel/drivers/iio/magnetometer/bmc150_magn.h
+++ b/kernel/drivers/iio/magnetometer/bmc150_magn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BMC150_MAGN_H_
 #define _BMC150_MAGN_H_
 
diff --git a/kernel/drivers/iio/potentiometer/Makefile b/kernel/drivers/iio/potentiometer/Makefile
index 2260d40e0..1afd1e70f 100644
--- a/kernel/drivers/iio/potentiometer/Makefile
+++ b/kernel/drivers/iio/potentiometer/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O potentiometer drivers
 #
diff --git a/kernel/drivers/iio/pressure/Makefile b/kernel/drivers/iio/pressure/Makefile
index 838642789..c2058d7b2 100644
--- a/kernel/drivers/iio/pressure/Makefile
+++ b/kernel/drivers/iio/pressure/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O pressure drivers
 #
diff --git a/kernel/drivers/iio/pressure/bmp280-regmap.c b/kernel/drivers/iio/pressure/bmp280-regmap.c
index 6807113ec..08c00ac32 100644
--- a/kernel/drivers/iio/pressure/bmp280-regmap.c
+++ b/kernel/drivers/iio/pressure/bmp280-regmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
diff --git a/kernel/drivers/iio/pressure/bmp280.h b/kernel/drivers/iio/pressure/bmp280.h
index 61347438b..eda50ef65 100644
--- a/kernel/drivers/iio/pressure/bmp280.h
+++ b/kernel/drivers/iio/pressure/bmp280.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/regmap.h>
diff --git a/kernel/drivers/iio/proximity/Makefile b/kernel/drivers/iio/proximity/Makefile
index ed1b6f4cc..ad6686391 100644
--- a/kernel/drivers/iio/proximity/Makefile
+++ b/kernel/drivers/iio/proximity/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for IIO proximity sensors
 #
diff --git a/kernel/drivers/iio/temperature/Makefile b/kernel/drivers/iio/temperature/Makefile
index ad1d668de..34bd90237 100644
--- a/kernel/drivers/iio/temperature/Makefile
+++ b/kernel/drivers/iio/temperature/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O temperature drivers
 #
diff --git a/kernel/drivers/iio/trigger/Makefile b/kernel/drivers/iio/trigger/Makefile
index 0a72a2a76..f3d11acb8 100644
--- a/kernel/drivers/iio/trigger/Makefile
+++ b/kernel/drivers/iio/trigger/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for triggers not associated with iio-devices
 #
diff --git a/kernel/drivers/infiniband/core/Makefile b/kernel/drivers/infiniband/core/Makefile
index b4df164f7..9c0a2b5c8 100644
--- a/kernel/drivers/infiniband/core/Makefile
+++ b/kernel/drivers/infiniband/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= rdma_cm.o
 user_access-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= rdma_ucm.o
 
diff --git a/kernel/drivers/infiniband/core/nldev.c b/kernel/drivers/infiniband/core/nldev.c
index 3ba24c428..2fae850a3 100644
--- a/kernel/drivers/infiniband/core/nldev.c
+++ b/kernel/drivers/infiniband/core/nldev.c
@@ -214,7 +214,9 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
 
 	err = nlmsg_parse(nlh, 0, tb, RDMA_NLDEV_ATTR_MAX - 1,
 			  nldev_policy, extack);
-	if (err || !tb[RDMA_NLDEV_ATTR_PORT_INDEX])
+	if (err ||
+	    !tb[RDMA_NLDEV_ATTR_DEV_INDEX] ||
+	    !tb[RDMA_NLDEV_ATTR_PORT_INDEX])
 		return -EINVAL;
 
 	index = nla_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]);
diff --git a/kernel/drivers/infiniband/hw/Makefile b/kernel/drivers/infiniband/hw/Makefile
index 34c93abf0..e4f31c1be 100644
--- a/kernel/drivers/infiniband/hw/Makefile
+++ b/kernel/drivers/infiniband/hw/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= mthca/
 obj-$(CONFIG_INFINIBAND_QIB)		+= qib/
 obj-$(CONFIG_INFINIBAND_CXGB3)		+= cxgb3/
diff --git a/kernel/drivers/infiniband/hw/bnxt_re/Makefile b/kernel/drivers/infiniband/hw/bnxt_re/Makefile
index afbaa0e20..6e3bc25cc 100644
--- a/kernel/drivers/infiniband/hw/bnxt_re/Makefile
+++ b/kernel/drivers/infiniband/hw/bnxt_re/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-y := -Idrivers/net/ethernet/broadcom/bnxt
 obj-$(CONFIG_INFINIBAND_BNXT_RE) += bnxt_re.o
diff --git a/kernel/drivers/infiniband/hw/cxgb3/Makefile b/kernel/drivers/infiniband/hw/cxgb3/Makefile
index 276136418..2c66d35d1 100644
--- a/kernel/drivers/infiniband/hw/cxgb3/Makefile
+++ b/kernel/drivers/infiniband/hw/cxgb3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb3
 
 obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
diff --git a/kernel/drivers/infiniband/hw/hfi1/Makefile b/kernel/drivers/infiniband/hw/hfi1/Makefile
index 66d538c03..ce4010bad 100644
--- a/kernel/drivers/infiniband/hw/hfi1/Makefile
+++ b/kernel/drivers/infiniband/hw/hfi1/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # HFI driver
 #
diff --git a/kernel/drivers/infiniband/hw/i40iw/Makefile b/kernel/drivers/infiniband/hw/i40iw/Makefile
index 90068c03d..5a8a7a3f2 100644
--- a/kernel/drivers/infiniband/hw/i40iw/Makefile
+++ b/kernel/drivers/infiniband/hw/i40iw/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y :=  -Idrivers/net/ethernet/intel/i40e
 
 obj-$(CONFIG_INFINIBAND_I40IW) += i40iw.o
diff --git a/kernel/drivers/infiniband/hw/mthca/Makefile b/kernel/drivers/infiniband/hw/mthca/Makefile
index e388d95d0..3a09e9ffd 100644
--- a/kernel/drivers/infiniband/hw/mthca/Makefile
+++ b/kernel/drivers/infiniband/hw/mthca/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INFINIBAND_MTHCA) += ib_mthca.o
 
 ib_mthca-y :=	mthca_main.o mthca_cmd.o mthca_profile.o mthca_reset.o \
diff --git a/kernel/drivers/infiniband/hw/qib/Makefile b/kernel/drivers/infiniband/hw/qib/Makefile
index 79ebd79e8..80ffab88f 100644
--- a/kernel/drivers/infiniband/hw/qib/Makefile
+++ b/kernel/drivers/infiniband/hw/qib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INFINIBAND_QIB) += ib_qib.o
 
 ib_qib-y := qib_diag.o qib_driver.o qib_eeprom.o \
diff --git a/kernel/drivers/infiniband/hw/usnic/Makefile b/kernel/drivers/infiniband/hw/usnic/Makefile
index 99fb2db47..94ae7a1a6 100644
--- a/kernel/drivers/infiniband/hw/usnic/Makefile
+++ b/kernel/drivers/infiniband/hw/usnic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Idrivers/net/ethernet/cisco/enic
 
 obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o
diff --git a/kernel/drivers/infiniband/sw/rxe/Makefile b/kernel/drivers/infiniband/sw/rxe/Makefile
index 3f12beb70..66af72dca 100644
--- a/kernel/drivers/infiniband/sw/rxe/Makefile
+++ b/kernel/drivers/infiniband/sw/rxe/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RDMA_RXE) += rdma_rxe.o
 
 rdma_rxe-y := \
diff --git a/kernel/drivers/infiniband/ulp/Makefile b/kernel/drivers/infiniband/ulp/Makefile
index c28af1823..437813c7b 100644
--- a/kernel/drivers/infiniband/ulp/Makefile
+++ b/kernel/drivers/infiniband/ulp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INFINIBAND_IPOIB)		+= ipoib/
 obj-$(CONFIG_INFINIBAND_SRP)		+= srp/
 obj-$(CONFIG_INFINIBAND_SRPT)		+= srpt/
diff --git a/kernel/drivers/infiniband/ulp/ipoib/Makefile b/kernel/drivers/infiniband/ulp/ipoib/Makefile
index e5430dd50..6ece857ed 100644
--- a/kernel/drivers/infiniband/ulp/ipoib/Makefile
+++ b/kernel/drivers/infiniband/ulp/ipoib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INFINIBAND_IPOIB)			+= ib_ipoib.o
 
 ib_ipoib-y					:= ipoib_main.o \
diff --git a/kernel/drivers/infiniband/ulp/isert/ib_isert.h b/kernel/drivers/infiniband/ulp/isert/ib_isert.h
index 87d994de8..d6fd24832 100644
--- a/kernel/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/kernel/drivers/infiniband/ulp/isert/ib_isert.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/in6.h>
diff --git a/kernel/drivers/input/Makefile b/kernel/drivers/input/Makefile
index 595820bba..40de6a7be 100644
--- a/kernel/drivers/input/Makefile
+++ b/kernel/drivers/input/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the input core drivers.
 #
diff --git a/kernel/drivers/input/gameport/Makefile b/kernel/drivers/input/gameport/Makefile
index b6f6097bd..73ad8fe4d 100644
--- a/kernel/drivers/input/gameport/Makefile
+++ b/kernel/drivers/input/gameport/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the gameport drivers.
 #
diff --git a/kernel/drivers/input/joystick/Makefile b/kernel/drivers/input/joystick/Makefile
index 496fd56b3..67651efda 100644
--- a/kernel/drivers/input/joystick/Makefile
+++ b/kernel/drivers/input/joystick/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the input core drivers.
 #
diff --git a/kernel/drivers/input/keyboard/Makefile b/kernel/drivers/input/keyboard/Makefile
index d2338bacd..526e68294 100644
--- a/kernel/drivers/input/keyboard/Makefile
+++ b/kernel/drivers/input/keyboard/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the input core drivers.
 #
diff --git a/kernel/drivers/input/misc/Makefile b/kernel/drivers/input/misc/Makefile
index 03fd4262a..4b6118d31 100644
--- a/kernel/drivers/input/misc/Makefile
+++ b/kernel/drivers/input/misc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the input misc drivers.
 #
diff --git a/kernel/drivers/input/mouse/Makefile b/kernel/drivers/input/mouse/Makefile
index 56bf0ad87..e49f08565 100644
--- a/kernel/drivers/input/mouse/Makefile
+++ b/kernel/drivers/input/mouse/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the mouse drivers.
 #
diff --git a/kernel/drivers/input/mouse/byd.h b/kernel/drivers/input/mouse/byd.h
index d6c120cf3..8cb90d904 100644
--- a/kernel/drivers/input/mouse/byd.h
+++ b/kernel/drivers/input/mouse/byd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BYD_H
 #define _BYD_H
 
diff --git a/kernel/drivers/input/mouse/cypress_ps2.h b/kernel/drivers/input/mouse/cypress_ps2.h
index 81f68aaed..1eaddd818 100644
--- a/kernel/drivers/input/mouse/cypress_ps2.h
+++ b/kernel/drivers/input/mouse/cypress_ps2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CYPRESS_PS2_H
 #define _CYPRESS_PS2_H
 
diff --git a/kernel/drivers/input/mouse/hgpk.h b/kernel/drivers/input/mouse/hgpk.h
index dd686771c..98b7b3842 100644
--- a/kernel/drivers/input/mouse/hgpk.h
+++ b/kernel/drivers/input/mouse/hgpk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * OLPC HGPK (XO-1) touchpad PS/2 mouse driver
  */
diff --git a/kernel/drivers/input/mouse/psmouse.h b/kernel/drivers/input/mouse/psmouse.h
index 38855e425..8cd453808 100644
--- a/kernel/drivers/input/mouse/psmouse.h
+++ b/kernel/drivers/input/mouse/psmouse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PSMOUSE_H
 #define _PSMOUSE_H
 
diff --git a/kernel/drivers/input/rmi4/Makefile b/kernel/drivers/input/rmi4/Makefile
index 9aaac3dd8..f17631656 100644
--- a/kernel/drivers/input/rmi4/Makefile
+++ b/kernel/drivers/input/rmi4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RMI4_CORE) += rmi_core.o
 rmi_core-y := rmi_bus.o rmi_driver.o rmi_f01.o
 
diff --git a/kernel/drivers/input/serio/Makefile b/kernel/drivers/input/serio/Makefile
index 767bd9b6e..a3ca07621 100644
--- a/kernel/drivers/input/serio/Makefile
+++ b/kernel/drivers/input/serio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the input core drivers.
 #
diff --git a/kernel/drivers/input/serio/i8042-sparcio.h b/kernel/drivers/input/serio/i8042-sparcio.h
index 6231d6386..796289846 100644
--- a/kernel/drivers/input/serio/i8042-sparcio.h
+++ b/kernel/drivers/input/serio/i8042-sparcio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _I8042_SPARCIO_H
 #define _I8042_SPARCIO_H
 
diff --git a/kernel/drivers/input/sparse-keymap.c b/kernel/drivers/input/sparse-keymap.c
index bb0349fa6..fd03e5576 100644
--- a/kernel/drivers/input/sparse-keymap.c
+++ b/kernel/drivers/input/sparse-keymap.c
@@ -255,6 +255,7 @@ void sparse_keymap_report_entry(struct input_dev *dev, const struct key_entry *k
 
 	case KE_VSW:
 		input_report_switch(dev, ke->sw.code, value);
+		input_sync(dev);
 		break;
 	}
 }
diff --git a/kernel/drivers/input/tablet/Makefile b/kernel/drivers/input/tablet/Makefile
index 200fc4e11..8279ccc18 100644
--- a/kernel/drivers/input/tablet/Makefile
+++ b/kernel/drivers/input/tablet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the tablet drivers
 #
diff --git a/kernel/drivers/input/touchscreen/Makefile b/kernel/drivers/input/touchscreen/Makefile
index 6badce870..850c15625 100644
--- a/kernel/drivers/input/touchscreen/Makefile
+++ b/kernel/drivers/input/touchscreen/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the touchscreen drivers.
 #
diff --git a/kernel/drivers/input/touchscreen/ar1021_i2c.c b/kernel/drivers/input/touchscreen/ar1021_i2c.c
index f9dcbd63e..b35b640fd 100644
--- a/kernel/drivers/input/touchscreen/ar1021_i2c.c
+++ b/kernel/drivers/input/touchscreen/ar1021_i2c.c
@@ -117,6 +117,7 @@ static int ar1021_i2c_probe(struct i2c_client *client,
 	input->open = ar1021_i2c_open;
 	input->close = ar1021_i2c_close;
 
+	__set_bit(INPUT_PROP_DIRECT, input->propbit);
 	input_set_capability(input, EV_KEY, BTN_TOUCH);
 	input_set_abs_params(input, ABS_X, 0, AR1021_MAX_X, 0, 0);
 	input_set_abs_params(input, ABS_Y, 0, AR1021_MAX_Y, 0, 0);
diff --git a/kernel/drivers/input/touchscreen/tsc200x-core.h b/kernel/drivers/input/touchscreen/tsc200x-core.h
index 49a63a3c6..a43c08ccf 100644
--- a/kernel/drivers/input/touchscreen/tsc200x-core.h
+++ b/kernel/drivers/input/touchscreen/tsc200x-core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TSC200X_CORE_H
 #define _TSC200X_CORE_H
 
diff --git a/kernel/drivers/iommu/Makefile b/kernel/drivers/iommu/Makefile
index b910aea81..1fb695854 100644
--- a/kernel/drivers/iommu/Makefile
+++ b/kernel/drivers/iommu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IOMMU_API) += iommu.o
 obj-$(CONFIG_IOMMU_API) += iommu-traces.o
 obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
diff --git a/kernel/drivers/iommu/intel_irq_remapping.c b/kernel/drivers/iommu/intel_irq_remapping.c
index a5b89f6bc..25842b566 100644
--- a/kernel/drivers/iommu/intel_irq_remapping.c
+++ b/kernel/drivers/iommu/intel_irq_remapping.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #define pr_fmt(fmt)     "DMAR-IR: " fmt
 
diff --git a/kernel/drivers/iommu/io-pgtable.h b/kernel/drivers/iommu/io-pgtable.h
index a3e667077..cd2e1eaff 100644
--- a/kernel/drivers/iommu/io-pgtable.h
+++ b/kernel/drivers/iommu/io-pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IO_PGTABLE_H
 #define __IO_PGTABLE_H
 #include <linux/bitops.h>
diff --git a/kernel/drivers/iommu/iommu-traces.c b/kernel/drivers/iommu/iommu-traces.c
index bf3b317ff..1e9ca7789 100644
--- a/kernel/drivers/iommu/iommu-traces.c
+++ b/kernel/drivers/iommu/iommu-traces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * iommu trace points
  *
diff --git a/kernel/drivers/iommu/s390-iommu.c b/kernel/drivers/iommu/s390-iommu.c
index 0e2f31f90..22d4db302 100644
--- a/kernel/drivers/iommu/s390-iommu.c
+++ b/kernel/drivers/iommu/s390-iommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOMMU API for s390 PCI devices
  *
diff --git a/kernel/drivers/irqchip/Makefile b/kernel/drivers/irqchip/Makefile
index 845abc107..b842dfdc9 100644
--- a/kernel/drivers/irqchip/Makefile
+++ b/kernel/drivers/irqchip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IRQCHIP)			+= irqchip.o
 
 obj-$(CONFIG_ALPINE_MSI)		+= irq-alpine-msi.o
diff --git a/kernel/drivers/irqchip/irq-ftintc010.c b/kernel/drivers/irqchip/irq-ftintc010.c
index cd2dc8bbb..0bf98425d 100644
--- a/kernel/drivers/irqchip/irq-ftintc010.c
+++ b/kernel/drivers/irqchip/irq-ftintc010.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * irqchip for the Faraday Technology FTINTC010 Copyright (C) 2017 Linus
  * Walleij <linus.walleij@linaro.org>
diff --git a/kernel/drivers/irqchip/irq-gic-realview.c b/kernel/drivers/irqchip/irq-gic-realview.c
index 18d58d2b4..b4c1924f0 100644
--- a/kernel/drivers/irqchip/irq-gic-realview.c
+++ b/kernel/drivers/irqchip/irq-gic-realview.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Special GIC quirks for the ARM RealView
  * Copyright (C) 2015 Linus Walleij
diff --git a/kernel/drivers/irqchip/irq-imgpdc.c b/kernel/drivers/irqchip/irq-imgpdc.c
index c02d29c9d..1f59998e0 100644
--- a/kernel/drivers/irqchip/irq-imgpdc.c
+++ b/kernel/drivers/irqchip/irq-imgpdc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IMG PowerDown Controller (PDC)
  *
diff --git a/kernel/drivers/irqchip/irq-metag-ext.c b/kernel/drivers/irqchip/irq-metag-ext.c
index be7216bfb..e67483161 100644
--- a/kernel/drivers/irqchip/irq-metag-ext.c
+++ b/kernel/drivers/irqchip/irq-metag-ext.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Meta External interrupt code.
  *
diff --git a/kernel/drivers/irqchip/irq-metag.c b/kernel/drivers/irqchip/irq-metag.c
index a5f053bd2..857b94674 100644
--- a/kernel/drivers/irqchip/irq-metag.c
+++ b/kernel/drivers/irqchip/irq-metag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Meta internal (HWSTATMETA) interrupt code.
  *
diff --git a/kernel/drivers/irqchip/irq-mvebu-gicp.c b/kernel/drivers/irqchip/irq-mvebu-gicp.c
index b283fc90b..17a4a7b6c 100644
--- a/kernel/drivers/irqchip/irq-mvebu-gicp.c
+++ b/kernel/drivers/irqchip/irq-mvebu-gicp.c
@@ -194,6 +194,7 @@ static int mvebu_gicp_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	gicp->dev = &pdev->dev;
+	spin_lock_init(&gicp->spi_lock);
 
 	gicp->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!gicp->res)
diff --git a/kernel/drivers/irqchip/irq-mvebu-gicp.h b/kernel/drivers/irqchip/irq-mvebu-gicp.h
index 98535e886..eaa12fb72 100644
--- a/kernel/drivers/irqchip/irq-mvebu-gicp.h
+++ b/kernel/drivers/irqchip/irq-mvebu-gicp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MVEBU_GICP_H__
 #define __MVEBU_GICP_H__
 
diff --git a/kernel/drivers/irqchip/irq-renesas-h8300h.c b/kernel/drivers/irqchip/irq-renesas-h8300h.c
index b8327590a..1054d74b7 100644
--- a/kernel/drivers/irqchip/irq-renesas-h8300h.c
+++ b/kernel/drivers/irqchip/irq-renesas-h8300h.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * H8/300H interrupt controller driver
  *
diff --git a/kernel/drivers/irqchip/irq-renesas-h8s.c b/kernel/drivers/irqchip/irq-renesas-h8s.c
index 71d8139be..aed31afb0 100644
--- a/kernel/drivers/irqchip/irq-renesas-h8s.c
+++ b/kernel/drivers/irqchip/irq-renesas-h8s.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * H8S interrupt contoller driver
  *
diff --git a/kernel/drivers/irqchip/irq-versatile-fpga.c b/kernel/drivers/irqchip/irq-versatile-fpga.c
index 37dd4645b..928858dad 100644
--- a/kernel/drivers/irqchip/irq-versatile-fpga.c
+++ b/kernel/drivers/irqchip/irq-versatile-fpga.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Support for Versatile FPGA-based IRQ controllers
  */
diff --git a/kernel/drivers/isdn/Makefile b/kernel/drivers/isdn/Makefile
index c32e45826..e7d3d8f2a 100644
--- a/kernel/drivers/isdn/Makefile
+++ b/kernel/drivers/isdn/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the kernel ISDN subsystem and device drivers.
 
 # Object files in subdirectories
diff --git a/kernel/drivers/isdn/capi/Makefile b/kernel/drivers/isdn/capi/Makefile
index 4d5b4b71d..06da3ed2c 100644
--- a/kernel/drivers/isdn/capi/Makefile
+++ b/kernel/drivers/isdn/capi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the CAPI subsystem.
 
 # Ordering constraints: kernelcapi.o first
diff --git a/kernel/drivers/isdn/capi/capilib.c b/kernel/drivers/isdn/capi/capilib.c
index 33361f833..a39ad3796 100644
--- a/kernel/drivers/isdn/capi/capilib.c
+++ b/kernel/drivers/isdn/capi/capilib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/slab.h>
 #include <linux/kernel.h>
diff --git a/kernel/drivers/isdn/gigaset/Makefile b/kernel/drivers/isdn/gigaset/Makefile
index c453b7227..ac45a2739 100644
--- a/kernel/drivers/isdn/gigaset/Makefile
+++ b/kernel/drivers/isdn/gigaset/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 gigaset-y := common.o interface.o proc.o ev-layer.o asyncdata.o
 gigaset-$(CONFIG_GIGASET_CAPI) += capi.o
 gigaset-$(CONFIG_GIGASET_I4L) += i4l.o
diff --git a/kernel/drivers/isdn/hardware/avm/Makefile b/kernel/drivers/isdn/hardware/avm/Makefile
index b540e8f2e..3830a0573 100644
--- a/kernel/drivers/isdn/hardware/avm/Makefile
+++ b/kernel/drivers/isdn/hardware/avm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the AVM ISDN device drivers
 
 # Each configuration option enables a list of files.
diff --git a/kernel/drivers/isdn/hardware/eicon/Makefile b/kernel/drivers/isdn/hardware/eicon/Makefile
index 4fa7fdb7d..a0ab2e2d7 100644
--- a/kernel/drivers/isdn/hardware/eicon/Makefile
+++ b/kernel/drivers/isdn/hardware/eicon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Eicon DIVA ISDN drivers.
 
 # Each configuration option enables a list of files.
diff --git a/kernel/drivers/isdn/hardware/eicon/adapter.h b/kernel/drivers/isdn/hardware/eicon/adapter.h
index 71a7c2f08..f9b24eb87 100644
--- a/kernel/drivers/isdn/hardware/eicon/adapter.h
+++ b/kernel/drivers/isdn/hardware/eicon/adapter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: adapter.h,v 1.4 2004/03/21 17:26:01 armin Exp $ */
 
 #ifndef __DIVA_USER_MODE_IDI_ADAPTER_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/debug.c b/kernel/drivers/isdn/hardware/eicon/debug.c
index 8bc2791bc..301788115 100644
--- a/kernel/drivers/isdn/hardware/eicon/debug.c
+++ b/kernel/drivers/isdn/hardware/eicon/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "platform.h"
 #include "pc.h"
 #include "di_defs.h"
diff --git a/kernel/drivers/isdn/hardware/eicon/diva.c b/kernel/drivers/isdn/hardware/eicon/diva.c
index d91dd580e..944a7f338 100644
--- a/kernel/drivers/isdn/hardware/eicon/diva.c
+++ b/kernel/drivers/isdn/hardware/eicon/diva.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Id: diva.c,v 1.21.4.1 2004/05/08 14:33:43 armin Exp $ */
 
 #define CARDTYPE_H_WANT_DATA            1
diff --git a/kernel/drivers/isdn/hardware/eicon/diva.h b/kernel/drivers/isdn/hardware/eicon/diva.h
index e979085d1..b06703209 100644
--- a/kernel/drivers/isdn/hardware/eicon/diva.h
+++ b/kernel/drivers/isdn/hardware/eicon/diva.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: diva.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */
 
 #ifndef __DIVA_XDI_OS_PART_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/diva_pci.h b/kernel/drivers/isdn/hardware/eicon/diva_pci.h
index bb4b56205..7ef5db98a 100644
--- a/kernel/drivers/isdn/hardware/eicon/diva_pci.h
+++ b/kernel/drivers/isdn/hardware/eicon/diva_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: diva_pci.h,v 1.6 2003/01/04 15:29:45 schindler Exp $ */
 
 #ifndef __DIVA_PCI_INTERFACE_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/dqueue.h b/kernel/drivers/isdn/hardware/eicon/dqueue.h
index 6992c4545..2da979968 100644
--- a/kernel/drivers/isdn/hardware/eicon/dqueue.h
+++ b/kernel/drivers/isdn/hardware/eicon/dqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: dqueue.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */
 
 #ifndef _DIVA_USER_MODE_IDI_DATA_QUEUE_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/dsp_tst.h b/kernel/drivers/isdn/hardware/eicon/dsp_tst.h
index fe36f138b..85edd3ea5 100644
--- a/kernel/drivers/isdn/hardware/eicon/dsp_tst.h
+++ b/kernel/drivers/isdn/hardware/eicon/dsp_tst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: dsp_tst.h,v 1.1.2.2 2001/02/08 12:25:43 armin Exp $ */
 
 #ifndef __DIVA_PRI_HOST_TEST_DSPS_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/entity.h b/kernel/drivers/isdn/hardware/eicon/entity.h
index fdb83416a..f9767d321 100644
--- a/kernel/drivers/isdn/hardware/eicon/entity.h
+++ b/kernel/drivers/isdn/hardware/eicon/entity.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: entity.h,v 1.4 2004/03/21 17:26:01 armin Exp $ */
 
 #ifndef __DIVAS_USER_MODE_IDI_ENTITY__
diff --git a/kernel/drivers/isdn/hardware/eicon/os_4bri.c b/kernel/drivers/isdn/hardware/eicon/os_4bri.c
index 189124680..87db5f4df 100644
--- a/kernel/drivers/isdn/hardware/eicon/os_4bri.c
+++ b/kernel/drivers/isdn/hardware/eicon/os_4bri.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Id: os_4bri.c,v 1.28.4.4 2005/02/11 19:40:25 armin Exp $ */
 
 #include "platform.h"
diff --git a/kernel/drivers/isdn/hardware/eicon/os_4bri.h b/kernel/drivers/isdn/hardware/eicon/os_4bri.h
index 72253278d..94b270953 100644
--- a/kernel/drivers/isdn/hardware/eicon/os_4bri.h
+++ b/kernel/drivers/isdn/hardware/eicon/os_4bri.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: os_4bri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */
 
 #ifndef __DIVA_OS_4_BRI_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/os_bri.c b/kernel/drivers/isdn/hardware/eicon/os_bri.c
index 20f2653c5..de93090bc 100644
--- a/kernel/drivers/isdn/hardware/eicon/os_bri.c
+++ b/kernel/drivers/isdn/hardware/eicon/os_bri.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Id: os_bri.c,v 1.21 2004/03/21 17:26:01 armin Exp $ */
 
 #include "platform.h"
diff --git a/kernel/drivers/isdn/hardware/eicon/os_bri.h b/kernel/drivers/isdn/hardware/eicon/os_bri.h
index 02e7456f8..37c92cc53 100644
--- a/kernel/drivers/isdn/hardware/eicon/os_bri.h
+++ b/kernel/drivers/isdn/hardware/eicon/os_bri.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: os_bri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */
 
 #ifndef __DIVA_OS_BRI_REV_1_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/os_pri.c b/kernel/drivers/isdn/hardware/eicon/os_pri.c
index da4957abb..b20f1fb89 100644
--- a/kernel/drivers/isdn/hardware/eicon/os_pri.c
+++ b/kernel/drivers/isdn/hardware/eicon/os_pri.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Id: os_pri.c,v 1.32 2004/03/21 17:26:01 armin Exp $ */
 
 #include "platform.h"
diff --git a/kernel/drivers/isdn/hardware/eicon/os_pri.h b/kernel/drivers/isdn/hardware/eicon/os_pri.h
index 537c74d04..0e91855b1 100644
--- a/kernel/drivers/isdn/hardware/eicon/os_pri.h
+++ b/kernel/drivers/isdn/hardware/eicon/os_pri.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: os_pri.h,v 1.1.2.2 2001/02/08 12:25:44 armin Exp $ */
 
 #ifndef __DIVA_OS_PRI_REV_1_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/um_idi.c b/kernel/drivers/isdn/hardware/eicon/um_idi.c
index e1519718c..db4dd4ff3 100644
--- a/kernel/drivers/isdn/hardware/eicon/um_idi.c
+++ b/kernel/drivers/isdn/hardware/eicon/um_idi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Id: um_idi.c,v 1.14 2004/03/21 17:54:37 armin Exp $ */
 
 #include "platform.h"
diff --git a/kernel/drivers/isdn/hardware/eicon/um_idi.h b/kernel/drivers/isdn/hardware/eicon/um_idi.h
index ffb88f7b4..9aedd9e35 100644
--- a/kernel/drivers/isdn/hardware/eicon/um_idi.h
+++ b/kernel/drivers/isdn/hardware/eicon/um_idi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: um_idi.h,v 1.6 2004/03/21 17:26:01 armin Exp $ */
 
 #ifndef __DIVA_USER_MODE_IDI_CORE_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/um_xdi.h b/kernel/drivers/isdn/hardware/eicon/um_xdi.h
index b48fc042a..1f37aa4ef 100644
--- a/kernel/drivers/isdn/hardware/eicon/um_xdi.h
+++ b/kernel/drivers/isdn/hardware/eicon/um_xdi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: um_xdi.h,v 1.1.2.2 2002/10/02 14:38:38 armin Exp $ */
 
 #ifndef __DIVA_USER_MODE_XDI_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/xdi_adapter.h b/kernel/drivers/isdn/hardware/eicon/xdi_adapter.h
index d303e65db..b036e217c 100644
--- a/kernel/drivers/isdn/hardware/eicon/xdi_adapter.h
+++ b/kernel/drivers/isdn/hardware/eicon/xdi_adapter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: xdi_adapter.h,v 1.7 2004/03/21 17:26:01 armin Exp $ */
 
 #ifndef __DIVA_OS_XDI_ADAPTER_H__
diff --git a/kernel/drivers/isdn/hardware/eicon/xdi_msg.h b/kernel/drivers/isdn/hardware/eicon/xdi_msg.h
index 2498c349a..0646079bf 100644
--- a/kernel/drivers/isdn/hardware/eicon/xdi_msg.h
+++ b/kernel/drivers/isdn/hardware/eicon/xdi_msg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: xdi_msg.h,v 1.1.2.2 2001/02/16 08:40:36 armin Exp $ */
 
 #ifndef __DIVA_XDI_UM_CFG_MESSAGE_H__
diff --git a/kernel/drivers/isdn/hardware/mISDN/Makefile b/kernel/drivers/isdn/hardware/mISDN/Makefile
index 2987d9909..422f9fd8a 100644
--- a/kernel/drivers/isdn/hardware/mISDN/Makefile
+++ b/kernel/drivers/isdn/hardware/mISDN/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the modular ISDN hardware drivers
 #
diff --git a/kernel/drivers/isdn/hardware/mISDN/hfc_multi.h b/kernel/drivers/isdn/hardware/mISDN/hfc_multi.h
index c601f8801..5acf826d9 100644
--- a/kernel/drivers/isdn/hardware/mISDN/hfc_multi.h
+++ b/kernel/drivers/isdn/hardware/mISDN/hfc_multi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * see notice in hfc_multi.c
  */
diff --git a/kernel/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h b/kernel/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h
index 8a2547477..b0d772340 100644
--- a/kernel/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h
+++ b/kernel/drivers/isdn/hardware/mISDN/hfc_multi_8xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * For License see notice in hfc_multi.c
  *
diff --git a/kernel/drivers/isdn/hardware/mISDN/hfcsusb.h b/kernel/drivers/isdn/hardware/mISDN/hfcsusb.h
index 5f8f1d9ca..e4fa2a282 100644
--- a/kernel/drivers/isdn/hardware/mISDN/hfcsusb.h
+++ b/kernel/drivers/isdn/hardware/mISDN/hfcsusb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * hfcsusb.h, HFC-S USB mISDN driver
  */
diff --git a/kernel/drivers/isdn/hisax/Makefile b/kernel/drivers/isdn/hisax/Makefile
index 646368fe4..3eca9d23f 100644
--- a/kernel/drivers/isdn/hisax/Makefile
+++ b/kernel/drivers/isdn/hisax/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the hisax ISDN device driver
 
 # The target object and module list name.
diff --git a/kernel/drivers/isdn/hisax/hfc4s8s_l1.h b/kernel/drivers/isdn/hisax/hfc4s8s_l1.h
index 6a8f89113..4665b9d5d 100644
--- a/kernel/drivers/isdn/hisax/hfc4s8s_l1.h
+++ b/kernel/drivers/isdn/hisax/hfc4s8s_l1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /***************************************************************/
 /*  $Id: hfc4s8s_l1.h,v 1.1 2005/02/02 17:28:55 martinb1 Exp $ */
 /*                                                             */
diff --git a/kernel/drivers/isdn/hisax/hfc_usb.h b/kernel/drivers/isdn/hisax/hfc_usb.h
index f987bf89d..9a212330e 100644
--- a/kernel/drivers/isdn/hisax/hfc_usb.h
+++ b/kernel/drivers/isdn/hisax/hfc_usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * hfc_usb.h
  *
diff --git a/kernel/drivers/isdn/hisax/hisax_fcpcipnp.h b/kernel/drivers/isdn/hisax/hisax_fcpcipnp.h
index aedef9782..1f64e9937 100644
--- a/kernel/drivers/isdn/hisax/hisax_fcpcipnp.h
+++ b/kernel/drivers/isdn/hisax/hisax_fcpcipnp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "hisax_if.h"
 #include "hisax_isac.h"
 #include <linux/pci.h>
diff --git a/kernel/drivers/isdn/hisax/hisax_isac.h b/kernel/drivers/isdn/hisax/hisax_isac.h
index 08890cf4d..d7301da97 100644
--- a/kernel/drivers/isdn/hisax/hisax_isac.h
+++ b/kernel/drivers/isdn/hisax/hisax_isac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HISAX_ISAC_H__
 #define __HISAX_ISAC_H__
 
diff --git a/kernel/drivers/isdn/i4l/Makefile b/kernel/drivers/isdn/i4l/Makefile
index cb9d3bb9f..be77500c9 100644
--- a/kernel/drivers/isdn/i4l/Makefile
+++ b/kernel/drivers/isdn/i4l/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the kernel ISDN subsystem and device drivers.
 
 # Each configuration option enables a list of files.
diff --git a/kernel/drivers/isdn/mISDN/Makefile b/kernel/drivers/isdn/mISDN/Makefile
index 0a6bd2a9e..f3b4b7fa8 100644
--- a/kernel/drivers/isdn/mISDN/Makefile
+++ b/kernel/drivers/isdn/mISDN/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the modular ISDN driver
 #
diff --git a/kernel/drivers/isdn/mISDN/dsp_hwec.h b/kernel/drivers/isdn/mISDN/dsp_hwec.h
index bbca1eb5a..c9cb0ea24 100644
--- a/kernel/drivers/isdn/mISDN/dsp_hwec.h
+++ b/kernel/drivers/isdn/mISDN/dsp_hwec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * dsp_hwec.h
  */
diff --git a/kernel/drivers/isdn/mISDN/l1oip.h b/kernel/drivers/isdn/mISDN/l1oip.h
index 661c060ad..7ea10db20 100644
--- a/kernel/drivers/isdn/mISDN/l1oip.h
+++ b/kernel/drivers/isdn/mISDN/l1oip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * see notice in l1oip.c
  */
diff --git a/kernel/drivers/leds/Makefile b/kernel/drivers/leds/Makefile
index 7d7b26552..35980450d 100644
--- a/kernel/drivers/leds/Makefile
+++ b/kernel/drivers/leds/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # LED Core
 obj-$(CONFIG_NEW_LEDS)			+= led-core.o
diff --git a/kernel/drivers/leds/trigger/Makefile b/kernel/drivers/leds/trigger/Makefile
index a72c43cff..9f2e86881 100644
--- a/kernel/drivers/leds/trigger/Makefile
+++ b/kernel/drivers/leds/trigger/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
 obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o
 obj-$(CONFIG_LEDS_TRIGGER_DISK)		+= ledtrig-disk.o
diff --git a/kernel/drivers/lightnvm/Makefile b/kernel/drivers/lightnvm/Makefile
index 82d1a117f..2c3fd9d2c 100644
--- a/kernel/drivers/lightnvm/Makefile
+++ b/kernel/drivers/lightnvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Open-Channel SSDs.
 #
diff --git a/kernel/drivers/macintosh/Makefile b/kernel/drivers/macintosh/Makefile
index 516eb65bc..ee803638e 100644
--- a/kernel/drivers/macintosh/Makefile
+++ b/kernel/drivers/macintosh/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Macintosh-specific device drivers.
 #
diff --git a/kernel/drivers/macintosh/adb-iop.c b/kernel/drivers/macintosh/adb-iop.c
index f5f4da3d0..dbc4a3e63 100644
--- a/kernel/drivers/macintosh/adb-iop.c
+++ b/kernel/drivers/macintosh/adb-iop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * I/O Processor (IOP) ADB Driver
  * Written and (C) 1999 by Joshua M. Thompson (funaho@jurai.org)
diff --git a/kernel/drivers/macintosh/adb.c b/kernel/drivers/macintosh/adb.c
index 039dc8285..289800b52 100644
--- a/kernel/drivers/macintosh/adb.c
+++ b/kernel/drivers/macintosh/adb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device driver for the Apple Desktop Bus
  * and the /dev/adb device on macintoshes.
diff --git a/kernel/drivers/macintosh/adbhid.c b/kernel/drivers/macintosh/adbhid.c
index 09d72bb00..e09119310 100644
--- a/kernel/drivers/macintosh/adbhid.c
+++ b/kernel/drivers/macintosh/adbhid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/macintosh/adbhid.c
  *
diff --git a/kernel/drivers/macintosh/ams/ams.h b/kernel/drivers/macintosh/ams/ams.h
index 90f094d45..fe8d596f9 100644
--- a/kernel/drivers/macintosh/ams/ams.h
+++ b/kernel/drivers/macintosh/ams/ams.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/i2c.h>
 #include <linux/input-polldev.h>
 #include <linux/kthread.h>
diff --git a/kernel/drivers/macintosh/ans-lcd.c b/kernel/drivers/macintosh/ans-lcd.c
index 281fa9e6f..1de81d922 100644
--- a/kernel/drivers/macintosh/ans-lcd.c
+++ b/kernel/drivers/macintosh/ans-lcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * /dev/lcd driver for Apple Network Servers.
  */
diff --git a/kernel/drivers/macintosh/ans-lcd.h b/kernel/drivers/macintosh/ans-lcd.h
index d795b9fd2..f0a6e4c68 100644
--- a/kernel/drivers/macintosh/ans-lcd.h
+++ b/kernel/drivers/macintosh/ans-lcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PPC_ANS_LCD_H
 #define _PPC_ANS_LCD_H
 
diff --git a/kernel/drivers/macintosh/macio-adb.c b/kernel/drivers/macintosh/macio-adb.c
index 87de8d9bc..9a6223add 100644
--- a/kernel/drivers/macintosh/macio-adb.c
+++ b/kernel/drivers/macintosh/macio-adb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the ADB controller in the Mac I/O (Hydra) chip.
  */
diff --git a/kernel/drivers/macintosh/macio_sysfs.c b/kernel/drivers/macintosh/macio_sysfs.c
index 281f53456..ca4fcffe4 100644
--- a/kernel/drivers/macintosh/macio_sysfs.c
+++ b/kernel/drivers/macintosh/macio_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <asm/macio.h>
diff --git a/kernel/drivers/macintosh/via-cuda.c b/kernel/drivers/macintosh/via-cuda.c
index 147da4edd..98dd702eb 100644
--- a/kernel/drivers/macintosh/via-cuda.c
+++ b/kernel/drivers/macintosh/via-cuda.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device driver for the Cuda and Egret system controllers found on PowerMacs
  * and 68k Macs.
diff --git a/kernel/drivers/macintosh/via-macii.c b/kernel/drivers/macintosh/via-macii.c
index 415c145c8..4ba06a169 100644
--- a/kernel/drivers/macintosh/via-macii.c
+++ b/kernel/drivers/macintosh/via-macii.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device driver for the via ADB on (many) Mac II-class machines
  *
diff --git a/kernel/drivers/macintosh/via-pmu-backlight.c b/kernel/drivers/macintosh/via-pmu-backlight.c
index 6f68537c9..89ed51571 100644
--- a/kernel/drivers/macintosh/via-pmu-backlight.c
+++ b/kernel/drivers/macintosh/via-pmu-backlight.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Backlight code for via-pmu
  *
diff --git a/kernel/drivers/macintosh/via-pmu-event.h b/kernel/drivers/macintosh/via-pmu-event.h
index 72c54de40..5e52109eb 100644
--- a/kernel/drivers/macintosh/via-pmu-event.h
+++ b/kernel/drivers/macintosh/via-pmu-event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __VIA_PMU_EVENT_H
 #define __VIA_PMU_EVENT_H
 
diff --git a/kernel/drivers/macintosh/via-pmu.c b/kernel/drivers/macintosh/via-pmu.c
index cce99f72e..c4c2b3b85 100644
--- a/kernel/drivers/macintosh/via-pmu.c
+++ b/kernel/drivers/macintosh/via-pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device driver for the via-pmu on Apple Powermacs.
  *
diff --git a/kernel/drivers/macintosh/via-pmu68k.c b/kernel/drivers/macintosh/via-pmu68k.c
index a411c5cb7..25465fb91 100644
--- a/kernel/drivers/macintosh/via-pmu68k.c
+++ b/kernel/drivers/macintosh/via-pmu68k.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device driver for the PMU on 68K-based Apple PowerBooks
  *
diff --git a/kernel/drivers/mailbox/Makefile b/kernel/drivers/mailbox/Makefile
index d54e41206..4896f8dca 100644
--- a/kernel/drivers/mailbox/Makefile
+++ b/kernel/drivers/mailbox/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Generic MAILBOX API
 
 obj-$(CONFIG_MAILBOX)		+= mailbox.o
diff --git a/kernel/drivers/mcb/Makefile b/kernel/drivers/mcb/Makefile
index bcc774577..77073c592 100644
--- a/kernel/drivers/mcb/Makefile
+++ b/kernel/drivers/mcb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_MCB) += mcb.o
 
diff --git a/kernel/drivers/mcb/mcb-internal.h b/kernel/drivers/mcb/mcb-internal.h
index d6e6933b1..3602cb3b2 100644
--- a/kernel/drivers/mcb/mcb-internal.h
+++ b/kernel/drivers/mcb/mcb-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MCB_INTERNAL
 #define __MCB_INTERNAL
 
diff --git a/kernel/drivers/md/Makefile b/kernel/drivers/md/Makefile
index 786ec9e86..e94b6f9be 100644
--- a/kernel/drivers/md/Makefile
+++ b/kernel/drivers/md/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel software RAID and LVM drivers.
 #
diff --git a/kernel/drivers/md/bcache/Makefile b/kernel/drivers/md/bcache/Makefile
index c488b846f..d26b35195 100644
--- a/kernel/drivers/md/bcache/Makefile
+++ b/kernel/drivers/md/bcache/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_BCACHE)	+= bcache.o
 
diff --git a/kernel/drivers/md/bcache/alloc.c b/kernel/drivers/md/bcache/alloc.c
index cacbe2dbd..080356347 100644
--- a/kernel/drivers/md/bcache/alloc.c
+++ b/kernel/drivers/md/bcache/alloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Primary bucket allocation code
  *
diff --git a/kernel/drivers/md/bcache/bcache.h b/kernel/drivers/md/bcache/bcache.h
index 2ed9bd231..abd31e847 100644
--- a/kernel/drivers/md/bcache/bcache.h
+++ b/kernel/drivers/md/bcache/bcache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_H
 #define _BCACHE_H
 
diff --git a/kernel/drivers/md/bcache/bset.c b/kernel/drivers/md/bcache/bset.c
index 18526d446..e56d3ecdb 100644
--- a/kernel/drivers/md/bcache/bset.c
+++ b/kernel/drivers/md/bcache/bset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Code for working with individual keys, and sorted sets of keys with in a
  * btree node
diff --git a/kernel/drivers/md/bcache/bset.h b/kernel/drivers/md/bcache/bset.h
index ae964624e..fa506c1aa 100644
--- a/kernel/drivers/md/bcache/bset.h
+++ b/kernel/drivers/md/bcache/bset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_BSET_H
 #define _BCACHE_BSET_H
 
diff --git a/kernel/drivers/md/bcache/btree.c b/kernel/drivers/md/bcache/btree.c
index 866dcf78f..658c54b3b 100644
--- a/kernel/drivers/md/bcache/btree.c
+++ b/kernel/drivers/md/bcache/btree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 Kent Overstreet <kent.overstreet@gmail.com>
  *
diff --git a/kernel/drivers/md/bcache/btree.h b/kernel/drivers/md/bcache/btree.h
index 73da1f562..42204d61b 100644
--- a/kernel/drivers/md/bcache/btree.h
+++ b/kernel/drivers/md/bcache/btree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_BTREE_H
 #define _BCACHE_BTREE_H
 
diff --git a/kernel/drivers/md/bcache/closure.h b/kernel/drivers/md/bcache/closure.h
index 295b7e43f..965907ce1 100644
--- a/kernel/drivers/md/bcache/closure.h
+++ b/kernel/drivers/md/bcache/closure.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CLOSURE_H
 #define _LINUX_CLOSURE_H
 
diff --git a/kernel/drivers/md/bcache/debug.c b/kernel/drivers/md/bcache/debug.c
index 61076eda2..c7a02c490 100644
--- a/kernel/drivers/md/bcache/debug.c
+++ b/kernel/drivers/md/bcache/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Assorted bcache debug code
  *
diff --git a/kernel/drivers/md/bcache/debug.h b/kernel/drivers/md/bcache/debug.h
index 1f63c195d..acc48d3fa 100644
--- a/kernel/drivers/md/bcache/debug.h
+++ b/kernel/drivers/md/bcache/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_DEBUG_H
 #define _BCACHE_DEBUG_H
 
diff --git a/kernel/drivers/md/bcache/extents.c b/kernel/drivers/md/bcache/extents.c
index 243de0bf1..41c238fc3 100644
--- a/kernel/drivers/md/bcache/extents.c
+++ b/kernel/drivers/md/bcache/extents.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2010 Kent Overstreet <kent.overstreet@gmail.com>
  *
diff --git a/kernel/drivers/md/bcache/extents.h b/kernel/drivers/md/bcache/extents.h
index e2ed54054..0cd3575af 100644
--- a/kernel/drivers/md/bcache/extents.h
+++ b/kernel/drivers/md/bcache/extents.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_EXTENTS_H
 #define _BCACHE_EXTENTS_H
 
diff --git a/kernel/drivers/md/bcache/io.c b/kernel/drivers/md/bcache/io.c
index 7e871bdc0..fac97ec2d 100644
--- a/kernel/drivers/md/bcache/io.c
+++ b/kernel/drivers/md/bcache/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Some low level IO code, and hacks for various block layer limitations
  *
diff --git a/kernel/drivers/md/bcache/journal.c b/kernel/drivers/md/bcache/journal.c
index 7e1d1c3ba..02a98ddb5 100644
--- a/kernel/drivers/md/bcache/journal.c
+++ b/kernel/drivers/md/bcache/journal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bcache journalling code, for btree insertions
  *
diff --git a/kernel/drivers/md/bcache/journal.h b/kernel/drivers/md/bcache/journal.h
index e3c39457a..b57881991 100644
--- a/kernel/drivers/md/bcache/journal.h
+++ b/kernel/drivers/md/bcache/journal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_JOURNAL_H
 #define _BCACHE_JOURNAL_H
 
diff --git a/kernel/drivers/md/bcache/movinggc.c b/kernel/drivers/md/bcache/movinggc.c
index f633b30c9..d50c1c97d 100644
--- a/kernel/drivers/md/bcache/movinggc.c
+++ b/kernel/drivers/md/bcache/movinggc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Moving/copying garbage collector
  *
diff --git a/kernel/drivers/md/bcache/request.c b/kernel/drivers/md/bcache/request.c
index 681b4f12b..3475d6628 100644
--- a/kernel/drivers/md/bcache/request.c
+++ b/kernel/drivers/md/bcache/request.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Main bcache entry point - handle a read or a write request and decide what to
  * do with it; the make_request functions are called by the block layer.
diff --git a/kernel/drivers/md/bcache/request.h b/kernel/drivers/md/bcache/request.h
index 768917695..dea0886b8 100644
--- a/kernel/drivers/md/bcache/request.h
+++ b/kernel/drivers/md/bcache/request.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_REQUEST_H_
 #define _BCACHE_REQUEST_H_
 
diff --git a/kernel/drivers/md/bcache/stats.c b/kernel/drivers/md/bcache/stats.c
index 0ca072c20..d0831d5bc 100644
--- a/kernel/drivers/md/bcache/stats.c
+++ b/kernel/drivers/md/bcache/stats.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bcache stats code
  *
diff --git a/kernel/drivers/md/bcache/stats.h b/kernel/drivers/md/bcache/stats.h
index adbff141c..0b70f9de0 100644
--- a/kernel/drivers/md/bcache/stats.h
+++ b/kernel/drivers/md/bcache/stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_STATS_H_
 #define _BCACHE_STATS_H_
 
diff --git a/kernel/drivers/md/bcache/sysfs.c b/kernel/drivers/md/bcache/sysfs.c
index 104c57cd6..234b2f5b2 100644
--- a/kernel/drivers/md/bcache/sysfs.c
+++ b/kernel/drivers/md/bcache/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bcache sysfs interfaces
  *
diff --git a/kernel/drivers/md/bcache/sysfs.h b/kernel/drivers/md/bcache/sysfs.h
index 0526fe92a..b54fe9602 100644
--- a/kernel/drivers/md/bcache/sysfs.h
+++ b/kernel/drivers/md/bcache/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_SYSFS_H_
 #define _BCACHE_SYSFS_H_
 
diff --git a/kernel/drivers/md/bcache/trace.c b/kernel/drivers/md/bcache/trace.c
index b7820b0d2..a9a73f560 100644
--- a/kernel/drivers/md/bcache/trace.c
+++ b/kernel/drivers/md/bcache/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "bcache.h"
 #include "btree.h"
 
diff --git a/kernel/drivers/md/bcache/util.h b/kernel/drivers/md/bcache/util.h
index cb8d2ccbb..f54b58282 100644
--- a/kernel/drivers/md/bcache/util.h
+++ b/kernel/drivers/md/bcache/util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _BCACHE_UTIL_H
 #define _BCACHE_UTIL_H
diff --git a/kernel/drivers/md/bcache/writeback.c b/kernel/drivers/md/bcache/writeback.c
index e663ca082..70454f2ad 100644
--- a/kernel/drivers/md/bcache/writeback.c
+++ b/kernel/drivers/md/bcache/writeback.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * background writeback - scan btree for dirty data and write it to the backing
  * device
diff --git a/kernel/drivers/md/bcache/writeback.h b/kernel/drivers/md/bcache/writeback.h
index e35421d20..151544740 100644
--- a/kernel/drivers/md/bcache/writeback.h
+++ b/kernel/drivers/md/bcache/writeback.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHE_WRITEBACK_H
 #define _BCACHE_WRITEBACK_H
 
diff --git a/kernel/drivers/md/bitmap.h b/kernel/drivers/md/bitmap.h
index d15721ac0..5df35ca90 100644
--- a/kernel/drivers/md/bitmap.h
+++ b/kernel/drivers/md/bitmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * bitmap.h: Copyright (C) Peter T. Breuer (ptb@ot.uc3m.es) 2003
  *
diff --git a/kernel/drivers/md/dm-builtin.c b/kernel/drivers/md/dm-builtin.c
index f09277187..8eb52e425 100644
--- a/kernel/drivers/md/dm-builtin.c
+++ b/kernel/drivers/md/dm-builtin.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "dm-core.h"
 
 /*
diff --git a/kernel/drivers/md/dm-stats.c b/kernel/drivers/md/dm-stats.c
index 6028d8247..a7868503d 100644
--- a/kernel/drivers/md/dm-stats.c
+++ b/kernel/drivers/md/dm-stats.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/numa.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/md/dm-stats.h b/kernel/drivers/md/dm-stats.h
index f1c0956e3..2ddfae678 100644
--- a/kernel/drivers/md/dm-stats.h
+++ b/kernel/drivers/md/dm-stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DM_STATS_H
 #define DM_STATS_H
 
diff --git a/kernel/drivers/md/linear.h b/kernel/drivers/md/linear.h
index 8d392e609..8381d651d 100644
--- a/kernel/drivers/md/linear.h
+++ b/kernel/drivers/md/linear.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINEAR_H
 #define _LINEAR_H
 
diff --git a/kernel/drivers/md/md-cluster.h b/kernel/drivers/md/md-cluster.h
index 274016177..c0240708f 100644
--- a/kernel/drivers/md/md-cluster.h
+++ b/kernel/drivers/md/md-cluster.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 
 #ifndef _MD_CLUSTER_H
diff --git a/kernel/drivers/md/multipath.h b/kernel/drivers/md/multipath.h
index 717c60f62..0adb941f4 100644
--- a/kernel/drivers/md/multipath.h
+++ b/kernel/drivers/md/multipath.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MULTIPATH_H
 #define _MULTIPATH_H
 
diff --git a/kernel/drivers/md/persistent-data/Makefile b/kernel/drivers/md/persistent-data/Makefile
index ff528792c..66be7c664 100644
--- a/kernel/drivers/md/persistent-data/Makefile
+++ b/kernel/drivers/md/persistent-data/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DM_PERSISTENT_DATA) += dm-persistent-data.o
 dm-persistent-data-objs := \
 	dm-array.o \
diff --git a/kernel/drivers/md/raid0.h b/kernel/drivers/md/raid0.h
index 7127a623f..540e65d92 100644
--- a/kernel/drivers/md/raid0.h
+++ b/kernel/drivers/md/raid0.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RAID0_H
 #define _RAID0_H
 
diff --git a/kernel/drivers/md/raid1-10.c b/kernel/drivers/md/raid1-10.c
index 9f2670b45..400001b81 100644
--- a/kernel/drivers/md/raid1-10.c
+++ b/kernel/drivers/md/raid1-10.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Maximum size of each resync request */
 #define RESYNC_BLOCK_SIZE (64*1024)
 #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)
diff --git a/kernel/drivers/md/raid1.h b/kernel/drivers/md/raid1.h
index c8894ef1e..c7294e755 100644
--- a/kernel/drivers/md/raid1.h
+++ b/kernel/drivers/md/raid1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RAID1_H
 #define _RAID1_H
 
diff --git a/kernel/drivers/md/raid10.h b/kernel/drivers/md/raid10.h
index 735ce1a3d..abceccab6 100644
--- a/kernel/drivers/md/raid10.h
+++ b/kernel/drivers/md/raid10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RAID10_H
 #define _RAID10_H
 
diff --git a/kernel/drivers/md/raid5-log.h b/kernel/drivers/md/raid5-log.h
index 328d67aed..7f9ad5f7c 100644
--- a/kernel/drivers/md/raid5-log.h
+++ b/kernel/drivers/md/raid5-log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RAID5_LOG_H
 #define _RAID5_LOG_H
 
diff --git a/kernel/drivers/md/raid5.h b/kernel/drivers/md/raid5.h
index f65363996..2e6123825 100644
--- a/kernel/drivers/md/raid5.h
+++ b/kernel/drivers/md/raid5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RAID5_H
 #define _RAID5_H
 
diff --git a/kernel/drivers/media/Makefile b/kernel/drivers/media/Makefile
index 044503aa8..594b462dd 100644
--- a/kernel/drivers/media/Makefile
+++ b/kernel/drivers/media/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel multimedia device drivers.
 #
diff --git a/kernel/drivers/media/cec/Makefile b/kernel/drivers/media/cec/Makefile
index 3353c1741..41ee3325e 100644
--- a/kernel/drivers/media/cec/Makefile
+++ b/kernel/drivers/media/cec/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cec-objs := cec-core.o cec-adap.o cec-api.o cec-edid.o
 
 ifeq ($(CONFIG_CEC_NOTIFIER),y)
diff --git a/kernel/drivers/media/common/b2c2/Makefile b/kernel/drivers/media/common/b2c2/Makefile
index 24993a5b3..73df4a334 100644
--- a/kernel/drivers/media/common/b2c2/Makefile
+++ b/kernel/drivers/media/common/b2c2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 b2c2-flexcop-objs += flexcop.o flexcop-fe-tuner.o flexcop-i2c.o
 b2c2-flexcop-objs += flexcop-sram.o flexcop-eeprom.o flexcop-misc.o
 b2c2-flexcop-objs += flexcop-hw-filter.o
diff --git a/kernel/drivers/media/common/b2c2/flexcop-common.h b/kernel/drivers/media/common/b2c2/flexcop-common.h
index 2533574c0..b7e5e4c17 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-common.h
+++ b/kernel/drivers/media/common/b2c2/flexcop-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-common.h - common header file for device-specific source files
diff --git a/kernel/drivers/media/common/b2c2/flexcop-eeprom.c b/kernel/drivers/media/common/b2c2/flexcop-eeprom.c
index 844c7836c..0f2151cd3 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-eeprom.c
+++ b/kernel/drivers/media/common/b2c2/flexcop-eeprom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-eeprom.c - eeprom access methods (currently only MAC address reading)
diff --git a/kernel/drivers/media/common/b2c2/flexcop-fe-tuner.c b/kernel/drivers/media/common/b2c2/flexcop-fe-tuner.c
index 7636606f0..a1ce3e8eb 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-fe-tuner.c
+++ b/kernel/drivers/media/common/b2c2/flexcop-fe-tuner.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-fe-tuner.c - methods for frontend attachment and DiSEqC controlling
diff --git a/kernel/drivers/media/common/b2c2/flexcop-hw-filter.c b/kernel/drivers/media/common/b2c2/flexcop-hw-filter.c
index 822025790..335f30a54 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-hw-filter.c
+++ b/kernel/drivers/media/common/b2c2/flexcop-hw-filter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-hw-filter.c - pid and mac address filtering and control functions
diff --git a/kernel/drivers/media/common/b2c2/flexcop-i2c.c b/kernel/drivers/media/common/b2c2/flexcop-i2c.c
index 58d39a59f..564da6fa9 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-i2c.c
+++ b/kernel/drivers/media/common/b2c2/flexcop-i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-i2c.c - flexcop internal 2Wire bus (I2C) and dvb i2c initialization
diff --git a/kernel/drivers/media/common/b2c2/flexcop-misc.c b/kernel/drivers/media/common/b2c2/flexcop-misc.c
index bb0d95fe6..83d01d3a8 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-misc.c
+++ b/kernel/drivers/media/common/b2c2/flexcop-misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-misc.c - miscellaneous functions
diff --git a/kernel/drivers/media/common/b2c2/flexcop-reg.h b/kernel/drivers/media/common/b2c2/flexcop-reg.h
index 835c54d60..dd7c962db 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-reg.h
+++ b/kernel/drivers/media/common/b2c2/flexcop-reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-reg.h - register abstraction for FlexCopII, FlexCopIIb and FlexCopIII
diff --git a/kernel/drivers/media/common/b2c2/flexcop-sram.c b/kernel/drivers/media/common/b2c2/flexcop-sram.c
index 185c285f7..d97962eb0 100644
--- a/kernel/drivers/media/common/b2c2/flexcop-sram.c
+++ b/kernel/drivers/media/common/b2c2/flexcop-sram.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-sram.c - functions for controlling the SRAM
diff --git a/kernel/drivers/media/common/b2c2/flexcop.h b/kernel/drivers/media/common/b2c2/flexcop.h
index 8942bdacb..911ece59e 100644
--- a/kernel/drivers/media/common/b2c2/flexcop.h
+++ b/kernel/drivers/media/common/b2c2/flexcop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop.h - private header file for all flexcop-chip-source files
diff --git a/kernel/drivers/media/common/b2c2/flexcop_ibi_value_be.h b/kernel/drivers/media/common/b2c2/flexcop_ibi_value_be.h
index 8f64bdbd7..c97a0d6d7 100644
--- a/kernel/drivers/media/common/b2c2/flexcop_ibi_value_be.h
+++ b/kernel/drivers/media/common/b2c2/flexcop_ibi_value_be.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * register descriptions
  * see flexcop.c for copyright information
diff --git a/kernel/drivers/media/common/b2c2/flexcop_ibi_value_le.h b/kernel/drivers/media/common/b2c2/flexcop_ibi_value_le.h
index c75830d7d..5db3b46f2 100644
--- a/kernel/drivers/media/common/b2c2/flexcop_ibi_value_le.h
+++ b/kernel/drivers/media/common/b2c2/flexcop_ibi_value_le.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * register descriptions
  * see flexcop.c for copyright information
diff --git a/kernel/drivers/media/common/btcx-risc.h b/kernel/drivers/media/common/btcx-risc.h
index 03583ef90..76dc16f40 100644
--- a/kernel/drivers/media/common/btcx-risc.h
+++ b/kernel/drivers/media/common/btcx-risc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  */
 struct btcx_riscmem {
diff --git a/kernel/drivers/media/common/cypress_firmware.h b/kernel/drivers/media/common/cypress_firmware.h
index 1e4f27356..0aa46e602 100644
--- a/kernel/drivers/media/common/cypress_firmware.h
+++ b/kernel/drivers/media/common/cypress_firmware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
  * see dvb-usb-init.c for copyright information.
diff --git a/kernel/drivers/media/common/saa7146/saa7146_i2c.c b/kernel/drivers/media/common/saa7146/saa7146_i2c.c
index 75897f95e..f9e099d81 100644
--- a/kernel/drivers/media/common/saa7146/saa7146_i2c.c
+++ b/kernel/drivers/media/common/saa7146/saa7146_i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <media/drv-intf/saa7146_vv.h>
diff --git a/kernel/drivers/media/common/saa7146/saa7146_vbi.c b/kernel/drivers/media/common/saa7146/saa7146_vbi.c
index d79e4d7ec..371c6f860 100644
--- a/kernel/drivers/media/common/saa7146/saa7146_vbi.c
+++ b/kernel/drivers/media/common/saa7146/saa7146_vbi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <media/drv-intf/saa7146_vv.h>
 
 static int vbi_pixel_to_capture = 720 * 2;
diff --git a/kernel/drivers/media/common/siano/Makefile b/kernel/drivers/media/common/siano/Makefile
index 4c0567f10..88e2b7ffc 100644
--- a/kernel/drivers/media/common/siano/Makefile
+++ b/kernel/drivers/media/common/siano/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o
 smsdvb-objs := smsdvb-main.o
 
diff --git a/kernel/drivers/media/dvb-core/Makefile b/kernel/drivers/media/dvb-core/Makefile
index 281bc8957..47e2e391b 100644
--- a/kernel/drivers/media/dvb-core/Makefile
+++ b/kernel/drivers/media/dvb-core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel DVB device drivers.
 #
diff --git a/kernel/drivers/media/dvb-core/dvb-usb-ids.h b/kernel/drivers/media/dvb-core/dvb-usb-ids.h
index 5b6041d46..54d7d8a48 100644
--- a/kernel/drivers/media/dvb-core/dvb-usb-ids.h
+++ b/kernel/drivers/media/dvb-core/dvb-usb-ids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* dvb-usb-ids.h is part of the DVB USB library.
  *
  * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) see
diff --git a/kernel/drivers/media/dvb-frontends/Makefile b/kernel/drivers/media/dvb-frontends/Makefile
index f45f6a4a4..d025eb373 100644
--- a/kernel/drivers/media/dvb-frontends/Makefile
+++ b/kernel/drivers/media/dvb-frontends/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel DVB frontend device drivers.
 #
diff --git a/kernel/drivers/media/dvb-frontends/dib7000m.h b/kernel/drivers/media/dvb-frontends/dib7000m.h
index 8f84dfa9b..df7ecb431 100644
--- a/kernel/drivers/media/dvb-frontends/dib7000m.h
+++ b/kernel/drivers/media/dvb-frontends/dib7000m.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DIB7000M_H
 #define DIB7000M_H
 
diff --git a/kernel/drivers/media/dvb-frontends/dib7000p.h b/kernel/drivers/media/dvb-frontends/dib7000p.h
index 205fbbff6..2e10b5ccc 100644
--- a/kernel/drivers/media/dvb-frontends/dib7000p.h
+++ b/kernel/drivers/media/dvb-frontends/dib7000p.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DIB7000P_H
 #define DIB7000P_H
 
diff --git a/kernel/drivers/media/dvb-frontends/dib8000.h b/kernel/drivers/media/dvb-frontends/dib8000.h
index 75cc8e47e..b920fe769 100644
--- a/kernel/drivers/media/dvb-frontends/dib8000.h
+++ b/kernel/drivers/media/dvb-frontends/dib8000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DIB8000_H
 #define DIB8000_H
 
diff --git a/kernel/drivers/media/dvb-frontends/dib9000.h b/kernel/drivers/media/dvb-frontends/dib9000.h
index 40883b41e..bb03362ac 100644
--- a/kernel/drivers/media/dvb-frontends/dib9000.h
+++ b/kernel/drivers/media/dvb-frontends/dib9000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DIB9000_H
 #define DIB9000_H
 
diff --git a/kernel/drivers/media/dvb-frontends/dibx000_common.h b/kernel/drivers/media/dvb-frontends/dibx000_common.h
index 61f4152f2..8784af962 100644
--- a/kernel/drivers/media/dvb-frontends/dibx000_common.h
+++ b/kernel/drivers/media/dvb-frontends/dibx000_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DIBX000_COMMON_H
 #define DIBX000_COMMON_H
 
diff --git a/kernel/drivers/media/dvb-frontends/drxk.h b/kernel/drivers/media/dvb-frontends/drxk.h
index a629897eb..eb9bdc9f5 100644
--- a/kernel/drivers/media/dvb-frontends/drxk.h
+++ b/kernel/drivers/media/dvb-frontends/drxk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DRXK_H_
 #define _DRXK_H_
 
diff --git a/kernel/drivers/media/dvb-frontends/drxk_hard.h b/kernel/drivers/media/dvb-frontends/drxk_hard.h
index 9ed88e014..a850a876d 100644
--- a/kernel/drivers/media/dvb-frontends/drxk_hard.h
+++ b/kernel/drivers/media/dvb-frontends/drxk_hard.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "drxk_map.h"
 
 #define DRXK_VERSION_MAJOR 0
diff --git a/kernel/drivers/media/dvb-frontends/drxk_map.h b/kernel/drivers/media/dvb-frontends/drxk_map.h
index 761613f9f..9234ef4fb 100644
--- a/kernel/drivers/media/dvb-frontends/drxk_map.h
+++ b/kernel/drivers/media/dvb-frontends/drxk_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define  AUD_COMM_EXEC__A                                                  0x1000000
 #define    AUD_COMM_EXEC_STOP                                              0x0
 #define  FEC_COMM_EXEC__A                                                  0x1C00000
diff --git a/kernel/drivers/media/dvb-frontends/dvb-pll.h b/kernel/drivers/media/dvb-frontends/dvb-pll.h
index bf9602a88..6aaa9c6bf 100644
--- a/kernel/drivers/media/dvb-frontends/dvb-pll.h
+++ b/kernel/drivers/media/dvb-frontends/dvb-pll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * descriptions + helper functions for simple dvb plls.
  */
diff --git a/kernel/drivers/media/dvb-frontends/nxt6000_priv.h b/kernel/drivers/media/dvb-frontends/nxt6000_priv.h
index 0422e5800..d317df02c 100644
--- a/kernel/drivers/media/dvb-frontends/nxt6000_priv.h
+++ b/kernel/drivers/media/dvb-frontends/nxt6000_priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Public Include File for DRV6000 users
  * (ie. NxtWave Communications - NXT6000 demodulator driver)
diff --git a/kernel/drivers/media/dvb-frontends/si21xx.h b/kernel/drivers/media/dvb-frontends/si21xx.h
index b1be62f19..43d480bb6 100644
--- a/kernel/drivers/media/dvb-frontends/si21xx.h
+++ b/kernel/drivers/media/dvb-frontends/si21xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SI21XX_H
 #define SI21XX_H
 
diff --git a/kernel/drivers/media/dvb-frontends/sp887x.h b/kernel/drivers/media/dvb-frontends/sp887x.h
index 412f011e6..a680cc223 100644
--- a/kernel/drivers/media/dvb-frontends/sp887x.h
+++ b/kernel/drivers/media/dvb-frontends/sp887x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
    Driver for the Spase sp887x demodulator
 */
diff --git a/kernel/drivers/media/dvb-frontends/tda18271c2dd.h b/kernel/drivers/media/dvb-frontends/tda18271c2dd.h
index e6ccf240f..289653db6 100644
--- a/kernel/drivers/media/dvb-frontends/tda18271c2dd.h
+++ b/kernel/drivers/media/dvb-frontends/tda18271c2dd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TDA18271C2DD_H_
 #define _TDA18271C2DD_H_
 
diff --git a/kernel/drivers/media/dvb-frontends/tda18271c2dd_maps.h b/kernel/drivers/media/dvb-frontends/tda18271c2dd_maps.h
index f3bca5c23..5f75516bc 100644
--- a/kernel/drivers/media/dvb-frontends/tda18271c2dd_maps.h
+++ b/kernel/drivers/media/dvb-frontends/tda18271c2dd_maps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 enum HF_S {
 	HF_None = 0, HF_B, HF_DK, HF_G, HF_I, HF_L, HF_L1, HF_MN, HF_FM_Radio,
 	HF_AnalogMax, HF_DVBT_6MHZ, HF_DVBT_7MHZ, HF_DVBT_8MHZ,
diff --git a/kernel/drivers/media/i2c/Makefile b/kernel/drivers/media/i2c/Makefile
index c843c181d..f104650d6 100644
--- a/kernel/drivers/media/i2c/Makefile
+++ b/kernel/drivers/media/i2c/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
 
diff --git a/kernel/drivers/media/i2c/msp3400-driver.h b/kernel/drivers/media/i2c/msp3400-driver.h
index a8702aca1..b6c7698bc 100644
--- a/kernel/drivers/media/i2c/msp3400-driver.h
+++ b/kernel/drivers/media/i2c/msp3400-driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  */
 
diff --git a/kernel/drivers/media/i2c/soc_camera/Makefile b/kernel/drivers/media/i2c/soc_camera/Makefile
index 78532a7fb..faa2df890 100644
--- a/kernel/drivers/media/i2c/soc_camera/Makefile
+++ b/kernel/drivers/media/i2c/soc_camera/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SOC_CAMERA_IMX074)		+= imx074.o
 obj-$(CONFIG_SOC_CAMERA_MT9M001)	+= mt9m001.o
 obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031.o
diff --git a/kernel/drivers/media/i2c/tea6415c.h b/kernel/drivers/media/i2c/tea6415c.h
index 3a47d6975..f43228207 100644
--- a/kernel/drivers/media/i2c/tea6415c.h
+++ b/kernel/drivers/media/i2c/tea6415c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INCLUDED_TEA6415C__
 #define __INCLUDED_TEA6415C__
 
diff --git a/kernel/drivers/media/i2c/tea6420.h b/kernel/drivers/media/i2c/tea6420.h
index 4aa3edb3e..07f9d72a8 100644
--- a/kernel/drivers/media/i2c/tea6420.h
+++ b/kernel/drivers/media/i2c/tea6420.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INCLUDED_TEA6420__
 #define __INCLUDED_TEA6420__
 
diff --git a/kernel/drivers/media/mmc/Makefile b/kernel/drivers/media/mmc/Makefile
index 31e297a20..e847aa82a 100644
--- a/kernel/drivers/media/mmc/Makefile
+++ b/kernel/drivers/media/mmc/Makefile
@@ -1 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += siano/
diff --git a/kernel/drivers/media/pci/Makefile b/kernel/drivers/media/pci/Makefile
index a7e8af0f6..1ab759e9b 100644
--- a/kernel/drivers/media/pci/Makefile
+++ b/kernel/drivers/media/pci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel multimedia device drivers.
 #
diff --git a/kernel/drivers/media/pci/b2c2/Makefile b/kernel/drivers/media/pci/b2c2/Makefile
index b894320a5..35d6835ae 100644
--- a/kernel/drivers/media/pci/b2c2/Makefile
+++ b/kernel/drivers/media/pci/b2c2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifneq ($(CONFIG_DVB_B2C2_FLEXCOP_PCI),)
 b2c2-flexcop-pci-objs += flexcop-dma.o
 endif
diff --git a/kernel/drivers/media/pci/b2c2/flexcop-dma.c b/kernel/drivers/media/pci/b2c2/flexcop-dma.c
index 913dc97f8..f07610a16 100644
--- a/kernel/drivers/media/pci/b2c2/flexcop-dma.c
+++ b/kernel/drivers/media/pci/b2c2/flexcop-dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-dma.c - configuring and controlling the DMA of the FlexCop
diff --git a/kernel/drivers/media/pci/bt8xx/Makefile b/kernel/drivers/media/pci/bt8xx/Makefile
index 2d4c3dd88..009f1dc15 100644
--- a/kernel/drivers/media/pci/bt8xx/Makefile
+++ b/kernel/drivers/media/pci/bt8xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 bttv-objs      :=      bttv-driver.o bttv-cards.o bttv-if.o \
 		       bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \
 		       bttv-input.o bttv-audio-hook.o btcx-risc.o
diff --git a/kernel/drivers/media/pci/bt8xx/btcx-risc.h b/kernel/drivers/media/pci/bt8xx/btcx-risc.h
index 1ed7a0001..dc774a64c 100644
--- a/kernel/drivers/media/pci/bt8xx/btcx-risc.h
+++ b/kernel/drivers/media/pci/bt8xx/btcx-risc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 struct btcx_riscmem {
 	unsigned int   size;
 	__le32         *cpu;
diff --git a/kernel/drivers/media/pci/bt8xx/bttv.h b/kernel/drivers/media/pci/bt8xx/bttv.h
index 91301c3ca..eb67e362a 100644
--- a/kernel/drivers/media/pci/bt8xx/bttv.h
+++ b/kernel/drivers/media/pci/bt8xx/bttv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *  bttv - Bt848 frame grabber driver
diff --git a/kernel/drivers/media/pci/bt8xx/dst_priv.h b/kernel/drivers/media/pci/bt8xx/dst_priv.h
index 3974a4c6e..a4319d41d 100644
--- a/kernel/drivers/media/pci/bt8xx/dst_priv.h
+++ b/kernel/drivers/media/pci/bt8xx/dst_priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * dst-bt878.h: part of the DST driver for the TwinHan DST Frontend
  *
diff --git a/kernel/drivers/media/pci/cx18/Makefile b/kernel/drivers/media/pci/cx18/Makefile
index d3ff1545c..98914a40f 100644
--- a/kernel/drivers/media/pci/cx18/Makefile
+++ b/kernel/drivers/media/pci/cx18/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cx18-objs    := cx18-driver.o cx18-cards.o cx18-i2c.o cx18-firmware.o cx18-gpio.o \
 	cx18-queue.o cx18-streams.o cx18-fileops.o cx18-ioctl.o cx18-controls.o \
 	cx18-mailbox.o cx18-vbi.o cx18-audio.o cx18-video.o cx18-irq.o \
diff --git a/kernel/drivers/media/pci/cx23885/Makefile b/kernel/drivers/media/pci/cx23885/Makefile
index a2cbdcf15..b8bf78061 100644
--- a/kernel/drivers/media/pci/cx23885/Makefile
+++ b/kernel/drivers/media/pci/cx23885/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cx23885-objs	:= cx23885-cards.o cx23885-video.o cx23885-vbi.o \
 		    cx23885-core.o cx23885-i2c.o cx23885-dvb.o cx23885-417.o \
 		    cx23885-ioctl.o cx23885-ir.o cx23885-av.o cx23885-input.o \
diff --git a/kernel/drivers/media/pci/cx23885/cx23885-f300.h b/kernel/drivers/media/pci/cx23885/cx23885-f300.h
index be14d7de7..34aef3610 100644
--- a/kernel/drivers/media/pci/cx23885/cx23885-f300.h
+++ b/kernel/drivers/media/pci/cx23885/cx23885-f300.h
@@ -1,2 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern int f300_set_voltage(struct dvb_frontend *fe,
 			    enum fe_sec_voltage voltage);
diff --git a/kernel/drivers/media/pci/cx25821/Makefile b/kernel/drivers/media/pci/cx25821/Makefile
index c8f8598a2..d14d65b1b 100644
--- a/kernel/drivers/media/pci/cx25821/Makefile
+++ b/kernel/drivers/media/pci/cx25821/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cx25821-y   := cx25821-core.o cx25821-cards.o cx25821-i2c.o \
 		       cx25821-gpio.o cx25821-medusa-video.o \
 		       cx25821-video.o
diff --git a/kernel/drivers/media/pci/cx88/Makefile b/kernel/drivers/media/pci/cx88/Makefile
index d3679c3ee..86646eee4 100644
--- a/kernel/drivers/media/pci/cx88/Makefile
+++ b/kernel/drivers/media/pci/cx88/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cx88xx-objs	:= cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \
 		   cx88-dsp.o cx88-input.o
 cx8800-objs	:= cx88-video.o cx88-vbi.o
diff --git a/kernel/drivers/media/pci/cx88/cx88-vbi.c b/kernel/drivers/media/pci/cx88/cx88-vbi.c
index 2d0ef19e6..c637679b0 100644
--- a/kernel/drivers/media/pci/cx88/cx88-vbi.c
+++ b/kernel/drivers/media/pci/cx88/cx88-vbi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  */
 
diff --git a/kernel/drivers/media/pci/ddbridge/Makefile b/kernel/drivers/media/pci/ddbridge/Makefile
index 09703312a..7453b6510 100644
--- a/kernel/drivers/media/pci/ddbridge/Makefile
+++ b/kernel/drivers/media/pci/ddbridge/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ddbridge device driver
 #
diff --git a/kernel/drivers/media/pci/ivtv/Makefile b/kernel/drivers/media/pci/ivtv/Makefile
index 0eaa88298..48f8a23f9 100644
--- a/kernel/drivers/media/pci/ivtv/Makefile
+++ b/kernel/drivers/media/pci/ivtv/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ivtv-objs	:= ivtv-routing.o ivtv-cards.o ivtv-controls.o \
 		   ivtv-driver.o ivtv-fileops.o ivtv-firmware.o \
 		   ivtv-gpio.o ivtv-i2c.o ivtv-ioctl.o ivtv-irq.o \
diff --git a/kernel/drivers/media/pci/mantis/Makefile b/kernel/drivers/media/pci/mantis/Makefile
index f715051e4..a684dc2ec 100644
--- a/kernel/drivers/media/pci/mantis/Makefile
+++ b/kernel/drivers/media/pci/mantis/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 mantis_core-objs :=	mantis_ioc.o	\
 			mantis_uart.o	\
 			mantis_dma.o	\
diff --git a/kernel/drivers/media/pci/netup_unidvb/Makefile b/kernel/drivers/media/pci/netup_unidvb/Makefile
index ee6ae0501..07d3f1eb7 100644
--- a/kernel/drivers/media/pci/netup_unidvb/Makefile
+++ b/kernel/drivers/media/pci/netup_unidvb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 netup-unidvb-objs += netup_unidvb_core.o
 netup-unidvb-objs += netup_unidvb_i2c.o
 netup-unidvb-objs += netup_unidvb_ci.o
diff --git a/kernel/drivers/media/pci/ngene/Makefile b/kernel/drivers/media/pci/ngene/Makefile
index 5c0b5d6b9..dbdf28497 100644
--- a/kernel/drivers/media/pci/ngene/Makefile
+++ b/kernel/drivers/media/pci/ngene/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the nGene device driver
 #
diff --git a/kernel/drivers/media/pci/pt3/Makefile b/kernel/drivers/media/pci/pt3/Makefile
index 396f146b1..aded8752a 100644
--- a/kernel/drivers/media/pci/pt3/Makefile
+++ b/kernel/drivers/media/pci/pt3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 earth-pt3-objs += pt3.o pt3_i2c.o pt3_dma.o
 
diff --git a/kernel/drivers/media/pci/saa7134/Makefile b/kernel/drivers/media/pci/saa7134/Makefile
index 09c43da67..dbaadddf4 100644
--- a/kernel/drivers/media/pci/saa7134/Makefile
+++ b/kernel/drivers/media/pci/saa7134/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 saa7134-y +=	saa7134-cards.o saa7134-core.o saa7134-i2c.o
 saa7134-y +=	saa7134-ts.o saa7134-tvaudio.o saa7134-vbi.o
diff --git a/kernel/drivers/media/pci/saa7134/saa7134-reg.h b/kernel/drivers/media/pci/saa7134/saa7134-reg.h
index b6ea6f4f9..56b12641d 100644
--- a/kernel/drivers/media/pci/saa7134/saa7134-reg.h
+++ b/kernel/drivers/media/pci/saa7134/saa7134-reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * philips saa7134 registers
diff --git a/kernel/drivers/media/pci/saa7164/Makefile b/kernel/drivers/media/pci/saa7164/Makefile
index ba0e33a1e..3896bcdb9 100644
--- a/kernel/drivers/media/pci/saa7164/Makefile
+++ b/kernel/drivers/media/pci/saa7164/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 saa7164-objs	:= saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \
 			saa7164-fw.o saa7164-bus.o saa7164-cmd.o saa7164-api.o \
 			saa7164-buffer.o saa7164-encoder.o saa7164-vbi.o
diff --git a/kernel/drivers/media/pci/smipcie/Makefile b/kernel/drivers/media/pci/smipcie/Makefile
index 013bc3fe4..6006aac3c 100644
--- a/kernel/drivers/media/pci/smipcie/Makefile
+++ b/kernel/drivers/media/pci/smipcie/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 smipcie-objs	:= smipcie-main.o smipcie-ir.o
 
diff --git a/kernel/drivers/media/pci/ttpci/Makefile b/kernel/drivers/media/pci/ttpci/Makefile
index 3cf617737..0b805339c 100644
--- a/kernel/drivers/media/pci/ttpci/Makefile
+++ b/kernel/drivers/media/pci/ttpci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel SAA7146 FULL TS DVB device driver
 # and the AV7110 DVB device driver
diff --git a/kernel/drivers/media/pci/ttpci/av7110.h b/kernel/drivers/media/pci/ttpci/av7110.h
index 347827925..cd09fd6e6 100644
--- a/kernel/drivers/media/pci/ttpci/av7110.h
+++ b/kernel/drivers/media/pci/ttpci/av7110.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AV7110_H_
 #define _AV7110_H_
 
diff --git a/kernel/drivers/media/pci/ttpci/av7110_av.h b/kernel/drivers/media/pci/ttpci/av7110_av.h
index f52276f47..71bbd4391 100644
--- a/kernel/drivers/media/pci/ttpci/av7110_av.h
+++ b/kernel/drivers/media/pci/ttpci/av7110_av.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AV7110_AV_H_
 #define _AV7110_AV_H_
 
diff --git a/kernel/drivers/media/pci/ttpci/av7110_ca.h b/kernel/drivers/media/pci/ttpci/av7110_ca.h
index 70ee855ec..a6e3f2955 100644
--- a/kernel/drivers/media/pci/ttpci/av7110_ca.h
+++ b/kernel/drivers/media/pci/ttpci/av7110_ca.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AV7110_CA_H_
 #define _AV7110_CA_H_
 
diff --git a/kernel/drivers/media/pci/ttpci/av7110_hw.h b/kernel/drivers/media/pci/ttpci/av7110_hw.h
index ccb148059..6380d8950 100644
--- a/kernel/drivers/media/pci/ttpci/av7110_hw.h
+++ b/kernel/drivers/media/pci/ttpci/av7110_hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AV7110_HW_H_
 #define _AV7110_HW_H_
 
diff --git a/kernel/drivers/media/pci/ttpci/av7110_ipack.c b/kernel/drivers/media/pci/ttpci/av7110_ipack.c
index 699ef8b5b..5aff26574 100644
--- a/kernel/drivers/media/pci/ttpci/av7110_ipack.c
+++ b/kernel/drivers/media/pci/ttpci/av7110_ipack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "dvb_filter.h"
 #include "av7110_ipack.h"
 #include <linux/string.h>	/* for memcpy() */
diff --git a/kernel/drivers/media/pci/ttpci/av7110_ipack.h b/kernel/drivers/media/pci/ttpci/av7110_ipack.h
index becf94d3f..943ec899b 100644
--- a/kernel/drivers/media/pci/ttpci/av7110_ipack.h
+++ b/kernel/drivers/media/pci/ttpci/av7110_ipack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AV7110_IPACK_H_
 #define _AV7110_IPACK_H_
 
diff --git a/kernel/drivers/media/pci/ttpci/budget.h b/kernel/drivers/media/pci/ttpci/budget.h
index d5ae44381..fae83866b 100644
--- a/kernel/drivers/media/pci/ttpci/budget.h
+++ b/kernel/drivers/media/pci/ttpci/budget.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __BUDGET_DVB__
 #define __BUDGET_DVB__
diff --git a/kernel/drivers/media/pci/ttpci/dvb_filter.c b/kernel/drivers/media/pci/ttpci/dvb_filter.c
index b67127b67..8c2eca5dc 100644
--- a/kernel/drivers/media/pci/ttpci/dvb_filter.c
+++ b/kernel/drivers/media/pci/ttpci/dvb_filter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/string.h>
diff --git a/kernel/drivers/media/pci/tw5864/tw5864-util.c b/kernel/drivers/media/pci/tw5864/tw5864-util.c
index 771eef235..b9cebe9d1 100644
--- a/kernel/drivers/media/pci/tw5864/tw5864-util.c
+++ b/kernel/drivers/media/pci/tw5864/tw5864-util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tw5864.h"
 
 void tw5864_indir_writeb(struct tw5864_dev *dev, u16 addr, u8 data)
diff --git a/kernel/drivers/media/pci/tw686x/tw686x-regs.h b/kernel/drivers/media/pci/tw686x/tw686x-regs.h
index 15a956642..8adacc928 100644
--- a/kernel/drivers/media/pci/tw686x/tw686x-regs.h
+++ b/kernel/drivers/media/pci/tw686x/tw686x-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* DMA controller registers */
 #define REG8_1(a0) ((const u16[8]) { a0, a0 + 1, a0 + 2, a0 + 3, \
 				     a0 + 4, a0 + 5, a0 + 6, a0 + 7})
diff --git a/kernel/drivers/media/pci/zoran/Makefile b/kernel/drivers/media/pci/zoran/Makefile
index 44cc13352..21ac29a71 100644
--- a/kernel/drivers/media/pci/zoran/Makefile
+++ b/kernel/drivers/media/pci/zoran/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 zr36067-objs	:=	zoran_procfs.o zoran_device.o \
 			zoran_driver.o zoran_card.o
 
diff --git a/kernel/drivers/media/platform/Makefile b/kernel/drivers/media/platform/Makefile
index c1ef946bf..327f80a6f 100644
--- a/kernel/drivers/media/platform/Makefile
+++ b/kernel/drivers/media/platform/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the video capture/playback device drivers.
 #
diff --git a/kernel/drivers/media/platform/atmel/atmel-isc-regs.h b/kernel/drivers/media/platform/atmel/atmel-isc-regs.h
index 6936ac467..e6cef966d 100644
--- a/kernel/drivers/media/platform/atmel/atmel-isc-regs.h
+++ b/kernel/drivers/media/platform/atmel/atmel-isc-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATMEL_ISC_REGS_H
 #define __ATMEL_ISC_REGS_H
 
diff --git a/kernel/drivers/media/platform/coda/trace.h b/kernel/drivers/media/platform/coda/trace.h
index f20666a4a..ca671e315 100644
--- a/kernel/drivers/media/platform/coda/trace.h
+++ b/kernel/drivers/media/platform/coda/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM coda
 
diff --git a/kernel/drivers/media/platform/davinci/Makefile b/kernel/drivers/media/platform/davinci/Makefile
index d74d9eeb0..05c45bf37 100644
--- a/kernel/drivers/media/platform/davinci/Makefile
+++ b/kernel/drivers/media/platform/davinci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the davinci video device drivers.
 #
diff --git a/kernel/drivers/media/platform/exynos4-is/Makefile b/kernel/drivers/media/platform/exynos4-is/Makefile
index eed1b185d..a5ab01c73 100644
--- a/kernel/drivers/media/platform/exynos4-is/Makefile
+++ b/kernel/drivers/media/platform/exynos4-is/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o media-dev.o
 exynos-fimc-lite-objs += fimc-lite-reg.o fimc-lite.o
 s5p-csis-objs := mipi-csis.o
diff --git a/kernel/drivers/media/platform/marvell-ccic/mcam-core.c b/kernel/drivers/media/platform/marvell-ccic/mcam-core.c
index b07a251e8..7b7250b1c 100644
--- a/kernel/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/kernel/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * The Marvell camera core.  This device appears in a number of settings,
  * so it needs platform-specific support outside of the core.
diff --git a/kernel/drivers/media/platform/marvell-ccic/mcam-core.h b/kernel/drivers/media/platform/marvell-ccic/mcam-core.h
index beb339f55..ad8955f9f 100644
--- a/kernel/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/kernel/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Marvell camera core structures.
  *
diff --git a/kernel/drivers/media/platform/mtk-mdp/Makefile b/kernel/drivers/media/platform/mtk-mdp/Makefile
index f8025699a..5982d65c9 100644
--- a/kernel/drivers/media/platform/mtk-mdp/Makefile
+++ b/kernel/drivers/media/platform/mtk-mdp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 mtk-mdp-y += mtk_mdp_core.o
 mtk-mdp-y += mtk_mdp_comp.o
 mtk-mdp-y += mtk_mdp_m2m.o
diff --git a/kernel/drivers/media/platform/mtk-vcodec/Makefile b/kernel/drivers/media/platform/mtk-vcodec/Makefile
index 852d9697c..37b94b555 100644
--- a/kernel/drivers/media/platform/mtk-vcodec/Makefile
+++ b/kernel/drivers/media/platform/mtk-vcodec/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC) += mtk-vcodec-dec.o \
 				       mtk-vcodec-enc.o \
diff --git a/kernel/drivers/media/platform/omap3isp/Makefile b/kernel/drivers/media/platform/omap3isp/Makefile
index 254975a91..56e99b4f7 100644
--- a/kernel/drivers/media/platform/omap3isp/Makefile
+++ b/kernel/drivers/media/platform/omap3isp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for OMAP3 ISP driver
 
 ccflags-$(CONFIG_VIDEO_OMAP3_DEBUG) += -DDEBUG
diff --git a/kernel/drivers/media/platform/qcom/venus/Makefile b/kernel/drivers/media/platform/qcom/venus/Makefile
index 0fe9afb83..bfd4edf7c 100644
--- a/kernel/drivers/media/platform/qcom/venus/Makefile
+++ b/kernel/drivers/media/platform/qcom/venus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for Qualcomm Venus driver
 
 venus-core-objs += core.o helpers.o firmware.o \
diff --git a/kernel/drivers/media/platform/s5p-mfc/Makefile b/kernel/drivers/media/platform/s5p-mfc/Makefile
index 15f59b324..0b324af2a 100644
--- a/kernel/drivers/media/platform/s5p-mfc/Makefile
+++ b/kernel/drivers/media/platform/s5p-mfc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc.o
 s5p-mfc-y += s5p_mfc.o s5p_mfc_intr.o
 s5p-mfc-y += s5p_mfc_dec.o s5p_mfc_enc.o
diff --git a/kernel/drivers/media/platform/sti/c8sectpfe/Makefile b/kernel/drivers/media/platform/sti/c8sectpfe/Makefile
index b578c7cb4..b642b4fd5 100644
--- a/kernel/drivers/media/platform/sti/c8sectpfe/Makefile
+++ b/kernel/drivers/media/platform/sti/c8sectpfe/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 c8sectpfe-y += c8sectpfe-core.o c8sectpfe-common.o c8sectpfe-dvb.o \
 		c8sectpfe-debugfs.o
 
diff --git a/kernel/drivers/media/platform/ti-vpe/Makefile b/kernel/drivers/media/platform/ti-vpe/Makefile
index 32504b724..886ac5ec0 100644
--- a/kernel/drivers/media/platform/ti-vpe/Makefile
+++ b/kernel/drivers/media/platform/ti-vpe/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VIDEO_TI_VPE) += ti-vpe.o
 obj-$(CONFIG_VIDEO_TI_VPDMA) += ti-vpdma.o
 obj-$(CONFIG_VIDEO_TI_SC) += ti-sc.o
diff --git a/kernel/drivers/media/platform/via-camera.h b/kernel/drivers/media/platform/via-camera.h
index b12a4b3d6..2d67f8ce2 100644
--- a/kernel/drivers/media/platform/via-camera.h
+++ b/kernel/drivers/media/platform/via-camera.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * VIA Camera register definitions.
  */
diff --git a/kernel/drivers/media/platform/vimc/Makefile b/kernel/drivers/media/platform/vimc/Makefile
index 68c5d9804..4b2e3de78 100644
--- a/kernel/drivers/media/platform/vimc/Makefile
+++ b/kernel/drivers/media/platform/vimc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vimc-objs := vimc-core.o
 vimc_capture-objs := vimc-capture.o
 vimc_common-objs := vimc-common.o
diff --git a/kernel/drivers/media/platform/vivid/Makefile b/kernel/drivers/media/platform/vivid/Makefile
index 29738810e..2f5762e33 100644
--- a/kernel/drivers/media/platform/vivid/Makefile
+++ b/kernel/drivers/media/platform/vivid/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \
 		vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \
 		vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \
diff --git a/kernel/drivers/media/platform/vsp1/Makefile b/kernel/drivers/media/platform/vsp1/Makefile
index a33afc385..f5cd6f049 100644
--- a/kernel/drivers/media/platform/vsp1/Makefile
+++ b/kernel/drivers/media/platform/vsp1/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vsp1-y					:= vsp1_drv.o vsp1_entity.o vsp1_pipe.o
 vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_video.o
 vsp1-y					+= vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o
diff --git a/kernel/drivers/media/radio/Makefile b/kernel/drivers/media/radio/Makefile
index 120e79119..37e6e8255 100644
--- a/kernel/drivers/media/radio/Makefile
+++ b/kernel/drivers/media/radio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel character device drivers.
 #
diff --git a/kernel/drivers/media/radio/lm7000.h b/kernel/drivers/media/radio/lm7000.h
index 139cd6b68..adb217965 100644
--- a/kernel/drivers/media/radio/lm7000.h
+++ b/kernel/drivers/media/radio/lm7000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LM7000_H
 #define __LM7000_H
 
diff --git a/kernel/drivers/media/rc/Makefile b/kernel/drivers/media/rc/Makefile
index 9bc6a3980..ab3d5a135 100644
--- a/kernel/drivers/media/rc/Makefile
+++ b/kernel/drivers/media/rc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rc-core-objs	:= rc-main.o rc-ir-raw.o
 
 obj-y += keymaps/
diff --git a/kernel/drivers/media/rc/img-ir/Makefile b/kernel/drivers/media/rc/img-ir/Makefile
index 8e6d458e6..741fedc5d 100644
--- a/kernel/drivers/media/rc/img-ir/Makefile
+++ b/kernel/drivers/media/rc/img-ir/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 img-ir-y			:= img-ir-core.o
 img-ir-$(CONFIG_IR_IMG_RAW)	+= img-ir-raw.o
 img-ir-$(CONFIG_IR_IMG_HW)	+= img-ir-hw.o
diff --git a/kernel/drivers/media/rc/keymaps/Makefile b/kernel/drivers/media/rc/keymaps/Makefile
index af6496d70..2d0b26bf2 100644
--- a/kernel/drivers/media/rc/keymaps/Makefile
+++ b/kernel/drivers/media/rc/keymaps/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-alink-dtu-m.o \
 			rc-anysee.o \
diff --git a/kernel/drivers/media/tuners/Makefile b/kernel/drivers/media/tuners/Makefile
index 06a9ab65e..7be965115 100644
--- a/kernel/drivers/media/tuners/Makefile
+++ b/kernel/drivers/media/tuners/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for common V4L/DVB tuners
 #
diff --git a/kernel/drivers/media/tuners/fc0011.h b/kernel/drivers/media/tuners/fc0011.h
index 438cf897a..a36871c44 100644
--- a/kernel/drivers/media/tuners/fc0011.h
+++ b/kernel/drivers/media/tuners/fc0011.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_FC0011_H_
 #define LINUX_FC0011_H_
 
diff --git a/kernel/drivers/media/tuners/mt2063.h b/kernel/drivers/media/tuners/mt2063.h
index e55e0a6dd..0e3e3b052 100644
--- a/kernel/drivers/media/tuners/mt2063.h
+++ b/kernel/drivers/media/tuners/mt2063.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MT2063_H__
 #define __MT2063_H__
 
diff --git a/kernel/drivers/media/usb/Makefile b/kernel/drivers/media/usb/Makefile
index 738b993ec..21e46b10c 100644
--- a/kernel/drivers/media/usb/Makefile
+++ b/kernel/drivers/media/usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the USB media device drivers
 #
diff --git a/kernel/drivers/media/usb/as102/Makefile b/kernel/drivers/media/usb/as102/Makefile
index 22f43eee4..56bd2d00b 100644
--- a/kernel/drivers/media/usb/as102/Makefile
+++ b/kernel/drivers/media/usb/as102/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
 		  as102_usb_drv.o as10x_cmd_cfg.o
 
diff --git a/kernel/drivers/media/usb/au0828/Makefile b/kernel/drivers/media/usb/au0828/Makefile
index 3dc7539a5..c06ef6601 100644
--- a/kernel/drivers/media/usb/au0828/Makefile
+++ b/kernel/drivers/media/usb/au0828/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 au0828-objs	:= au0828-core.o au0828-i2c.o au0828-cards.o au0828-dvb.o
 
 ifeq ($(CONFIG_VIDEO_AU0828_V4L2),y)
diff --git a/kernel/drivers/media/usb/b2c2/flexcop-usb.h b/kernel/drivers/media/usb/b2c2/flexcop-usb.h
index 25ad43166..e86faa0e0 100644
--- a/kernel/drivers/media/usb/b2c2/flexcop-usb.h
+++ b/kernel/drivers/media/usb/b2c2/flexcop-usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux driver for digital TV devices equipped with B2C2 FlexcopII(b)/III
  * flexcop-usb.h - header file for the USB part
diff --git a/kernel/drivers/media/usb/cx231xx/Makefile b/kernel/drivers/media/usb/cx231xx/Makefile
index 52cf76935..19e8c35d6 100644
--- a/kernel/drivers/media/usb/cx231xx/Makefile
+++ b/kernel/drivers/media/usb/cx231xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cx231xx-y += cx231xx-video.o cx231xx-i2c.o cx231xx-cards.o cx231xx-core.o
 cx231xx-y += cx231xx-avcore.o cx231xx-417.o cx231xx-pcb-cfg.o cx231xx-vbi.o
 cx231xx-$(CONFIG_VIDEO_CX231XX_RC) += cx231xx-input.o
diff --git a/kernel/drivers/media/usb/dvb-usb-v2/Makefile b/kernel/drivers/media/usb/dvb-usb-v2/Makefile
index 969f68e55..bed44601f 100644
--- a/kernel/drivers/media/usb/dvb-usb-v2/Makefile
+++ b/kernel/drivers/media/usb/dvb-usb-v2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dvb_usb_v2-objs := dvb_usb_core.o dvb_usb_urb.o usb_urb.o
 obj-$(CONFIG_DVB_USB_V2) += dvb_usb_v2.o
 
diff --git a/kernel/drivers/media/usb/dvb-usb-v2/gl861.h b/kernel/drivers/media/usb/dvb-usb-v2/gl861.h
index b0b80d87b..b651b857e 100644
--- a/kernel/drivers/media/usb/dvb-usb-v2/gl861.h
+++ b/kernel/drivers/media/usb/dvb-usb-v2/gl861.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DVB_USB_GL861_H_
 #define _DVB_USB_GL861_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb-v2/usb_urb.c b/kernel/drivers/media/usb/dvb-usb-v2/usb_urb.c
index 55136cde3..dce2b97ef 100644
--- a/kernel/drivers/media/usb/dvb-usb-v2/usb_urb.c
+++ b/kernel/drivers/media/usb/dvb-usb-v2/usb_urb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* usb-urb.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/Makefile b/kernel/drivers/media/usb/dvb-usb/Makefile
index 3b3f32b42..16de1e4f3 100644
--- a/kernel/drivers/media/usb/dvb-usb/Makefile
+++ b/kernel/drivers/media/usb/dvb-usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 dvb-usb-objs += dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o
 dvb-usb-objs += dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o
 obj-$(CONFIG_DVB_USB) += dvb-usb.o
diff --git a/kernel/drivers/media/usb/dvb-usb/af9005-script.h b/kernel/drivers/media/usb/dvb-usb/af9005-script.h
index 4d6904542..870cb59cd 100644
--- a/kernel/drivers/media/usb/dvb-usb/af9005-script.h
+++ b/kernel/drivers/media/usb/dvb-usb/af9005-script.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 File automatically generated by createinit.py using data
 extracted from AF05BDA.sys (windows driver):
diff --git a/kernel/drivers/media/usb/dvb-usb/az6027.h b/kernel/drivers/media/usb/dvb-usb/az6027.h
index f3afe17f3..95b056b36 100644
--- a/kernel/drivers/media/usb/dvb-usb/az6027.h
+++ b/kernel/drivers/media/usb/dvb-usb/az6027.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DVB_USB_VP6027_H_
 #define _DVB_USB_VP6027_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb/cxusb.h b/kernel/drivers/media/usb/dvb-usb/cxusb.h
index 66429d7f6..88f9b9804 100644
--- a/kernel/drivers/media/usb/dvb-usb/cxusb.h
+++ b/kernel/drivers/media/usb/dvb-usb/cxusb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DVB_USB_CXUSB_H_
 #define _DVB_USB_CXUSB_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb/dib07x0.h b/kernel/drivers/media/usb/dvb-usb/dib07x0.h
index 7e62c1018..2e67f794f 100644
--- a/kernel/drivers/media/usb/dvb-usb/dib07x0.h
+++ b/kernel/drivers/media/usb/dvb-usb/dib07x0.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DIB07X0_H_
 #define _DIB07X0_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb/digitv.h b/kernel/drivers/media/usb/dvb-usb/digitv.h
index 581e09c25..2af9fedfa 100644
--- a/kernel/drivers/media/usb/dvb-usb/digitv.h
+++ b/kernel/drivers/media/usb/dvb-usb/digitv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DVB_USB_DIGITV_H_
 #define _DVB_USB_DIGITV_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb-common.h b/kernel/drivers/media/usb/dvb-usb/dvb-usb-common.h
index 7e619d638..8c51ac449 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb-common.h
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* dvb-usb-common.h is part of the DVB USB library.
  *
  * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb-dvb.c b/kernel/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
index e5675da28..3a66e732e 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb-dvb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* dvb-usb-dvb.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/kernel/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
index 04033efe7..15c153e49 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* dvb-usb-firmware.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb-i2c.c b/kernel/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
index 4f0b0adce..ca0b734e0 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb-i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* dvb-usb-i2c.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb-remote.c b/kernel/drivers/media/usb/dvb-usb/dvb-usb-remote.c
index 0b03f9bd9..701c10835 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb-remote.c
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb-remote.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* dvb-usb-remote.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb-urb.c b/kernel/drivers/media/usb/dvb-usb/dvb-usb-urb.c
index 95f909749..c1b4e94a3 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb-urb.c
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb-urb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* dvb-usb-urb.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dvb-usb.h b/kernel/drivers/media/usb/dvb-usb/dvb-usb.h
index 72468fdff..6c7c46375 100644
--- a/kernel/drivers/media/usb/dvb-usb/dvb-usb.h
+++ b/kernel/drivers/media/usb/dvb-usb/dvb-usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* dvb-usb.h is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/dw2102.h b/kernel/drivers/media/usb/dvb-usb/dw2102.h
index 5cd0b0eb6..f64cf79b7 100644
--- a/kernel/drivers/media/usb/dvb-usb/dw2102.h
+++ b/kernel/drivers/media/usb/dvb-usb/dw2102.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DW2102_H_
 #define _DW2102_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb/m920x.h b/kernel/drivers/media/usb/dvb-usb/m920x.h
index 3c061518f..bab3c6ac7 100644
--- a/kernel/drivers/media/usb/dvb-usb/m920x.h
+++ b/kernel/drivers/media/usb/dvb-usb/m920x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DVB_USB_M920X_H_
 #define _DVB_USB_M920X_H_
 
diff --git a/kernel/drivers/media/usb/dvb-usb/usb-urb.c b/kernel/drivers/media/usb/dvb-usb/usb-urb.c
index 89173603b..2804d2d0e 100644
--- a/kernel/drivers/media/usb/dvb-usb/usb-urb.c
+++ b/kernel/drivers/media/usb/dvb-usb/usb-urb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* usb-urb.c is part of the DVB USB library.
  *
  * Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@posteo.de)
diff --git a/kernel/drivers/media/usb/dvb-usb/vp702x.h b/kernel/drivers/media/usb/dvb-usb/vp702x.h
index 20b90055e..18ad7ced2 100644
--- a/kernel/drivers/media/usb/dvb-usb/vp702x.h
+++ b/kernel/drivers/media/usb/dvb-usb/vp702x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DVB_USB_VP7021_H_
 #define _DVB_USB_VP7021_H_
 
diff --git a/kernel/drivers/media/usb/em28xx/Makefile b/kernel/drivers/media/usb/em28xx/Makefile
index 3f850d506..86bfc35e2 100644
--- a/kernel/drivers/media/usb/em28xx/Makefile
+++ b/kernel/drivers/media/usb/em28xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 em28xx-y +=	em28xx-core.o em28xx-i2c.o em28xx-cards.o em28xx-camera.o
 
 em28xx-v4l-objs := em28xx-video.o em28xx-vbi.o
diff --git a/kernel/drivers/media/usb/em28xx/em28xx-reg.h b/kernel/drivers/media/usb/em28xx/em28xx-reg.h
index 747525ca7..9e5cdfb25 100644
--- a/kernel/drivers/media/usb/em28xx/em28xx-reg.h
+++ b/kernel/drivers/media/usb/em28xx/em28xx-reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define EM_GPIO_0  (1 << 0)
 #define EM_GPIO_1  (1 << 1)
 #define EM_GPIO_2  (1 << 2)
diff --git a/kernel/drivers/media/usb/go7007/Makefile b/kernel/drivers/media/usb/go7007/Makefile
index e99287c3b..3d95bbc41 100644
--- a/kernel/drivers/media/usb/go7007/Makefile
+++ b/kernel/drivers/media/usb/go7007/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VIDEO_GO7007) += go7007.o
 obj-$(CONFIG_VIDEO_GO7007_USB) += go7007-usb.o
 obj-$(CONFIG_VIDEO_GO7007_LOADER) += go7007-loader.o
diff --git a/kernel/drivers/media/usb/gspca/Makefile b/kernel/drivers/media/usb/gspca/Makefile
index 9f5ccecb9..3e3ecbffd 100644
--- a/kernel/drivers/media/usb/gspca/Makefile
+++ b/kernel/drivers/media/usb/gspca/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_GSPCA)          += gspca_main.o
 obj-$(CONFIG_USB_GSPCA_BENQ)     += gspca_benq.o
 obj-$(CONFIG_USB_GSPCA_CONEX)    += gspca_conex.o
diff --git a/kernel/drivers/media/usb/gspca/gl860/Makefile b/kernel/drivers/media/usb/gspca/gl860/Makefile
index cf6397415..7bcfa36f1 100644
--- a/kernel/drivers/media/usb/gspca/gl860/Makefile
+++ b/kernel/drivers/media/usb/gspca/gl860/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_GL860) += gspca_gl860.o
 
 gspca_gl860-objs := gl860.o \
diff --git a/kernel/drivers/media/usb/gspca/gspca.h b/kernel/drivers/media/usb/gspca/gspca.h
index d39adf903..9e0cf7116 100644
--- a/kernel/drivers/media/usb/gspca/gspca.h
+++ b/kernel/drivers/media/usb/gspca/gspca.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GSPCAV2_H
 #define GSPCAV2_H
 
diff --git a/kernel/drivers/media/usb/gspca/m5602/Makefile b/kernel/drivers/media/usb/gspca/m5602/Makefile
index 8e1fb5a1d..95c9db6dc 100644
--- a/kernel/drivers/media/usb/gspca/m5602/Makefile
+++ b/kernel/drivers/media/usb/gspca/m5602/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_M5602) += gspca_m5602.o
 
 gspca_m5602-objs := m5602_core.o \
diff --git a/kernel/drivers/media/usb/gspca/stv06xx/Makefile b/kernel/drivers/media/usb/gspca/stv06xx/Makefile
index 3a4b2f899..c4d7206e0 100644
--- a/kernel/drivers/media/usb/gspca/stv06xx/Makefile
+++ b/kernel/drivers/media/usb/gspca/stv06xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_STV06XX) += gspca_stv06xx.o
 
 gspca_stv06xx-objs := stv06xx.o \
diff --git a/kernel/drivers/media/usb/pvrusb2/Makefile b/kernel/drivers/media/usb/pvrusb2/Makefile
index ad705547b..0d8406403 100644
--- a/kernel/drivers/media/usb/pvrusb2/Makefile
+++ b/kernel/drivers/media/usb/pvrusb2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-pvrusb2-sysfs-$(CONFIG_VIDEO_PVRUSB2_SYSFS) := pvrusb2-sysfs.o
 obj-pvrusb2-debugifc-$(CONFIG_VIDEO_PVRUSB2_DEBUGIFC) := pvrusb2-debugifc.o
 obj-pvrusb2-dvb-$(CONFIG_VIDEO_PVRUSB2_DVB) := pvrusb2-dvb.o
diff --git a/kernel/drivers/media/usb/pvrusb2/pvrusb2-dvb.h b/kernel/drivers/media/usb/pvrusb2/pvrusb2-dvb.h
index 884ff916a..b500c86d4 100644
--- a/kernel/drivers/media/usb/pvrusb2/pvrusb2-dvb.h
+++ b/kernel/drivers/media/usb/pvrusb2/pvrusb2-dvb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PVRUSB2_DVB_H__
 #define __PVRUSB2_DVB_H__
 
diff --git a/kernel/drivers/media/usb/pwc/pwc-nala.h b/kernel/drivers/media/usb/pwc/pwc-nala.h
index 168c73ef7..0fe9d473f 100644
--- a/kernel/drivers/media/usb/pwc/pwc-nala.h
+++ b/kernel/drivers/media/usb/pwc/pwc-nala.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
    /* SQCIF */
    {
       {0, 0, {0x04, 0x01, 0x03}},
diff --git a/kernel/drivers/media/usb/stk1160/Makefile b/kernel/drivers/media/usb/stk1160/Makefile
index 42d05463b..613471528 100644
--- a/kernel/drivers/media/usb/stk1160/Makefile
+++ b/kernel/drivers/media/usb/stk1160/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 stk1160-y := 	stk1160-core.o \
 		stk1160-v4l.o \
 		stk1160-video.o \
diff --git a/kernel/drivers/media/usb/tm6000/Makefile b/kernel/drivers/media/usb/tm6000/Makefile
index f2644933b..05322a72e 100644
--- a/kernel/drivers/media/usb/tm6000/Makefile
+++ b/kernel/drivers/media/usb/tm6000/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 tm6000-y := tm6000-cards.o \
 		   tm6000-core.o  \
 		   tm6000-i2c.o   \
diff --git a/kernel/drivers/media/usb/usbvision/usbvision-cards.h b/kernel/drivers/media/usb/usbvision/usbvision-cards.h
index a51cc1185..07ec83512 100644
--- a/kernel/drivers/media/usb/usbvision/usbvision-cards.h
+++ b/kernel/drivers/media/usb/usbvision/usbvision-cards.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define XANBOO                                   0
 #define BELKIN_VIDEOBUS_II                       1
 #define BELKIN_VIDEOBUS                          2
diff --git a/kernel/drivers/media/usb/uvc/Makefile b/kernel/drivers/media/usb/uvc/Makefile
index c26d12fdb..a4fe5b5d5 100644
--- a/kernel/drivers/media/usb/uvc/Makefile
+++ b/kernel/drivers/media/usb/uvc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 uvcvideo-objs  := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \
 		  uvc_status.o uvc_isight.o uvc_debugfs.o
 ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
diff --git a/kernel/drivers/media/usb/uvc/uvcvideo.h b/kernel/drivers/media/usb/uvc/uvcvideo.h
index 34c7ee6cc..05398784d 100644
--- a/kernel/drivers/media/usb/uvc/uvcvideo.h
+++ b/kernel/drivers/media/usb/uvc/uvcvideo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _USB_VIDEO_H_
 #define _USB_VIDEO_H_
 
diff --git a/kernel/drivers/media/v4l2-core/Makefile b/kernel/drivers/media/v4l2-core/Makefile
index 098ad5fd5..77303286a 100644
--- a/kernel/drivers/media/v4l2-core/Makefile
+++ b/kernel/drivers/media/v4l2-core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the V4L2 core
 #
diff --git a/kernel/drivers/media/v4l2-core/v4l2-trace.c b/kernel/drivers/media/v4l2-core/v4l2-trace.c
index 741601054..95f3b02e1 100644
--- a/kernel/drivers/media/v4l2-core/v4l2-trace.c
+++ b/kernel/drivers/media/v4l2-core/v4l2-trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <media/v4l2-common.h>
 #include <media/v4l2-fh.h>
 #include <media/videobuf2-v4l2.h>
diff --git a/kernel/drivers/media/v4l2-core/vb2-trace.c b/kernel/drivers/media/v4l2-core/vb2-trace.c
index 61e74f593..4c0f39d27 100644
--- a/kernel/drivers/media/v4l2-core/vb2-trace.c
+++ b/kernel/drivers/media/v4l2-core/vb2-trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <media/videobuf2-core.h>
 
 #define CREATE_TRACE_POINTS
diff --git a/kernel/drivers/memory/Makefile b/kernel/drivers/memory/Makefile
index e88097fbc..470b93e38 100644
--- a/kernel/drivers/memory/Makefile
+++ b/kernel/drivers/memory/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for memory devices
 #
diff --git a/kernel/drivers/memory/tegra/Makefile b/kernel/drivers/memory/tegra/Makefile
index c2cb671ff..b44e8627a 100644
--- a/kernel/drivers/memory/tegra/Makefile
+++ b/kernel/drivers/memory/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 tegra-mc-y := mc.o
 
 tegra-mc-$(CONFIG_ARCH_TEGRA_3x_SOC)  += tegra30.o
diff --git a/kernel/drivers/memstick/host/Makefile b/kernel/drivers/memstick/host/Makefile
index 491c95574..1abaa03ee 100644
--- a/kernel/drivers/memstick/host/Makefile
+++ b/kernel/drivers/memstick/host/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for MemoryStick host controller drivers
 #
diff --git a/kernel/drivers/message/fusion/Makefile b/kernel/drivers/message/fusion/Makefile
index d182a24b3..e2d98b5c6 100644
--- a/kernel/drivers/message/fusion/Makefile
+++ b/kernel/drivers/message/fusion/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Fusion MPT drivers; recognized debug defines...
 
 # enable verbose logging
diff --git a/kernel/drivers/message/fusion/lsi/mpi.h b/kernel/drivers/message/fusion/lsi/mpi.h
index 11c0f4613..a575545d6 100644
--- a/kernel/drivers/message/fusion/lsi/mpi.h
+++ b/kernel/drivers/message/fusion/lsi/mpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_cnfg.h b/kernel/drivers/message/fusion/lsi/mpi_cnfg.h
index d9bcfba6b..4e9c0ce94 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_cnfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_fc.h b/kernel/drivers/message/fusion/lsi/mpi_fc.h
index 7d663ce76..bdea95e0c 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_fc.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_fc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_init.h b/kernel/drivers/message/fusion/lsi/mpi_init.h
index 4295d062c..bc6326ff2 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_init.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_ioc.h b/kernel/drivers/message/fusion/lsi/mpi_ioc.h
index 19fb21b8f..c249f2994 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_ioc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_lan.h b/kernel/drivers/message/fusion/lsi/mpi_lan.h
index f41fcb69b..d06f99286 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_lan.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_lan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_log_fc.h b/kernel/drivers/message/fusion/lsi/mpi_log_fc.h
index 03be8b217..f1e75dd5d 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_log_fc.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_log_fc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation. All rights reserved.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_log_sas.h b/kernel/drivers/message/fusion/lsi/mpi_log_sas.h
index f62960b5d..27fe17a75 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_log_sas.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_log_sas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /***************************************************************************
  *                                                                         *
  *  Copyright (c) 2000-2008 LSI Corporation.  All rights reserved.         *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_raid.h b/kernel/drivers/message/fusion/lsi/mpi_raid.h
index add60cc85..36688a921 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_raid.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_raid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2001-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_sas.h b/kernel/drivers/message/fusion/lsi/mpi_sas.h
index ab410036b..56013f288 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_sas.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_sas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2004-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_targ.h b/kernel/drivers/message/fusion/lsi/mpi_targ.h
index c3dea7f69..97e6eead6 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_targ.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_targ.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_tool.h b/kernel/drivers/message/fusion/lsi/mpi_tool.h
index 53cd715aa..b11456fb8 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_tool.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_tool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2001-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/lsi/mpi_type.h b/kernel/drivers/message/fusion/lsi/mpi_type.h
index 888b26dbc..073e637cf 100644
--- a/kernel/drivers/message/fusion/lsi/mpi_type.h
+++ b/kernel/drivers/message/fusion/lsi/mpi_type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (c) 2000-2008 LSI Corporation.
  *
diff --git a/kernel/drivers/message/fusion/mptdebug.h b/kernel/drivers/message/fusion/mptdebug.h
index 28e478879..2205dcab0 100644
--- a/kernel/drivers/message/fusion/mptdebug.h
+++ b/kernel/drivers/message/fusion/mptdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/drivers/message/fusion/mptdebug.h
  *      For use with LSI PCI chip/adapter(s)
diff --git a/kernel/drivers/mfd/Makefile b/kernel/drivers/mfd/Makefile
index c3d0a1b39..8703ff179 100644
--- a/kernel/drivers/mfd/Makefile
+++ b/kernel/drivers/mfd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for multifunction miscellaneous devices
 #
diff --git a/kernel/drivers/mfd/twl-core.h b/kernel/drivers/mfd/twl-core.h
index 6ff99dce7..6f96c2009 100644
--- a/kernel/drivers/mfd/twl-core.h
+++ b/kernel/drivers/mfd/twl-core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TWL_CORE_H__
 #define __TWL_CORE_H__
 
diff --git a/kernel/drivers/misc/Makefile b/kernel/drivers/misc/Makefile
index 0f95f60a2..a57455478 100644
--- a/kernel/drivers/misc/Makefile
+++ b/kernel/drivers/misc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for misc devices that really don't fit anywhere else.
 #
diff --git a/kernel/drivers/misc/cxl/Makefile b/kernel/drivers/misc/cxl/Makefile
index 0b5fd749d..502d41fc9 100644
--- a/kernel/drivers/misc/cxl/Makefile
+++ b/kernel/drivers/misc/cxl/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y			:= $(call cc-disable-warning, unused-const-variable)
 ccflags-$(CONFIG_PPC_WERROR)	+= -Werror
 
diff --git a/kernel/drivers/misc/cxl/flash.c b/kernel/drivers/misc/cxl/flash.c
index 3aa216bf0..43917898f 100644
--- a/kernel/drivers/misc/cxl/flash.c
+++ b/kernel/drivers/misc/cxl/flash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/semaphore.h>
diff --git a/kernel/drivers/misc/eeprom/Makefile b/kernel/drivers/misc/eeprom/Makefile
index 90a52624d..2aab60ef3 100644
--- a/kernel/drivers/misc/eeprom/Makefile
+++ b/kernel/drivers/misc/eeprom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_EEPROM_AT24)	+= at24.o
 obj-$(CONFIG_EEPROM_AT25)	+= at25.o
 obj-$(CONFIG_EEPROM_LEGACY)	+= eeprom.o
diff --git a/kernel/drivers/misc/ibmasm/Makefile b/kernel/drivers/misc/ibmasm/Makefile
index 9e63ade5f..1b9dd0f44 100644
--- a/kernel/drivers/misc/ibmasm/Makefile
+++ b/kernel/drivers/misc/ibmasm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_IBM_ASM) := ibmasm.o
 
diff --git a/kernel/drivers/misc/lkdtm.h b/kernel/drivers/misc/lkdtm.h
index bfb6c45b6..687a0dbbe 100644
--- a/kernel/drivers/misc/lkdtm.h
+++ b/kernel/drivers/misc/lkdtm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LKDTM_H
 #define __LKDTM_H
 
diff --git a/kernel/drivers/misc/lkdtm_bugs.c b/kernel/drivers/misc/lkdtm_bugs.c
index 9e0b4f959..b0f7af872 100644
--- a/kernel/drivers/misc/lkdtm_bugs.c
+++ b/kernel/drivers/misc/lkdtm_bugs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is for all the tests related to logic bugs (e.g. bad dereferences,
  * bad alignment, bad loops, bad locking, bad scheduling, deep stacks, and
diff --git a/kernel/drivers/misc/lkdtm_heap.c b/kernel/drivers/misc/lkdtm_heap.c
index ffb6aeac0..f5494a6d4 100644
--- a/kernel/drivers/misc/lkdtm_heap.c
+++ b/kernel/drivers/misc/lkdtm_heap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is for all the tests relating directly to heap memory, including
  * page allocation and slab allocations.
diff --git a/kernel/drivers/misc/lkdtm_perms.c b/kernel/drivers/misc/lkdtm_perms.c
index c7635a793..53b85c9d1 100644
--- a/kernel/drivers/misc/lkdtm_perms.c
+++ b/kernel/drivers/misc/lkdtm_perms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is for all the tests related to validating kernel memory
  * permissions: non-executable regions, non-writable regions, and
diff --git a/kernel/drivers/misc/lkdtm_rodata.c b/kernel/drivers/misc/lkdtm_rodata.c
index 3564477b8..58d180af7 100644
--- a/kernel/drivers/misc/lkdtm_rodata.c
+++ b/kernel/drivers/misc/lkdtm_rodata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This includes functions that are meant to live entirely in .rodata
  * (via objcopy tricks), to validate the non-executability of .rodata.
diff --git a/kernel/drivers/misc/lkdtm_usercopy.c b/kernel/drivers/misc/lkdtm_usercopy.c
index df6ac985f..a64372cc1 100644
--- a/kernel/drivers/misc/lkdtm_usercopy.c
+++ b/kernel/drivers/misc/lkdtm_usercopy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is for all the tests related to copy_to_user() and copy_from_user()
  * hardening.
diff --git a/kernel/drivers/misc/mei/Makefile b/kernel/drivers/misc/mei/Makefile
index 12cceb011..cd6825afa 100644
--- a/kernel/drivers/misc/mei/Makefile
+++ b/kernel/drivers/misc/mei/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - Intel Management Engine Interface (Intel MEI) Linux driver
 # Copyright (c) 2010-2014, Intel Corporation.
diff --git a/kernel/drivers/misc/mic/Makefile b/kernel/drivers/misc/mic/Makefile
index f2b1323ff..1a43622b1 100644
--- a/kernel/drivers/misc/mic/Makefile
+++ b/kernel/drivers/misc/mic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - Intel MIC Linux driver.
 # Copyright(c) 2013, Intel Corporation.
diff --git a/kernel/drivers/misc/mic/card/Makefile b/kernel/drivers/misc/mic/card/Makefile
index 6e9675e12..921a7e7e0 100644
--- a/kernel/drivers/misc/mic/card/Makefile
+++ b/kernel/drivers/misc/mic/card/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - Intel MIC Linux driver.
 # Copyright(c) 2013, Intel Corporation.
diff --git a/kernel/drivers/misc/mic/cosm/Makefile b/kernel/drivers/misc/mic/cosm/Makefile
index b85d4d49d..97d74cb12 100644
--- a/kernel/drivers/misc/mic/cosm/Makefile
+++ b/kernel/drivers/misc/mic/cosm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - Intel MIC Coprocessor State Management (COSM) Driver
 # Copyright(c) 2015, Intel Corporation.
diff --git a/kernel/drivers/misc/mic/host/Makefile b/kernel/drivers/misc/mic/host/Makefile
index f3b502333..25f153367 100644
--- a/kernel/drivers/misc/mic/host/Makefile
+++ b/kernel/drivers/misc/mic/host/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - Intel MIC Linux driver.
 # Copyright(c) 2013, Intel Corporation.
diff --git a/kernel/drivers/misc/mic/scif/Makefile b/kernel/drivers/misc/mic/scif/Makefile
index 29cfc3e51..ff372555d 100644
--- a/kernel/drivers/misc/mic/scif/Makefile
+++ b/kernel/drivers/misc/mic/scif/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile - SCIF driver.
 # Copyright(c) 2014, Intel Corporation.
diff --git a/kernel/drivers/misc/sgi-xp/Makefile b/kernel/drivers/misc/sgi-xp/Makefile
index 4fc40d8e1..bbb622c19 100644
--- a/kernel/drivers/misc/sgi-xp/Makefile
+++ b/kernel/drivers/misc/sgi-xp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for SGI's XP devices.
 #
diff --git a/kernel/drivers/mmc/core/Makefile b/kernel/drivers/mmc/core/Makefile
index 7e3ed1aea..abba078f7 100644
--- a/kernel/drivers/mmc/core/Makefile
+++ b/kernel/drivers/mmc/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel mmc core.
 #
diff --git a/kernel/drivers/mmc/core/block.h b/kernel/drivers/mmc/core/block.h
index 860ca7c8d..594663610 100644
--- a/kernel/drivers/mmc/core/block.h
+++ b/kernel/drivers/mmc/core/block.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MMC_CORE_BLOCK_H
 #define _MMC_CORE_BLOCK_H
 
diff --git a/kernel/drivers/mmc/core/queue.h b/kernel/drivers/mmc/core/queue.h
index f18d3f656..6bfba32ff 100644
--- a/kernel/drivers/mmc/core/queue.h
+++ b/kernel/drivers/mmc/core/queue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MMC_QUEUE_H
 #define MMC_QUEUE_H
 
diff --git a/kernel/drivers/mmc/core/quirks.h b/kernel/drivers/mmc/core/quirks.h
index fb725934f..f664e9cbc 100644
--- a/kernel/drivers/mmc/core/quirks.h
+++ b/kernel/drivers/mmc/core/quirks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  This file contains work-arounds for many known SD/MMC
  *  and SDIO hardware bugs.
diff --git a/kernel/drivers/mmc/core/sd.h b/kernel/drivers/mmc/core/sd.h
index 1ada9808c..497c026a5 100644
--- a/kernel/drivers/mmc/core/sd.h
+++ b/kernel/drivers/mmc/core/sd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MMC_CORE_SD_H
 #define _MMC_CORE_SD_H
 
diff --git a/kernel/drivers/mmc/host/Makefile b/kernel/drivers/mmc/host/Makefile
index 303f5cd46..7c7b29ff5 100644
--- a/kernel/drivers/mmc/host/Makefile
+++ b/kernel/drivers/mmc/host/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for MMC/SD host controller drivers
 #
diff --git a/kernel/drivers/mmc/host/dw_mmc-zx.h b/kernel/drivers/mmc/host/dw_mmc-zx.h
index f369997a3..09ac52766 100644
--- a/kernel/drivers/mmc/host/dw_mmc-zx.h
+++ b/kernel/drivers/mmc/host/dw_mmc-zx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DW_MMC_ZX_H_
 #define _DW_MMC_ZX_H_
 
diff --git a/kernel/drivers/mmc/host/dw_mmc.c b/kernel/drivers/mmc/host/dw_mmc.c
index 860313bd9..4f2806720 100644
--- a/kernel/drivers/mmc/host/dw_mmc.c
+++ b/kernel/drivers/mmc/host/dw_mmc.c
@@ -401,16 +401,37 @@ static u32 dw_mci_prep_stop_abort(struct dw_mci *host, struct mmc_command *cmd)
 static inline void dw_mci_set_cto(struct dw_mci *host)
 {
 	unsigned int cto_clks;
+	unsigned int cto_div;
 	unsigned int cto_ms;
+	unsigned long irqflags;
 
 	cto_clks = mci_readl(host, TMOUT) & 0xff;
-	cto_ms = DIV_ROUND_UP(cto_clks, host->bus_hz / 1000);
+	cto_div = (mci_readl(host, CLKDIV) & 0xff) * 2;
+	if (cto_div == 0)
+		cto_div = 1;
+	cto_ms = DIV_ROUND_UP(MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz);
 
 	/* add a bit spare time */
 	cto_ms += 10;
 
-	mod_timer(&host->cto_timer,
-		  jiffies + msecs_to_jiffies(cto_ms) + 1);
+	/*
+	 * The durations we're working with are fairly short so we have to be
+	 * extra careful about synchronization here.  Specifically in hardware a
+	 * command timeout is _at most_ 5.1 ms, so that means we expect an
+	 * interrupt (either command done or timeout) to come rather quickly
+	 * after the mci_writel.  ...but just in case we have a long interrupt
+	 * latency let's add a bit of paranoia.
+	 *
+	 * In general we'll assume that at least an interrupt will be asserted
+	 * in hardware by the time the cto_timer runs.  ...and if it hasn't
+	 * been asserted in hardware by that time then we'll assume it'll never
+	 * come.
+	 */
+	spin_lock_irqsave(&host->irq_lock, irqflags);
+	if (!test_bit(EVENT_CMD_COMPLETE, &host->pending_events))
+		mod_timer(&host->cto_timer,
+			jiffies + msecs_to_jiffies(cto_ms) + 1);
+	spin_unlock_irqrestore(&host->irq_lock, irqflags);
 }
 
 static void dw_mci_start_command(struct dw_mci *host,
@@ -425,11 +446,11 @@ static void dw_mci_start_command(struct dw_mci *host,
 	wmb(); /* drain writebuffer */
 	dw_mci_wait_while_busy(host, cmd_flags);
 
+	mci_writel(host, CMD, cmd_flags | SDMMC_CMD_START);
+
 	/* response expected command only */
 	if (cmd_flags & SDMMC_CMD_RESP_EXP)
 		dw_mci_set_cto(host);
-
-	mci_writel(host, CMD, cmd_flags | SDMMC_CMD_START);
 }
 
 static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data)
@@ -1915,10 +1936,15 @@ static int dw_mci_data_complete(struct dw_mci *host, struct mmc_data *data)
 static void dw_mci_set_drto(struct dw_mci *host)
 {
 	unsigned int drto_clks;
+	unsigned int drto_div;
 	unsigned int drto_ms;
 
 	drto_clks = mci_readl(host, TMOUT) >> 8;
-	drto_ms = DIV_ROUND_UP(drto_clks, host->bus_hz / 1000);
+	drto_div = (mci_readl(host, CLKDIV) & 0xff) * 2;
+	if (drto_div == 0)
+		drto_div = 1;
+	drto_ms = DIV_ROUND_UP(MSEC_PER_SEC * drto_clks * drto_div,
+			       host->bus_hz);
 
 	/* add a bit spare time */
 	drto_ms += 10;
@@ -1926,6 +1952,24 @@ static void dw_mci_set_drto(struct dw_mci *host)
 	mod_timer(&host->dto_timer, jiffies + msecs_to_jiffies(drto_ms));
 }
 
+static bool dw_mci_clear_pending_cmd_complete(struct dw_mci *host)
+{
+	if (!test_bit(EVENT_CMD_COMPLETE, &host->pending_events))
+		return false;
+
+	/*
+	 * Really be certain that the timer has stopped.  This is a bit of
+	 * paranoia and could only really happen if we had really bad
+	 * interrupt latency and the interrupt routine and timeout were
+	 * running concurrently so that the del_timer() in the interrupt
+	 * handler couldn't run.
+	 */
+	WARN_ON(del_timer_sync(&host->cto_timer));
+	clear_bit(EVENT_CMD_COMPLETE, &host->pending_events);
+
+	return true;
+}
+
 static void dw_mci_tasklet_func(unsigned long priv)
 {
 	struct dw_mci *host = (struct dw_mci *)priv;
@@ -1952,8 +1996,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
 
 		case STATE_SENDING_CMD11:
 		case STATE_SENDING_CMD:
-			if (!test_and_clear_bit(EVENT_CMD_COMPLETE,
-						&host->pending_events))
+			if (!dw_mci_clear_pending_cmd_complete(host))
 				break;
 
 			cmd = host->cmd;
@@ -2122,8 +2165,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
 			/* fall through */
 
 		case STATE_SENDING_STOP:
-			if (!test_and_clear_bit(EVENT_CMD_COMPLETE,
-						&host->pending_events))
+			if (!dw_mci_clear_pending_cmd_complete(host))
 				break;
 
 			/* CMD error in data command */
@@ -2570,6 +2612,8 @@ done:
 
 static void dw_mci_cmd_interrupt(struct dw_mci *host, u32 status)
 {
+	del_timer(&host->cto_timer);
+
 	if (!host->cmd_status)
 		host->cmd_status = status;
 
@@ -2594,6 +2638,7 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 	struct dw_mci *host = dev_id;
 	u32 pending;
 	struct dw_mci_slot *slot = host->slot;
+	unsigned long irqflags;
 
 	pending = mci_readl(host, MINTSTS); /* read-only mask reg */
 
@@ -2601,8 +2646,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 		/* Check volt switch first, since it can look like an error */
 		if ((host->state == STATE_SENDING_CMD11) &&
 		    (pending & SDMMC_INT_VOLT_SWITCH)) {
-			unsigned long irqflags;
-
 			mci_writel(host, RINTSTS, SDMMC_INT_VOLT_SWITCH);
 			pending &= ~SDMMC_INT_VOLT_SWITCH;
 
@@ -2618,11 +2661,15 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 		}
 
 		if (pending & DW_MCI_CMD_ERROR_FLAGS) {
+			spin_lock_irqsave(&host->irq_lock, irqflags);
+
 			del_timer(&host->cto_timer);
 			mci_writel(host, RINTSTS, DW_MCI_CMD_ERROR_FLAGS);
 			host->cmd_status = pending;
 			smp_wmb(); /* drain writebuffer */
 			set_bit(EVENT_CMD_COMPLETE, &host->pending_events);
+
+			spin_unlock_irqrestore(&host->irq_lock, irqflags);
 		}
 
 		if (pending & DW_MCI_DATA_ERROR_FLAGS) {
@@ -2662,9 +2709,12 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 		}
 
 		if (pending & SDMMC_INT_CMD_DONE) {
-			del_timer(&host->cto_timer);
+			spin_lock_irqsave(&host->irq_lock, irqflags);
+
 			mci_writel(host, RINTSTS, SDMMC_INT_CMD_DONE);
 			dw_mci_cmd_interrupt(host, pending);
+
+			spin_unlock_irqrestore(&host->irq_lock, irqflags);
 		}
 
 		if (pending & SDMMC_INT_CD) {
@@ -2938,7 +2988,35 @@ static void dw_mci_cmd11_timer(unsigned long arg)
 static void dw_mci_cto_timer(unsigned long arg)
 {
 	struct dw_mci *host = (struct dw_mci *)arg;
+	unsigned long irqflags;
+	u32 pending;
 
+	spin_lock_irqsave(&host->irq_lock, irqflags);
+
+	/*
+	 * If somehow we have very bad interrupt latency it's remotely possible
+	 * that the timer could fire while the interrupt is still pending or
+	 * while the interrupt is midway through running.  Let's be paranoid
+	 * and detect those two cases.  Note that this is paranoia is somewhat
+	 * justified because in this function we don't actually cancel the
+	 * pending command in the controller--we just assume it will never come.
+	 */
+	pending = mci_readl(host, MINTSTS); /* read-only mask reg */
+	if (pending & (DW_MCI_CMD_ERROR_FLAGS | SDMMC_INT_CMD_DONE)) {
+		/* The interrupt should fire; no need to act but we can warn */
+		dev_warn(host->dev, "Unexpected interrupt latency\n");
+		goto exit;
+	}
+	if (test_bit(EVENT_CMD_COMPLETE, &host->pending_events)) {
+		/* Presumably interrupt handler couldn't delete the timer */
+		dev_warn(host->dev, "CTO timeout when already completed\n");
+		goto exit;
+	}
+
+	/*
+	 * Continued paranoia to make sure we're in the state we expect.
+	 * This paranoia isn't really justified but it seems good to be safe.
+	 */
 	switch (host->state) {
 	case STATE_SENDING_CMD11:
 	case STATE_SENDING_CMD:
@@ -2957,6 +3035,9 @@ static void dw_mci_cto_timer(unsigned long arg)
 			 host->state);
 		break;
 	}
+
+exit:
+	spin_unlock_irqrestore(&host->irq_lock, irqflags);
 }
 
 static void dw_mci_dto_timer(unsigned long arg)
diff --git a/kernel/drivers/mmc/host/pxamci.h b/kernel/drivers/mmc/host/pxamci.h
index f6c2e2fcc..d301ca18c 100644
--- a/kernel/drivers/mmc/host/pxamci.h
+++ b/kernel/drivers/mmc/host/pxamci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define MMC_STRPCL	0x0000
 #define STOP_CLOCK		(1 << 0)
 #define START_CLOCK		(2 << 0)
diff --git a/kernel/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/kernel/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index f905f2361..8bae88a15 100644
--- a/kernel/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/kernel/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -146,11 +146,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
 	WARN_ON(host->sg_len > 1);
 
 	/* This DMAC cannot handle if buffer is not 8-bytes alignment */
-	if (!IS_ALIGNED(sg->offset, 8)) {
-		host->force_pio = true;
-		renesas_sdhi_internal_dmac_enable_dma(host, false);
-		return;
-	}
+	if (!IS_ALIGNED(sg->offset, 8))
+		goto force_pio;
 
 	if (data->flags & MMC_DATA_READ) {
 		dtran_mode |= DTRAN_MODE_CH_NUM_CH1;
@@ -163,8 +160,8 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
 	}
 
 	ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, dir);
-	if (ret < 0)
-		return;
+	if (ret == 0)
+		goto force_pio;
 
 	renesas_sdhi_internal_dmac_enable_dma(host, true);
 
@@ -176,6 +173,12 @@ renesas_sdhi_internal_dmac_start_dma(struct tmio_mmc_host *host,
 					    dtran_mode);
 	renesas_sdhi_internal_dmac_dm_write(host, DM_DTRAN_ADDR,
 					    sg->dma_address);
+
+	return;
+
+force_pio:
+	host->force_pio = true;
+	renesas_sdhi_internal_dmac_enable_dma(host, false);
 }
 
 static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg)
diff --git a/kernel/drivers/mmc/host/sdhci-pci.h b/kernel/drivers/mmc/host/sdhci-pci.h
index 75196a2b5..3e8ea3e56 100644
--- a/kernel/drivers/mmc/host/sdhci-pci.h
+++ b/kernel/drivers/mmc/host/sdhci-pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SDHCI_PCI_H
 #define __SDHCI_PCI_H
 
diff --git a/kernel/drivers/mmc/host/tmio_mmc_core.c b/kernel/drivers/mmc/host/tmio_mmc_core.c
index a7293e186..9c4e6199b 100644
--- a/kernel/drivers/mmc/host/tmio_mmc_core.c
+++ b/kernel/drivers/mmc/host/tmio_mmc_core.c
@@ -47,6 +47,7 @@
 #include <linux/mmc/sdio.h>
 #include <linux/scatterlist.h>
 #include <linux/spinlock.h>
+#include <linux/swiotlb.h>
 #include <linux/workqueue.h>
 
 #include "tmio_mmc.h"
@@ -1215,6 +1216,18 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
 	mmc->max_blk_count = pdata->max_blk_count ? :
 		(PAGE_SIZE / mmc->max_blk_size) * mmc->max_segs;
 	mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
+	/*
+	 * Since swiotlb has memory size limitation, this will calculate
+	 * the maximum size locally (because we don't have any APIs for it now)
+	 * and check the current max_req_size. And then, this will update
+	 * the max_req_size if needed as a workaround.
+	 */
+	if (swiotlb_max_segment()) {
+		unsigned int max_size = (1 << IO_TLB_SHIFT) * IO_TLB_SEGSIZE;
+
+		if (mmc->max_req_size > max_size)
+			mmc->max_req_size = max_size;
+	}
 	mmc->max_seg_size = mmc->max_req_size;
 
 	_host->native_hotplug = !(pdata->flags & TMIO_MMC_USE_GPIO_CD ||
diff --git a/kernel/drivers/mtd/Makefile b/kernel/drivers/mtd/Makefile
index 151d60df3..d6f8f625e 100644
--- a/kernel/drivers/mtd/Makefile
+++ b/kernel/drivers/mtd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the memory technology device drivers.
 #
diff --git a/kernel/drivers/mtd/chips/Makefile b/kernel/drivers/mtd/chips/Makefile
index 36582412c..1f4e84f1c 100644
--- a/kernel/drivers/mtd/chips/Makefile
+++ b/kernel/drivers/mtd/chips/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/drivers/chips/Makefile
 #
diff --git a/kernel/drivers/mtd/chips/fwh_lock.h b/kernel/drivers/mtd/chips/fwh_lock.h
index 800b0e853..53e6b2d59 100644
--- a/kernel/drivers/mtd/chips/fwh_lock.h
+++ b/kernel/drivers/mtd/chips/fwh_lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FWH_LOCK_H
 #define FWH_LOCK_H
 
diff --git a/kernel/drivers/mtd/devices/Makefile b/kernel/drivers/mtd/devices/Makefile
index f0f767624..94895eab3 100644
--- a/kernel/drivers/mtd/devices/Makefile
+++ b/kernel/drivers/mtd/devices/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/drivers/mtd/devices/Makefile
 #
diff --git a/kernel/drivers/mtd/devices/bcm47xxsflash.h b/kernel/drivers/mtd/devices/bcm47xxsflash.h
index b2d7b38f7..fef0d5e42 100644
--- a/kernel/drivers/mtd/devices/bcm47xxsflash.h
+++ b/kernel/drivers/mtd/devices/bcm47xxsflash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM47XXSFLASH_H
 #define __BCM47XXSFLASH_H
 
diff --git a/kernel/drivers/mtd/maps/Makefile b/kernel/drivers/mtd/maps/Makefile
index 5a09a72ab..b849aaf85 100644
--- a/kernel/drivers/mtd/maps/Makefile
+++ b/kernel/drivers/mtd/maps/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/drivers/maps/Makefile
 #
diff --git a/kernel/drivers/mtd/maps/physmap_of_gemini.c b/kernel/drivers/mtd/maps/physmap_of_gemini.c
index 4ed1a6bb4..830b1b7e7 100644
--- a/kernel/drivers/mtd/maps/physmap_of_gemini.c
+++ b/kernel/drivers/mtd/maps/physmap_of_gemini.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cortina Systems Gemini OF physmap add-on
  * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
diff --git a/kernel/drivers/mtd/maps/physmap_of_gemini.h b/kernel/drivers/mtd/maps/physmap_of_gemini.h
index c67502528..60e13a689 100644
--- a/kernel/drivers/mtd/maps/physmap_of_gemini.h
+++ b/kernel/drivers/mtd/maps/physmap_of_gemini.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/of.h>
 #include <linux/mtd/map.h>
 
diff --git a/kernel/drivers/mtd/maps/physmap_of_versatile.h b/kernel/drivers/mtd/maps/physmap_of_versatile.h
index 5b86f6dc6..0302502c9 100644
--- a/kernel/drivers/mtd/maps/physmap_of_versatile.h
+++ b/kernel/drivers/mtd/maps/physmap_of_versatile.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/of.h>
 #include <linux/mtd/map.h>
 
diff --git a/kernel/drivers/mtd/maps/tsunami_flash.c b/kernel/drivers/mtd/maps/tsunami_flash.c
index da2cdb5fd..9fc1f727a 100644
--- a/kernel/drivers/mtd/maps/tsunami_flash.c
+++ b/kernel/drivers/mtd/maps/tsunami_flash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * tsunami_flash.c
  *
diff --git a/kernel/drivers/mtd/mtdcore.h b/kernel/drivers/mtd/mtdcore.h
index 55fdb8e1f..37accfd04 100644
--- a/kernel/drivers/mtd/mtdcore.h
+++ b/kernel/drivers/mtd/mtdcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * These are exported solely for the purpose of mtd_blkdevs.c and mtdchar.c.
  * You should not use them for _anything_ else.
diff --git a/kernel/drivers/mtd/nand/Makefile b/kernel/drivers/mtd/nand/Makefile
index ade5fc4c3..6e2db700d 100644
--- a/kernel/drivers/mtd/nand/Makefile
+++ b/kernel/drivers/mtd/nand/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # linux/drivers/nand/Makefile
 #
diff --git a/kernel/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/kernel/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index c8834767a..201b9baa5 100644
--- a/kernel/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/kernel/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BCM47XXNFLASH_H
 #define __BCM47XXNFLASH_H
 
diff --git a/kernel/drivers/mtd/nand/brcmnand/Makefile b/kernel/drivers/mtd/nand/brcmnand/Makefile
index b28ffb59e..195b845e4 100644
--- a/kernel/drivers/mtd/nand/brcmnand/Makefile
+++ b/kernel/drivers/mtd/nand/brcmnand/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # link order matters; don't link the more generic brcmstb_nand.o before the
 # more specific iproc_nand.o, for instance
 obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= iproc_nand.o
diff --git a/kernel/drivers/mtd/onenand/Makefile b/kernel/drivers/mtd/onenand/Makefile
index 9d6540e8b..f8b624aca 100644
--- a/kernel/drivers/mtd/onenand/Makefile
+++ b/kernel/drivers/mtd/onenand/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the OneNAND MTD
 #
diff --git a/kernel/drivers/mtd/onenand/onenand_bbt.c b/kernel/drivers/mtd/onenand/onenand_bbt.c
index 680188a88..420260c25 100644
--- a/kernel/drivers/mtd/onenand/onenand_bbt.c
+++ b/kernel/drivers/mtd/onenand/onenand_bbt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/drivers/mtd/onenand/onenand_bbt.c
  *
diff --git a/kernel/drivers/mtd/spi-nor/Makefile b/kernel/drivers/mtd/spi-nor/Makefile
index 7d84c5108..f4c61d282 100644
--- a/kernel/drivers/mtd/spi-nor/Makefile
+++ b/kernel/drivers/mtd/spi-nor/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o
 obj-$(CONFIG_SPI_ASPEED_SMC)	+= aspeed-smc.o
 obj-$(CONFIG_SPI_ATMEL_QUADSPI)	+= atmel-quadspi.o
diff --git a/kernel/drivers/mtd/tests/Makefile b/kernel/drivers/mtd/tests/Makefile
index 937a829bb..5de0378f9 100644
--- a/kernel/drivers/mtd/tests/Makefile
+++ b/kernel/drivers/mtd/tests/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MTD_TESTS) += mtd_oobtest.o
 obj-$(CONFIG_MTD_TESTS) += mtd_pagetest.o
 obj-$(CONFIG_MTD_TESTS) += mtd_readtest.o
diff --git a/kernel/drivers/mtd/tests/mtd_test.c b/kernel/drivers/mtd/tests/mtd_test.c
index 34736bbcc..3d0b8b5c1 100644
--- a/kernel/drivers/mtd/tests/mtd_test.c
+++ b/kernel/drivers/mtd/tests/mtd_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) "mtd_test: " fmt
 
 #include <linux/module.h>
diff --git a/kernel/drivers/mtd/tests/mtd_test.h b/kernel/drivers/mtd/tests/mtd_test.h
index 04afd0e70..5a6e3bbe0 100644
--- a/kernel/drivers/mtd/tests/mtd_test.h
+++ b/kernel/drivers/mtd/tests/mtd_test.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/mtd/mtd.h>
 #include <linux/sched/signal.h>
 
diff --git a/kernel/drivers/mtd/ubi/Makefile b/kernel/drivers/mtd/ubi/Makefile
index 4e3c3d70d..543673605 100644
--- a/kernel/drivers/mtd/ubi/Makefile
+++ b/kernel/drivers/mtd/ubi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MTD_UBI) += ubi.o
 
 ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o attach.o
diff --git a/kernel/drivers/mtd/ubi/wl.h b/kernel/drivers/mtd/ubi/wl.h
index bd1f07e5c..2aaa3f7f2 100644
--- a/kernel/drivers/mtd/ubi/wl.h
+++ b/kernel/drivers/mtd/ubi/wl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef UBI_WL_H
 #define UBI_WL_H
 #ifdef CONFIG_MTD_UBI_FASTMAP
diff --git a/kernel/drivers/net/Makefile b/kernel/drivers/net/Makefile
index 8dff90008..676a75f41 100644
--- a/kernel/drivers/net/Makefile
+++ b/kernel/drivers/net/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux network device drivers.
 #
diff --git a/kernel/drivers/net/appletalk/cops.h b/kernel/drivers/net/appletalk/cops.h
index fd2750b26..7a0bfb351 100644
--- a/kernel/drivers/net/appletalk/cops.h
+++ b/kernel/drivers/net/appletalk/cops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*      cops.h: LocalTalk driver for Linux.
  *
  *      Authors:
diff --git a/kernel/drivers/net/appletalk/ipddp.h b/kernel/drivers/net/appletalk/ipddp.h
index 531519da9..9a8e45a46 100644
--- a/kernel/drivers/net/appletalk/ipddp.h
+++ b/kernel/drivers/net/appletalk/ipddp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	ipddp.h: Header for IP-over-DDP driver for Linux.
  */
diff --git a/kernel/drivers/net/appletalk/ltpc.h b/kernel/drivers/net/appletalk/ltpc.h
index cd30544a3..58cf94573 100644
--- a/kernel/drivers/net/appletalk/ltpc.h
+++ b/kernel/drivers/net/appletalk/ltpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /***   ltpc.h
  *
  *
diff --git a/kernel/drivers/net/arcnet/Makefile b/kernel/drivers/net/arcnet/Makefile
index 5ce8ee63e..53525e8ea 100644
--- a/kernel/drivers/net/arcnet/Makefile
+++ b/kernel/drivers/net/arcnet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for linux/drivers/net/arcnet
 #
 
diff --git a/kernel/drivers/net/arcnet/com9026.h b/kernel/drivers/net/arcnet/com9026.h
index efcaf6707..6adbc1871 100644
--- a/kernel/drivers/net/arcnet/com9026.h
+++ b/kernel/drivers/net/arcnet/com9026.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __COM9026_H
 #define __COM9026_H
 
diff --git a/kernel/drivers/net/bonding/bond_debugfs.c b/kernel/drivers/net/bonding/bond_debugfs.c
index e52e25a97..3868e1a51 100644
--- a/kernel/drivers/net/bonding/bond_debugfs.c
+++ b/kernel/drivers/net/bonding/bond_debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/device.h>
diff --git a/kernel/drivers/net/bonding/bond_procfs.c b/kernel/drivers/net/bonding/bond_procfs.c
index d8d4ada03..f7799321d 100644
--- a/kernel/drivers/net/bonding/bond_procfs.c
+++ b/kernel/drivers/net/bonding/bond_procfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/proc_fs.h>
 #include <linux/export.h>
 #include <net/net_namespace.h>
diff --git a/kernel/drivers/net/caif/Makefile b/kernel/drivers/net/caif/Makefile
index 9bbd45391..54ae1165d 100644
--- a/kernel/drivers/net/caif/Makefile
+++ b/kernel/drivers/net/caif/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG
 
 # Serial interface
diff --git a/kernel/drivers/net/can/Makefile b/kernel/drivers/net/can/Makefile
index 4aabbee13..02b8ed794 100644
--- a/kernel/drivers/net/can/Makefile
+++ b/kernel/drivers/net/can/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 #  Makefile for the Linux Controller Area Network drivers.
 #
diff --git a/kernel/drivers/net/can/sja1000/Makefile b/kernel/drivers/net/can/sja1000/Makefile
index be11ddd11..9253aaf9e 100644
--- a/kernel/drivers/net/can/sja1000/Makefile
+++ b/kernel/drivers/net/can/sja1000/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 #  Makefile for the SJA1000 CAN controller drivers.
 #
diff --git a/kernel/drivers/net/can/softing/softing.h b/kernel/drivers/net/can/softing/softing.h
index 35f062282..2893007ea 100644
--- a/kernel/drivers/net/can/softing/softing.h
+++ b/kernel/drivers/net/can/softing/softing.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * softing common interfaces
  *
diff --git a/kernel/drivers/net/can/softing/softing_platform.h b/kernel/drivers/net/can/softing/softing_platform.h
index ebbf69815..68a161547 100644
--- a/kernel/drivers/net/can/softing/softing_platform.h
+++ b/kernel/drivers/net/can/softing/softing_platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/platform_device.h>
 
diff --git a/kernel/drivers/net/can/usb/Makefile b/kernel/drivers/net/can/usb/Makefile
index 164453fd5..49ac7b99b 100644
--- a/kernel/drivers/net/can/usb/Makefile
+++ b/kernel/drivers/net/can/usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 #  Makefile for the Linux Controller Area Network USB drivers.
 #
diff --git a/kernel/drivers/net/cris/eth_v10.c b/kernel/drivers/net/cris/eth_v10.c
index 017f48cdc..1cbca8e57 100644
--- a/kernel/drivers/net/cris/eth_v10.c
+++ b/kernel/drivers/net/cris/eth_v10.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * e100net.c: A network driver for the ETRAX 100LX network controller.
  *
diff --git a/kernel/drivers/net/dsa/Makefile b/kernel/drivers/net/dsa/Makefile
index 4a5b5bd29..d040aeb45 100644
--- a/kernel/drivers/net/dsa/Makefile
+++ b/kernel/drivers/net/dsa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm-sf2.o
 bcm-sf2-objs			:= bcm_sf2.o bcm_sf2_cfp.o
 obj-$(CONFIG_NET_DSA_LOOP)	+= dsa_loop.o dsa_loop_bdinfo.o
diff --git a/kernel/drivers/net/dsa/b53/Makefile b/kernel/drivers/net/dsa/b53/Makefile
index 7e6f9a8bf..4256fb42a 100644
--- a/kernel/drivers/net/dsa/b53/Makefile
+++ b/kernel/drivers/net/dsa/b53/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_B53)		+= b53_common.o
 
 obj-$(CONFIG_B53_SPI_DRIVER)	+= b53_spi.o
diff --git a/kernel/drivers/net/dsa/dsa_loop.h b/kernel/drivers/net/dsa/dsa_loop.h
index dc396877f..93e5c15d0 100644
--- a/kernel/drivers/net/dsa/dsa_loop.h
+++ b/kernel/drivers/net/dsa/dsa_loop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DSA_LOOP_H
 #define __DSA_LOOP_H
 
diff --git a/kernel/drivers/net/dsa/lan9303.h b/kernel/drivers/net/dsa/lan9303.h
index 4d8be555f..7df2ac77f 100644
--- a/kernel/drivers/net/dsa/lan9303.h
+++ b/kernel/drivers/net/dsa/lan9303.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/regmap.h>
 #include <linux/device.h>
 #include <net/dsa.h>
diff --git a/kernel/drivers/net/dsa/mv88e6xxx/Makefile b/kernel/drivers/net/dsa/mv88e6xxx/Makefile
index 5cd555146..58a4a0014 100644
--- a/kernel/drivers/net/dsa/mv88e6xxx/Makefile
+++ b/kernel/drivers/net/dsa/mv88e6xxx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
 mv88e6xxx-objs := chip.o
 mv88e6xxx-objs += global1.o
diff --git a/kernel/drivers/net/ethernet/3com/Makefile b/kernel/drivers/net/ethernet/3com/Makefile
index 74046afab..f8b73babc 100644
--- a/kernel/drivers/net/ethernet/3com/Makefile
+++ b/kernel/drivers/net/ethernet/3com/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the 3Com Ethernet device drivers
 #
diff --git a/kernel/drivers/net/ethernet/8390/Makefile b/kernel/drivers/net/ethernet/8390/Makefile
index ff3b31894..f975c2fc8 100644
--- a/kernel/drivers/net/ethernet/8390/Makefile
+++ b/kernel/drivers/net/ethernet/8390/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the 8390 network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/Makefile b/kernel/drivers/net/ethernet/Makefile
index a0a03d4d9..39f627335 100644
--- a/kernel/drivers/net/ethernet/Makefile
+++ b/kernel/drivers/net/ethernet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux network Ethernet device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/aeroflex/greth.h b/kernel/drivers/net/ethernet/aeroflex/greth.h
index 9c07140a5..a1e04c9e9 100644
--- a/kernel/drivers/net/ethernet/aeroflex/greth.h
+++ b/kernel/drivers/net/ethernet/aeroflex/greth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GRETH_H
 #define GRETH_H
 
diff --git a/kernel/drivers/net/ethernet/alacritech/slic.h b/kernel/drivers/net/ethernet/alacritech/slic.h
index 08931b4af..d0c388cfd 100644
--- a/kernel/drivers/net/ethernet/alacritech/slic.h
+++ b/kernel/drivers/net/ethernet/alacritech/slic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _SLIC_H
 #define _SLIC_H
diff --git a/kernel/drivers/net/ethernet/alteon/acenic.h b/kernel/drivers/net/ethernet/alteon/acenic.h
index 51c486cfb..c670067b1 100644
--- a/kernel/drivers/net/ethernet/alteon/acenic.h
+++ b/kernel/drivers/net/ethernet/alteon/acenic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ACENIC_H_
 #define _ACENIC_H_
 #include <linux/interrupt.h>
diff --git a/kernel/drivers/net/ethernet/amd/7990.h b/kernel/drivers/net/ethernet/amd/7990.h
index e9e0be313..741cdc392 100644
--- a/kernel/drivers/net/ethernet/amd/7990.h
+++ b/kernel/drivers/net/ethernet/amd/7990.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * 7990.h -- LANCE ethernet IC generic routines.
  * This is an attempt to separate out the bits of various ethernet
diff --git a/kernel/drivers/net/ethernet/amd/Makefile b/kernel/drivers/net/ethernet/amd/Makefile
index a38a2dce3..45f86822a 100644
--- a/kernel/drivers/net/ethernet/amd/Makefile
+++ b/kernel/drivers/net/ethernet/amd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the AMD network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/amd/hplance.h b/kernel/drivers/net/ethernet/amd/hplance.h
index 04aee9e03..bc845a2c6 100644
--- a/kernel/drivers/net/ethernet/amd/hplance.h
+++ b/kernel/drivers/net/ethernet/amd/hplance.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Random defines and structures for the HP Lance driver.
  * Copyright (C) 05/1998 Peter Maydell <pmaydell@chiark.greenend.org.uk>
  * Based on the Sun Lance driver and the NetBSD HP Lance driver
diff --git a/kernel/drivers/net/ethernet/amd/xgbe/Makefile b/kernel/drivers/net/ethernet/amd/xgbe/Makefile
index 0dea8f5da..620785ffb 100644
--- a/kernel/drivers/net/ethernet/amd/xgbe/Makefile
+++ b/kernel/drivers/net/ethernet/amd/xgbe/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_AMD_XGBE) += amd-xgbe.o
 
 amd-xgbe-objs := xgbe-main.o xgbe-drv.o xgbe-dev.o \
diff --git a/kernel/drivers/net/ethernet/arc/emac.h b/kernel/drivers/net/ethernet/arc/emac.h
index e4feb712d..3c63b16d4 100644
--- a/kernel/drivers/net/ethernet/arc/emac.h
+++ b/kernel/drivers/net/ethernet/arc/emac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/drivers/net/ethernet/arc/emac_mdio.c b/kernel/drivers/net/ethernet/arc/emac_mdio.c
index a22403c68..0187dbf3b 100644
--- a/kernel/drivers/net/ethernet/arc/emac_mdio.c
+++ b/kernel/drivers/net/ethernet/arc/emac_mdio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com)
  *
diff --git a/kernel/drivers/net/ethernet/atheros/Makefile b/kernel/drivers/net/ethernet/atheros/Makefile
index 5cf1c65bb..aa3d394b8 100644
--- a/kernel/drivers/net/ethernet/atheros/Makefile
+++ b/kernel/drivers/net/ethernet/atheros/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Atheros network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/aurora/nb8800.h b/kernel/drivers/net/ethernet/aurora/nb8800.h
index 6ec4a956e..aacc3cce2 100644
--- a/kernel/drivers/net/ethernet/aurora/nb8800.h
+++ b/kernel/drivers/net/ethernet/aurora/nb8800.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NB8800_H_
 #define _NB8800_H_
 
diff --git a/kernel/drivers/net/ethernet/broadcom/Makefile b/kernel/drivers/net/ethernet/broadcom/Makefile
index 79f2372c6..7046ad6d3 100644
--- a/kernel/drivers/net/ethernet/broadcom/Makefile
+++ b/kernel/drivers/net/ethernet/broadcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Broadcom network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/broadcom/b44.h b/kernel/drivers/net/ethernet/broadcom/b44.h
index 89d2cf341..b3e36ca0f 100644
--- a/kernel/drivers/net/ethernet/broadcom/b44.h
+++ b/kernel/drivers/net/ethernet/broadcom/b44.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _B44_H
 #define _B44_H
 
diff --git a/kernel/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/kernel/drivers/net/ethernet/broadcom/bcm63xx_enet.h
index 0a1b7b2e5..c6f6f14e8 100644
--- a/kernel/drivers/net/ethernet/broadcom/bcm63xx_enet.h
+++ b/kernel/drivers/net/ethernet/broadcom/bcm63xx_enet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_ENET_H_
 #define BCM63XX_ENET_H_
 
diff --git a/kernel/drivers/net/ethernet/broadcom/bcmsysport.c b/kernel/drivers/net/ethernet/broadcom/bcmsysport.c
index 83eec9a8c..eb441e5e2 100644
--- a/kernel/drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/kernel/drivers/net/ethernet/broadcom/bcmsysport.c
@@ -1809,15 +1809,17 @@ static inline void bcm_sysport_mask_all_intrs(struct bcm_sysport_priv *priv)
 
 static inline void gib_set_pad_extension(struct bcm_sysport_priv *priv)
 {
-	u32 __maybe_unused reg;
+	u32 reg;
 
-	/* Include Broadcom tag in pad extension */
+	reg = gib_readl(priv, GIB_CONTROL);
+	/* Include Broadcom tag in pad extension and fix up IPG_LENGTH */
 	if (netdev_uses_dsa(priv->netdev)) {
-		reg = gib_readl(priv, GIB_CONTROL);
 		reg &= ~(GIB_PAD_EXTENSION_MASK << GIB_PAD_EXTENSION_SHIFT);
 		reg |= ENET_BRCM_TAG_LEN << GIB_PAD_EXTENSION_SHIFT;
-		gib_writel(priv, reg, GIB_CONTROL);
 	}
+	reg &= ~(GIB_IPG_LEN_MASK << GIB_IPG_LEN_SHIFT);
+	reg |= 12 << GIB_IPG_LEN_SHIFT;
+	gib_writel(priv, reg, GIB_CONTROL);
 }
 
 static int bcm_sysport_open(struct net_device *dev)
diff --git a/kernel/drivers/net/ethernet/broadcom/bgmac.h b/kernel/drivers/net/ethernet/broadcom/bgmac.h
index 443d57b10..4040d846d 100644
--- a/kernel/drivers/net/ethernet/broadcom/bgmac.h
+++ b/kernel/drivers/net/ethernet/broadcom/bgmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BGMAC_H
 #define _BGMAC_H
 
diff --git a/kernel/drivers/net/ethernet/broadcom/tg3.h b/kernel/drivers/net/ethernet/broadcom/tg3.h
index 3b5e98ecb..c2d02d02d 100644
--- a/kernel/drivers/net/ethernet/broadcom/tg3.h
+++ b/kernel/drivers/net/ethernet/broadcom/tg3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: tg3.h,v 1.37.2.32 2002/03/11 12:18:18 davem Exp $
  * tg3.h: Definitions for Broadcom Tigon3 ethernet driver.
  *
diff --git a/kernel/drivers/net/ethernet/cadence/Makefile b/kernel/drivers/net/ethernet/cadence/Makefile
index 1d66ddb68..1f33cdca9 100644
--- a/kernel/drivers/net/ethernet/cadence/Makefile
+++ b/kernel/drivers/net/ethernet/cadence/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Atmel network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/cavium/liquidio/Makefile b/kernel/drivers/net/ethernet/cavium/liquidio/Makefile
index c4d411d1a..b802896bb 100644
--- a/kernel/drivers/net/ethernet/cavium/liquidio/Makefile
+++ b/kernel/drivers/net/ethernet/cavium/liquidio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Cavium Liquidio ethernet device driver
 #
diff --git a/kernel/drivers/net/ethernet/cavium/thunder/Makefile b/kernel/drivers/net/ethernet/cavium/thunder/Makefile
index 6b4d4add7..2fc6142d1 100644
--- a/kernel/drivers/net/ethernet/cavium/thunder/Makefile
+++ b/kernel/drivers/net/ethernet/cavium/thunder/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Cavium's Thunder ethernet device
 #
diff --git a/kernel/drivers/net/ethernet/chelsio/Makefile b/kernel/drivers/net/ethernet/chelsio/Makefile
index b6a5eec6e..c0f978d2e 100644
--- a/kernel/drivers/net/ethernet/chelsio/Makefile
+++ b/kernel/drivers/net/ethernet/chelsio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Chelsio network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h b/kernel/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
index ccdb2bc9a..e9c65d812 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/fpga_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Date: 2005/03/07 23:59:05 $ $RCSfile: fpga_defs.h,v $ $Revision: 1.4 $ */
 
 /*
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c b/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
index 76ce6e538..30b003484 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Date: 2005/10/24 23:18:13 $ $RCSfile: mv88e1xxx.c,v $ $Revision: 1.49 $ */
 #include "common.h"
 #include "mv88e1xxx.h"
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h b/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
index 967cc4286..11bf0f7c2 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Date: 2005/03/07 23:59:05 $ $RCSfile: mv88e1xxx.h,v $ $Revision: 1.13 $ */
 #ifndef CHELSIO_MV8E1XXX_H
 #define CHELSIO_MV8E1XXX_H
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/my3126.c b/kernel/drivers/net/ethernet/chelsio/cxgb/my3126.c
index d546f46c8..20c09cc4b 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/my3126.c
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/my3126.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Date: 2005/11/12 02:13:49 $ $RCSfile: my3126.c,v $ $Revision: 1.15 $ */
 #include "cphy.h"
 #include "elmer0.h"
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/tp.c b/kernel/drivers/net/ethernet/chelsio/cxgb/tp.c
index b146acabf..4337cee07 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/tp.c
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/tp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Date: 2006/02/07 04:21:54 $ $RCSfile: tp.c,v $ $Revision: 1.73 $ */
 #include "common.h"
 #include "regs.h"
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/tp.h b/kernel/drivers/net/ethernet/chelsio/cxgb/tp.h
index dfd8ce251..ba15675d5 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/tp.h
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/tp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Date: 2005/03/07 23:59:05 $ $RCSfile: tp.h,v $ $Revision: 1.20 $ */
 #ifndef CHELSIO_TP_H
 #define CHELSIO_TP_H
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326.c b/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
index bdc895bd2..873c1c7b4 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* $Date: 2006/04/28 19:20:06 $ $RCSfile: vsc7326.c,v $ $Revision: 1.19 $ */
 
 /* Driver for Vitesse VSC7326 (Schaumburg) MAC */
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h b/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
index 479edbcab..04503857c 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb/vsc7326_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Date: 2006/04/28 19:20:17 $ $RCSfile: vsc7326_reg.h,v $ $Revision: 1.5 $ */
 #ifndef _VSC7321_REG_H_
 #define _VSC7321_REG_H_
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb3/regs.h b/kernel/drivers/net/ethernet/chelsio/cxgb3/regs.h
index 81029b872..174eb4510 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb3/regs.h
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb3/regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define A_SG_CONTROL 0x0
 
 #define S_CONGMODE    29
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h b/kernel/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
index 29b6c800b..c31ce8dc9 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb3/sge_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file is automatically generated --- any changes will be lost.
  */
diff --git a/kernel/drivers/net/ethernet/chelsio/cxgb4/Makefile b/kernel/drivers/net/ethernet/chelsio/cxgb4/Makefile
index 817212702..24143c8ab 100644
--- a/kernel/drivers/net/ethernet/chelsio/cxgb4/Makefile
+++ b/kernel/drivers/net/ethernet/chelsio/cxgb4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Chelsio T4 driver
 #
diff --git a/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.c b/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.c
index 3c677ed3c..8dc21c9f9 100644
--- a/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.c
+++ b/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/if.h>
 #include <linux/if_ether.h>
 #include <linux/if_link.h>
diff --git a/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.h b/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.h
index 6aa9f89d0..d3c4a1cb0 100644
--- a/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.h
+++ b/kernel/drivers/net/ethernet/cisco/enic/enic_clsf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ENIC_CLSF_H_
 #define _ENIC_CLSF_H_
 
diff --git a/kernel/drivers/net/ethernet/davicom/dm9000.h b/kernel/drivers/net/ethernet/davicom/dm9000.h
index 9ce058ada..581b35ad4 100644
--- a/kernel/drivers/net/ethernet/davicom/dm9000.h
+++ b/kernel/drivers/net/ethernet/davicom/dm9000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * dm9000 Ethernet
  */
diff --git a/kernel/drivers/net/ethernet/dec/tulip/Makefile b/kernel/drivers/net/ethernet/dec/tulip/Makefile
index 5e8be38b4..8aab37564 100644
--- a/kernel/drivers/net/ethernet/dec/tulip/Makefile
+++ b/kernel/drivers/net/ethernet/dec/tulip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux "Tulip" family network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/freescale/Makefile b/kernel/drivers/net/ethernet/freescale/Makefile
index c46df5c82..ed8ad0fef 100644
--- a/kernel/drivers/net/ethernet/freescale/Makefile
+++ b/kernel/drivers/net/ethernet/freescale/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Freescale network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/freescale/dpaa/Makefile b/kernel/drivers/net/ethernet/freescale/dpaa/Makefile
index 7db50bccb..4f23e7923 100644
--- a/kernel/drivers/net/ethernet/freescale/dpaa/Makefile
+++ b/kernel/drivers/net/ethernet/freescale/dpaa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Freescale DPAA Ethernet controllers
 #
diff --git a/kernel/drivers/net/ethernet/freescale/fec.h b/kernel/drivers/net/ethernet/freescale/fec.h
index ede1876a9..44720f83a 100644
--- a/kernel/drivers/net/ethernet/freescale/fec.h
+++ b/kernel/drivers/net/ethernet/freescale/fec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /****************************************************************************/
 
 /*
diff --git a/kernel/drivers/net/ethernet/freescale/fman/Makefile b/kernel/drivers/net/ethernet/freescale/fman/Makefile
index 2c38119b1..f83a3653b 100644
--- a/kernel/drivers/net/ethernet/freescale/fman/Makefile
+++ b/kernel/drivers/net/ethernet/freescale/fman/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y +=  -I$(srctree)/drivers/net/ethernet/freescale/fman
 
 obj-$(CONFIG_FSL_FMAN) += fsl_fman.o
diff --git a/kernel/drivers/net/ethernet/freescale/fs_enet/Makefile b/kernel/drivers/net/ethernet/freescale/fs_enet/Makefile
index d4a305ee3..1821f94ef 100644
--- a/kernel/drivers/net/ethernet/freescale/fs_enet/Makefile
+++ b/kernel/drivers/net/ethernet/freescale/fs_enet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Freescale Ethernet controllers
 #
diff --git a/kernel/drivers/net/ethernet/freescale/fs_enet/fec.h b/kernel/drivers/net/ethernet/freescale/fs_enet/fec.h
index b9fe5bde4..7832db71d 100644
--- a/kernel/drivers/net/ethernet/freescale/fs_enet/fec.h
+++ b/kernel/drivers/net/ethernet/freescale/fs_enet/fec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_ENET_FEC_H
 #define FS_ENET_FEC_H
 
diff --git a/kernel/drivers/net/ethernet/freescale/fs_enet/fs_enet.h b/kernel/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
index 5ce516c8a..168e10ea4 100644
--- a/kernel/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
+++ b/kernel/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_ENET_H
 #define FS_ENET_H
 
diff --git a/kernel/drivers/net/ethernet/hisilicon/Makefile b/kernel/drivers/net/ethernet/hisilicon/Makefile
index 3828c435c..7f76d4120 100644
--- a/kernel/drivers/net/ethernet/hisilicon/Makefile
+++ b/kernel/drivers/net/ethernet/hisilicon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the HISILICON network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/hisilicon/hns/Makefile b/kernel/drivers/net/ethernet/hisilicon/hns/Makefile
index 6010c83e3..7aa623b9c 100644
--- a/kernel/drivers/net/ethernet/hisilicon/hns/Makefile
+++ b/kernel/drivers/net/ethernet/hisilicon/hns/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the HISILICON network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/kernel/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index 36520634c..e77192683 100644
--- a/kernel/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/kernel/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -2369,8 +2369,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev)
 			priv->enet_ver = AE_VERSION_2;
 
 		ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0);
-		if (IS_ERR_OR_NULL(ae_node)) {
-			ret = PTR_ERR(ae_node);
+		if (!ae_node) {
+			ret = -ENODEV;
 			dev_err(dev, "not find ae-handle\n");
 			goto out_read_prop_fail;
 		}
diff --git a/kernel/drivers/net/ethernet/i825xx/Makefile b/kernel/drivers/net/ethernet/i825xx/Makefile
index 8c8dcd29c..422a19a5d 100644
--- a/kernel/drivers/net/ethernet/i825xx/Makefile
+++ b/kernel/drivers/net/ethernet/i825xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Intel 82586/82593/82596 chipset device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/ibm/emac/Makefile b/kernel/drivers/net/ethernet/ibm/emac/Makefile
index 98768ba09..ddf1ce3c8 100644
--- a/kernel/drivers/net/ethernet/ibm/emac/Makefile
+++ b/kernel/drivers/net/ethernet/ibm/emac/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PowerPC 4xx on-chip ethernet driver
 #
diff --git a/kernel/drivers/net/ethernet/intel/Makefile b/kernel/drivers/net/ethernet/intel/Makefile
index 5ea764d85..90af7757a 100644
--- a/kernel/drivers/net/ethernet/intel/Makefile
+++ b/kernel/drivers/net/ethernet/intel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Intel network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.c b/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.c
index 93cf5fd17..d81311395 100644
--- a/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.c
+++ b/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/list.h>
 #include <linux/errno.h>
 
diff --git a/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.h b/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.h
index 7d283c750..15a10da5b 100644
--- a/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.h
+++ b/kernel/drivers/net/ethernet/intel/i40evf/i40evf_client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _I40E_CLIENT_H_
 #define _I40E_CLIENT_H_
 
diff --git a/kernel/drivers/net/ethernet/marvell/Makefile b/kernel/drivers/net/ethernet/marvell/Makefile
index ff1bffa74..9498ed26d 100644
--- a/kernel/drivers/net/ethernet/marvell/Makefile
+++ b/kernel/drivers/net/ethernet/marvell/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Marvell device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/marvell/skge.h b/kernel/drivers/net/ethernet/marvell/skge.h
index 3ea151ff9..6fa7b6a34 100644
--- a/kernel/drivers/net/ethernet/marvell/skge.h
+++ b/kernel/drivers/net/ethernet/marvell/skge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for the new Marvell Yukon / SysKonnect driver.
  */
diff --git a/kernel/drivers/net/ethernet/marvell/sky2.h b/kernel/drivers/net/ethernet/marvell/sky2.h
index 0fe160796..b02b65230 100644
--- a/kernel/drivers/net/ethernet/marvell/sky2.h
+++ b/kernel/drivers/net/ethernet/marvell/sky2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for the new Marvell Yukon 2 driver.
  */
diff --git a/kernel/drivers/net/ethernet/mellanox/mlx4/Makefile b/kernel/drivers/net/ethernet/mellanox/mlx4/Makefile
index c82217e0d..16b10d01f 100644
--- a/kernel/drivers/net/ethernet/mellanox/mlx4/Makefile
+++ b/kernel/drivers/net/ethernet/mellanox/mlx4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MLX4_CORE)		+= mlx4_core.o
 
 mlx4_core-y :=	alloc.o catas.o cmd.o cq.o eq.o fw.o fw_qos.o icm.o intf.o \
diff --git a/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h b/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h
index 926f3c3f3..aab28eb27 100644
--- a/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h
+++ b/kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MLX4_STATS_
 #define _MLX4_STATS_
 
diff --git a/kernel/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/kernel/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 87a309980..714dd0dc5 100644
--- a/kernel/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/kernel/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MLX5_CORE)		+= mlx5_core.o
 subdir-ccflags-y += -I$(src)
 
diff --git a/kernel/drivers/net/ethernet/mellanox/mlxsw/Makefile b/kernel/drivers/net/ethernet/mellanox/mlxsw/Makefile
index 891ff418b..9a5a1cc87 100644
--- a/kernel/drivers/net/ethernet/mellanox/mlxsw/Makefile
+++ b/kernel/drivers/net/ethernet/mellanox/mlxsw/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MLXSW_CORE)	+= mlxsw_core.o
 mlxsw_core-objs			:= core.o core_acl_flex_keys.o \
 				   core_acl_flex_actions.o
diff --git a/kernel/drivers/net/ethernet/mellanox/mlxsw/i2c.c b/kernel/drivers/net/ethernet/mellanox/mlxsw/i2c.c
index 12c3a4449..c0dcfa05b 100644
--- a/kernel/drivers/net/ethernet/mellanox/mlxsw/i2c.c
+++ b/kernel/drivers/net/ethernet/mellanox/mlxsw/i2c.c
@@ -294,7 +294,7 @@ mlxsw_i2c_write(struct device *dev, size_t in_mbox_size, u8 *in_mbox, int num,
 		write_tran.len = MLXSW_I2C_ADDR_WIDTH + chunk_size;
 		mlxsw_i2c_set_slave_addr(tran_buf, off);
 		memcpy(&tran_buf[MLXSW_I2C_ADDR_BUF_SIZE], in_mbox +
-		       chunk_size * i, chunk_size);
+		       MLXSW_I2C_BLK_MAX * i, chunk_size);
 
 		j = 0;
 		end = jiffies + timeout;
diff --git a/kernel/drivers/net/ethernet/mellanox/mlxsw/reg.h b/kernel/drivers/net/ethernet/mellanox/mlxsw/reg.h
index 4afc8486e..5acfbe5b8 100644
--- a/kernel/drivers/net/ethernet/mellanox/mlxsw/reg.h
+++ b/kernel/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -5827,6 +5827,29 @@ MLXSW_ITEM32(reg, mtmp, mtr, 0x08, 30, 1);
  */
 MLXSW_ITEM32(reg, mtmp, max_temperature, 0x08, 0, 16);
 
+/* reg_mtmp_tee
+ * Temperature Event Enable.
+ * 0 - Do not generate event
+ * 1 - Generate event
+ * 2 - Generate single event
+ * Access: RW
+ */
+MLXSW_ITEM32(reg, mtmp, tee, 0x0C, 30, 2);
+
+#define MLXSW_REG_MTMP_THRESH_HI 0x348	/* 105 Celsius */
+
+/* reg_mtmp_temperature_threshold_hi
+ * High threshold for Temperature Warning Event. In 0.125 Celsius.
+ * Access: RW
+ */
+MLXSW_ITEM32(reg, mtmp, temperature_threshold_hi, 0x0C, 0, 16);
+
+/* reg_mtmp_temperature_threshold_lo
+ * Low threshold for Temperature Warning Event. In 0.125 Celsius.
+ * Access: RW
+ */
+MLXSW_ITEM32(reg, mtmp, temperature_threshold_lo, 0x10, 0, 16);
+
 #define MLXSW_REG_MTMP_SENSOR_NAME_SIZE 8
 
 /* reg_mtmp_sensor_name
@@ -5843,6 +5866,8 @@ static inline void mlxsw_reg_mtmp_pack(char *payload, u8 sensor_index,
 	mlxsw_reg_mtmp_sensor_index_set(payload, sensor_index);
 	mlxsw_reg_mtmp_mte_set(payload, max_temp_enable);
 	mlxsw_reg_mtmp_mtr_set(payload, max_temp_reset);
+	mlxsw_reg_mtmp_temperature_threshold_hi_set(payload,
+						    MLXSW_REG_MTMP_THRESH_HI);
 }
 
 static inline void mlxsw_reg_mtmp_unpack(char *payload, unsigned int *p_temp,
diff --git a/kernel/drivers/net/ethernet/micrel/Makefile b/kernel/drivers/net/ethernet/micrel/Makefile
index c83e4bc50..848fc1c5a 100644
--- a/kernel/drivers/net/ethernet/micrel/Makefile
+++ b/kernel/drivers/net/ethernet/micrel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Micrel network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/micrel/ks8695net.h b/kernel/drivers/net/ethernet/micrel/ks8695net.h
index 80eff6ea5..b18fad4ad 100644
--- a/kernel/drivers/net/ethernet/micrel/ks8695net.h
+++ b/kernel/drivers/net/ethernet/micrel/ks8695net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Micrel KS8695 (Centaur) Ethernet.
  *
diff --git a/kernel/drivers/net/ethernet/microchip/enc28j60_hw.h b/kernel/drivers/net/ethernet/microchip/enc28j60_hw.h
index 25b41de49..da4ab1725 100644
--- a/kernel/drivers/net/ethernet/microchip/enc28j60_hw.h
+++ b/kernel/drivers/net/ethernet/microchip/enc28j60_hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * enc28j60_hw.h: EDTP FrameThrower style enc28j60 registers
  *
diff --git a/kernel/drivers/net/ethernet/microchip/encx24j600_hw.h b/kernel/drivers/net/ethernet/microchip/encx24j600_hw.h
index 4be73d555..f604a260e 100644
--- a/kernel/drivers/net/ethernet/microchip/encx24j600_hw.h
+++ b/kernel/drivers/net/ethernet/microchip/encx24j600_hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
  * encx24j600_hw.h: Register definitions
  *
diff --git a/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h b/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
index b7fc26c4f..cf7381060 100644
--- a/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
+++ b/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MYRI10GE_MCP_H__
 #define __MYRI10GE_MCP_H__
 
diff --git a/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h b/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
index 75ec5e7cf..95a0095a4 100644
--- a/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
+++ b/kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MYRI10GE_MCP_GEN_HEADER_H__
 #define __MYRI10GE_MCP_GEN_HEADER_H__
 
diff --git a/kernel/drivers/net/ethernet/natsemi/Makefile b/kernel/drivers/net/ethernet/natsemi/Makefile
index 764c532a9..cc6649775 100644
--- a/kernel/drivers/net/ethernet/natsemi/Makefile
+++ b/kernel/drivers/net/ethernet/natsemi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the National Semi-conductor Sonic devices.
 #
diff --git a/kernel/drivers/net/ethernet/natsemi/jazzsonic.c b/kernel/drivers/net/ethernet/natsemi/jazzsonic.c
index a6caeb567..d5b28884e 100644
--- a/kernel/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/kernel/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * jazzsonic.c
  *
diff --git a/kernel/drivers/net/ethernet/natsemi/macsonic.c b/kernel/drivers/net/ethernet/natsemi/macsonic.c
index 3ca6ae7ca..a42433fb6 100644
--- a/kernel/drivers/net/ethernet/natsemi/macsonic.c
+++ b/kernel/drivers/net/ethernet/natsemi/macsonic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * macsonic.c
  *
diff --git a/kernel/drivers/net/ethernet/natsemi/sonic.h b/kernel/drivers/net/ethernet/natsemi/sonic.h
index 7b0a8db57..421b1a283 100644
--- a/kernel/drivers/net/ethernet/natsemi/sonic.h
+++ b/kernel/drivers/net/ethernet/natsemi/sonic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Header file for sonic.c
  *
diff --git a/kernel/drivers/net/ethernet/natsemi/xtsonic.c b/kernel/drivers/net/ethernet/natsemi/xtsonic.c
index 9ee0f69a8..1817deea9 100644
--- a/kernel/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/kernel/drivers/net/ethernet/natsemi/xtsonic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xtsonic.c
  *
diff --git a/kernel/drivers/net/ethernet/netronome/nfp/Makefile b/kernel/drivers/net/ethernet/netronome/nfp/Makefile
index 96e579a15..3cafa3d15 100644
--- a/kernel/drivers/net/ethernet/netronome/nfp/Makefile
+++ b/kernel/drivers/net/ethernet/netronome/nfp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_NFP)	+= nfp.o
 
 nfp-objs := \
diff --git a/kernel/drivers/net/ethernet/qlogic/Makefile b/kernel/drivers/net/ethernet/qlogic/Makefile
index cee90e05b..6cd2e333a 100644
--- a/kernel/drivers/net/ethernet/qlogic/Makefile
+++ b/kernel/drivers/net/ethernet/qlogic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the QLogic network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/qlogic/qed/Makefile b/kernel/drivers/net/ethernet/qlogic/qed/Makefile
index 82dd47068..82a0b9018 100644
--- a/kernel/drivers/net/ethernet/qlogic/qed/Makefile
+++ b/kernel/drivers/net/ethernet/qlogic/qed/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_QED) := qed.o
 
 qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \
diff --git a/kernel/drivers/net/ethernet/qlogic/qed/qed_selftest.h b/kernel/drivers/net/ethernet/qlogic/qed/qed_selftest.h
index 739ddb730..ad00d082f 100644
--- a/kernel/drivers/net/ethernet/qlogic/qed/qed_selftest.h
+++ b/kernel/drivers/net/ethernet/qlogic/qed/qed_selftest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _QED_SELFTEST_API_H
 #define _QED_SELFTEST_API_H
 #include <linux/types.h>
diff --git a/kernel/drivers/net/ethernet/qlogic/qlcnic/Makefile b/kernel/drivers/net/ethernet/qlogic/qlcnic/Makefile
index 3c2c2c7c1..dbaeab344 100644
--- a/kernel/drivers/net/ethernet/qlogic/qlcnic/Makefile
+++ b/kernel/drivers/net/ethernet/qlogic/qlcnic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Qlogic 1G/10G Ethernet Driver for CNA devices
 #
diff --git a/kernel/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c b/kernel/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
index fe2599b83..31389ab8b 100644
--- a/kernel/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
+++ b/kernel/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/slab.h>
diff --git a/kernel/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/kernel/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 31f40148f..5edbd5321 100644
--- a/kernel/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
+++ b/kernel/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/module.h>
diff --git a/kernel/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c b/kernel/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
index 7ad146080..384c8bc87 100644
--- a/kernel/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
+++ b/kernel/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "qlge.h"
 
 int ql_unpause_mpi_risc(struct ql_adapter *qdev)
diff --git a/kernel/drivers/net/ethernet/qualcomm/Makefile b/kernel/drivers/net/ethernet/qualcomm/Makefile
index 1847350f4..9250976dd 100644
--- a/kernel/drivers/net/ethernet/qualcomm/Makefile
+++ b/kernel/drivers/net/ethernet/qualcomm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Qualcomm network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/realtek/atp.h b/kernel/drivers/net/ethernet/realtek/atp.h
index 32497f0e5..63f0d2d0e 100644
--- a/kernel/drivers/net/ethernet/realtek/atp.h
+++ b/kernel/drivers/net/ethernet/realtek/atp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Linux header file for the ATP pocket ethernet adapter. */
 /* v1.09 8/9/2000 becker@scyld.com. */
 
diff --git a/kernel/drivers/net/ethernet/seeq/sgiseeq.h b/kernel/drivers/net/ethernet/seeq/sgiseeq.h
index 2211e2987..2f65c5560 100644
--- a/kernel/drivers/net/ethernet/seeq/sgiseeq.h
+++ b/kernel/drivers/net/ethernet/seeq/sgiseeq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * sgiseeq.h: Defines for the Seeq8003 ethernet controller.
  *
diff --git a/kernel/drivers/net/ethernet/sfc/Makefile b/kernel/drivers/net/ethernet/sfc/Makefile
index 520cfcc17..3bac58d0f 100644
--- a/kernel/drivers/net/ethernet/sfc/Makefile
+++ b/kernel/drivers/net/ethernet/sfc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 sfc-y			+= efx.o nic.o farch.o siena.o ef10.o tx.o rx.o \
 			   selftest.o ethtool.o ptp.o tx_tso.o \
 			   mcdi.o mcdi_port.o mcdi_mon.o
diff --git a/kernel/drivers/net/ethernet/sfc/falcon/Makefile b/kernel/drivers/net/ethernet/sfc/falcon/Makefile
index aa1b45979..39448e5b7 100644
--- a/kernel/drivers/net/ethernet/sfc/falcon/Makefile
+++ b/kernel/drivers/net/ethernet/sfc/falcon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 sfc-falcon-y		+= efx.o nic.o farch.o falcon.o tx.o rx.o selftest.o \
 			   ethtool.o qt202x_phy.o mdio_10g.o tenxpress.o \
 			   txc43128_phy.o falcon_boards.o
diff --git a/kernel/drivers/net/ethernet/sis/sis900.h b/kernel/drivers/net/ethernet/sis/sis900.h
index f0da3dc52..66e4bf387 100644
--- a/kernel/drivers/net/ethernet/sis/sis900.h
+++ b/kernel/drivers/net/ethernet/sis/sis900.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
  * Copyright 1999 Silicon Integrated System Corporation
  * References:
diff --git a/kernel/drivers/net/ethernet/smsc/Makefile b/kernel/drivers/net/ethernet/smsc/Makefile
index f3438dec9..4105912b1 100644
--- a/kernel/drivers/net/ethernet/smsc/Makefile
+++ b/kernel/drivers/net/ethernet/smsc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the SMSC network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/stmicro/stmmac/Makefile b/kernel/drivers/net/ethernet/stmicro/stmmac/Makefile
index 238307fad..ff3f83b86 100644
--- a/kernel/drivers/net/ethernet/stmicro/stmmac/Makefile
+++ b/kernel/drivers/net/ethernet/stmicro/stmmac/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_STMMAC_ETH) += stmmac.o
 stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o	\
 	      chain_mode.o dwmac_lib.o dwmac1000_core.o dwmac1000_dma.o	\
diff --git a/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 638369500..195eb7e71 100644
--- a/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -168,8 +168,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
 	}
 
 	/* Processing RX queues common config */
-	if (of_property_read_u8(rx_node, "snps,rx-queues-to-use",
-				&plat->rx_queues_to_use))
+	if (of_property_read_u32(rx_node, "snps,rx-queues-to-use",
+				 &plat->rx_queues_to_use))
 		plat->rx_queues_to_use = 1;
 
 	if (of_property_read_bool(rx_node, "snps,rx-sched-sp"))
@@ -191,8 +191,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
 		else
 			plat->rx_queues_cfg[queue].mode_to_use = MTL_QUEUE_DCB;
 
-		if (of_property_read_u8(q_node, "snps,map-to-dma-channel",
-					&plat->rx_queues_cfg[queue].chan))
+		if (of_property_read_u32(q_node, "snps,map-to-dma-channel",
+					 &plat->rx_queues_cfg[queue].chan))
 			plat->rx_queues_cfg[queue].chan = queue;
 		/* TODO: Dynamic mapping to be included in the future */
 
@@ -222,8 +222,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
 	}
 
 	/* Processing TX queues common config */
-	if (of_property_read_u8(tx_node, "snps,tx-queues-to-use",
-				&plat->tx_queues_to_use))
+	if (of_property_read_u32(tx_node, "snps,tx-queues-to-use",
+				 &plat->tx_queues_to_use))
 		plat->tx_queues_to_use = 1;
 
 	if (of_property_read_bool(tx_node, "snps,tx-sched-wrr"))
@@ -244,8 +244,8 @@ static void stmmac_mtl_setup(struct platform_device *pdev,
 		if (queue >= plat->tx_queues_to_use)
 			break;
 
-		if (of_property_read_u8(q_node, "snps,weight",
-					&plat->tx_queues_cfg[queue].weight))
+		if (of_property_read_u32(q_node, "snps,weight",
+					 &plat->tx_queues_cfg[queue].weight))
 			plat->tx_queues_cfg[queue].weight = 0x10 + queue;
 
 		if (of_property_read_bool(q_node, "snps,dcb-algorithm")) {
diff --git a/kernel/drivers/net/ethernet/sun/Makefile b/kernel/drivers/net/ethernet/sun/Makefile
index 37855438b..9a5249dee 100644
--- a/kernel/drivers/net/ethernet/sun/Makefile
+++ b/kernel/drivers/net/ethernet/sun/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Sun network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/sun/niu.h b/kernel/drivers/net/ethernet/sun/niu.h
index 51e177e18..04c215f91 100644
--- a/kernel/drivers/net/ethernet/sun/niu.h
+++ b/kernel/drivers/net/ethernet/sun/niu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* niu.h: Definitions for Neptune ethernet driver.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/drivers/net/ethernet/sun/sunbmac.h b/kernel/drivers/net/ethernet/sun/sunbmac.h
index ee5693047..d379bd407 100644
--- a/kernel/drivers/net/ethernet/sun/sunbmac.h
+++ b/kernel/drivers/net/ethernet/sun/sunbmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: sunbmac.h,v 1.7 2000/07/11 22:35:22 davem Exp $
  * sunbmac.h: Defines for the Sun "Big MAC" 100baseT ethernet cards.
  *
diff --git a/kernel/drivers/net/ethernet/sun/sungem.h b/kernel/drivers/net/ethernet/sun/sungem.h
index 835ce1b3c..626302a9b 100644
--- a/kernel/drivers/net/ethernet/sun/sungem.h
+++ b/kernel/drivers/net/ethernet/sun/sungem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: sungem.h,v 1.10.2.4 2002/03/11 08:54:48 davem Exp $
  * sungem.h: Definitions for Sun GEM ethernet driver.
  *
diff --git a/kernel/drivers/net/ethernet/sun/sunhme.h b/kernel/drivers/net/ethernet/sun/sunhme.h
index fca1bca7f..9118c60c9 100644
--- a/kernel/drivers/net/ethernet/sun/sunhme.h
+++ b/kernel/drivers/net/ethernet/sun/sunhme.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: sunhme.h,v 1.33 2001/08/03 06:23:04 davem Exp $
  * sunhme.h: Definitions for Sparc HME/BigMac 10/100baseT ethernet driver.
  *           Also known as the "Happy Meal".
diff --git a/kernel/drivers/net/ethernet/sun/sunqe.h b/kernel/drivers/net/ethernet/sun/sunqe.h
index ae190b774..0daed05b7 100644
--- a/kernel/drivers/net/ethernet/sun/sunqe.h
+++ b/kernel/drivers/net/ethernet/sun/sunqe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: sunqe.h,v 1.13 2000/02/09 11:15:42 davem Exp $
  * sunqe.h: Definitions for the Sun QuadEthernet driver.
  *
diff --git a/kernel/drivers/net/ethernet/sun/sunvnet_common.h b/kernel/drivers/net/ethernet/sun/sunvnet_common.h
index b20d6fa7e..6a4dd1fb1 100644
--- a/kernel/drivers/net/ethernet/sun/sunvnet_common.h
+++ b/kernel/drivers/net/ethernet/sun/sunvnet_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SUNVNETCOMMON_H
 #define _SUNVNETCOMMON_H
 
diff --git a/kernel/drivers/net/ethernet/synopsys/Makefile b/kernel/drivers/net/ethernet/synopsys/Makefile
index 0ad01916f..7a46393ab 100644
--- a/kernel/drivers/net/ethernet/synopsys/Makefile
+++ b/kernel/drivers/net/ethernet/synopsys/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Synopsys network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/ti/Makefile b/kernel/drivers/net/ethernet/ti/Makefile
index 10e6b0ce5..0be551de8 100644
--- a/kernel/drivers/net/ethernet/ti/Makefile
+++ b/kernel/drivers/net/ethernet/ti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the TI network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/tile/Makefile b/kernel/drivers/net/ethernet/tile/Makefile
index 0ef9eefd3..3d0ae1f07 100644
--- a/kernel/drivers/net/ethernet/tile/Makefile
+++ b/kernel/drivers/net/ethernet/tile/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the TILE on-chip networking support.
 #
diff --git a/kernel/drivers/net/ethernet/toshiba/Makefile b/kernel/drivers/net/ethernet/toshiba/Makefile
index a50690084..f434fd0f4 100644
--- a/kernel/drivers/net/ethernet/toshiba/Makefile
+++ b/kernel/drivers/net/ethernet/toshiba/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Toshiba network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/xilinx/Makefile b/kernel/drivers/net/ethernet/xilinx/Makefile
index 214205e97..7d7dc1771 100644
--- a/kernel/drivers/net/ethernet/xilinx/Makefile
+++ b/kernel/drivers/net/ethernet/xilinx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Xilink network device drivers.
 #
diff --git a/kernel/drivers/net/ethernet/xilinx/ll_temac.h b/kernel/drivers/net/ethernet/xilinx/ll_temac.h
index 7d06e3e1a..107575225 100644
--- a/kernel/drivers/net/ethernet/xilinx/ll_temac.h
+++ b/kernel/drivers/net/ethernet/xilinx/ll_temac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef XILINX_LL_TEMAC_H
 #define XILINX_LL_TEMAC_H
diff --git a/kernel/drivers/net/ethernet/xilinx/ll_temac_mdio.c b/kernel/drivers/net/ethernet/xilinx/ll_temac_mdio.c
index 7714aff78..f5e83ac6f 100644
--- a/kernel/drivers/net/ethernet/xilinx/ll_temac_mdio.c
+++ b/kernel/drivers/net/ethernet/xilinx/ll_temac_mdio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MDIO bus driver for the Xilinx TEMAC device
  *
diff --git a/kernel/drivers/net/ethernet/xilinx/xilinx_axienet.h b/kernel/drivers/net/ethernet/xilinx/xilinx_axienet.h
index 5ef626331..c33740048 100644
--- a/kernel/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/kernel/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for Xilinx Axi Ethernet device driver.
  *
diff --git a/kernel/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/kernel/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index 63307ea97..16c3bfbe1 100644
--- a/kernel/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/kernel/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * MDIO bus driver for the Xilinx Axi Ethernet device
  *
diff --git a/kernel/drivers/net/fddi/skfp/Makefile b/kernel/drivers/net/fddi/skfp/Makefile
index a957a1c7e..875eac8a7 100644
--- a/kernel/drivers/net/fddi/skfp/Makefile
+++ b/kernel/drivers/net/fddi/skfp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the SysKonnect FDDI PCI adapter driver
 #
diff --git a/kernel/drivers/net/hamradio/Makefile b/kernel/drivers/net/hamradio/Makefile
index 104096070..7a1518d76 100644
--- a/kernel/drivers/net/hamradio/Makefile
+++ b/kernel/drivers/net/hamradio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux AX.25 and HFMODEM device drivers.
 #
diff --git a/kernel/drivers/net/hamradio/z8530.h b/kernel/drivers/net/hamradio/z8530.h
index 8bef54857..1655901d7 100644
--- a/kernel/drivers/net/hamradio/z8530.h
+++ b/kernel/drivers/net/hamradio/z8530.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* 8530 Serial Communications Controller Register definitions */
 #define	FLAG	0x7e
diff --git a/kernel/drivers/net/hippi/rrunner.h b/kernel/drivers/net/hippi/rrunner.h
index 28169043a..875337846 100644
--- a/kernel/drivers/net/hippi/rrunner.h
+++ b/kernel/drivers/net/hippi/rrunner.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RRUNNER_H_
 #define _RRUNNER_H_
 
diff --git a/kernel/drivers/net/ieee802154/Makefile b/kernel/drivers/net/ieee802154/Makefile
index 8374bb44a..bea1de5e7 100644
--- a/kernel/drivers/net/ieee802154/Makefile
+++ b/kernel/drivers/net/ieee802154/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IEEE802154_FAKELB) += fakelb.o
 obj-$(CONFIG_IEEE802154_AT86RF230) += at86rf230.o
 obj-$(CONFIG_IEEE802154_MRF24J40) += mrf24j40.o
diff --git a/kernel/drivers/net/phy/Makefile b/kernel/drivers/net/phy/Makefile
index 416df92fb..00f097e18 100644
--- a/kernel/drivers/net/phy/Makefile
+++ b/kernel/drivers/net/phy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for Linux PHY drivers and MDIO bus drivers
 
 libphy-y			:= phy.o phy-c45.o phy-core.o phy_device.o
diff --git a/kernel/drivers/net/phy/dp83640_reg.h b/kernel/drivers/net/phy/dp83640_reg.h
index e7fe41117..21aa24c74 100644
--- a/kernel/drivers/net/phy/dp83640_reg.h
+++ b/kernel/drivers/net/phy/dp83640_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* dp83640_reg.h
  * Generated by regen.tcl on Thu Feb 17 10:02:48 AM CET 2011
  */
diff --git a/kernel/drivers/net/phy/marvell.c b/kernel/drivers/net/phy/marvell.c
index 15cbcdba6..4d02b27df 100644
--- a/kernel/drivers/net/phy/marvell.c
+++ b/kernel/drivers/net/phy/marvell.c
@@ -681,9 +681,11 @@ static int m88e1116r_config_init(struct phy_device *phydev)
 	if (err < 0)
 		return err;
 
-	err = m88e1121_config_aneg_rgmii_delays(phydev);
-	if (err < 0)
-		return err;
+	if (phy_interface_is_rgmii(phydev)) {
+		err = m88e1121_config_aneg_rgmii_delays(phydev);
+		if (err < 0)
+			return err;
+	}
 
 	err = genphy_soft_reset(phydev);
 	if (err < 0)
diff --git a/kernel/drivers/net/phy/mdio-boardinfo.h b/kernel/drivers/net/phy/mdio-boardinfo.h
index 3a7f14390..773bb5139 100644
--- a/kernel/drivers/net/phy/mdio-boardinfo.h
+++ b/kernel/drivers/net/phy/mdio-boardinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mdio-boardinfo.h - board info interface internal to the mdio_bus
  * component
diff --git a/kernel/drivers/net/phy/swphy.h b/kernel/drivers/net/phy/swphy.h
index 2f09ac324..3668ab8c9 100644
--- a/kernel/drivers/net/phy/swphy.h
+++ b/kernel/drivers/net/phy/swphy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SWPHY_H
 #define SWPHY_H
 
diff --git a/kernel/drivers/net/ppp/Makefile b/kernel/drivers/net/ppp/Makefile
index a6b6297b0..16c457d6b 100644
--- a/kernel/drivers/net/ppp/Makefile
+++ b/kernel/drivers/net/ppp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux PPP network device drivers.
 #
diff --git a/kernel/drivers/net/ppp/ppp_mppe.h b/kernel/drivers/net/ppp/ppp_mppe.h
index 7a14e058c..677b3b3f7 100644
--- a/kernel/drivers/net/ppp/ppp_mppe.h
+++ b/kernel/drivers/net/ppp/ppp_mppe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define MPPE_PAD                4      /* MPPE growth per frame */
 #define MPPE_MAX_KEY_LEN       16      /* largest key length (128-bit) */
 
diff --git a/kernel/drivers/net/slip/slip.h b/kernel/drivers/net/slip/slip.h
index cf32aadf5..c420e5948 100644
--- a/kernel/drivers/net/slip/slip.h
+++ b/kernel/drivers/net/slip/slip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * slip.h	Define the SLIP device driver interface and constants.
  *
diff --git a/kernel/drivers/net/tap.c b/kernel/drivers/net/tap.c
index 1b10fcc6a..6c0c84c33 100644
--- a/kernel/drivers/net/tap.c
+++ b/kernel/drivers/net/tap.c
@@ -1032,6 +1032,8 @@ static long tap_ioctl(struct file *file, unsigned int cmd,
 	case TUNSETSNDBUF:
 		if (get_user(s, sp))
 			return -EFAULT;
+		if (s <= 0)
+			return -EINVAL;
 
 		q->sk.sk_sndbuf = s;
 		return 0;
diff --git a/kernel/drivers/net/team/Makefile b/kernel/drivers/net/team/Makefile
index c57e85889..f582d81a5 100644
--- a/kernel/drivers/net/team/Makefile
+++ b/kernel/drivers/net/team/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the network team driver
 #
diff --git a/kernel/drivers/net/tun.c b/kernel/drivers/net/tun.c
index 5550f56cb..42bb820a5 100644
--- a/kernel/drivers/net/tun.c
+++ b/kernel/drivers/net/tun.c
@@ -2429,6 +2429,10 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 			ret = -EFAULT;
 			break;
 		}
+		if (sndbuf <= 0) {
+			ret = -EINVAL;
+			break;
+		}
 
 		tun->sndbuf = sndbuf;
 		tun_set_sndbuf(tun);
diff --git a/kernel/drivers/net/usb/Makefile b/kernel/drivers/net/usb/Makefile
index 37fb46aee..27307a4ab 100644
--- a/kernel/drivers/net/usb/Makefile
+++ b/kernel/drivers/net/usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB Network drivers
 #
diff --git a/kernel/drivers/net/vrf.c b/kernel/drivers/net/vrf.c
index 9b243e6f3..7dc3bcac3 100644
--- a/kernel/drivers/net/vrf.c
+++ b/kernel/drivers/net/vrf.c
@@ -1165,7 +1165,7 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it)
 	frh->family = family;
 	frh->action = FR_ACT_TO_TBL;
 
-	if (nla_put_u32(skb, FRA_L3MDEV, 1))
+	if (nla_put_u8(skb, FRA_L3MDEV, 1))
 		goto nla_put_failure;
 
 	if (nla_put_u32(skb, FRA_PRIORITY, FIB_RULE_PREF))
diff --git a/kernel/drivers/net/wan/Makefile b/kernel/drivers/net/wan/Makefile
index 73c232660..9532e69fd 100644
--- a/kernel/drivers/net/wan/Makefile
+++ b/kernel/drivers/net/wan/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux network (wan) device drivers.
 #
diff --git a/kernel/drivers/net/wan/hd64570.h b/kernel/drivers/net/wan/hd64570.h
index 10963e8f4..24529996c 100644
--- a/kernel/drivers/net/wan/hd64570.h
+++ b/kernel/drivers/net/wan/hd64570.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HD64570_H
 #define __HD64570_H
 
diff --git a/kernel/drivers/net/wan/lapbether.c b/kernel/drivers/net/wan/lapbether.c
index 63f749078..0e3f8ed84 100644
--- a/kernel/drivers/net/wan/lapbether.c
+++ b/kernel/drivers/net/wan/lapbether.c
@@ -346,7 +346,6 @@ out:
 fail:
 	dev_put(dev);
 	free_netdev(ndev);
-	kfree(lapbeth);
 	goto out;
 }
 
diff --git a/kernel/drivers/net/wan/lmc/lmc.h b/kernel/drivers/net/wan/lmc/lmc.h
index 4ced7ac16..38961793a 100644
--- a/kernel/drivers/net/wan/lmc/lmc.h
+++ b/kernel/drivers/net/wan/lmc/lmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LMC_H_
 #define _LMC_H_
 
diff --git a/kernel/drivers/net/wan/lmc/lmc_debug.c b/kernel/drivers/net/wan/lmc/lmc_debug.c
index 15049d711..f999db788 100644
--- a/kernel/drivers/net/wan/lmc/lmc_debug.c
+++ b/kernel/drivers/net/wan/lmc/lmc_debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
diff --git a/kernel/drivers/net/wan/lmc/lmc_debug.h b/kernel/drivers/net/wan/lmc/lmc_debug.h
index 2d46f1215..820adcae5 100644
--- a/kernel/drivers/net/wan/lmc/lmc_debug.h
+++ b/kernel/drivers/net/wan/lmc/lmc_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LMC_DEBUG_H_
 #define _LMC_DEBUG_H_
 
diff --git a/kernel/drivers/net/wan/lmc/lmc_proto.h b/kernel/drivers/net/wan/lmc/lmc_proto.h
index 662148c54..bb098e443 100644
--- a/kernel/drivers/net/wan/lmc/lmc_proto.h
+++ b/kernel/drivers/net/wan/lmc/lmc_proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LMC_PROTO_H_
 #define _LMC_PROTO_H_
 
diff --git a/kernel/drivers/net/wan/x25_asy.h b/kernel/drivers/net/wan/x25_asy.h
index f57ee6783..eb4a4216e 100644
--- a/kernel/drivers/net/wan/x25_asy.h
+++ b/kernel/drivers/net/wan/x25_asy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_X25_ASY_H
 #define _LINUX_X25_ASY_H
 
diff --git a/kernel/drivers/net/wan/z85230.h b/kernel/drivers/net/wan/z85230.h
index 2416a9d60..32ae710d4 100644
--- a/kernel/drivers/net/wan/z85230.h
+++ b/kernel/drivers/net/wan/z85230.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Description of Z8530 Z85C30 and Z85230 communications chips
  *
diff --git a/kernel/drivers/net/wimax/i2400m/Makefile b/kernel/drivers/net/wimax/i2400m/Makefile
index f6d19c348..b1db1eff0 100644
--- a/kernel/drivers/net/wimax/i2400m/Makefile
+++ b/kernel/drivers/net/wimax/i2400m/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_WIMAX_I2400M) += i2400m.o
 obj-$(CONFIG_WIMAX_I2400M_USB) += i2400m-usb.o
diff --git a/kernel/drivers/net/wireless/Makefile b/kernel/drivers/net/wireless/Makefile
index 54b41ac5f..7fc963067 100644
--- a/kernel/drivers/net/wireless/Makefile
+++ b/kernel/drivers/net/wireless/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Wireless network device drivers.
 #
diff --git a/kernel/drivers/net/wireless/admtek/adm8211.h b/kernel/drivers/net/wireless/admtek/adm8211.h
index bbc10b1cd..2c55c629d 100644
--- a/kernel/drivers/net/wireless/admtek/adm8211.h
+++ b/kernel/drivers/net/wireless/admtek/adm8211.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ADM8211_H
 #define ADM8211_H
 
diff --git a/kernel/drivers/net/wireless/ath/Makefile b/kernel/drivers/net/wireless/ath/Makefile
index 4cdebc765..e4e460b54 100644
--- a/kernel/drivers/net/wireless/ath/Makefile
+++ b/kernel/drivers/net/wireless/ath/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ATH5K)		+= ath5k/
 obj-$(CONFIG_ATH9K_HW)		+= ath9k/
 obj-$(CONFIG_CARL9170)		+= carl9170/
diff --git a/kernel/drivers/net/wireless/ath/ath10k/Makefile b/kernel/drivers/net/wireless/ath/ath10k/Makefile
index 899b9b79f..9492177e9 100644
--- a/kernel/drivers/net/wireless/ath/ath10k/Makefile
+++ b/kernel/drivers/net/wireless/ath/ath10k/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ATH10K) += ath10k_core.o
 ath10k_core-y += mac.o \
 		 debug.o \
diff --git a/kernel/drivers/net/wireless/ath/ath10k/htt_rx.c b/kernel/drivers/net/wireless/ath/ath10k/htt_rx.c
index a3f5dc783..0aeeb233a 100644
--- a/kernel/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/kernel/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -550,6 +550,11 @@ static int ath10k_htt_rx_crypto_param_len(struct ath10k *ar,
 		return IEEE80211_TKIP_IV_LEN;
 	case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2:
 		return IEEE80211_CCMP_HDR_LEN;
+	case HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2:
+		return IEEE80211_CCMP_256_HDR_LEN;
+	case HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2:
+	case HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2:
+		return IEEE80211_GCMP_HDR_LEN;
 	case HTT_RX_MPDU_ENCRYPT_WEP128:
 	case HTT_RX_MPDU_ENCRYPT_WAPI:
 		break;
@@ -575,6 +580,11 @@ static int ath10k_htt_rx_crypto_tail_len(struct ath10k *ar,
 		return IEEE80211_TKIP_ICV_LEN;
 	case HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2:
 		return IEEE80211_CCMP_MIC_LEN;
+	case HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2:
+		return IEEE80211_CCMP_256_MIC_LEN;
+	case HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2:
+	case HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2:
+		return IEEE80211_GCMP_MIC_LEN;
 	case HTT_RX_MPDU_ENCRYPT_WEP128:
 	case HTT_RX_MPDU_ENCRYPT_WAPI:
 		break;
@@ -1051,9 +1061,21 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar,
 	hdr = (void *)msdu->data;
 
 	/* Tail */
-	if (status->flag & RX_FLAG_IV_STRIPPED)
+	if (status->flag & RX_FLAG_IV_STRIPPED) {
 		skb_trim(msdu, msdu->len -
 			 ath10k_htt_rx_crypto_tail_len(ar, enctype));
+	} else {
+		/* MIC */
+		if ((status->flag & RX_FLAG_MIC_STRIPPED) &&
+		    enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2)
+			skb_trim(msdu, msdu->len - 8);
+
+		/* ICV */
+		if (status->flag & RX_FLAG_ICV_STRIPPED &&
+		    enctype != HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2)
+			skb_trim(msdu, msdu->len -
+				 ath10k_htt_rx_crypto_tail_len(ar, enctype));
+	}
 
 	/* MMIC */
 	if ((status->flag & RX_FLAG_MMIC_STRIPPED) &&
@@ -1075,7 +1097,8 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar,
 static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar,
 					  struct sk_buff *msdu,
 					  struct ieee80211_rx_status *status,
-					  const u8 first_hdr[64])
+					  const u8 first_hdr[64],
+					  enum htt_rx_mpdu_encrypt_type enctype)
 {
 	struct ieee80211_hdr *hdr;
 	struct htt_rx_desc *rxd;
@@ -1083,6 +1106,7 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar,
 	u8 da[ETH_ALEN];
 	u8 sa[ETH_ALEN];
 	int l3_pad_bytes;
+	int bytes_aligned = ar->hw_params.decap_align_bytes;
 
 	/* Delivered decapped frame:
 	 * [nwifi 802.11 header] <-- replaced with 802.11 hdr
@@ -1111,6 +1135,14 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar,
 	/* push original 802.11 header */
 	hdr = (struct ieee80211_hdr *)first_hdr;
 	hdr_len = ieee80211_hdrlen(hdr->frame_control);
+
+	if (!(status->flag & RX_FLAG_IV_STRIPPED)) {
+		memcpy(skb_push(msdu,
+				ath10k_htt_rx_crypto_param_len(ar, enctype)),
+		       (void *)hdr + round_up(hdr_len, bytes_aligned),
+			ath10k_htt_rx_crypto_param_len(ar, enctype));
+	}
+
 	memcpy(skb_push(msdu, hdr_len), hdr, hdr_len);
 
 	/* original 802.11 header has a different DA and in
@@ -1171,6 +1203,7 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar,
 	u8 sa[ETH_ALEN];
 	int l3_pad_bytes;
 	struct htt_rx_desc *rxd;
+	int bytes_aligned = ar->hw_params.decap_align_bytes;
 
 	/* Delivered decapped frame:
 	 * [eth header] <-- replaced with 802.11 hdr & rfc1042/llc
@@ -1199,6 +1232,14 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar,
 	/* push original 802.11 header */
 	hdr = (struct ieee80211_hdr *)first_hdr;
 	hdr_len = ieee80211_hdrlen(hdr->frame_control);
+
+	if (!(status->flag & RX_FLAG_IV_STRIPPED)) {
+		memcpy(skb_push(msdu,
+				ath10k_htt_rx_crypto_param_len(ar, enctype)),
+		       (void *)hdr + round_up(hdr_len, bytes_aligned),
+			ath10k_htt_rx_crypto_param_len(ar, enctype));
+	}
+
 	memcpy(skb_push(msdu, hdr_len), hdr, hdr_len);
 
 	/* original 802.11 header has a different DA and in
@@ -1212,12 +1253,14 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar,
 static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar,
 					 struct sk_buff *msdu,
 					 struct ieee80211_rx_status *status,
-					 const u8 first_hdr[64])
+					 const u8 first_hdr[64],
+					 enum htt_rx_mpdu_encrypt_type enctype)
 {
 	struct ieee80211_hdr *hdr;
 	size_t hdr_len;
 	int l3_pad_bytes;
 	struct htt_rx_desc *rxd;
+	int bytes_aligned = ar->hw_params.decap_align_bytes;
 
 	/* Delivered decapped frame:
 	 * [amsdu header] <-- replaced with 802.11 hdr
@@ -1233,6 +1276,14 @@ static void ath10k_htt_rx_h_undecap_snap(struct ath10k *ar,
 
 	hdr = (struct ieee80211_hdr *)first_hdr;
 	hdr_len = ieee80211_hdrlen(hdr->frame_control);
+
+	if (!(status->flag & RX_FLAG_IV_STRIPPED)) {
+		memcpy(skb_push(msdu,
+				ath10k_htt_rx_crypto_param_len(ar, enctype)),
+		       (void *)hdr + round_up(hdr_len, bytes_aligned),
+			ath10k_htt_rx_crypto_param_len(ar, enctype));
+	}
+
 	memcpy(skb_push(msdu, hdr_len), hdr, hdr_len);
 }
 
@@ -1267,13 +1318,15 @@ static void ath10k_htt_rx_h_undecap(struct ath10k *ar,
 					    is_decrypted);
 		break;
 	case RX_MSDU_DECAP_NATIVE_WIFI:
-		ath10k_htt_rx_h_undecap_nwifi(ar, msdu, status, first_hdr);
+		ath10k_htt_rx_h_undecap_nwifi(ar, msdu, status, first_hdr,
+					      enctype);
 		break;
 	case RX_MSDU_DECAP_ETHERNET2_DIX:
 		ath10k_htt_rx_h_undecap_eth(ar, msdu, status, first_hdr, enctype);
 		break;
 	case RX_MSDU_DECAP_8023_SNAP_LLC:
-		ath10k_htt_rx_h_undecap_snap(ar, msdu, status, first_hdr);
+		ath10k_htt_rx_h_undecap_snap(ar, msdu, status, first_hdr,
+					     enctype);
 		break;
 	}
 }
@@ -1316,7 +1369,8 @@ static void ath10k_htt_rx_h_csum_offload(struct sk_buff *msdu)
 
 static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
 				 struct sk_buff_head *amsdu,
-				 struct ieee80211_rx_status *status)
+				 struct ieee80211_rx_status *status,
+				 bool fill_crypt_header)
 {
 	struct sk_buff *first;
 	struct sk_buff *last;
@@ -1326,7 +1380,6 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
 	enum htt_rx_mpdu_encrypt_type enctype;
 	u8 first_hdr[64];
 	u8 *qos;
-	size_t hdr_len;
 	bool has_fcs_err;
 	bool has_crypto_err;
 	bool has_tkip_err;
@@ -1351,15 +1404,17 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
 	 * decapped header. It'll be used for undecapping of each MSDU.
 	 */
 	hdr = (void *)rxd->rx_hdr_status;
-	hdr_len = ieee80211_hdrlen(hdr->frame_control);
-	memcpy(first_hdr, hdr, hdr_len);
+	memcpy(first_hdr, hdr, RX_HTT_HDR_STATUS_LEN);
 
 	/* Each A-MSDU subframe will use the original header as the base and be
 	 * reported as a separate MSDU so strip the A-MSDU bit from QoS Ctl.
 	 */
 	hdr = (void *)first_hdr;
-	qos = ieee80211_get_qos_ctl(hdr);
-	qos[0] &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
+
+	if (ieee80211_is_data_qos(hdr->frame_control)) {
+		qos = ieee80211_get_qos_ctl(hdr);
+		qos[0] &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT;
+	}
 
 	/* Some attention flags are valid only in the last MSDU. */
 	last = skb_peek_tail(amsdu);
@@ -1406,9 +1461,14 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
 		status->flag |= RX_FLAG_DECRYPTED;
 
 		if (likely(!is_mgmt))
-			status->flag |= RX_FLAG_IV_STRIPPED |
-					RX_FLAG_MMIC_STRIPPED;
-}
+			status->flag |= RX_FLAG_MMIC_STRIPPED;
+
+		if (fill_crypt_header)
+			status->flag |= RX_FLAG_MIC_STRIPPED |
+					RX_FLAG_ICV_STRIPPED;
+		else
+			status->flag |= RX_FLAG_IV_STRIPPED;
+	}
 
 	skb_queue_walk(amsdu, msdu) {
 		ath10k_htt_rx_h_csum_offload(msdu);
@@ -1424,6 +1484,9 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
 		if (is_mgmt)
 			continue;
 
+		if (fill_crypt_header)
+			continue;
+
 		hdr = (void *)msdu->data;
 		hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED);
 	}
@@ -1434,6 +1497,9 @@ static void ath10k_htt_rx_h_deliver(struct ath10k *ar,
 				    struct ieee80211_rx_status *status)
 {
 	struct sk_buff *msdu;
+	struct sk_buff *first_subframe;
+
+	first_subframe = skb_peek(amsdu);
 
 	while ((msdu = __skb_dequeue(amsdu))) {
 		/* Setup per-MSDU flags */
@@ -1442,6 +1508,13 @@ static void ath10k_htt_rx_h_deliver(struct ath10k *ar,
 		else
 			status->flag |= RX_FLAG_AMSDU_MORE;
 
+		if (msdu == first_subframe) {
+			first_subframe = NULL;
+			status->flag &= ~RX_FLAG_ALLOW_SAME_PN;
+		} else {
+			status->flag |= RX_FLAG_ALLOW_SAME_PN;
+		}
+
 		ath10k_process_rx(ar, status, msdu);
 	}
 }
@@ -1584,7 +1657,7 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
 		ath10k_htt_rx_h_unchain(ar, &amsdu);
 
 	ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);
-	ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);
+	ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status, true);
 	ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);
 
 	return num_msdus;
@@ -1745,8 +1818,7 @@ static void ath10k_htt_rx_delba(struct ath10k *ar, struct htt_resp *resp)
 }
 
 static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list,
-				       struct sk_buff_head *amsdu,
-				       int budget_left)
+				       struct sk_buff_head *amsdu)
 {
 	struct sk_buff *msdu;
 	struct htt_rx_desc *rxd;
@@ -1757,9 +1829,8 @@ static int ath10k_htt_rx_extract_amsdu(struct sk_buff_head *list,
 	if (WARN_ON(!skb_queue_empty(amsdu)))
 		return -EINVAL;
 
-	while ((msdu = __skb_dequeue(list)) && budget_left) {
+	while ((msdu = __skb_dequeue(list))) {
 		__skb_queue_tail(amsdu, msdu);
-		budget_left--;
 
 		rxd = (void *)msdu->data - sizeof(*rxd);
 		if (rxd->msdu_end.common.info0 &
@@ -1850,8 +1921,7 @@ static int ath10k_htt_rx_h_rx_offload(struct ath10k *ar,
 	return num_msdu;
 }
 
-static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb,
-				    int budget_left)
+static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb)
 {
 	struct ath10k_htt *htt = &ar->htt;
 	struct htt_resp *resp = (void *)skb->data;
@@ -1908,9 +1978,9 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb,
 	if (offload)
 		num_msdus = ath10k_htt_rx_h_rx_offload(ar, &list);
 
-	while (!skb_queue_empty(&list) && budget_left) {
+	while (!skb_queue_empty(&list)) {
 		__skb_queue_head_init(&amsdu);
-		ret = ath10k_htt_rx_extract_amsdu(&list, &amsdu, budget_left);
+		ret = ath10k_htt_rx_extract_amsdu(&list, &amsdu);
 		switch (ret) {
 		case 0:
 			/* Note: The in-order indication may report interleaved
@@ -1920,10 +1990,9 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb,
 			 * should still give an idea about rx rate to the user.
 			 */
 			num_msdus += skb_queue_len(&amsdu);
-			budget_left -= skb_queue_len(&amsdu);
 			ath10k_htt_rx_h_ppdu(ar, &amsdu, status, vdev_id);
 			ath10k_htt_rx_h_filter(ar, &amsdu, status);
-			ath10k_htt_rx_h_mpdu(ar, &amsdu, status);
+			ath10k_htt_rx_h_mpdu(ar, &amsdu, status, false);
 			ath10k_htt_rx_h_deliver(ar, &amsdu, status);
 			break;
 		case -EAGAIN:
@@ -2563,8 +2632,7 @@ int ath10k_htt_txrx_compl_task(struct ath10k *ar, int budget)
 		}
 
 		spin_lock_bh(&htt->rx_ring.lock);
-		num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb,
-							(budget - quota));
+		num_rx_msdus = ath10k_htt_rx_in_ord_ind(ar, skb);
 		spin_unlock_bh(&htt->rx_ring.lock);
 		if (num_rx_msdus < 0) {
 			resched_napi = true;
diff --git a/kernel/drivers/net/wireless/ath/ath10k/rx_desc.h b/kernel/drivers/net/wireless/ath/ath10k/rx_desc.h
index c1022a1cf..28da14398 100644
--- a/kernel/drivers/net/wireless/ath/ath10k/rx_desc.h
+++ b/kernel/drivers/net/wireless/ath/ath10k/rx_desc.h
@@ -239,6 +239,9 @@ enum htt_rx_mpdu_encrypt_type {
 	HTT_RX_MPDU_ENCRYPT_WAPI             = 5,
 	HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2     = 6,
 	HTT_RX_MPDU_ENCRYPT_NONE             = 7,
+	HTT_RX_MPDU_ENCRYPT_AES_CCM256_WPA2  = 8,
+	HTT_RX_MPDU_ENCRYPT_AES_GCMP_WPA2    = 9,
+	HTT_RX_MPDU_ENCRYPT_AES_GCMP256_WPA2 = 10,
 };
 
 #define RX_MPDU_START_INFO0_PEER_IDX_MASK     0x000007ff
diff --git a/kernel/drivers/net/wireless/ath/ath5k/Makefile b/kernel/drivers/net/wireless/ath/ath5k/Makefile
index 1b3a34f7f..a8724eee2 100644
--- a/kernel/drivers/net/wireless/ath/ath5k/Makefile
+++ b/kernel/drivers/net/wireless/ath/ath5k/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ath5k-y				+= caps.o
 ath5k-y				+= initvals.o
 ath5k-y				+= eeprom.o
diff --git a/kernel/drivers/net/wireless/ath/ath5k/sysfs.c b/kernel/drivers/net/wireless/ath/ath5k/sysfs.c
index 04cf0ca72..25978c732 100644
--- a/kernel/drivers/net/wireless/ath/ath5k/sysfs.c
+++ b/kernel/drivers/net/wireless/ath/ath5k/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/device.h>
diff --git a/kernel/drivers/net/wireless/ath/ath5k/trace.h b/kernel/drivers/net/wireless/ath/ath5k/trace.h
index c6eef519b..a41e3bf42 100644
--- a/kernel/drivers/net/wireless/ath/ath5k/trace.h
+++ b/kernel/drivers/net/wireless/ath/ath5k/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(__TRACE_ATH5K_H) || defined(TRACE_HEADER_MULTI_READ)
 #define __TRACE_ATH5K_H
 
diff --git a/kernel/drivers/net/wireless/ath/ath6kl/trace.h b/kernel/drivers/net/wireless/ath/ath6kl/trace.h
index 1a1ea7881..91e735cfd 100644
--- a/kernel/drivers/net/wireless/ath/ath6kl/trace.h
+++ b/kernel/drivers/net/wireless/ath/ath6kl/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_ATH6KL_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
 
 #include <net/cfg80211.h>
diff --git a/kernel/drivers/net/wireless/ath/ath9k/Makefile b/kernel/drivers/net/wireless/ath/ath9k/Makefile
index 36a40ffdc..d804ce739 100644
--- a/kernel/drivers/net/wireless/ath/ath9k/Makefile
+++ b/kernel/drivers/net/wireless/ath/ath9k/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ath9k-y +=	beacon.o \
 		gpio.o \
 		init.o \
diff --git a/kernel/drivers/net/wireless/ath/carl9170/version.h b/kernel/drivers/net/wireless/ath/carl9170/version.h
index a0410fe8c..9a44d004c 100644
--- a/kernel/drivers/net/wireless/ath/carl9170/version.h
+++ b/kernel/drivers/net/wireless/ath/carl9170/version.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CARL9170_SHARED_VERSION_H
 #define __CARL9170_SHARED_VERSION_H
 #define CARL9170FW_VERSION_YEAR 16
diff --git a/kernel/drivers/net/wireless/ath/wcn36xx/Makefile b/kernel/drivers/net/wireless/ath/wcn36xx/Makefile
index 50c43b438..3b0943510 100644
--- a/kernel/drivers/net/wireless/ath/wcn36xx/Makefile
+++ b/kernel/drivers/net/wireless/ath/wcn36xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WCN36XX) := wcn36xx.o
 wcn36xx-y +=   main.o \
                dxe.o \
diff --git a/kernel/drivers/net/wireless/ath/wcn36xx/main.c b/kernel/drivers/net/wireless/ath/wcn36xx/main.c
index 35bd50bcb..b83f01d6e 100644
--- a/kernel/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/kernel/drivers/net/wireless/ath/wcn36xx/main.c
@@ -812,7 +812,6 @@ static void wcn36xx_bss_info_changed(struct ieee80211_hw *hw,
 			if (!sta) {
 				wcn36xx_err("sta %pM is not found\n",
 					      bss_conf->bssid);
-				rcu_read_unlock();
 				goto out;
 			}
 			sta_priv = wcn36xx_sta_to_priv(sta);
diff --git a/kernel/drivers/net/wireless/ath/wil6210/Makefile b/kernel/drivers/net/wireless/ath/wil6210/Makefile
index d27efe837..398edd2a7 100644
--- a/kernel/drivers/net/wireless/ath/wil6210/Makefile
+++ b/kernel/drivers/net/wireless/ath/wil6210/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WIL6210) += wil6210.o
 
 wil6210-y := main.o
diff --git a/kernel/drivers/net/wireless/broadcom/b43/Makefile b/kernel/drivers/net/wireless/broadcom/b43/Makefile
index 27fab958e..54f92ce49 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/Makefile
+++ b/kernel/drivers/net/wireless/broadcom/b43/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 b43-y				+= main.o
 b43-y				+= bus.o
 b43-$(CONFIG_B43_PHY_G)		+= phy_g.o tables.o lo.o wa.o
diff --git a/kernel/drivers/net/wireless/broadcom/b43/b43.h b/kernel/drivers/net/wireless/broadcom/b43/b43.h
index d7d42f0b8..b77d1a904 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/b43.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/b43.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_H_
 #define B43_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/bus.h b/kernel/drivers/net/wireless/broadcom/b43/bus.h
index 256c2c179..2a695f9e5 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/bus.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/bus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_BUS_H_
 #define B43_BUS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/debugfs.h b/kernel/drivers/net/wireless/broadcom/b43/debugfs.h
index d05377745..0bf437c86 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/debugfs.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_DEBUGFS_H_
 #define B43_DEBUGFS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/dma.h b/kernel/drivers/net/wireless/broadcom/b43/dma.h
index df8c8cdcb..c2a357219 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/dma.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_DMA_H_
 #define B43_DMA_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/leds.h b/kernel/drivers/net/wireless/broadcom/b43/leds.h
index 32b66d53c..5ebd1b2b1 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/leds.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/leds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_LEDS_H_
 #define B43_LEDS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/lo.h b/kernel/drivers/net/wireless/broadcom/b43/lo.h
index 7b4df3883..66e07ab79 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/lo.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/lo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_LO_H_
 #define B43_LO_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_a.h b/kernel/drivers/net/wireless/broadcom/b43/phy_a.h
index 0a92d01c2..b1cbfc02b 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_a.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_a.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_B43_PHY_A_H_
 #define LINUX_B43_PHY_A_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_ac.h b/kernel/drivers/net/wireless/broadcom/b43/phy_ac.h
index d1ca79e0e..02eb6c086 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_ac.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_ac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_PHY_AC_H_
 #define B43_PHY_AC_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_common.h b/kernel/drivers/net/wireless/broadcom/b43/phy_common.h
index ced054a98..57a1ad8af 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_common.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_B43_PHY_COMMON_H_
 #define LINUX_B43_PHY_COMMON_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_g.h b/kernel/drivers/net/wireless/broadcom/b43/phy_g.h
index 5413c906a..a27b8603c 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_g.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_g.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_B43_PHY_G_H_
 #define LINUX_B43_PHY_G_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_ht.h b/kernel/drivers/net/wireless/broadcom/b43/phy_ht.h
index c086f56ce..046753857 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_ht.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_ht.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_PHY_HT_H_
 #define B43_PHY_HT_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_lcn.h b/kernel/drivers/net/wireless/broadcom/b43/phy_lcn.h
index 6a7092e13..0b1cfaf63 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_lcn.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_lcn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_PHY_LCN_H_
 #define B43_PHY_LCN_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_lp.h b/kernel/drivers/net/wireless/broadcom/b43/phy_lp.h
index 62737f700..50bef2ea6 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_lp.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_lp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_B43_PHY_LP_H_
 #define LINUX_B43_PHY_LP_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/phy_n.h b/kernel/drivers/net/wireless/broadcom/b43/phy_n.h
index a6da2c31a..b96ded0ef 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/phy_n.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/phy_n.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_NPHY_H_
 #define B43_NPHY_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/pio.h b/kernel/drivers/net/wireless/broadcom/b43/pio.h
index 1e5161474..ffbfec622 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/pio.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/pio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_PIO_H_
 #define B43_PIO_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/ppr.h b/kernel/drivers/net/wireless/broadcom/b43/ppr.h
index 24d7447e9..094389f9f 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/ppr.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/ppr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_B43_PPR_H_
 #define LINUX_B43_PPR_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/radio_2055.h b/kernel/drivers/net/wireless/broadcom/b43/radio_2055.h
index 67f96122f..ad7271cde 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/radio_2055.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/radio_2055.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_RADIO_2055_H_
 #define B43_RADIO_2055_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/radio_2056.h b/kernel/drivers/net/wireless/broadcom/b43/radio_2056.h
index 5b8667345..59297fdce 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/radio_2056.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/radio_2056.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_RADIO_2056_H_
 #define B43_RADIO_2056_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/radio_2057.h b/kernel/drivers/net/wireless/broadcom/b43/radio_2057.h
index 220d08023..d7959da77 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/radio_2057.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/radio_2057.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_RADIO_2057_H_
 #define B43_RADIO_2057_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/radio_2059.h b/kernel/drivers/net/wireless/broadcom/b43/radio_2059.h
index 9e22fb605..32c0025bc 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/radio_2059.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/radio_2059.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_RADIO_2059_H_
 #define B43_RADIO_2059_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/rfkill.h b/kernel/drivers/net/wireless/broadcom/b43/rfkill.h
index f046c3ca0..8682ac5b8 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/rfkill.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/rfkill.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_RFKILL_H_
 #define B43_RFKILL_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/sdio.h b/kernel/drivers/net/wireless/broadcom/b43/sdio.h
index 1e93926f3..aa5693b12 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/sdio.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/sdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_SDIO_H_
 #define B43_SDIO_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/sysfs.h b/kernel/drivers/net/wireless/broadcom/b43/sysfs.h
index 12bda9ef1..e70e6cff3 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/sysfs.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_SYSFS_H_
 #define B43_SYSFS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/tables.h b/kernel/drivers/net/wireless/broadcom/b43/tables.h
index 80e73c7cb..3b0777f15 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/tables.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_TABLES_H_
 #define B43_TABLES_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/tables_lpphy.h b/kernel/drivers/net/wireless/broadcom/b43/tables_lpphy.h
index 84f1d265f..62002098b 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/tables_lpphy.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/tables_lpphy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_TABLES_LPPHY_H_
 #define B43_TABLES_LPPHY_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/tables_nphy.h b/kernel/drivers/net/wireless/broadcom/b43/tables_nphy.h
index b51f386db..3876786d2 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/tables_nphy.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/tables_nphy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_TABLES_NPHY_H_
 #define B43_TABLES_NPHY_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/tables_phy_ht.h b/kernel/drivers/net/wireless/broadcom/b43/tables_phy_ht.h
index 1b5ef2bc7..7ed057118 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/tables_phy_ht.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/tables_phy_ht.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_TABLES_PHY_HT_H_
 #define B43_TABLES_PHY_HT_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h b/kernel/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h
index caff9db68..5ea6c15e8 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_TABLES_PHY_LCN_H_
 #define B43_TABLES_PHY_LCN_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/wa.h b/kernel/drivers/net/wireless/broadcom/b43/wa.h
index e163c5e56..f3459b99d 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/wa.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/wa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_WA_H_
 #define B43_WA_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43/xmit.h b/kernel/drivers/net/wireless/broadcom/b43/xmit.h
index ba6115308..6524a75bb 100644
--- a/kernel/drivers/net/wireless/broadcom/b43/xmit.h
+++ b/kernel/drivers/net/wireless/broadcom/b43/xmit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43_XMIT_H_
 #define B43_XMIT_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/Makefile b/kernel/drivers/net/wireless/broadcom/b43legacy/Makefile
index 227a77e84..f8b392f09 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/Makefile
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # b43legacy core
 b43legacy-y				+= main.o
 b43legacy-y				+= ilt.o
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/b43legacy.h b/kernel/drivers/net/wireless/broadcom/b43legacy/b43legacy.h
index 482476fdb..6b0cec467 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/b43legacy.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/b43legacy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_H_
 #define B43legacy_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/debugfs.h b/kernel/drivers/net/wireless/broadcom/b43legacy/debugfs.h
index 9ee32158b..7a3776440 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/debugfs.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_DEBUGFS_H_
 #define B43legacy_DEBUGFS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/dma.h b/kernel/drivers/net/wireless/broadcom/b43legacy/dma.h
index c3282f906..b5c1a51db 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/dma.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_DMA_H_
 #define B43legacy_DMA_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/ilt.h b/kernel/drivers/net/wireless/broadcom/b43legacy/ilt.h
index 48bcf37ec..ce7a61e2e 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/ilt.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/ilt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_ILT_H_
 #define B43legacy_ILT_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/leds.h b/kernel/drivers/net/wireless/broadcom/b43legacy/leds.h
index 9ff6750dc..389ae06a2 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/leds.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/leds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_LEDS_H_
 #define B43legacy_LEDS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/pio.h b/kernel/drivers/net/wireless/broadcom/b43legacy/pio.h
index 8e6773ea6..1cd1b9ca5 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/pio.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/pio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_PIO_H_
 #define B43legacy_PIO_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/rfkill.h b/kernel/drivers/net/wireless/broadcom/b43legacy/rfkill.h
index 75585571c..7f314eb81 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/rfkill.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/rfkill.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_RFKILL_H_
 #define B43legacy_RFKILL_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/sysfs.h b/kernel/drivers/net/wireless/broadcom/b43legacy/sysfs.h
index 417d50980..ea9d783e6 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/sysfs.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_SYSFS_H_
 #define B43legacy_SYSFS_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/b43legacy/xmit.h b/kernel/drivers/net/wireless/broadcom/b43legacy/xmit.h
index 289db00a4..e4ef869f0 100644
--- a/kernel/drivers/net/wireless/broadcom/b43legacy/xmit.h
+++ b/kernel/drivers/net/wireless/broadcom/b43legacy/xmit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef B43legacy_XMIT_H_
 #define B43legacy_XMIT_H_
 
diff --git a/kernel/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c b/kernel/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
index 74b17cecb..c0a5449ed 100644
--- a/kernel/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
+++ b/kernel/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <net/mac80211.h>
 #include <linux/bcma/bcma_driver_chipcommon.h>
 #include <linux/gpio.h>
diff --git a/kernel/drivers/net/wireless/cisco/airo.h b/kernel/drivers/net/wireless/cisco/airo.h
index e480adf86..8a02977a2 100644
--- a/kernel/drivers/net/wireless/cisco/airo.h
+++ b/kernel/drivers/net/wireless/cisco/airo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AIRO_H_
 #define _AIRO_H_
 
diff --git a/kernel/drivers/net/wireless/intel/ipw2x00/Makefile b/kernel/drivers/net/wireless/intel/ipw2x00/Makefile
index aecd2cff4..e1ec50359 100644
--- a/kernel/drivers/net/wireless/intel/ipw2x00/Makefile
+++ b/kernel/drivers/net/wireless/intel/ipw2x00/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Intel Centrino wireless drivers
 #
diff --git a/kernel/drivers/net/wireless/intel/iwlegacy/Makefile b/kernel/drivers/net/wireless/intel/iwlegacy/Makefile
index c826a6b98..c5ad0453b 100644
--- a/kernel/drivers/net/wireless/intel/iwlegacy/Makefile
+++ b/kernel/drivers/net/wireless/intel/iwlegacy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IWLEGACY)	+= iwlegacy.o
 iwlegacy-objs 		:= common.o
 iwlegacy-$(CONFIG_IWLEGACY_DEBUGFS) += debug.o
diff --git a/kernel/drivers/net/wireless/intel/iwlwifi/Makefile b/kernel/drivers/net/wireless/intel/iwlwifi/Makefile
index 35a32a3ec..595b26b66 100644
--- a/kernel/drivers/net/wireless/intel/iwlwifi/Makefile
+++ b/kernel/drivers/net/wireless/intel/iwlwifi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # common
 obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o
 iwlwifi-objs		+= iwl-io.o
diff --git a/kernel/drivers/net/wireless/intel/iwlwifi/dvm/Makefile b/kernel/drivers/net/wireless/intel/iwlwifi/dvm/Makefile
index b256a3549..702d42b2d 100644
--- a/kernel/drivers/net/wireless/intel/iwlwifi/dvm/Makefile
+++ b/kernel/drivers/net/wireless/intel/iwlwifi/dvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # DVM
 obj-$(CONFIG_IWLDVM)	+= iwldvm.o
 iwldvm-objs		+= main.o rs.o mac80211.o ucode.o tx.o
diff --git a/kernel/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/kernel/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
index 00e6737dd..a47635c32 100644
--- a/kernel/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
+++ b/kernel/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IWLMVM)   += iwlmvm.o
 iwlmvm-y += fw.o mac80211.o nvm.o ops.o phy-ctxt.o mac-ctxt.o
 iwlmvm-y += utils.o rx.o rxmq.o tx.o binding.o quota.o sta.o sf.o
diff --git a/kernel/drivers/net/wireless/intersil/hostap/Makefile b/kernel/drivers/net/wireless/intersil/hostap/Makefile
index b8e41a702..ae3bb73b2 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/Makefile
+++ b/kernel/drivers/net/wireless/intersil/hostap/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 hostap-y := hostap_80211_rx.o hostap_80211_tx.o hostap_ap.o hostap_info.o \
             hostap_ioctl.o hostap_main.o hostap_proc.o 
 obj-$(CONFIG_HOSTAP) += hostap.o
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap.h b/kernel/drivers/net/wireless/intersil/hostap/hostap.h
index ce8721fbc..8130d29c7 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap.h
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOSTAP_H
 #define HOSTAP_H
 
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_80211.h b/kernel/drivers/net/wireless/intersil/hostap/hostap_80211.h
index ed98ce7c8..1452cf6ec 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_80211.h
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_80211.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOSTAP_80211_H
 #define HOSTAP_80211_H
 
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c
index 6d8b64ca1..61be822f9 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
 #include <linux/export.h>
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
index c1b10d511..c47da0694 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <linux/etherdevice.h>
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.c
index eb9cd6fa9..1a8d8db80 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Intersil Prism2 driver with Host AP (software access point) support
  * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.h b/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.h
index 334e2d0b8..b7ac9e2f1 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.h
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_ap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOSTAP_AP_H
 #define HOSTAP_AP_H
 
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_common.h b/kernel/drivers/net/wireless/intersil/hostap/hostap_common.h
index 4230102ac..225435382 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_common.h
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOSTAP_COMMON_H
 #define HOSTAP_COMMON_H
 
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_config.h b/kernel/drivers/net/wireless/intersil/hostap/hostap_config.h
index 2c8f71f0e..3ebd55847 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_config.h
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOSTAP_CONFIG_H
 #define HOSTAP_CONFIG_H
 
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_download.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_download.c
index 705fe668b..4507614a7 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_download.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_download.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static int prism2_enable_aux_port(struct net_device *dev, int enable)
 {
 	u16 val, reg;
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_info.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_info.c
index 7635ac4f6..de8a099a9 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_info.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_info.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Host AP driver Info Frame processing (part of hostap.o module) */
 
 #include <linux/if_arp.h>
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_ioctl.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
index ff153ce29..c1bc0a6ef 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */
 
 #include <linux/slab.h>
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_proc.c b/kernel/drivers/net/wireless/intersil/hostap/hostap_proc.c
index dd84557cf..d234231bf 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_proc.c
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* /proc routines for Host AP driver */
 
 #include <linux/types.h>
diff --git a/kernel/drivers/net/wireless/intersil/hostap/hostap_wlan.h b/kernel/drivers/net/wireless/intersil/hostap/hostap_wlan.h
index 5352adb94..a8c4c1a8b 100644
--- a/kernel/drivers/net/wireless/intersil/hostap/hostap_wlan.h
+++ b/kernel/drivers/net/wireless/intersil/hostap/hostap_wlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOSTAP_WLAN_H
 #define HOSTAP_WLAN_H
 
diff --git a/kernel/drivers/net/wireless/intersil/orinoco/Makefile b/kernel/drivers/net/wireless/intersil/orinoco/Makefile
index b7ecef820..0c29c56c8 100644
--- a/kernel/drivers/net/wireless/intersil/orinoco/Makefile
+++ b/kernel/drivers/net/wireless/intersil/orinoco/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the orinoco wireless device drivers.
 #
diff --git a/kernel/drivers/net/wireless/intersil/p54/Makefile b/kernel/drivers/net/wireless/intersil/p54/Makefile
index b542e68f1..d71651ff9 100644
--- a/kernel/drivers/net/wireless/intersil/p54/Makefile
+++ b/kernel/drivers/net/wireless/intersil/p54/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 p54common-objs			:= eeprom.o fwio.o txrx.o main.o
 p54common-$(CONFIG_P54_LEDS)	+= led.o
 
diff --git a/kernel/drivers/net/wireless/marvell/libertas/Makefile b/kernel/drivers/net/wireless/marvell/libertas/Makefile
index eac72f7bd..41b9b440a 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/Makefile
+++ b/kernel/drivers/net/wireless/marvell/libertas/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 libertas-y += cfg.o
 libertas-y += cmd.o
 libertas-y += cmdresp.o
diff --git a/kernel/drivers/net/wireless/marvell/libertas/cfg.c b/kernel/drivers/net/wireless/marvell/libertas/cfg.c
index 71ba2c8d0..9f3a7b512 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/cfg.c
+++ b/kernel/drivers/net/wireless/marvell/libertas/cfg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement cfg80211 ("iw") support.
  *
diff --git a/kernel/drivers/net/wireless/marvell/libertas/cfg.h b/kernel/drivers/net/wireless/marvell/libertas/cfg.h
index acccc2922..0e48dc6d8 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/cfg.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/cfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LBS_CFG80211_H__
 #define __LBS_CFG80211_H__
 
diff --git a/kernel/drivers/net/wireless/marvell/libertas/cmd.h b/kernel/drivers/net/wireless/marvell/libertas/cmd.h
index 0c5444b02..80878561c 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/cmd.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/cmd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright (C) 2007, Red Hat, Inc. */
 
 #ifndef _LBS_CMD_H_
diff --git a/kernel/drivers/net/wireless/marvell/libertas/cmdresp.c b/kernel/drivers/net/wireless/marvell/libertas/cmdresp.c
index aaf01619d..b73d08381 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/cmdresp.c
+++ b/kernel/drivers/net/wireless/marvell/libertas/cmdresp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains the handling of command
  * responses as well as events generated by firmware.
diff --git a/kernel/drivers/net/wireless/marvell/libertas/debugfs.c b/kernel/drivers/net/wireless/marvell/libertas/debugfs.c
index faed1823c..c83f44f9d 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/debugfs.c
+++ b/kernel/drivers/net/wireless/marvell/libertas/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/dcache.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
diff --git a/kernel/drivers/net/wireless/marvell/libertas/debugfs.h b/kernel/drivers/net/wireless/marvell/libertas/debugfs.h
index f2b9c7ffe..6efd1a66d 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/debugfs.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LBS_DEBUGFS_H_
 #define _LBS_DEBUGFS_H_
 
diff --git a/kernel/drivers/net/wireless/marvell/libertas/decl.h b/kernel/drivers/net/wireless/marvell/libertas/decl.h
index 84a3aa7ac..5d1e30e0c 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/decl.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/decl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  *  This file contains declaration referring to
diff --git a/kernel/drivers/net/wireless/marvell/libertas/defs.h b/kernel/drivers/net/wireless/marvell/libertas/defs.h
index d3221444e..58e2ead7b 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/defs.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header file contains global constant/enum definitions,
  * global variable declaration.
diff --git a/kernel/drivers/net/wireless/marvell/libertas/dev.h b/kernel/drivers/net/wireless/marvell/libertas/dev.h
index edf710bc5..dd1ee1f0a 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/dev.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file contains definitions and data structures specific
  * to Marvell 802.11 NIC. It contains the Device Information
diff --git a/kernel/drivers/net/wireless/marvell/libertas/ethtool.c b/kernel/drivers/net/wireless/marvell/libertas/ethtool.c
index 693868f16..1bb8746a0 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/ethtool.c
+++ b/kernel/drivers/net/wireless/marvell/libertas/ethtool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/hardirq.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
diff --git a/kernel/drivers/net/wireless/marvell/libertas/host.h b/kernel/drivers/net/wireless/marvell/libertas/host.h
index 96726f79a..a4fc3f79b 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/host.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/host.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file function prototypes, data structure
  * and  definitions for all the host/station commands
diff --git a/kernel/drivers/net/wireless/marvell/libertas/if_usb.h b/kernel/drivers/net/wireless/marvell/libertas/if_usb.h
index 6e42eac33..8dc14bec3 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/if_usb.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/if_usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LBS_IF_USB_H
 #define _LBS_IF_USB_H
 
diff --git a/kernel/drivers/net/wireless/marvell/libertas/mesh.c b/kernel/drivers/net/wireless/marvell/libertas/mesh.c
index 37ace5cb3..b0cb16ef8 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/mesh.c
+++ b/kernel/drivers/net/wireless/marvell/libertas/mesh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/delay.h>
diff --git a/kernel/drivers/net/wireless/marvell/libertas/mesh.h b/kernel/drivers/net/wireless/marvell/libertas/mesh.h
index 6603f341c..dfe22c91a 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/mesh.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/mesh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Contains all definitions needed for the Libertas' MESH implementation.
  */
diff --git a/kernel/drivers/net/wireless/marvell/libertas/radiotap.h b/kernel/drivers/net/wireless/marvell/libertas/radiotap.h
index b3c8ea6d6..1ed5608d3 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/radiotap.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/radiotap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <net/ieee80211_radiotap.h>
 
 struct tx_radiotap_hdr {
diff --git a/kernel/drivers/net/wireless/marvell/libertas/types.h b/kernel/drivers/net/wireless/marvell/libertas/types.h
index cf1d9b047..cd4ceb6f8 100644
--- a/kernel/drivers/net/wireless/marvell/libertas/types.h
+++ b/kernel/drivers/net/wireless/marvell/libertas/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header file contains definition for global types
  */
diff --git a/kernel/drivers/net/wireless/marvell/libertas_tf/deb_defs.h b/kernel/drivers/net/wireless/marvell/libertas_tf/deb_defs.h
index 4bd3dc5ad..37a98e228 100644
--- a/kernel/drivers/net/wireless/marvell/libertas_tf/deb_defs.h
+++ b/kernel/drivers/net/wireless/marvell/libertas_tf/deb_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
   * This header file contains global constant/enum definitions,
   * global variable declaration.
diff --git a/kernel/drivers/net/wireless/quantenna/qtnfmac/Makefile b/kernel/drivers/net/wireless/quantenna/qtnfmac/Makefile
index f236b7dc2..97f760a3d 100644
--- a/kernel/drivers/net/wireless/quantenna/qtnfmac/Makefile
+++ b/kernel/drivers/net/wireless/quantenna/qtnfmac/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2015-2016 Quantenna Communications, Inc.
 # All rights reserved.
diff --git a/kernel/drivers/net/wireless/ralink/rt2x00/Makefile b/kernel/drivers/net/wireless/ralink/rt2x00/Makefile
index 24a66015a..de030ebcd 100644
--- a/kernel/drivers/net/wireless/ralink/rt2x00/Makefile
+++ b/kernel/drivers/net/wireless/ralink/rt2x00/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rt2x00lib-y				+= rt2x00dev.o
 rt2x00lib-y				+= rt2x00mac.o
 rt2x00lib-y				+= rt2x00config.o
diff --git a/kernel/drivers/net/wireless/ray_cs.h b/kernel/drivers/net/wireless/ray_cs.h
index 524c2f02d..0609d8625 100644
--- a/kernel/drivers/net/wireless/ray_cs.h
+++ b/kernel/drivers/net/wireless/ray_cs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Raytheon wireless LAN PCMCIA card driver for Linux 
    A  PCMCIA client driver for the Raylink wireless network card
    Written by Corey Thomas
diff --git a/kernel/drivers/net/wireless/rayctl.h b/kernel/drivers/net/wireless/rayctl.h
index b21ed64e1..668444f6b 100644
--- a/kernel/drivers/net/wireless/rayctl.h
+++ b/kernel/drivers/net/wireless/rayctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RAYCTL_H_
 #define _RAYCTL_H_
 
diff --git a/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h b/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h
index e8243a44d..7948a2da1 100644
--- a/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h
+++ b/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RTL8180_H
 #define RTL8180_H
 
diff --git a/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h b/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h
index 310013a2d..de7727b74 100644
--- a/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h
+++ b/kernel/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RTL8180_RTL8225_H
 #define RTL8180_RTL8225_H
 
diff --git a/kernel/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h b/kernel/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h
index e12575e96..c493e59ee 100644
--- a/kernel/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h
+++ b/kernel/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RTL8187_RFKILL_H
 #define RTL8187_RFKILL_H
 
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/Makefile
index 84c2e826f..09c30e428 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RTLWIFI) 		+= rtlwifi.o
 rtlwifi-objs	:=		\
 		base.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
index 20582df04..d15c58737 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/btcoexist/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 btcoexist-objs :=	halbtc8192e2ant.o	\
 			halbtc8723b1ant.o	\
 			halbtc8723b2ant.o	\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
index dae4f0f19..5ea368e8e 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8188ee-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile
index 0546b7556..40f075527 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8192c-common-objs :=		\
 		main.o		\
 		dm_common.o	\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile
index 577c7adbc..bc307ccc5 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8192ce-objs :=		\
 		dm.o		\
 		hw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile
index 97437dadc..8b3921fd2 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8192cu-objs :=		\
 		dm.o		\
 		hw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile
index d0703f20d..6482d823a 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192de/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8192de-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile
index f254b9f64..12dfbeb1f 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8192ee-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile
index dfa9dbbe2..e577235f5 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192se/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8192se-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile
index e7607d2cb..d12387072 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8723ae-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile
index a841cbd55..d3ed44d80 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723be/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8723be-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile
index 73da75526..3451198b6 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723com/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8723-common-objs :=		\
 		main.o		\
 		dm_common.o	\
diff --git a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile
index 8ca406b95..81dbf4ca6 100644
--- a/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtl8821ae-objs :=		\
 		dm.o		\
 		fw.o		\
diff --git a/kernel/drivers/net/wireless/rsi/Makefile b/kernel/drivers/net/wireless/rsi/Makefile
index ebb899659..47c45908d 100644
--- a/kernel/drivers/net/wireless/rsi/Makefile
+++ b/kernel/drivers/net/wireless/rsi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rsi_91x-y			+= rsi_91x_main.o
 rsi_91x-y			+= rsi_91x_core.o
 rsi_91x-y			+= rsi_91x_mac80211.o
diff --git a/kernel/drivers/net/wireless/st/cw1200/Makefile b/kernel/drivers/net/wireless/st/cw1200/Makefile
index b086aac65..386a484e0 100644
--- a/kernel/drivers/net/wireless/st/cw1200/Makefile
+++ b/kernel/drivers/net/wireless/st/cw1200/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 cw1200_core-y := \
 		fwio.o \
 		txrx.o \
diff --git a/kernel/drivers/net/wireless/ti/Makefile b/kernel/drivers/net/wireless/ti/Makefile
index af14231ae..0530dd744 100644
--- a/kernel/drivers/net/wireless/ti/Makefile
+++ b/kernel/drivers/net/wireless/ti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WLCORE)			+= wlcore/
 obj-$(CONFIG_WL12XX)			+= wl12xx/
 obj-$(CONFIG_WL1251)			+= wl1251/
diff --git a/kernel/drivers/net/wireless/ti/wl1251/Makefile b/kernel/drivers/net/wireless/ti/wl1251/Makefile
index 58b4f935a..38da9f8e5 100644
--- a/kernel/drivers/net/wireless/ti/wl1251/Makefile
+++ b/kernel/drivers/net/wireless/ti/wl1251/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 wl1251-objs		= main.o event.o tx.o rx.o ps.o cmd.o \
 			  acx.o boot.o init.o debugfs.o io.o
 wl1251_spi-objs		+= spi.o
diff --git a/kernel/drivers/net/wireless/ti/wl1251/acx.c b/kernel/drivers/net/wireless/ti/wl1251/acx.c
index d6fbdda2c..f78fc3880 100644
--- a/kernel/drivers/net/wireless/ti/wl1251/acx.c
+++ b/kernel/drivers/net/wireless/ti/wl1251/acx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "acx.h"
 
 #include <linux/module.h>
diff --git a/kernel/drivers/net/wireless/ti/wl1251/cmd.c b/kernel/drivers/net/wireless/ti/wl1251/cmd.c
index ede31f048..9547aea01 100644
--- a/kernel/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/kernel/drivers/net/wireless/ti/wl1251/cmd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "cmd.h"
 
 #include <linux/module.h>
diff --git a/kernel/drivers/net/wireless/ti/wl1251/wl12xx_80211.h b/kernel/drivers/net/wireless/ti/wl1251/wl12xx_80211.h
index 04ed51495..7fabe702c 100644
--- a/kernel/drivers/net/wireless/ti/wl1251/wl12xx_80211.h
+++ b/kernel/drivers/net/wireless/ti/wl1251/wl12xx_80211.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __WL12XX_80211_H__
 #define __WL12XX_80211_H__
 
diff --git a/kernel/drivers/net/wireless/ti/wlcore/Makefile b/kernel/drivers/net/wireless/ti/wlcore/Makefile
index e286713b3..7d418c57b 100644
--- a/kernel/drivers/net/wireless/ti/wlcore/Makefile
+++ b/kernel/drivers/net/wireless/ti/wlcore/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 wlcore-objs		= main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
 			  boot.o init.o debugfs.o scan.o sysfs.o vendor_cmd.o
 
diff --git a/kernel/drivers/net/wireless/ti/wlcore/wl12xx_80211.h b/kernel/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
index 22b0bc98d..181be725e 100644
--- a/kernel/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
+++ b/kernel/drivers/net/wireless/ti/wlcore/wl12xx_80211.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __WL12XX_80211_H__
 #define __WL12XX_80211_H__
 
diff --git a/kernel/drivers/net/wireless/wl3501.h b/kernel/drivers/net/wireless/wl3501.h
index 3fbfd1981..efdce9ae3 100644
--- a/kernel/drivers/net/wireless/wl3501.h
+++ b/kernel/drivers/net/wireless/wl3501.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __WL3501_H__
 #define __WL3501_H__
 
diff --git a/kernel/drivers/net/wireless/zydas/zd1211rw/Makefile b/kernel/drivers/net/wireless/zydas/zd1211rw/Makefile
index 5728a918e..1647a449c 100644
--- a/kernel/drivers/net/wireless/zydas/zd1211rw/Makefile
+++ b/kernel/drivers/net/wireless/zydas/zd1211rw/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ZD1211RW) += zd1211rw.o
 
 zd1211rw-objs := zd_chip.o zd_mac.o \
diff --git a/kernel/drivers/nfc/Makefile b/kernel/drivers/nfc/Makefile
index 640b72743..5393ba59b 100644
--- a/kernel/drivers/nfc/Makefile
+++ b/kernel/drivers/nfc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for nfc devices
 #
diff --git a/kernel/drivers/nfc/mei_phy.h b/kernel/drivers/nfc/mei_phy.h
index acd3a1fc6..51bd44f5f 100644
--- a/kernel/drivers/nfc/mei_phy.h
+++ b/kernel/drivers/nfc/mei_phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LOCAL_MEI_PHY_H_
 #define __LOCAL_MEI_PHY_H_
 
diff --git a/kernel/drivers/nfc/microread/Makefile b/kernel/drivers/nfc/microread/Makefile
index 755c24cba..2f7dda265 100644
--- a/kernel/drivers/nfc/microread/Makefile
+++ b/kernel/drivers/nfc/microread/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Microread HCI based NFC driver
 #
diff --git a/kernel/drivers/nfc/nfcmrvl/Makefile b/kernel/drivers/nfc/nfcmrvl/Makefile
index fa07c7806..e74de0cb3 100644
--- a/kernel/drivers/nfc/nfcmrvl/Makefile
+++ b/kernel/drivers/nfc/nfcmrvl/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for NFCMRVL NCI based NFC driver
 #
diff --git a/kernel/drivers/nfc/st-nci/Makefile b/kernel/drivers/nfc/st-nci/Makefile
index 439b2fa86..e0310743f 100644
--- a/kernel/drivers/nfc/st-nci/Makefile
+++ b/kernel/drivers/nfc/st-nci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ST_NCI NCI based NFC driver
 #
diff --git a/kernel/drivers/nubus/nubus.c b/kernel/drivers/nubus/nubus.c
index df431e8a0..8ce69c833 100644
--- a/kernel/drivers/nubus/nubus.c
+++ b/kernel/drivers/nubus/nubus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Macintosh Nubus Interface Code
  *
diff --git a/kernel/drivers/nubus/proc.c b/kernel/drivers/nubus/proc.c
index e8f68f573..004a122ac 100644
--- a/kernel/drivers/nubus/proc.c
+++ b/kernel/drivers/nubus/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* drivers/nubus/proc.c: Proc FS interface for NuBus.
 
    By David Huggins-Daines <dhd@debian.org>
diff --git a/kernel/drivers/nvdimm/Makefile b/kernel/drivers/nvdimm/Makefile
index 909554c3f..447e0e14f 100644
--- a/kernel/drivers/nvdimm/Makefile
+++ b/kernel/drivers/nvdimm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
 obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
 obj-$(CONFIG_ND_BTT) += nd_btt.o
diff --git a/kernel/drivers/nvdimm/pmem.h b/kernel/drivers/nvdimm/pmem.h
index c5917f040..6a3cd2a10 100644
--- a/kernel/drivers/nvdimm/pmem.h
+++ b/kernel/drivers/nvdimm/pmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NVDIMM_PMEM_H__
 #define __NVDIMM_PMEM_H__
 #include <linux/badblocks.h>
diff --git a/kernel/drivers/nvme/host/Makefile b/kernel/drivers/nvme/host/Makefile
index cc0aacb4c..7b96e4588 100644
--- a/kernel/drivers/nvme/host/Makefile
+++ b/kernel/drivers/nvme/host/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_NVME_CORE)			+= nvme-core.o
 obj-$(CONFIG_BLK_DEV_NVME)		+= nvme.o
 obj-$(CONFIG_NVME_FABRICS)		+= nvme-fabrics.o
diff --git a/kernel/drivers/nvme/host/core.c b/kernel/drivers/nvme/host/core.c
index 5a14cc7f2..37f9039bb 100644
--- a/kernel/drivers/nvme/host/core.c
+++ b/kernel/drivers/nvme/host/core.c
@@ -1249,6 +1249,7 @@ static int nvme_revalidate_disk(struct gendisk *disk)
 		goto out;
 	}
 
+	__nvme_revalidate_disk(disk, id);
 	nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid);
 	if (!uuid_equal(&ns->uuid, &uuid) ||
 	    memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) ||
diff --git a/kernel/drivers/nvme/host/rdma.c b/kernel/drivers/nvme/host/rdma.c
index 87bac27ec..0ebb539f3 100644
--- a/kernel/drivers/nvme/host/rdma.c
+++ b/kernel/drivers/nvme/host/rdma.c
@@ -1614,12 +1614,15 @@ nvme_rdma_queue_is_ready(struct nvme_rdma_queue *queue, struct request *rq)
 			/*
 			 * reconnecting state means transport disruption, which
 			 * can take a long time and even might fail permanently,
-			 * so we can't let incoming I/O be requeued forever.
-			 * fail it fast to allow upper layers a chance to
-			 * failover.
+			 * fail fast to give upper layers a chance to failover.
+			 * deleting state means that the ctrl will never accept
+			 * commands again, fail it permanently.
 			 */
-			if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING)
+			if (queue->ctrl->ctrl.state == NVME_CTRL_RECONNECTING ||
+			    queue->ctrl->ctrl.state == NVME_CTRL_DELETING) {
+				nvme_req(rq)->status = NVME_SC_ABORT_REQ;
 				return BLK_STS_IOERR;
+			}
 			return BLK_STS_RESOURCE; /* try again later */
 		}
 	}
diff --git a/kernel/drivers/nvme/target/Makefile b/kernel/drivers/nvme/target/Makefile
index fecc14f53..488250189 100644
--- a/kernel/drivers/nvme/target/Makefile
+++ b/kernel/drivers/nvme/target/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_NVME_TARGET)		+= nvmet.o
 obj-$(CONFIG_NVME_TARGET_LOOP)		+= nvme-loop.o
diff --git a/kernel/drivers/nvmem/Makefile b/kernel/drivers/nvmem/Makefile
index 173140658..6f7a77fb3 100644
--- a/kernel/drivers/nvmem/Makefile
+++ b/kernel/drivers/nvmem/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for nvmem drivers.
 #
diff --git a/kernel/drivers/of/Makefile b/kernel/drivers/of/Makefile
index 97dc01c81..8f19d342e 100644
--- a/kernel/drivers/of/Makefile
+++ b/kernel/drivers/of/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y = base.o device.o platform.o property.o
 obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
 obj-$(CONFIG_OF_FLATTREE) += fdt.o
diff --git a/kernel/drivers/of/unittest-data/Makefile b/kernel/drivers/of/unittest-data/Makefile
index 2d135fba9..3031fc2f1 100644
--- a/kernel/drivers/of/unittest-data/Makefile
+++ b/kernel/drivers/of/unittest-data/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += testcases.dtb.o
 
 targets += testcases.dtb testcases.dtb.S
diff --git a/kernel/drivers/of/unittest-data/overlay.dts b/kernel/drivers/of/unittest-data/overlay.dts
index 9e791fcf0..ab5e89b5e 100644
--- a/kernel/drivers/of/unittest-data/overlay.dts
+++ b/kernel/drivers/of/unittest-data/overlay.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /plugin/;
 
diff --git a/kernel/drivers/of/unittest-data/overlay_bad_phandle.dts b/kernel/drivers/of/unittest-data/overlay_bad_phandle.dts
index 270ee885a..4d5b99723 100644
--- a/kernel/drivers/of/unittest-data/overlay_bad_phandle.dts
+++ b/kernel/drivers/of/unittest-data/overlay_bad_phandle.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /plugin/;
 
diff --git a/kernel/drivers/of/unittest-data/overlay_base.dts b/kernel/drivers/of/unittest-data/overlay_base.dts
index 453d0bd83..820b79ca3 100644
--- a/kernel/drivers/of/unittest-data/overlay_base.dts
+++ b/kernel/drivers/of/unittest-data/overlay_base.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 /plugin/;
 
diff --git a/kernel/drivers/of/unittest-data/testcases.dts b/kernel/drivers/of/unittest-data/testcases.dts
index 12f7c3d64..ce49463d9 100644
--- a/kernel/drivers/of/unittest-data/testcases.dts
+++ b/kernel/drivers/of/unittest-data/testcases.dts
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 / {
 	testcase-data {
diff --git a/kernel/drivers/of/unittest-data/tests-interrupts.dtsi b/kernel/drivers/of/unittest-data/tests-interrupts.dtsi
index da4695f60..ec175e800 100644
--- a/kernel/drivers/of/unittest-data/tests-interrupts.dtsi
+++ b/kernel/drivers/of/unittest-data/tests-interrupts.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	testcase-data {
diff --git a/kernel/drivers/of/unittest-data/tests-match.dtsi b/kernel/drivers/of/unittest-data/tests-match.dtsi
index c9e541129..1fd3b2131 100644
--- a/kernel/drivers/of/unittest-data/tests-match.dtsi
+++ b/kernel/drivers/of/unittest-data/tests-match.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	testcase-data {
diff --git a/kernel/drivers/of/unittest-data/tests-overlay.dtsi b/kernel/drivers/of/unittest-data/tests-overlay.dtsi
index 02ba56c20..7b8001ab9 100644
--- a/kernel/drivers/of/unittest-data/tests-overlay.dtsi
+++ b/kernel/drivers/of/unittest-data/tests-overlay.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	testcase-data {
diff --git a/kernel/drivers/of/unittest-data/tests-phandle.dtsi b/kernel/drivers/of/unittest-data/tests-phandle.dtsi
index 5b1527e8a..3c2f09e56 100644
--- a/kernel/drivers/of/unittest-data/tests-phandle.dtsi
+++ b/kernel/drivers/of/unittest-data/tests-phandle.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	aliases {
diff --git a/kernel/drivers/of/unittest-data/tests-platform.dtsi b/kernel/drivers/of/unittest-data/tests-platform.dtsi
index a0c93822a..fa3961107 100644
--- a/kernel/drivers/of/unittest-data/tests-platform.dtsi
+++ b/kernel/drivers/of/unittest-data/tests-platform.dtsi
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 / {
 	testcase-data {
diff --git a/kernel/drivers/of/unittest.c b/kernel/drivers/of/unittest.c
index 29a35cb1d..168ef0bba 100644
--- a/kernel/drivers/of/unittest.c
+++ b/kernel/drivers/of/unittest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Self tests for device tree subsystem
  */
diff --git a/kernel/drivers/oprofile/nmi_timer_int.c b/kernel/drivers/oprofile/nmi_timer_int.c
index e65a576e4..f343bd966 100644
--- a/kernel/drivers/oprofile/nmi_timer_int.c
+++ b/kernel/drivers/oprofile/nmi_timer_int.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * @file nmi_timer_int.c
  *
diff --git a/kernel/drivers/oprofile/oprofile_perf.c b/kernel/drivers/oprofile/oprofile_perf.c
index d5b2732b1..4b150a754 100644
--- a/kernel/drivers/oprofile/oprofile_perf.c
+++ b/kernel/drivers/oprofile/oprofile_perf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2010 ARM Ltd.
  * Copyright 2012 Advanced Micro Devices, Inc., Robert Richter
diff --git a/kernel/drivers/parisc/Makefile b/kernel/drivers/parisc/Makefile
index f95cab571..3cd5e6cb8 100644
--- a/kernel/drivers/parisc/Makefile
+++ b/kernel/drivers/parisc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for most of the non-PCI devices in PA-RISC machines
 #
diff --git a/kernel/drivers/parisc/iommu-helpers.h b/kernel/drivers/parisc/iommu-helpers.h
index e56f1569f..0905be256 100644
--- a/kernel/drivers/parisc/iommu-helpers.h
+++ b/kernel/drivers/parisc/iommu-helpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/prefetch.h>
 
 /**
diff --git a/kernel/drivers/parport/Makefile b/kernel/drivers/parport/Makefile
index 696b8d4ca..6fa41f817 100644
--- a/kernel/drivers/parport/Makefile
+++ b/kernel/drivers/parport/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel Parallel port device drivers.
 #
diff --git a/kernel/drivers/parport/ieee1284_ops.c b/kernel/drivers/parport/ieee1284_ops.c
index a959224d0..5d41dda6d 100644
--- a/kernel/drivers/parport/ieee1284_ops.c
+++ b/kernel/drivers/parport/ieee1284_ops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* IEEE-1284 operations for parport.
  *
  * This file is for generic IEEE 1284 operations.  The idea is that
diff --git a/kernel/drivers/parport/multiface.h b/kernel/drivers/parport/multiface.h
index 56769dd5d..6513a44b9 100644
--- a/kernel/drivers/parport/multiface.h
+++ b/kernel/drivers/parport/multiface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MULTIFACE_H_
 #define _MULTIFACE_H_
 
diff --git a/kernel/drivers/parport/probe.c b/kernel/drivers/parport/probe.c
index 4d1d6eaf3..e035174ba 100644
--- a/kernel/drivers/parport/probe.c
+++ b/kernel/drivers/parport/probe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Parallel port device probing code
  *
diff --git a/kernel/drivers/parport/procfs.c b/kernel/drivers/parport/procfs.c
index 8ee44a104..48804049d 100644
--- a/kernel/drivers/parport/procfs.c
+++ b/kernel/drivers/parport/procfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Sysctl interface for parport devices.
  * 
  * Authors: David Campbell
diff --git a/kernel/drivers/pci/Makefile b/kernel/drivers/pci/Makefile
index 66a21acad..80adbdbce 100644
--- a/kernel/drivers/pci/Makefile
+++ b/kernel/drivers/pci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the PCI bus specific drivers.
 #
diff --git a/kernel/drivers/pci/dwc/Makefile b/kernel/drivers/pci/dwc/Makefile
index c61be9738..e73661182 100644
--- a/kernel/drivers/pci/dwc/Makefile
+++ b/kernel/drivers/pci/dwc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PCIE_DW) += pcie-designware.o
 obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o
 obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o
diff --git a/kernel/drivers/pci/host/Makefile b/kernel/drivers/pci/host/Makefile
index 12382785e..95f5b80ca 100644
--- a/kernel/drivers/pci/host/Makefile
+++ b/kernel/drivers/pci/host/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PCI_FTPCI100) += pci-ftpci100.o
 obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o
 obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
diff --git a/kernel/drivers/pci/host/pci-ftpci100.c b/kernel/drivers/pci/host/pci-ftpci100.c
index 96028f01b..4ea7d2ebc 100644
--- a/kernel/drivers/pci/host/pci-ftpci100.c
+++ b/kernel/drivers/pci/host/pci-ftpci100.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Support for Faraday Technology FTPC100 PCI Controller
  *
diff --git a/kernel/drivers/pci/host/pcie-tango.c b/kernel/drivers/pci/host/pcie-tango.c
index 6bbb81f06..95049de41 100644
--- a/kernel/drivers/pci/host/pcie-tango.c
+++ b/kernel/drivers/pci/host/pcie-tango.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/pci-ecam.h>
 #include <linux/delay.h>
 #include <linux/of.h>
diff --git a/kernel/drivers/pci/hotplug/Makefile b/kernel/drivers/pci/hotplug/Makefile
index e33cdda45..7e3331603 100644
--- a/kernel/drivers/pci/hotplug/Makefile
+++ b/kernel/drivers/pci/hotplug/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux kernel pci hotplug controller drivers.
 #
diff --git a/kernel/drivers/pci/htirq.c b/kernel/drivers/pci/htirq.c
index 7eb4109a3..bb88c26f5 100644
--- a/kernel/drivers/pci/htirq.c
+++ b/kernel/drivers/pci/htirq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * File:	htirq.c
  * Purpose:	Hypertransport Interrupt Capability
diff --git a/kernel/drivers/pci/irq.c b/kernel/drivers/pci/irq.c
index 83d30953c..10929cd43 100644
--- a/kernel/drivers/pci/irq.c
+++ b/kernel/drivers/pci/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI IRQ handling code
  *
diff --git a/kernel/drivers/pci/pci-label.c b/kernel/drivers/pci/pci-label.c
index 7e9e79575..a961a71d9 100644
--- a/kernel/drivers/pci/pci-label.c
+++ b/kernel/drivers/pci/pci-label.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Purpose: Export the firmware instance and label associated with
  * a pci device to sysfs
diff --git a/kernel/drivers/pci/pci-sysfs.c b/kernel/drivers/pci/pci-sysfs.c
index 8e075ea27..00fa4278c 100644
--- a/kernel/drivers/pci/pci-sysfs.c
+++ b/kernel/drivers/pci/pci-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pci/pci-sysfs.c
  *
diff --git a/kernel/drivers/pci/pci.h b/kernel/drivers/pci/pci.h
index a6560c9ba..fdb02c1f9 100644
--- a/kernel/drivers/pci/pci.h
+++ b/kernel/drivers/pci/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DRIVERS_PCI_H
 #define DRIVERS_PCI_H
 
diff --git a/kernel/drivers/pci/pcie/Makefile b/kernel/drivers/pci/pcie/Makefile
index 36e35ea8f..223e4c34c 100644
--- a/kernel/drivers/pci/pcie/Makefile
+++ b/kernel/drivers/pci/pcie/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for PCI-Express PORT Driver
 #
diff --git a/kernel/drivers/pci/pcie/aer/Makefile b/kernel/drivers/pci/pcie/aer/Makefile
index 2cba67510..09bd89087 100644
--- a/kernel/drivers/pci/pcie/aer/Makefile
+++ b/kernel/drivers/pci/pcie/aer/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for PCI-Express Root Port Advanced Error Reporting Driver
 #
diff --git a/kernel/drivers/pci/pcie/aer/aerdrv.h b/kernel/drivers/pci/pcie/aer/aerdrv.h
index d51e4a57b..5449e5ce1 100644
--- a/kernel/drivers/pci/pcie/aer/aerdrv.h
+++ b/kernel/drivers/pci/pcie/aer/aerdrv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2006 Intel Corp.
  *	Tom Long Nguyen (tom.l.nguyen@intel.com)
diff --git a/kernel/drivers/pci/pcie/aer/aerdrv_acpi.c b/kernel/drivers/pci/pcie/aer/aerdrv_acpi.c
index 01906576a..b2019440e 100644
--- a/kernel/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/kernel/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Access ACPI _OSC method
  *
diff --git a/kernel/drivers/pci/pcie/aspm.c b/kernel/drivers/pci/pcie/aspm.c
index 1dfa10cc5..83e4a892b 100644
--- a/kernel/drivers/pci/pcie/aspm.c
+++ b/kernel/drivers/pci/pcie/aspm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * File:	drivers/pci/pcie/aspm.c
  * Enabling PCIe link L0s/L1 state and Clock Power Management
diff --git a/kernel/drivers/pci/pcie/portdrv.h b/kernel/drivers/pci/pcie/portdrv.h
index 4334fd5d7..a854bc569 100644
--- a/kernel/drivers/pci/pcie/portdrv.h
+++ b/kernel/drivers/pci/pcie/portdrv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	portdrv.h
  * Purpose:	PCI Express Port Bus Driver's Internal Data Structures
diff --git a/kernel/drivers/pci/pcie/portdrv_core.c b/kernel/drivers/pci/pcie/portdrv_core.c
index 313a21df1..ebc9d45bd 100644
--- a/kernel/drivers/pci/pcie/portdrv_core.c
+++ b/kernel/drivers/pci/pcie/portdrv_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * File:	portdrv_core.c
  * Purpose:	PCI Express Port Bus Driver's Core Functions
diff --git a/kernel/drivers/pci/pcie/portdrv_pci.c b/kernel/drivers/pci/pcie/portdrv_pci.c
index 083276e03..68c389c7b 100644
--- a/kernel/drivers/pci/pcie/portdrv_pci.c
+++ b/kernel/drivers/pci/pcie/portdrv_pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * File:	portdrv_pci.c
  * Purpose:	PCI Express Port Bus Driver
diff --git a/kernel/drivers/pci/proc.c b/kernel/drivers/pci/proc.c
index 098360d7f..58a662e3c 100644
--- a/kernel/drivers/pci/proc.c
+++ b/kernel/drivers/pci/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Procfs interface for the PCI bus.
  *
diff --git a/kernel/drivers/pci/quirks.c b/kernel/drivers/pci/quirks.c
index a4d33619a..911b3b65c 100644
--- a/kernel/drivers/pci/quirks.c
+++ b/kernel/drivers/pci/quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  This file contains work-arounds for many known PCI hardware
  *  bugs.  Devices present only on certain architectures (host
diff --git a/kernel/drivers/pci/setup-res.c b/kernel/drivers/pci/setup-res.c
index e576e1a8d..c039149ca 100644
--- a/kernel/drivers/pci/setup-res.c
+++ b/kernel/drivers/pci/setup-res.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	drivers/pci/setup-res.c
  *
diff --git a/kernel/drivers/pci/syscall.c b/kernel/drivers/pci/syscall.c
index 9bf993e1f..83efa001c 100644
--- a/kernel/drivers/pci/syscall.c
+++ b/kernel/drivers/pci/syscall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	pci_syscall.c
  *
diff --git a/kernel/drivers/pcmcia/Makefile b/kernel/drivers/pcmcia/Makefile
index 27e94b30c..e7dae16b9 100644
--- a/kernel/drivers/pcmcia/Makefile
+++ b/kernel/drivers/pcmcia/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
 #
diff --git a/kernel/drivers/pcmcia/bcm63xx_pcmcia.h b/kernel/drivers/pcmcia/bcm63xx_pcmcia.h
index ed957399d..2122c59a1 100644
--- a/kernel/drivers/pcmcia/bcm63xx_pcmcia.h
+++ b/kernel/drivers/pcmcia/bcm63xx_pcmcia.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BCM63XX_PCMCIA_H_
 #define BCM63XX_PCMCIA_H_
 
diff --git a/kernel/drivers/pcmcia/i82092aa.h b/kernel/drivers/pcmcia/i82092aa.h
index 8836d393a..fabe08c3e 100644
--- a/kernel/drivers/pcmcia/i82092aa.h
+++ b/kernel/drivers/pcmcia/i82092aa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INCLUDE_GUARD_i82092aa_H_
 #define _INCLUDE_GUARD_i82092aa_H_
 
diff --git a/kernel/drivers/pcmcia/m32r_cfc.h b/kernel/drivers/pcmcia/m32r_cfc.h
index f558e1adf..05fec9861 100644
--- a/kernel/drivers/pcmcia/m32r_cfc.h
+++ b/kernel/drivers/pcmcia/m32r_cfc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2001 by Hiroyuki Kondo
  */
diff --git a/kernel/drivers/pcmcia/m32r_pcc.h b/kernel/drivers/pcmcia/m32r_pcc.h
index f95c58563..d99ad3864 100644
--- a/kernel/drivers/pcmcia/m32r_pcc.h
+++ b/kernel/drivers/pcmcia/m32r_pcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2001 by Hiroyuki Kondo
  */
diff --git a/kernel/drivers/pcmcia/pd6729.h b/kernel/drivers/pcmcia/pd6729.h
index c8e84bdec..605cc2ccf 100644
--- a/kernel/drivers/pcmcia/pd6729.h
+++ b/kernel/drivers/pcmcia/pd6729.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INCLUDE_GUARD_PD6729_H_
 #define _INCLUDE_GUARD_PD6729_H_
 
diff --git a/kernel/drivers/pcmcia/sa1100_assabet.c b/kernel/drivers/pcmcia/sa1100_assabet.c
index 71ace6910..78ad2bba7 100644
--- a/kernel/drivers/pcmcia/sa1100_assabet.c
+++ b/kernel/drivers/pcmcia/sa1100_assabet.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pcmcia/sa1100_assabet.c
  *
diff --git a/kernel/drivers/pcmcia/sa1100_cerf.c b/kernel/drivers/pcmcia/sa1100_cerf.c
index c3f67363f..2a54081d1 100644
--- a/kernel/drivers/pcmcia/sa1100_cerf.c
+++ b/kernel/drivers/pcmcia/sa1100_cerf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pcmcia/sa1100_cerf.c
  *
diff --git a/kernel/drivers/pcmcia/sa1100_generic.h b/kernel/drivers/pcmcia/sa1100_generic.h
index adb08dbc7..a5f1f1dd6 100644
--- a/kernel/drivers/pcmcia/sa1100_generic.h
+++ b/kernel/drivers/pcmcia/sa1100_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "soc_common.h"
 #include "sa11xx_base.h"
 
diff --git a/kernel/drivers/pcmcia/sa1100_h3600.c b/kernel/drivers/pcmcia/sa1100_h3600.c
index 431d8b07c..aebf9a66f 100644
--- a/kernel/drivers/pcmcia/sa1100_h3600.c
+++ b/kernel/drivers/pcmcia/sa1100_h3600.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pcmcia/sa1100_h3600.c
  *
diff --git a/kernel/drivers/pcmcia/sa1100_shannon.c b/kernel/drivers/pcmcia/sa1100_shannon.c
index b07a2dc32..0e52a5759 100644
--- a/kernel/drivers/pcmcia/sa1100_shannon.c
+++ b/kernel/drivers/pcmcia/sa1100_shannon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pcmcia/sa1100_shannon.c
  *
diff --git a/kernel/drivers/pcmcia/sa1100_simpad.c b/kernel/drivers/pcmcia/sa1100_simpad.c
index 73fd37968..7ce65bb23 100644
--- a/kernel/drivers/pcmcia/sa1100_simpad.c
+++ b/kernel/drivers/pcmcia/sa1100_simpad.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pcmcia/sa1100_simpad.c
  *
diff --git a/kernel/drivers/pcmcia/sa1111_generic.h b/kernel/drivers/pcmcia/sa1111_generic.h
index e74ecfdc1..c01571d46 100644
--- a/kernel/drivers/pcmcia/sa1111_generic.h
+++ b/kernel/drivers/pcmcia/sa1111_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "soc_common.h"
 #include "sa11xx_base.h"
 
diff --git a/kernel/drivers/pcmcia/sa1111_jornada720.c b/kernel/drivers/pcmcia/sa1111_jornada720.c
index 480a3ede2..3d4ca87ca 100644
--- a/kernel/drivers/pcmcia/sa1111_jornada720.c
+++ b/kernel/drivers/pcmcia/sa1111_jornada720.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/pcmcia/sa1100_jornada720.c
  *
diff --git a/kernel/drivers/pcmcia/sa1111_neponset.c b/kernel/drivers/pcmcia/sa1111_neponset.c
index 019c395eb..0ccf05a28 100644
--- a/kernel/drivers/pcmcia/sa1111_neponset.c
+++ b/kernel/drivers/pcmcia/sa1111_neponset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/drivers/pcmcia/sa1100_neponset.c
  *
diff --git a/kernel/drivers/pcmcia/soc_common.h b/kernel/drivers/pcmcia/soc_common.h
index 3f3625805..b7f993f1b 100644
--- a/kernel/drivers/pcmcia/soc_common.h
+++ b/kernel/drivers/pcmcia/soc_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/drivers/pcmcia/soc_common.h
  *
diff --git a/kernel/drivers/pcmcia/yenta_socket.h b/kernel/drivers/pcmcia/yenta_socket.h
index 4e75e9e25..efeed19e2 100644
--- a/kernel/drivers/pcmcia/yenta_socket.h
+++ b/kernel/drivers/pcmcia/yenta_socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __YENTA_H
 #define __YENTA_H
 
diff --git a/kernel/drivers/perf/Makefile b/kernel/drivers/perf/Makefile
index 6420bd439..9402dc8ff 100644
--- a/kernel/drivers/perf/Makefile
+++ b/kernel/drivers/perf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o
 obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o
 obj-$(CONFIG_QCOM_L2_PMU)	+= qcom_l2_pmu.o
diff --git a/kernel/drivers/perf/arm_pmu_platform.c b/kernel/drivers/perf/arm_pmu_platform.c
index 4eafa7a42..4428852e1 100644
--- a/kernel/drivers/perf/arm_pmu_platform.c
+++ b/kernel/drivers/perf/arm_pmu_platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * platform_device probing code for ARM performance counters.
  *
diff --git a/kernel/drivers/phy/Makefile b/kernel/drivers/phy/Makefile
index 3a52dcb09..84e3bd9c5 100644
--- a/kernel/drivers/phy/Makefile
+++ b/kernel/drivers/phy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the phy drivers.
 #
diff --git a/kernel/drivers/phy/broadcom/Makefile b/kernel/drivers/phy/broadcom/Makefile
index 4eb82ec8d..fdd9ec8fd 100644
--- a/kernel/drivers/phy/broadcom/Makefile
+++ b/kernel/drivers/phy/broadcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_CYGNUS_PCIE)		+= phy-bcm-cygnus-pcie.o
 obj-$(CONFIG_BCM_KONA_USB2_PHY)		+= phy-bcm-kona-usb2.o
 obj-$(CONFIG_PHY_BCM_NS_USB2)		+= phy-bcm-ns-usb2.o
diff --git a/kernel/drivers/phy/marvell/Makefile b/kernel/drivers/phy/marvell/Makefile
index 0cf6a7cba..5c3ec5d10 100644
--- a/kernel/drivers/phy/marvell/Makefile
+++ b/kernel/drivers/phy/marvell/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY)	+= phy-armada375-usb2.o
 obj-$(CONFIG_PHY_BERLIN_SATA)		+= phy-berlin-sata.o
 obj-$(CONFIG_PHY_BERLIN_USB)		+= phy-berlin-usb.o
diff --git a/kernel/drivers/phy/qualcomm/Makefile b/kernel/drivers/phy/qualcomm/Makefile
index 2e183d769..9abb78997 100644
--- a/kernel/drivers/phy/qualcomm/Makefile
+++ b/kernel/drivers/phy/qualcomm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)	+= phy-qcom-apq8064-sata.o
 obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)	+= phy-qcom-ipq806x-sata.o
 obj-$(CONFIG_PHY_QCOM_QMP)		+= phy-qcom-qmp.o
diff --git a/kernel/drivers/phy/rockchip/Makefile b/kernel/drivers/phy/rockchip/Makefile
index bd0acdf38..7f149d989 100644
--- a/kernel/drivers/phy/rockchip/Makefile
+++ b/kernel/drivers/phy/rockchip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_ROCKCHIP_DP)		+= phy-rockchip-dp.o
 obj-$(CONFIG_PHY_ROCKCHIP_EMMC)		+= phy-rockchip-emmc.o
 obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2)	+= phy-rockchip-inno-usb2.o
diff --git a/kernel/drivers/phy/samsung/Makefile b/kernel/drivers/phy/samsung/Makefile
index 20d7f2424..db9b1aa0d 100644
--- a/kernel/drivers/phy/samsung/Makefile
+++ b/kernel/drivers/phy/samsung/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)	+= phy-exynos-dp-video.o
 obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)	+= phy-exynos-mipi-video.o
 obj-$(CONFIG_PHY_EXYNOS_PCIE)		+= phy-exynos-pcie.o
diff --git a/kernel/drivers/phy/ti/Makefile b/kernel/drivers/phy/ti/Makefile
index 0cc3a1a55..9f361756e 100644
--- a/kernel/drivers/phy/ti/Makefile
+++ b/kernel/drivers/phy/ti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHY_DA8XX_USB)		+= phy-da8xx-usb.o
 obj-$(CONFIG_PHY_DM816X_USB)		+= phy-dm816x-usb.o
 obj-$(CONFIG_OMAP_CONTROL_PHY)		+= phy-omap-control.o
diff --git a/kernel/drivers/pinctrl/Makefile b/kernel/drivers/pinctrl/Makefile
index c16e27900..d0d4844f8 100644
--- a/kernel/drivers/pinctrl/Makefile
+++ b/kernel/drivers/pinctrl/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # generic pinmux support
 
 subdir-ccflags-$(CONFIG_DEBUG_PINCTRL)	+= -DDEBUG
diff --git a/kernel/drivers/pinctrl/bcm/Makefile b/kernel/drivers/pinctrl/bcm/Makefile
index 2a65111f3..80ceb9dae 100644
--- a/kernel/drivers/pinctrl/bcm/Makefile
+++ b/kernel/drivers/pinctrl/bcm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Broadcom pinctrl support
 
 obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinctrl-bcm281xx.o
diff --git a/kernel/drivers/pinctrl/freescale/Makefile b/kernel/drivers/pinctrl/freescale/Makefile
index 525a5ff5d..19bb9a55a 100644
--- a/kernel/drivers/pinctrl/freescale/Makefile
+++ b/kernel/drivers/pinctrl/freescale/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Freescale pin control drivers
 obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o
 obj-$(CONFIG_PINCTRL_IMX1_CORE)	+= pinctrl-imx1-core.o
diff --git a/kernel/drivers/pinctrl/intel/Makefile b/kernel/drivers/pinctrl/intel/Makefile
index c12874da5..624d367ca 100644
--- a/kernel/drivers/pinctrl/intel/Makefile
+++ b/kernel/drivers/pinctrl/intel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Intel pin control drivers
 
 obj-$(CONFIG_PINCTRL_BAYTRAIL)		+= pinctrl-baytrail.o
diff --git a/kernel/drivers/pinctrl/mediatek/Makefile b/kernel/drivers/pinctrl/mediatek/Makefile
index e59c613d4..10d90140a 100644
--- a/kernel/drivers/pinctrl/mediatek/Makefile
+++ b/kernel/drivers/pinctrl/mediatek/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Core
 obj-y				+= pinctrl-mtk-common.o
 
diff --git a/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h b/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
index 4eb98ddb4..17df4cfbd 100644
--- a/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
+++ b/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt6397.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PINCTRL_MTK_MT6397_H
 #define __PINCTRL_MTK_MT6397_H
 
diff --git a/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h b/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h
index 212559c14..850483d7d 100644
--- a/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h
+++ b/kernel/drivers/pinctrl/mediatek/pinctrl-mtk-mt8127.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PINCTRL_MTK_MT8127_H
 #define __PINCTRL_MTK_MT8127_H
 
diff --git a/kernel/drivers/pinctrl/mvebu/Makefile b/kernel/drivers/pinctrl/mvebu/Makefile
index 5b03fd55e..cd082dca4 100644
--- a/kernel/drivers/pinctrl/mvebu/Makefile
+++ b/kernel/drivers/pinctrl/mvebu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PINCTRL_MVEBU)	+= pinctrl-mvebu.o
 obj-$(CONFIG_PINCTRL_DOVE)	+= pinctrl-dove.o
 obj-$(CONFIG_PINCTRL_KIRKWOOD)	+= pinctrl-kirkwood.o
diff --git a/kernel/drivers/pinctrl/nomadik/Makefile b/kernel/drivers/pinctrl/nomadik/Makefile
index 30b27f18c..bf8b7517e 100644
--- a/kernel/drivers/pinctrl/nomadik/Makefile
+++ b/kernel/drivers/pinctrl/nomadik/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Nomadik family pin control drivers
 obj-$(CONFIG_PINCTRL_ABX500)	+= pinctrl-abx500.o
 obj-$(CONFIG_PINCTRL_AB8500)	+= pinctrl-ab8500.o
diff --git a/kernel/drivers/pinctrl/nomadik/pinctrl-abx500.h b/kernel/drivers/pinctrl/nomadik/pinctrl-abx500.h
index 2beef3bfe..43f9b718a 100644
--- a/kernel/drivers/pinctrl/nomadik/pinctrl-abx500.h
+++ b/kernel/drivers/pinctrl/nomadik/pinctrl-abx500.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PINCTRL_PINCTRL_ABx500_H
 #define PINCTRL_PINCTRL_ABx500_H
 
diff --git a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c
index af4814479..726c0b550 100644
--- a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c
+++ b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinctrl.h>
 #include "pinctrl-nomadik.h"
diff --git a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c
index 2860eafd1..ae3ac7b79 100644
--- a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c
+++ b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinctrl.h>
 #include "pinctrl-nomadik.h"
diff --git a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c
index e852048c4..7e814764d 100644
--- a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c
+++ b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinctrl.h>
 #include "pinctrl-nomadik.h"
diff --git a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik.h b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik.h
index 30bba2a75..ae0bac066 100644
--- a/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik.h
+++ b/kernel/drivers/pinctrl/nomadik/pinctrl-nomadik.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PINCTRL_PINCTRL_NOMADIK_H
 #define PINCTRL_PINCTRL_NOMADIK_H
 
diff --git a/kernel/drivers/pinctrl/pinctrl-coh901.h b/kernel/drivers/pinctrl/pinctrl-coh901.h
index 872942225..ba2678665 100644
--- a/kernel/drivers/pinctrl/pinctrl-coh901.h
+++ b/kernel/drivers/pinctrl/pinctrl-coh901.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 int u300_gpio_config_get(struct gpio_chip *chip,
 			 unsigned offset,
 			 unsigned long *config);
diff --git a/kernel/drivers/pinctrl/qcom/Makefile b/kernel/drivers/pinctrl/qcom/Makefile
index 06c8b2ace..a1db345de 100644
--- a/kernel/drivers/pinctrl/qcom/Makefile
+++ b/kernel/drivers/pinctrl/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Qualcomm pin control drivers
 obj-$(CONFIG_PINCTRL_MSM)	+= pinctrl-msm.o
 obj-$(CONFIG_PINCTRL_APQ8064)	+= pinctrl-apq8064.o
diff --git a/kernel/drivers/pinctrl/samsung/Makefile b/kernel/drivers/pinctrl/samsung/Makefile
index 595995851..df426561d 100644
--- a/kernel/drivers/pinctrl/samsung/Makefile
+++ b/kernel/drivers/pinctrl/samsung/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Samsung pin control drivers
 
 obj-$(CONFIG_PINCTRL_SAMSUNG)	+= pinctrl-samsung.o
diff --git a/kernel/drivers/pinctrl/sh-pfc/Makefile b/kernel/drivers/pinctrl/sh-pfc/Makefile
index 1d4f05a96..a7903904b 100644
--- a/kernel/drivers/pinctrl/sh-pfc/Makefile
+++ b/kernel/drivers/pinctrl/sh-pfc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PINCTRL_SH_PFC)	+= core.o pinctrl.o
 obj-$(CONFIG_PINCTRL_SH_PFC_GPIO)	+= gpio.o
 obj-$(CONFIG_PINCTRL_PFC_EMEV2)	+= pfc-emev2.o
diff --git a/kernel/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/kernel/drivers/pinctrl/sh-pfc/pfc-sh7722.c
index 29c69133b..0e733bffd 100644
--- a/kernel/drivers/pinctrl/sh-pfc/pfc-sh7722.c
+++ b/kernel/drivers/pinctrl/sh-pfc/pfc-sh7722.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
diff --git a/kernel/drivers/pinctrl/spear/Makefile b/kernel/drivers/pinctrl/spear/Makefile
index 37b8412ac..da52d1755 100644
--- a/kernel/drivers/pinctrl/spear/Makefile
+++ b/kernel/drivers/pinctrl/spear/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # SPEAr pinmux support
 
 obj-$(CONFIG_PINCTRL_SPEAR_PLGPIO)	+= pinctrl-plgpio.o
diff --git a/kernel/drivers/pinctrl/stm32/Makefile b/kernel/drivers/pinctrl/stm32/Makefile
index 5f379f515..d13ca3573 100644
--- a/kernel/drivers/pinctrl/stm32/Makefile
+++ b/kernel/drivers/pinctrl/stm32/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Core
 obj-$(CONFIG_PINCTRL_STM32) += pinctrl-stm32.o
 
diff --git a/kernel/drivers/pinctrl/sunxi/Makefile b/kernel/drivers/pinctrl/sunxi/Makefile
index dc6c9619e..12a752e83 100644
--- a/kernel/drivers/pinctrl/sunxi/Makefile
+++ b/kernel/drivers/pinctrl/sunxi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Core
 obj-y					+= pinctrl-sunxi.o
 
diff --git a/kernel/drivers/pinctrl/tegra/Makefile b/kernel/drivers/pinctrl/tegra/Makefile
index d9ea2be69..bbcb043c3 100644
--- a/kernel/drivers/pinctrl/tegra/Makefile
+++ b/kernel/drivers/pinctrl/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PINCTRL_TEGRA)		+= pinctrl-tegra.o
 obj-$(CONFIG_PINCTRL_TEGRA20)		+= pinctrl-tegra20.o
 obj-$(CONFIG_PINCTRL_TEGRA30)		+= pinctrl-tegra30.o
diff --git a/kernel/drivers/pinctrl/uniphier/Makefile b/kernel/drivers/pinctrl/uniphier/Makefile
index d592ff77d..ec66c86e2 100644
--- a/kernel/drivers/pinctrl/uniphier/Makefile
+++ b/kernel/drivers/pinctrl/uniphier/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y					+= pinctrl-uniphier-core.o
 
 obj-$(CONFIG_PINCTRL_UNIPHIER_LD4)	+= pinctrl-uniphier-ld4.o
diff --git a/kernel/drivers/pinctrl/vt8500/Makefile b/kernel/drivers/pinctrl/vt8500/Makefile
index 24ec45dd0..c6a5c3b14 100644
--- a/kernel/drivers/pinctrl/vt8500/Makefile
+++ b/kernel/drivers/pinctrl/vt8500/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # VIA/Wondermedia pinctrl support
 
 obj-$(CONFIG_PINCTRL_WMT)	+= pinctrl-wmt.o
diff --git a/kernel/drivers/platform/Makefile b/kernel/drivers/platform/Makefile
index ca2692510..d3a663026 100644
--- a/kernel/drivers/platform/Makefile
+++ b/kernel/drivers/platform/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for linux/drivers/platform
 #
diff --git a/kernel/drivers/platform/chrome/Makefile b/kernel/drivers/platform/chrome/Makefile
index 66c345ca3..a077b1f02 100644
--- a/kernel/drivers/platform/chrome/Makefile
+++ b/kernel/drivers/platform/chrome/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_CHROMEOS_LAPTOP)		+= chromeos_laptop.o
 obj-$(CONFIG_CHROMEOS_PSTORE)		+= chromeos_pstore.o
diff --git a/kernel/drivers/platform/x86/Makefile b/kernel/drivers/platform/x86/Makefile
index 91cec1751..f9e3ae683 100644
--- a/kernel/drivers/platform/x86/Makefile
+++ b/kernel/drivers/platform/x86/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for linux/drivers/platform/x86
 # x86 Platform-Specific Drivers
diff --git a/kernel/drivers/pnp/Makefile b/kernel/drivers/pnp/Makefile
index bfba893cb..71d532f18 100644
--- a/kernel/drivers/pnp/Makefile
+++ b/kernel/drivers/pnp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Plug-and-Play Support.
 #
diff --git a/kernel/drivers/pnp/base.h b/kernel/drivers/pnp/base.h
index 3151fd164..cdcfa39cf 100644
--- a/kernel/drivers/pnp/base.h
+++ b/kernel/drivers/pnp/base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2008 Hewlett-Packard Development Company, L.P.
  *	Bjorn Helgaas <bjorn.helgaas@hp.com>
diff --git a/kernel/drivers/pnp/card.c b/kernel/drivers/pnp/card.c
index 31ad9fc3f..c2464ee08 100644
--- a/kernel/drivers/pnp/card.c
+++ b/kernel/drivers/pnp/card.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * card.c - contains functions for managing groups of PnP devices
  *
diff --git a/kernel/drivers/pnp/core.c b/kernel/drivers/pnp/core.c
index b54620e53..3bf18d718 100644
--- a/kernel/drivers/pnp/core.c
+++ b/kernel/drivers/pnp/core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * core.c - contains all core device and protocol registration functions
  *
diff --git a/kernel/drivers/pnp/driver.c b/kernel/drivers/pnp/driver.c
index 63452f20e..93a30a8f8 100644
--- a/kernel/drivers/pnp/driver.c
+++ b/kernel/drivers/pnp/driver.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * driver.c - device id matching, driver model, etc.
  *
diff --git a/kernel/drivers/pnp/interface.c b/kernel/drivers/pnp/interface.c
index 5c5b3d47b..187e4a117 100644
--- a/kernel/drivers/pnp/interface.c
+++ b/kernel/drivers/pnp/interface.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * interface.c - contains everything related to the user interface
  *
diff --git a/kernel/drivers/pnp/isapnp/compat.c b/kernel/drivers/pnp/isapnp/compat.c
index 10bdcc4d4..6c845b628 100644
--- a/kernel/drivers/pnp/isapnp/compat.c
+++ b/kernel/drivers/pnp/isapnp/compat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * compat.c - A series of functions to make it easier to convert drivers that use
  *            the old isapnp APIs. If possible use the new APIs instead.
diff --git a/kernel/drivers/pnp/manager.c b/kernel/drivers/pnp/manager.c
index 7ad329575..144055593 100644
--- a/kernel/drivers/pnp/manager.c
+++ b/kernel/drivers/pnp/manager.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * manager.c - Resource Management, Conflict Resolution, Activation and Disabling of Devices
  *
diff --git a/kernel/drivers/pnp/pnpacpi/pnpacpi.h b/kernel/drivers/pnp/pnpacpi/pnpacpi.h
index 051ef9699..4489cd6db 100644
--- a/kernel/drivers/pnp/pnpacpi/pnpacpi.h
+++ b/kernel/drivers/pnp/pnpacpi/pnpacpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ACPI_PNP_H
 #define ACPI_PNP_H
 
diff --git a/kernel/drivers/pnp/pnpbios/bioscalls.c b/kernel/drivers/pnp/pnpbios/bioscalls.c
index ff563db02..ba5cfc3db 100644
--- a/kernel/drivers/pnp/pnpbios/bioscalls.c
+++ b/kernel/drivers/pnp/pnpbios/bioscalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bioscalls.c - the lowlevel layer of the PnPBIOS driver
  */
diff --git a/kernel/drivers/pnp/pnpbios/proc.c b/kernel/drivers/pnp/pnpbios/proc.c
index 5ee6b2a5f..7d4aca794 100644
--- a/kernel/drivers/pnp/pnpbios/proc.c
+++ b/kernel/drivers/pnp/pnpbios/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * /proc/bus/pnp interface for Plug and Play devices
  *
diff --git a/kernel/drivers/pnp/pnpbios/rsparser.c b/kernel/drivers/pnp/pnpbios/rsparser.c
index cca2f9f9f..2f31b212b 100644
--- a/kernel/drivers/pnp/pnpbios/rsparser.c
+++ b/kernel/drivers/pnp/pnpbios/rsparser.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * rsparser.c - parses and encodes pnpbios resource data streams
  */
diff --git a/kernel/drivers/pnp/quirks.c b/kernel/drivers/pnp/quirks.c
index d28e3ab94..f054cdddf 100644
--- a/kernel/drivers/pnp/quirks.c
+++ b/kernel/drivers/pnp/quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  This file contains quirk handling code for PnP devices
  *  Some devices do not report all their resources, and need to have extra
diff --git a/kernel/drivers/pnp/resource.c b/kernel/drivers/pnp/resource.c
index f980ff716..70d4ba957 100644
--- a/kernel/drivers/pnp/resource.c
+++ b/kernel/drivers/pnp/resource.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * resource.c - Contains functions for registering and analyzing resource information
  *
diff --git a/kernel/drivers/pnp/support.c b/kernel/drivers/pnp/support.c
index f5beb24d0..e4f53d311 100644
--- a/kernel/drivers/pnp/support.c
+++ b/kernel/drivers/pnp/support.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * support.c - standard functions for the use of pnp protocol drivers
  *
diff --git a/kernel/drivers/pnp/system.c b/kernel/drivers/pnp/system.c
index 49c1720df..695050374 100644
--- a/kernel/drivers/pnp/system.c
+++ b/kernel/drivers/pnp/system.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * system.c - a driver for reserving pnp system resources
  *
diff --git a/kernel/drivers/power/reset/Makefile b/kernel/drivers/power/reset/Makefile
index 58cf5b305..aeb65edb1 100644
--- a/kernel/drivers/power/reset/Makefile
+++ b/kernel/drivers/power/reset/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o
 obj-$(CONFIG_POWER_RESET_AT91_POWEROFF) += at91-poweroff.o
 obj-$(CONFIG_POWER_RESET_AT91_RESET) += at91-reset.o
diff --git a/kernel/drivers/power/reset/gemini-poweroff.c b/kernel/drivers/power/reset/gemini-poweroff.c
index de878fd26..ff75af5ab 100644
--- a/kernel/drivers/power/reset/gemini-poweroff.c
+++ b/kernel/drivers/power/reset/gemini-poweroff.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Gemini power management controller
  * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
diff --git a/kernel/drivers/power/reset/piix4-poweroff.c b/kernel/drivers/power/reset/piix4-poweroff.c
index bacfc9578..20ce3ff5e 100644
--- a/kernel/drivers/power/reset/piix4-poweroff.c
+++ b/kernel/drivers/power/reset/piix4-poweroff.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Imagination Technologies
- * Author: Paul Burton <paul.burton@imgtec.com>
+ * Author: Paul Burton <paul.burton@mips.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -109,5 +109,5 @@ static struct pci_driver piix4_poweroff_driver = {
 };
 
 module_pci_driver(piix4_poweroff_driver);
-MODULE_AUTHOR("Paul Burton <paul.burton@imgtec.com>");
+MODULE_AUTHOR("Paul Burton <paul.burton@mips.com>");
 MODULE_LICENSE("GPL");
diff --git a/kernel/drivers/power/supply/Makefile b/kernel/drivers/power/supply/Makefile
index 621a19058..aae4e4a8b 100644
--- a/kernel/drivers/power/supply/Makefile
+++ b/kernel/drivers/power/supply/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
 
 power_supply-y				:= power_supply_core.o
diff --git a/kernel/drivers/power/supply/ab8500_bmdata.c b/kernel/drivers/power/supply/ab8500_bmdata.c
index 8c4958601..4a7ed50d1 100644
--- a/kernel/drivers/power/supply/ab8500_bmdata.c
+++ b/kernel/drivers/power/supply/ab8500_bmdata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/power_supply.h>
 #include <linux/of.h>
diff --git a/kernel/drivers/ptp/Makefile b/kernel/drivers/ptp/Makefile
index d1f2fb19c..fd28207f5 100644
--- a/kernel/drivers/ptp/Makefile
+++ b/kernel/drivers/ptp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for PTP 1588 clock support.
 #
diff --git a/kernel/drivers/pwm/Makefile b/kernel/drivers/pwm/Makefile
index ebefba5f5..0258a745f 100644
--- a/kernel/drivers/pwm/Makefile
+++ b/kernel/drivers/pwm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PWM)		+= core.o
 obj-$(CONFIG_PWM_SYSFS)		+= sysfs.o
 obj-$(CONFIG_PWM_AB8500)	+= pwm-ab8500.o
diff --git a/kernel/drivers/rapidio/Makefile b/kernel/drivers/rapidio/Makefile
index 74dcea45a..a34b0254b 100644
--- a/kernel/drivers/rapidio/Makefile
+++ b/kernel/drivers/rapidio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for RapidIO interconnect services
 #
diff --git a/kernel/drivers/rapidio/switches/Makefile b/kernel/drivers/rapidio/switches/Makefile
index 6bdd54c4e..69e7de31e 100644
--- a/kernel/drivers/rapidio/switches/Makefile
+++ b/kernel/drivers/rapidio/switches/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for RIO switches
 #
diff --git a/kernel/drivers/ras/cec.c b/kernel/drivers/ras/cec.c
index e2c1988cd..adbf1a9e0 100644
--- a/kernel/drivers/ras/cec.c
+++ b/kernel/drivers/ras/cec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/gfp.h>
 #include <linux/kernel.h>
diff --git a/kernel/drivers/ras/debugfs.h b/kernel/drivers/ras/debugfs.h
index db72e4513..c07443b46 100644
--- a/kernel/drivers/ras/debugfs.h
+++ b/kernel/drivers/ras/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RAS_DEBUGFS_H__
 #define __RAS_DEBUGFS_H__
 
diff --git a/kernel/drivers/ras/ras.c b/kernel/drivers/ras/ras.c
index 5429d3795..3f3890732 100644
--- a/kernel/drivers/ras/ras.c
+++ b/kernel/drivers/ras/ras.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Intel Corporation
  *
diff --git a/kernel/drivers/regulator/Makefile b/kernel/drivers/regulator/Makefile
index cbb6e45c7..80ffc57a9 100644
--- a/kernel/drivers/regulator/Makefile
+++ b/kernel/drivers/regulator/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for regulator drivers.
 #
diff --git a/kernel/drivers/regulator/fixed-helper.c b/kernel/drivers/regulator/fixed-helper.c
index f9d027992..777fac6fb 100644
--- a/kernel/drivers/regulator/fixed-helper.c
+++ b/kernel/drivers/regulator/fixed-helper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
diff --git a/kernel/drivers/remoteproc/Makefile b/kernel/drivers/remoteproc/Makefile
index 1a0b3dd44..6e16450ce 100644
--- a/kernel/drivers/remoteproc/Makefile
+++ b/kernel/drivers/remoteproc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Generic framework for controlling remote processors
 #
diff --git a/kernel/drivers/remoteproc/qcom_common.h b/kernel/drivers/remoteproc/qcom_common.h
index 4f8bc1684..832e20271 100644
--- a/kernel/drivers/remoteproc/qcom_common.h
+++ b/kernel/drivers/remoteproc/qcom_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RPROC_QCOM_COMMON_H__
 #define __RPROC_QCOM_COMMON_H__
 
diff --git a/kernel/drivers/remoteproc/qcom_wcnss.h b/kernel/drivers/remoteproc/qcom_wcnss.h
index 25fb7f62a..62c8682d0 100644
--- a/kernel/drivers/remoteproc/qcom_wcnss.h
+++ b/kernel/drivers/remoteproc/qcom_wcnss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QCOM_WNCSS_H__
 #define __QCOM_WNCSS_H__
 
diff --git a/kernel/drivers/reset/Makefile b/kernel/drivers/reset/Makefile
index af1c15c33..c1fd702ac 100644
--- a/kernel/drivers/reset/Makefile
+++ b/kernel/drivers/reset/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += core.o
 obj-y += hisilicon/
 obj-$(CONFIG_ARCH_STI) += sti/
diff --git a/kernel/drivers/rpmsg/Makefile b/kernel/drivers/rpmsg/Makefile
index c71f4ab1a..9aa859502 100644
--- a/kernel/drivers/rpmsg/Makefile
+++ b/kernel/drivers/rpmsg/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RPMSG)		+= rpmsg_core.o
 obj-$(CONFIG_RPMSG_CHAR)	+= rpmsg_char.o
 obj-$(CONFIG_RPMSG_QCOM_GLINK_RPM) += qcom_glink_rpm.o
diff --git a/kernel/drivers/rtc/Makefile b/kernel/drivers/rtc/Makefile
index 7230014c9..0bf1fc02b 100644
--- a/kernel/drivers/rtc/Makefile
+++ b/kernel/drivers/rtc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for RTC class/drivers.
 #
diff --git a/kernel/drivers/rtc/rtc-core.h b/kernel/drivers/rtc/rtc-core.h
index ecab76a32..513b9bedd 100644
--- a/kernel/drivers/rtc/rtc-core.h
+++ b/kernel/drivers/rtc/rtc-core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_RTC_INTF_DEV
 
 extern void __init rtc_dev_init(void);
diff --git a/kernel/drivers/rtc/rtc-efi-platform.c b/kernel/drivers/rtc/rtc-efi-platform.c
index 1a7f1d1bc..6c037dc4e 100644
--- a/kernel/drivers/rtc/rtc-efi-platform.c
+++ b/kernel/drivers/rtc/rtc-efi-platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Moved from arch/ia64/kernel/time.c
  *
diff --git a/kernel/drivers/rtc/rtc-sa1100.h b/kernel/drivers/rtc/rtc-sa1100.h
index 2c79c0c57..cc724f5b0 100644
--- a/kernel/drivers/rtc/rtc-sa1100.h
+++ b/kernel/drivers/rtc/rtc-sa1100.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RTC_SA1100_H__
 #define __RTC_SA1100_H__
 
diff --git a/kernel/drivers/s390/block/Makefile b/kernel/drivers/s390/block/Makefile
index b64e2b32c..60c85cff5 100644
--- a/kernel/drivers/s390/block/Makefile
+++ b/kernel/drivers/s390/block/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # S/390 block devices
 #
diff --git a/kernel/drivers/s390/block/dasd_3990_erp.c b/kernel/drivers/s390/block/dasd_3990_erp.c
index e448a0fc0..c94b606e0 100644
--- a/kernel/drivers/s390/block/dasd_3990_erp.c
+++ b/kernel/drivers/s390/block/dasd_3990_erp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Horst  Hummel    <Horst.Hummel@de.ibm.com>
  *		    Holger Smolinski <Holger.Smolinski@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_alias.c b/kernel/drivers/s390/block/dasd_alias.c
index 0e0e622ea..62f5f04d8 100644
--- a/kernel/drivers/s390/block/dasd_alias.c
+++ b/kernel/drivers/s390/block/dasd_alias.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PAV alias management for the DASD ECKD discipline
  *
diff --git a/kernel/drivers/s390/block/dasd_diag.h b/kernel/drivers/s390/block/dasd_diag.h
index e84a5468d..405b6feed 100644
--- a/kernel/drivers/s390/block/dasd_diag.h
+++ b/kernel/drivers/s390/block/dasd_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Based on.......: linux/drivers/s390/block/mdisk.h
diff --git a/kernel/drivers/s390/block/dasd_eckd.h b/kernel/drivers/s390/block/dasd_eckd.h
index 34e153a6b..5869d2fed 100644
--- a/kernel/drivers/s390/block/dasd_eckd.h
+++ b/kernel/drivers/s390/block/dasd_eckd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Horst Hummel <Horst.Hummel@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_eer.c b/kernel/drivers/s390/block/dasd_eer.c
index 8713fefd7..4630782b5 100644
--- a/kernel/drivers/s390/block/dasd_eer.c
+++ b/kernel/drivers/s390/block/dasd_eer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Character device driver for extended error reporting.
  *
diff --git a/kernel/drivers/s390/block/dasd_erp.c b/kernel/drivers/s390/block/dasd_erp.c
index 6389feb2f..ba4fa372d 100644
--- a/kernel/drivers/s390/block/dasd_erp.c
+++ b/kernel/drivers/s390/block/dasd_erp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Horst Hummel <Horst.Hummel@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_fba.h b/kernel/drivers/s390/block/dasd_fba.h
index b5d3db0e5..b14bf1b2c 100644
--- a/kernel/drivers/s390/block/dasd_fba.h
+++ b/kernel/drivers/s390/block/dasd_fba.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  * Bugreports.to..: <Linux390@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_genhd.c b/kernel/drivers/s390/block/dasd_genhd.c
index 8b1341fb2..7036a6c6f 100644
--- a/kernel/drivers/s390/block/dasd_genhd.c
+++ b/kernel/drivers/s390/block/dasd_genhd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Horst Hummel <Horst.Hummel@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_int.h b/kernel/drivers/s390/block/dasd_int.h
index db470bd10..e94080a51 100644
--- a/kernel/drivers/s390/block/dasd_int.h
+++ b/kernel/drivers/s390/block/dasd_int.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Horst Hummel <Horst.Hummel@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_ioctl.c b/kernel/drivers/s390/block/dasd_ioctl.c
index ec65c1e51..7bdc6aaa0 100644
--- a/kernel/drivers/s390/block/dasd_ioctl.c
+++ b/kernel/drivers/s390/block/dasd_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Horst Hummel <Horst.Hummel@de.ibm.com>
diff --git a/kernel/drivers/s390/block/dasd_proc.c b/kernel/drivers/s390/block/dasd_proc.c
index 7104d6765..c33788a82 100644
--- a/kernel/drivers/s390/block/dasd_proc.c
+++ b/kernel/drivers/s390/block/dasd_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
  *		    Horst Hummel <Horst.Hummel@de.ibm.com>
diff --git a/kernel/drivers/s390/block/scm_blk.h b/kernel/drivers/s390/block/scm_blk.h
index 71288dd9d..aa42c3a2c 100644
--- a/kernel/drivers/s390/block/scm_blk.h
+++ b/kernel/drivers/s390/block/scm_blk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SCM_BLK_H
 #define SCM_BLK_H
 
diff --git a/kernel/drivers/s390/block/scm_drv.c b/kernel/drivers/s390/block/scm_drv.c
index c98cf52d7..3134fd6e0 100644
--- a/kernel/drivers/s390/block/scm_drv.c
+++ b/kernel/drivers/s390/block/scm_drv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device driver for s390 storage class memory.
  *
diff --git a/kernel/drivers/s390/char/Makefile b/kernel/drivers/s390/char/Makefile
index 0c443e268..05ac6ba15 100644
--- a/kernel/drivers/s390/char/Makefile
+++ b/kernel/drivers/s390/char/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # S/390 character devices
 #
diff --git a/kernel/drivers/s390/char/con3215.c b/kernel/drivers/s390/char/con3215.c
index 9ec4ae056..353f0bebc 100644
--- a/kernel/drivers/s390/char/con3215.c
+++ b/kernel/drivers/s390/char/con3215.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 3215 line mode terminal driver.
  *
diff --git a/kernel/drivers/s390/char/con3270.c b/kernel/drivers/s390/char/con3270.c
index 8522cfce5..be3e3c120 100644
--- a/kernel/drivers/s390/char/con3270.c
+++ b/kernel/drivers/s390/char/con3270.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IBM/3270 Driver - console view.
  *
diff --git a/kernel/drivers/s390/char/ctrlchar.c b/kernel/drivers/s390/char/ctrlchar.c
index f7d92584b..e1686a69a 100644
--- a/kernel/drivers/s390/char/ctrlchar.c
+++ b/kernel/drivers/s390/char/ctrlchar.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Unified handling of special chars.
  *
diff --git a/kernel/drivers/s390/char/ctrlchar.h b/kernel/drivers/s390/char/ctrlchar.h
index 59c2d6e55..e52afa3b8 100644
--- a/kernel/drivers/s390/char/ctrlchar.h
+++ b/kernel/drivers/s390/char/ctrlchar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Unified handling of special chars.
  *
diff --git a/kernel/drivers/s390/char/defkeymap.c b/kernel/drivers/s390/char/defkeymap.c
index 07c7f3108..98a5c459a 100644
--- a/kernel/drivers/s390/char/defkeymap.c
+++ b/kernel/drivers/s390/char/defkeymap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /* Do not edit this file! It was automatically generated by   */
 /*    loadkeys --mktable defkeymap.map > defkeymap.c          */
diff --git a/kernel/drivers/s390/char/diag_ftp.c b/kernel/drivers/s390/char/diag_ftp.c
index a5ccbf6f0..6bf1058de 100644
--- a/kernel/drivers/s390/char/diag_ftp.c
+++ b/kernel/drivers/s390/char/diag_ftp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    DIAGNOSE X'2C4' instruction based HMC FTP services, useable on z/VM
  *
diff --git a/kernel/drivers/s390/char/diag_ftp.h b/kernel/drivers/s390/char/diag_ftp.h
index 3abd26140..5d036ba71 100644
--- a/kernel/drivers/s390/char/diag_ftp.h
+++ b/kernel/drivers/s390/char/diag_ftp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    DIAGNOSE X'2C4' instruction based SE/HMC FTP Services, useable on z/VM
  *
diff --git a/kernel/drivers/s390/char/hmcdrv_cache.c b/kernel/drivers/s390/char/hmcdrv_cache.c
index 4cda5ada1..1f5bdb237 100644
--- a/kernel/drivers/s390/char/hmcdrv_cache.c
+++ b/kernel/drivers/s390/char/hmcdrv_cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    SE/HMC Drive (Read) Cache Functions
  *
diff --git a/kernel/drivers/s390/char/hmcdrv_cache.h b/kernel/drivers/s390/char/hmcdrv_cache.h
index a14b57526..d69f9fe87 100644
--- a/kernel/drivers/s390/char/hmcdrv_cache.h
+++ b/kernel/drivers/s390/char/hmcdrv_cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    SE/HMC Drive (Read) Cache Functions
  *
diff --git a/kernel/drivers/s390/char/hmcdrv_dev.c b/kernel/drivers/s390/char/hmcdrv_dev.c
index 43cee7fcd..20e9cd542 100644
--- a/kernel/drivers/s390/char/hmcdrv_dev.c
+++ b/kernel/drivers/s390/char/hmcdrv_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    HMC Drive CD/DVD Device
  *
diff --git a/kernel/drivers/s390/char/hmcdrv_dev.h b/kernel/drivers/s390/char/hmcdrv_dev.h
index cb17f07e0..558eba929 100644
--- a/kernel/drivers/s390/char/hmcdrv_dev.h
+++ b/kernel/drivers/s390/char/hmcdrv_dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    SE/HMC Drive FTP Device
  *
diff --git a/kernel/drivers/s390/char/hmcdrv_ftp.c b/kernel/drivers/s390/char/hmcdrv_ftp.c
index 8cb7d8fba..0e70397d6 100644
--- a/kernel/drivers/s390/char/hmcdrv_ftp.c
+++ b/kernel/drivers/s390/char/hmcdrv_ftp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    HMC Drive FTP Services
  *
diff --git a/kernel/drivers/s390/char/hmcdrv_ftp.h b/kernel/drivers/s390/char/hmcdrv_ftp.h
index f3643a7b3..d12ca12b5 100644
--- a/kernel/drivers/s390/char/hmcdrv_ftp.h
+++ b/kernel/drivers/s390/char/hmcdrv_ftp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    SE/HMC Drive FTP Services
  *
diff --git a/kernel/drivers/s390/char/keyboard.c b/kernel/drivers/s390/char/keyboard.c
index 186d05e4c..5b505fdae 100644
--- a/kernel/drivers/s390/char/keyboard.c
+++ b/kernel/drivers/s390/char/keyboard.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    ebcdic keycode functions for s390 console drivers
  *
diff --git a/kernel/drivers/s390/char/keyboard.h b/kernel/drivers/s390/char/keyboard.h
index a31f33921..a074d9711 100644
--- a/kernel/drivers/s390/char/keyboard.h
+++ b/kernel/drivers/s390/char/keyboard.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    ebcdic keycode functions for s390 console drivers
  *
diff --git a/kernel/drivers/s390/char/raw3270.h b/kernel/drivers/s390/char/raw3270.h
index 56519cbb1..114ca7cbf 100644
--- a/kernel/drivers/s390/char/raw3270.h
+++ b/kernel/drivers/s390/char/raw3270.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IBM/3270 Driver
  *
diff --git a/kernel/drivers/s390/char/sclp.c b/kernel/drivers/s390/char/sclp.c
index 6111c1fa2..41d8aa968 100644
--- a/kernel/drivers/s390/char/sclp.c
+++ b/kernel/drivers/s390/char/sclp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * core function to access sclp interface
  *
diff --git a/kernel/drivers/s390/char/sclp.h b/kernel/drivers/s390/char/sclp.h
index 53b5d1b97..f41f6e2ca 100644
--- a/kernel/drivers/s390/char/sclp.h
+++ b/kernel/drivers/s390/char/sclp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 1999,2012
  *
diff --git a/kernel/drivers/s390/char/sclp_cmd.c b/kernel/drivers/s390/char/sclp_cmd.c
index dff8b9487..d7686a68c 100644
--- a/kernel/drivers/s390/char/sclp_cmd.c
+++ b/kernel/drivers/s390/char/sclp_cmd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2007,2012
  *
diff --git a/kernel/drivers/s390/char/sclp_con.c b/kernel/drivers/s390/char/sclp_con.c
index 6037bc87e..d247f238f 100644
--- a/kernel/drivers/s390/char/sclp_con.c
+++ b/kernel/drivers/s390/char/sclp_con.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCLP line mode console driver
  *
diff --git a/kernel/drivers/s390/char/sclp_config.c b/kernel/drivers/s390/char/sclp_config.c
index 7003d52c2..194ffd5c8 100644
--- a/kernel/drivers/s390/char/sclp_config.c
+++ b/kernel/drivers/s390/char/sclp_config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
diff --git a/kernel/drivers/s390/char/sclp_cpi_sys.c b/kernel/drivers/s390/char/sclp_cpi_sys.c
index 90d92fbe7..f60d7ea82 100644
--- a/kernel/drivers/s390/char/sclp_cpi_sys.c
+++ b/kernel/drivers/s390/char/sclp_cpi_sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    SCLP control program identification sysfs interface
  *
diff --git a/kernel/drivers/s390/char/sclp_cpi_sys.h b/kernel/drivers/s390/char/sclp_cpi_sys.h
index 65bb6a99c..edf60d1ca 100644
--- a/kernel/drivers/s390/char/sclp_cpi_sys.h
+++ b/kernel/drivers/s390/char/sclp_cpi_sys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    SCLP control program identification sysfs interface
  *
diff --git a/kernel/drivers/s390/char/sclp_ctl.c b/kernel/drivers/s390/char/sclp_ctl.c
index 78a7e4f94..a78cea0c3 100644
--- a/kernel/drivers/s390/char/sclp_ctl.c
+++ b/kernel/drivers/s390/char/sclp_ctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOCTL interface for SCLP
  *
diff --git a/kernel/drivers/s390/char/sclp_diag.h b/kernel/drivers/s390/char/sclp_diag.h
index 59c4afa5e..796c5311b 100644
--- a/kernel/drivers/s390/char/sclp_diag.h
+++ b/kernel/drivers/s390/char/sclp_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2013
  *    Author(s): Ralf Hoppe (rhoppe@de.ibm.com)
diff --git a/kernel/drivers/s390/char/sclp_early.c b/kernel/drivers/s390/char/sclp_early.c
index bc1fc0091..d06bc5674 100644
--- a/kernel/drivers/s390/char/sclp_early.c
+++ b/kernel/drivers/s390/char/sclp_early.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCLP early driver
  *
diff --git a/kernel/drivers/s390/char/sclp_early_core.c b/kernel/drivers/s390/char/sclp_early_core.c
index 5029cc87e..edeb2597b 100644
--- a/kernel/drivers/s390/char/sclp_early_core.c
+++ b/kernel/drivers/s390/char/sclp_early_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2015
  *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/drivers/s390/char/sclp_ftp.c b/kernel/drivers/s390/char/sclp_ftp.c
index 6561cc5b2..dfdd6c8fd 100644
--- a/kernel/drivers/s390/char/sclp_ftp.c
+++ b/kernel/drivers/s390/char/sclp_ftp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    SCLP Event Type (ET) 7 - Diagnostic Test FTP Services, useable on LPAR
  *
diff --git a/kernel/drivers/s390/char/sclp_ftp.h b/kernel/drivers/s390/char/sclp_ftp.h
index 98ba3183e..d64da18c1 100644
--- a/kernel/drivers/s390/char/sclp_ftp.h
+++ b/kernel/drivers/s390/char/sclp_ftp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    SCLP Event Type (ET) 7 - Diagnostic Test FTP Services, useable on LPAR
  *
diff --git a/kernel/drivers/s390/char/sclp_ocf.c b/kernel/drivers/s390/char/sclp_ocf.c
index f9cbb1ab0..d35f10ea5 100644
--- a/kernel/drivers/s390/char/sclp_ocf.c
+++ b/kernel/drivers/s390/char/sclp_ocf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    SCLP OCF communication parameters sysfs interface
  *
diff --git a/kernel/drivers/s390/char/sclp_pci.c b/kernel/drivers/s390/char/sclp_pci.c
index 4dbb3dfd4..e7c84a4e5 100644
--- a/kernel/drivers/s390/char/sclp_pci.c
+++ b/kernel/drivers/s390/char/sclp_pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI I/O adapter configuration related functions.
  *
diff --git a/kernel/drivers/s390/char/sclp_quiesce.c b/kernel/drivers/s390/char/sclp_quiesce.c
index e49585111..76956c213 100644
--- a/kernel/drivers/s390/char/sclp_quiesce.c
+++ b/kernel/drivers/s390/char/sclp_quiesce.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *     signal quiesce handler
  *
diff --git a/kernel/drivers/s390/char/sclp_rw.c b/kernel/drivers/s390/char/sclp_rw.c
index 91b26df52..44594a492 100644
--- a/kernel/drivers/s390/char/sclp_rw.c
+++ b/kernel/drivers/s390/char/sclp_rw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * driver: reading from and writing to system console on S/390 via SCLP
  *
diff --git a/kernel/drivers/s390/char/sclp_rw.h b/kernel/drivers/s390/char/sclp_rw.h
index e3b029099..a2eb22f67 100644
--- a/kernel/drivers/s390/char/sclp_rw.h
+++ b/kernel/drivers/s390/char/sclp_rw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * interface to the SCLP-read/write driver
  *
diff --git a/kernel/drivers/s390/char/sclp_sdias.c b/kernel/drivers/s390/char/sclp_sdias.c
index 7cdd13dd7..8e0b69a2f 100644
--- a/kernel/drivers/s390/char/sclp_sdias.c
+++ b/kernel/drivers/s390/char/sclp_sdias.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCLP "store data in absolute storage"
  *
diff --git a/kernel/drivers/s390/char/sclp_sdias.h b/kernel/drivers/s390/char/sclp_sdias.h
index f2431c414..bc36cf881 100644
--- a/kernel/drivers/s390/char/sclp_sdias.h
+++ b/kernel/drivers/s390/char/sclp_sdias.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SCLP "store data in absolute storage"
  *
diff --git a/kernel/drivers/s390/char/sclp_tty.c b/kernel/drivers/s390/char/sclp_tty.c
index 236b736ae..875628dab 100644
--- a/kernel/drivers/s390/char/sclp_tty.c
+++ b/kernel/drivers/s390/char/sclp_tty.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    SCLP line mode terminal driver.
  *
diff --git a/kernel/drivers/s390/char/sclp_tty.h b/kernel/drivers/s390/char/sclp_tty.h
index c8773421c..0fa2d5971 100644
--- a/kernel/drivers/s390/char/sclp_tty.h
+++ b/kernel/drivers/s390/char/sclp_tty.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    interface to the SCLP-read/write driver
  *
diff --git a/kernel/drivers/s390/char/sclp_vt220.c b/kernel/drivers/s390/char/sclp_vt220.c
index 095481d32..e84395d71 100644
--- a/kernel/drivers/s390/char/sclp_vt220.c
+++ b/kernel/drivers/s390/char/sclp_vt220.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCLP VT220 terminal driver.
  *
diff --git a/kernel/drivers/s390/char/tape.h b/kernel/drivers/s390/char/tape.h
index ea664dd4f..997b25f6e 100644
--- a/kernel/drivers/s390/char/tape.h
+++ b/kernel/drivers/s390/char/tape.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    tape device driver for 3480/3490E/3590 tapes.
  *
diff --git a/kernel/drivers/s390/char/tape_3590.h b/kernel/drivers/s390/char/tape_3590.h
index 36b759e89..b398d8a3e 100644
--- a/kernel/drivers/s390/char/tape_3590.h
+++ b/kernel/drivers/s390/char/tape_3590.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    tape device discipline for 3590 tapes.
  *
diff --git a/kernel/drivers/s390/char/tape_char.c b/kernel/drivers/s390/char/tape_char.c
index 46ac1164f..fc206c9d1 100644
--- a/kernel/drivers/s390/char/tape_char.c
+++ b/kernel/drivers/s390/char/tape_char.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    character device frontend for tape device driver
  *
diff --git a/kernel/drivers/s390/char/tape_class.h b/kernel/drivers/s390/char/tape_class.h
index a332c10d5..d25ac075b 100644
--- a/kernel/drivers/s390/char/tape_class.h
+++ b/kernel/drivers/s390/char/tape_class.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2004   All Rights Reserved.
  *
diff --git a/kernel/drivers/s390/char/tape_proc.c b/kernel/drivers/s390/char/tape_proc.c
index 8733b232a..faae30476 100644
--- a/kernel/drivers/s390/char/tape_proc.c
+++ b/kernel/drivers/s390/char/tape_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    tape device driver for S/390 and zSeries tapes.
  *
diff --git a/kernel/drivers/s390/char/tape_std.c b/kernel/drivers/s390/char/tape_std.c
index 3478e19ae..7caba0cc8 100644
--- a/kernel/drivers/s390/char/tape_std.c
+++ b/kernel/drivers/s390/char/tape_std.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    standard tape device functions for ibm tapes.
  *
diff --git a/kernel/drivers/s390/char/tape_std.h b/kernel/drivers/s390/char/tape_std.h
index 8c760c036..53ec8e287 100644
--- a/kernel/drivers/s390/char/tape_std.h
+++ b/kernel/drivers/s390/char/tape_std.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    standard tape device functions for ibm tapes.
  *
diff --git a/kernel/drivers/s390/char/tty3270.h b/kernel/drivers/s390/char/tty3270.h
index 11141a8f8..52ceed6f8 100644
--- a/kernel/drivers/s390/char/tty3270.h
+++ b/kernel/drivers/s390/char/tty3270.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007
  *
diff --git a/kernel/drivers/s390/char/vmcp.c b/kernel/drivers/s390/char/vmcp.c
index 7898bbcc2..17e411c57 100644
--- a/kernel/drivers/s390/char/vmcp.c
+++ b/kernel/drivers/s390/char/vmcp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2004, 2010
  * Interface implementation for communication with the z/VM control program
diff --git a/kernel/drivers/s390/char/vmur.h b/kernel/drivers/s390/char/vmur.h
index fa320ad45..67164ba22 100644
--- a/kernel/drivers/s390/char/vmur.h
+++ b/kernel/drivers/s390/char/vmur.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux driver for System z and s390 unit record devices
  * (z/VM virtual punch, reader, printer)
diff --git a/kernel/drivers/s390/cio/Makefile b/kernel/drivers/s390/cio/Makefile
index bdf475260..a070ef0ef 100644
--- a/kernel/drivers/s390/cio/Makefile
+++ b/kernel/drivers/s390/cio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the S/390 common i/o drivers
 #
diff --git a/kernel/drivers/s390/cio/airq.c b/kernel/drivers/s390/cio/airq.c
index 99b5db469..a45011e45 100644
--- a/kernel/drivers/s390/cio/airq.c
+++ b/kernel/drivers/s390/cio/airq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Support for adapter interruptions
  *
diff --git a/kernel/drivers/s390/cio/blacklist.c b/kernel/drivers/s390/cio/blacklist.c
index bf7f5d4c5..2a3f874a2 100644
--- a/kernel/drivers/s390/cio/blacklist.c
+++ b/kernel/drivers/s390/cio/blacklist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *   S/390 common I/O routines -- blacklisting of specific devices
  *
diff --git a/kernel/drivers/s390/cio/ccwreq.c b/kernel/drivers/s390/cio/ccwreq.c
index 2782100b2..603268a33 100644
--- a/kernel/drivers/s390/cio/ccwreq.c
+++ b/kernel/drivers/s390/cio/ccwreq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Handling of internal CCW device requests.
  *
diff --git a/kernel/drivers/s390/cio/chp.h b/kernel/drivers/s390/cio/chp.h
index 0d8437b7e..7e80323cd 100644
--- a/kernel/drivers/s390/cio/chp.h
+++ b/kernel/drivers/s390/cio/chp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007, 2010
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
diff --git a/kernel/drivers/s390/cio/chsc.h b/kernel/drivers/s390/cio/chsc.h
index 321a3f765..dda595353 100644
--- a/kernel/drivers/s390/cio/chsc.h
+++ b/kernel/drivers/s390/cio/chsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_CHSC_H
 #define S390_CHSC_H
 
diff --git a/kernel/drivers/s390/cio/chsc_sch.h b/kernel/drivers/s390/cio/chsc_sch.h
index 589ebfad6..ff5328b0b 100644
--- a/kernel/drivers/s390/cio/chsc_sch.h
+++ b/kernel/drivers/s390/cio/chsc_sch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CHSC_SCH_H
 #define _CHSC_SCH_H
 
diff --git a/kernel/drivers/s390/cio/cio.h b/kernel/drivers/s390/cio/cio.h
index 939596d81..94cd813bd 100644
--- a/kernel/drivers/s390/cio/cio.h
+++ b/kernel/drivers/s390/cio/cio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_CIO_H
 #define S390_CIO_H
 
diff --git a/kernel/drivers/s390/cio/cio_debug.h b/kernel/drivers/s390/cio/cio_debug.h
index e64e8278c..fa817efce 100644
--- a/kernel/drivers/s390/cio/cio_debug.h
+++ b/kernel/drivers/s390/cio/cio_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CIO_DEBUG_H
 #define CIO_DEBUG_H
 
diff --git a/kernel/drivers/s390/cio/crw.c b/kernel/drivers/s390/cio/crw.c
index 3d3cd402b..fc285ca41 100644
--- a/kernel/drivers/s390/cio/crw.c
+++ b/kernel/drivers/s390/cio/crw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *   Channel report handling code
  *
diff --git a/kernel/drivers/s390/cio/css.h b/kernel/drivers/s390/cio/css.h
index c9f3fb39e..30357cbf3 100644
--- a/kernel/drivers/s390/cio/css.h
+++ b/kernel/drivers/s390/cio/css.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CSS_H
 #define _CSS_H
 
diff --git a/kernel/drivers/s390/cio/device.h b/kernel/drivers/s390/cio/device.h
index 69cb70f08..b37c22adc 100644
--- a/kernel/drivers/s390/cio/device.h
+++ b/kernel/drivers/s390/cio/device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_DEVICE_H
 #define S390_DEVICE_H
 
diff --git a/kernel/drivers/s390/cio/device_id.c b/kernel/drivers/s390/cio/device_id.c
index d4fa30541..f6df83a9d 100644
--- a/kernel/drivers/s390/cio/device_id.c
+++ b/kernel/drivers/s390/cio/device_id.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  CCW device SENSE ID I/O handling.
  *
diff --git a/kernel/drivers/s390/cio/device_pgid.c b/kernel/drivers/s390/cio/device_pgid.c
index da246b67e..d30a3babf 100644
--- a/kernel/drivers/s390/cio/device_pgid.c
+++ b/kernel/drivers/s390/cio/device_pgid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  CCW device PGID and path verification I/O handling.
  *
diff --git a/kernel/drivers/s390/cio/device_status.c b/kernel/drivers/s390/cio/device_status.c
index 9bc351237..7d5c7892b 100644
--- a/kernel/drivers/s390/cio/device_status.c
+++ b/kernel/drivers/s390/cio/device_status.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2002
  *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
diff --git a/kernel/drivers/s390/cio/eadm_sch.h b/kernel/drivers/s390/cio/eadm_sch.h
index 9664e4653..390ab5a6b 100644
--- a/kernel/drivers/s390/cio/eadm_sch.h
+++ b/kernel/drivers/s390/cio/eadm_sch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef EADM_SCH_H
 #define EADM_SCH_H
 
diff --git a/kernel/drivers/s390/cio/fcx.c b/kernel/drivers/s390/cio/fcx.c
index ca5e9bb9d..99c900cc3 100644
--- a/kernel/drivers/s390/cio/fcx.c
+++ b/kernel/drivers/s390/cio/fcx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Functions for assembling fcx enabled I/O control blocks.
  *
diff --git a/kernel/drivers/s390/cio/idset.c b/kernel/drivers/s390/cio/idset.c
index b3e06a7b9..835de44db 100644
--- a/kernel/drivers/s390/cio/idset.c
+++ b/kernel/drivers/s390/cio/idset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2007, 2012
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
diff --git a/kernel/drivers/s390/cio/idset.h b/kernel/drivers/s390/cio/idset.h
index 89a787790..a3ece8d80 100644
--- a/kernel/drivers/s390/cio/idset.h
+++ b/kernel/drivers/s390/cio/idset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007, 2012
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
diff --git a/kernel/drivers/s390/cio/io_sch.h b/kernel/drivers/s390/cio/io_sch.h
index 9a1b56b2d..af571d8d6 100644
--- a/kernel/drivers/s390/cio/io_sch.h
+++ b/kernel/drivers/s390/cio/io_sch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_IO_SCH_H
 #define S390_IO_SCH_H
 
diff --git a/kernel/drivers/s390/cio/ioasm.c b/kernel/drivers/s390/cio/ioasm.c
index 4182f6012..4fa9ee1d0 100644
--- a/kernel/drivers/s390/cio/ioasm.c
+++ b/kernel/drivers/s390/cio/ioasm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Channel subsystem I/O instructions.
  */
diff --git a/kernel/drivers/s390/cio/ioasm.h b/kernel/drivers/s390/cio/ioasm.h
index b31ee6bff..35ad4ddd6 100644
--- a/kernel/drivers/s390/cio/ioasm.h
+++ b/kernel/drivers/s390/cio/ioasm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef S390_CIO_IOASM_H
 #define S390_CIO_IOASM_H
 
diff --git a/kernel/drivers/s390/cio/itcw.c b/kernel/drivers/s390/cio/itcw.c
index 358ee16d1..deaf59f93 100644
--- a/kernel/drivers/s390/cio/itcw.c
+++ b/kernel/drivers/s390/cio/itcw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Functions for incremental construction of fcx enabled I/O control blocks.
  *
diff --git a/kernel/drivers/s390/cio/orb.h b/kernel/drivers/s390/cio/orb.h
index 7a640530e..a2d3778b2 100644
--- a/kernel/drivers/s390/cio/orb.h
+++ b/kernel/drivers/s390/cio/orb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Orb related data structures.
  *
diff --git a/kernel/drivers/s390/cio/qdio.h b/kernel/drivers/s390/cio/qdio.h
index 7e70f9298..29d6b5222 100644
--- a/kernel/drivers/s390/cio/qdio.h
+++ b/kernel/drivers/s390/cio/qdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2000, 2009
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
diff --git a/kernel/drivers/s390/cio/qdio_debug.c b/kernel/drivers/s390/cio/qdio_debug.c
index b6fc147f8..68a82f3e2 100644
--- a/kernel/drivers/s390/cio/qdio_debug.c
+++ b/kernel/drivers/s390/cio/qdio_debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright IBM Corp. 2008, 2009
  *
diff --git a/kernel/drivers/s390/cio/qdio_debug.h b/kernel/drivers/s390/cio/qdio_debug.h
index 1d595d17b..e06496ab0 100644
--- a/kernel/drivers/s390/cio/qdio_debug.h
+++ b/kernel/drivers/s390/cio/qdio_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2008
  *
diff --git a/kernel/drivers/s390/cio/qdio_thinint.c b/kernel/drivers/s390/cio/qdio_thinint.c
index c61164f45..a739bdf96 100644
--- a/kernel/drivers/s390/cio/qdio_thinint.c
+++ b/kernel/drivers/s390/cio/qdio_thinint.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2000, 2009
  * Author(s): Utz Bacher <utz.bacher@de.ibm.com>
diff --git a/kernel/drivers/s390/cio/trace.c b/kernel/drivers/s390/cio/trace.c
index 8e706669a..e331cd97e 100644
--- a/kernel/drivers/s390/cio/trace.c
+++ b/kernel/drivers/s390/cio/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tracepoint definitions for s390_cio
  *
diff --git a/kernel/drivers/s390/cio/trace.h b/kernel/drivers/s390/cio/trace.h
index 5b807a09f..1f8d1c1e5 100644
--- a/kernel/drivers/s390/cio/trace.h
+++ b/kernel/drivers/s390/cio/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Tracepoint header for the s390 Common I/O layer (CIO)
  *
diff --git a/kernel/drivers/s390/cio/vfio_ccw_cp.c b/kernel/drivers/s390/cio/vfio_ccw_cp.c
index 5ccfdc80d..f20b4d66c 100644
--- a/kernel/drivers/s390/cio/vfio_ccw_cp.c
+++ b/kernel/drivers/s390/cio/vfio_ccw_cp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * channel program interfaces
  *
diff --git a/kernel/drivers/s390/cio/vfio_ccw_cp.h b/kernel/drivers/s390/cio/vfio_ccw_cp.h
index 7a1996b3b..a4b74fb1a 100644
--- a/kernel/drivers/s390/cio/vfio_ccw_cp.h
+++ b/kernel/drivers/s390/cio/vfio_ccw_cp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * channel program interfaces
  *
diff --git a/kernel/drivers/s390/cio/vfio_ccw_fsm.c b/kernel/drivers/s390/cio/vfio_ccw_fsm.c
index 80a0559cd..c30420c51 100644
--- a/kernel/drivers/s390/cio/vfio_ccw_fsm.c
+++ b/kernel/drivers/s390/cio/vfio_ccw_fsm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Finite state machine for vfio-ccw device handling
  *
diff --git a/kernel/drivers/s390/cio/vfio_ccw_ops.c b/kernel/drivers/s390/cio/vfio_ccw_ops.c
index a66a317f3..41eeb57d6 100644
--- a/kernel/drivers/s390/cio/vfio_ccw_ops.c
+++ b/kernel/drivers/s390/cio/vfio_ccw_ops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Physical device callbacks for vfio_ccw
  *
diff --git a/kernel/drivers/s390/cio/vfio_ccw_private.h b/kernel/drivers/s390/cio/vfio_ccw_private.h
index fc0f01c16..78a66d967 100644
--- a/kernel/drivers/s390/cio/vfio_ccw_private.h
+++ b/kernel/drivers/s390/cio/vfio_ccw_private.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Private stuff for vfio_ccw driver
  *
diff --git a/kernel/drivers/s390/crypto/Makefile b/kernel/drivers/s390/crypto/Makefile
index be36f1010..b59af548e 100644
--- a/kernel/drivers/s390/crypto/Makefile
+++ b/kernel/drivers/s390/crypto/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # S/390 crypto devices
 #
diff --git a/kernel/drivers/s390/crypto/ap_asm.h b/kernel/drivers/s390/crypto/ap_asm.h
index cd350345b..6c0474c83 100644
--- a/kernel/drivers/s390/crypto/ap_asm.h
+++ b/kernel/drivers/s390/crypto/ap_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2016
  * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/drivers/s390/crypto/ap_card.c b/kernel/drivers/s390/crypto/ap_card.c
index 836efac96..8a31c9e95 100644
--- a/kernel/drivers/s390/crypto/ap_card.c
+++ b/kernel/drivers/s390/crypto/ap_card.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2016
  * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/drivers/s390/crypto/ap_debug.h b/kernel/drivers/s390/crypto/ap_debug.h
index 78dbff842..6a9d77c75 100644
--- a/kernel/drivers/s390/crypto/ap_debug.h
+++ b/kernel/drivers/s390/crypto/ap_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2016
  *  Author(s): Harald Freudenberger <freude@de.ibm.com>
diff --git a/kernel/drivers/s390/crypto/ap_queue.c b/kernel/drivers/s390/crypto/ap_queue.c
index 56b96edff..6c8bd8ad6 100644
--- a/kernel/drivers/s390/crypto/ap_queue.c
+++ b/kernel/drivers/s390/crypto/ap_queue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2016
  * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/kernel/drivers/s390/crypto/zcrypt_cex4.h b/kernel/drivers/s390/crypto/zcrypt_cex4.h
index 719571375..748390a37 100644
--- a/kernel/drivers/s390/crypto/zcrypt_cex4.h
+++ b/kernel/drivers/s390/crypto/zcrypt_cex4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2012
  *  Author(s): Holger Dengler <hd@linux.vnet.ibm.com>
diff --git a/kernel/drivers/s390/crypto/zcrypt_debug.h b/kernel/drivers/s390/crypto/zcrypt_debug.h
index 13e38defb..241dbb5f7 100644
--- a/kernel/drivers/s390/crypto/zcrypt_debug.h
+++ b/kernel/drivers/s390/crypto/zcrypt_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright IBM Corp. 2016
  *  Author(s): Holger Dengler (hd@linux.vnet.ibm.com)
diff --git a/kernel/drivers/s390/net/Makefile b/kernel/drivers/s390/net/Makefile
index c351b0760..513b7ae64 100644
--- a/kernel/drivers/s390/net/Makefile
+++ b/kernel/drivers/s390/net/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # S/390 network devices
 #
diff --git a/kernel/drivers/s390/net/ctcm_dbug.c b/kernel/drivers/s390/net/ctcm_dbug.c
index 8363f1c96..f7ec51db3 100644
--- a/kernel/drivers/s390/net/ctcm_dbug.c
+++ b/kernel/drivers/s390/net/ctcm_dbug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Copyright IBM Corp. 2001, 2007
  *	Authors:	Peter Tiedemann (ptiedem@de.ibm.com)
diff --git a/kernel/drivers/s390/net/ctcm_dbug.h b/kernel/drivers/s390/net/ctcm_dbug.h
index 47bf05019..675575ef1 100644
--- a/kernel/drivers/s390/net/ctcm_dbug.h
+++ b/kernel/drivers/s390/net/ctcm_dbug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Copyright IBM Corp. 2001, 2007
  *	Authors:	Peter Tiedemann (ptiedem@de.ibm.com)
diff --git a/kernel/drivers/s390/net/ctcm_fsms.c b/kernel/drivers/s390/net/ctcm_fsms.c
index 570ae3b7a..1b4ee570b 100644
--- a/kernel/drivers/s390/net/ctcm_fsms.c
+++ b/kernel/drivers/s390/net/ctcm_fsms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2001, 2007
  * Authors:	Fritz Elfert (felfert@millenux.com)
diff --git a/kernel/drivers/s390/net/ctcm_fsms.h b/kernel/drivers/s390/net/ctcm_fsms.h
index c963d0479..225737295 100644
--- a/kernel/drivers/s390/net/ctcm_fsms.h
+++ b/kernel/drivers/s390/net/ctcm_fsms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2001, 2007
  * Authors: 	Fritz Elfert (felfert@millenux.com)
diff --git a/kernel/drivers/s390/net/ctcm_main.h b/kernel/drivers/s390/net/ctcm_main.h
index 6f4417c80..16bdf23ee 100644
--- a/kernel/drivers/s390/net/ctcm_main.h
+++ b/kernel/drivers/s390/net/ctcm_main.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Copyright IBM Corp. 2001, 2007
  *	Authors:	Fritz Elfert (felfert@millenux.com)
diff --git a/kernel/drivers/s390/net/ctcm_mpc.c b/kernel/drivers/s390/net/ctcm_mpc.c
index f8be39634..e02f295d3 100644
--- a/kernel/drivers/s390/net/ctcm_mpc.c
+++ b/kernel/drivers/s390/net/ctcm_mpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Copyright IBM Corp. 2004, 2007
  *	Authors:	Belinda Thompson (belindat@us.ibm.com)
diff --git a/kernel/drivers/s390/net/ctcm_mpc.h b/kernel/drivers/s390/net/ctcm_mpc.h
index bd1b1cc54..441d7b211 100644
--- a/kernel/drivers/s390/net/ctcm_mpc.h
+++ b/kernel/drivers/s390/net/ctcm_mpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright IBM Corp. 2007
  * Authors:	Peter Tiedemann (ptiedem@de.ibm.com)
diff --git a/kernel/drivers/s390/net/ctcm_sysfs.c b/kernel/drivers/s390/net/ctcm_sysfs.c
index ddb0aa321..ded1930a0 100644
--- a/kernel/drivers/s390/net/ctcm_sysfs.c
+++ b/kernel/drivers/s390/net/ctcm_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2007, 2007
  * Authors:	Peter Tiedemann (ptiedem@de.ibm.com)
diff --git a/kernel/drivers/s390/net/fsm.h b/kernel/drivers/s390/net/fsm.h
index a4510cf59..16dc071a2 100644
--- a/kernel/drivers/s390/net/fsm.h
+++ b/kernel/drivers/s390/net/fsm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FSM_H_
 #define _FSM_H_
 
diff --git a/kernel/drivers/s390/net/lcs.h b/kernel/drivers/s390/net/lcs.h
index 150fcb4ce..f94d8f6dd 100644
--- a/kernel/drivers/s390/net/lcs.h
+++ b/kernel/drivers/s390/net/lcs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*lcs.h*/
 
 #include <linux/interrupt.h>
diff --git a/kernel/drivers/s390/net/qeth_core.h b/kernel/drivers/s390/net/qeth_core.h
index 59e09854c..47a13c572 100644
--- a/kernel/drivers/s390/net/qeth_core.h
+++ b/kernel/drivers/s390/net/qeth_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
diff --git a/kernel/drivers/s390/net/qeth_core_mpc.c b/kernel/drivers/s390/net/qeth_core_mpc.c
index 6dd7d05e5..dafb8c643 100644
--- a/kernel/drivers/s390/net/qeth_core_mpc.c
+++ b/kernel/drivers/s390/net/qeth_core_mpc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>,
diff --git a/kernel/drivers/s390/net/qeth_core_mpc.h b/kernel/drivers/s390/net/qeth_core_mpc.h
index 912e0107d..55f3d234e 100644
--- a/kernel/drivers/s390/net/qeth_core_mpc.h
+++ b/kernel/drivers/s390/net/qeth_core_mpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Frank Pavlic <fpavlic@de.ibm.com>,
diff --git a/kernel/drivers/s390/net/qeth_l2.h b/kernel/drivers/s390/net/qeth_l2.h
index 0d59f9a45..d4a8293d3 100644
--- a/kernel/drivers/s390/net/qeth_l2.h
+++ b/kernel/drivers/s390/net/qeth_l2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2013
  *    Author(s): Eugene Crosser <eugene.crosser@ru.ibm.com>
diff --git a/kernel/drivers/s390/net/qeth_l2_sys.c b/kernel/drivers/s390/net/qeth_l2_sys.c
index 9696baa49..d33d413f7 100644
--- a/kernel/drivers/s390/net/qeth_l2_sys.c
+++ b/kernel/drivers/s390/net/qeth_l2_sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2013
  *    Author(s): Eugene Crosser <eugene.crosser@ru.ibm.com>
diff --git a/kernel/drivers/s390/net/qeth_l3.h b/kernel/drivers/s390/net/qeth_l3.h
index 9b5e439f1..194ae9b57 100644
--- a/kernel/drivers/s390/net/qeth_l3.h
+++ b/kernel/drivers/s390/net/qeth_l3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
diff --git a/kernel/drivers/s390/net/qeth_l3_sys.c b/kernel/drivers/s390/net/qeth_l3_sys.c
index e8bcc314c..7a829ad77 100644
--- a/kernel/drivers/s390/net/qeth_l3_sys.c
+++ b/kernel/drivers/s390/net/qeth_l3_sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *    Copyright IBM Corp. 2007
  *    Author(s): Utz Bacher <utz.bacher@de.ibm.com>,
diff --git a/kernel/drivers/s390/net/smsgiucv.h b/kernel/drivers/s390/net/smsgiucv.h
index 45bc92592..a0d6c6130 100644
--- a/kernel/drivers/s390/net/smsgiucv.h
+++ b/kernel/drivers/s390/net/smsgiucv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IUCV special message driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_ccw.c b/kernel/drivers/s390/scsi/zfcp_ccw.c
index 54c7b48fd..49eda141e 100644
--- a/kernel/drivers/s390/scsi/zfcp_ccw.c
+++ b/kernel/drivers/s390/scsi/zfcp_ccw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_dbf.c b/kernel/drivers/s390/scsi/zfcp_dbf.c
index 8227076c9..a8b831000 100644
--- a/kernel/drivers/s390/scsi/zfcp_dbf.c
+++ b/kernel/drivers/s390/scsi/zfcp_dbf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_dbf.h b/kernel/drivers/s390/scsi/zfcp_dbf.h
index 3508c0045..e2a973cd2 100644
--- a/kernel/drivers/s390/scsi/zfcp_dbf.h
+++ b/kernel/drivers/s390/scsi/zfcp_dbf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  * debug feature declarations
diff --git a/kernel/drivers/s390/scsi/zfcp_def.h b/kernel/drivers/s390/scsi/zfcp_def.h
index b8e853e53..3396a4772 100644
--- a/kernel/drivers/s390/scsi/zfcp_def.h
+++ b/kernel/drivers/s390/scsi/zfcp_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_erp.c b/kernel/drivers/s390/scsi/zfcp_erp.c
index ec2532ee1..cbb8156bf 100644
--- a/kernel/drivers/s390/scsi/zfcp_erp.c
+++ b/kernel/drivers/s390/scsi/zfcp_erp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_ext.h b/kernel/drivers/s390/scsi/zfcp_ext.h
index a9e968717..8ca2ab7de 100644
--- a/kernel/drivers/s390/scsi/zfcp_ext.h
+++ b/kernel/drivers/s390/scsi/zfcp_ext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_fc.c b/kernel/drivers/s390/scsi/zfcp_fc.c
index 8210645c2..ca218c823 100644
--- a/kernel/drivers/s390/scsi/zfcp_fc.c
+++ b/kernel/drivers/s390/scsi/zfcp_fc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_fc.h b/kernel/drivers/s390/scsi/zfcp_fc.h
index 41f22d3dc..6a397ddaa 100644
--- a/kernel/drivers/s390/scsi/zfcp_fc.h
+++ b/kernel/drivers/s390/scsi/zfcp_fc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_fsf.c b/kernel/drivers/s390/scsi/zfcp_fsf.c
index 69d1dc3ec..00fb98f7b 100644
--- a/kernel/drivers/s390/scsi/zfcp_fsf.c
+++ b/kernel/drivers/s390/scsi/zfcp_fsf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_fsf.h b/kernel/drivers/s390/scsi/zfcp_fsf.h
index 88feba5bf..4baca67ab 100644
--- a/kernel/drivers/s390/scsi/zfcp_fsf.h
+++ b/kernel/drivers/s390/scsi/zfcp_fsf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_qdio.c b/kernel/drivers/s390/scsi/zfcp_qdio.c
index 9e358fc04..4ab02e8d3 100644
--- a/kernel/drivers/s390/scsi/zfcp_qdio.c
+++ b/kernel/drivers/s390/scsi/zfcp_qdio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_qdio.h b/kernel/drivers/s390/scsi/zfcp_qdio.h
index 7f647a90c..886c662cc 100644
--- a/kernel/drivers/s390/scsi/zfcp_qdio.h
+++ b/kernel/drivers/s390/scsi/zfcp_qdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_reqlist.h b/kernel/drivers/s390/scsi/zfcp_reqlist.h
index 703fce59b..59a943c0d 100644
--- a/kernel/drivers/s390/scsi/zfcp_reqlist.h
+++ b/kernel/drivers/s390/scsi/zfcp_reqlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_scsi.c b/kernel/drivers/s390/scsi/zfcp_scsi.c
index 6cf873262..4d2ba5682 100644
--- a/kernel/drivers/s390/scsi/zfcp_scsi.c
+++ b/kernel/drivers/s390/scsi/zfcp_scsi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_sysfs.c b/kernel/drivers/s390/scsi/zfcp_sysfs.c
index 96a0be13e..3ac823f25 100644
--- a/kernel/drivers/s390/scsi/zfcp_sysfs.c
+++ b/kernel/drivers/s390/scsi/zfcp_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/s390/scsi/zfcp_unit.c b/kernel/drivers/s390/scsi/zfcp_unit.c
index 9310a547b..1bf0a0984 100644
--- a/kernel/drivers/s390/scsi/zfcp_unit.c
+++ b/kernel/drivers/s390/scsi/zfcp_unit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * zfcp device driver
  *
diff --git a/kernel/drivers/sbus/char/Makefile b/kernel/drivers/sbus/char/Makefile
index 78b6183c9..ae478144c 100644
--- a/kernel/drivers/sbus/char/Makefile
+++ b/kernel/drivers/sbus/char/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel miscellaneous SPARC device drivers.
 #
diff --git a/kernel/drivers/sbus/char/bbc_envctrl.c b/kernel/drivers/sbus/char/bbc_envctrl.c
index 228c782d6..fb5bcf6dd 100644
--- a/kernel/drivers/sbus/char/bbc_envctrl.c
+++ b/kernel/drivers/sbus/char/bbc_envctrl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* bbc_envctrl.c: UltraSPARC-III environment control driver.
  *
  * Copyright (C) 2001, 2008 David S. Miller (davem@davemloft.net)
diff --git a/kernel/drivers/sbus/char/bbc_i2c.h b/kernel/drivers/sbus/char/bbc_i2c.h
index 4b4531066..c2d066d3f 100644
--- a/kernel/drivers/sbus/char/bbc_i2c.h
+++ b/kernel/drivers/sbus/char/bbc_i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BBC_I2C_H
 #define _BBC_I2C_H
 
diff --git a/kernel/drivers/sbus/char/max1617.h b/kernel/drivers/sbus/char/max1617.h
index cd30819a0..45c831878 100644
--- a/kernel/drivers/sbus/char/max1617.h
+++ b/kernel/drivers/sbus/char/max1617.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: max1617.h,v 1.1 2001/04/02 09:59:08 davem Exp $ */
 #ifndef _MAX1617_H
 #define _MAX1617_H
diff --git a/kernel/drivers/scsi/53c700.h b/kernel/drivers/scsi/53c700.h
index f34c916b9..0c9a100af 100644
--- a/kernel/drivers/scsi/53c700.h
+++ b/kernel/drivers/scsi/53c700.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* -*- mode: c; c-basic-offset: 8 -*- */
 
 /* Driver for 53c700 and 53c700-66 chips from NCR and Symbios
diff --git a/kernel/drivers/scsi/Makefile b/kernel/drivers/scsi/Makefile
index 93dbe58c4..1639bf8b1 100644
--- a/kernel/drivers/scsi/Makefile
+++ b/kernel/drivers/scsi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for linux/drivers/scsi
 #
diff --git a/kernel/drivers/scsi/NCR5380.c b/kernel/drivers/scsi/NCR5380.c
index 8a0812221..777b0222d 100644
--- a/kernel/drivers/scsi/NCR5380.c
+++ b/kernel/drivers/scsi/NCR5380.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NCR 5380 generic driver routines.  These should make it *trivial*
  * to implement 5380 SCSI drivers under Linux with a non-trantor
diff --git a/kernel/drivers/scsi/NCR5380.h b/kernel/drivers/scsi/NCR5380.h
index d78f0957d..31096a0b0 100644
--- a/kernel/drivers/scsi/NCR5380.h
+++ b/kernel/drivers/scsi/NCR5380.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  * NCR 5380 defines
  *
diff --git a/kernel/drivers/scsi/NCR_D700.h b/kernel/drivers/scsi/NCR_D700.h
index f167af6bd..eb675d782 100644
--- a/kernel/drivers/scsi/NCR_D700.h
+++ b/kernel/drivers/scsi/NCR_D700.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* -*- mode: c; c-basic-offset: 8 -*- */
 
 /* NCR Dual 700 MCA SCSI Driver
diff --git a/kernel/drivers/scsi/NCR_Q720.h b/kernel/drivers/scsi/NCR_Q720.h
index 7b9209008..d5f46cdb7 100644
--- a/kernel/drivers/scsi/NCR_Q720.h
+++ b/kernel/drivers/scsi/NCR_Q720.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* -*- mode: c; c-basic-offset: 8 -*- */
 
 /* NCR Quad 720 MCA SCSI Driver
diff --git a/kernel/drivers/scsi/a2091.h b/kernel/drivers/scsi/a2091.h
index 794b8e65c..8d8a4074a 100644
--- a/kernel/drivers/scsi/a2091.h
+++ b/kernel/drivers/scsi/a2091.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef A2091_H
 #define A2091_H
 
diff --git a/kernel/drivers/scsi/a3000.h b/kernel/drivers/scsi/a3000.h
index 49db4a335..5cb3e7535 100644
--- a/kernel/drivers/scsi/a3000.h
+++ b/kernel/drivers/scsi/a3000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef A3000_H
 #define A3000_H
 
diff --git a/kernel/drivers/scsi/aha152x.h b/kernel/drivers/scsi/aha152x.h
index ac4bfa438..efd01877d 100644
--- a/kernel/drivers/scsi/aha152x.h
+++ b/kernel/drivers/scsi/aha152x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AHA152X_H
 #define _AHA152X_H
 
diff --git a/kernel/drivers/scsi/aha1542.h b/kernel/drivers/scsi/aha1542.h
index 0fe9bae1b..f5b0d210f 100644
--- a/kernel/drivers/scsi/aha1542.h
+++ b/kernel/drivers/scsi/aha1542.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AHA1542_H_
 #define _AHA1542_H_
 
diff --git a/kernel/drivers/scsi/aha1740.h b/kernel/drivers/scsi/aha1740.h
index b0c560346..dfdaa4d3e 100644
--- a/kernel/drivers/scsi/aha1740.h
+++ b/kernel/drivers/scsi/aha1740.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AHA1740_H
 
 /* $Id$
diff --git a/kernel/drivers/scsi/aic7xxx/Makefile b/kernel/drivers/scsi/aic7xxx/Makefile
index b03ba0df7..c15be2590 100644
--- a/kernel/drivers/scsi/aic7xxx/Makefile
+++ b/kernel/drivers/scsi/aic7xxx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux aic7xxx SCSI driver.
 #
diff --git a/kernel/drivers/scsi/aic7xxx/aicasm/Makefile b/kernel/drivers/scsi/aic7xxx/aicasm/Makefile
index 45e2d49c1..243adb0a3 100644
--- a/kernel/drivers/scsi/aic7xxx/aicasm/Makefile
+++ b/kernel/drivers/scsi/aic7xxx/aicasm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 PROG=	aicasm
 
 OUTDIR ?= ./
diff --git a/kernel/drivers/scsi/arm/Makefile b/kernel/drivers/scsi/arm/Makefile
index 16c3e86a6..b576d9276 100644
--- a/kernel/drivers/scsi/arm/Makefile
+++ b/kernel/drivers/scsi/arm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for drivers/scsi/arm
 #
diff --git a/kernel/drivers/scsi/atp870u.h b/kernel/drivers/scsi/atp870u.h
index 9b839b1e8..75c44399f 100644
--- a/kernel/drivers/scsi/atp870u.h
+++ b/kernel/drivers/scsi/atp870u.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ATP870U_H
 #define _ATP870U_H
 
diff --git a/kernel/drivers/scsi/bfa/Makefile b/kernel/drivers/scsi/bfa/Makefile
index 475cf925d..442fc3db8 100644
--- a/kernel/drivers/scsi/bfa/Makefile
+++ b/kernel/drivers/scsi/bfa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SCSI_BFA_FC) := bfa.o
 
 bfa-y := bfad.o bfad_im.o bfad_attr.o bfad_debugfs.o bfad_bsg.o
diff --git a/kernel/drivers/scsi/constants.c b/kernel/drivers/scsi/constants.c
index 6dc96c8df..d4c2a2e4c 100644
--- a/kernel/drivers/scsi/constants.c
+++ b/kernel/drivers/scsi/constants.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ASCII values for a number of symbolic constants, printing functions,
  * etc.
diff --git a/kernel/drivers/scsi/csiostor/Makefile b/kernel/drivers/scsi/csiostor/Makefile
index 3681a3fbd..d047e22ea 100644
--- a/kernel/drivers/scsi/csiostor/Makefile
+++ b/kernel/drivers/scsi/csiostor/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 ## Chelsio FCoE driver
 #
diff --git a/kernel/drivers/scsi/dc395x.h b/kernel/drivers/scsi/dc395x.h
index fbf35e377..5379a9361 100644
--- a/kernel/drivers/scsi/dc395x.h
+++ b/kernel/drivers/scsi/dc395x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /************************************************************************/
 /*									*/
 /*	dc395x.h							*/
diff --git a/kernel/drivers/scsi/eata_generic.h b/kernel/drivers/scsi/eata_generic.h
index 5016af5cf..1a396c5e7 100644
--- a/kernel/drivers/scsi/eata_generic.h
+++ b/kernel/drivers/scsi/eata_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /********************************************************
 * Header file for eata_dma.c and eata_pio.c		*
 * Linux EATA SCSI drivers				*
diff --git a/kernel/drivers/scsi/eata_pio.h b/kernel/drivers/scsi/eata_pio.h
index 7deeb9357..5b5e3d136 100644
--- a/kernel/drivers/scsi/eata_pio.h
+++ b/kernel/drivers/scsi/eata_pio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /********************************************************
 * Header file for eata_pio.c Linux EATA-PIO SCSI driver *
 * (c) 1993-96 Michael Neuffer  	                        *
diff --git a/kernel/drivers/scsi/esp_scsi.h b/kernel/drivers/scsi/esp_scsi.h
index 7e8932ae9..8163dca20 100644
--- a/kernel/drivers/scsi/esp_scsi.h
+++ b/kernel/drivers/scsi/esp_scsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* esp_scsi.h: Defines and structures for the ESP driver.
  *
  * Copyright (C) 2007 David S. Miller (davem@davemloft.net)
diff --git a/kernel/drivers/scsi/fcoe/libfcoe.h b/kernel/drivers/scsi/fcoe/libfcoe.h
index d3bb16d11..b8bdfab51 100644
--- a/kernel/drivers/scsi/fcoe/libfcoe.h
+++ b/kernel/drivers/scsi/fcoe/libfcoe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FCOE_LIBFCOE_H_
 #define _FCOE_LIBFCOE_H_
 
diff --git a/kernel/drivers/scsi/fnic/Makefile b/kernel/drivers/scsi/fnic/Makefile
index 383598fad..6214a6b2e 100644
--- a/kernel/drivers/scsi/fnic/Makefile
+++ b/kernel/drivers/scsi/fnic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FCOE_FNIC) += fnic.o
 
 fnic-y	:= \
diff --git a/kernel/drivers/scsi/gdth.h b/kernel/drivers/scsi/gdth.h
index 3fd8b83ff..95fc720c1 100644
--- a/kernel/drivers/scsi/gdth.h
+++ b/kernel/drivers/scsi/gdth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GDTH_H
 #define _GDTH_H
 
diff --git a/kernel/drivers/scsi/gdth_ioctl.h b/kernel/drivers/scsi/gdth_ioctl.h
index b004c6165..4c91894ac 100644
--- a/kernel/drivers/scsi/gdth_ioctl.h
+++ b/kernel/drivers/scsi/gdth_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GDTH_IOCTL_H
 #define _GDTH_IOCTL_H
 
diff --git a/kernel/drivers/scsi/gdth_proc.c b/kernel/drivers/scsi/gdth_proc.c
index d08b27167..20add49cd 100644
--- a/kernel/drivers/scsi/gdth_proc.c
+++ b/kernel/drivers/scsi/gdth_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* gdth_proc.c 
  * $Id: gdth_proc.c,v 1.43 2006/01/11 16:15:00 achim Exp $
  */
diff --git a/kernel/drivers/scsi/gdth_proc.h b/kernel/drivers/scsi/gdth_proc.h
index aaa618198..d7d0aa283 100644
--- a/kernel/drivers/scsi/gdth_proc.h
+++ b/kernel/drivers/scsi/gdth_proc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GDTH_PROC_H
 #define _GDTH_PROC_H
 
diff --git a/kernel/drivers/scsi/gvp11.h b/kernel/drivers/scsi/gvp11.h
index 852913cde..61c1a3584 100644
--- a/kernel/drivers/scsi/gvp11.h
+++ b/kernel/drivers/scsi/gvp11.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GVP11_H
 
 /* $Id: gvp11.h,v 1.4 1997/01/19 23:07:12 davem Exp $
diff --git a/kernel/drivers/scsi/ibmvscsi_tgt/libsrp.h b/kernel/drivers/scsi/ibmvscsi_tgt/libsrp.h
index 9fec55b36..832606ae2 100644
--- a/kernel/drivers/scsi/ibmvscsi_tgt/libsrp.h
+++ b/kernel/drivers/scsi/ibmvscsi_tgt/libsrp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LIBSRP_H__
 #define __LIBSRP_H__
 
diff --git a/kernel/drivers/scsi/imm.h b/kernel/drivers/scsi/imm.h
index 8f6f32fc6..7f2bb35b1 100644
--- a/kernel/drivers/scsi/imm.h
+++ b/kernel/drivers/scsi/imm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*  Driver for the Iomega MatchMaker parallel port SCSI HBA embedded in 
  * the Iomega ZIP Plus drive
diff --git a/kernel/drivers/scsi/isci/Makefile b/kernel/drivers/scsi/isci/Makefile
index 3359e10e0..da6f04cae 100644
--- a/kernel/drivers/scsi/isci/Makefile
+++ b/kernel/drivers/scsi/isci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SCSI_ISCI) += isci.o
 isci-objs := init.o phy.o request.o \
 	     remote_device.o port.o \
diff --git a/kernel/drivers/scsi/libfc/Makefile b/kernel/drivers/scsi/libfc/Makefile
index 4bb23ac86..65396f86c 100644
--- a/kernel/drivers/scsi/libfc/Makefile
+++ b/kernel/drivers/scsi/libfc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # $Id: Makefile
 
 obj-$(CONFIG_LIBFC) += libfc.o
diff --git a/kernel/drivers/scsi/mac53c94.h b/kernel/drivers/scsi/mac53c94.h
index 1ad24e4f0..5df6e81f7 100644
--- a/kernel/drivers/scsi/mac53c94.h
+++ b/kernel/drivers/scsi/mac53c94.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mac53c94.h: definitions for the driver for the 53c94 SCSI bus adaptor
  * found on Power Macintosh computers, controlling the external SCSI chain.
diff --git a/kernel/drivers/scsi/megaraid.h b/kernel/drivers/scsi/megaraid.h
index 508d65e5a..21eba2fd4 100644
--- a/kernel/drivers/scsi/megaraid.h
+++ b/kernel/drivers/scsi/megaraid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MEGARAID_H__
 #define __MEGARAID_H__
 
diff --git a/kernel/drivers/scsi/megaraid/Makefile b/kernel/drivers/scsi/megaraid/Makefile
index 5826ed509..6e74d2122 100644
--- a/kernel/drivers/scsi/megaraid/Makefile
+++ b/kernel/drivers/scsi/megaraid/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MEGARAID_MM)	+= megaraid_mm.o
 obj-$(CONFIG_MEGARAID_MAILBOX)	+= megaraid_mbox.o
 obj-$(CONFIG_MEGARAID_SAS)	+= megaraid_sas.o
diff --git a/kernel/drivers/scsi/mesh.h b/kernel/drivers/scsi/mesh.h
index 4fdb81fa5..ee53c05ac 100644
--- a/kernel/drivers/scsi/mesh.h
+++ b/kernel/drivers/scsi/mesh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mesh.h: definitions for the driver for the MESH SCSI bus adaptor
  * (Macintosh Enhanced SCSI Hardware) found on Power Macintosh computers.
diff --git a/kernel/drivers/scsi/mpt3sas/Makefile b/kernel/drivers/scsi/mpt3sas/Makefile
index b7643f596..84fb3fbdb 100644
--- a/kernel/drivers/scsi/mpt3sas/Makefile
+++ b/kernel/drivers/scsi/mpt3sas/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # mpt3sas makefile
 obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas.o
 mpt3sas-y +=  mpt3sas_base.o     \
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2.h
index a9a659fc2..2608011cc 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2015 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
index fa61baf7c..036c9cf61 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2015 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_init.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_init.h
index bba56b61d..38b2c879b 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_init.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2015 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h
index af4be4035..673cf05f9 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2015 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_raid.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_raid.h
index 1c0eeeeb5..b9bb1c178 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_raid.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_raid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2014 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_sas.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_sas.h
index c10c2c02a..afa17ff24 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_sas.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_sas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2015 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_tool.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_tool.h
index 5f9289a11..593765a4d 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_tool.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_tool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2000-2014 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_type.h b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_type.h
index 92a81abc2..36494439a 100644
--- a/kernel/drivers/scsi/mpt3sas/mpi/mpi2_type.h
+++ b/kernel/drivers/scsi/mpt3sas/mpi/mpi2_type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright 2000-2014 Avago Technologies.  All rights reserved.
  *
diff --git a/kernel/drivers/scsi/mvme147.c b/kernel/drivers/scsi/mvme147.c
index 4f515700b..e6b2b681f 100644
--- a/kernel/drivers/scsi/mvme147.c
+++ b/kernel/drivers/scsi/mvme147.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/blkdev.h>
diff --git a/kernel/drivers/scsi/mvme147.h b/kernel/drivers/scsi/mvme147.h
index bfd4566ef..f75ff58dd 100644
--- a/kernel/drivers/scsi/mvme147.h
+++ b/kernel/drivers/scsi/mvme147.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MVME147_H
 
 /* $Id: mvme147.h,v 1.4 1997/01/19 23:07:10 davem Exp $
diff --git a/kernel/drivers/scsi/osst.h b/kernel/drivers/scsi/osst.h
index b4fea98ba..b90ae2808 100644
--- a/kernel/drivers/scsi/osst.h
+++ b/kernel/drivers/scsi/osst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	$Header: /cvsroot/osst/Driver/osst.h,v 1.16 2005/01/01 21:13:35 wriede Exp $
  */
diff --git a/kernel/drivers/scsi/osst_detect.h b/kernel/drivers/scsi/osst_detect.h
index 21717d0e6..83c1d4fb1 100644
--- a/kernel/drivers/scsi/osst_detect.h
+++ b/kernel/drivers/scsi/osst_detect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define SIGS_FROM_OSST \
        {"OnStream", "SC-", "", "osst"}, \
        {"OnStream", "DI-", "", "osst"}, \
diff --git a/kernel/drivers/scsi/osst_options.h b/kernel/drivers/scsi/osst_options.h
index ff1e61094..a6a389b88 100644
--- a/kernel/drivers/scsi/osst_options.h
+++ b/kernel/drivers/scsi/osst_options.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
    The compile-time configurable defaults for the Linux SCSI tape driver.
 
diff --git a/kernel/drivers/scsi/pcmcia/Makefile b/kernel/drivers/scsi/pcmcia/Makefile
index 683bf148b..44eea2d43 100644
--- a/kernel/drivers/scsi/pcmcia/Makefile
+++ b/kernel/drivers/scsi/pcmcia/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-y		:= -Idrivers/scsi
 
diff --git a/kernel/drivers/scsi/pm8001/Makefile b/kernel/drivers/scsi/pm8001/Makefile
index ce4cd87c7..02b733899 100644
--- a/kernel/drivers/scsi/pm8001/Makefile
+++ b/kernel/drivers/scsi/pm8001/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Kernel configuration file for the PM8001 SAS/SATA 8x6G based HBA driver
 #
diff --git a/kernel/drivers/scsi/ppa.h b/kernel/drivers/scsi/ppa.h
index ba8021427..6a1f8a2d7 100644
--- a/kernel/drivers/scsi/ppa.h
+++ b/kernel/drivers/scsi/ppa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*  Driver for the PPA3 parallel port SCSI HBA embedded in 
  * the Iomega ZIP drive
  * 
diff --git a/kernel/drivers/scsi/qla2xxx/Makefile b/kernel/drivers/scsi/qla2xxx/Makefile
index 0b767a0bb..17d5bc1cc 100644
--- a/kernel/drivers/scsi/qla2xxx/Makefile
+++ b/kernel/drivers/scsi/qla2xxx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \
 		qla_nx.o qla_mr.o qla_nx2.o qla_target.o qla_tmpl.o qla_nvme.o
diff --git a/kernel/drivers/scsi/qla2xxx/qla_devtbl.h b/kernel/drivers/scsi/qla2xxx/qla_devtbl.h
index d6ea69df7..ffb9694be 100644
--- a/kernel/drivers/scsi/qla2xxx/qla_devtbl.h
+++ b/kernel/drivers/scsi/qla2xxx/qla_devtbl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define QLA_MODEL_NAMES		0x5C
 
 /*
diff --git a/kernel/drivers/scsi/qla2xxx/qla_os.c b/kernel/drivers/scsi/qla2xxx/qla_os.c
index 3bd956d3b..dce42a416 100644
--- a/kernel/drivers/scsi/qla2xxx/qla_os.c
+++ b/kernel/drivers/scsi/qla2xxx/qla_os.c
@@ -3212,6 +3212,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 		ql_log(ql_log_fatal, base_vha, 0x00ed,
 		    "Failed to start DPC thread.\n");
 		ret = PTR_ERR(ha->dpc_thread);
+		ha->dpc_thread = NULL;
 		goto probe_failed;
 	}
 	ql_dbg(ql_dbg_init, base_vha, 0x00ee,
diff --git a/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h b/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h
index 071035dfa..7550ba283 100644
--- a/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h
+++ b/kernel/drivers/scsi/qla2xxx/tcm_qla2xxx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <target/target_core_base.h>
 #include <linux/btree.h>
 
diff --git a/kernel/drivers/scsi/qlogicfas408.h b/kernel/drivers/scsi/qlogicfas408.h
index f6b1216af..a971db11d 100644
--- a/kernel/drivers/scsi/qlogicfas408.h
+++ b/kernel/drivers/scsi/qlogicfas408.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* to be used by qlogicfas and qlogic_cs */
 #ifndef __QLOGICFAS408_H
 #define __QLOGICFAS408_H
diff --git a/kernel/drivers/scsi/qlogicpti.h b/kernel/drivers/scsi/qlogicpti.h
index 892a0b058..884ad72ad 100644
--- a/kernel/drivers/scsi/qlogicpti.h
+++ b/kernel/drivers/scsi/qlogicpti.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* qlogicpti.h: Performance Technologies QlogicISP sbus card defines.
  *
  * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu)
diff --git a/kernel/drivers/scsi/scsi.h b/kernel/drivers/scsi/scsi.h
index d5a55fae6..6dcc4c685 100644
--- a/kernel/drivers/scsi/scsi.h
+++ b/kernel/drivers/scsi/scsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  scsi.h Copyright (C) 1992 Drew Eckhardt 
  *         Copyright (C) 1993, 1994, 1995, 1998, 1999 Eric Youngdale
diff --git a/kernel/drivers/scsi/scsi_common.c b/kernel/drivers/scsi/scsi_common.c
index a75673bb8..40bc616cf 100644
--- a/kernel/drivers/scsi/scsi_common.c
+++ b/kernel/drivers/scsi/scsi_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCSI functions used by both the initiator and the target code.
  */
diff --git a/kernel/drivers/scsi/scsi_debugfs.c b/kernel/drivers/scsi/scsi_debugfs.c
index 5e9755008..01f08c03f 100644
--- a/kernel/drivers/scsi/scsi_debugfs.c
+++ b/kernel/drivers/scsi/scsi_debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/seq_file.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_dbg.h>
diff --git a/kernel/drivers/scsi/scsi_devinfo.c b/kernel/drivers/scsi/scsi_devinfo.c
index 28fea83ae..6bf43d94c 100644
--- a/kernel/drivers/scsi/scsi_devinfo.c
+++ b/kernel/drivers/scsi/scsi_devinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/blkdev.h>
 #include <linux/init.h>
diff --git a/kernel/drivers/scsi/scsi_lib_dma.c b/kernel/drivers/scsi/scsi_lib_dma.c
index 2ac3f3975..572391527 100644
--- a/kernel/drivers/scsi/scsi_lib_dma.c
+++ b/kernel/drivers/scsi/scsi_lib_dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SCSI library functions depending on DMA
  */
diff --git a/kernel/drivers/scsi/scsi_logging.h b/kernel/drivers/scsi/scsi_logging.h
index 7fe64a847..6907c924d 100644
--- a/kernel/drivers/scsi/scsi_logging.h
+++ b/kernel/drivers/scsi/scsi_logging.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_LOGGING_H
 #define _SCSI_LOGGING_H
 
diff --git a/kernel/drivers/scsi/scsi_priv.h b/kernel/drivers/scsi/scsi_priv.h
index 5c6d016a5..d7669caa9 100644
--- a/kernel/drivers/scsi/scsi_priv.h
+++ b/kernel/drivers/scsi/scsi_priv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_PRIV_H
 #define _SCSI_PRIV_H
 
diff --git a/kernel/drivers/scsi/scsi_proc.c b/kernel/drivers/scsi/scsi_proc.c
index 480a597b3..7f0ceb65c 100644
--- a/kernel/drivers/scsi/scsi_proc.c
+++ b/kernel/drivers/scsi/scsi_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/drivers/scsi/scsi_proc.c
  *
diff --git a/kernel/drivers/scsi/scsi_sas_internal.h b/kernel/drivers/scsi/scsi_sas_internal.h
index e65991249..82fd548c5 100644
--- a/kernel/drivers/scsi/scsi_sas_internal.h
+++ b/kernel/drivers/scsi/scsi_sas_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SAS_INTERNAL_H
 #define _SCSI_SAS_INTERNAL_H
 
diff --git a/kernel/drivers/scsi/scsi_scan.c b/kernel/drivers/scsi/scsi_scan.c
index 15590a063..40124648a 100644
--- a/kernel/drivers/scsi/scsi_scan.c
+++ b/kernel/drivers/scsi/scsi_scan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * scsi_scan.c
  *
diff --git a/kernel/drivers/scsi/scsi_transport_api.h b/kernel/drivers/scsi/scsi_transport_api.h
index 934f0e62b..f91776653 100644
--- a/kernel/drivers/scsi/scsi_transport_api.h
+++ b/kernel/drivers/scsi/scsi_transport_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_TRANSPORT_API_H
 #define _SCSI_TRANSPORT_API_H
 
diff --git a/kernel/drivers/scsi/scsicam.c b/kernel/drivers/scsi/scsicam.c
index 312734685..e96913805 100644
--- a/kernel/drivers/scsi/scsicam.c
+++ b/kernel/drivers/scsi/scsicam.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * scsicam.c - SCSI CAM support functions, use for HDIO_GETGEO, etc.
  *
diff --git a/kernel/drivers/scsi/sd.h b/kernel/drivers/scsi/sd.h
index 99c4dde9b..320de7583 100644
--- a/kernel/drivers/scsi/sd.h
+++ b/kernel/drivers/scsi/sd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_DISK_H
 #define _SCSI_DISK_H
 
diff --git a/kernel/drivers/scsi/sense_codes.h b/kernel/drivers/scsi/sense_codes.h
index e4e1dccd1..201a53668 100644
--- a/kernel/drivers/scsi/sense_codes.h
+++ b/kernel/drivers/scsi/sense_codes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The canonical list of T10 Additional Sense Codes is available at:
  * http://www.t10.org/lists/asc-num.txt [most recent: 20141221]
diff --git a/kernel/drivers/scsi/snic/Makefile b/kernel/drivers/scsi/snic/Makefile
index ef7c0dd47..41546e3cb 100644
--- a/kernel/drivers/scsi/snic/Makefile
+++ b/kernel/drivers/scsi/snic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SCSI_SNIC) += snic.o
 
 snic-y := \
diff --git a/kernel/drivers/scsi/sr.h b/kernel/drivers/scsi/sr.h
index 1de33719a..a2bb7b8ba 100644
--- a/kernel/drivers/scsi/sr.h
+++ b/kernel/drivers/scsi/sr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *      sr.h by David Giller
  *      CD-ROM disk driver header file
diff --git a/kernel/drivers/scsi/sr_ioctl.c b/kernel/drivers/scsi/sr_ioctl.c
index 4610c8c56..2a21f2d48 100644
--- a/kernel/drivers/scsi/sr_ioctl.c
+++ b/kernel/drivers/scsi/sr_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
diff --git a/kernel/drivers/scsi/sr_vendor.c b/kernel/drivers/scsi/sr_vendor.c
index 11a238cb2..e3b0ce251 100644
--- a/kernel/drivers/scsi/sr_vendor.c
+++ b/kernel/drivers/scsi/sr_vendor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* -*-linux-c-*-
 
  * vendor-specific code for SCSI CD-ROM's goes here.
diff --git a/kernel/drivers/scsi/st.h b/kernel/drivers/scsi/st.h
index 8c732c8de..95d2e7a79 100644
--- a/kernel/drivers/scsi/st.h
+++ b/kernel/drivers/scsi/st.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _ST_H
 #define _ST_H
diff --git a/kernel/drivers/scsi/st_options.h b/kernel/drivers/scsi/st_options.h
index d2f947935..2b6cabd7b 100644
--- a/kernel/drivers/scsi/st_options.h
+++ b/kernel/drivers/scsi/st_options.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
    The compile-time configurable defaults for the Linux SCSI tape driver.
 
diff --git a/kernel/drivers/scsi/ufs/Makefile b/kernel/drivers/scsi/ufs/Makefile
index 6e77cb0bf..9310c6c83 100644
--- a/kernel/drivers/scsi/ufs/Makefile
+++ b/kernel/drivers/scsi/ufs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # UFSHCD makefile
 obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o
 obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o
diff --git a/kernel/drivers/scsi/wd719x.h b/kernel/drivers/scsi/wd719x.h
index 9c6dd45f9..0455b1633 100644
--- a/kernel/drivers/scsi/wd719x.h
+++ b/kernel/drivers/scsi/wd719x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _WD719X_H_
 #define _WD719X_H_
 
diff --git a/kernel/drivers/sh/Makefile b/kernel/drivers/sh/Makefile
index 114203f32..c53262835 100644
--- a/kernel/drivers/sh/Makefile
+++ b/kernel/drivers/sh/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the SuperH specific drivers.
 #
diff --git a/kernel/drivers/sh/intc/internals.h b/kernel/drivers/sh/intc/internals.h
index 6ce7f0d26..fa73c173b 100644
--- a/kernel/drivers/sh/intc/internals.h
+++ b/kernel/drivers/sh/intc/internals.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/sh_intc.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
diff --git a/kernel/drivers/soc/Makefile b/kernel/drivers/soc/Makefile
index 2fcaff864..36dec140e 100644
--- a/kernel/drivers/soc/Makefile
+++ b/kernel/drivers/soc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Kernel SOC specific device drivers.
 #
diff --git a/kernel/drivers/soc/dove/pmu.c b/kernel/drivers/soc/dove/pmu.c
index 95d77ec5c..5abb08ffb 100644
--- a/kernel/drivers/soc/dove/pmu.c
+++ b/kernel/drivers/soc/dove/pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Marvell Dove PMU support
  */
diff --git a/kernel/drivers/soc/fsl/qbman/Makefile b/kernel/drivers/soc/fsl/qbman/Makefile
index 7ae199f16..363982b83 100644
--- a/kernel/drivers/soc/fsl/qbman/Makefile
+++ b/kernel/drivers/soc/fsl/qbman/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FSL_DPAA)                          += bman_ccsr.o qman_ccsr.o \
 						   bman_portal.o qman_portal.o \
 						   bman.o qman.o
diff --git a/kernel/drivers/soc/fsl/qe/Makefile b/kernel/drivers/soc/fsl/qe/Makefile
index 2031d385b..55a555304 100644
--- a/kernel/drivers/soc/fsl/qe/Makefile
+++ b/kernel/drivers/soc/fsl/qe/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux ppc-specific parts of QE
 #
diff --git a/kernel/drivers/soc/qcom/Makefile b/kernel/drivers/soc/qcom/Makefile
index f151de41e..fab44666b 100644
--- a/kernel/drivers/soc/qcom/Makefile
+++ b/kernel/drivers/soc/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_QCOM_GLINK_SSR) +=	glink_ssr.o
 obj-$(CONFIG_QCOM_GSBI)	+=	qcom_gsbi.o
 obj-$(CONFIG_QCOM_MDT_LOADER)	+= mdt_loader.o
diff --git a/kernel/drivers/soc/renesas/Makefile b/kernel/drivers/soc/renesas/Makefile
index 6b6e7f161..763c03d80 100644
--- a/kernel/drivers/soc/renesas/Makefile
+++ b/kernel/drivers/soc/renesas/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Generic, must be first because of soc_device_register()
 obj-$(CONFIG_SOC_RENESAS)	+= renesas-soc.o
 
diff --git a/kernel/drivers/soc/tegra/Makefile b/kernel/drivers/soc/tegra/Makefile
index 0e52b4572..482e108d2 100644
--- a/kernel/drivers/soc/tegra/Makefile
+++ b/kernel/drivers/soc/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += fuse/
 
 obj-y += common.o
diff --git a/kernel/drivers/soc/tegra/fuse/Makefile b/kernel/drivers/soc/tegra/fuse/Makefile
index 21bc27580..ea8332cc3 100644
--- a/kernel/drivers/soc/tegra/fuse/Makefile
+++ b/kernel/drivers/soc/tegra/fuse/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y					+= fuse-tegra.o
 obj-y					+= fuse-tegra30.o
 obj-y					+= tegra-apbmisc.o
diff --git a/kernel/drivers/soc/ti/Makefile b/kernel/drivers/soc/ti/Makefile
index 7d572736c..8e205287f 100644
--- a/kernel/drivers/soc/ti/Makefile
+++ b/kernel/drivers/soc/ti/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # TI Keystone SOC drivers
 #
diff --git a/kernel/drivers/spi/Makefile b/kernel/drivers/spi/Makefile
index a3ae2b70c..8e0cda73b 100644
--- a/kernel/drivers/spi/Makefile
+++ b/kernel/drivers/spi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for kernel SPI drivers.
 #
diff --git a/kernel/drivers/spi/spi-bcm53xx.h b/kernel/drivers/spi/spi-bcm53xx.h
index 73575dfe6..03e344208 100644
--- a/kernel/drivers/spi/spi-bcm53xx.h
+++ b/kernel/drivers/spi/spi-bcm53xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SPI_BCM53XX_H
 #define SPI_BCM53XX_H
 
diff --git a/kernel/drivers/spi/spi-bitbang-txrx.h b/kernel/drivers/spi/spi-bitbang-txrx.h
index 47bb9b898..ae61d72c7 100644
--- a/kernel/drivers/spi/spi-bitbang-txrx.h
+++ b/kernel/drivers/spi/spi-bitbang-txrx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Mix this utility code with some glue code to get one of several types of
  * simple SPI master driver.  Two do polled word-at-a-time I/O:
diff --git a/kernel/drivers/spi/spi-cavium.h b/kernel/drivers/spi/spi-cavium.h
index 1f91d61b7..1f3ac463a 100644
--- a/kernel/drivers/spi/spi-cavium.h
+++ b/kernel/drivers/spi/spi-cavium.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPI_CAVIUM_H
 #define __SPI_CAVIUM_H
 
diff --git a/kernel/drivers/spi/spi-dw.h b/kernel/drivers/spi/spi-dw.h
index da5eab62d..5c07cf8f1 100644
--- a/kernel/drivers/spi/spi-dw.h
+++ b/kernel/drivers/spi/spi-dw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DW_SPI_HEADER_H
 #define DW_SPI_HEADER_H
 
diff --git a/kernel/drivers/ssb/Makefile b/kernel/drivers/ssb/Makefile
index 64a09681c..142d33df0 100644
--- a/kernel/drivers/ssb/Makefile
+++ b/kernel/drivers/ssb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # core
 ssb-y					+= main.o scan.o
 ssb-$(CONFIG_SSB_EMBEDDED)		+= embedded.o
diff --git a/kernel/drivers/ssb/ssb_private.h b/kernel/drivers/ssb/ssb_private.h
index c2f5d3969..ef9ac8efc 100644
--- a/kernel/drivers/ssb/ssb_private.h
+++ b/kernel/drivers/ssb/ssb_private.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_PRIVATE_H_
 #define LINUX_SSB_PRIVATE_H_
 
diff --git a/kernel/drivers/staging/Makefile b/kernel/drivers/staging/Makefile
index 8951c37d8..6e5360200 100644
--- a/kernel/drivers/staging/Makefile
+++ b/kernel/drivers/staging/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for staging directory
 
 obj-y				+= media/
diff --git a/kernel/drivers/staging/android/ion/Makefile b/kernel/drivers/staging/android/ion/Makefile
index eb7eeed6a..bb30bf877 100644
--- a/kernel/drivers/staging/android/ion/Makefile
+++ b/kernel/drivers/staging/android/ion/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_ION) +=	ion.o ion-ioctl.o ion_heap.o
 obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o
 obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o
diff --git a/kernel/drivers/staging/board/board.h b/kernel/drivers/staging/board/board.h
index 42ed12513..5609daf4d 100644
--- a/kernel/drivers/staging/board/board.h
+++ b/kernel/drivers/staging/board/board.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BOARD_H__
 #define __BOARD_H__
 
diff --git a/kernel/drivers/staging/board/kzm9d.c b/kernel/drivers/staging/board/kzm9d.c
index 05a6d434d..d449a8374 100644
--- a/kernel/drivers/staging/board/kzm9d.c
+++ b/kernel/drivers/staging/board/kzm9d.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Staging board support for KZM9D. Enable not-yet-DT-capable devices here. */
 
 #include <linux/kernel.h>
diff --git a/kernel/drivers/staging/comedi/Makefile b/kernel/drivers/staging/comedi/Makefile
index 7f9dfb392..6af5da3b4 100644
--- a/kernel/drivers/staging/comedi/Makefile
+++ b/kernel/drivers/staging/comedi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_COMEDI_DEBUG)		:= -DDEBUG
 
 comedi-y				:= comedi_fops.o range.o drivers.o \
diff --git a/kernel/drivers/staging/comedi/comedi_internal.h b/kernel/drivers/staging/comedi/comedi_internal.h
index 6246f4a78..515f293a5 100644
--- a/kernel/drivers/staging/comedi/comedi_internal.h
+++ b/kernel/drivers/staging/comedi/comedi_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _COMEDI_INTERNAL_H
 #define _COMEDI_INTERNAL_H
 
diff --git a/kernel/drivers/staging/comedi/drivers/Makefile b/kernel/drivers/staging/comedi/drivers/Makefile
index 0c8cfa738..736e7e552 100644
--- a/kernel/drivers/staging/comedi/drivers/Makefile
+++ b/kernel/drivers/staging/comedi/drivers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for individual comedi drivers
 #
 ccflags-$(CONFIG_COMEDI_DEBUG)		:= -DDEBUG
diff --git a/kernel/drivers/staging/comedi/drivers/addi_tcw.h b/kernel/drivers/staging/comedi/drivers/addi_tcw.h
index db6d5a4e8..2b44d3a04 100644
--- a/kernel/drivers/staging/comedi/drivers/addi_tcw.h
+++ b/kernel/drivers/staging/comedi/drivers/addi_tcw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ADDI_TCW_H
 #define _ADDI_TCW_H
 
diff --git a/kernel/drivers/staging/comedi/drivers/addi_watchdog.h b/kernel/drivers/staging/comedi/drivers/addi_watchdog.h
index b049cfba9..7523084a0 100644
--- a/kernel/drivers/staging/comedi/drivers/addi_watchdog.h
+++ b/kernel/drivers/staging/comedi/drivers/addi_watchdog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ADDI_WATCHDOG_H
 #define _ADDI_WATCHDOG_H
 
diff --git a/kernel/drivers/staging/comedi/drivers/amcc_s5933.h b/kernel/drivers/staging/comedi/drivers/amcc_s5933.h
index f03e4c8c2..f738b91b2 100644
--- a/kernel/drivers/staging/comedi/drivers/amcc_s5933.h
+++ b/kernel/drivers/staging/comedi/drivers/amcc_s5933.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Stuff for AMCC S5933 PCI Controller
  *
diff --git a/kernel/drivers/staging/comedi/drivers/jr3_pci.h b/kernel/drivers/staging/comedi/drivers/jr3_pci.h
index 28ff0c2aa..acd4e5456 100644
--- a/kernel/drivers/staging/comedi/drivers/jr3_pci.h
+++ b/kernel/drivers/staging/comedi/drivers/jr3_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Helper types to take care of the fact that the DSP card memory
  * is 16 bits, but aligned on a 32 bit PCI boundary
diff --git a/kernel/drivers/staging/comedi/drivers/ni_labpc_isadma.h b/kernel/drivers/staging/comedi/drivers/ni_labpc_isadma.h
index e93f79050..f06f9353c 100644
--- a/kernel/drivers/staging/comedi/drivers/ni_labpc_isadma.h
+++ b/kernel/drivers/staging/comedi/drivers/ni_labpc_isadma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ni_labpc ISA DMA support.
  */
diff --git a/kernel/drivers/staging/comedi/drivers/ni_labpc_regs.h b/kernel/drivers/staging/comedi/drivers/ni_labpc_regs.h
index 6003e9d5f..ace40065a 100644
--- a/kernel/drivers/staging/comedi/drivers/ni_labpc_regs.h
+++ b/kernel/drivers/staging/comedi/drivers/ni_labpc_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ni_labpc register definitions.
  */
diff --git a/kernel/drivers/staging/comedi/drivers/z8536.h b/kernel/drivers/staging/comedi/drivers/z8536.h
index 47eadbf4d..3ef5f9e79 100644
--- a/kernel/drivers/staging/comedi/drivers/z8536.h
+++ b/kernel/drivers/staging/comedi/drivers/z8536.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Z8536 CIO Internal registers
  */
diff --git a/kernel/drivers/staging/dgnc/dgnc_utils.c b/kernel/drivers/staging/dgnc/dgnc_utils.c
index e07ff8d2f..620f5741a 100644
--- a/kernel/drivers/staging/dgnc/dgnc_utils.c
+++ b/kernel/drivers/staging/dgnc/dgnc_utils.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/tty.h>
 #include <linux/sched/signal.h>
 #include "dgnc_utils.h"
diff --git a/kernel/drivers/staging/dgnc/dgnc_utils.h b/kernel/drivers/staging/dgnc/dgnc_utils.h
index d1f07a573..b30527f08 100644
--- a/kernel/drivers/staging/dgnc/dgnc_utils.h
+++ b/kernel/drivers/staging/dgnc/dgnc_utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DGNC_UTILS_H
 #define _DGNC_UTILS_H
 
diff --git a/kernel/drivers/staging/fbtft/Makefile b/kernel/drivers/staging/fbtft/Makefile
index 05ae9fbf9..6bc03311c 100644
--- a/kernel/drivers/staging/fbtft/Makefile
+++ b/kernel/drivers/staging/fbtft/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Core module
 obj-$(CONFIG_FB_TFT)             += fbtft.o
 fbtft-y                          += fbtft-core.o fbtft-sysfs.o fbtft-bus.o fbtft-io.o
diff --git a/kernel/drivers/staging/fbtft/fbtft-bus.c b/kernel/drivers/staging/fbtft/fbtft-bus.c
index a80b5d115..2a8eef15c 100644
--- a/kernel/drivers/staging/fbtft/fbtft-bus.c
+++ b/kernel/drivers/staging/fbtft/fbtft-bus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/errno.h>
 #include <linux/gpio.h>
diff --git a/kernel/drivers/staging/fbtft/fbtft-io.c b/kernel/drivers/staging/fbtft/fbtft-io.c
index ffb9a3b4d..f4a591919 100644
--- a/kernel/drivers/staging/fbtft/fbtft-io.c
+++ b/kernel/drivers/staging/fbtft/fbtft-io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/errno.h>
 #include <linux/gpio.h>
diff --git a/kernel/drivers/staging/fbtft/fbtft-sysfs.c b/kernel/drivers/staging/fbtft/fbtft-sysfs.c
index 5bfd67b52..712096659 100644
--- a/kernel/drivers/staging/fbtft/fbtft-sysfs.c
+++ b/kernel/drivers/staging/fbtft/fbtft-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "fbtft.h"
 #include "internal.h"
 
diff --git a/kernel/drivers/staging/fwserial/fwserial.h b/kernel/drivers/staging/fwserial/fwserial.h
index 30b2481fe..1d15f183e 100644
--- a/kernel/drivers/staging/fwserial/fwserial.h
+++ b/kernel/drivers/staging/fwserial/fwserial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FIREWIRE_FWSERIAL_H
 #define _FIREWIRE_FWSERIAL_H
 
diff --git a/kernel/drivers/staging/gdm724x/Makefile b/kernel/drivers/staging/gdm724x/Makefile
index ba7f11a6a..e61b95788 100644
--- a/kernel/drivers/staging/gdm724x/Makefile
+++ b/kernel/drivers/staging/gdm724x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_LTE_GDM724X) := gdmulte.o
 gdmulte-y += gdm_lte.o netlink_k.o
 gdmulte-y += gdm_usb.o gdm_endian.o
diff --git a/kernel/drivers/staging/greybus/Makefile b/kernel/drivers/staging/greybus/Makefile
index 23e1cb7bf..2551ed16b 100644
--- a/kernel/drivers/staging/greybus/Makefile
+++ b/kernel/drivers/staging/greybus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Greybus core
 greybus-y :=	core.o		\
 		debugfs.o	\
diff --git a/kernel/drivers/staging/greybus/greybus_id.h b/kernel/drivers/staging/greybus/greybus_id.h
index 4bb1fc1b8..f4c844009 100644
--- a/kernel/drivers/staging/greybus/greybus_id.h
+++ b/kernel/drivers/staging/greybus/greybus_id.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* FIXME
  * move this to include/linux/mod_devicetable.h when merging
  */
diff --git a/kernel/drivers/staging/greybus/tools/Makefile b/kernel/drivers/staging/greybus/tools/Makefile
index 852b12b71..ad0ae8053 100644
--- a/kernel/drivers/staging/greybus/tools/Makefile
+++ b/kernel/drivers/staging/greybus/tools/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifeq ($(strip $(V)), 1)
   Q =
 else
diff --git a/kernel/drivers/staging/iio/Makefile b/kernel/drivers/staging/iio/Makefile
index 0cfd05d5b..455bffc29 100644
--- a/kernel/drivers/staging/iio/Makefile
+++ b/kernel/drivers/staging/iio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the industrial I/O core.
 #
diff --git a/kernel/drivers/staging/iio/adc/Makefile b/kernel/drivers/staging/iio/adc/Makefile
index bf18bdd7c..ebe83c1ad 100644
--- a/kernel/drivers/staging/iio/adc/Makefile
+++ b/kernel/drivers/staging/iio/adc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for industrial I/O ADC drivers
 #
diff --git a/kernel/drivers/staging/iio/meter/Makefile b/kernel/drivers/staging/iio/meter/Makefile
index de3863d6b..19e7982f5 100644
--- a/kernel/drivers/staging/iio/meter/Makefile
+++ b/kernel/drivers/staging/iio/meter/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for metering ic drivers
 #
diff --git a/kernel/drivers/staging/iio/meter/ade7854.h b/kernel/drivers/staging/iio/meter/ade7854.h
index dbd97def9..c27247a78 100644
--- a/kernel/drivers/staging/iio/meter/ade7854.h
+++ b/kernel/drivers/staging/iio/meter/ade7854.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ADE7854_H
 #define _ADE7854_H
 
diff --git a/kernel/drivers/staging/iio/meter/meter.h b/kernel/drivers/staging/iio/meter/meter.h
index 0e37f2385..edf26302f 100644
--- a/kernel/drivers/staging/iio/meter/meter.h
+++ b/kernel/drivers/staging/iio/meter/meter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _METER_H
 #define _METER_H
 
diff --git a/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.h b/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
index c07321f8d..fb05a2a83 100644
--- a/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
+++ b/kernel/drivers/staging/iio/trigger/iio-trig-bfin-timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IIO_BFIN_TIMER_TRIGGER_H__
 #define __IIO_BFIN_TIMER_TRIGGER_H__
 
diff --git a/kernel/drivers/staging/ks7010/eap_packet.h b/kernel/drivers/staging/ks7010/eap_packet.h
index ae03f7477..dca2a142e 100644
--- a/kernel/drivers/staging/ks7010/eap_packet.h
+++ b/kernel/drivers/staging/ks7010/eap_packet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef EAP_PACKET_H
 #define EAP_PACKET_H
 
diff --git a/kernel/drivers/staging/lustre/lnet/libcfs/Makefile b/kernel/drivers/staging/lustre/lnet/libcfs/Makefile
index 215fa2382..1607570ef 100644
--- a/kernel/drivers/staging/lustre/lnet/libcfs/Makefile
+++ b/kernel/drivers/staging/lustre/lnet/libcfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
 
diff --git a/kernel/drivers/staging/lustre/lnet/lnet/Makefile b/kernel/drivers/staging/lustre/lnet/lnet/Makefile
index fd8585cd0..0a9d70924 100644
--- a/kernel/drivers/staging/lustre/lnet/lnet/Makefile
+++ b/kernel/drivers/staging/lustre/lnet/lnet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
 
diff --git a/kernel/drivers/staging/lustre/lustre/llite/Makefile b/kernel/drivers/staging/lustre/lustre/llite/Makefile
index ef7adef4c..519fd747e 100644
--- a/kernel/drivers/staging/lustre/lustre/llite/Makefile
+++ b/kernel/drivers/staging/lustre/lustre/llite/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
 
diff --git a/kernel/drivers/staging/lustre/lustre/llite/xattr_cache.c b/kernel/drivers/staging/lustre/lustre/llite/xattr_cache.c
index 80ee39204..f9cf79761 100644
--- a/kernel/drivers/staging/lustre/lustre/llite/xattr_cache.c
+++ b/kernel/drivers/staging/lustre/lustre/llite/xattr_cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2012 Xyratex Technology Limited
  *
diff --git a/kernel/drivers/staging/lustre/lustre/lov/Makefile b/kernel/drivers/staging/lustre/lustre/lov/Makefile
index 3abfb4eab..1ebf0193f 100644
--- a/kernel/drivers/staging/lustre/lustre/lov/Makefile
+++ b/kernel/drivers/staging/lustre/lustre/lov/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
 
diff --git a/kernel/drivers/staging/lustre/lustre/obdclass/Makefile b/kernel/drivers/staging/lustre/lustre/obdclass/Makefile
index fa0ad6548..e3fa9acff 100644
--- a/kernel/drivers/staging/lustre/lustre/obdclass/Makefile
+++ b/kernel/drivers/staging/lustre/lustre/obdclass/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
 
diff --git a/kernel/drivers/staging/lustre/lustre/ptlrpc/Makefile b/kernel/drivers/staging/lustre/lustre/ptlrpc/Makefile
index a518001cd..1deb1971b 100644
--- a/kernel/drivers/staging/lustre/lustre/ptlrpc/Makefile
+++ b/kernel/drivers/staging/lustre/lustre/ptlrpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/include
 subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
 
diff --git a/kernel/drivers/staging/media/Makefile b/kernel/drivers/staging/media/Makefile
index ac090c5fc..be732cf93 100644
--- a/kernel/drivers/staging/media/Makefile
+++ b/kernel/drivers/staging/media/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_I2C_BCM2048)	+= bcm2048/
 obj-$(CONFIG_DVB_CXD2099)	+= cxd2099/
 obj-$(CONFIG_VIDEO_IMX_MEDIA)	+= imx/
diff --git a/kernel/drivers/staging/media/atomisp/i2c/Makefile b/kernel/drivers/staging/media/atomisp/i2c/Makefile
index be13fab92..041a04171 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/Makefile
+++ b/kernel/drivers/staging/media/atomisp/i2c/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for sensor drivers
 #
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/Makefile b/kernel/drivers/staging/media/atomisp/i2c/imx/Makefile
index b6578f095..c1a85e6e2 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/Makefile
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VIDEO_IMX) += imx1x5.o
 
 imx1x5-objs := imx.o drv201.o ad5816g.o dw9714.o dw9719.o dw9718.o vcm.o otp.o otp_imx.o otp_brcc064_e2prom.o otp_e2prom.o
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.c b/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.c
index 558dcdf13..fb74f14cb 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.c
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/delay.h>
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.h b/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.h
index f995c2eea..e1396b00a 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/ad5816g.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AD5816G_H__
 #define __AD5816G_H__
 
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/common.h b/kernel/drivers/staging/media/atomisp/i2c/imx/common.h
index 7e525cef5..af2e3160d 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/common.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.c b/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.c
index 6d9d4c968..221e4875a 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.c
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/delay.h>
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.h b/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.h
index 8fc0ad116..2ef8aafdf 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/drv201.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRV201_H__
 #define __DRV201_H__
 
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.c b/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.c
index 6397a7ee0..f96855454 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.c
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/device.h>
 #include <linux/delay.h>
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.h b/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.h
index 5a98a9c97..aee560026 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/dw9714.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DW9714_H__
 #define __DW9714_H__
 
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/imx134.h b/kernel/drivers/staging/media/atomisp/i2c/imx/imx134.h
index cf35197ed..9026e8ba5 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/imx134.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/imx134.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IMX134_H__
 #define __IMX134_H__
 
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/imx175.h b/kernel/drivers/staging/media/atomisp/i2c/imx/imx175.h
index 5f409cced..5e082088c 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/imx175.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/imx175.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IMX175_H__
 #define __IMX175_H__
 #include "common.h"
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/imx219.h b/kernel/drivers/staging/media/atomisp/i2c/imx/imx219.h
index 52df582c5..bbd515bf7 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/imx219.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/imx219.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IMX219_H__
 #define __IMX219_H__
 #include "common.h"
diff --git a/kernel/drivers/staging/media/atomisp/i2c/imx/imx227.h b/kernel/drivers/staging/media/atomisp/i2c/imx/imx227.h
index 10e5b86f6..795fe017d 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/imx/imx227.h
+++ b/kernel/drivers/staging/media/atomisp/i2c/imx/imx227.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IMX227_H__
 #define __IMX227_H__
 
diff --git a/kernel/drivers/staging/media/atomisp/i2c/ov5693/Makefile b/kernel/drivers/staging/media/atomisp/i2c/ov5693/Makefile
index 4e3833aae..facb70e6a 100644
--- a/kernel/drivers/staging/media/atomisp/i2c/ov5693/Makefile
+++ b/kernel/drivers/staging/media/atomisp/i2c/ov5693/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VIDEO_OV5693) += ov5693.o
 
 # HACK! While this driver is in bad shape, don't enable several warnings
diff --git a/kernel/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h b/kernel/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
index c5e22bba4..dc7104470 100644
--- a/kernel/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
+++ b/kernel/drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Access to message bus through three registers
  * in CUNIT(0:0:0) PCI configuration space.
diff --git a/kernel/drivers/staging/media/atomisp/pci/atomisp2/Makefile b/kernel/drivers/staging/media/atomisp/pci/atomisp2/Makefile
index 2bd98f066..ac3805345 100644
--- a/kernel/drivers/staging/media/atomisp/pci/atomisp2/Makefile
+++ b/kernel/drivers/staging/media/atomisp/pci/atomisp2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 atomisp-objs += \
 	atomisp_drvfs.o \
 	atomisp_file.o \
diff --git a/kernel/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c b/kernel/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
index cd452cc20..4631b1d39 100644
--- a/kernel/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
+++ b/kernel/drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/pci.h>
 #include <linux/pm_qos.h>
diff --git a/kernel/drivers/staging/media/imx/Makefile b/kernel/drivers/staging/media/imx/Makefile
index 3569625b6..698a42103 100644
--- a/kernel/drivers/staging/media/imx/Makefile
+++ b/kernel/drivers/staging/media/imx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 imx-media-objs := imx-media-dev.o imx-media-internal-sd.o imx-media-of.o
 imx-media-common-objs := imx-media-utils.o imx-media-fim.o
 imx-media-ic-objs := imx-ic-common.o imx-ic-prp.o imx-ic-prpencvf.o
diff --git a/kernel/drivers/staging/most/Makefile b/kernel/drivers/staging/most/Makefile
index 9ee981c77..f5bbb9dea 100644
--- a/kernel/drivers/staging/most/Makefile
+++ b/kernel/drivers/staging/most/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MOSTCORE)	+= mostcore/
 obj-$(CONFIG_AIM_CDEV)	+= aim-cdev/
 obj-$(CONFIG_AIM_NETWORK)	+= aim-network/
diff --git a/kernel/drivers/staging/nvec/Makefile b/kernel/drivers/staging/nvec/Makefile
index 0db0e1f43..f0cff8f9f 100644
--- a/kernel/drivers/staging/nvec/Makefile
+++ b/kernel/drivers/staging/nvec/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SERIO_NVEC_PS2)	+= nvec_ps2.o
 obj-$(CONFIG_MFD_NVEC)		+= nvec.o
 obj-$(CONFIG_NVEC_POWER) 	+= nvec_power.o
diff --git a/kernel/drivers/staging/olpc_dcon/olpc_dcon.h b/kernel/drivers/staging/olpc_dcon/olpc_dcon.h
index 215e7ec4d..8fbde5d3b 100644
--- a/kernel/drivers/staging/olpc_dcon/olpc_dcon.h
+++ b/kernel/drivers/staging/olpc_dcon/olpc_dcon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef OLPC_DCON_H_
 #define OLPC_DCON_H_
 
diff --git a/kernel/drivers/staging/rtl8188eu/Makefile b/kernel/drivers/staging/rtl8188eu/Makefile
index 27af86e05..033fb2e69 100644
--- a/kernel/drivers/staging/rtl8188eu/Makefile
+++ b/kernel/drivers/staging/rtl8188eu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 r8188eu-y :=				\
 		core/rtw_ap.o		\
 		core/rtw_cmd.o		\
diff --git a/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c b/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
index 81bf4944e..bbb981c6b 100644
--- a/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
+++ b/kernel/drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*++
 Copyright (c) Realtek Semiconductor Corp. All rights reserved.
 
diff --git a/kernel/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h b/kernel/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h
index 21996a117..6722010ba 100644
--- a/kernel/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h
+++ b/kernel/drivers/staging/rtl8188eu/include/Hal8188ERateAdaptive.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INC_RA_H
 #define __INC_RA_H
 /*++
diff --git a/kernel/drivers/staging/rtl8188eu/include/phy.h b/kernel/drivers/staging/rtl8188eu/include/phy.h
index cd387e998..e99ac3910 100644
--- a/kernel/drivers/staging/rtl8188eu/include/phy.h
+++ b/kernel/drivers/staging/rtl8188eu/include/phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <odm.h>
 
 #define IQK_DELAY_TIME_88E	    10
diff --git a/kernel/drivers/staging/rtl8188eu/include/rf.h b/kernel/drivers/staging/rtl8188eu/include/rf.h
index 98a5551f5..ed3241c02 100644
--- a/kernel/drivers/staging/rtl8188eu/include/rf.h
+++ b/kernel/drivers/staging/rtl8188eu/include/rf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define RF6052_MAX_TX_PWR	0x3F
 #define RF6052_MAX_REG		0x3F
 
diff --git a/kernel/drivers/staging/rtl8192e/Makefile b/kernel/drivers/staging/rtl8192e/Makefile
index 7101fcc88..6af519938 100644
--- a/kernel/drivers/staging/rtl8192e/Makefile
+++ b/kernel/drivers/staging/rtl8192e/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 rtllib-objs :=			\
 	dot11d.o		\
 	rtllib_module.o		\
diff --git a/kernel/drivers/staging/rtl8192e/rtl8192e/Makefile b/kernel/drivers/staging/rtl8192e/rtl8192e/Makefile
index 176a4a2b8..75e6ec510 100644
--- a/kernel/drivers/staging/rtl8192e/rtl8192e/Makefile
+++ b/kernel/drivers/staging/rtl8192e/rtl8192e/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 r8192e_pci-objs :=		\
 	r8192E_dev.o		\
 	r8192E_phy.o		\
diff --git a/kernel/drivers/staging/rtl8192u/Makefile b/kernel/drivers/staging/rtl8192u/Makefile
index 703c1505e..3022728a3 100644
--- a/kernel/drivers/staging/rtl8192u/Makefile
+++ b/kernel/drivers/staging/rtl8192u/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 NIC_SELECT = RTL8192U
 
 ccflags-y := -std=gnu89
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/Makefile b/kernel/drivers/staging/rtl8192u/ieee80211/Makefile
index 9e3f432e5..0d4d6489f 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/Makefile
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 NIC_SELECT = RTL8192U
 
 ccflags-y := -O2
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.c b/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.c
index 00b6052fb..64b13a5da 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.c
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Implement 802.11d. */
 
 #include "dot11d.h"
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.h b/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.h
index 8ae673b21..88bc29830 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.h
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/dot11d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INC_DOT11D_H
 #define __INC_DOT11D_H
 
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
index 7abedc27d..b6a76aae4 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BATYPE_H_
 #define _BATYPE_H_
 
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 8aa38dcf0..4b92bb51c 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /********************************************************************************************************************************
  * This file is created to process BA Action Frame. According to 802.11 spec, there are 3 BA action types at all. And as BA is
  * related to TS, this part need some structure defined in QOS side code. Also TX RX is going to be resturctured, so how to send
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
index 5f54d93df..a85036022 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RTL819XU_HTTYPE_H_
 #define _RTL819XU_HTTYPE_H_
 
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
index 9248dbcf3..bf7b7122d 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 //As this function is mainly ported from Windows driver, so leave the name little changed. If any confusion caused, tell me. Created by WB. 2008.05.08
 #include "ieee80211.h"
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 49c23c720..71df9d9e2 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INC_QOS_TYPE_H
 #define __INC_QOS_TYPE_H
 
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index e25b69777..3a0ff08c6 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TSTYPE_H_
 #define _TSTYPE_H_
 #include "rtl819x_Qos.h"
diff --git a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index f98bb03aa..f4921abf7 100644
--- a/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/kernel/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "ieee80211.h"
 #include <linux/etherdevice.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/staging/rtl8192u/r8192U_dm.c b/kernel/drivers/staging/rtl8192u/r8192U_dm.c
index e6f8d1da6..4c241a07a 100644
--- a/kernel/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/kernel/drivers/staging/rtl8192u/r8192U_dm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*++
 Copyright-c Realtek Semiconductor Corp. All rights reserved.
 
diff --git a/kernel/drivers/staging/rtl8192u/r8192U_dm.h b/kernel/drivers/staging/rtl8192u/r8192U_dm.h
index 2d0232fb3..98137f65d 100644
--- a/kernel/drivers/staging/rtl8192u/r8192U_dm.h
+++ b/kernel/drivers/staging/rtl8192u/r8192U_dm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*****************************************************************************
  *	Copyright(c) 2007,  RealTEK Technology Inc. All Right Reserved.
  *
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.c
index ae9a4f1ac..80672100e 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.c
+++ b/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /******************************************************************************
  *
  *  (c) Copyright 2008, RealTEK Technologies Inc. All Rights Reserved.
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.h b/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.h
index ad0f60035..85fb49ca7 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.h
+++ b/kernel/drivers/staging/rtl8192u/r819xU_cmdpkt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef R819XUSB_CMDPKT_H
 #define R819XUSB_CMDPKT_H
 /* Different command packet have dedicated message length and definition. */
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_firmware.c b/kernel/drivers/staging/rtl8192u/r819xU_firmware.c
index 35d178670..9c7e19aed 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_firmware.c
+++ b/kernel/drivers/staging/rtl8192u/r819xU_firmware.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**************************************************************************************************
  * Procedure:    Init boot code/firmware code/data session
  *
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_firmware.h b/kernel/drivers/staging/rtl8192u/r819xU_firmware.h
index 24b63f2ec..cccd1c82f 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_firmware.h
+++ b/kernel/drivers/staging/rtl8192u/r819xU_firmware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INC_FIRMWARE_H
 #define __INC_FIRMWARE_H
 
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.c b/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.c
index 4eb43cfe5..0af062036 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.c
+++ b/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*Created on  2008/ 7/16,  5:31*/
 #include <linux/types.h>
 #include "r819xU_firmware_img.h"
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.h b/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.h
index 18d0a6b5c..355da9157 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.h
+++ b/kernel/drivers/staging/rtl8192u/r819xU_firmware_img.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef IMG_H
 #define IMG_H
 
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_phy.c b/kernel/drivers/staging/rtl8192u/r819xU_phy.c
index 3874f8307..12750671c 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/kernel/drivers/staging/rtl8192u/r819xU_phy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "r8192U.h"
 #include "r8192U_hw.h"
 #include "r819xU_phy.h"
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_phy.h b/kernel/drivers/staging/rtl8192u/r819xU_phy.h
index e67212633..0a42a6092 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_phy.h
+++ b/kernel/drivers/staging/rtl8192u/r819xU_phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _R819XU_PHY_H
 #define _R819XU_PHY_H
 
diff --git a/kernel/drivers/staging/rtl8192u/r819xU_phyreg.h b/kernel/drivers/staging/rtl8192u/r819xU_phyreg.h
index b855627e9..c058a9537 100644
--- a/kernel/drivers/staging/rtl8192u/r819xU_phyreg.h
+++ b/kernel/drivers/staging/rtl8192u/r819xU_phyreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _R819XU_PHYREG_H
 #define _R819XU_PHYREG_H
 
diff --git a/kernel/drivers/staging/rtl8712/Makefile b/kernel/drivers/staging/rtl8712/Makefile
index 6f8500c2d..3ae216b66 100644
--- a/kernel/drivers/staging/rtl8712/Makefile
+++ b/kernel/drivers/staging/rtl8712/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 r8712u-y :=				\
 		rtl871x_cmd.o		\
 		rtl8712_cmd.o		\
diff --git a/kernel/drivers/staging/rtl8712/rtl8712_efuse.h b/kernel/drivers/staging/rtl8712/rtl8712_efuse.h
index 6a64f91ad..dbba51cd4 100644
--- a/kernel/drivers/staging/rtl8712/rtl8712_efuse.h
+++ b/kernel/drivers/staging/rtl8712/rtl8712_efuse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RTL8712_EFUSE_H__
 #define __RTL8712_EFUSE_H__
 
diff --git a/kernel/drivers/staging/rtl8712/rtl871x_ioctl.h b/kernel/drivers/staging/rtl8712/rtl871x_ioctl.h
index 08bcb3b41..634e67461 100644
--- a/kernel/drivers/staging/rtl8712/rtl871x_ioctl.h
+++ b/kernel/drivers/staging/rtl8712/rtl871x_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IOCTL_H
 #define __IOCTL_H
 
diff --git a/kernel/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h b/kernel/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
index 11bcfb7bf..d479f739f 100644
--- a/kernel/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
+++ b/kernel/drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*****************************************************************************
  *	Copyright(c) 2008,  RealTEK Technology Inc. All Right Reserved.
  *
diff --git a/kernel/drivers/staging/rtl8712/rtl871x_recv.h b/kernel/drivers/staging/rtl8712/rtl871x_recv.h
index 9de06c5fe..f87b2ff5d 100644
--- a/kernel/drivers/staging/rtl8712/rtl871x_recv.h
+++ b/kernel/drivers/staging/rtl8712/rtl871x_recv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RTL871X_RECV_H_
 #define _RTL871X_RECV_H_
 
diff --git a/kernel/drivers/staging/rtl8723bs/Makefile b/kernel/drivers/staging/rtl8723bs/Makefile
index 4e7b460a9..f236acfd3 100644
--- a/kernel/drivers/staging/rtl8723bs/Makefile
+++ b/kernel/drivers/staging/rtl8723bs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 r8723bs-y = \
 		core/rtw_ap.o \
 		core/rtw_btcoex.o \
diff --git a/kernel/drivers/staging/rtl8723bs/hal/Hal8723BReg.h b/kernel/drivers/staging/rtl8723bs/hal/Hal8723BReg.h
index 152a198c8..ce0245792 100644
--- a/kernel/drivers/staging/rtl8723bs/hal/Hal8723BReg.h
+++ b/kernel/drivers/staging/rtl8723bs/hal/Hal8723BReg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*****************************************************************************
  *Copyright(c) 2009,  RealTEK Technology Inc. All Right Reserved.
  *
diff --git a/kernel/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h b/kernel/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h
index 796449c3f..130a94879 100644
--- a/kernel/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h
+++ b/kernel/drivers/staging/rtl8723bs/include/Hal8723BPwrSeq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef REALTEK_POWER_SEQUENCE_8723B
 #define REALTEK_POWER_SEQUENCE_8723B
 
diff --git a/kernel/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h b/kernel/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h
index d97ca1630..ab5a8627d 100644
--- a/kernel/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h
+++ b/kernel/drivers/staging/rtl8723bs/include/rtw_wifi_regd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  *
  * Copyright(c) 2009-2010  Realtek Corporation.
diff --git a/kernel/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/kernel/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index 305e88a6b..aa2f62acc 100644
--- a/kernel/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/kernel/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /******************************************************************************
  *
  * Copyright(c) 2009-2010  Realtek Corporation.
diff --git a/kernel/drivers/staging/rts5208/trace.c b/kernel/drivers/staging/rts5208/trace.c
index 1bddbdf34..c878e7529 100644
--- a/kernel/drivers/staging/rts5208/trace.c
+++ b/kernel/drivers/staging/rts5208/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/string.h>
 
diff --git a/kernel/drivers/staging/skein/Makefile b/kernel/drivers/staging/skein/Makefile
index b7f947fb9..86b7966d6 100644
--- a/kernel/drivers/staging/skein/Makefile
+++ b/kernel/drivers/staging/skein/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the skein secure hash algorithm
 #
diff --git a/kernel/drivers/staging/skein/skein_iv.h b/kernel/drivers/staging/skein/skein_iv.h
index 509d464c6..916f029da 100644
--- a/kernel/drivers/staging/skein/skein_iv.h
+++ b/kernel/drivers/staging/skein/skein_iv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SKEIN_IV_H_
 #define _SKEIN_IV_H_
 
diff --git a/kernel/drivers/staging/skein/threefish_api.c b/kernel/drivers/staging/skein/threefish_api.c
index 2b649abb7..e69cefa6b 100644
--- a/kernel/drivers/staging/skein/threefish_api.c
+++ b/kernel/drivers/staging/skein/threefish_api.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include "threefish_api.h"
 
diff --git a/kernel/drivers/staging/skein/threefish_api.h b/kernel/drivers/staging/skein/threefish_api.h
index 615e46757..21539c3cc 100644
--- a/kernel/drivers/staging/skein/threefish_api.h
+++ b/kernel/drivers/staging/skein/threefish_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef THREEFISHAPI_H
 #define THREEFISHAPI_H
diff --git a/kernel/drivers/staging/skein/threefish_block.c b/kernel/drivers/staging/skein/threefish_block.c
index 50640656c..87f055890 100644
--- a/kernel/drivers/staging/skein/threefish_block.c
+++ b/kernel/drivers/staging/skein/threefish_block.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include "threefish_api.h"
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_chip.c b/kernel/drivers/staging/sm750fb/ddk750_chip.c
index 4754f7a20..313b99104 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_chip.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_chip.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_chip.h b/kernel/drivers/staging/sm750fb/ddk750_chip.h
index 2c7a9b9a7..09c223f81 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_chip.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_chip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_CHIP_H__
 #define DDK750_CHIP_H__
 #define DEFAULT_INPUT_CLOCK 14318181 /* Default reference clock */
diff --git a/kernel/drivers/staging/sm750fb/ddk750_display.c b/kernel/drivers/staging/sm750fb/ddk750_display.c
index 9b116ed6e..c6fd90191 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_display.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_display.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "ddk750_reg.h"
 #include "ddk750_chip.h"
 #include "ddk750_display.h"
diff --git a/kernel/drivers/staging/sm750fb/ddk750_display.h b/kernel/drivers/staging/sm750fb/ddk750_display.h
index 609bf742e..523bbf335 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_display.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_display.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_DISPLAY_H__
 #define DDK750_DISPLAY_H__
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_dvi.c b/kernel/drivers/staging/sm750fb/ddk750_dvi.c
index 87a199d6c..f41bd9181 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_dvi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define USE_DVICHIP
 #ifdef USE_DVICHIP
 #include "ddk750_chip.h"
diff --git a/kernel/drivers/staging/sm750fb/ddk750_dvi.h b/kernel/drivers/staging/sm750fb/ddk750_dvi.h
index 4a8394561..9529cb9cf 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_dvi.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_dvi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_DVI_H__
 #define DDK750_DVI_H__
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_hwi2c.c b/kernel/drivers/staging/sm750fb/ddk750_hwi2c.c
index ec556a978..8482689b6 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_hwi2c.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_hwi2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define USE_HW_I2C
 #ifdef USE_HW_I2C
 #include "ddk750_chip.h"
diff --git a/kernel/drivers/staging/sm750fb/ddk750_hwi2c.h b/kernel/drivers/staging/sm750fb/ddk750_hwi2c.h
index 46e22dce2..337c6493c 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_hwi2c.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_hwi2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_HWI2C_H__
 #define DDK750_HWI2C_H__
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_mode.c b/kernel/drivers/staging/sm750fb/ddk750_mode.c
index bb673e189..2cdd87b78 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_mode.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_mode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include "ddk750_reg.h"
 #include "ddk750_mode.h"
diff --git a/kernel/drivers/staging/sm750fb/ddk750_mode.h b/kernel/drivers/staging/sm750fb/ddk750_mode.h
index d5eae36d8..259a9d6a4 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_mode.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_mode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_MODE_H__
 #define DDK750_MODE_H__
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_power.c b/kernel/drivers/staging/sm750fb/ddk750_power.c
index 222ae1a06..73aeaeb89 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_power.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_power.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "ddk750_chip.h"
 #include "ddk750_reg.h"
 #include "ddk750_power.h"
diff --git a/kernel/drivers/staging/sm750fb/ddk750_power.h b/kernel/drivers/staging/sm750fb/ddk750_power.h
index 44c4fc587..651d05247 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_power.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_POWER_H__
 #define DDK750_POWER_H__
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_reg.h b/kernel/drivers/staging/sm750fb/ddk750_reg.h
index f9b989b7a..fe412ead7 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_reg.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_REG_H__
 #define DDK750_REG_H__
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_sii164.c b/kernel/drivers/staging/sm750fb/ddk750_sii164.c
index 0431833de..1eeaf087e 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/kernel/drivers/staging/sm750fb/ddk750_sii164.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define USE_DVICHIP
 #ifdef USE_DVICHIP
 
diff --git a/kernel/drivers/staging/sm750fb/ddk750_sii164.h b/kernel/drivers/staging/sm750fb/ddk750_sii164.h
index 6968cf532..af52a3121 100644
--- a/kernel/drivers/staging/sm750fb/ddk750_sii164.h
+++ b/kernel/drivers/staging/sm750fb/ddk750_sii164.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DDK750_SII164_H__
 #define DDK750_SII164_H__
 
diff --git a/kernel/drivers/staging/sm750fb/sm750.h b/kernel/drivers/staging/sm750fb/sm750.h
index 438612279..ce90adcb4 100644
--- a/kernel/drivers/staging/sm750fb/sm750.h
+++ b/kernel/drivers/staging/sm750fb/sm750.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LYNXDRV_H_
 #define LYNXDRV_H_
 
diff --git a/kernel/drivers/staging/sm750fb/sm750_accel.c b/kernel/drivers/staging/sm750fb/sm750_accel.c
index 4b720cfa0..1035e91e7 100644
--- a/kernel/drivers/staging/sm750fb/sm750_accel.c
+++ b/kernel/drivers/staging/sm750fb/sm750_accel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/kernel/drivers/staging/sm750fb/sm750_accel.h b/kernel/drivers/staging/sm750fb/sm750_accel.h
index 4b0ff8feb..c4f42002a 100644
--- a/kernel/drivers/staging/sm750fb/sm750_accel.h
+++ b/kernel/drivers/staging/sm750fb/sm750_accel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ACCEL_H__
 #define ACCEL_H__
 
diff --git a/kernel/drivers/staging/sm750fb/sm750_cursor.c b/kernel/drivers/staging/sm750fb/sm750_cursor.c
index aa47a16ac..9d2415922 100644
--- a/kernel/drivers/staging/sm750fb/sm750_cursor.c
+++ b/kernel/drivers/staging/sm750fb/sm750_cursor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/kernel/drivers/staging/sm750fb/sm750_cursor.h b/kernel/drivers/staging/sm750fb/sm750_cursor.h
index c7b86ae23..16ac07eb5 100644
--- a/kernel/drivers/staging/sm750fb/sm750_cursor.h
+++ b/kernel/drivers/staging/sm750fb/sm750_cursor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LYNX_CURSOR_H__
 #define LYNX_CURSOR_H__
 
diff --git a/kernel/drivers/staging/sm750fb/sm750_hw.c b/kernel/drivers/staging/sm750fb/sm750_hw.c
index baf1bbdc9..ffd114a6d 100644
--- a/kernel/drivers/staging/sm750fb/sm750_hw.c
+++ b/kernel/drivers/staging/sm750fb/sm750_hw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/kernel/drivers/staging/speakup/Makefile b/kernel/drivers/staging/speakup/Makefile
index c864ea69c..5befb4933 100644
--- a/kernel/drivers/staging/speakup/Makefile
+++ b/kernel/drivers/staging/speakup/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SPEAKUP_SYNTH_ACNTSA) += speakup_acntsa.o
 obj-$(CONFIG_SPEAKUP_SYNTH_ACNTPC) += speakup_acntpc.o
 obj-$(CONFIG_SPEAKUP_SYNTH_APOLLO) += speakup_apollo.o
diff --git a/kernel/drivers/staging/speakup/devsynth.c b/kernel/drivers/staging/speakup/devsynth.c
index 58abd1d85..d92025632 100644
--- a/kernel/drivers/staging/speakup/devsynth.c
+++ b/kernel/drivers/staging/speakup/devsynth.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/miscdevice.h>	/* for misc_register, and SYNTH_MINOR */
 #include <linux/types.h>
diff --git a/kernel/drivers/staging/speakup/i18n.c b/kernel/drivers/staging/speakup/i18n.c
index 7809867f5..cea870765 100644
--- a/kernel/drivers/staging/speakup/i18n.c
+++ b/kernel/drivers/staging/speakup/i18n.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Internationalization implementation.  Includes definitions of English
  * string arrays, and the i18n pointer.
  */
diff --git a/kernel/drivers/staging/speakup/i18n.h b/kernel/drivers/staging/speakup/i18n.h
index 8fcce5666..2ec6e659d 100644
--- a/kernel/drivers/staging/speakup/i18n.h
+++ b/kernel/drivers/staging/speakup/i18n.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef I18N_H
 #define I18N_H
 /* Internationalization declarations */
diff --git a/kernel/drivers/staging/speakup/selection.c b/kernel/drivers/staging/speakup/selection.c
index 08f68fc28..66061b5c3 100644
--- a/kernel/drivers/staging/speakup/selection.c
+++ b/kernel/drivers/staging/speakup/selection.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h> /* for kmalloc */
 #include <linux/consolemap.h>
 #include <linux/interrupt.h>
diff --git a/kernel/drivers/staging/speakup/serialio.h b/kernel/drivers/staging/speakup/serialio.h
index 89de6fff9..aa691e4a6 100644
--- a/kernel/drivers/staging/speakup/serialio.h
+++ b/kernel/drivers/staging/speakup/serialio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPEAKUP_SERIAL_H
 #define _SPEAKUP_SERIAL_H
 
diff --git a/kernel/drivers/staging/speakup/speakup.h b/kernel/drivers/staging/speakup/speakup.h
index a654334c9..3d8bda8b9 100644
--- a/kernel/drivers/staging/speakup/speakup.h
+++ b/kernel/drivers/staging/speakup/speakup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SPEAKUP_H
 #define _SPEAKUP_H
 
diff --git a/kernel/drivers/staging/speakup/speakup_acnt.h b/kernel/drivers/staging/speakup/speakup_acnt.h
index 107ec1155..cffa938ae 100644
--- a/kernel/drivers/staging/speakup/speakup_acnt.h
+++ b/kernel/drivers/staging/speakup/speakup_acnt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* speakup_acntpc.h - header file for speakups Accent-PC driver. */
 
 #define SYNTH_IO_EXTENT	0x02
diff --git a/kernel/drivers/staging/speakup/speakup_dtlk.h b/kernel/drivers/staging/speakup/speakup_dtlk.h
index 51ac0f2fc..9c378b580 100644
--- a/kernel/drivers/staging/speakup/speakup_dtlk.h
+++ b/kernel/drivers/staging/speakup/speakup_dtlk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* speakup_dtlk.h - header file for speakups DoubleTalk driver. */
 
 #define SYNTH_IO_EXTENT	0x02
diff --git a/kernel/drivers/staging/speakup/speakupmap.h b/kernel/drivers/staging/speakup/speakupmap.h
index f1c0dd3b2..c60d7339b 100644
--- a/kernel/drivers/staging/speakup/speakupmap.h
+++ b/kernel/drivers/staging/speakup/speakupmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 	119, 62, 6,
 	0, 16, 20, 17, 32, 48, 0,
 	2, 0, 78, 0, 0, 0, 0,
diff --git a/kernel/drivers/staging/speakup/spk_types.h b/kernel/drivers/staging/speakup/spk_types.h
index 22f657d45..c50de6035 100644
--- a/kernel/drivers/staging/speakup/spk_types.h
+++ b/kernel/drivers/staging/speakup/spk_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SPEAKUP_TYPES_H
 #define SPEAKUP_TYPES_H
 
diff --git a/kernel/drivers/staging/unisys/visorbus/Makefile b/kernel/drivers/staging/unisys/visorbus/Makefile
index f3730d8c9..784cdc1f9 100644
--- a/kernel/drivers/staging/unisys/visorbus/Makefile
+++ b/kernel/drivers/staging/unisys/visorbus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Unisys visorbus
 #
diff --git a/kernel/drivers/staging/vboxvideo/Makefile b/kernel/drivers/staging/vboxvideo/Makefile
index 2d0b3bc7a..3f6094aa9 100644
--- a/kernel/drivers/staging/vboxvideo/Makefile
+++ b/kernel/drivers/staging/vboxvideo/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Iinclude/drm
 
 vboxvideo-y :=  hgsmi_base.o modesetting.o vbva_base.o \
diff --git a/kernel/drivers/staging/vc04_services/Makefile b/kernel/drivers/staging/vc04_services/Makefile
index e9a8e1343..1ecb261e0 100644
--- a/kernel/drivers/staging/vc04_services/Makefile
+++ b/kernel/drivers/staging/vc04_services/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_BCM2835_VCHIQ)	+= vchiq.o
 
 vchiq-objs := \
diff --git a/kernel/drivers/staging/vc04_services/bcm2835-camera/Makefile b/kernel/drivers/staging/vc04_services/bcm2835-camera/Makefile
index 8307f3051..2a4565e68 100644
--- a/kernel/drivers/staging/vc04_services/bcm2835-camera/Makefile
+++ b/kernel/drivers/staging/vc04_services/bcm2835-camera/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \
 	bcm2835-camera.o \
 	controls.o \
diff --git a/kernel/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion b/kernel/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion
index 9f5b6344b..dd1f324a8 100644
--- a/kernel/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion
+++ b/kernel/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_genversion
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# SPDX-License-Identifier: GPL-2.0
 
 use strict;
 
diff --git a/kernel/drivers/staging/vme/devices/vme_pio2.h b/kernel/drivers/staging/vme/devices/vme_pio2.h
index ac4a4bad4..65f834cde 100644
--- a/kernel/drivers/staging/vme/devices/vme_pio2.h
+++ b/kernel/drivers/staging/vme/devices/vme_pio2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VME_PIO2_H_
 #define _VME_PIO2_H_
 
diff --git a/kernel/drivers/staging/vme/devices/vme_user.h b/kernel/drivers/staging/vme/devices/vme_user.h
index a6cb75686..19ecb0578 100644
--- a/kernel/drivers/staging/vme/devices/vme_user.h
+++ b/kernel/drivers/staging/vme/devices/vme_user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VME_USER_H_
 #define _VME_USER_H_
 
diff --git a/kernel/drivers/staging/vt6655/Makefile b/kernel/drivers/staging/vt6655/Makefile
index d55c3baad..a151f30fc 100644
--- a/kernel/drivers/staging/vt6655/Makefile
+++ b/kernel/drivers/staging/vt6655/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # TODO: all of these should be removed
 ccflags-y := -DLINUX -D__KERNEL__ -D__NO_VERSION__
 ccflags-y += -DHOSTAP
diff --git a/kernel/drivers/staging/vt6656/Makefile b/kernel/drivers/staging/vt6656/Makefile
index 3dbe1f89d..b64c0d87f 100644
--- a/kernel/drivers/staging/vt6656/Makefile
+++ b/kernel/drivers/staging/vt6656/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # TODO: all of these should be removed
 ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
 ccflags-y += -DHOSTAP
diff --git a/kernel/drivers/staging/wilc1000/Makefile b/kernel/drivers/staging/wilc1000/Makefile
index d22628314..ee7e26b88 100644
--- a/kernel/drivers/staging/wilc1000/Makefile
+++ b/kernel/drivers/staging/wilc1000/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_WILC1000) += wilc1000.o
 
 ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \
diff --git a/kernel/drivers/staging/wilc1000/coreconfigurator.c b/kernel/drivers/staging/wilc1000/coreconfigurator.c
index 622994795..8cf886d32 100644
--- a/kernel/drivers/staging/wilc1000/coreconfigurator.c
+++ b/kernel/drivers/staging/wilc1000/coreconfigurator.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "coreconfigurator.h"
 #include "wilc_wlan_if.h"
 #include "wilc_wlan.h"
diff --git a/kernel/drivers/staging/wilc1000/coreconfigurator.h b/kernel/drivers/staging/wilc1000/coreconfigurator.h
index 5256f4052..3f5da8c58 100644
--- a/kernel/drivers/staging/wilc1000/coreconfigurator.h
+++ b/kernel/drivers/staging/wilc1000/coreconfigurator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*!
  *  @file	coreconfigurator.h
diff --git a/kernel/drivers/staging/wilc1000/host_interface.c b/kernel/drivers/staging/wilc1000/host_interface.c
index 7b620658e..421168b9a 100644
--- a/kernel/drivers/staging/wilc1000/host_interface.c
+++ b/kernel/drivers/staging/wilc1000/host_interface.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/kthread.h>
diff --git a/kernel/drivers/staging/wilc1000/host_interface.h b/kernel/drivers/staging/wilc1000/host_interface.h
index 1ce5ead31..44a2f4b59 100644
--- a/kernel/drivers/staging/wilc1000/host_interface.h
+++ b/kernel/drivers/staging/wilc1000/host_interface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef HOST_INT_H
 #define HOST_INT_H
 #include <linux/ieee80211.h>
diff --git a/kernel/drivers/staging/wilc1000/linux_mon.c b/kernel/drivers/staging/wilc1000/linux_mon.c
index 01efa80b4..91d49c473 100644
--- a/kernel/drivers/staging/wilc1000/linux_mon.c
+++ b/kernel/drivers/staging/wilc1000/linux_mon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*!
  *  @file	linux_mon.c
  *  @brief	File Operations OS wrapper functionality
diff --git a/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index ac5aaafa4..af12925a9 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "wilc_wfi_cfgoperations.h"
 #include "host_interface.h"
 #include <linux/errno.h>
diff --git a/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
index 85a3810d7..dfb7ec272 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
+++ b/kernel/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*!
  *  @file	wilc_wfi_cfgoperations.h
  *  @brief	Definitions for the network module
diff --git a/kernel/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/kernel/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 7a36561a5..e6f4d8497 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/kernel/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*!
  *  @file	wilc_wfi_netdevice.h
  *  @brief	Definitions for the network module
diff --git a/kernel/drivers/staging/wilc1000/wilc_wlan.h b/kernel/drivers/staging/wilc1000/wilc_wlan.h
index 7a5eba9b5..da7173105 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wlan.h
+++ b/kernel/drivers/staging/wilc1000/wilc_wlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef WILC_WLAN_H
 #define WILC_WLAN_H
 
diff --git a/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.c b/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.c
index d3e5b1b30..19e4f85fd 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.c
+++ b/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ////////////////////////////////////////////////////////////////////////// */
 /*  */
 /* Copyright (c) Atmel Corporation.  All rights reserved. */
diff --git a/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.h b/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.h
index b8641a273..08092a551 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.h
+++ b/kernel/drivers/staging/wilc1000/wilc_wlan_cfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ////////////////////////////////////////////////////////////////////////// */
 /*  */
 /* Copyright (c) Atmel Corporation.  All rights reserved. */
diff --git a/kernel/drivers/staging/wilc1000/wilc_wlan_if.h b/kernel/drivers/staging/wilc1000/wilc_wlan_if.h
index f4d60057a..c1693cfc0 100644
--- a/kernel/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/kernel/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* ///////////////////////////////////////////////////////////////////////// */
 /*  */
 /* Copyright (c) Atmel Corporation.  All rights reserved. */
diff --git a/kernel/drivers/staging/wlan-ng/Makefile b/kernel/drivers/staging/wlan-ng/Makefile
index 32b69f238..1d24b0f86 100644
--- a/kernel/drivers/staging/wlan-ng/Makefile
+++ b/kernel/drivers/staging/wlan-ng/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PRISM2_USB) += prism2_usb.o
 
 prism2_usb-y := prism2usb.o \
diff --git a/kernel/drivers/staging/wlan-ng/cfg80211.c b/kernel/drivers/staging/wlan-ng/cfg80211.c
index 178f6f5d4..42912257e 100644
--- a/kernel/drivers/staging/wlan-ng/cfg80211.c
+++ b/kernel/drivers/staging/wlan-ng/cfg80211.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* cfg80211 Interface for prism2_usb module */
 #include "hfa384x.h"
 #include "prism2mgmt.h"
diff --git a/kernel/drivers/staging/wlan-ng/prism2usb.c b/kernel/drivers/staging/wlan-ng/prism2usb.c
index bfb6b0a65..b5ba17600 100644
--- a/kernel/drivers/staging/wlan-ng/prism2usb.c
+++ b/kernel/drivers/staging/wlan-ng/prism2usb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "hfa384x_usb.c"
 #include "prism2mgmt.c"
 #include "prism2mib.c"
diff --git a/kernel/drivers/staging/xgifb/XGI_main.h b/kernel/drivers/staging/xgifb/XGI_main.h
index 7a80a90f2..a3af1cbbf 100644
--- a/kernel/drivers/staging/xgifb/XGI_main.h
+++ b/kernel/drivers/staging/xgifb/XGI_main.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XGIFB_MAIN
 #define _XGIFB_MAIN
 /* ------------------- Constant Definitions ------------------------- */
diff --git a/kernel/drivers/staging/xgifb/XGIfb.h b/kernel/drivers/staging/xgifb/XGIfb.h
index af5036239..982c676c1 100644
--- a/kernel/drivers/staging/xgifb/XGIfb.h
+++ b/kernel/drivers/staging/xgifb/XGIfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_XGIFB
 #define _LINUX_XGIFB
 #include "vgatypes.h"
diff --git a/kernel/drivers/staging/xgifb/vb_def.h b/kernel/drivers/staging/xgifb/vb_def.h
index 94e2e3c7c..0311e2682 100644
--- a/kernel/drivers/staging/xgifb/vb_def.h
+++ b/kernel/drivers/staging/xgifb/vb_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VB_DEF_
 #define _VB_DEF_
 #include "../../video/fbdev/sis/initdef.h"
diff --git a/kernel/drivers/staging/xgifb/vb_init.c b/kernel/drivers/staging/xgifb/vb_init.c
index 591a3c9ba..ac1c815a3 100644
--- a/kernel/drivers/staging/xgifb/vb_init.c
+++ b/kernel/drivers/staging/xgifb/vb_init.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
 
diff --git a/kernel/drivers/staging/xgifb/vb_init.h b/kernel/drivers/staging/xgifb/vb_init.h
index e835054b8..2f8a70133 100644
--- a/kernel/drivers/staging/xgifb/vb_init.h
+++ b/kernel/drivers/staging/xgifb/vb_init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VBINIT_
 #define _VBINIT_
 unsigned char XGIInitNew(struct pci_dev *pdev);
diff --git a/kernel/drivers/staging/xgifb/vb_setmode.c b/kernel/drivers/staging/xgifb/vb_setmode.c
index cea128bed..da07ca57b 100644
--- a/kernel/drivers/staging/xgifb/vb_setmode.c
+++ b/kernel/drivers/staging/xgifb/vb_setmode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/delay.h>
 #include "XGIfb.h"
 
diff --git a/kernel/drivers/staging/xgifb/vb_setmode.h b/kernel/drivers/staging/xgifb/vb_setmode.h
index c6317ab00..5904ed1f2 100644
--- a/kernel/drivers/staging/xgifb/vb_setmode.h
+++ b/kernel/drivers/staging/xgifb/vb_setmode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VBSETMODE_
 #define _VBSETMODE_
 
diff --git a/kernel/drivers/staging/xgifb/vb_struct.h b/kernel/drivers/staging/xgifb/vb_struct.h
index 2fd1a5935..e256f72f6 100644
--- a/kernel/drivers/staging/xgifb/vb_struct.h
+++ b/kernel/drivers/staging/xgifb/vb_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VB_STRUCT_
 #define _VB_STRUCT_
 #include "../../video/fbdev/sis/vstruct.h"
diff --git a/kernel/drivers/staging/xgifb/vb_table.h b/kernel/drivers/staging/xgifb/vb_table.h
index 31dd52c51..0da63e1da 100644
--- a/kernel/drivers/staging/xgifb/vb_table.h
+++ b/kernel/drivers/staging/xgifb/vb_table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VB_TABLE_
 #define _VB_TABLE_
 static const struct SiS_MCLKData XGI340New_MCLKData[] = {
diff --git a/kernel/drivers/staging/xgifb/vb_util.h b/kernel/drivers/staging/xgifb/vb_util.h
index 052694e75..0f6d5aac0 100644
--- a/kernel/drivers/staging/xgifb/vb_util.h
+++ b/kernel/drivers/staging/xgifb/vb_util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VBUTIL_
 #define _VBUTIL_
 static inline void xgifb_reg_set(unsigned long port, u8 index, u8 data)
diff --git a/kernel/drivers/staging/xgifb/vgatypes.h b/kernel/drivers/staging/xgifb/vgatypes.h
index de80e5c10..22919f236 100644
--- a/kernel/drivers/staging/xgifb/vgatypes.h
+++ b/kernel/drivers/staging/xgifb/vgatypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VGATYPES_
 #define _VGATYPES_
 
diff --git a/kernel/drivers/target/Makefile b/kernel/drivers/target/Makefile
index e619c0266..456347473 100644
--- a/kernel/drivers/target/Makefile
+++ b/kernel/drivers/target/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 target_core_mod-y		:= target_core_configfs.o \
 				   target_core_device.o \
diff --git a/kernel/drivers/target/iscsi/Makefile b/kernel/drivers/target/iscsi/Makefile
index 0f18295e0..8c9ae96b7 100644
--- a/kernel/drivers/target/iscsi/Makefile
+++ b/kernel/drivers/target/iscsi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 iscsi_target_mod-y +=		iscsi_target_parameters.o \
 				iscsi_target_seq_pdu_list.o \
 				iscsi_target_auth.o \
diff --git a/kernel/drivers/target/iscsi/cxgbit/Makefile b/kernel/drivers/target/iscsi/cxgbit/Makefile
index 4893ec29b..d16aaae7b 100644
--- a/kernel/drivers/target/iscsi/cxgbit/Makefile
+++ b/kernel/drivers/target/iscsi/cxgbit/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Idrivers/net/ethernet/chelsio/cxgb4
 ccflags-y += -Idrivers/net/ethernet/chelsio/libcxgb
 ccflags-y += -Idrivers/target/iscsi
diff --git a/kernel/drivers/target/iscsi/iscsi_target.h b/kernel/drivers/target/iscsi/iscsi_target.h
index e0db2ceb0..42de1843a 100644
--- a/kernel/drivers/target/iscsi/iscsi_target.h
+++ b/kernel/drivers/target/iscsi/iscsi_target.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_H
 #define ISCSI_TARGET_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_auth.h b/kernel/drivers/target/iscsi/iscsi_target_auth.h
index 1b91c13cc..d5600ac30 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_auth.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_auth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ISCSI_CHAP_H_
 #define _ISCSI_CHAP_H_
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_datain_values.h b/kernel/drivers/target/iscsi/iscsi_target_datain_values.h
index 16edeeeb7..a420fbd37 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_datain_values.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_datain_values.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_DATAIN_VALUES_H
 #define ISCSI_TARGET_DATAIN_VALUES_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_device.h b/kernel/drivers/target/iscsi/iscsi_target_device.h
index 06dbff5cd..ab2166f17 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_device.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_DEVICE_H
 #define ISCSI_TARGET_DEVICE_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_erl0.h b/kernel/drivers/target/iscsi/iscsi_target_erl0.h
index 3822d9cd1..3393407bc 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_erl0.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_erl0.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_ERL0_H
 #define ISCSI_TARGET_ERL0_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_erl1.h b/kernel/drivers/target/iscsi/iscsi_target_erl1.h
index 54d36bd25..5f66b265b 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_erl1.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_erl1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_ERL1_H
 #define ISCSI_TARGET_ERL1_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_erl2.h b/kernel/drivers/target/iscsi/iscsi_target_erl2.h
index 634d01e13..93e180d68 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_erl2.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_erl2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_ERL2_H
 #define ISCSI_TARGET_ERL2_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_login.h b/kernel/drivers/target/iscsi/iscsi_target_login.h
index 0e1fd6ced..c2495e036 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_login.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_login.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_LOGIN_H
 #define ISCSI_TARGET_LOGIN_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_nego.h b/kernel/drivers/target/iscsi/iscsi_target_nego.h
index 53438bfca..835e1b769 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_nego.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_nego.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_NEGO_H
 #define ISCSI_TARGET_NEGO_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_nodeattrib.h b/kernel/drivers/target/iscsi/iscsi_target_nodeattrib.h
index 79cdf06ad..ce074cb54 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_nodeattrib.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_nodeattrib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_NODEATTRIB_H
 #define ISCSI_TARGET_NODEATTRIB_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_parameters.h b/kernel/drivers/target/iscsi/iscsi_target_parameters.h
index c47b73f57..daf47f38e 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_parameters.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_parameters.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_PARAMETERS_H
 #define ISCSI_PARAMETERS_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_seq_pdu_list.h b/kernel/drivers/target/iscsi/iscsi_target_seq_pdu_list.h
index be1234362..5a0907027 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_seq_pdu_list.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_seq_pdu_list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_SEQ_AND_PDU_LIST_H
 #define ISCSI_SEQ_AND_PDU_LIST_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_tmr.h b/kernel/drivers/target/iscsi/iscsi_target_tmr.h
index 64cc5c07e..301f0936b 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_tmr.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_tmr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_TMR_H
 #define ISCSI_TARGET_TMR_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_tpg.h b/kernel/drivers/target/iscsi/iscsi_target_tpg.h
index 59fd3cabe..88576f5d0 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_tpg.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_tpg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_TPG_H
 #define ISCSI_TARGET_TPG_H
 
diff --git a/kernel/drivers/target/iscsi/iscsi_target_transport.c b/kernel/drivers/target/iscsi/iscsi_target_transport.c
index c4eb141c6..036940518 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_transport.c
+++ b/kernel/drivers/target/iscsi/iscsi_target_transport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/module.h>
diff --git a/kernel/drivers/target/iscsi/iscsi_target_util.h b/kernel/drivers/target/iscsi/iscsi_target_util.h
index 425160565..5e053d61c 100644
--- a/kernel/drivers/target/iscsi/iscsi_target_util.h
+++ b/kernel/drivers/target/iscsi/iscsi_target_util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_UTIL_H
 #define ISCSI_TARGET_UTIL_H
 
diff --git a/kernel/drivers/target/loopback/tcm_loop.h b/kernel/drivers/target/loopback/tcm_loop.h
index 3acc43c05..d3110909a 100644
--- a/kernel/drivers/target/loopback/tcm_loop.h
+++ b/kernel/drivers/target/loopback/tcm_loop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/types.h>
 #include <linux/device.h>
 #include <target/target_core_base.h> /* struct se_cmd */
diff --git a/kernel/drivers/target/sbp/sbp_target.h b/kernel/drivers/target/sbp/sbp_target.h
index 73bcb1208..1d101ac86 100644
--- a/kernel/drivers/target/sbp/sbp_target.h
+++ b/kernel/drivers/target/sbp/sbp_target.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SBP_BASE_H
 #define _SBP_BASE_H
 
diff --git a/kernel/drivers/target/target_core_alua.h b/kernel/drivers/target/target_core_alua.h
index c69c11baf..1902cb5c3 100644
--- a/kernel/drivers/target/target_core_alua.h
+++ b/kernel/drivers/target/target_core_alua.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_ALUA_H
 #define TARGET_CORE_ALUA_H
 
diff --git a/kernel/drivers/target/target_core_file.h b/kernel/drivers/target/target_core_file.h
index 526595a07..53be5ffd3 100644
--- a/kernel/drivers/target/target_core_file.h
+++ b/kernel/drivers/target/target_core_file.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_FILE_H
 #define TARGET_CORE_FILE_H
 
diff --git a/kernel/drivers/target/target_core_iblock.h b/kernel/drivers/target/target_core_iblock.h
index f2a579721..b4aeb2584 100644
--- a/kernel/drivers/target/target_core_iblock.h
+++ b/kernel/drivers/target/target_core_iblock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_IBLOCK_H
 #define TARGET_CORE_IBLOCK_H
 
diff --git a/kernel/drivers/target/target_core_internal.h b/kernel/drivers/target/target_core_internal.h
index f30e8ac13..18e3eb16e 100644
--- a/kernel/drivers/target/target_core_internal.h
+++ b/kernel/drivers/target/target_core_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_INTERNAL_H
 #define TARGET_CORE_INTERNAL_H
 
diff --git a/kernel/drivers/target/target_core_pr.h b/kernel/drivers/target/target_core_pr.h
index 772f9148e..198fad5c8 100644
--- a/kernel/drivers/target/target_core_pr.h
+++ b/kernel/drivers/target/target_core_pr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_PR_H
 #define TARGET_CORE_PR_H
 
diff --git a/kernel/drivers/target/target_core_pscsi.h b/kernel/drivers/target/target_core_pscsi.h
index b86fb0e1b..e8458b5e8 100644
--- a/kernel/drivers/target/target_core_pscsi.h
+++ b/kernel/drivers/target/target_core_pscsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_PSCSI_H
 #define TARGET_CORE_PSCSI_H
 
diff --git a/kernel/drivers/target/target_core_rd.h b/kernel/drivers/target/target_core_rd.h
index 91fc1a347..8b88f9b14 100644
--- a/kernel/drivers/target/target_core_rd.h
+++ b/kernel/drivers/target/target_core_rd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_RD_H
 #define TARGET_CORE_RD_H
 
diff --git a/kernel/drivers/target/target_core_ua.h b/kernel/drivers/target/target_core_ua.h
index 97402856a..b0f4205a9 100644
--- a/kernel/drivers/target/target_core_ua.h
+++ b/kernel/drivers/target/target_core_ua.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_UA_H
 #define TARGET_CORE_UA_H
 
diff --git a/kernel/drivers/target/target_core_xcopy.h b/kernel/drivers/target/target_core_xcopy.h
index 7c0b105cb..26ba4c3c9 100644
--- a/kernel/drivers/target/target_core_xcopy.h
+++ b/kernel/drivers/target/target_core_xcopy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <target/target_core_base.h>
 
 #define XCOPY_HDR_LEN			16
diff --git a/kernel/drivers/target/tcm_fc/Makefile b/kernel/drivers/target/tcm_fc/Makefile
index 20b14bb08..a7d1593ab 100644
--- a/kernel/drivers/target/tcm_fc/Makefile
+++ b/kernel/drivers/target/tcm_fc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 tcm_fc-y +=		tfc_cmd.o \
 			tfc_conf.o \
 			tfc_io.o \
diff --git a/kernel/drivers/tee/Makefile b/kernel/drivers/tee/Makefile
index 7a4e4a1ac..21f51fd88 100644
--- a/kernel/drivers/tee/Makefile
+++ b/kernel/drivers/tee/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TEE) += tee.o
 tee-objs += tee_core.o
 tee-objs += tee_shm.o
diff --git a/kernel/drivers/tee/optee/Makefile b/kernel/drivers/tee/optee/Makefile
index 92fe5789b..d526fb88d 100644
--- a/kernel/drivers/tee/optee/Makefile
+++ b/kernel/drivers/tee/optee/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OPTEE) += optee.o
 optee-objs += core.o
 optee-objs += call.o
diff --git a/kernel/drivers/thermal/Makefile b/kernel/drivers/thermal/Makefile
index 8b79bca23..195cd08fb 100644
--- a/kernel/drivers/thermal/Makefile
+++ b/kernel/drivers/thermal/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for sensor chip drivers.
 #
diff --git a/kernel/drivers/thermal/int340x_thermal/Makefile b/kernel/drivers/thermal/int340x_thermal/Makefile
index df0df055e..287eb0a14 100644
--- a/kernel/drivers/thermal/int340x_thermal/Makefile
+++ b/kernel/drivers/thermal/int340x_thermal/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_INT340X_THERMAL)	+= int3400_thermal.o
 obj-$(CONFIG_INT340X_THERMAL)	+= int340x_thermal_zone.o
 obj-$(CONFIG_INT340X_THERMAL)	+= int3402_thermal.o
diff --git a/kernel/drivers/thermal/int340x_thermal/acpi_thermal_rel.h b/kernel/drivers/thermal/int340x_thermal/acpi_thermal_rel.h
index 65075b174..58822575f 100644
--- a/kernel/drivers/thermal/int340x_thermal/acpi_thermal_rel.h
+++ b/kernel/drivers/thermal/int340x_thermal/acpi_thermal_rel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACPI_ACPI_THERMAL_H
 #define __ACPI_ACPI_THERMAL_H
 
diff --git a/kernel/drivers/thermal/tegra/Makefile b/kernel/drivers/thermal/tegra/Makefile
index 1ce1af2cf..8a3f221f1 100644
--- a/kernel/drivers/thermal/tegra/Makefile
+++ b/kernel/drivers/thermal/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TEGRA_SOCTHERM)	+= tegra-soctherm.o
 
 tegra-soctherm-y				:= soctherm.o soctherm-fuse.o
diff --git a/kernel/drivers/thermal/ti-soc-thermal/Makefile b/kernel/drivers/thermal/ti-soc-thermal/Makefile
index 0f89bdf03..f180ebead 100644
--- a/kernel/drivers/thermal/ti-soc-thermal/Makefile
+++ b/kernel/drivers/thermal/ti-soc-thermal/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TI_SOC_THERMAL)		+= ti-soc-thermal.o
 ti-soc-thermal-y			:= ti-bandgap.o
 ti-soc-thermal-$(CONFIG_TI_THERMAL)	+= ti-thermal-common.o
diff --git a/kernel/drivers/thunderbolt/cap.c b/kernel/drivers/thunderbolt/cap.c
index 38bc27a5c..c2277b8ee 100644
--- a/kernel/drivers/thunderbolt/cap.c
+++ b/kernel/drivers/thunderbolt/cap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - capabilities lookup
  *
diff --git a/kernel/drivers/thunderbolt/ctl.c b/kernel/drivers/thunderbolt/ctl.c
index fb40dd058..423ae231f 100644
--- a/kernel/drivers/thunderbolt/ctl.c
+++ b/kernel/drivers/thunderbolt/ctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - control channel and configuration commands
  *
diff --git a/kernel/drivers/thunderbolt/ctl.h b/kernel/drivers/thunderbolt/ctl.h
index 36fd28b1c..dd34f627c 100644
--- a/kernel/drivers/thunderbolt/ctl.h
+++ b/kernel/drivers/thunderbolt/ctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Thunderbolt Cactus Ridge driver - control channel and configuration commands
  *
diff --git a/kernel/drivers/thunderbolt/eeprom.c b/kernel/drivers/thunderbolt/eeprom.c
index fe2f00cea..3e8caf22c 100644
--- a/kernel/drivers/thunderbolt/eeprom.c
+++ b/kernel/drivers/thunderbolt/eeprom.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - eeprom access
  *
diff --git a/kernel/drivers/thunderbolt/nhi.h b/kernel/drivers/thunderbolt/nhi.h
index 5b5bb2c43..1c7e6b92e 100644
--- a/kernel/drivers/thunderbolt/nhi.h
+++ b/kernel/drivers/thunderbolt/nhi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Thunderbolt Cactus Ridge driver - NHI driver
  *
diff --git a/kernel/drivers/thunderbolt/nhi_regs.h b/kernel/drivers/thunderbolt/nhi_regs.h
index 09ed574e9..752ec0430 100644
--- a/kernel/drivers/thunderbolt/nhi_regs.h
+++ b/kernel/drivers/thunderbolt/nhi_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Thunderbolt driver - NHI registers
  *
diff --git a/kernel/drivers/thunderbolt/path.c b/kernel/drivers/thunderbolt/path.c
index 9562cd026..ff49ad880 100644
--- a/kernel/drivers/thunderbolt/path.c
+++ b/kernel/drivers/thunderbolt/path.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - path/tunnel functionality
  *
diff --git a/kernel/drivers/thunderbolt/switch.c b/kernel/drivers/thunderbolt/switch.c
index 53f40c57d..3953d1720 100644
--- a/kernel/drivers/thunderbolt/switch.c
+++ b/kernel/drivers/thunderbolt/switch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - switch/port utility functions
  *
diff --git a/kernel/drivers/thunderbolt/tb.c b/kernel/drivers/thunderbolt/tb.c
index 0b22ad9d6..d674e0676 100644
--- a/kernel/drivers/thunderbolt/tb.c
+++ b/kernel/drivers/thunderbolt/tb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - bus logic (NHI independent)
  *
diff --git a/kernel/drivers/thunderbolt/tb.h b/kernel/drivers/thunderbolt/tb.h
index e0deee4f1..d7ffc159b 100644
--- a/kernel/drivers/thunderbolt/tb.h
+++ b/kernel/drivers/thunderbolt/tb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Thunderbolt Cactus Ridge driver - bus logic (NHI independent)
  *
diff --git a/kernel/drivers/thunderbolt/tb_regs.h b/kernel/drivers/thunderbolt/tb_regs.h
index 582bd1f15..5d94142af 100644
--- a/kernel/drivers/thunderbolt/tb_regs.h
+++ b/kernel/drivers/thunderbolt/tb_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Thunderbolt Cactus Ridge driver - Port/Switch config area registers
  *
diff --git a/kernel/drivers/thunderbolt/tunnel_pci.c b/kernel/drivers/thunderbolt/tunnel_pci.c
index ca4475907..0637537ea 100644
--- a/kernel/drivers/thunderbolt/tunnel_pci.c
+++ b/kernel/drivers/thunderbolt/tunnel_pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Thunderbolt Cactus Ridge driver - PCIe tunnel
  *
diff --git a/kernel/drivers/thunderbolt/tunnel_pci.h b/kernel/drivers/thunderbolt/tunnel_pci.h
index a67f93c14..f9b65fa1f 100644
--- a/kernel/drivers/thunderbolt/tunnel_pci.h
+++ b/kernel/drivers/thunderbolt/tunnel_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Thunderbolt Cactus Ridge driver - PCIe tunnel
  *
diff --git a/kernel/drivers/tty/Makefile b/kernel/drivers/tty/Makefile
index 16330a819..8ce3a8661 100644
--- a/kernel/drivers/tty/Makefile
+++ b/kernel/drivers/tty/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_TTY)		+= tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \
 				   tty_buffer.o tty_port.o tty_mutex.o \
 				   tty_ldsem.o tty_baudrate.o tty_jobctrl.o \
diff --git a/kernel/drivers/tty/hvc/Makefile b/kernel/drivers/tty/hvc/Makefile
index 6a2702be7..0b02ec7f1 100644
--- a/kernel/drivers/tty/hvc/Makefile
+++ b/kernel/drivers/tty/hvc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_HVC_CONSOLE)	+= hvc_vio.o hvsi_lib.o
 obj-$(CONFIG_HVC_OPAL)		+= hvc_opal.o hvsi_lib.o
 obj-$(CONFIG_HVC_OLD_HVSI)	+= hvsi.o
diff --git a/kernel/drivers/tty/hvc/hvc_irq.c b/kernel/drivers/tty/hvc/hvc_irq.c
index bc7a96874..4b255dfef 100644
--- a/kernel/drivers/tty/hvc/hvc_irq.c
+++ b/kernel/drivers/tty/hvc/hvc_irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright IBM Corp. 2001,2008
  *
diff --git a/kernel/drivers/tty/hvc/hvc_iucv.c b/kernel/drivers/tty/hvc/hvc_iucv.c
index 8b70a1627..a74680729 100644
--- a/kernel/drivers/tty/hvc/hvc_iucv.c
+++ b/kernel/drivers/tty/hvc/hvc_iucv.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * z/VM IUCV hypervisor console (HVC) device driver
  *
diff --git a/kernel/drivers/tty/hvc/hvsi_lib.c b/kernel/drivers/tty/hvc/hvsi_lib.c
index a270f0458..09289c815 100644
--- a/kernel/drivers/tty/hvc/hvsi_lib.c
+++ b/kernel/drivers/tty/hvc/hvsi_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
diff --git a/kernel/drivers/tty/ipwireless/hardware.c b/kernel/drivers/tty/ipwireless/hardware.c
index df0204b61..a6b8240af 100644
--- a/kernel/drivers/tty/ipwireless/hardware.c
+++ b/kernel/drivers/tty/ipwireless/hardware.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/hardware.h b/kernel/drivers/tty/ipwireless/hardware.h
index 90a8590e4..e524a8fcc 100644
--- a/kernel/drivers/tty/ipwireless/hardware.h
+++ b/kernel/drivers/tty/ipwireless/hardware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/main.h b/kernel/drivers/tty/ipwireless/main.h
index f2cbb116b..73818bb64 100644
--- a/kernel/drivers/tty/ipwireless/main.h
+++ b/kernel/drivers/tty/ipwireless/main.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/network.c b/kernel/drivers/tty/ipwireless/network.c
index c2f9a3263..695439c03 100644
--- a/kernel/drivers/tty/ipwireless/network.c
+++ b/kernel/drivers/tty/ipwireless/network.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/network.h b/kernel/drivers/tty/ipwireless/network.h
index 561f765b3..784932a59 100644
--- a/kernel/drivers/tty/ipwireless/network.h
+++ b/kernel/drivers/tty/ipwireless/network.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/setup_protocol.h b/kernel/drivers/tty/ipwireless/setup_protocol.h
index 002c34e72..d4a7ae257 100644
--- a/kernel/drivers/tty/ipwireless/setup_protocol.h
+++ b/kernel/drivers/tty/ipwireless/setup_protocol.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/tty.c b/kernel/drivers/tty/ipwireless/tty.c
index 2685d59d2..1ef751c27 100644
--- a/kernel/drivers/tty/ipwireless/tty.c
+++ b/kernel/drivers/tty/ipwireless/tty.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/ipwireless/tty.h b/kernel/drivers/tty/ipwireless/tty.h
index 747b2d637..ec698d9f3 100644
--- a/kernel/drivers/tty/ipwireless/tty.h
+++ b/kernel/drivers/tty/ipwireless/tty.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IPWireless 3G PCMCIA Network Driver
  *
diff --git a/kernel/drivers/tty/moxa.h b/kernel/drivers/tty/moxa.h
index 87d16ce57..8ce89fd36 100644
--- a/kernel/drivers/tty/moxa.h
+++ b/kernel/drivers/tty/moxa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MOXA_H_FILE
 #define MOXA_H_FILE
 
diff --git a/kernel/drivers/tty/mxser.h b/kernel/drivers/tty/mxser.h
index 0bf794313..e6cb15626 100644
--- a/kernel/drivers/tty/mxser.h
+++ b/kernel/drivers/tty/mxser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MXSER_H
 #define _MXSER_H
 
diff --git a/kernel/drivers/tty/pty.c b/kernel/drivers/tty/pty.c
index 26dcb3b60..643384420 100644
--- a/kernel/drivers/tty/pty.c
+++ b/kernel/drivers/tty/pty.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *
diff --git a/kernel/drivers/tty/rocket.h b/kernel/drivers/tty/rocket.h
index c11a9392f..d0560203f 100644
--- a/kernel/drivers/tty/rocket.h
+++ b/kernel/drivers/tty/rocket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * rocket.h --- the exported interface of the rocket driver to its configuration program.
  *
diff --git a/kernel/drivers/tty/rocket_int.h b/kernel/drivers/tty/rocket_int.h
index ef1e1be6b..727e50dbb 100644
--- a/kernel/drivers/tty/rocket_int.h
+++ b/kernel/drivers/tty/rocket_int.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * rocket_int.h --- internal header file for rocket.c
  *
diff --git a/kernel/drivers/tty/serial/8250/Makefile b/kernel/drivers/tty/serial/8250/Makefile
index 6a18d2d76..18751bc63 100644
--- a/kernel/drivers/tty/serial/8250/Makefile
+++ b/kernel/drivers/tty/serial/8250/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the 8250 serial device drivers.
 #
diff --git a/kernel/drivers/tty/serial/Makefile b/kernel/drivers/tty/serial/Makefile
index fe88a75d9..842d185d6 100644
--- a/kernel/drivers/tty/serial/Makefile
+++ b/kernel/drivers/tty/serial/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel serial device drivers.
 #
diff --git a/kernel/drivers/tty/serial/amba-pl011.h b/kernel/drivers/tty/serial/amba-pl011.h
index 411c60e1f..077eb12a3 100644
--- a/kernel/drivers/tty/serial/amba-pl011.h
+++ b/kernel/drivers/tty/serial/amba-pl011.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AMBA_PL011_H
 #define AMBA_PL011_H
 
diff --git a/kernel/drivers/tty/serial/apbuart.h b/kernel/drivers/tty/serial/apbuart.h
index 5faf87c8d..81baf0076 100644
--- a/kernel/drivers/tty/serial/apbuart.h
+++ b/kernel/drivers/tty/serial/apbuart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GRLIB_APBUART_H__
 #define __GRLIB_APBUART_H__
 
diff --git a/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h b/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
index 60c7e94cd..18ec08499 100644
--- a/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Driver for CPM (SCC/SMC) serial ports
  *
diff --git a/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h b/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
index 51e651a69..051a8509c 100644
--- a/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/kernel/drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Driver for CPM (SCC/SMC) serial ports
  *
diff --git a/kernel/drivers/tty/serial/crisv10.c b/kernel/drivers/tty/serial/crisv10.c
index 59a2a7e18..142180497 100644
--- a/kernel/drivers/tty/serial/crisv10.c
+++ b/kernel/drivers/tty/serial/crisv10.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Serial port driver for the ETRAX 100LX chip
  *
diff --git a/kernel/drivers/tty/serial/crisv10.h b/kernel/drivers/tty/serial/crisv10.h
index 15a52ee58..79ba2bc95 100644
--- a/kernel/drivers/tty/serial/crisv10.h
+++ b/kernel/drivers/tty/serial/crisv10.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * serial.h: Arch-dep definitions for the Etrax100 serial driver.
  *
diff --git a/kernel/drivers/tty/serial/dz.h b/kernel/drivers/tty/serial/dz.h
index faf169ed2..3b3e31954 100644
--- a/kernel/drivers/tty/serial/dz.h
+++ b/kernel/drivers/tty/serial/dz.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * dz.h: Serial port driver for DECstations equipped
  *       with the DZ chipset.
diff --git a/kernel/drivers/tty/serial/etraxfs-uart.c b/kernel/drivers/tty/serial/etraxfs-uart.c
index 2f80bc7e4..24bf6bfb2 100644
--- a/kernel/drivers/tty/serial/etraxfs-uart.c
+++ b/kernel/drivers/tty/serial/etraxfs-uart.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/console.h>
diff --git a/kernel/drivers/tty/serial/ip22zilog.h b/kernel/drivers/tty/serial/ip22zilog.h
index a59a9a834..b52801fe2 100644
--- a/kernel/drivers/tty/serial/ip22zilog.h
+++ b/kernel/drivers/tty/serial/ip22zilog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IP22_ZILOG_H
 #define _IP22_ZILOG_H
 
diff --git a/kernel/drivers/tty/serial/pmac_zilog.h b/kernel/drivers/tty/serial/pmac_zilog.h
index 3483242ee..bb874e768 100644
--- a/kernel/drivers/tty/serial/pmac_zilog.h
+++ b/kernel/drivers/tty/serial/pmac_zilog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PMAC_ZILOG_H__
 #define __PMAC_ZILOG_H__
 
diff --git a/kernel/drivers/tty/serial/sh-sci.h b/kernel/drivers/tty/serial/sh-sci.h
index 971b2ab08..938e23a2d 100644
--- a/kernel/drivers/tty/serial/sh-sci.h
+++ b/kernel/drivers/tty/serial/sh-sci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/bitops.h>
 #include <linux/serial_core.h>
 #include <linux/io.h>
diff --git a/kernel/drivers/tty/serial/sunsab.h b/kernel/drivers/tty/serial/sunsab.h
index b78e1f7b8..1644031aa 100644
--- a/kernel/drivers/tty/serial/sunsab.h
+++ b/kernel/drivers/tty/serial/sunsab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sunsab.h: Register Definitions for the Siemens SAB82532 DUSCC
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
diff --git a/kernel/drivers/tty/serial/sunzilog.h b/kernel/drivers/tty/serial/sunzilog.h
index 5dec7b47c..6d6764f0a 100644
--- a/kernel/drivers/tty/serial/sunzilog.h
+++ b/kernel/drivers/tty/serial/sunzilog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SUNZILOG_H
 #define _SUNZILOG_H
 
diff --git a/kernel/drivers/tty/serial/zs.h b/kernel/drivers/tty/serial/zs.h
index aa921b57d..26ef8eafa 100644
--- a/kernel/drivers/tty/serial/zs.h
+++ b/kernel/drivers/tty/serial/zs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zs.h: Definitions for the DECstation Z85C30 serial driver.
  *
diff --git a/kernel/drivers/tty/sysrq.c b/kernel/drivers/tty/sysrq.c
index 3ffc1ce29..d008f5a75 100644
--- a/kernel/drivers/tty/sysrq.c
+++ b/kernel/drivers/tty/sysrq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Linux Magic System Request Key Hacks
  *
diff --git a/kernel/drivers/tty/tty_mutex.c b/kernel/drivers/tty/tty_mutex.c
index d8bae67a6..2640635ee 100644
--- a/kernel/drivers/tty/tty_mutex.c
+++ b/kernel/drivers/tty/tty_mutex.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/tty.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
diff --git a/kernel/drivers/tty/vt/Makefile b/kernel/drivers/tty/vt/Makefile
index 17ae94cb2..edbbe0ccd 100644
--- a/kernel/drivers/tty/vt/Makefile
+++ b/kernel/drivers/tty/vt/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # This file contains the font map for the default (hardware) font
 #
diff --git a/kernel/drivers/tty/vt/selection.c b/kernel/drivers/tty/vt/selection.c
index accbd1257..7a4c8022c 100644
--- a/kernel/drivers/tty/vt/selection.c
+++ b/kernel/drivers/tty/vt/selection.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This module exports the functions:
  *
diff --git a/kernel/drivers/tty/vt/vc_screen.c b/kernel/drivers/tty/vt/vc_screen.c
index 56dcff605..85b6634f5 100644
--- a/kernel/drivers/tty/vt/vc_screen.c
+++ b/kernel/drivers/tty/vt/vc_screen.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Provide access to virtual console memory.
  * /dev/vcs0: the screen as it is being viewed right now (possibly scrolled)
diff --git a/kernel/drivers/tty/vt/vt_ioctl.c b/kernel/drivers/tty/vt/vt_ioctl.c
index 96d389cb5..2d2b42059 100644
--- a/kernel/drivers/tty/vt/vt_ioctl.c
+++ b/kernel/drivers/tty/vt/vt_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1992 obz under the linux copyright
  *
diff --git a/kernel/drivers/uio/Makefile b/kernel/drivers/uio/Makefile
index e9663bb8a..c285dd2a4 100644
--- a/kernel/drivers/uio/Makefile
+++ b/kernel/drivers/uio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_UIO)	+= uio.o
 obj-$(CONFIG_UIO_CIF)	+= uio_cif.o
 obj-$(CONFIG_UIO_PDRV_GENIRQ)	+= uio_pdrv_genirq.o
diff --git a/kernel/drivers/usb/Makefile b/kernel/drivers/usb/Makefile
index 9650b351c..060643a1b 100644
--- a/kernel/drivers/usb/Makefile
+++ b/kernel/drivers/usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel USB device drivers.
 #
diff --git a/kernel/drivers/usb/atm/Makefile b/kernel/drivers/usb/atm/Makefile
index ac278946b..7ac65ce1a 100644
--- a/kernel/drivers/usb/atm/Makefile
+++ b/kernel/drivers/usb/atm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB ATM/xDSL drivers
 #
diff --git a/kernel/drivers/usb/chipidea/Makefile b/kernel/drivers/usb/chipidea/Makefile
index ddcbddf83..e3d5e728f 100644
--- a/kernel/drivers/usb/chipidea/Makefile
+++ b/kernel/drivers/usb/chipidea/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_CHIPIDEA)		+= ci_hdrc.o
 
 ci_hdrc-y				:= core.o otg.o debug.o
diff --git a/kernel/drivers/usb/chipidea/debug.c b/kernel/drivers/usb/chipidea/debug.c
index 1c31e8a08..c9e1a165e 100644
--- a/kernel/drivers/usb/chipidea/debug.c
+++ b/kernel/drivers/usb/chipidea/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/types.h>
diff --git a/kernel/drivers/usb/chipidea/host.h b/kernel/drivers/usb/chipidea/host.h
index 0f12f131b..70112cf0f 100644
--- a/kernel/drivers/usb/chipidea/host.h
+++ b/kernel/drivers/usb/chipidea/host.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRIVERS_USB_CHIPIDEA_HOST_H
 #define __DRIVERS_USB_CHIPIDEA_HOST_H
 
diff --git a/kernel/drivers/usb/class/cdc-acm.h b/kernel/drivers/usb/class/cdc-acm.h
index 7a2b3deaf..eacc116e8 100644
--- a/kernel/drivers/usb/class/cdc-acm.h
+++ b/kernel/drivers/usb/class/cdc-acm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Includes for cdc-acm.c
diff --git a/kernel/drivers/usb/common/Makefile b/kernel/drivers/usb/common/Makefile
index 6bbb3ec17..0a7c45e85 100644
--- a/kernel/drivers/usb/common/Makefile
+++ b/kernel/drivers/usb/common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the usb common parts.
 #
diff --git a/kernel/drivers/usb/core/Makefile b/kernel/drivers/usb/core/Makefile
index 250ec1d66..92c9cefb4 100644
--- a/kernel/drivers/usb/core/Makefile
+++ b/kernel/drivers/usb/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB Core files and filesystem
 #
diff --git a/kernel/drivers/usb/dwc2/Makefile b/kernel/drivers/usb/dwc2/Makefile
index b9237e1e4..440320cc2 100644
--- a/kernel/drivers/usb/dwc2/Makefile
+++ b/kernel/drivers/usb/dwc2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_USB_DWC2_DEBUG)	+= -DDEBUG
 ccflags-$(CONFIG_USB_DWC2_VERBOSE)	+= -DVERBOSE_DEBUG
 
diff --git a/kernel/drivers/usb/dwc3/Makefile b/kernel/drivers/usb/dwc3/Makefile
index f15fabbd1..7ac725038 100644
--- a/kernel/drivers/usb/dwc3/Makefile
+++ b/kernel/drivers/usb/dwc3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # define_trace.h needs to know how to find our header
 CFLAGS_trace.o				:= -I$(src)
 
diff --git a/kernel/drivers/usb/gadget/Makefile b/kernel/drivers/usb/gadget/Makefile
index 598a67d6b..130dad713 100644
--- a/kernel/drivers/usb/gadget/Makefile
+++ b/kernel/drivers/usb/gadget/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # USB peripheral controller drivers
 #
diff --git a/kernel/drivers/usb/gadget/configfs.h b/kernel/drivers/usb/gadget/configfs.h
index 540d5e92e..3b6f5298b 100644
--- a/kernel/drivers/usb/gadget/configfs.h
+++ b/kernel/drivers/usb/gadget/configfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef USB__GADGET__CONFIGFS__H
 #define USB__GADGET__CONFIGFS__H
 
diff --git a/kernel/drivers/usb/gadget/function/Makefile b/kernel/drivers/usb/gadget/function/Makefile
index 86e825269..5d3a6cf02 100644
--- a/kernel/drivers/usb/gadget/function/Makefile
+++ b/kernel/drivers/usb/gadget/function/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # USB peripheral controller drivers
 #
diff --git a/kernel/drivers/usb/gadget/function/f_mass_storage.h b/kernel/drivers/usb/gadget/function/f_mass_storage.h
index dc05ca0c4..58857fcf1 100644
--- a/kernel/drivers/usb/gadget/function/f_mass_storage.h
+++ b/kernel/drivers/usb/gadget/function/f_mass_storage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef USB_F_MASS_STORAGE_H
 #define USB_F_MASS_STORAGE_H
 
diff --git a/kernel/drivers/usb/gadget/function/g_zero.h b/kernel/drivers/usb/gadget/function/g_zero.h
index 492924d0d..98b8462ad 100644
--- a/kernel/drivers/usb/gadget/function/g_zero.h
+++ b/kernel/drivers/usb/gadget/function/g_zero.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header declares the utility functions used by "Gadget Zero", plus
  * interfaces to its two single-configuration function drivers.
diff --git a/kernel/drivers/usb/gadget/function/storage_common.h b/kernel/drivers/usb/gadget/function/storage_common.h
index e0814a960..e5e3a2553 100644
--- a/kernel/drivers/usb/gadget/function/storage_common.h
+++ b/kernel/drivers/usb/gadget/function/storage_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef USB_STORAGE_COMMON_H
 #define USB_STORAGE_COMMON_H
 
diff --git a/kernel/drivers/usb/gadget/function/tcm.h b/kernel/drivers/usb/gadget/function/tcm.h
index a27e6e34d..3cd565794 100644
--- a/kernel/drivers/usb/gadget/function/tcm.h
+++ b/kernel/drivers/usb/gadget/function/tcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TARGET_USB_GADGET_H__
 #define __TARGET_USB_GADGET_H__
 
diff --git a/kernel/drivers/usb/gadget/function/uvc_queue.h b/kernel/drivers/usb/gadget/function/uvc_queue.h
index ac461a9a1..51ee94e5c 100644
--- a/kernel/drivers/usb/gadget/function/uvc_queue.h
+++ b/kernel/drivers/usb/gadget/function/uvc_queue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UVC_QUEUE_H_
 #define _UVC_QUEUE_H_
 
diff --git a/kernel/drivers/usb/gadget/legacy/Makefile b/kernel/drivers/usb/gadget/legacy/Makefile
index 7f485f257..abd0c3e66 100644
--- a/kernel/drivers/usb/gadget/legacy/Makefile
+++ b/kernel/drivers/usb/gadget/legacy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # USB gadget drivers
 #
diff --git a/kernel/drivers/usb/gadget/udc/Makefile b/kernel/drivers/usb/gadget/udc/Makefile
index ea9e1c7f1..ce865b129 100644
--- a/kernel/drivers/usb/gadget/udc/Makefile
+++ b/kernel/drivers/usb/gadget/udc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # define_trace.h needs to know how to find our header
 CFLAGS_trace.o			:= -I$(src)
 
diff --git a/kernel/drivers/usb/gadget/udc/bdc/Makefile b/kernel/drivers/usb/gadget/udc/bdc/Makefile
index 5cf6a3bcd..52cb5ea48 100644
--- a/kernel/drivers/usb/gadget/udc/bdc/Makefile
+++ b/kernel/drivers/usb/gadget/udc/bdc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_USB_BDC_UDC)	+= bdc.o
 bdc-y	:= bdc_core.o bdc_cmd.o bdc_ep.o bdc_udc.o
 
diff --git a/kernel/drivers/usb/gadget/udc/omap_udc.h b/kernel/drivers/usb/gadget/udc/omap_udc.h
index 26974196c..00f9e608e 100644
--- a/kernel/drivers/usb/gadget/udc/omap_udc.h
+++ b/kernel/drivers/usb/gadget/udc/omap_udc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * omap_udc.h -- for omap 3.2 udc, with OTG support
  *
diff --git a/kernel/drivers/usb/host/Makefile b/kernel/drivers/usb/host/Makefile
index cf2691fff..4ab2689c8 100644
--- a/kernel/drivers/usb/host/Makefile
+++ b/kernel/drivers/usb/host/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for USB Host Controller Drivers
 #
diff --git a/kernel/drivers/usb/host/fotg210.h b/kernel/drivers/usb/host/fotg210.h
index b5cfa7aeb..7fcd785c7 100644
--- a/kernel/drivers/usb/host/fotg210.h
+++ b/kernel/drivers/usb/host/fotg210.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_FOTG210_H
 #define __LINUX_FOTG210_H
 
diff --git a/kernel/drivers/usb/host/isp116x.h b/kernel/drivers/usb/host/isp116x.h
index dd34b7a33..a5e929c10 100644
--- a/kernel/drivers/usb/host/isp116x.h
+++ b/kernel/drivers/usb/host/isp116x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ISP116x register declarations and HCD data structures
  *
diff --git a/kernel/drivers/usb/host/isp1362.h b/kernel/drivers/usb/host/isp1362.h
index 3b0b4847c..da79e36ce 100644
--- a/kernel/drivers/usb/host/isp1362.h
+++ b/kernel/drivers/usb/host/isp1362.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ISP1362 HCD (Host Controller Driver) for USB.
  *
diff --git a/kernel/drivers/usb/host/oxu210hp.h b/kernel/drivers/usb/host/oxu210hp.h
index 1c216ad9a..437044147 100644
--- a/kernel/drivers/usb/host/oxu210hp.h
+++ b/kernel/drivers/usb/host/oxu210hp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Host interface registers
  */
diff --git a/kernel/drivers/usb/host/pci-quirks.h b/kernel/drivers/usb/host/pci-quirks.h
index 5582cbafe..b68dcb5dd 100644
--- a/kernel/drivers/usb/host/pci-quirks.h
+++ b/kernel/drivers/usb/host/pci-quirks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_USB_PCI_QUIRKS_H
 #define __LINUX_USB_PCI_QUIRKS_H
 
diff --git a/kernel/drivers/usb/host/sl811.h b/kernel/drivers/usb/host/sl811.h
index 1e23ef49b..2abe51a5d 100644
--- a/kernel/drivers/usb/host/sl811.h
+++ b/kernel/drivers/usb/host/sl811.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SL811HS register declarations and HCD data structures
  *
diff --git a/kernel/drivers/usb/host/uhci-debug.c b/kernel/drivers/usb/host/uhci-debug.c
index 9c6635d43..c4e67c4b5 100644
--- a/kernel/drivers/usb/host/uhci-debug.c
+++ b/kernel/drivers/usb/host/uhci-debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UHCI-specific debugging code. Invaluable when something
  * goes wrong, but don't get in my face.
diff --git a/kernel/drivers/usb/host/uhci-grlib.c b/kernel/drivers/usb/host/uhci-grlib.c
index 0342991c9..2103b1ed0 100644
--- a/kernel/drivers/usb/host/uhci-grlib.c
+++ b/kernel/drivers/usb/host/uhci-grlib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UHCI HCD (Host Controller Driver) for GRLIB GRUSBHC
  *
diff --git a/kernel/drivers/usb/host/uhci-hcd.h b/kernel/drivers/usb/host/uhci-hcd.h
index 91b22b2ea..d97f0d9b3 100644
--- a/kernel/drivers/usb/host/uhci-hcd.h
+++ b/kernel/drivers/usb/host/uhci-hcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_UHCI_HCD_H
 #define __LINUX_UHCI_HCD_H
 
diff --git a/kernel/drivers/usb/host/uhci-hub.c b/kernel/drivers/usb/host/uhci-hub.c
index ece9e37e8..47106dd8c 100644
--- a/kernel/drivers/usb/host/uhci-hub.c
+++ b/kernel/drivers/usb/host/uhci-hub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Universal Host Controller Interface driver for USB.
  *
diff --git a/kernel/drivers/usb/host/uhci-pci.c b/kernel/drivers/usb/host/uhci-pci.c
index 49effdc0d..0dd944277 100644
--- a/kernel/drivers/usb/host/uhci-pci.c
+++ b/kernel/drivers/usb/host/uhci-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UHCI HCD (Host Controller Driver) PCI Bus Glue.
  *
diff --git a/kernel/drivers/usb/host/uhci-platform.c b/kernel/drivers/usb/host/uhci-platform.c
index 1b4e086c3..6cb16d4b2 100644
--- a/kernel/drivers/usb/host/uhci-platform.c
+++ b/kernel/drivers/usb/host/uhci-platform.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic UHCI HCD (Host Controller Driver) for Platform Devices
  *
diff --git a/kernel/drivers/usb/host/uhci-q.c b/kernel/drivers/usb/host/uhci-q.c
index c17ea1589..49d4edc03 100644
--- a/kernel/drivers/usb/host/uhci-q.c
+++ b/kernel/drivers/usb/host/uhci-q.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Universal Host Controller Interface driver for USB.
  *
diff --git a/kernel/drivers/usb/image/microtek.h b/kernel/drivers/usb/image/microtek.h
index 7e32ae787..66685e592 100644
--- a/kernel/drivers/usb/image/microtek.h
+++ b/kernel/drivers/usb/image/microtek.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
  /*
  * Driver for Microtek Scanmaker X6 USB scanner and possibly others.
  * 
diff --git a/kernel/drivers/usb/isp1760/isp1760-hcd.c b/kernel/drivers/usb/isp1760/isp1760-hcd.c
index 8e59e0c02..bb4d6d959 100644
--- a/kernel/drivers/usb/isp1760/isp1760-hcd.c
+++ b/kernel/drivers/usb/isp1760/isp1760-hcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Driver for the NXP ISP1760 chip
  *
diff --git a/kernel/drivers/usb/isp1760/isp1760-hcd.h b/kernel/drivers/usb/isp1760/isp1760-hcd.h
index 0c1c98d6e..f1bb2deb1 100644
--- a/kernel/drivers/usb/isp1760/isp1760-hcd.h
+++ b/kernel/drivers/usb/isp1760/isp1760-hcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ISP1760_HCD_H_
 #define _ISP1760_HCD_H_
 
diff --git a/kernel/drivers/usb/isp1760/isp1760-if.c b/kernel/drivers/usb/isp1760/isp1760-if.c
index bc68bbab7..241a00d75 100644
--- a/kernel/drivers/usb/isp1760/isp1760-if.c
+++ b/kernel/drivers/usb/isp1760/isp1760-if.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Glue code for the ISP1760 driver and bus
  * Currently there is support for
diff --git a/kernel/drivers/usb/misc/Makefile b/kernel/drivers/usb/misc/Makefile
index 7fdb45fc9..109f54f5b 100644
--- a/kernel/drivers/usb/misc/Makefile
+++ b/kernel/drivers/usb/misc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the rest of the USB drivers
 # (the ones that don't fit into any other categories)
diff --git a/kernel/drivers/usb/mon/mon_bin.c b/kernel/drivers/usb/mon/mon_bin.c
index b6d8bf475..f6ae753ab 100644
--- a/kernel/drivers/usb/mon/mon_bin.c
+++ b/kernel/drivers/usb/mon/mon_bin.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
diff --git a/kernel/drivers/usb/mon/mon_stat.c b/kernel/drivers/usb/mon/mon_stat.c
index 5bdf73a57..98ab0cc47 100644
--- a/kernel/drivers/usb/mon/mon_stat.c
+++ b/kernel/drivers/usb/mon/mon_stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
diff --git a/kernel/drivers/usb/mon/mon_text.c b/kernel/drivers/usb/mon/mon_text.c
index 19c416d69..f5e1bb5e5 100644
--- a/kernel/drivers/usb/mon/mon_text.c
+++ b/kernel/drivers/usb/mon/mon_text.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
diff --git a/kernel/drivers/usb/mon/usb_mon.h b/kernel/drivers/usb/mon/usb_mon.h
index df9a4df34..aa64efaba 100644
--- a/kernel/drivers/usb/mon/usb_mon.h
+++ b/kernel/drivers/usb/mon/usb_mon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The USB Monitor, inspired by Dave Harding's USBMon.
  *
diff --git a/kernel/drivers/usb/mtu3/Makefile b/kernel/drivers/usb/mtu3/Makefile
index 60e0fff7a..4a9715812 100644
--- a/kernel/drivers/usb/mtu3/Makefile
+++ b/kernel/drivers/usb/mtu3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-$(CONFIG_USB_MTU3_DEBUG)	+= -DDEBUG
 
diff --git a/kernel/drivers/usb/musb/Makefile b/kernel/drivers/usb/musb/Makefile
index 689d42aba..79d4d5439 100644
--- a/kernel/drivers/usb/musb/Makefile
+++ b/kernel/drivers/usb/musb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # for USB OTG silicon based on Mentor Graphics INVENTRA designs
 #
diff --git a/kernel/drivers/usb/musb/cppi_dma.h b/kernel/drivers/usb/musb/cppi_dma.h
index 9bb7c5e45..16dd1ed44 100644
--- a/kernel/drivers/usb/musb/cppi_dma.h
+++ b/kernel/drivers/usb/musb/cppi_dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright (C) 2005-2006 by Texas Instruments */
 
 #ifndef _CPPI_DMA_H_
diff --git a/kernel/drivers/usb/phy/Makefile b/kernel/drivers/usb/phy/Makefile
index e7c9ca8ca..0c40ccc90 100644
--- a/kernel/drivers/usb/phy/Makefile
+++ b/kernel/drivers/usb/phy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for physical layer USB drivers
 #
diff --git a/kernel/drivers/usb/phy/phy-am335x-control.h b/kernel/drivers/usb/phy/phy-am335x-control.h
index e86b3165d..cd4acfc6e 100644
--- a/kernel/drivers/usb/phy/phy-am335x-control.h
+++ b/kernel/drivers/usb/phy/phy-am335x-control.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AM335x_PHY_CONTROL_H_
 #define _AM335x_PHY_CONTROL_H_
 
diff --git a/kernel/drivers/usb/phy/phy-generic.h b/kernel/drivers/usb/phy/phy-generic.h
index 0d0eadd54..972896275 100644
--- a/kernel/drivers/usb/phy/phy-generic.h
+++ b/kernel/drivers/usb/phy/phy-generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PHY_GENERIC_H_
 #define _PHY_GENERIC_H_
 
diff --git a/kernel/drivers/usb/renesas_usbhs/Makefile b/kernel/drivers/usb/renesas_usbhs/Makefile
index d787d05f6..fac147a3a 100644
--- a/kernel/drivers/usb/renesas_usbhs/Makefile
+++ b/kernel/drivers/usb/renesas_usbhs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # for Renesas USB
 #
diff --git a/kernel/drivers/usb/serial/Makefile b/kernel/drivers/usb/serial/Makefile
index 5a21a8239..2d491e434 100644
--- a/kernel/drivers/usb/serial/Makefile
+++ b/kernel/drivers/usb/serial/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the USB serial device drivers.
 #
diff --git a/kernel/drivers/usb/serial/cypress_m8.h b/kernel/drivers/usb/serial/cypress_m8.h
index 119d2e170..35e223751 100644
--- a/kernel/drivers/usb/serial/cypress_m8.h
+++ b/kernel/drivers/usb/serial/cypress_m8.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CYPRESS_M8_H
 #define CYPRESS_M8_H
 
diff --git a/kernel/drivers/usb/serial/ezusb_convert.pl b/kernel/drivers/usb/serial/ezusb_convert.pl
index 13f114691..40d23f21e 100644
--- a/kernel/drivers/usb/serial/ezusb_convert.pl
+++ b/kernel/drivers/usb/serial/ezusb_convert.pl
@@ -1,4 +1,5 @@
 #! /usr/bin/perl -w
+# SPDX-License-Identifier: GPL-2.0
 
 
 # convert an Intel HEX file into a set of C records usable by the firmware
diff --git a/kernel/drivers/usb/serial/ftdi_sio.h b/kernel/drivers/usb/serial/ftdi_sio.h
index bbcc13df1..dcd0b6e05 100644
--- a/kernel/drivers/usb/serial/ftdi_sio.h
+++ b/kernel/drivers/usb/serial/ftdi_sio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Driver definitions for the FTDI USB Single Port Serial Converter -
  * known as FTDI_SIO (Serial Input/Output application of the chipset)
diff --git a/kernel/drivers/usb/serial/ftdi_sio_ids.h b/kernel/drivers/usb/serial/ftdi_sio_ids.h
index f9d15bd62..4faa09fe3 100644
--- a/kernel/drivers/usb/serial/ftdi_sio_ids.h
+++ b/kernel/drivers/usb/serial/ftdi_sio_ids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters.
  * Please keep numerically sorted within individual areas, thanks!
diff --git a/kernel/drivers/usb/serial/kl5kusb105.h b/kernel/drivers/usb/serial/kl5kusb105.h
index 22a90badc..41c9bf60f 100644
--- a/kernel/drivers/usb/serial/kl5kusb105.h
+++ b/kernel/drivers/usb/serial/kl5kusb105.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for the KLSI KL5KUSB105 serial port adapter
  */
diff --git a/kernel/drivers/usb/serial/kobil_sct.h b/kernel/drivers/usb/serial/kobil_sct.h
index be207f715..030c1b426 100644
--- a/kernel/drivers/usb/serial/kobil_sct.h
+++ b/kernel/drivers/usb/serial/kobil_sct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define SUSBCRequest_SetBaudRateParityAndStopBits       1
 #define SUSBCR_SBR_MASK				0xFF00
 #define SUSBCR_SBR_1200				0x0100
diff --git a/kernel/drivers/usb/serial/usb-wwan.h b/kernel/drivers/usb/serial/usb-wwan.h
index 44b25c08c..d28dab4b9 100644
--- a/kernel/drivers/usb/serial/usb-wwan.h
+++ b/kernel/drivers/usb/serial/usb-wwan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for USB serial mobile broadband cards
  */
diff --git a/kernel/drivers/usb/storage/Makefile b/kernel/drivers/usb/storage/Makefile
index 4cd55481b..c5126a4cd 100644
--- a/kernel/drivers/usb/storage/Makefile
+++ b/kernel/drivers/usb/storage/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the USB Mass Storage device drivers.
 #
diff --git a/kernel/drivers/usb/storage/option_ms.h b/kernel/drivers/usb/storage/option_ms.h
index b6e448cab..643999218 100644
--- a/kernel/drivers/usb/storage/option_ms.h
+++ b/kernel/drivers/usb/storage/option_ms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OPTION_MS_H_
 #define _OPTION_MS_H_
 extern int option_ms_init(struct us_data *us);
diff --git a/kernel/drivers/usb/storage/sierra_ms.c b/kernel/drivers/usb/storage/sierra_ms.c
index 9a51019ac..daf624484 100644
--- a/kernel/drivers/usb/storage/sierra_ms.c
+++ b/kernel/drivers/usb/storage/sierra_ms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/kernel/drivers/usb/storage/sierra_ms.h b/kernel/drivers/usb/storage/sierra_ms.h
index bb48634ac..3e9da537d 100644
--- a/kernel/drivers/usb/storage/sierra_ms.h
+++ b/kernel/drivers/usb/storage/sierra_ms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SIERRA_MS_H_
 #define _SIERRA_MS_H_
 extern int sierra_ms_init(struct us_data *us);
diff --git a/kernel/drivers/usb/storage/uas-detect.h b/kernel/drivers/usb/storage/uas-detect.h
index a155cd02b..1fcd758a9 100644
--- a/kernel/drivers/usb/storage/uas-detect.h
+++ b/kernel/drivers/usb/storage/uas-detect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 #include "usb.h"
diff --git a/kernel/drivers/usb/typec/ucsi/Makefile b/kernel/drivers/usb/typec/ucsi/Makefile
index 8372fc22f..b57891c1f 100644
--- a/kernel/drivers/usb/typec/ucsi/Makefile
+++ b/kernel/drivers/usb/typec/ucsi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS_trace.o			:= -I$(src)
 
 obj-$(CONFIG_TYPEC_UCSI)	+= typec_ucsi.o
diff --git a/kernel/drivers/usb/typec/ucsi/debug.h b/kernel/drivers/usb/typec/ucsi/debug.h
index e4d8fc763..fdeff39df 100644
--- a/kernel/drivers/usb/typec/ucsi/debug.h
+++ b/kernel/drivers/usb/typec/ucsi/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UCSI_DEBUG_H
 #define __UCSI_DEBUG_H
 
diff --git a/kernel/drivers/usb/typec/ucsi/trace.h b/kernel/drivers/usb/typec/ucsi/trace.h
index 98b404404..d5092446e 100644
--- a/kernel/drivers/usb/typec/ucsi/trace.h
+++ b/kernel/drivers/usb/typec/ucsi/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ucsi
diff --git a/kernel/drivers/usb/typec/ucsi/ucsi.h b/kernel/drivers/usb/typec/ucsi/ucsi.h
index 8a88f4582..53b80f40a 100644
--- a/kernel/drivers/usb/typec/ucsi/ucsi.h
+++ b/kernel/drivers/usb/typec/ucsi/ucsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __DRIVER_USB_TYPEC_UCSI_H
 #define __DRIVER_USB_TYPEC_UCSI_H
diff --git a/kernel/drivers/usb/usbip/Makefile b/kernel/drivers/usb/usbip/Makefile
index d843a9e68..f4c8f3840 100644
--- a/kernel/drivers/usb/usbip/Makefile
+++ b/kernel/drivers/usb/usbip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_USBIP_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_USBIP_CORE) += usbip-core.o
diff --git a/kernel/drivers/usb/wusbcore/Makefile b/kernel/drivers/usb/wusbcore/Makefile
index b3bd31303..d604ccdd9 100644
--- a/kernel/drivers/usb/wusbcore/Makefile
+++ b/kernel/drivers/usb/wusbcore/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_USB_WUSB_CBAF_DEBUG) := -DDEBUG
 
 obj-$(CONFIG_USB_WUSB)		+= wusbcore.o
diff --git a/kernel/drivers/uwb/Makefile b/kernel/drivers/uwb/Makefile
index d47dd6e29..32f4de7af 100644
--- a/kernel/drivers/uwb/Makefile
+++ b/kernel/drivers/uwb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_UWB)		+= uwb.o
 obj-$(CONFIG_UWB_WHCI)		+= umc.o whci.o whc-rc.o
 obj-$(CONFIG_UWB_HWA)		+= hwa-rc.o
diff --git a/kernel/drivers/uwb/i1480/dfu/Makefile b/kernel/drivers/uwb/i1480/dfu/Makefile
index bd1b9f254..4739fdac5 100644
--- a/kernel/drivers/uwb/i1480/dfu/Makefile
+++ b/kernel/drivers/uwb/i1480/dfu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_UWB_I1480U)	+= i1480-dfu-usb.o
 
 i1480-dfu-usb-objs := \
diff --git a/kernel/drivers/vfio/Makefile b/kernel/drivers/vfio/Makefile
index 4a23c13b6..de67c4725 100644
--- a/kernel/drivers/vfio/Makefile
+++ b/kernel/drivers/vfio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vfio_virqfd-y := virqfd.o
 
 obj-$(CONFIG_VFIO) += vfio.o
diff --git a/kernel/drivers/vfio/platform/Makefile b/kernel/drivers/vfio/platform/Makefile
index 41a6224f5..3f3a24e7c 100644
--- a/kernel/drivers/vfio/platform/Makefile
+++ b/kernel/drivers/vfio/platform/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vfio-platform-base-y := vfio_platform_common.o vfio_platform_irq.o
 vfio-platform-y := vfio_platform.o
 
diff --git a/kernel/drivers/vfio/platform/reset/Makefile b/kernel/drivers/vfio/platform/reset/Makefile
index 93f4e2326..90ba20b64 100644
--- a/kernel/drivers/vfio/platform/reset/Makefile
+++ b/kernel/drivers/vfio/platform/reset/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 vfio-platform-calxedaxgmac-y := vfio_platform_calxedaxgmac.o
 vfio-platform-amdxgbe-y := vfio_platform_amdxgbe.o
 
diff --git a/kernel/drivers/vhost/Makefile b/kernel/drivers/vhost/Makefile
index 6b012b986..6c6df24f7 100644
--- a/kernel/drivers/vhost/Makefile
+++ b/kernel/drivers/vhost/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VHOST_NET) += vhost_net.o
 vhost_net-y := net.o
 
diff --git a/kernel/drivers/vhost/test.h b/kernel/drivers/vhost/test.h
index 1fef5df82..7dd265bfd 100644
--- a/kernel/drivers/vhost/test.h
+++ b/kernel/drivers/vhost/test.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_VHOST_TEST_H
 #define LINUX_VHOST_TEST_H
 
diff --git a/kernel/drivers/vhost/vhost.h b/kernel/drivers/vhost/vhost.h
index d59a9cc65..79c6e7a60 100644
--- a/kernel/drivers/vhost/vhost.h
+++ b/kernel/drivers/vhost/vhost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VHOST_H
 #define _VHOST_H
 
diff --git a/kernel/drivers/video/Makefile b/kernel/drivers/video/Makefile
index 445b2c230..df7650ade 100644
--- a/kernel/drivers/video/Makefile
+++ b/kernel/drivers/video/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VGASTATE)            += vgastate.o
 obj-$(CONFIG_HDMI)                += hdmi.o
 
diff --git a/kernel/drivers/video/backlight/Makefile b/kernel/drivers/video/backlight/Makefile
index 890512969..5e28f01c8 100644
--- a/kernel/drivers/video/backlight/Makefile
+++ b/kernel/drivers/video/backlight/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Backlight & LCD drivers
 
 obj-$(CONFIG_LCD_AMS369FG06)		+= ams369fg06.o
diff --git a/kernel/drivers/video/console/Makefile b/kernel/drivers/video/console/Makefile
index eb2cbec52..db07b784b 100644
--- a/kernel/drivers/video/console/Makefile
+++ b/kernel/drivers/video/console/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux graphics to console drivers.
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
 # Rewritten to use lists instead of if-statements.
diff --git a/kernel/drivers/video/fbdev/Makefile b/kernel/drivers/video/fbdev/Makefile
index ee8c81405..8895536a2 100644
--- a/kernel/drivers/video/fbdev/Makefile
+++ b/kernel/drivers/video/fbdev/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux video drivers.
 # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net>
 # Rewritten to use lists instead of if-statements.
diff --git a/kernel/drivers/video/fbdev/amba-clcd-nomadik.h b/kernel/drivers/video/fbdev/amba-clcd-nomadik.h
index a24032c81..462c31381 100644
--- a/kernel/drivers/video/fbdev/amba-clcd-nomadik.h
+++ b/kernel/drivers/video/fbdev/amba-clcd-nomadik.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AMBA_CLCD_NOMADIK_H
 #define _AMBA_CLCD_NOMADIK_H
 
diff --git a/kernel/drivers/video/fbdev/amba-clcd-versatile.h b/kernel/drivers/video/fbdev/amba-clcd-versatile.h
index 4692c3092..b20baa47e 100644
--- a/kernel/drivers/video/fbdev/amba-clcd-versatile.h
+++ b/kernel/drivers/video/fbdev/amba-clcd-versatile.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Special local versatile callbacks
  */
diff --git a/kernel/drivers/video/fbdev/atafb.h b/kernel/drivers/video/fbdev/atafb.h
index 014e05906..2b2675980 100644
--- a/kernel/drivers/video/fbdev/atafb.h
+++ b/kernel/drivers/video/fbdev/atafb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VIDEO_ATAFB_H
 #define _VIDEO_ATAFB_H
 
diff --git a/kernel/drivers/video/fbdev/atafb_utils.h b/kernel/drivers/video/fbdev/atafb_utils.h
index ac9e19dc5..8f3396ea8 100644
--- a/kernel/drivers/video/fbdev/atafb_utils.h
+++ b/kernel/drivers/video/fbdev/atafb_utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VIDEO_ATAFB_UTILS_H
 #define _VIDEO_ATAFB_UTILS_H
 
diff --git a/kernel/drivers/video/fbdev/aty/Makefile b/kernel/drivers/video/fbdev/aty/Makefile
index a6cc0e9ec..069465c82 100644
--- a/kernel/drivers/video/fbdev/aty/Makefile
+++ b/kernel/drivers/video/fbdev/aty/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FB_ATY) += atyfb.o
 obj-$(CONFIG_FB_ATY128) += aty128fb.o
 obj-$(CONFIG_FB_RADEON) += radeonfb.o
diff --git a/kernel/drivers/video/fbdev/aty/ati_ids.h b/kernel/drivers/video/fbdev/aty/ati_ids.h
index 3e9d28bcd..2b589d687 100644
--- a/kernel/drivers/video/fbdev/aty/ati_ids.h
+++ b/kernel/drivers/video/fbdev/aty/ati_ids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ATI PCI IDs from XFree86, kept here to make sync'ing with
  * XFree much simpler. Currently, this list is only used by
diff --git a/kernel/drivers/video/fbdev/aty/atyfb.h b/kernel/drivers/video/fbdev/aty/atyfb.h
index 63c4842eb..8235b285d 100644
--- a/kernel/drivers/video/fbdev/aty/atyfb.h
+++ b/kernel/drivers/video/fbdev/aty/atyfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ATI Frame Buffer Device Driver Core Definitions
  */
diff --git a/kernel/drivers/video/fbdev/aty/mach64_accel.c b/kernel/drivers/video/fbdev/aty/mach64_accel.c
index 182bd6801..2541a0e0d 100644
--- a/kernel/drivers/video/fbdev/aty/mach64_accel.c
+++ b/kernel/drivers/video/fbdev/aty/mach64_accel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  *  ATI Mach64 Hardware Acceleration
diff --git a/kernel/drivers/video/fbdev/aty/mach64_ct.c b/kernel/drivers/video/fbdev/aty/mach64_ct.c
index 51f29d627..7d3bd723d 100644
--- a/kernel/drivers/video/fbdev/aty/mach64_ct.c
+++ b/kernel/drivers/video/fbdev/aty/mach64_ct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  *  ATI Mach64 CT/VT/GT/LT Support
diff --git a/kernel/drivers/video/fbdev/aty/mach64_cursor.c b/kernel/drivers/video/fbdev/aty/mach64_cursor.c
index 2fa0317ab..4cde25eab 100644
--- a/kernel/drivers/video/fbdev/aty/mach64_cursor.c
+++ b/kernel/drivers/video/fbdev/aty/mach64_cursor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  ATI Mach64 CT/VT/GT/LT Cursor Support
  */
diff --git a/kernel/drivers/video/fbdev/aty/mach64_gx.c b/kernel/drivers/video/fbdev/aty/mach64_gx.c
index 10c988aef..27cb65fa2 100644
--- a/kernel/drivers/video/fbdev/aty/mach64_gx.c
+++ b/kernel/drivers/video/fbdev/aty/mach64_gx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  *  ATI Mach64 GX Support
diff --git a/kernel/drivers/video/fbdev/aty/radeon_accel.c b/kernel/drivers/video/fbdev/aty/radeon_accel.c
index a469a3d6e..bb147d8bf 100644
--- a/kernel/drivers/video/fbdev/aty/radeon_accel.c
+++ b/kernel/drivers/video/fbdev/aty/radeon_accel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "radeonfb.h"
 
 /* the accelerated functions here are patterned after the 
diff --git a/kernel/drivers/video/fbdev/aty/radeon_i2c.c b/kernel/drivers/video/fbdev/aty/radeon_i2c.c
index ab1d0fd76..269b12ebb 100644
--- a/kernel/drivers/video/fbdev/aty/radeon_i2c.c
+++ b/kernel/drivers/video/fbdev/aty/radeon_i2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "radeonfb.h"
 
 #include <linux/module.h>
diff --git a/kernel/drivers/video/fbdev/aty/radeon_monitor.c b/kernel/drivers/video/fbdev/aty/radeon_monitor.c
index dd823f5fe..9966c58aa 100644
--- a/kernel/drivers/video/fbdev/aty/radeon_monitor.c
+++ b/kernel/drivers/video/fbdev/aty/radeon_monitor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "radeonfb.h"
 
 #include <linux/slab.h>
diff --git a/kernel/drivers/video/fbdev/aty/radeon_pm.c b/kernel/drivers/video/fbdev/aty/radeon_pm.c
index 141754273..f7c253dd5 100644
--- a/kernel/drivers/video/fbdev/aty/radeon_pm.c
+++ b/kernel/drivers/video/fbdev/aty/radeon_pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	drivers/video/aty/radeon_pm.c
  *
diff --git a/kernel/drivers/video/fbdev/aty/radeonfb.h b/kernel/drivers/video/fbdev/aty/radeonfb.h
index 962e31263..131b34dd6 100644
--- a/kernel/drivers/video/fbdev/aty/radeonfb.h
+++ b/kernel/drivers/video/fbdev/aty/radeonfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RADEONFB_H__
 #define __RADEONFB_H__
 
diff --git a/kernel/drivers/video/fbdev/carminefb.h b/kernel/drivers/video/fbdev/carminefb.h
index 05306de0c..297688eba 100644
--- a/kernel/drivers/video/fbdev/carminefb.h
+++ b/kernel/drivers/video/fbdev/carminefb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CARMINE_CARMINE_H
 #define CARMINE_CARMINE_H
 
diff --git a/kernel/drivers/video/fbdev/carminefb_regs.h b/kernel/drivers/video/fbdev/carminefb_regs.h
index 045215600..ae18318d2 100644
--- a/kernel/drivers/video/fbdev/carminefb_regs.h
+++ b/kernel/drivers/video/fbdev/carminefb_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CARMINEFB_REGS_H
 #define _CARMINEFB_REGS_H
 
diff --git a/kernel/drivers/video/fbdev/core/Makefile b/kernel/drivers/video/fbdev/core/Makefile
index 73493bbd7..d34fd182c 100644
--- a/kernel/drivers/video/fbdev/core/Makefile
+++ b/kernel/drivers/video/fbdev/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FB_CMDLINE)          += fb_cmdline.o
 obj-$(CONFIG_FB_NOTIFY)           += fb_notify.o
 obj-$(CONFIG_FB)                  += fb.o
diff --git a/kernel/drivers/video/fbdev/core/fb_draw.h b/kernel/drivers/video/fbdev/core/fb_draw.h
index 624ee115f..e0d829873 100644
--- a/kernel/drivers/video/fbdev/core/fb_draw.h
+++ b/kernel/drivers/video/fbdev/core/fb_draw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FB_DRAW_H
 #define _FB_DRAW_H
 
diff --git a/kernel/drivers/video/fbdev/efifb.c b/kernel/drivers/video/fbdev/efifb.c
index 3a010641f..d1bf9c2a7 100644
--- a/kernel/drivers/video/fbdev/efifb.c
+++ b/kernel/drivers/video/fbdev/efifb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Framebuffer driver for EFI/UEFI based system
  *
diff --git a/kernel/drivers/video/fbdev/geode/Makefile b/kernel/drivers/video/fbdev/geode/Makefile
index 5c98da126..16ba8a71d 100644
--- a/kernel/drivers/video/fbdev/geode/Makefile
+++ b/kernel/drivers/video/fbdev/geode/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Geode family framebuffer drivers
 
 obj-$(CONFIG_FB_GEODE_GX1) += gx1fb.o
diff --git a/kernel/drivers/video/fbdev/i810/Makefile b/kernel/drivers/video/fbdev/i810/Makefile
index 96e08c8de..3e466510f 100644
--- a/kernel/drivers/video/fbdev/i810/Makefile
+++ b/kernel/drivers/video/fbdev/i810/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Intel 810/815 framebuffer driver
 #
diff --git a/kernel/drivers/video/fbdev/intelfb/Makefile b/kernel/drivers/video/fbdev/intelfb/Makefile
index f7d631ebe..7ff2debb3 100644
--- a/kernel/drivers/video/fbdev/intelfb/Makefile
+++ b/kernel/drivers/video/fbdev/intelfb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FB_INTEL) += intelfb.o
 
 intelfb-y := intelfbdrv.o intelfbhw.o
diff --git a/kernel/drivers/video/fbdev/intelfb/intelfb.h b/kernel/drivers/video/fbdev/intelfb/intelfb.h
index 37f8339ea..b54db05f0 100644
--- a/kernel/drivers/video/fbdev/intelfb/intelfb.h
+++ b/kernel/drivers/video/fbdev/intelfb/intelfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INTELFB_H
 #define _INTELFB_H
 
diff --git a/kernel/drivers/video/fbdev/matrox/g450_pll.h b/kernel/drivers/video/fbdev/matrox/g450_pll.h
index aac615d18..5303336c6 100644
--- a/kernel/drivers/video/fbdev/matrox/g450_pll.h
+++ b/kernel/drivers/video/fbdev/matrox/g450_pll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __G450_PLL_H__
 #define __G450_PLL_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_DAC1064.h b/kernel/drivers/video/fbdev/matrox/matroxfb_DAC1064.h
index 1e6e45b57..3b2a6fd35 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_DAC1064.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_DAC1064.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_DAC1064_H__
 #define __MATROXFB_DAC1064_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_Ti3026.h b/kernel/drivers/video/fbdev/matrox/matroxfb_Ti3026.h
index 27872aaa0..faee149d0 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_Ti3026.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_Ti3026.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_TI3026_H__
 #define __MATROXFB_TI3026_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_accel.h b/kernel/drivers/video/fbdev/matrox/matroxfb_accel.h
index 1e418e62c..a7aa9a1d2 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_accel.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_accel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_ACCEL_H__
 #define __MATROXFB_ACCEL_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_base.h b/kernel/drivers/video/fbdev/matrox/matroxfb_base.h
index 7a90ea2c4..f85ad2565 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_base.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Hardware accelerated Matrox Millennium I, II, Mystique, G100, G200, G400 and G450
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_crtc2.h b/kernel/drivers/video/fbdev/matrox/matroxfb_crtc2.h
index 1005582e8..23e90e210 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_crtc2.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_crtc2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_CRTC2_H__
 #define __MATROXFB_CRTC2_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_g450.h b/kernel/drivers/video/fbdev/matrox/matroxfb_g450.h
index 3a3e65444..b5f17b86e 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_g450.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_g450.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_G450_H__
 #define __MATROXFB_G450_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_maven.h b/kernel/drivers/video/fbdev/matrox/matroxfb_maven.h
index 99eddec9f..f896b7883 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_maven.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_maven.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_MAVEN_H__
 #define __MATROXFB_MAVEN_H__
 
diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_misc.h b/kernel/drivers/video/fbdev/matrox/matroxfb_misc.h
index 351c823f1..9cb6686d3 100644
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_misc.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_misc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MATROXFB_MISC_H__
 #define __MATROXFB_MISC_H__
 
diff --git a/kernel/drivers/video/fbdev/mb862xx/mb862xx_reg.h b/kernel/drivers/video/fbdev/mb862xx/mb862xx_reg.h
index 9df48b8ed..e6d051395 100644
--- a/kernel/drivers/video/fbdev/mb862xx/mb862xx_reg.h
+++ b/kernel/drivers/video/fbdev/mb862xx/mb862xx_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Fujitsu MB862xx Graphics Controller Registers/Bits
  */
diff --git a/kernel/drivers/video/fbdev/mb862xx/mb862xxfb.h b/kernel/drivers/video/fbdev/mb862xx/mb862xxfb.h
index 8550630c1..50bc9b584 100644
--- a/kernel/drivers/video/fbdev/mb862xx/mb862xxfb.h
+++ b/kernel/drivers/video/fbdev/mb862xx/mb862xxfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MB862XX_H__
 #define __MB862XX_H__
 
diff --git a/kernel/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h b/kernel/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h
index 96a2dfef0..3a2549f9a 100644
--- a/kernel/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h
+++ b/kernel/drivers/video/fbdev/mb862xx/mb862xxfb_accel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MB826XXFB_ACCEL_H__
 #define __MB826XXFB_ACCEL_H__
 
diff --git a/kernel/drivers/video/fbdev/mbx/mbxdebugfs.c b/kernel/drivers/video/fbdev/mbx/mbxdebugfs.c
index 2528d3e60..2bd328883 100644
--- a/kernel/drivers/video/fbdev/mbx/mbxdebugfs.c
+++ b/kernel/drivers/video/fbdev/mbx/mbxdebugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/debugfs.h>
 #include <linux/slab.h>
 
diff --git a/kernel/drivers/video/fbdev/mbx/reg_bits.h b/kernel/drivers/video/fbdev/mbx/reg_bits.h
index 5f14b4bef..6607f3536 100644
--- a/kernel/drivers/video/fbdev/mbx/reg_bits.h
+++ b/kernel/drivers/video/fbdev/mbx/reg_bits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __REG_BITS_2700G_
 #define __REG_BITS_2700G_
 
diff --git a/kernel/drivers/video/fbdev/mbx/regs.h b/kernel/drivers/video/fbdev/mbx/regs.h
index 063099d48..591fc9d26 100644
--- a/kernel/drivers/video/fbdev/mbx/regs.h
+++ b/kernel/drivers/video/fbdev/mbx/regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __REGS_2700G_
 #define __REGS_2700G_
 
diff --git a/kernel/drivers/video/fbdev/mmp/panel/Kconfig b/kernel/drivers/video/fbdev/mmp/panel/Kconfig
index 4b2c4f457..808890f70 100644
--- a/kernel/drivers/video/fbdev/mmp/panel/Kconfig
+++ b/kernel/drivers/video/fbdev/mmp/panel/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config MMP_PANEL_TPOHVGA
 	bool "tpohvga panel TJ032MD01BW support"
 	depends on SPI_MASTER
diff --git a/kernel/drivers/video/fbdev/nvidia/Makefile b/kernel/drivers/video/fbdev/nvidia/Makefile
index 917d3eb05..cdd6e8ac4 100644
--- a/kernel/drivers/video/fbdev/nvidia/Makefile
+++ b/kernel/drivers/video/fbdev/nvidia/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the nVidia framebuffer driver
 #
diff --git a/kernel/drivers/video/fbdev/nvidia/nv_proto.h b/kernel/drivers/video/fbdev/nvidia/nv_proto.h
index 878a5ce02..fb9c5ebf2 100644
--- a/kernel/drivers/video/fbdev/nvidia/nv_proto.h
+++ b/kernel/drivers/video/fbdev/nvidia/nv_proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_proto.h,v 1.10 2003/07/31 20:24:29 mvojkovi Exp $ */
 
 #ifndef __NV_PROTO_H__
diff --git a/kernel/drivers/video/fbdev/nvidia/nv_type.h b/kernel/drivers/video/fbdev/nvidia/nv_type.h
index 6ff321a36..d7a1d4363 100644
--- a/kernel/drivers/video/fbdev/nvidia/nv_type.h
+++ b/kernel/drivers/video/fbdev/nvidia/nv_type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NV_TYPE_H__
 #define __NV_TYPE_H__
 
diff --git a/kernel/drivers/video/fbdev/omap/Makefile b/kernel/drivers/video/fbdev/omap/Makefile
index 732e0718b..daaa73a94 100644
--- a/kernel/drivers/video/fbdev/omap/Makefile
+++ b/kernel/drivers/video/fbdev/omap/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the OMAP1 framebuffer device driver
 #
diff --git a/kernel/drivers/video/fbdev/omap/lcdc.h b/kernel/drivers/video/fbdev/omap/lcdc.h
index 845222270..8a7607d86 100644
--- a/kernel/drivers/video/fbdev/omap/lcdc.h
+++ b/kernel/drivers/video/fbdev/omap/lcdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LCDC_H
 #define LCDC_H
 
diff --git a/kernel/drivers/video/fbdev/omap2/omapfb/Makefile b/kernel/drivers/video/fbdev/omap2/omapfb/Makefile
index ad68ecf14..602edfed0 100644
--- a/kernel/drivers/video/fbdev/omap2/omapfb/Makefile
+++ b/kernel/drivers/video/fbdev/omap2/omapfb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
 obj-y += dss/
 obj-y += displays/
diff --git a/kernel/drivers/video/fbdev/omap2/omapfb/displays/Makefile b/kernel/drivers/video/fbdev/omap2/omapfb/displays/Makefile
index 4f7459272..f801762ce 100644
--- a/kernel/drivers/video/fbdev/omap2/omapfb/displays/Makefile
+++ b/kernel/drivers/video/fbdev/omap2/omapfb/displays/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FB_OMAP2_ENCODER_OPA362) += encoder-opa362.o
 obj-$(CONFIG_FB_OMAP2_ENCODER_TFP410) += encoder-tfp410.o
 obj-$(CONFIG_FB_OMAP2_ENCODER_TPD12S015) += encoder-tpd12s015.o
diff --git a/kernel/drivers/video/fbdev/omap2/omapfb/dss/Kconfig b/kernel/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
index 27d220212..6d0bb27e4 100644
--- a/kernel/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
+++ b/kernel/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 config FB_OMAP2_DSS_INIT
 	bool
 
diff --git a/kernel/drivers/video/fbdev/omap2/omapfb/dss/Makefile b/kernel/drivers/video/fbdev/omap2/omapfb/dss/Makefile
index 02308e24f..7318d5260 100644
--- a/kernel/drivers/video/fbdev/omap2/omapfb/dss/Makefile
+++ b/kernel/drivers/video/fbdev/omap2/omapfb/dss/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FB_OMAP2_DSS_INIT) += omapdss-boot-init.o
 obj-$(CONFIG_FB_OMAP2_DSS) += omapdss.o
 # Core DSS files
diff --git a/kernel/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c b/kernel/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
index 189a5ad12..f13d76398 100644
--- a/kernel/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
+++ b/kernel/drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #define DSS_SUBSYS_NAME "HDMI"
 
diff --git a/kernel/drivers/video/fbdev/pxa168fb.h b/kernel/drivers/video/fbdev/pxa168fb.h
index eee09279c..2aba90de1 100644
--- a/kernel/drivers/video/fbdev/pxa168fb.h
+++ b/kernel/drivers/video/fbdev/pxa168fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PXA168FB_H__
 #define __PXA168FB_H__
 
diff --git a/kernel/drivers/video/fbdev/pxa3xx-gcu.h b/kernel/drivers/video/fbdev/pxa3xx-gcu.h
index 0428ed03d..ea9489d16 100644
--- a/kernel/drivers/video/fbdev/pxa3xx-gcu.h
+++ b/kernel/drivers/video/fbdev/pxa3xx-gcu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PXA3XX_GCU_H__
 #define __PXA3XX_GCU_H__
 
diff --git a/kernel/drivers/video/fbdev/riva/Makefile b/kernel/drivers/video/fbdev/riva/Makefile
index 8898c9915..bdbdd6eb8 100644
--- a/kernel/drivers/video/fbdev/riva/Makefile
+++ b/kernel/drivers/video/fbdev/riva/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Riva framebuffer driver
 #
diff --git a/kernel/drivers/video/fbdev/riva/nv_type.h b/kernel/drivers/video/fbdev/riva/nv_type.h
index a69480c9a..51937a0ae 100644
--- a/kernel/drivers/video/fbdev/riva/nv_type.h
+++ b/kernel/drivers/video/fbdev/riva/nv_type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_type.h,v 1.35 2002/08/05 20:47:06 mvojkovi Exp $ */
 
 #ifndef __NV_STRUCT_H__
diff --git a/kernel/drivers/video/fbdev/riva/rivafb.h b/kernel/drivers/video/fbdev/riva/rivafb.h
index 61fd37ca4..593297ca2 100644
--- a/kernel/drivers/video/fbdev/riva/rivafb.h
+++ b/kernel/drivers/video/fbdev/riva/rivafb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RIVAFB_H
 #define __RIVAFB_H
 
diff --git a/kernel/drivers/video/fbdev/sbuslib.c b/kernel/drivers/video/fbdev/sbuslib.c
index a350209ff..af6fc97f4 100644
--- a/kernel/drivers/video/fbdev/sbuslib.c
+++ b/kernel/drivers/video/fbdev/sbuslib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* sbuslib.c: Helper library for SBUS framebuffer drivers.
  *
  * Copyright (C) 2003 David S. Miller (davem@redhat.com)
diff --git a/kernel/drivers/video/fbdev/sbuslib.h b/kernel/drivers/video/fbdev/sbuslib.h
index 7ba325023..a6b9a2467 100644
--- a/kernel/drivers/video/fbdev/sbuslib.h
+++ b/kernel/drivers/video/fbdev/sbuslib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sbuslib.h: SBUS fb helper library interfaces */
 #ifndef _SBUSLIB_H
 #define _SBUSLIB_H
diff --git a/kernel/drivers/video/fbdev/sh_mobile_lcdcfb.h b/kernel/drivers/video/fbdev/sh_mobile_lcdcfb.h
index f839adef1..cc52c7472 100644
--- a/kernel/drivers/video/fbdev/sh_mobile_lcdcfb.h
+++ b/kernel/drivers/video/fbdev/sh_mobile_lcdcfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SH_MOBILE_LCDCFB_H
 #define SH_MOBILE_LCDCFB_H
 
diff --git a/kernel/drivers/video/fbdev/sticore.h b/kernel/drivers/video/fbdev/sticore.h
index af1619536..fb8f58f98 100644
--- a/kernel/drivers/video/fbdev/sticore.h
+++ b/kernel/drivers/video/fbdev/sticore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef STICORE_H
 #define STICORE_H
 
diff --git a/kernel/drivers/video/fbdev/via/Makefile b/kernel/drivers/video/fbdev/via/Makefile
index 159f26e6a..771a0eee7 100644
--- a/kernel/drivers/video/fbdev/via/Makefile
+++ b/kernel/drivers/video/fbdev/via/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the VIA framebuffer driver (for Linux Kernel 2.6)
 #
diff --git a/kernel/drivers/video/fbdev/wmt_ge_rops.h b/kernel/drivers/video/fbdev/wmt_ge_rops.h
index f73ec6377..8d9ed8a51 100644
--- a/kernel/drivers/video/fbdev/wmt_ge_rops.h
+++ b/kernel/drivers/video/fbdev/wmt_ge_rops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_FB_WMT_GE_ROPS
 
 extern void wmt_ge_fillrect(struct fb_info *info,
diff --git a/kernel/drivers/video/logo/Makefile b/kernel/drivers/video/logo/Makefile
index 3b4378135..6194373ee 100644
--- a/kernel/drivers/video/logo/Makefile
+++ b/kernel/drivers/video/logo/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux logos
 
 obj-$(CONFIG_LOGO)			+= logo.o
diff --git a/kernel/drivers/virtio/Makefile b/kernel/drivers/virtio/Makefile
index 41e30e3dc..3a2b5c5dc 100644
--- a/kernel/drivers/virtio/Makefile
+++ b/kernel/drivers/virtio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o
 obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o
diff --git a/kernel/drivers/vme/vme_bridge.h b/kernel/drivers/vme/vme_bridge.h
index 2662e916b..42ecf9610 100644
--- a/kernel/drivers/vme/vme_bridge.h
+++ b/kernel/drivers/vme/vme_bridge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VME_BRIDGE_H_
 #define _VME_BRIDGE_H_
 
diff --git a/kernel/drivers/w1/masters/Makefile b/kernel/drivers/w1/masters/Makefile
index c5a3e96fc..18954cae4 100644
--- a/kernel/drivers/w1/masters/Makefile
+++ b/kernel/drivers/w1/masters/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for 1-wire bus master drivers.
 #
diff --git a/kernel/drivers/w1/slaves/Makefile b/kernel/drivers/w1/slaves/Makefile
index 36b22fb2d..79c611ce5 100644
--- a/kernel/drivers/w1/slaves/Makefile
+++ b/kernel/drivers/w1/slaves/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Dallas's 1-wire slaves.
 #
diff --git a/kernel/drivers/watchdog/Makefile b/kernel/drivers/watchdog/Makefile
index 56adf9fa6..715a21078 100644
--- a/kernel/drivers/watchdog/Makefile
+++ b/kernel/drivers/watchdog/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the WatchDog device drivers.
 #
diff --git a/kernel/drivers/watchdog/iTCO_vendor.h b/kernel/drivers/watchdog/iTCO_vendor.h
index 3c57b4553..7b82a7c6e 100644
--- a/kernel/drivers/watchdog/iTCO_vendor.h
+++ b/kernel/drivers/watchdog/iTCO_vendor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* iTCO Vendor Specific Support hooks */
 #ifdef CONFIG_ITCO_VENDOR_SUPPORT
 extern void iTCO_vendor_pre_start(struct resource *, unsigned int);
diff --git a/kernel/drivers/watchdog/sp5100_tco.h b/kernel/drivers/watchdog/sp5100_tco.h
index 2b28c00da..1af4dee71 100644
--- a/kernel/drivers/watchdog/sp5100_tco.h
+++ b/kernel/drivers/watchdog/sp5100_tco.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	sp5100_tco:	TCO timer driver for sp5100 chipsets.
  *
diff --git a/kernel/drivers/watchdog/watchdog_pretimeout.h b/kernel/drivers/watchdog/watchdog_pretimeout.h
index a5a32b39c..a3f1abc68 100644
--- a/kernel/drivers/watchdog/watchdog_pretimeout.h
+++ b/kernel/drivers/watchdog/watchdog_pretimeout.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __WATCHDOG_PRETIMEOUT_H
 #define __WATCHDOG_PRETIMEOUT_H
 
diff --git a/kernel/drivers/xen/Makefile b/kernel/drivers/xen/Makefile
index caaa15dc3..d3930ecaf 100644
--- a/kernel/drivers/xen/Makefile
+++ b/kernel/drivers/xen/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
 obj-$(CONFIG_X86)			+= fallback.o
 obj-y	+= grant-table.o features.o balloon.o manage.o preempt.o time.o
diff --git a/kernel/drivers/xen/biomerge.c b/kernel/drivers/xen/biomerge.c
index 1bdd02a6d..30d7f52eb 100644
--- a/kernel/drivers/xen/biomerge.c
+++ b/kernel/drivers/xen/biomerge.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bio.h>
 #include <linux/io.h>
 #include <linux/export.h>
diff --git a/kernel/drivers/xen/cpu_hotplug.c b/kernel/drivers/xen/cpu_hotplug.c
index 0003912a8..d4265c8eb 100644
--- a/kernel/drivers/xen/cpu_hotplug.c
+++ b/kernel/drivers/xen/cpu_hotplug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
 
 #include <linux/notifier.h>
diff --git a/kernel/drivers/xen/events/events_2l.c b/kernel/drivers/xen/events/events_2l.c
index bdff01095..8edef51c9 100644
--- a/kernel/drivers/xen/events/events_2l.c
+++ b/kernel/drivers/xen/events/events_2l.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xen event channels (2-level ABI)
  *
diff --git a/kernel/drivers/xen/time.c b/kernel/drivers/xen/time.c
index ac5f23fca..a63fedbdc 100644
--- a/kernel/drivers/xen/time.c
+++ b/kernel/drivers/xen/time.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Xen stolen ticks accounting.
  */
diff --git a/kernel/drivers/xen/xen-pciback/Makefile b/kernel/drivers/xen/xen-pciback/Makefile
index ffe0ad343..e8d981d43 100644
--- a/kernel/drivers/xen/xen-pciback/Makefile
+++ b/kernel/drivers/xen/xen-pciback/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback.o
 
 xen-pciback-y := pci_stub.o pciback_ops.o xenbus.o
diff --git a/kernel/drivers/xen/xen-pciback/conf_space.c b/kernel/drivers/xen/xen-pciback/conf_space.c
index 9e9286d08..60111719b 100644
--- a/kernel/drivers/xen/xen-pciback/conf_space.c
+++ b/kernel/drivers/xen/xen-pciback/conf_space.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend - Functions for creating a virtual configuration space for
  *               exported PCI Devices.
diff --git a/kernel/drivers/xen/xen-pciback/conf_space.h b/kernel/drivers/xen/xen-pciback/conf_space.h
index 62461a8ba..22db63071 100644
--- a/kernel/drivers/xen/xen-pciback/conf_space.h
+++ b/kernel/drivers/xen/xen-pciback/conf_space.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PCI Backend - Common data structures for overriding the configuration space
  *
diff --git a/kernel/drivers/xen/xen-pciback/conf_space_capability.c b/kernel/drivers/xen/xen-pciback/conf_space_capability.c
index 7f83e9083..73427d8e0 100644
--- a/kernel/drivers/xen/xen-pciback/conf_space_capability.c
+++ b/kernel/drivers/xen/xen-pciback/conf_space_capability.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend - Handles the virtual fields found on the capability lists
  *               in the configuration space.
diff --git a/kernel/drivers/xen/xen-pciback/conf_space_header.c b/kernel/drivers/xen/xen-pciback/conf_space_header.c
index 5b3d57fc8..10ae24b5a 100644
--- a/kernel/drivers/xen/xen-pciback/conf_space_header.c
+++ b/kernel/drivers/xen/xen-pciback/conf_space_header.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend - Handles the virtual fields in the configuration space headers.
  *
diff --git a/kernel/drivers/xen/xen-pciback/conf_space_quirks.c b/kernel/drivers/xen/xen-pciback/conf_space_quirks.c
index 7476791ca..89d9744ec 100644
--- a/kernel/drivers/xen/xen-pciback/conf_space_quirks.c
+++ b/kernel/drivers/xen/xen-pciback/conf_space_quirks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend - Handle special overlays for broken devices.
  *
diff --git a/kernel/drivers/xen/xen-pciback/conf_space_quirks.h b/kernel/drivers/xen/xen-pciback/conf_space_quirks.h
index cfcc517e4..d873abe35 100644
--- a/kernel/drivers/xen/xen-pciback/conf_space_quirks.h
+++ b/kernel/drivers/xen/xen-pciback/conf_space_quirks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PCI Backend - Data structures for special overlays for broken devices.
  *
diff --git a/kernel/drivers/xen/xen-pciback/passthrough.c b/kernel/drivers/xen/xen-pciback/passthrough.c
index f16a30e2a..66e9b814c 100644
--- a/kernel/drivers/xen/xen-pciback/passthrough.c
+++ b/kernel/drivers/xen/xen-pciback/passthrough.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend - Provides restricted access to the real PCI bus topology
  *               to the frontend
diff --git a/kernel/drivers/xen/xen-pciback/pciback.h b/kernel/drivers/xen/xen-pciback/pciback.h
index 7af369b6a..263c059bf 100644
--- a/kernel/drivers/xen/xen-pciback/pciback.h
+++ b/kernel/drivers/xen/xen-pciback/pciback.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PCI Backend Common Data Structures & Function Declarations
  *
diff --git a/kernel/drivers/xen/xen-pciback/pciback_ops.c b/kernel/drivers/xen/xen-pciback/pciback_ops.c
index f8c77751f..ee2c891b5 100644
--- a/kernel/drivers/xen/xen-pciback/pciback_ops.c
+++ b/kernel/drivers/xen/xen-pciback/pciback_ops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend Operations - respond to PCI requests from Frontend
  *
diff --git a/kernel/drivers/xen/xen-pciback/vpci.c b/kernel/drivers/xen/xen-pciback/vpci.c
index c99f8bb1c..f6ba18191 100644
--- a/kernel/drivers/xen/xen-pciback/vpci.c
+++ b/kernel/drivers/xen/xen-pciback/vpci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend - Provides a Virtual PCI bus (with real devices)
  *               to the frontend
diff --git a/kernel/drivers/xen/xen-pciback/xenbus.c b/kernel/drivers/xen/xen-pciback/xenbus.c
index 3814b44bf..581c4e1a8 100644
--- a/kernel/drivers/xen/xen-pciback/xenbus.c
+++ b/kernel/drivers/xen/xen-pciback/xenbus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PCI Backend Xenbus Setup - handles setup with frontend and xend
  *
diff --git a/kernel/drivers/xen/xen-selfballoon.c b/kernel/drivers/xen/xen-selfballoon.c
index a67e955ca..55988b841 100644
--- a/kernel/drivers/xen/xen-selfballoon.c
+++ b/kernel/drivers/xen/xen-selfballoon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /******************************************************************************
  * Xen selfballoon driver (and optional frontswap self-shrinking driver)
  *
diff --git a/kernel/drivers/xen/xenbus/Makefile b/kernel/drivers/xen/xenbus/Makefile
index 31e2e9050..0c7532110 100644
--- a/kernel/drivers/xen/xenbus/Makefile
+++ b/kernel/drivers/xen/xenbus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y	+= xenbus.o
 obj-y	+= xenbus_dev_frontend.o
 
diff --git a/kernel/drivers/xen/xenbus/xenbus_dev_backend.c b/kernel/drivers/xen/xenbus/xenbus_dev_backend.c
index 1126701e2..edba5fecd 100644
--- a/kernel/drivers/xen/xenbus/xenbus_dev_backend.c
+++ b/kernel/drivers/xen/xenbus/xenbus_dev_backend.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/slab.h>
diff --git a/kernel/drivers/xen/xenfs/xenfs.h b/kernel/drivers/xen/xenfs/xenfs.h
index 2c5934ea9..cfe4874b8 100644
--- a/kernel/drivers/xen/xenfs/xenfs.h
+++ b/kernel/drivers/xen/xenfs/xenfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XENFS_XENBUS_H
 #define _XENFS_XENBUS_H
 
diff --git a/kernel/drivers/xen/xenfs/xenstored.c b/kernel/drivers/xen/xenfs/xenstored.c
index 82fd2a396..f59235f9f 100644
--- a/kernel/drivers/xen/xenfs/xenstored.c
+++ b/kernel/drivers/xen/xenfs/xenstored.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/mm.h>
diff --git a/kernel/drivers/xen/xenfs/xensyms.c b/kernel/drivers/xen/xenfs/xensyms.c
index c6e2b4a54..c6c73a33c 100644
--- a/kernel/drivers/xen/xenfs/xensyms.c
+++ b/kernel/drivers/xen/xenfs/xensyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <linux/fs.h>
diff --git a/kernel/drivers/zorro/Makefile b/kernel/drivers/zorro/Makefile
index 7dc5332ff..b360ac4ea 100644
--- a/kernel/drivers/zorro/Makefile
+++ b/kernel/drivers/zorro/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Zorro bus specific drivers.
 #
diff --git a/kernel/drivers/zorro/gen-devlist.c b/kernel/drivers/zorro/gen-devlist.c
index 16fe206f9..e325c5ce9 100644
--- a/kernel/drivers/zorro/gen-devlist.c
+++ b/kernel/drivers/zorro/gen-devlist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Generate devlist.h from the Zorro ID file.
  *
diff --git a/kernel/drivers/zorro/names.c b/kernel/drivers/zorro/names.c
index 83eedddbb..fa3c83dbe 100644
--- a/kernel/drivers/zorro/names.c
+++ b/kernel/drivers/zorro/names.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Zorro Device Name Tables
  *
diff --git a/kernel/drivers/zorro/proc.c b/kernel/drivers/zorro/proc.c
index 05397305f..df05a26ab 100644
--- a/kernel/drivers/zorro/proc.c
+++ b/kernel/drivers/zorro/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Procfs interface for the Zorro bus.
  *
diff --git a/kernel/drivers/zorro/zorro.h b/kernel/drivers/zorro/zorro.h
index 4f805c01c..ac0bab341 100644
--- a/kernel/drivers/zorro/zorro.h
+++ b/kernel/drivers/zorro/zorro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef CONFIG_ZORRO_NAMES
 extern void zorro_name_device(struct zorro_dev *z);
diff --git a/kernel/firmware/Makefile b/kernel/firmware/Makefile
index fa0808853..168094a3f 100644
--- a/kernel/firmware/Makefile
+++ b/kernel/firmware/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # kbuild file for firmware/
 #
diff --git a/kernel/fs/9p/Makefile b/kernel/fs/9p/Makefile
index 9619ccadd..e7800a5c7 100644
--- a/kernel/fs/9p/Makefile
+++ b/kernel/fs/9p/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_9P_FS) := 9p.o
 
 9p-objs := \
diff --git a/kernel/fs/Makefile b/kernel/fs/Makefile
index 7bbaca9c6..ef772f1ea 100644
--- a/kernel/fs/Makefile
+++ b/kernel/fs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux filesystems.
 #
diff --git a/kernel/fs/adfs/adfs.h b/kernel/fs/adfs/adfs.h
index fadf408bd..c76db75f0 100644
--- a/kernel/fs/adfs/adfs.h
+++ b/kernel/fs/adfs/adfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fs.h>
 #include <linux/adfs_fs.h>
 
diff --git a/kernel/fs/adfs/file.c b/kernel/fs/adfs/file.c
index 46c0d5671..754afb14a 100644
--- a/kernel/fs/adfs/file.c
+++ b/kernel/fs/adfs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/adfs/file.c
  *
diff --git a/kernel/fs/affs/affs.h b/kernel/fs/affs/affs.h
index 773749be8..a92eb6ae2 100644
--- a/kernel/fs/affs/affs.h
+++ b/kernel/fs/affs/affs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef pr_fmt
 #undef pr_fmt
 #endif
diff --git a/kernel/fs/affs/amigaffs.c b/kernel/fs/affs/amigaffs.c
index 8cf941c3b..185d5ab7e 100644
--- a/kernel/fs/affs/amigaffs.c
+++ b/kernel/fs/affs/amigaffs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/amigaffs.c
  *
diff --git a/kernel/fs/affs/amigaffs.h b/kernel/fs/affs/amigaffs.h
index 43b41c06a..f9bef9056 100644
--- a/kernel/fs/affs/amigaffs.h
+++ b/kernel/fs/affs/amigaffs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AMIGAFFS_H
 #define AMIGAFFS_H
 
diff --git a/kernel/fs/affs/bitmap.c b/kernel/fs/affs/bitmap.c
index 2b2112475..2b1399611 100644
--- a/kernel/fs/affs/bitmap.c
+++ b/kernel/fs/affs/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/bitmap.c
  *
diff --git a/kernel/fs/affs/dir.c b/kernel/fs/affs/dir.c
index 591ecd7f3..a105e77df 100644
--- a/kernel/fs/affs/dir.c
+++ b/kernel/fs/affs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/dir.c
  *
diff --git a/kernel/fs/affs/file.c b/kernel/fs/affs/file.c
index 00331810f..a85817f54 100644
--- a/kernel/fs/affs/file.c
+++ b/kernel/fs/affs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/file.c
  *
diff --git a/kernel/fs/affs/inode.c b/kernel/fs/affs/inode.c
index fd4ef3c40..73598bff8 100644
--- a/kernel/fs/affs/inode.c
+++ b/kernel/fs/affs/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/inode.c
  *
diff --git a/kernel/fs/affs/namei.c b/kernel/fs/affs/namei.c
index 46d3ace67..d8aa0ae3d 100644
--- a/kernel/fs/affs/namei.c
+++ b/kernel/fs/affs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/namei.c
  *
diff --git a/kernel/fs/affs/symlink.c b/kernel/fs/affs/symlink.c
index ae622cdce..a7531b26e 100644
--- a/kernel/fs/affs/symlink.c
+++ b/kernel/fs/affs/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/affs/symlink.c
  *
diff --git a/kernel/fs/afs/Makefile b/kernel/fs/afs/Makefile
index 095c54165..641148208 100644
--- a/kernel/fs/afs/Makefile
+++ b/kernel/fs/afs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Red Hat Linux AFS client.
 #
diff --git a/kernel/fs/afs/netdevices.c b/kernel/fs/afs/netdevices.c
index 40b2bab3e..50bd5bb1c 100644
--- a/kernel/fs/afs/netdevices.c
+++ b/kernel/fs/afs/netdevices.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* AFS network device helpers
  *
  * Copyright (c) 2007 Patrick McHardy <kaber@trash.net>
diff --git a/kernel/fs/attr.c b/kernel/fs/attr.c
index 135304146..12ffdb6fb 100644
--- a/kernel/fs/attr.c
+++ b/kernel/fs/attr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/attr.c
  *
diff --git a/kernel/fs/bad_inode.c b/kernel/fs/bad_inode.c
index bb53728c7..213b51dbb 100644
--- a/kernel/fs/bad_inode.c
+++ b/kernel/fs/bad_inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/bad_inode.c
  *
diff --git a/kernel/fs/befs/befs.h b/kernel/fs/befs/befs.h
index b914cfb03..7cd472456 100644
--- a/kernel/fs/befs/befs.h
+++ b/kernel/fs/befs/befs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * befs.h
  *
diff --git a/kernel/fs/befs/befs_fs_types.h b/kernel/fs/befs/befs_fs_types.h
index 69c9d8cde..8019fde81 100644
--- a/kernel/fs/befs/befs_fs_types.h
+++ b/kernel/fs/befs/befs_fs_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fs/befs/befs_fs_types.h
  *
diff --git a/kernel/fs/befs/btree.h b/kernel/fs/befs/btree.h
index 60c6c728e..a253a6276 100644
--- a/kernel/fs/befs/btree.h
+++ b/kernel/fs/befs/btree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * btree.h
  *
diff --git a/kernel/fs/befs/datastream.c b/kernel/fs/befs/datastream.c
index 720b3bc5c..97719a7c7 100644
--- a/kernel/fs/befs/datastream.c
+++ b/kernel/fs/befs/datastream.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/befs/datastream.c
  *
diff --git a/kernel/fs/befs/datastream.h b/kernel/fs/befs/datastream.h
index 7ff9ff09e..39b1d4766 100644
--- a/kernel/fs/befs/datastream.h
+++ b/kernel/fs/befs/datastream.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * datastream.h
  *
diff --git a/kernel/fs/befs/debug.c b/kernel/fs/befs/debug.c
index 36656c86f..eb7bd6c69 100644
--- a/kernel/fs/befs/debug.c
+++ b/kernel/fs/befs/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/befs/debug.c
  *
diff --git a/kernel/fs/befs/endian.h b/kernel/fs/befs/endian.h
index 27223878b..bb55a54c2 100644
--- a/kernel/fs/befs/endian.h
+++ b/kernel/fs/befs/endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/befs/endian.h
  *
diff --git a/kernel/fs/befs/inode.c b/kernel/fs/befs/inode.c
index 5367a6470..791b46a6f 100644
--- a/kernel/fs/befs/inode.c
+++ b/kernel/fs/befs/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * inode.c
  *
diff --git a/kernel/fs/befs/io.c b/kernel/fs/befs/io.c
index 227cb86e0..2caf50a4a 100644
--- a/kernel/fs/befs/io.c
+++ b/kernel/fs/befs/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/befs/io.c
  *
diff --git a/kernel/fs/bfs/bfs.h b/kernel/fs/bfs/bfs.h
index f40006db3..67aef3bb8 100644
--- a/kernel/fs/bfs/bfs.h
+++ b/kernel/fs/bfs/bfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	fs/bfs/bfs.h
  *	Copyright (C) 1999 Tigran Aivazian <tigran@veritas.com>
diff --git a/kernel/fs/bfs/dir.c b/kernel/fs/bfs/dir.c
index 3e5ac30e8..ee832ca5f 100644
--- a/kernel/fs/bfs/dir.c
+++ b/kernel/fs/bfs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	fs/bfs/dir.c
  *	BFS directory operations.
diff --git a/kernel/fs/bfs/file.c b/kernel/fs/bfs/file.c
index 97f1b5160..1476cdd90 100644
--- a/kernel/fs/bfs/file.c
+++ b/kernel/fs/bfs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	fs/bfs/file.c
  *	BFS file operations.
diff --git a/kernel/fs/binfmt_flat.c b/kernel/fs/binfmt_flat.c
index 475d083f8..5d6b94475 100644
--- a/kernel/fs/binfmt_flat.c
+++ b/kernel/fs/binfmt_flat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /****************************************************************************/
 /*
  *  linux/fs/binfmt_flat.c
diff --git a/kernel/fs/btrfs/Makefile b/kernel/fs/btrfs/Makefile
index 962a95aef..f2cd9dedb 100644
--- a/kernel/fs/btrfs/Makefile
+++ b/kernel/fs/btrfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_BTRFS_FS) := btrfs.o
 
diff --git a/kernel/fs/btrfs/export.c b/kernel/fs/btrfs/export.c
index fa6698072..3aeb5770f 100644
--- a/kernel/fs/btrfs/export.c
+++ b/kernel/fs/btrfs/export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/types.h>
 #include "ctree.h"
diff --git a/kernel/fs/btrfs/export.h b/kernel/fs/btrfs/export.h
index 074348a95..91b3908e7 100644
--- a/kernel/fs/btrfs/export.h
+++ b/kernel/fs/btrfs/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BTRFS_EXPORT_H
 #define BTRFS_EXPORT_H
 
diff --git a/kernel/fs/btrfs/extent_io.c b/kernel/fs/btrfs/extent_io.c
index 970190cd3..7fa50e12f 100644
--- a/kernel/fs/btrfs/extent_io.c
+++ b/kernel/fs/btrfs/extent_io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <linux/slab.h>
 #include <linux/bio.h>
diff --git a/kernel/fs/btrfs/extent_io.h b/kernel/fs/btrfs/extent_io.h
index faffa28ba..e5535bbe6 100644
--- a/kernel/fs/btrfs/extent_io.h
+++ b/kernel/fs/btrfs/extent_io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __EXTENTIO__
 #define __EXTENTIO__
 
diff --git a/kernel/fs/btrfs/extent_map.c b/kernel/fs/btrfs/extent_map.c
index 698501558..2e348fb0b 100644
--- a/kernel/fs/btrfs/extent_map.c
+++ b/kernel/fs/btrfs/extent_map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
diff --git a/kernel/fs/btrfs/extent_map.h b/kernel/fs/btrfs/extent_map.h
index a67b2def5..64365bbc9 100644
--- a/kernel/fs/btrfs/extent_map.h
+++ b/kernel/fs/btrfs/extent_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __EXTENTMAP__
 #define __EXTENTMAP__
 
diff --git a/kernel/fs/btrfs/inode-map.h b/kernel/fs/btrfs/inode-map.h
index c8e864b2d..6734ec92a 100644
--- a/kernel/fs/btrfs/inode-map.h
+++ b/kernel/fs/btrfs/inode-map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BTRFS_INODE_MAP
 #define __BTRFS_INODE_MAP
 
diff --git a/kernel/fs/btrfs/sysfs.h b/kernel/fs/btrfs/sysfs.h
index d7da1a4c2..4cb908305 100644
--- a/kernel/fs/btrfs/sysfs.h
+++ b/kernel/fs/btrfs/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BTRFS_SYSFS_H_
 #define _BTRFS_SYSFS_H_
 
diff --git a/kernel/fs/cachefiles/Makefile b/kernel/fs/cachefiles/Makefile
index 32cbab0ff..891dedda5 100644
--- a/kernel/fs/cachefiles/Makefile
+++ b/kernel/fs/cachefiles/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for caching in a mounted filesystem
 #
diff --git a/kernel/fs/ceph/Makefile b/kernel/fs/ceph/Makefile
index 85a4230b9..174f5709e 100644
--- a/kernel/fs/ceph/Makefile
+++ b/kernel/fs/ceph/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for CEPH filesystem.
 #
diff --git a/kernel/fs/ceph/addr.c b/kernel/fs/ceph/addr.c
index b3e3edc09..4d622654b 100644
--- a/kernel/fs/ceph/addr.c
+++ b/kernel/fs/ceph/addr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/backing-dev.h>
diff --git a/kernel/fs/ceph/caps.c b/kernel/fs/ceph/caps.c
index 1978a8cb1..ff5d32cf9 100644
--- a/kernel/fs/ceph/caps.c
+++ b/kernel/fs/ceph/caps.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/fs.h>
diff --git a/kernel/fs/ceph/ceph_frag.c b/kernel/fs/ceph/ceph_frag.c
index bdce8b1fb..6f67d5b88 100644
--- a/kernel/fs/ceph/ceph_frag.c
+++ b/kernel/fs/ceph/ceph_frag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Ceph 'frag' type
  */
diff --git a/kernel/fs/ceph/debugfs.c b/kernel/fs/ceph/debugfs.c
index d635496ea..644def813 100644
--- a/kernel/fs/ceph/debugfs.c
+++ b/kernel/fs/ceph/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/device.h>
diff --git a/kernel/fs/ceph/dir.c b/kernel/fs/ceph/dir.c
index 019c2036d..8a5266699 100644
--- a/kernel/fs/ceph/dir.c
+++ b/kernel/fs/ceph/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/spinlock.h>
diff --git a/kernel/fs/ceph/export.c b/kernel/fs/ceph/export.c
index 7df550c13..3c59ad180 100644
--- a/kernel/fs/ceph/export.c
+++ b/kernel/fs/ceph/export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/exportfs.h>
diff --git a/kernel/fs/ceph/file.c b/kernel/fs/ceph/file.c
index 65a6fa12c..5c17125f4 100644
--- a/kernel/fs/ceph/file.c
+++ b/kernel/fs/ceph/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/module.h>
diff --git a/kernel/fs/ceph/inode.c b/kernel/fs/ceph/inode.c
index 373dab517..f2550a076 100644
--- a/kernel/fs/ceph/inode.c
+++ b/kernel/fs/ceph/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/module.h>
diff --git a/kernel/fs/ceph/ioctl.c b/kernel/fs/ceph/ioctl.c
index 4c9c72f26..851aa69ec 100644
--- a/kernel/fs/ceph/ioctl.c
+++ b/kernel/fs/ceph/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 #include <linux/in.h>
 
diff --git a/kernel/fs/ceph/ioctl.h b/kernel/fs/ceph/ioctl.h
index c77028afb..51f7f1d39 100644
--- a/kernel/fs/ceph/ioctl.h
+++ b/kernel/fs/ceph/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_CEPH_IOCTL_H
 #define FS_CEPH_IOCTL_H
 
diff --git a/kernel/fs/ceph/locks.c b/kernel/fs/ceph/locks.c
index 8cd63e812..e7cce412f 100644
--- a/kernel/fs/ceph/locks.c
+++ b/kernel/fs/ceph/locks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/file.h>
diff --git a/kernel/fs/ceph/mds_client.c b/kernel/fs/ceph/mds_client.c
index f23c820da..0687ab3c3 100644
--- a/kernel/fs/ceph/mds_client.c
+++ b/kernel/fs/ceph/mds_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/fs.h>
diff --git a/kernel/fs/ceph/mds_client.h b/kernel/fs/ceph/mds_client.h
index 636d6b2ec..837ac4b08 100644
--- a/kernel/fs/ceph/mds_client.h
+++ b/kernel/fs/ceph/mds_client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_MDS_CLIENT_H
 #define _FS_CEPH_MDS_CLIENT_H
 
diff --git a/kernel/fs/ceph/mdsmap.c b/kernel/fs/ceph/mdsmap.c
index 33ced4c22..44e53abeb 100644
--- a/kernel/fs/ceph/mdsmap.c
+++ b/kernel/fs/ceph/mdsmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/bug.h>
diff --git a/kernel/fs/ceph/snap.c b/kernel/fs/ceph/snap.c
index 7fc0b850c..8a2ca41e4 100644
--- a/kernel/fs/ceph/snap.c
+++ b/kernel/fs/ceph/snap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/sort.h>
diff --git a/kernel/fs/ceph/strings.c b/kernel/fs/ceph/strings.c
index 913dea163..4a79f3632 100644
--- a/kernel/fs/ceph/strings.c
+++ b/kernel/fs/ceph/strings.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Ceph fs string constants
  */
diff --git a/kernel/fs/ceph/super.h b/kernel/fs/ceph/super.h
index 279a2f401..3e27a28aa 100644
--- a/kernel/fs/ceph/super.h
+++ b/kernel/fs/ceph/super.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_SUPER_H
 #define _FS_CEPH_SUPER_H
 
diff --git a/kernel/fs/ceph/xattr.c b/kernel/fs/ceph/xattr.c
index 3542b2c36..e1c4e0b12 100644
--- a/kernel/fs/ceph/xattr.c
+++ b/kernel/fs/ceph/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 #include <linux/ceph/pagelist.h>
 
diff --git a/kernel/fs/char_dev.c b/kernel/fs/char_dev.c
index ebcc8fb3f..a65e4a563 100644
--- a/kernel/fs/char_dev.c
+++ b/kernel/fs/char_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/char_dev.c
  *
diff --git a/kernel/fs/cifs/Makefile b/kernel/fs/cifs/Makefile
index 5e853a395..7134f1827 100644
--- a/kernel/fs/cifs/Makefile
+++ b/kernel/fs/cifs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Linux CIFS VFS client 
 #
diff --git a/kernel/fs/cifs/dir.c b/kernel/fs/cifs/dir.c
index e702d48bd..81ba6e0d8 100644
--- a/kernel/fs/cifs/dir.c
+++ b/kernel/fs/cifs/dir.c
@@ -204,7 +204,8 @@ check_name(struct dentry *direntry, struct cifs_tcon *tcon)
 	struct cifs_sb_info *cifs_sb = CIFS_SB(direntry->d_sb);
 	int i;
 
-	if (unlikely(direntry->d_name.len >
+	if (unlikely(tcon->fsAttrInfo.MaxPathNameComponentLength &&
+		     direntry->d_name.len >
 		     le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength)))
 		return -ENAMETOOLONG;
 
@@ -520,7 +521,7 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
 
 	rc = check_name(direntry, tcon);
 	if (rc)
-		goto out_free_xid;
+		goto out;
 
 	server = tcon->ses->server;
 
diff --git a/kernel/fs/coda/cache.c b/kernel/fs/coda/cache.c
index 5bb630a76..201fc08a8 100644
--- a/kernel/fs/coda/cache.c
+++ b/kernel/fs/coda/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Cache operations for Coda.
  * For Linux 2.1: (C) 1997 Carnegie Mellon University
diff --git a/kernel/fs/coda/cnode.c b/kernel/fs/coda/cnode.c
index f13e09057..845b5a669 100644
--- a/kernel/fs/coda/cnode.c
+++ b/kernel/fs/coda/cnode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* cnode related routines for the coda kernel code
    (C) 1996 Peter Braam
    */
diff --git a/kernel/fs/coda/coda_cache.h b/kernel/fs/coda/coda_cache.h
index c910b5eb1..c9f7a77c0 100644
--- a/kernel/fs/coda/coda_cache.h
+++ b/kernel/fs/coda/coda_cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Coda filesystem -- Linux Minicache
  *
  * Copyright (C) 1989 - 1997 Carnegie Mellon University
diff --git a/kernel/fs/coda/coda_fs_i.h b/kernel/fs/coda/coda_fs_i.h
index c64075213..d702ba1a2 100644
--- a/kernel/fs/coda/coda_fs_i.h
+++ b/kernel/fs/coda/coda_fs_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  coda_fs_i.h
  *
diff --git a/kernel/fs/coda/coda_int.h b/kernel/fs/coda/coda_int.h
index 381c993b1..bb0b3e0ed 100644
--- a/kernel/fs/coda/coda_int.h
+++ b/kernel/fs/coda/coda_int.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CODA_INT_
 #define _CODA_INT_
 
diff --git a/kernel/fs/coda/coda_linux.c b/kernel/fs/coda/coda_linux.c
index f1714cfb5..ca599df0d 100644
--- a/kernel/fs/coda/coda_linux.c
+++ b/kernel/fs/coda/coda_linux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Inode operations for Coda filesystem
  * Original version: (C) 1996 P. Braam and M. Callahan
diff --git a/kernel/fs/coda/coda_linux.h b/kernel/fs/coda/coda_linux.h
index d3c361883..126155cad 100644
--- a/kernel/fs/coda/coda_linux.h
+++ b/kernel/fs/coda/coda_linux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  * Coda File System, Linux Kernel module
  * 
diff --git a/kernel/fs/coda/dir.c b/kernel/fs/coda/dir.c
index 274ab5586..00876ddad 100644
--- a/kernel/fs/coda/dir.c
+++ b/kernel/fs/coda/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  * Directory operations for Coda filesystem
diff --git a/kernel/fs/coda/file.c b/kernel/fs/coda/file.c
index 363402fcb..1cbc1f229 100644
--- a/kernel/fs/coda/file.c
+++ b/kernel/fs/coda/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * File operations for Coda.
  * Original version: (C) 1996 Peter Braam 
diff --git a/kernel/fs/coda/inode.c b/kernel/fs/coda/inode.c
index 6058df380..6f0a6a4d5 100644
--- a/kernel/fs/coda/inode.c
+++ b/kernel/fs/coda/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Super block/filesystem wide operations
  *
diff --git a/kernel/fs/coda/pioctl.c b/kernel/fs/coda/pioctl.c
index b0b9cda41..e0c17b7dc 100644
--- a/kernel/fs/coda/pioctl.c
+++ b/kernel/fs/coda/pioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Pioctl operations for Coda.
  * Original version: (C) 1996 Peter Braam
diff --git a/kernel/fs/coda/symlink.c b/kernel/fs/coda/symlink.c
index 03736e20d..202297d15 100644
--- a/kernel/fs/coda/symlink.c
+++ b/kernel/fs/coda/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Symlink inode operations for Coda filesystem
  * Original version: (C) 1996 P. Braam and M. Callahan
diff --git a/kernel/fs/coda/sysctl.c b/kernel/fs/coda/sysctl.c
index 34218a8a2..0301d4500 100644
--- a/kernel/fs/coda/sysctl.c
+++ b/kernel/fs/coda/sysctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Sysctl operations for Coda filesystem
  * Original version: (C) 1996 P. Braam and M. Callahan
diff --git a/kernel/fs/coda/upcall.c b/kernel/fs/coda/upcall.c
index e82357c89..a37f00353 100644
--- a/kernel/fs/coda/upcall.c
+++ b/kernel/fs/coda/upcall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Mostly platform independent upcall operations to Venus:
  *  -- upcalls
diff --git a/kernel/fs/compat_ioctl.c b/kernel/fs/compat_ioctl.c
index d27b326d9..bd5d91e11 100644
--- a/kernel/fs/compat_ioctl.c
+++ b/kernel/fs/compat_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
  *
diff --git a/kernel/fs/coredump.c b/kernel/fs/coredump.c
index 0eec03696..52c63d6c9 100644
--- a/kernel/fs/coredump.c
+++ b/kernel/fs/coredump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
diff --git a/kernel/fs/cramfs/uncompress.c b/kernel/fs/cramfs/uncompress.c
index ec4f1d4fd..975d98fc2 100644
--- a/kernel/fs/cramfs/uncompress.c
+++ b/kernel/fs/cramfs/uncompress.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * uncompress.c
  *
diff --git a/kernel/fs/crypto/bio.c b/kernel/fs/crypto/bio.c
index 483784d5e..0d5e6a569 100644
--- a/kernel/fs/crypto/bio.c
+++ b/kernel/fs/crypto/bio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This contains encryption functions for per-file encryption.
  *
diff --git a/kernel/fs/crypto/fname.c b/kernel/fs/crypto/fname.c
index ad9f814fd..8606da1df 100644
--- a/kernel/fs/crypto/fname.c
+++ b/kernel/fs/crypto/fname.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This contains functions for filename crypto management
  *
diff --git a/kernel/fs/crypto/fscrypt_private.h b/kernel/fs/crypto/fscrypt_private.h
index a1d5021c3..092e9dad1 100644
--- a/kernel/fs/crypto/fscrypt_private.h
+++ b/kernel/fs/crypto/fscrypt_private.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fscrypt_private.h
  *
diff --git a/kernel/fs/crypto/keyinfo.c b/kernel/fs/crypto/keyinfo.c
index 8e704d12a..a38630214 100644
--- a/kernel/fs/crypto/keyinfo.c
+++ b/kernel/fs/crypto/keyinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * key management facility for FS encryption support.
  *
diff --git a/kernel/fs/crypto/policy.c b/kernel/fs/crypto/policy.c
index ce07a8620..a120649be 100644
--- a/kernel/fs/crypto/policy.c
+++ b/kernel/fs/crypto/policy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Encryption policy functions for per-file encryption support.
  *
diff --git a/kernel/fs/dlm/Makefile b/kernel/fs/dlm/Makefile
index ca1c9124c..3545fdafc 100644
--- a/kernel/fs/dlm/Makefile
+++ b/kernel/fs/dlm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_DLM) +=		dlm.o
 dlm-y :=			ast.o \
 				config.o \
diff --git a/kernel/fs/drop_caches.c b/kernel/fs/drop_caches.c
index d72d52b90..823770171 100644
--- a/kernel/fs/drop_caches.c
+++ b/kernel/fs/drop_caches.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement the manual drop-all-pagecache function
  */
diff --git a/kernel/fs/efs/dir.c b/kernel/fs/efs/dir.c
index a7be96e5f..f892ac7c2 100644
--- a/kernel/fs/efs/dir.c
+++ b/kernel/fs/efs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dir.c
  *
diff --git a/kernel/fs/efs/efs.h b/kernel/fs/efs/efs.h
index 70f5d4f9a..13a4d9622 100644
--- a/kernel/fs/efs/efs.h
+++ b/kernel/fs/efs/efs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 1999 Al Smith
  *
diff --git a/kernel/fs/efs/file.c b/kernel/fs/efs/file.c
index a37dcee46..9e641da6f 100644
--- a/kernel/fs/efs/file.c
+++ b/kernel/fs/efs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * file.c
  *
diff --git a/kernel/fs/efs/namei.c b/kernel/fs/efs/namei.c
index d34a40edc..38961ee1d 100644
--- a/kernel/fs/efs/namei.c
+++ b/kernel/fs/efs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * namei.c
  *
diff --git a/kernel/fs/efs/super.c b/kernel/fs/efs/super.c
index 5c42f1e34..65b590095 100644
--- a/kernel/fs/efs/super.c
+++ b/kernel/fs/efs/super.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * super.c
  *
diff --git a/kernel/fs/efs/symlink.c b/kernel/fs/efs/symlink.c
index 4870cc82d..923eb9165 100644
--- a/kernel/fs/efs/symlink.c
+++ b/kernel/fs/efs/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * symlink.c
  *
diff --git a/kernel/fs/ext2/Makefile b/kernel/fs/ext2/Makefile
index 445b0e996..311479d86 100644
--- a/kernel/fs/ext2/Makefile
+++ b/kernel/fs/ext2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux ext2-filesystem routines.
 #
diff --git a/kernel/fs/ext2/acl.c b/kernel/fs/ext2/acl.c
index 51f0aea70..224c04abb 100644
--- a/kernel/fs/ext2/acl.c
+++ b/kernel/fs/ext2/acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/acl.c
  *
diff --git a/kernel/fs/ext2/acl.h b/kernel/fs/ext2/acl.h
index 44937f9fc..0f01c759d 100644
--- a/kernel/fs/ext2/acl.h
+++ b/kernel/fs/ext2/acl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: fs/ext2/acl.h
 
diff --git a/kernel/fs/ext2/balloc.c b/kernel/fs/ext2/balloc.c
index d0bdb74f0..e1b3724be 100644
--- a/kernel/fs/ext2/balloc.c
+++ b/kernel/fs/ext2/balloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext2/balloc.c
  *
diff --git a/kernel/fs/ext2/dir.c b/kernel/fs/ext2/dir.c
index e2709695b..987647986 100644
--- a/kernel/fs/ext2/dir.c
+++ b/kernel/fs/ext2/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext2/dir.c
  *
diff --git a/kernel/fs/ext2/ext2.h b/kernel/fs/ext2/ext2.h
index 28de3edd4..032295e1d 100644
--- a/kernel/fs/ext2/ext2.h
+++ b/kernel/fs/ext2/ext2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1992, 1993, 1994, 1995
  * Remy Card (card@masi.ibp.fr)
diff --git a/kernel/fs/ext2/file.c b/kernel/fs/ext2/file.c
index ff3a3636a..c67b48648 100644
--- a/kernel/fs/ext2/file.c
+++ b/kernel/fs/ext2/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext2/file.c
  *
diff --git a/kernel/fs/ext2/ialloc.c b/kernel/fs/ext2/ialloc.c
index 395fc074c..a1fc3dabc 100644
--- a/kernel/fs/ext2/ialloc.c
+++ b/kernel/fs/ext2/ialloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext2/ialloc.c
  *
diff --git a/kernel/fs/ext2/inode.c b/kernel/fs/ext2/inode.c
index 4dca6f348..1442a4c73 100644
--- a/kernel/fs/ext2/inode.c
+++ b/kernel/fs/ext2/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext2/inode.c
  *
diff --git a/kernel/fs/ext2/ioctl.c b/kernel/fs/ext2/ioctl.c
index 087f122cc..0367c0039 100644
--- a/kernel/fs/ext2/ioctl.c
+++ b/kernel/fs/ext2/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/ioctl.c
  *
diff --git a/kernel/fs/ext2/namei.c b/kernel/fs/ext2/namei.c
index 814e405a2..e078075dc 100644
--- a/kernel/fs/ext2/namei.c
+++ b/kernel/fs/ext2/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/namei.c
  *
diff --git a/kernel/fs/ext2/symlink.c b/kernel/fs/ext2/symlink.c
index eeffb0138..d5589ddcc 100644
--- a/kernel/fs/ext2/symlink.c
+++ b/kernel/fs/ext2/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext2/symlink.c
  *
diff --git a/kernel/fs/ext2/xattr.c b/kernel/fs/ext2/xattr.c
index 1b9b1268d..62d9a659a 100644
--- a/kernel/fs/ext2/xattr.c
+++ b/kernel/fs/ext2/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/xattr.c
  *
diff --git a/kernel/fs/ext2/xattr.h b/kernel/fs/ext2/xattr.h
index 6f82ab1b0..cee888cdc 100644
--- a/kernel/fs/ext2/xattr.h
+++ b/kernel/fs/ext2/xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: linux/ext2_xattr.h
 
diff --git a/kernel/fs/ext2/xattr_security.c b/kernel/fs/ext2/xattr_security.c
index 7b9e9c184..9a682e440 100644
--- a/kernel/fs/ext2/xattr_security.c
+++ b/kernel/fs/ext2/xattr_security.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/xattr_security.c
  * Handler for storing security labels as extended attributes.
diff --git a/kernel/fs/ext2/xattr_trusted.c b/kernel/fs/ext2/xattr_trusted.c
index 65049b71a..49add1107 100644
--- a/kernel/fs/ext2/xattr_trusted.c
+++ b/kernel/fs/ext2/xattr_trusted.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/xattr_trusted.c
  * Handler for trusted extended attributes.
diff --git a/kernel/fs/ext2/xattr_user.c b/kernel/fs/ext2/xattr_user.c
index fb2f992ae..c243a3b4d 100644
--- a/kernel/fs/ext2/xattr_user.c
+++ b/kernel/fs/ext2/xattr_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext2/xattr_user.c
  * Handler for extended user attributes.
diff --git a/kernel/fs/ext4/Makefile b/kernel/fs/ext4/Makefile
index d9beca165..8fdfcd3c3 100644
--- a/kernel/fs/ext4/Makefile
+++ b/kernel/fs/ext4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux ext4-filesystem routines.
 #
diff --git a/kernel/fs/ext4/acl.c b/kernel/fs/ext4/acl.c
index 46ff2229f..fb50f9aa6 100644
--- a/kernel/fs/ext4/acl.c
+++ b/kernel/fs/ext4/acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/acl.c
  *
diff --git a/kernel/fs/ext4/acl.h b/kernel/fs/ext4/acl.h
index da2c79577..a48fc5ae2 100644
--- a/kernel/fs/ext4/acl.h
+++ b/kernel/fs/ext4/acl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: fs/ext4/acl.h
 
diff --git a/kernel/fs/ext4/balloc.c b/kernel/fs/ext4/balloc.c
index e04ec868e..d5ddfb96c 100644
--- a/kernel/fs/ext4/balloc.c
+++ b/kernel/fs/ext4/balloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/balloc.c
  *
diff --git a/kernel/fs/ext4/bitmap.c b/kernel/fs/ext4/bitmap.c
index 4a606afb1..f63e028c6 100644
--- a/kernel/fs/ext4/bitmap.c
+++ b/kernel/fs/ext4/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/bitmap.c
  *
diff --git a/kernel/fs/ext4/block_validity.c b/kernel/fs/ext4/block_validity.c
index fdb19543a..bee888e0e 100644
--- a/kernel/fs/ext4/block_validity.c
+++ b/kernel/fs/ext4/block_validity.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/block_validity.c
  *
diff --git a/kernel/fs/ext4/dir.c b/kernel/fs/ext4/dir.c
index b04e88217..d5babc9f2 100644
--- a/kernel/fs/ext4/dir.c
+++ b/kernel/fs/ext4/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/dir.c
  *
diff --git a/kernel/fs/ext4/ext4.h b/kernel/fs/ext4/ext4.h
index e2abe01c8..58a030456 100644
--- a/kernel/fs/ext4/ext4.h
+++ b/kernel/fs/ext4/ext4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ext4.h
  *
diff --git a/kernel/fs/ext4/ext4_jbd2.c b/kernel/fs/ext4/ext4_jbd2.c
index 5b342ac67..2d593201c 100644
--- a/kernel/fs/ext4/ext4_jbd2.c
+++ b/kernel/fs/ext4/ext4_jbd2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Interface between ext4 and JBD
  */
diff --git a/kernel/fs/ext4/extents_status.c b/kernel/fs/ext4/extents_status.c
index e7f12a204..763ef185d 100644
--- a/kernel/fs/ext4/extents_status.c
+++ b/kernel/fs/ext4/extents_status.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/ext4/extents_status.c
  *
diff --git a/kernel/fs/ext4/extents_status.h b/kernel/fs/ext4/extents_status.h
index f7aa24f46..ca90fc96f 100644
--- a/kernel/fs/ext4/extents_status.h
+++ b/kernel/fs/ext4/extents_status.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/ext4/extents_status.h
  *
diff --git a/kernel/fs/ext4/file.c b/kernel/fs/ext4/file.c
index b1da660ac..5cb9aa3ad 100644
--- a/kernel/fs/ext4/file.c
+++ b/kernel/fs/ext4/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/file.c
  *
diff --git a/kernel/fs/ext4/fsync.c b/kernel/fs/ext4/fsync.c
index f9230580a..26a7fe5c4 100644
--- a/kernel/fs/ext4/fsync.c
+++ b/kernel/fs/ext4/fsync.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/fsync.c
  *
diff --git a/kernel/fs/ext4/ialloc.c b/kernel/fs/ext4/ialloc.c
index ee823022a..c5f697a3f 100644
--- a/kernel/fs/ext4/ialloc.c
+++ b/kernel/fs/ext4/ialloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/ialloc.c
  *
diff --git a/kernel/fs/ext4/indirect.c b/kernel/fs/ext4/indirect.c
index 7ffa290cb..c32802c95 100644
--- a/kernel/fs/ext4/indirect.c
+++ b/kernel/fs/ext4/indirect.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/indirect.c
  *
diff --git a/kernel/fs/ext4/inode.c b/kernel/fs/ext4/inode.c
index 31db875bc..90afeb729 100644
--- a/kernel/fs/ext4/inode.c
+++ b/kernel/fs/ext4/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/inode.c
  *
diff --git a/kernel/fs/ext4/ioctl.c b/kernel/fs/ext4/ioctl.c
index afb66d4ab..75d83471f 100644
--- a/kernel/fs/ext4/ioctl.c
+++ b/kernel/fs/ext4/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/ioctl.c
  *
diff --git a/kernel/fs/ext4/mballoc.h b/kernel/fs/ext4/mballoc.h
index 009300ee1..dcf52540f 100644
--- a/kernel/fs/ext4/mballoc.h
+++ b/kernel/fs/ext4/mballoc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/ext4/mballoc.h
  *
diff --git a/kernel/fs/ext4/mmp.c b/kernel/fs/ext4/mmp.c
index 84c54f15f..27b9a76a0 100644
--- a/kernel/fs/ext4/mmp.c
+++ b/kernel/fs/ext4/mmp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/random.h>
 #include <linux/buffer_head.h>
diff --git a/kernel/fs/ext4/namei.c b/kernel/fs/ext4/namei.c
index c1cf020d1..bd48a8d83 100644
--- a/kernel/fs/ext4/namei.c
+++ b/kernel/fs/ext4/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/namei.c
  *
diff --git a/kernel/fs/ext4/page-io.c b/kernel/fs/ext4/page-io.c
index 55ad7dd14..db7590178 100644
--- a/kernel/fs/ext4/page-io.c
+++ b/kernel/fs/ext4/page-io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/page-io.c
  *
diff --git a/kernel/fs/ext4/readpage.c b/kernel/fs/ext4/readpage.c
index 04c90643a..9ffa6fad1 100644
--- a/kernel/fs/ext4/readpage.c
+++ b/kernel/fs/ext4/readpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/readpage.c
  *
diff --git a/kernel/fs/ext4/resize.c b/kernel/fs/ext4/resize.c
index 035cd3f47..1dac59c24 100644
--- a/kernel/fs/ext4/resize.c
+++ b/kernel/fs/ext4/resize.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/resize.c
  *
diff --git a/kernel/fs/ext4/symlink.c b/kernel/fs/ext4/symlink.c
index 5c8fc53cb..a2006c9af 100644
--- a/kernel/fs/ext4/symlink.c
+++ b/kernel/fs/ext4/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/symlink.c
  *
diff --git a/kernel/fs/ext4/sysfs.c b/kernel/fs/ext4/sysfs.c
index 48c7a7d55..e21afd52e 100644
--- a/kernel/fs/ext4/sysfs.c
+++ b/kernel/fs/ext4/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ext4/sysfs.c
  *
diff --git a/kernel/fs/ext4/truncate.h b/kernel/fs/ext4/truncate.h
index c70d06a38..b64a9fa0f 100644
--- a/kernel/fs/ext4/truncate.h
+++ b/kernel/fs/ext4/truncate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/ext4/truncate.h
  *
diff --git a/kernel/fs/ext4/xattr.c b/kernel/fs/ext4/xattr.c
index 3b69330a4..218a7ba57 100644
--- a/kernel/fs/ext4/xattr.c
+++ b/kernel/fs/ext4/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/xattr.c
  *
diff --git a/kernel/fs/ext4/xattr.h b/kernel/fs/ext4/xattr.h
index 0d2dde1fa..f8cc07588 100644
--- a/kernel/fs/ext4/xattr.h
+++ b/kernel/fs/ext4/xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: fs/ext4/xattr.h
 
diff --git a/kernel/fs/ext4/xattr_security.c b/kernel/fs/ext4/xattr_security.c
index a89211120..629001b28 100644
--- a/kernel/fs/ext4/xattr_security.c
+++ b/kernel/fs/ext4/xattr_security.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/xattr_security.c
  * Handler for storing security labels as extended attributes.
diff --git a/kernel/fs/ext4/xattr_trusted.c b/kernel/fs/ext4/xattr_trusted.c
index c7765c735..e9389e5d7 100644
--- a/kernel/fs/ext4/xattr_trusted.c
+++ b/kernel/fs/ext4/xattr_trusted.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/xattr_trusted.c
  * Handler for trusted extended attributes.
diff --git a/kernel/fs/ext4/xattr_user.c b/kernel/fs/ext4/xattr_user.c
index ca20e4230..d4546184b 100644
--- a/kernel/fs/ext4/xattr_user.c
+++ b/kernel/fs/ext4/xattr_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ext4/xattr_user.c
  * Handler for extended user attributes.
diff --git a/kernel/fs/f2fs/Makefile b/kernel/fs/f2fs/Makefile
index a0dc559b1..776c4b936 100644
--- a/kernel/fs/f2fs/Makefile
+++ b/kernel/fs/f2fs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_F2FS_FS) += f2fs.o
 
 f2fs-y		:= dir.o file.o inode.o namei.o hash.o super.o inline.o
diff --git a/kernel/fs/fat/Makefile b/kernel/fs/fat/Makefile
index 964b634f6..70645ce2f 100644
--- a/kernel/fs/fat/Makefile
+++ b/kernel/fs/fat/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux fat filesystem support.
 #
diff --git a/kernel/fs/fat/cache.c b/kernel/fs/fat/cache.c
index 5d3849215..e9bed49df 100644
--- a/kernel/fs/fat/cache.c
+++ b/kernel/fs/fat/cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/fat/cache.c
  *
diff --git a/kernel/fs/fat/fat.h b/kernel/fs/fat/fat.h
index 051dac1ce..8fc1093da 100644
--- a/kernel/fs/fat/fat.h
+++ b/kernel/fs/fat/fat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FAT_H
 #define _FAT_H
 
diff --git a/kernel/fs/fcntl.c b/kernel/fs/fcntl.c
index 448a1119f..8d78ffd7b 100644
--- a/kernel/fs/fcntl.c
+++ b/kernel/fs/fcntl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/fcntl.c
  *
diff --git a/kernel/fs/fhandle.c b/kernel/fs/fhandle.c
index 58a61f55e..474adc8d2 100644
--- a/kernel/fs/fhandle.c
+++ b/kernel/fs/fhandle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/syscalls.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
diff --git a/kernel/fs/file.c b/kernel/fs/file.c
index 1fc7fbbb4..4eecbf424 100644
--- a/kernel/fs/file.c
+++ b/kernel/fs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/file.c
  *
diff --git a/kernel/fs/filesystems.c b/kernel/fs/filesystems.c
index a920ad262..f2728a4a0 100644
--- a/kernel/fs/filesystems.c
+++ b/kernel/fs/filesystems.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/filesystems.c
  *
diff --git a/kernel/fs/fs_pin.c b/kernel/fs/fs_pin.c
index e747b3d72..0d285fd5b 100644
--- a/kernel/fs/fs_pin.c
+++ b/kernel/fs/fs_pin.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
diff --git a/kernel/fs/fscache/Makefile b/kernel/fs/fscache/Makefile
index 6d561531c..79e08e05e 100644
--- a/kernel/fs/fscache/Makefile
+++ b/kernel/fs/fscache/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for general filesystem caching code
 #
diff --git a/kernel/fs/gfs2/Makefile b/kernel/fs/gfs2/Makefile
index 861282023..41b2aa4bc 100644
--- a/kernel/fs/gfs2/Makefile
+++ b/kernel/fs/gfs2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -I$(src)
 obj-$(CONFIG_GFS2_FS) += gfs2.o
 gfs2-y := acl.o bmap.o dir.o xattr.o glock.o \
diff --git a/kernel/fs/gfs2/trace_gfs2.h b/kernel/fs/gfs2/trace_gfs2.h
index 49ac55da4..2f1592656 100644
--- a/kernel/fs/gfs2/trace_gfs2.h
+++ b/kernel/fs/gfs2/trace_gfs2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM gfs2
 
diff --git a/kernel/fs/hfs/attr.c b/kernel/fs/hfs/attr.c
index 0933600e1..74fa62643 100644
--- a/kernel/fs/hfs/attr.c
+++ b/kernel/fs/hfs/attr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfs/attr.c
  *
diff --git a/kernel/fs/hfs/bfind.c b/kernel/fs/hfs/bfind.c
index de69d8a24..4af318fbd 100644
--- a/kernel/fs/hfs/bfind.c
+++ b/kernel/fs/hfs/bfind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfs/bfind.c
  *
diff --git a/kernel/fs/hfs/bnode.c b/kernel/fs/hfs/bnode.c
index d77d844b6..8aec5e732 100644
--- a/kernel/fs/hfs/bnode.c
+++ b/kernel/fs/hfs/bnode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfs/bnode.c
  *
diff --git a/kernel/fs/hfs/brec.c b/kernel/fs/hfs/brec.c
index 6fc766df0..ad04a5741 100644
--- a/kernel/fs/hfs/brec.c
+++ b/kernel/fs/hfs/brec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfs/brec.c
  *
diff --git a/kernel/fs/hfs/btree.c b/kernel/fs/hfs/btree.c
index 37cdd955e..374b5688e 100644
--- a/kernel/fs/hfs/btree.c
+++ b/kernel/fs/hfs/btree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfs/btree.c
  *
diff --git a/kernel/fs/hfs/btree.h b/kernel/fs/hfs/btree.h
index f6bd266d7..c8b252dbb 100644
--- a/kernel/fs/hfs/btree.h
+++ b/kernel/fs/hfs/btree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/fs/hfs/btree.h
  *
diff --git a/kernel/fs/hfsplus/Makefile b/kernel/fs/hfsplus/Makefile
index 683fca2e5..f6a56542f 100644
--- a/kernel/fs/hfsplus/Makefile
+++ b/kernel/fs/hfsplus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 ## Makefile for the linux hfsplus filesystem routines.
 #
diff --git a/kernel/fs/hfsplus/acl.h b/kernel/fs/hfsplus/acl.h
index 95c8ed9ec..488c2b75c 100644
--- a/kernel/fs/hfsplus/acl.h
+++ b/kernel/fs/hfsplus/acl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/hfsplus/acl.h
  *
diff --git a/kernel/fs/hfsplus/attributes.c b/kernel/fs/hfsplus/attributes.c
index e5b221de7..2bab6b3cd 100644
--- a/kernel/fs/hfsplus/attributes.c
+++ b/kernel/fs/hfsplus/attributes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/attributes.c
  *
diff --git a/kernel/fs/hfsplus/bfind.c b/kernel/fs/hfsplus/bfind.c
index 528e38b5a..ca2ba8c9f 100644
--- a/kernel/fs/hfsplus/bfind.c
+++ b/kernel/fs/hfsplus/bfind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/bfind.c
  *
diff --git a/kernel/fs/hfsplus/bitmap.c b/kernel/fs/hfsplus/bitmap.c
index c0ae274c0..cebce0cfe 100644
--- a/kernel/fs/hfsplus/bitmap.c
+++ b/kernel/fs/hfsplus/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/bitmap.c
  *
diff --git a/kernel/fs/hfsplus/bnode.c b/kernel/fs/hfsplus/bnode.c
index ce014ceb8..d77015c3f 100644
--- a/kernel/fs/hfsplus/bnode.c
+++ b/kernel/fs/hfsplus/bnode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/bnode.c
  *
diff --git a/kernel/fs/hfsplus/brec.c b/kernel/fs/hfsplus/brec.c
index 754fdf8c6..808f4d8c8 100644
--- a/kernel/fs/hfsplus/brec.c
+++ b/kernel/fs/hfsplus/brec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/brec.c
  *
diff --git a/kernel/fs/hfsplus/btree.c b/kernel/fs/hfsplus/btree.c
index d9d1a36ba..de14b2b68 100644
--- a/kernel/fs/hfsplus/btree.c
+++ b/kernel/fs/hfsplus/btree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/btree.c
  *
diff --git a/kernel/fs/hfsplus/catalog.c b/kernel/fs/hfsplus/catalog.c
index a5e00f7a4..a196369ba 100644
--- a/kernel/fs/hfsplus/catalog.c
+++ b/kernel/fs/hfsplus/catalog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/catalog.c
  *
diff --git a/kernel/fs/hfsplus/dir.c b/kernel/fs/hfsplus/dir.c
index 31d5e3f1f..e8120a282 100644
--- a/kernel/fs/hfsplus/dir.c
+++ b/kernel/fs/hfsplus/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/dir.c
  *
diff --git a/kernel/fs/hfsplus/extents.c b/kernel/fs/hfsplus/extents.c
index a3eb640b4..e8770935c 100644
--- a/kernel/fs/hfsplus/extents.c
+++ b/kernel/fs/hfsplus/extents.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/extents.c
  *
diff --git a/kernel/fs/hfsplus/hfsplus_fs.h b/kernel/fs/hfsplus/hfsplus_fs.h
index a3f03b247..a015044da 100644
--- a/kernel/fs/hfsplus/hfsplus_fs.h
+++ b/kernel/fs/hfsplus/hfsplus_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/hfsplus_fs.h
  *
diff --git a/kernel/fs/hfsplus/hfsplus_raw.h b/kernel/fs/hfsplus/hfsplus_raw.h
index 8298d0985..456e87aec 100644
--- a/kernel/fs/hfsplus/hfsplus_raw.h
+++ b/kernel/fs/hfsplus/hfsplus_raw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/hfsplus_raw.h
  *
diff --git a/kernel/fs/hfsplus/inode.c b/kernel/fs/hfsplus/inode.c
index 4f26b6877..190c60efb 100644
--- a/kernel/fs/hfsplus/inode.c
+++ b/kernel/fs/hfsplus/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/inode.c
  *
diff --git a/kernel/fs/hfsplus/ioctl.c b/kernel/fs/hfsplus/ioctl.c
index 0a156d84e..5e6502ef7 100644
--- a/kernel/fs/hfsplus/ioctl.c
+++ b/kernel/fs/hfsplus/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/ioctl.c
  *
diff --git a/kernel/fs/hfsplus/options.c b/kernel/fs/hfsplus/options.c
index bb806e58c..047e05c57 100644
--- a/kernel/fs/hfsplus/options.c
+++ b/kernel/fs/hfsplus/options.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/options.c
  *
diff --git a/kernel/fs/hfsplus/posix_acl.c b/kernel/fs/hfsplus/posix_acl.c
index 6bb5d7c42..066114dcc 100644
--- a/kernel/fs/hfsplus/posix_acl.c
+++ b/kernel/fs/hfsplus/posix_acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/posix_acl.c
  *
diff --git a/kernel/fs/hfsplus/tables.c b/kernel/fs/hfsplus/tables.c
index 1b911730a..a5fb8ee7d 100644
--- a/kernel/fs/hfsplus/tables.c
+++ b/kernel/fs/hfsplus/tables.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/tables.c
  *
diff --git a/kernel/fs/hfsplus/unicode.c b/kernel/fs/hfsplus/unicode.c
index e56393988..dfa90c219 100644
--- a/kernel/fs/hfsplus/unicode.c
+++ b/kernel/fs/hfsplus/unicode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/unicode.c
  *
diff --git a/kernel/fs/hfsplus/wrapper.c b/kernel/fs/hfsplus/wrapper.c
index 10032b919..08c1580bd 100644
--- a/kernel/fs/hfsplus/wrapper.c
+++ b/kernel/fs/hfsplus/wrapper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hfsplus/wrapper.c
  *
diff --git a/kernel/fs/hfsplus/xattr.c b/kernel/fs/hfsplus/xattr.c
index d37bb88dc..e538b758c 100644
--- a/kernel/fs/hfsplus/xattr.c
+++ b/kernel/fs/hfsplus/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/xattr.c
  *
diff --git a/kernel/fs/hfsplus/xattr.h b/kernel/fs/hfsplus/xattr.h
index 68f6b5393..a4e611d69 100644
--- a/kernel/fs/hfsplus/xattr.h
+++ b/kernel/fs/hfsplus/xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/hfsplus/xattr.h
  *
diff --git a/kernel/fs/hfsplus/xattr_security.c b/kernel/fs/hfsplus/xattr_security.c
index 37b3efa73..f5550b006 100644
--- a/kernel/fs/hfsplus/xattr_security.c
+++ b/kernel/fs/hfsplus/xattr_security.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/xattr_trusted.c
  *
diff --git a/kernel/fs/hfsplus/xattr_trusted.c b/kernel/fs/hfsplus/xattr_trusted.c
index 94519d6c6..fbad91e1d 100644
--- a/kernel/fs/hfsplus/xattr_trusted.c
+++ b/kernel/fs/hfsplus/xattr_trusted.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/xattr_trusted.c
  *
diff --git a/kernel/fs/hfsplus/xattr_user.c b/kernel/fs/hfsplus/xattr_user.c
index fae6c0ea0..74d19faf2 100644
--- a/kernel/fs/hfsplus/xattr_user.c
+++ b/kernel/fs/hfsplus/xattr_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/hfsplus/xattr_user.c
  *
diff --git a/kernel/fs/hostfs/hostfs.h b/kernel/fs/hostfs/hostfs.h
index 91e19f9df..ffaec2e75 100644
--- a/kernel/fs/hostfs/hostfs.h
+++ b/kernel/fs/hostfs/hostfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UM_FS_HOSTFS
 #define __UM_FS_HOSTFS
 
diff --git a/kernel/fs/hpfs/alloc.c b/kernel/fs/hpfs/alloc.c
index 098bf0f4f..66617b155 100644
--- a/kernel/fs/hpfs/alloc.c
+++ b/kernel/fs/hpfs/alloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/alloc.c
  *
diff --git a/kernel/fs/hpfs/anode.c b/kernel/fs/hpfs/anode.c
index 2d5b254ad..c14c9a035 100644
--- a/kernel/fs/hpfs/anode.c
+++ b/kernel/fs/hpfs/anode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/anode.c
  *
diff --git a/kernel/fs/hpfs/buffer.c b/kernel/fs/hpfs/buffer.c
index f62611444..e285d6b3b 100644
--- a/kernel/fs/hpfs/buffer.c
+++ b/kernel/fs/hpfs/buffer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/buffer.c
  *
diff --git a/kernel/fs/hpfs/dentry.c b/kernel/fs/hpfs/dentry.c
index bb87d65f0..89a36fdc6 100644
--- a/kernel/fs/hpfs/dentry.c
+++ b/kernel/fs/hpfs/dentry.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/dentry.c
  *
diff --git a/kernel/fs/hpfs/dir.c b/kernel/fs/hpfs/dir.c
index fa6bbb4f5..8d6b7e35f 100644
--- a/kernel/fs/hpfs/dir.c
+++ b/kernel/fs/hpfs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/dir.c
  *
diff --git a/kernel/fs/hpfs/dnode.c b/kernel/fs/hpfs/dnode.c
index 86ab7e790..3b834563b 100644
--- a/kernel/fs/hpfs/dnode.c
+++ b/kernel/fs/hpfs/dnode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/dnode.c
  *
diff --git a/kernel/fs/hpfs/ea.c b/kernel/fs/hpfs/ea.c
index ce3f98ba9..102ba18e5 100644
--- a/kernel/fs/hpfs/ea.c
+++ b/kernel/fs/hpfs/ea.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/ea.c
  *
diff --git a/kernel/fs/hpfs/file.c b/kernel/fs/hpfs/file.c
index f26138425..1ecec124e 100644
--- a/kernel/fs/hpfs/file.c
+++ b/kernel/fs/hpfs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/file.c
  *
diff --git a/kernel/fs/hpfs/hpfs.h b/kernel/fs/hpfs/hpfs.h
index cce025aff..823a32879 100644
--- a/kernel/fs/hpfs/hpfs.h
+++ b/kernel/fs/hpfs/hpfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/fs/hpfs/hpfs.h
  *
diff --git a/kernel/fs/hpfs/hpfs_fn.h b/kernel/fs/hpfs/hpfs_fn.h
index d352f3a6a..2577ef103 100644
--- a/kernel/fs/hpfs/hpfs_fn.h
+++ b/kernel/fs/hpfs/hpfs_fn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/fs/hpfs/hpfs_fn.h
  *
diff --git a/kernel/fs/hpfs/inode.c b/kernel/fs/hpfs/inode.c
index b9c724ed1..eb8b4baf0 100644
--- a/kernel/fs/hpfs/inode.c
+++ b/kernel/fs/hpfs/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/inode.c
  *
diff --git a/kernel/fs/hpfs/map.c b/kernel/fs/hpfs/map.c
index a13692918..e0e60b148 100644
--- a/kernel/fs/hpfs/map.c
+++ b/kernel/fs/hpfs/map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/map.c
  *
diff --git a/kernel/fs/hpfs/name.c b/kernel/fs/hpfs/name.c
index b00d396d2..ef7ba77f3 100644
--- a/kernel/fs/hpfs/name.c
+++ b/kernel/fs/hpfs/name.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/name.c
  *
diff --git a/kernel/fs/hpfs/namei.c b/kernel/fs/hpfs/namei.c
index f30c14414..a3615e4c7 100644
--- a/kernel/fs/hpfs/namei.c
+++ b/kernel/fs/hpfs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/hpfs/namei.c
  *
diff --git a/kernel/fs/hugetlbfs/inode.c b/kernel/fs/hugetlbfs/inode.c
index 59073e9f0..ed113ea17 100644
--- a/kernel/fs/hugetlbfs/inode.c
+++ b/kernel/fs/hugetlbfs/inode.c
@@ -842,9 +842,12 @@ static int hugetlbfs_error_remove_page(struct address_space *mapping,
 				struct page *page)
 {
 	struct inode *inode = mapping->host;
+	pgoff_t index = page->index;
 
 	remove_huge_page(page);
-	hugetlb_fix_reserve_counts(inode);
+	if (unlikely(hugetlb_unreserve_pages(inode, index, index + 1, 1)))
+		hugetlb_fix_reserve_counts(inode);
+
 	return 0;
 }
 
diff --git a/kernel/fs/ioctl.c b/kernel/fs/ioctl.c
index 569db68d0..5ace7efb0 100644
--- a/kernel/fs/ioctl.c
+++ b/kernel/fs/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ioctl.c
  *
diff --git a/kernel/fs/isofs/Makefile b/kernel/fs/isofs/Makefile
index bf162f094..6498fd2b0 100644
--- a/kernel/fs/isofs/Makefile
+++ b/kernel/fs/isofs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux isofs filesystem routines.
 #
diff --git a/kernel/fs/isofs/dir.c b/kernel/fs/isofs/dir.c
index e7599615e..947ce22f5 100644
--- a/kernel/fs/isofs/dir.c
+++ b/kernel/fs/isofs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/isofs/dir.c
  *
diff --git a/kernel/fs/isofs/export.c b/kernel/fs/isofs/export.c
index 0c5f721b4..85a909376 100644
--- a/kernel/fs/isofs/export.c
+++ b/kernel/fs/isofs/export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fs/isofs/export.c
  *
diff --git a/kernel/fs/isofs/isofs.h b/kernel/fs/isofs/isofs.h
index 133a456b0..57d4c3e2e 100644
--- a/kernel/fs/isofs/isofs.h
+++ b/kernel/fs/isofs/isofs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
 #include <linux/exportfs.h>
diff --git a/kernel/fs/isofs/joliet.c b/kernel/fs/isofs/joliet.c
index a048de81c..be8b6a9d0 100644
--- a/kernel/fs/isofs/joliet.c
+++ b/kernel/fs/isofs/joliet.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/isofs/joliet.c
  *
diff --git a/kernel/fs/isofs/namei.c b/kernel/fs/isofs/namei.c
index aee592767..cac468f04 100644
--- a/kernel/fs/isofs/namei.c
+++ b/kernel/fs/isofs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/isofs/namei.c
  *
diff --git a/kernel/fs/isofs/rock.c b/kernel/fs/isofs/rock.c
index 0ec137310..94ef92fe8 100644
--- a/kernel/fs/isofs/rock.c
+++ b/kernel/fs/isofs/rock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/isofs/rock.c
  *
diff --git a/kernel/fs/isofs/rock.h b/kernel/fs/isofs/rock.h
index ed09e2b08..ef0362543 100644
--- a/kernel/fs/isofs/rock.h
+++ b/kernel/fs/isofs/rock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * These structs are used by the system-use-sharing protocol, in which the
  * Rock Ridge extensions are embedded.  It is quite possible that other
diff --git a/kernel/fs/isofs/util.c b/kernel/fs/isofs/util.c
index 005a15cfd..42544bf0e 100644
--- a/kernel/fs/isofs/util.c
+++ b/kernel/fs/isofs/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/isofs/util.c
  */
diff --git a/kernel/fs/jffs2/Makefile b/kernel/fs/jffs2/Makefile
index 60e5d49ca..5294969d5 100644
--- a/kernel/fs/jffs2/Makefile
+++ b/kernel/fs/jffs2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Journalling Flash File System v2 (JFFS2)
 #
diff --git a/kernel/fs/jfs/Makefile b/kernel/fs/jfs/Makefile
index d20d4737b..285ec189e 100644
--- a/kernel/fs/jfs/Makefile
+++ b/kernel/fs/jfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux JFS filesystem routines.
 #
diff --git a/kernel/fs/jfs/ioctl.c b/kernel/fs/jfs/ioctl.c
index 5c5ac5b3a..ba34dae8b 100644
--- a/kernel/fs/jfs/ioctl.c
+++ b/kernel/fs/jfs/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/jfs/ioctl.c
  *
diff --git a/kernel/fs/lockd/Makefile b/kernel/fs/lockd/Makefile
index 9b320cc2a..6d5e83ed4 100644
--- a/kernel/fs/lockd/Makefile
+++ b/kernel/fs/lockd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux lock manager stuff
 #
diff --git a/kernel/fs/lockd/clnt4xdr.c b/kernel/fs/lockd/clnt4xdr.c
index c349fc0f9..00d5ef5f9 100644
--- a/kernel/fs/lockd/clnt4xdr.c
+++ b/kernel/fs/lockd/clnt4xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/clnt4xdr.c
  *
diff --git a/kernel/fs/lockd/clntxdr.c b/kernel/fs/lockd/clntxdr.c
index 3b4724a6c..2c6176387 100644
--- a/kernel/fs/lockd/clntxdr.c
+++ b/kernel/fs/lockd/clntxdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/clntxdr.c
  *
diff --git a/kernel/fs/lockd/host.c b/kernel/fs/lockd/host.c
index d716c9993..0d4e590e0 100644
--- a/kernel/fs/lockd/host.c
+++ b/kernel/fs/lockd/host.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/host.c
  *
diff --git a/kernel/fs/lockd/mon.c b/kernel/fs/lockd/mon.c
index 9d8166c39..9fbbd11f9 100644
--- a/kernel/fs/lockd/mon.c
+++ b/kernel/fs/lockd/mon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/mon.c
  *
diff --git a/kernel/fs/lockd/netns.h b/kernel/fs/lockd/netns.h
index fb8cac882..5bec78c8e 100644
--- a/kernel/fs/lockd/netns.h
+++ b/kernel/fs/lockd/netns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LOCKD_NETNS_H__
 #define __LOCKD_NETNS_H__
 
diff --git a/kernel/fs/lockd/procfs.c b/kernel/fs/lockd/procfs.c
index 8f72cb237..ca9228a56 100644
--- a/kernel/fs/lockd/procfs.c
+++ b/kernel/fs/lockd/procfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Procfs support for lockd
  *
diff --git a/kernel/fs/lockd/procfs.h b/kernel/fs/lockd/procfs.h
index 184a15edd..ba9a82f4c 100644
--- a/kernel/fs/lockd/procfs.h
+++ b/kernel/fs/lockd/procfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Procfs support for lockd
  *
diff --git a/kernel/fs/lockd/svc4proc.c b/kernel/fs/lockd/svc4proc.c
index 82925f17e..1bddf70d9 100644
--- a/kernel/fs/lockd/svc4proc.c
+++ b/kernel/fs/lockd/svc4proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/svc4proc.c
  *
diff --git a/kernel/fs/lockd/svclock.c b/kernel/fs/lockd/svclock.c
index 3507c80d1..3701bccab 100644
--- a/kernel/fs/lockd/svclock.c
+++ b/kernel/fs/lockd/svclock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/svclock.c
  *
diff --git a/kernel/fs/lockd/svcproc.c b/kernel/fs/lockd/svcproc.c
index 079151625..0d670c5c3 100644
--- a/kernel/fs/lockd/svcproc.c
+++ b/kernel/fs/lockd/svcproc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/svcproc.c
  *
diff --git a/kernel/fs/lockd/svcshare.c b/kernel/fs/lockd/svcshare.c
index b0ae07008..ade4931b2 100644
--- a/kernel/fs/lockd/svcshare.c
+++ b/kernel/fs/lockd/svcshare.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/svcshare.c
  *
diff --git a/kernel/fs/lockd/xdr.c b/kernel/fs/lockd/xdr.c
index 442bbd0b0..7147e4aeb 100644
--- a/kernel/fs/lockd/xdr.c
+++ b/kernel/fs/lockd/xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/xdr.c
  *
diff --git a/kernel/fs/lockd/xdr4.c b/kernel/fs/lockd/xdr4.c
index 2a0cd5679..7ed9edf9a 100644
--- a/kernel/fs/lockd/xdr4.c
+++ b/kernel/fs/lockd/xdr4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/lockd/xdr4.c
  *
diff --git a/kernel/fs/minix/bitmap.c b/kernel/fs/minix/bitmap.c
index c2c3fd327..f4e5e5181 100644
--- a/kernel/fs/minix/bitmap.c
+++ b/kernel/fs/minix/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/minix/bitmap.c
  *
diff --git a/kernel/fs/minix/dir.c b/kernel/fs/minix/dir.c
index baa9721f1..dcfe5b253 100644
--- a/kernel/fs/minix/dir.c
+++ b/kernel/fs/minix/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/minix/dir.c
  *
diff --git a/kernel/fs/minix/file.c b/kernel/fs/minix/file.c
index a6a4797aa..c50b0a20f 100644
--- a/kernel/fs/minix/file.c
+++ b/kernel/fs/minix/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/minix/file.c
  *
diff --git a/kernel/fs/minix/itree_common.c b/kernel/fs/minix/itree_common.c
index 2d1ca0887..043c3fdbc 100644
--- a/kernel/fs/minix/itree_common.c
+++ b/kernel/fs/minix/itree_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Generic part */
 
 typedef struct {
diff --git a/kernel/fs/minix/itree_v1.c b/kernel/fs/minix/itree_v1.c
index 46ca39d6c..046cc96ee 100644
--- a/kernel/fs/minix/itree_v1.c
+++ b/kernel/fs/minix/itree_v1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/buffer_head.h>
 #include <linux/slab.h>
 #include "minix.h"
diff --git a/kernel/fs/minix/itree_v2.c b/kernel/fs/minix/itree_v2.c
index 1ee101352..f7fc7eccc 100644
--- a/kernel/fs/minix/itree_v2.c
+++ b/kernel/fs/minix/itree_v2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/buffer_head.h>
 #include "minix.h"
 
diff --git a/kernel/fs/minix/minix.h b/kernel/fs/minix/minix.h
index 663d66138..df081e8af 100644
--- a/kernel/fs/minix/minix.h
+++ b/kernel/fs/minix/minix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_MINIX_H
 #define FS_MINIX_H
 
diff --git a/kernel/fs/minix/namei.c b/kernel/fs/minix/namei.c
index 1e0f11f5d..ccf0f0003 100644
--- a/kernel/fs/minix/namei.c
+++ b/kernel/fs/minix/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/minix/namei.c
  *
diff --git a/kernel/fs/mount.h b/kernel/fs/mount.h
index 6790767d1..f39bc9da4 100644
--- a/kernel/fs/mount.h
+++ b/kernel/fs/mount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/mount.h>
 #include <linux/seq_file.h>
 #include <linux/poll.h>
diff --git a/kernel/fs/mpage.c b/kernel/fs/mpage.c
index c991faec7..b7e7f5707 100644
--- a/kernel/fs/mpage.c
+++ b/kernel/fs/mpage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fs/mpage.c
  *
diff --git a/kernel/fs/namei.c b/kernel/fs/namei.c
index c75ea03ca..ed8b9488a 100644
--- a/kernel/fs/namei.c
+++ b/kernel/fs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/namei.c
  *
diff --git a/kernel/fs/ncpfs/Makefile b/kernel/fs/ncpfs/Makefile
index c66af563f..66fe5f878 100644
--- a/kernel/fs/ncpfs/Makefile
+++ b/kernel/fs/ncpfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux ncp filesystem routines.
 #
diff --git a/kernel/fs/ncpfs/dir.c b/kernel/fs/ncpfs/dir.c
index 088f52484..b5ec1d980 100644
--- a/kernel/fs/ncpfs/dir.c
+++ b/kernel/fs/ncpfs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  dir.c
  *
diff --git a/kernel/fs/ncpfs/file.c b/kernel/fs/ncpfs/file.c
index a06c07619..8f8cc0334 100644
--- a/kernel/fs/ncpfs/file.c
+++ b/kernel/fs/ncpfs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  file.c
  *
diff --git a/kernel/fs/ncpfs/getopt.c b/kernel/fs/ncpfs/getopt.c
index 344889cd1..5c941bef1 100644
--- a/kernel/fs/ncpfs/getopt.c
+++ b/kernel/fs/ncpfs/getopt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * getopt.c
  */
diff --git a/kernel/fs/ncpfs/getopt.h b/kernel/fs/ncpfs/getopt.h
index cccc007dc..30f0da317 100644
--- a/kernel/fs/ncpfs/getopt.h
+++ b/kernel/fs/ncpfs/getopt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_GETOPT_H
 #define _LINUX_GETOPT_H
 
diff --git a/kernel/fs/ncpfs/ioctl.c b/kernel/fs/ncpfs/ioctl.c
index 12550c232..d378b98cd 100644
--- a/kernel/fs/ncpfs/ioctl.c
+++ b/kernel/fs/ncpfs/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  ioctl.c
  *
diff --git a/kernel/fs/ncpfs/mmap.c b/kernel/fs/ncpfs/mmap.c
index 6719c0be6..a5c5cf2ff 100644
--- a/kernel/fs/ncpfs/mmap.c
+++ b/kernel/fs/ncpfs/mmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  mmap.c
  *
diff --git a/kernel/fs/ncpfs/ncp_fs.h b/kernel/fs/ncpfs/ncp_fs.h
index b9f69e1b1..bdd262b6c 100644
--- a/kernel/fs/ncpfs/ncp_fs.h
+++ b/kernel/fs/ncpfs/ncp_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/ncp_fs.h>
 #include "ncp_fs_i.h"
 #include "ncp_fs_sb.h"
diff --git a/kernel/fs/ncpfs/ncp_fs_i.h b/kernel/fs/ncpfs/ncp_fs_i.h
index c4794504f..3432bafb5 100644
--- a/kernel/fs/ncpfs/ncp_fs_i.h
+++ b/kernel/fs/ncpfs/ncp_fs_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ncp_fs_i.h
  *
diff --git a/kernel/fs/ncpfs/ncp_fs_sb.h b/kernel/fs/ncpfs/ncp_fs_sb.h
index 366fd63cc..89031d7e3 100644
--- a/kernel/fs/ncpfs/ncp_fs_sb.h
+++ b/kernel/fs/ncpfs/ncp_fs_sb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ncp_fs_sb.h
  *
diff --git a/kernel/fs/ncpfs/ncplib_kernel.c b/kernel/fs/ncpfs/ncplib_kernel.c
index 88dbbc9fc..804adfebb 100644
--- a/kernel/fs/ncpfs/ncplib_kernel.c
+++ b/kernel/fs/ncpfs/ncplib_kernel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  ncplib_kernel.c
  *
diff --git a/kernel/fs/ncpfs/ncplib_kernel.h b/kernel/fs/ncpfs/ncplib_kernel.h
index b4c87cfce..aaae8aa9b 100644
--- a/kernel/fs/ncpfs/ncplib_kernel.h
+++ b/kernel/fs/ncpfs/ncplib_kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ncplib_kernel.h
  *
diff --git a/kernel/fs/ncpfs/ncpsign_kernel.c b/kernel/fs/ncpfs/ncpsign_kernel.c
index 08907599d..8085b1a3b 100644
--- a/kernel/fs/ncpfs/ncpsign_kernel.c
+++ b/kernel/fs/ncpfs/ncpsign_kernel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  ncpsign_kernel.c
  *
diff --git a/kernel/fs/ncpfs/ncpsign_kernel.h b/kernel/fs/ncpfs/ncpsign_kernel.h
index d9a1438bb..57ff0a065 100644
--- a/kernel/fs/ncpfs/ncpsign_kernel.h
+++ b/kernel/fs/ncpfs/ncpsign_kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ncpsign_kernel.h
  *
diff --git a/kernel/fs/ncpfs/sock.c b/kernel/fs/ncpfs/sock.c
index 98b6db0ed..7dd7170d6 100644
--- a/kernel/fs/ncpfs/sock.c
+++ b/kernel/fs/ncpfs/sock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ncpfs/sock.c
  *
diff --git a/kernel/fs/ncpfs/symlink.c b/kernel/fs/ncpfs/symlink.c
index a6d26b46f..b6e16da48 100644
--- a/kernel/fs/ncpfs/symlink.c
+++ b/kernel/fs/ncpfs/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ncpfs/symlink.c
  *
diff --git a/kernel/fs/nfs/Makefile b/kernel/fs/nfs/Makefile
index 1fb118902..c587e3c4c 100644
--- a/kernel/fs/nfs/Makefile
+++ b/kernel/fs/nfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux nfs filesystem routines.
 #
diff --git a/kernel/fs/nfs/blocklayout/dev.c b/kernel/fs/nfs/blocklayout/dev.c
index a69ef4e9c..95f74bd2c 100644
--- a/kernel/fs/nfs/blocklayout/dev.c
+++ b/kernel/fs/nfs/blocklayout/dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014-2016 Christoph Hellwig.
  */
diff --git a/kernel/fs/nfs/blocklayout/extent_tree.c b/kernel/fs/nfs/blocklayout/extent_tree.c
index c85fbfd2d..7a57ff252 100644
--- a/kernel/fs/nfs/blocklayout/extent_tree.c
+++ b/kernel/fs/nfs/blocklayout/extent_tree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014-2016 Christoph Hellwig.
  */
diff --git a/kernel/fs/nfs/cache_lib.c b/kernel/fs/nfs/cache_lib.c
index 2ae676f93..b60627bcf 100644
--- a/kernel/fs/nfs/cache_lib.c
+++ b/kernel/fs/nfs/cache_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/cache_lib.c
  *
diff --git a/kernel/fs/nfs/cache_lib.h b/kernel/fs/nfs/cache_lib.h
index 4116d2c3f..4e6236a86 100644
--- a/kernel/fs/nfs/cache_lib.h
+++ b/kernel/fs/nfs/cache_lib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Helper routines for the NFS client caches
  *
diff --git a/kernel/fs/nfs/callback.c b/kernel/fs/nfs/callback.c
index 2cddf7f43..cd9d992fe 100644
--- a/kernel/fs/nfs/callback.c
+++ b/kernel/fs/nfs/callback.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/callback.c
  *
diff --git a/kernel/fs/nfs/callback.h b/kernel/fs/nfs/callback.h
index 3dc54d7cb..a20a0bce4 100644
--- a/kernel/fs/nfs/callback.h
+++ b/kernel/fs/nfs/callback.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/nfs/callback.h
  *
diff --git a/kernel/fs/nfs/callback_proc.c b/kernel/fs/nfs/callback_proc.c
index 14358de17..19151f6c0 100644
--- a/kernel/fs/nfs/callback_proc.c
+++ b/kernel/fs/nfs/callback_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/callback_proc.c
  *
diff --git a/kernel/fs/nfs/callback_xdr.c b/kernel/fs/nfs/callback_xdr.c
index 681dd642f..123c06942 100644
--- a/kernel/fs/nfs/callback_xdr.c
+++ b/kernel/fs/nfs/callback_xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/callback_xdr.c
  *
diff --git a/kernel/fs/nfs/delegation.h b/kernel/fs/nfs/delegation.h
index e9d555796..ddaf2644c 100644
--- a/kernel/fs/nfs/delegation.h
+++ b/kernel/fs/nfs/delegation.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/nfs/delegation.h
  *
diff --git a/kernel/fs/nfs/dns_resolve.c b/kernel/fs/nfs/dns_resolve.c
index d25f10fb4..060c658ea 100644
--- a/kernel/fs/nfs/dns_resolve.c
+++ b/kernel/fs/nfs/dns_resolve.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/dns_resolve.c
  *
diff --git a/kernel/fs/nfs/dns_resolve.h b/kernel/fs/nfs/dns_resolve.h
index 2e4f596d2..576ff4b54 100644
--- a/kernel/fs/nfs/dns_resolve.h
+++ b/kernel/fs/nfs/dns_resolve.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Resolve DNS hostnames into valid ip addresses
  */
diff --git a/kernel/fs/nfs/export.c b/kernel/fs/nfs/export.c
index 249cb96cc..83fd09fc8 100644
--- a/kernel/fs/nfs/export.c
+++ b/kernel/fs/nfs/export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015, Primary Data, Inc. All rights reserved.
  *
diff --git a/kernel/fs/nfs/flexfilelayout/flexfilelayout.h b/kernel/fs/nfs/flexfilelayout/flexfilelayout.h
index 98b34c9b0..679cb087e 100644
--- a/kernel/fs/nfs/flexfilelayout/flexfilelayout.h
+++ b/kernel/fs/nfs/flexfilelayout/flexfilelayout.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NFSv4 flexfile layout driver data structures.
  *
diff --git a/kernel/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/kernel/fs/nfs/flexfilelayout/flexfilelayoutdev.c
index f32c58bbe..d62279d3f 100644
--- a/kernel/fs/nfs/flexfilelayout/flexfilelayoutdev.c
+++ b/kernel/fs/nfs/flexfilelayout/flexfilelayoutdev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Device operations for the pnfs nfs4 file layout driver.
  *
diff --git a/kernel/fs/nfs/internal.h b/kernel/fs/nfs/internal.h
index 5bdf952f4..f9a4a5524 100644
--- a/kernel/fs/nfs/internal.h
+++ b/kernel/fs/nfs/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NFS internal definitions
  */
diff --git a/kernel/fs/nfs/io.c b/kernel/fs/nfs/io.c
index 1fc5d1ce3..20fef85d2 100644
--- a/kernel/fs/nfs/io.c
+++ b/kernel/fs/nfs/io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 Trond Myklebust
  *
diff --git a/kernel/fs/nfs/iostat.h b/kernel/fs/nfs/iostat.h
index 0cb806fbd..2ddaab1ac 100644
--- a/kernel/fs/nfs/iostat.h
+++ b/kernel/fs/nfs/iostat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/fs/nfs/iostat.h
  *
diff --git a/kernel/fs/nfs/mount_clnt.c b/kernel/fs/nfs/mount_clnt.c
index 60bad882c..d979ff4fe 100644
--- a/kernel/fs/nfs/mount_clnt.c
+++ b/kernel/fs/nfs/mount_clnt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * In-kernel MOUNT protocol client
  *
diff --git a/kernel/fs/nfs/netns.h b/kernel/fs/nfs/netns.h
index 5fbd2bde9..fc9978c58 100644
--- a/kernel/fs/nfs/netns.h
+++ b/kernel/fs/nfs/netns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NFS-private data for each "struct net".  Accessed with net_generic().
  */
diff --git a/kernel/fs/nfs/nfs.h b/kernel/fs/nfs/nfs.h
index 43679df56..5ba00610a 100644
--- a/kernel/fs/nfs/nfs.h
+++ b/kernel/fs/nfs/nfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2012 Netapp, Inc. All rights reserved.
  *
diff --git a/kernel/fs/nfs/nfs2xdr.c b/kernel/fs/nfs/nfs2xdr.c
index fe68dabfb..85e4b4a23 100644
--- a/kernel/fs/nfs/nfs2xdr.c
+++ b/kernel/fs/nfs/nfs2xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/nfs2xdr.c
  *
diff --git a/kernel/fs/nfs/nfs3_fs.h b/kernel/fs/nfs/nfs3_fs.h
index e134d6548..f82e11c4c 100644
--- a/kernel/fs/nfs/nfs3_fs.h
+++ b/kernel/fs/nfs/nfs3_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2014 Anna Schumaker.
  *
diff --git a/kernel/fs/nfs/nfs3acl.c b/kernel/fs/nfs/nfs3acl.c
index 720d92f5a..7173a4ee8 100644
--- a/kernel/fs/nfs/nfs3acl.c
+++ b/kernel/fs/nfs/nfs3acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/gfp.h>
 #include <linux/nfs.h>
diff --git a/kernel/fs/nfs/nfs3proc.c b/kernel/fs/nfs/nfs3proc.c
index d1e87ec0d..bc673fb47 100644
--- a/kernel/fs/nfs/nfs3proc.c
+++ b/kernel/fs/nfs/nfs3proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/nfs/nfs3proc.c
  *
diff --git a/kernel/fs/nfs/nfs3xdr.c b/kernel/fs/nfs/nfs3xdr.c
index e82c9e553..6cd33bd5d 100644
--- a/kernel/fs/nfs/nfs3xdr.c
+++ b/kernel/fs/nfs/nfs3xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/nfs3xdr.c
  *
diff --git a/kernel/fs/nfs/nfs42.h b/kernel/fs/nfs/nfs42.h
index b6cd15314..19ec38f85 100644
--- a/kernel/fs/nfs/nfs42.h
+++ b/kernel/fs/nfs/nfs42.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Anna Schumaker <Anna.Schumaker@Netapp.com>
  */
diff --git a/kernel/fs/nfs/nfs42proc.c b/kernel/fs/nfs/nfs42proc.c
index 6c2db51e6..9c374441f 100644
--- a/kernel/fs/nfs/nfs42proc.c
+++ b/kernel/fs/nfs/nfs42proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014 Anna Schumaker <Anna.Schumaker@Netapp.com>
  */
diff --git a/kernel/fs/nfs/nfs42xdr.c b/kernel/fs/nfs/nfs42xdr.c
index 5ee1b0f0d..5966e1e7b 100644
--- a/kernel/fs/nfs/nfs42xdr.c
+++ b/kernel/fs/nfs/nfs42xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014 Anna Schumaker <Anna.Schumaker@Netapp.com>
  */
diff --git a/kernel/fs/nfs/nfs4_fs.h b/kernel/fs/nfs/nfs4_fs.h
index ac4f10b7f..dcfcf7fd7 100644
--- a/kernel/fs/nfs/nfs4_fs.h
+++ b/kernel/fs/nfs/nfs4_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/fs/nfs/nfs4_fs.h
  *
diff --git a/kernel/fs/nfs/nfs4file.c b/kernel/fs/nfs/nfs4file.c
index 0efba7778..626d13820 100644
--- a/kernel/fs/nfs/nfs4file.c
+++ b/kernel/fs/nfs/nfs4file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/nfs/file.c
  *
diff --git a/kernel/fs/nfs/nfs4getroot.c b/kernel/fs/nfs/nfs4getroot.c
index ac8406018..1a69479a3 100644
--- a/kernel/fs/nfs/nfs4getroot.c
+++ b/kernel/fs/nfs/nfs4getroot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
 * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
 * Written by David Howells (dhowells@redhat.com)
diff --git a/kernel/fs/nfs/nfs4namespace.c b/kernel/fs/nfs/nfs4namespace.c
index 7d531da1b..8c3f327d8 100644
--- a/kernel/fs/nfs/nfs4namespace.c
+++ b/kernel/fs/nfs/nfs4namespace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/nfs4namespace.c
  *
diff --git a/kernel/fs/nfs/nfs4session.h b/kernel/fs/nfs/nfs4session.h
index dfae4880e..3c550f297 100644
--- a/kernel/fs/nfs/nfs4session.h
+++ b/kernel/fs/nfs/nfs4session.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fs/nfs/nfs4session.h
  *
diff --git a/kernel/fs/nfs/nfs4sysctl.c b/kernel/fs/nfs/nfs4sysctl.c
index 8693d77c4..0d91d84e5 100644
--- a/kernel/fs/nfs/nfs4sysctl.c
+++ b/kernel/fs/nfs/nfs4sysctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/nfs4sysctl.c
  *
diff --git a/kernel/fs/nfs/nfs4trace.c b/kernel/fs/nfs/nfs4trace.c
index 2850bce19..e9fb3e50a 100644
--- a/kernel/fs/nfs/nfs4trace.c
+++ b/kernel/fs/nfs/nfs4trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2013 Trond Myklebust <Trond.Myklebust@netapp.com>
  */
diff --git a/kernel/fs/nfs/nfs4trace.h b/kernel/fs/nfs/nfs4trace.h
index be1da19c6..e7c627551 100644
--- a/kernel/fs/nfs/nfs4trace.h
+++ b/kernel/fs/nfs/nfs4trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Trond Myklebust <Trond.Myklebust@netapp.com>
  */
diff --git a/kernel/fs/nfs/nfsroot.c b/kernel/fs/nfs/nfsroot.c
index 89a15dbe5..effaa4247 100644
--- a/kernel/fs/nfs/nfsroot.c
+++ b/kernel/fs/nfs/nfsroot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Copyright (C) 1995, 1996  Gero Kuhlmann <gero@gkminix.han.de>
  *
diff --git a/kernel/fs/nfs/nfstrace.c b/kernel/fs/nfs/nfstrace.c
index c74f7af23..b60d5fbd7 100644
--- a/kernel/fs/nfs/nfstrace.c
+++ b/kernel/fs/nfs/nfstrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2013 Trond Myklebust <Trond.Myklebust@netapp.com>
  */
diff --git a/kernel/fs/nfs/nfstrace.h b/kernel/fs/nfs/nfstrace.h
index 551711042..093290c42 100644
--- a/kernel/fs/nfs/nfstrace.h
+++ b/kernel/fs/nfs/nfstrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Trond Myklebust <Trond.Myklebust@netapp.com>
  */
diff --git a/kernel/fs/nfs/proc.c b/kernel/fs/nfs/proc.c
index 7962e4909..f7fd9192d 100644
--- a/kernel/fs/nfs/proc.c
+++ b/kernel/fs/nfs/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/nfs/proc.c
  *
diff --git a/kernel/fs/nfs/symlink.c b/kernel/fs/nfs/symlink.c
index 5a1d0ded8..06eb44b47 100644
--- a/kernel/fs/nfs/symlink.c
+++ b/kernel/fs/nfs/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/nfs/symlink.c
  *
diff --git a/kernel/fs/nfs/sysctl.c b/kernel/fs/nfs/sysctl.c
index bb6ed810f..7aea195dd 100644
--- a/kernel/fs/nfs/sysctl.c
+++ b/kernel/fs/nfs/sysctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/nfs/sysctl.c
  *
diff --git a/kernel/fs/nfs/unlink.c b/kernel/fs/nfs/unlink.c
index e3949d930..630b4a3c1 100644
--- a/kernel/fs/nfs/unlink.c
+++ b/kernel/fs/nfs/unlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/nfs/unlink.c
  *
diff --git a/kernel/fs/nfsd/Makefile b/kernel/fs/nfsd/Makefile
index 5f5d3a769..2bfb58eef 100644
--- a/kernel/fs/nfsd/Makefile
+++ b/kernel/fs/nfsd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux nfs server
 #
diff --git a/kernel/fs/nfsd/auth.c b/kernel/fs/nfsd/auth.c
index 62469c60b..697f8ae77 100644
--- a/kernel/fs/nfsd/auth.c
+++ b/kernel/fs/nfsd/auth.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
 
 #include <linux/sched.h>
diff --git a/kernel/fs/nfsd/auth.h b/kernel/fs/nfsd/auth.h
index 53325a12b..dbd66424f 100644
--- a/kernel/fs/nfsd/auth.h
+++ b/kernel/fs/nfsd/auth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * nfsd-specific authentication stuff.
  *
diff --git a/kernel/fs/nfsd/blocklayout.c b/kernel/fs/nfsd/blocklayout.c
index c862c2489..3f880ae09 100644
--- a/kernel/fs/nfsd/blocklayout.c
+++ b/kernel/fs/nfsd/blocklayout.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014-2016 Christoph Hellwig.
  */
diff --git a/kernel/fs/nfsd/blocklayoutxdr.c b/kernel/fs/nfsd/blocklayoutxdr.c
index ac6f54546..442543304 100644
--- a/kernel/fs/nfsd/blocklayoutxdr.c
+++ b/kernel/fs/nfsd/blocklayoutxdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014-2016 Christoph Hellwig.
  */
diff --git a/kernel/fs/nfsd/blocklayoutxdr.h b/kernel/fs/nfsd/blocklayoutxdr.h
index 397bc7563..bc5166bfe 100644
--- a/kernel/fs/nfsd/blocklayoutxdr.h
+++ b/kernel/fs/nfsd/blocklayoutxdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFSD_BLOCKLAYOUTXDR_H
 #define _NFSD_BLOCKLAYOUTXDR_H 1
 
diff --git a/kernel/fs/nfsd/cache.h b/kernel/fs/nfsd/cache.h
index dd96a3830..046b3f048 100644
--- a/kernel/fs/nfsd/cache.h
+++ b/kernel/fs/nfsd/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Request reply cache. This was heavily inspired by the
  * implementation in 4.3BSD/4.4BSD.
diff --git a/kernel/fs/nfsd/current_stateid.h b/kernel/fs/nfsd/current_stateid.h
index 34075cee5..c28540d86 100644
--- a/kernel/fs/nfsd/current_stateid.h
+++ b/kernel/fs/nfsd/current_stateid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFSD4_CURRENT_STATE_H
 #define _NFSD4_CURRENT_STATE_H
 
diff --git a/kernel/fs/nfsd/export.c b/kernel/fs/nfsd/export.c
index 3bc08c394..46b48dbbd 100644
--- a/kernel/fs/nfsd/export.c
+++ b/kernel/fs/nfsd/export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NFS exporting and validation.
  *
diff --git a/kernel/fs/nfsd/export.h b/kernel/fs/nfsd/export.h
index 730f15eeb..c8b74126d 100644
--- a/kernel/fs/nfsd/export.h
+++ b/kernel/fs/nfsd/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
  */
diff --git a/kernel/fs/nfsd/fault_inject.c b/kernel/fs/nfsd/fault_inject.c
index 34c1c449f..6dfede6d1 100644
--- a/kernel/fs/nfsd/fault_inject.c
+++ b/kernel/fs/nfsd/fault_inject.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2011 Bryan Schumaker <bjschuma@netapp.com>
  *
diff --git a/kernel/fs/nfsd/flexfilelayout.c b/kernel/fs/nfsd/flexfilelayout.c
index b67287383..db7ef07ae 100644
--- a/kernel/fs/nfsd/flexfilelayout.c
+++ b/kernel/fs/nfsd/flexfilelayout.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 Tom Haynes <loghyr@primarydata.com>
  *
diff --git a/kernel/fs/nfsd/flexfilelayoutxdr.c b/kernel/fs/nfsd/flexfilelayoutxdr.c
index 5e3fd7fc1..e81d2a5cf 100644
--- a/kernel/fs/nfsd/flexfilelayoutxdr.c
+++ b/kernel/fs/nfsd/flexfilelayoutxdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 Tom Haynes <loghyr@primarydata.com>
  */
diff --git a/kernel/fs/nfsd/flexfilelayoutxdr.h b/kernel/fs/nfsd/flexfilelayoutxdr.h
index 467defd4e..8e195aeca 100644
--- a/kernel/fs/nfsd/flexfilelayoutxdr.h
+++ b/kernel/fs/nfsd/flexfilelayoutxdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2016 Tom Haynes <loghyr@primarydata.com>
  */
diff --git a/kernel/fs/nfsd/lockd.c b/kernel/fs/nfsd/lockd.c
index 1a03bc305..3f5b3d7b6 100644
--- a/kernel/fs/nfsd/lockd.c
+++ b/kernel/fs/nfsd/lockd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains all the stubs needed when communicating with lockd.
  * This level of indirection is necessary so we can run nfsd+lockd without
diff --git a/kernel/fs/nfsd/nfs2acl.c b/kernel/fs/nfsd/nfs2acl.c
index 6276ec860..cbab1d2d8 100644
--- a/kernel/fs/nfsd/nfs2acl.c
+++ b/kernel/fs/nfsd/nfs2acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Process version 2 NFSACL requests.
  *
diff --git a/kernel/fs/nfsd/nfs3acl.c b/kernel/fs/nfsd/nfs3acl.c
index 01976529f..13bca4a2f 100644
--- a/kernel/fs/nfsd/nfs3acl.c
+++ b/kernel/fs/nfsd/nfs3acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Process version 3 NFSACL requests.
  *
diff --git a/kernel/fs/nfsd/nfs3proc.c b/kernel/fs/nfsd/nfs3proc.c
index 2cb56a0d6..1d0ce3c57 100644
--- a/kernel/fs/nfsd/nfs3proc.c
+++ b/kernel/fs/nfsd/nfs3proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Process version 3 NFS requests.
  *
diff --git a/kernel/fs/nfsd/nfs3xdr.c b/kernel/fs/nfsd/nfs3xdr.c
index bf444b664..f38acd905 100644
--- a/kernel/fs/nfsd/nfs3xdr.c
+++ b/kernel/fs/nfsd/nfs3xdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XDR support for nfsd/protocol version 3.
  *
diff --git a/kernel/fs/nfsd/nfs4layouts.c b/kernel/fs/nfsd/nfs4layouts.c
index e122da696..ea45d954e 100644
--- a/kernel/fs/nfsd/nfs4layouts.c
+++ b/kernel/fs/nfsd/nfs4layouts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014 Christoph Hellwig.
  */
diff --git a/kernel/fs/nfsd/nfscache.c b/kernel/fs/nfsd/nfscache.c
index 96fd15979..334f2ad60 100644
--- a/kernel/fs/nfsd/nfscache.c
+++ b/kernel/fs/nfsd/nfscache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Request reply cache. This is currently a global cache, but this may
  * change in the future and be a per-client cache.
diff --git a/kernel/fs/nfsd/nfsd.h b/kernel/fs/nfsd/nfsd.h
index b9c538ab7..3fce905d0 100644
--- a/kernel/fs/nfsd/nfsd.h
+++ b/kernel/fs/nfsd/nfsd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Hodge-podge collection of knfsd-related stuff.
  * I will sort this out later.
diff --git a/kernel/fs/nfsd/nfsfh.c b/kernel/fs/nfsd/nfsfh.c
index cfe7500d5..8aa011820 100644
--- a/kernel/fs/nfsd/nfsfh.c
+++ b/kernel/fs/nfsd/nfsfh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NFS server file handle treatment.
  *
diff --git a/kernel/fs/nfsd/nfsfh.h b/kernel/fs/nfsd/nfsfh.h
index e47cf6c2a..43f31cf49 100644
--- a/kernel/fs/nfsd/nfsfh.h
+++ b/kernel/fs/nfsd/nfsfh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
  *
diff --git a/kernel/fs/nfsd/nfsproc.c b/kernel/fs/nfsd/nfsproc.c
index 5076ae2b8..43c0419b8 100644
--- a/kernel/fs/nfsd/nfsproc.c
+++ b/kernel/fs/nfsd/nfsproc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Process version 2 NFS requests.
  *
diff --git a/kernel/fs/nfsd/nfssvc.c b/kernel/fs/nfsd/nfssvc.c
index 7e3af3ef0..e02bd2783 100644
--- a/kernel/fs/nfsd/nfssvc.c
+++ b/kernel/fs/nfsd/nfssvc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Central processing for nfsd.
  *
diff --git a/kernel/fs/nfsd/nfsxdr.c b/kernel/fs/nfsd/nfsxdr.c
index e4da27179..644a0342f 100644
--- a/kernel/fs/nfsd/nfsxdr.c
+++ b/kernel/fs/nfsd/nfsxdr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * XDR support for nfsd
  *
diff --git a/kernel/fs/nfsd/pnfs.h b/kernel/fs/nfsd/pnfs.h
index d27a5aa60..4f4282d4e 100644
--- a/kernel/fs/nfsd/pnfs.h
+++ b/kernel/fs/nfsd/pnfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_NFSD_PNFS_H
 #define _FS_NFSD_PNFS_H 1
 
diff --git a/kernel/fs/nfsd/stats.c b/kernel/fs/nfsd/stats.c
index d97338bb6..9bce3b913 100644
--- a/kernel/fs/nfsd/stats.c
+++ b/kernel/fs/nfsd/stats.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * procfs-based user access to knfsd statistics
  *
diff --git a/kernel/fs/nfsd/stats.h b/kernel/fs/nfsd/stats.h
index a5c944b77..b23fdac69 100644
--- a/kernel/fs/nfsd/stats.h
+++ b/kernel/fs/nfsd/stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Statistics for NFS server.
  *
diff --git a/kernel/fs/nfsd/trace.h b/kernel/fs/nfsd/trace.h
index 328704190..8b2f1d92c 100644
--- a/kernel/fs/nfsd/trace.h
+++ b/kernel/fs/nfsd/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 Christoph Hellwig.
  */
diff --git a/kernel/fs/nfsd/vfs.c b/kernel/fs/nfsd/vfs.c
index bc69d40c4..a3c9bfa77 100644
--- a/kernel/fs/nfsd/vfs.c
+++ b/kernel/fs/nfsd/vfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * File operations used by nfsd. Some of these have been ripped from
  * other parts of the kernel because they weren't exported, others
diff --git a/kernel/fs/nfsd/vfs.h b/kernel/fs/nfsd/vfs.h
index 1bbdccecb..be6d8e004 100644
--- a/kernel/fs/nfsd/vfs.h
+++ b/kernel/fs/nfsd/vfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
  */
diff --git a/kernel/fs/nfsd/xdr.h b/kernel/fs/nfsd/xdr.h
index 457ce45e5..2f4f22e6b 100644
--- a/kernel/fs/nfsd/xdr.h
+++ b/kernel/fs/nfsd/xdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* XDR types for nfsd. This is mainly a typing exercise. */
 
 #ifndef LINUX_NFSD_H
diff --git a/kernel/fs/nfsd/xdr3.h b/kernel/fs/nfsd/xdr3.h
index 80d7da620..056bf8a73 100644
--- a/kernel/fs/nfsd/xdr3.h
+++ b/kernel/fs/nfsd/xdr3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * XDR types for NFSv3 in nfsd.
  *
diff --git a/kernel/fs/nfsd/xdr4cb.h b/kernel/fs/nfsd/xdr4cb.h
index 49b719dfe..517239af0 100644
--- a/kernel/fs/nfsd/xdr4cb.h
+++ b/kernel/fs/nfsd/xdr4cb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define NFS4_MAXTAGLEN		20
 
 #define NFS4_enc_cb_null_sz		0
diff --git a/kernel/fs/nilfs2/Makefile b/kernel/fs/nilfs2/Makefile
index fc603e043..43b60b8a4 100644
--- a/kernel/fs/nilfs2/Makefile
+++ b/kernel/fs/nilfs2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_NILFS2_FS) += nilfs2.o
 nilfs2-y := inode.o file.o dir.o super.o namei.o page.o mdt.o \
 	btnode.o bmap.o btree.o direct.o dat.o recovery.o \
diff --git a/kernel/fs/nilfs2/export.h b/kernel/fs/nilfs2/export.h
index 00107fdb9..d29fd837c 100644
--- a/kernel/fs/nilfs2/export.h
+++ b/kernel/fs/nilfs2/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef NILFS_EXPORT_H
 #define NILFS_EXPORT_H
 
diff --git a/kernel/fs/nls/Makefile b/kernel/fs/nls/Makefile
index 8ae37c1b5..ac54db297 100644
--- a/kernel/fs/nls/Makefile
+++ b/kernel/fs/nls/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for native language support
 #
diff --git a/kernel/fs/notify/Makefile b/kernel/fs/notify/Makefile
index 3e969ae91..63a4b8828 100644
--- a/kernel/fs/notify/Makefile
+++ b/kernel/fs/notify/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_FSNOTIFY)		+= fsnotify.o notification.o group.o mark.o \
 				   fdinfo.o
 
diff --git a/kernel/fs/notify/fanotify/fanotify.c b/kernel/fs/notify/fanotify/fanotify.c
index 2fa99aeaa..09640b546 100644
--- a/kernel/fs/notify/fanotify/fanotify.c
+++ b/kernel/fs/notify/fanotify/fanotify.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fanotify.h>
 #include <linux/fdtable.h>
 #include <linux/fsnotify_backend.h>
diff --git a/kernel/fs/notify/fanotify/fanotify.h b/kernel/fs/notify/fanotify/fanotify.h
index 4eb6f5efa..7dacb7d80 100644
--- a/kernel/fs/notify/fanotify/fanotify.h
+++ b/kernel/fs/notify/fanotify/fanotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fsnotify_backend.h>
 #include <linux/path.h>
 #include <linux/slab.h>
diff --git a/kernel/fs/notify/fanotify/fanotify_user.c b/kernel/fs/notify/fanotify/fanotify_user.c
index 907a481ac..9752e7270 100644
--- a/kernel/fs/notify/fanotify/fanotify_user.c
+++ b/kernel/fs/notify/fanotify/fanotify_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fanotify.h>
 #include <linux/fcntl.h>
 #include <linux/file.h>
diff --git a/kernel/fs/notify/fdinfo.c b/kernel/fs/notify/fdinfo.c
index dd63aa9a6..517f88c1d 100644
--- a/kernel/fs/notify/fdinfo.c
+++ b/kernel/fs/notify/fdinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/fsnotify_backend.h>
diff --git a/kernel/fs/notify/fdinfo.h b/kernel/fs/notify/fdinfo.h
index 9664c4904..5c9937e02 100644
--- a/kernel/fs/notify/fdinfo.h
+++ b/kernel/fs/notify/fdinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __FSNOTIFY_FDINFO_H__
 #define __FSNOTIFY_FDINFO_H__
 
diff --git a/kernel/fs/notify/fsnotify.h b/kernel/fs/notify/fsnotify.h
index bf012e8ec..60f365dc1 100644
--- a/kernel/fs/notify/fsnotify.h
+++ b/kernel/fs/notify/fsnotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __FS_NOTIFY_FSNOTIFY_H_
 #define __FS_NOTIFY_FSNOTIFY_H_
 
diff --git a/kernel/fs/notify/inotify/inotify.h b/kernel/fs/notify/inotify/inotify.h
index 9ff67b61d..c00d2caca 100644
--- a/kernel/fs/notify/inotify/inotify.h
+++ b/kernel/fs/notify/inotify/inotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fsnotify_backend.h>
 #include <linux/inotify.h>
 #include <linux/slab.h> /* struct kmem_cache */
diff --git a/kernel/fs/nsfs.c b/kernel/fs/nsfs.c
index 08127a2b8..ef243e14b 100644
--- a/kernel/fs/nsfs.c
+++ b/kernel/fs/nsfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mount.h>
 #include <linux/file.h>
 #include <linux/fs.h>
diff --git a/kernel/fs/ntfs/Makefile b/kernel/fs/ntfs/Makefile
index 2ff263e6d..3e736572e 100644
--- a/kernel/fs/ntfs/Makefile
+++ b/kernel/fs/ntfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Rules for making the NTFS driver.
 
 obj-$(CONFIG_NTFS_FS) += ntfs.o
diff --git a/kernel/fs/ocfs2/Makefile b/kernel/fs/ocfs2/Makefile
index 4342c7ee7..99ee09318 100644
--- a/kernel/fs/ocfs2/Makefile
+++ b/kernel/fs/ocfs2/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -Ifs/ocfs2
 
 obj-$(CONFIG_OCFS2_FS) += 	\
diff --git a/kernel/fs/ocfs2/alloc.c b/kernel/fs/ocfs2/alloc.c
index a177eae3a..addd7c5f2 100644
--- a/kernel/fs/ocfs2/alloc.c
+++ b/kernel/fs/ocfs2/alloc.c
@@ -7304,13 +7304,24 @@ out:
 
 static int ocfs2_trim_extent(struct super_block *sb,
 			     struct ocfs2_group_desc *gd,
-			     u32 start, u32 count)
+			     u64 group, u32 start, u32 count)
 {
 	u64 discard, bcount;
+	struct ocfs2_super *osb = OCFS2_SB(sb);
 
 	bcount = ocfs2_clusters_to_blocks(sb, count);
-	discard = le64_to_cpu(gd->bg_blkno) +
-			ocfs2_clusters_to_blocks(sb, start);
+	discard = ocfs2_clusters_to_blocks(sb, start);
+
+	/*
+	 * For the first cluster group, the gd->bg_blkno is not at the start
+	 * of the group, but at an offset from the start. If we add it while
+	 * calculating discard for first group, we will wrongly start fstrim a
+	 * few blocks after the desried start block and the range can cross
+	 * over into the next cluster group. So, add it only if this is not
+	 * the first cluster group.
+	 */
+	if (group != osb->first_cluster_group_blkno)
+		discard += le64_to_cpu(gd->bg_blkno);
 
 	trace_ocfs2_trim_extent(sb, (unsigned long long)discard, bcount);
 
@@ -7318,7 +7329,7 @@ static int ocfs2_trim_extent(struct super_block *sb,
 }
 
 static int ocfs2_trim_group(struct super_block *sb,
-			    struct ocfs2_group_desc *gd,
+			    struct ocfs2_group_desc *gd, u64 group,
 			    u32 start, u32 max, u32 minbits)
 {
 	int ret = 0, count = 0, next;
@@ -7337,7 +7348,7 @@ static int ocfs2_trim_group(struct super_block *sb,
 		next = ocfs2_find_next_bit(bitmap, max, start);
 
 		if ((next - start) >= minbits) {
-			ret = ocfs2_trim_extent(sb, gd,
+			ret = ocfs2_trim_extent(sb, gd, group,
 						start, next - start);
 			if (ret < 0) {
 				mlog_errno(ret);
@@ -7435,7 +7446,8 @@ int ocfs2_trim_fs(struct super_block *sb, struct fstrim_range *range)
 		}
 
 		gd = (struct ocfs2_group_desc *)gd_bh->b_data;
-		cnt = ocfs2_trim_group(sb, gd, first_bit, last_bit, minlen);
+		cnt = ocfs2_trim_group(sb, gd, group,
+				       first_bit, last_bit, minlen);
 		brelse(gd_bh);
 		gd_bh = NULL;
 		if (cnt < 0) {
diff --git a/kernel/fs/ocfs2/ioctl.c b/kernel/fs/ocfs2/ioctl.c
index 4506ec5ec..ab30c005c 100644
--- a/kernel/fs/ocfs2/ioctl.c
+++ b/kernel/fs/ocfs2/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ocfs2/ioctl.c
  *
diff --git a/kernel/fs/ocfs2/ioctl.h b/kernel/fs/ocfs2/ioctl.h
index 0cd5323bd..9f5e4d95e 100644
--- a/kernel/fs/ocfs2/ioctl.h
+++ b/kernel/fs/ocfs2/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ioctl.h
  *
diff --git a/kernel/fs/ocfs2/mmap.h b/kernel/fs/ocfs2/mmap.h
index 1274ee0f1..1051507cc 100644
--- a/kernel/fs/ocfs2/mmap.h
+++ b/kernel/fs/ocfs2/mmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef OCFS2_MMAP_H
 #define OCFS2_MMAP_H
 
diff --git a/kernel/fs/ocfs2/ocfs2_trace.h b/kernel/fs/ocfs2/ocfs2_trace.h
index 0b58abcf1..a0b5d00ef 100644
--- a/kernel/fs/ocfs2/ocfs2_trace.h
+++ b/kernel/fs/ocfs2/ocfs2_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ocfs2
 
diff --git a/kernel/fs/ocfs2/quota.h b/kernel/fs/ocfs2/quota.h
index d153e6e31..ebb5c99f4 100644
--- a/kernel/fs/ocfs2/quota.h
+++ b/kernel/fs/ocfs2/quota.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * quota.h for OCFS2
  *
diff --git a/kernel/fs/ocfs2/quota_global.c b/kernel/fs/ocfs2/quota_global.c
index c94b6baaa..b39d14cbf 100644
--- a/kernel/fs/ocfs2/quota_global.c
+++ b/kernel/fs/ocfs2/quota_global.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Implementation of operations over global quota file
  */
diff --git a/kernel/fs/ocfs2/quota_local.c b/kernel/fs/ocfs2/quota_local.c
index aa700fd10..16c42ed0d 100644
--- a/kernel/fs/ocfs2/quota_local.c
+++ b/kernel/fs/ocfs2/quota_local.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Implementation of operations over local quota file
  */
diff --git a/kernel/fs/omfs/bitmap.c b/kernel/fs/omfs/bitmap.c
index 83f4e7651..7147ba6a6 100644
--- a/kernel/fs/omfs/bitmap.c
+++ b/kernel/fs/omfs/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/buffer_head.h>
diff --git a/kernel/fs/omfs/omfs.h b/kernel/fs/omfs/omfs.h
index f0f8bc75e..4008be73d 100644
--- a/kernel/fs/omfs/omfs.h
+++ b/kernel/fs/omfs/omfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OMFS_H
 #define _OMFS_H
 
diff --git a/kernel/fs/omfs/omfs_fs.h b/kernel/fs/omfs/omfs_fs.h
index 83a98330e..caecb3d5a 100644
--- a/kernel/fs/omfs/omfs_fs.h
+++ b/kernel/fs/omfs/omfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OMFS_FS_H
 #define _OMFS_FS_H
 
diff --git a/kernel/fs/orangefs/Makefile b/kernel/fs/orangefs/Makefile
index a9d6a968f..9b6c50bb1 100644
--- a/kernel/fs/orangefs/Makefile
+++ b/kernel/fs/orangefs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ORANGEFS filesystem.
 #
diff --git a/kernel/fs/orangefs/acl.c b/kernel/fs/orangefs/acl.c
index 9108ef433..c2d8233b1 100644
--- a/kernel/fs/orangefs/acl.c
+++ b/kernel/fs/orangefs/acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/dcache.c b/kernel/fs/orangefs/dcache.c
index 5355efba4..ae782df5c 100644
--- a/kernel/fs/orangefs/dcache.c
+++ b/kernel/fs/orangefs/dcache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/devorangefs-req.c b/kernel/fs/orangefs/devorangefs-req.c
index 2826859bd..ded456f17 100644
--- a/kernel/fs/orangefs/devorangefs-req.c
+++ b/kernel/fs/orangefs/devorangefs-req.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/dir.c b/kernel/fs/orangefs/dir.c
index d327cbd17..a8cc588d6 100644
--- a/kernel/fs/orangefs/dir.c
+++ b/kernel/fs/orangefs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 2017 Omnibond Systems, L.L.C.
  */
diff --git a/kernel/fs/orangefs/downcall.h b/kernel/fs/orangefs/downcall.h
index 163001c95..ea2332e16 100644
--- a/kernel/fs/orangefs/downcall.h
+++ b/kernel/fs/orangefs/downcall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/file.c b/kernel/fs/orangefs/file.c
index 336ecbf8c..e4a8e6a7e 100644
--- a/kernel/fs/orangefs/file.c
+++ b/kernel/fs/orangefs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/inode.c b/kernel/fs/orangefs/inode.c
index 9428ea0aa..28825a5b6 100644
--- a/kernel/fs/orangefs/inode.c
+++ b/kernel/fs/orangefs/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/namei.c b/kernel/fs/orangefs/namei.c
index 478e88bd7..7e9e5d0ea 100644
--- a/kernel/fs/orangefs/namei.c
+++ b/kernel/fs/orangefs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-bufmap.c b/kernel/fs/orangefs/orangefs-bufmap.c
index 7ef473f3d..59f444dce 100644
--- a/kernel/fs/orangefs/orangefs-bufmap.c
+++ b/kernel/fs/orangefs/orangefs-bufmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-bufmap.h b/kernel/fs/orangefs/orangefs-bufmap.h
index 71f64f405..c2c3c5a0e 100644
--- a/kernel/fs/orangefs/orangefs-bufmap.h
+++ b/kernel/fs/orangefs/orangefs-bufmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-cache.c b/kernel/fs/orangefs/orangefs-cache.c
index aa3830b74..3b6982bf6 100644
--- a/kernel/fs/orangefs/orangefs-cache.c
+++ b/kernel/fs/orangefs/orangefs-cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-debug.h b/kernel/fs/orangefs/orangefs-debug.h
index 387db17cd..b6001bb28 100644
--- a/kernel/fs/orangefs/orangefs-debug.h
+++ b/kernel/fs/orangefs/orangefs-debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-debugfs.c b/kernel/fs/orangefs/orangefs-debugfs.c
index 5f59917fd..1c59dff53 100644
--- a/kernel/fs/orangefs/orangefs-debugfs.c
+++ b/kernel/fs/orangefs/orangefs-debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * What:		/sys/kernel/debug/orangefs/debug-help
  * Date:		June 2015
diff --git a/kernel/fs/orangefs/orangefs-debugfs.h b/kernel/fs/orangefs/orangefs-debugfs.h
index 803517269..b5fd9cd49 100644
--- a/kernel/fs/orangefs/orangefs-debugfs.h
+++ b/kernel/fs/orangefs/orangefs-debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 int orangefs_debugfs_init(int);
 void orangefs_debugfs_cleanup(void);
 int orangefs_client_debug_init(void);
diff --git a/kernel/fs/orangefs/orangefs-dev-proto.h b/kernel/fs/orangefs/orangefs-dev-proto.h
index efe08c763..dc6609824 100644
--- a/kernel/fs/orangefs/orangefs-dev-proto.h
+++ b/kernel/fs/orangefs/orangefs-dev-proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-kernel.h b/kernel/fs/orangefs/orangefs-kernel.h
index ea0ce507a..004af348f 100644
--- a/kernel/fs/orangefs/orangefs-kernel.h
+++ b/kernel/fs/orangefs/orangefs-kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/orangefs-sysfs.c b/kernel/fs/orangefs/orangefs-sysfs.c
index afd2f523b..079a46579 100644
--- a/kernel/fs/orangefs/orangefs-sysfs.c
+++ b/kernel/fs/orangefs/orangefs-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Documentation/ABI/stable/orangefs-sysfs:
  *
diff --git a/kernel/fs/orangefs/orangefs-utils.c b/kernel/fs/orangefs/orangefs-utils.c
index aab6f1842..f82336496 100644
--- a/kernel/fs/orangefs/orangefs-utils.c
+++ b/kernel/fs/orangefs/orangefs-utils.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/protocol.h b/kernel/fs/orangefs/protocol.h
index 48bcc1bbe..e0bf5e4dc 100644
--- a/kernel/fs/orangefs/protocol.h
+++ b/kernel/fs/orangefs/protocol.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/spinlock_types.h>
diff --git a/kernel/fs/orangefs/super.c b/kernel/fs/orangefs/super.c
index 47f3fb9cb..47ebd9bfd 100644
--- a/kernel/fs/orangefs/super.c
+++ b/kernel/fs/orangefs/super.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/symlink.c b/kernel/fs/orangefs/symlink.c
index 02b1bbdbc..d856cdf91 100644
--- a/kernel/fs/orangefs/symlink.c
+++ b/kernel/fs/orangefs/symlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/upcall.h b/kernel/fs/orangefs/upcall.h
index b8249f8fd..16118452a 100644
--- a/kernel/fs/orangefs/upcall.h
+++ b/kernel/fs/orangefs/upcall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/orangefs/waitqueue.c b/kernel/fs/orangefs/waitqueue.c
index 61e2ca7fe..835c6e148 100644
--- a/kernel/fs/orangefs/waitqueue.c
+++ b/kernel/fs/orangefs/waitqueue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  * (C) 2011 Omnibond Systems
diff --git a/kernel/fs/orangefs/xattr.c b/kernel/fs/orangefs/xattr.c
index 81ac88bb9..03bcb8715 100644
--- a/kernel/fs/orangefs/xattr.c
+++ b/kernel/fs/orangefs/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) 2001 Clemson University and The University of Chicago
  *
diff --git a/kernel/fs/pipe.c b/kernel/fs/pipe.c
index 97e5be897..349c9d56d 100644
--- a/kernel/fs/pipe.c
+++ b/kernel/fs/pipe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/pipe.c
  *
diff --git a/kernel/fs/proc/Makefile b/kernel/fs/proc/Makefile
index 12c6922c9..f7456c4e7 100644
--- a/kernel/fs/proc/Makefile
+++ b/kernel/fs/proc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux proc filesystem routines.
 #
diff --git a/kernel/fs/proc/array.c b/kernel/fs/proc/array.c
index 77a8eacbe..9390032a1 100644
--- a/kernel/fs/proc/array.c
+++ b/kernel/fs/proc/array.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/proc/array.c
  *
diff --git a/kernel/fs/proc/base.c b/kernel/fs/proc/base.c
index ad3b0762c..9d357b2ea 100644
--- a/kernel/fs/proc/base.c
+++ b/kernel/fs/proc/base.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/proc/base.c
  *
diff --git a/kernel/fs/proc/cmdline.c b/kernel/fs/proc/cmdline.c
index cbd82dff7..403cbb12a 100644
--- a/kernel/fs/proc/cmdline.c
+++ b/kernel/fs/proc/cmdline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/kernel/fs/proc/cpuinfo.c b/kernel/fs/proc/cpuinfo.c
index 06f4d31e0..e0f867cd8 100644
--- a/kernel/fs/proc/cpuinfo.c
+++ b/kernel/fs/proc/cpuinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/kernel/fs/proc/devices.c b/kernel/fs/proc/devices.c
index e5709343f..2c7f22b14 100644
--- a/kernel/fs/proc/devices.c
+++ b/kernel/fs/proc/devices.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/kernel/fs/proc/fd.c b/kernel/fs/proc/fd.c
index c330495c3..96fc70225 100644
--- a/kernel/fs/proc/fd.c
+++ b/kernel/fs/proc/fd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched/signal.h>
 #include <linux/errno.h>
 #include <linux/dcache.h>
diff --git a/kernel/fs/proc/fd.h b/kernel/fs/proc/fd.h
index 46dafadd0..f371a602b 100644
--- a/kernel/fs/proc/fd.h
+++ b/kernel/fs/proc/fd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PROCFS_FD_H__
 #define __PROCFS_FD_H__
 
diff --git a/kernel/fs/proc/inode.c b/kernel/fs/proc/inode.c
index e250910cf..225f541f7 100644
--- a/kernel/fs/proc/inode.c
+++ b/kernel/fs/proc/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/proc/inode.c
  *
diff --git a/kernel/fs/proc/interrupts.c b/kernel/fs/proc/interrupts.c
index a352d5703..6a6bee9c6 100644
--- a/kernel/fs/proc/interrupts.c
+++ b/kernel/fs/proc/interrupts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
diff --git a/kernel/fs/proc/kcore.c b/kernel/fs/proc/kcore.c
index 45629f4b5..4bc85cb8b 100644
--- a/kernel/fs/proc/kcore.c
+++ b/kernel/fs/proc/kcore.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	fs/proc/kcore.c kernel ELF core dumper
  *
diff --git a/kernel/fs/proc/kmsg.c b/kernel/fs/proc/kmsg.c
index f9387bb76..e0f8774ac 100644
--- a/kernel/fs/proc/kmsg.c
+++ b/kernel/fs/proc/kmsg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/proc/kmsg.c
  *
diff --git a/kernel/fs/proc/loadavg.c b/kernel/fs/proc/loadavg.c
index 983fce5c2..9bc5c58c0 100644
--- a/kernel/fs/proc/loadavg.c
+++ b/kernel/fs/proc/loadavg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/pid_namespace.h>
diff --git a/kernel/fs/proc/meminfo.c b/kernel/fs/proc/meminfo.c
index cdd979724..6bb20f864 100644
--- a/kernel/fs/proc/meminfo.c
+++ b/kernel/fs/proc/meminfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/kernel/fs/proc/namespaces.c b/kernel/fs/proc/namespaces.c
index 3803b24ca..59b17e509 100644
--- a/kernel/fs/proc/namespaces.c
+++ b/kernel/fs/proc/namespaces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/proc_fs.h>
 #include <linux/nsproxy.h>
 #include <linux/ptrace.h>
diff --git a/kernel/fs/proc/page.c b/kernel/fs/proc/page.c
index 272653648..1491918a3 100644
--- a/kernel/fs/proc/page.c
+++ b/kernel/fs/proc/page.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bootmem.h>
 #include <linux/compiler.h>
 #include <linux/fs.h>
diff --git a/kernel/fs/proc/proc_sysctl.c b/kernel/fs/proc/proc_sysctl.c
index 8f479229b..c5cbbdff3 100644
--- a/kernel/fs/proc/proc_sysctl.c
+++ b/kernel/fs/proc/proc_sysctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * /proc/sys support
  */
diff --git a/kernel/fs/proc/proc_tty.c b/kernel/fs/proc/proc_tty.c
index 901bd06f4..2da657848 100644
--- a/kernel/fs/proc/proc_tty.c
+++ b/kernel/fs/proc/proc_tty.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * proc_tty.c -- handles /proc/tty
  *
diff --git a/kernel/fs/proc/root.c b/kernel/fs/proc/root.c
index 926fb27f4..4e42aba97 100644
--- a/kernel/fs/proc/root.c
+++ b/kernel/fs/proc/root.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/proc/root.c
  *
diff --git a/kernel/fs/proc/self.c b/kernel/fs/proc/self.c
index 39857f6db..31326bb23 100644
--- a/kernel/fs/proc/self.c
+++ b/kernel/fs/proc/self.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/pid_namespace.h>
diff --git a/kernel/fs/proc/softirqs.c b/kernel/fs/proc/softirqs.c
index ad8a77f94..24072cc06 100644
--- a/kernel/fs/proc/softirqs.c
+++ b/kernel/fs/proc/softirqs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 #include <linux/proc_fs.h>
diff --git a/kernel/fs/proc/stat.c b/kernel/fs/proc/stat.c
index bd4e55f4a..59749dfae 100644
--- a/kernel/fs/proc/stat.c
+++ b/kernel/fs/proc/stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cpumask.h>
 #include <linux/fs.h>
 #include <linux/init.h>
diff --git a/kernel/fs/proc/task_mmu.c b/kernel/fs/proc/task_mmu.c
index 5589b4bd4..6744bd706 100644
--- a/kernel/fs/proc/task_mmu.c
+++ b/kernel/fs/proc/task_mmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/vmacache.h>
 #include <linux/hugetlb.h>
@@ -1310,13 +1311,15 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,
 		pmd_t pmd = *pmdp;
 		struct page *page = NULL;
 
-		if ((vma->vm_flags & VM_SOFTDIRTY) || pmd_soft_dirty(pmd))
+		if (vma->vm_flags & VM_SOFTDIRTY)
 			flags |= PM_SOFT_DIRTY;
 
 		if (pmd_present(pmd)) {
 			page = pmd_page(pmd);
 
 			flags |= PM_PRESENT;
+			if (pmd_soft_dirty(pmd))
+				flags |= PM_SOFT_DIRTY;
 			if (pm->show_pfn)
 				frame = pmd_pfn(pmd) +
 					((addr & ~PMD_MASK) >> PAGE_SHIFT);
@@ -1328,6 +1331,8 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end,
 			frame = swp_type(entry) |
 				(swp_offset(entry) << MAX_SWAPFILES_SHIFT);
 			flags |= PM_SWAP;
+			if (pmd_swp_soft_dirty(pmd))
+				flags |= PM_SOFT_DIRTY;
 			VM_BUG_ON(!is_pmd_migration_entry(pmd));
 			page = migration_entry_to_page(entry);
 		}
diff --git a/kernel/fs/proc/task_nommu.c b/kernel/fs/proc/task_nommu.c
index b00b76609..5b62f57bd 100644
--- a/kernel/fs/proc/task_nommu.c
+++ b/kernel/fs/proc/task_nommu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/mm.h>
 #include <linux/file.h>
diff --git a/kernel/fs/proc/thread_self.c b/kernel/fs/proc/thread_self.c
index 20614b62a..b813e3b52 100644
--- a/kernel/fs/proc/thread_self.c
+++ b/kernel/fs/proc/thread_self.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/pid_namespace.h>
diff --git a/kernel/fs/proc/uptime.c b/kernel/fs/proc/uptime.c
index 7981c4ffe..95a708d83 100644
--- a/kernel/fs/proc/uptime.c
+++ b/kernel/fs/proc/uptime.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/kernel/fs/proc/version.c b/kernel/fs/proc/version.c
index d2154eb6d..94901e8e7 100644
--- a/kernel/fs/proc/version.c
+++ b/kernel/fs/proc/version.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/kernel/fs/proc_namespace.c b/kernel/fs/proc_namespace.c
index 99dff222f..7626ee11b 100644
--- a/kernel/fs/proc_namespace.c
+++ b/kernel/fs/proc_namespace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fs/proc_namespace.c - handling of /proc/<pid>/{mounts,mountinfo,mountstats}
  *
diff --git a/kernel/fs/pstore/Makefile b/kernel/fs/pstore/Makefile
index b8803cc07..967b5891f 100644
--- a/kernel/fs/pstore/Makefile
+++ b/kernel/fs/pstore/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux pstorefs routines.
 #
diff --git a/kernel/fs/pstore/internal.h b/kernel/fs/pstore/internal.h
index 7f4e48c8d..c02931447 100644
--- a/kernel/fs/pstore/internal.h
+++ b/kernel/fs/pstore/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PSTORE_INTERNAL_H__
 #define __PSTORE_INTERNAL_H__
 
diff --git a/kernel/fs/qnx4/bitmap.c b/kernel/fs/qnx4/bitmap.c
index 76a7a697b..163afc4ba 100644
--- a/kernel/fs/qnx4/bitmap.c
+++ b/kernel/fs/qnx4/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * QNX4 file system, Linux implementation.
  *
diff --git a/kernel/fs/qnx4/dir.c b/kernel/fs/qnx4/dir.c
index 781056a04..a6ee23aad 100644
--- a/kernel/fs/qnx4/dir.c
+++ b/kernel/fs/qnx4/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * QNX4 file system, Linux implementation.
  *
diff --git a/kernel/fs/qnx4/namei.c b/kernel/fs/qnx4/namei.c
index e62c81837..eca278780 100644
--- a/kernel/fs/qnx4/namei.c
+++ b/kernel/fs/qnx4/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* 
  * QNX4 file system, Linux implementation.
  * 
diff --git a/kernel/fs/qnx4/qnx4.h b/kernel/fs/qnx4/qnx4.h
index c9b1be2c1..628370546 100644
--- a/kernel/fs/qnx4/qnx4.h
+++ b/kernel/fs/qnx4/qnx4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fs.h>
 #include <linux/qnx4_fs.h>
 
diff --git a/kernel/fs/qnx6/dir.c b/kernel/fs/qnx6/dir.c
index 27637e0bd..c1cfb8a19 100644
--- a/kernel/fs/qnx6/dir.c
+++ b/kernel/fs/qnx6/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * QNX6 file system, Linux implementation.
  *
diff --git a/kernel/fs/qnx6/namei.c b/kernel/fs/qnx6/namei.c
index 6c1a32313..72c277083 100644
--- a/kernel/fs/qnx6/namei.c
+++ b/kernel/fs/qnx6/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * QNX6 file system, Linux implementation.
  *
diff --git a/kernel/fs/qnx6/qnx6.h b/kernel/fs/qnx6/qnx6.h
index f23b5c4a6..34a6b126a 100644
--- a/kernel/fs/qnx6/qnx6.h
+++ b/kernel/fs/qnx6/qnx6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * QNX6 file system, Linux implementation.
  *
diff --git a/kernel/fs/qnx6/super_mmi.c b/kernel/fs/qnx6/super_mmi.c
index 62aaf3e31..d282c2c73 100644
--- a/kernel/fs/qnx6/super_mmi.c
+++ b/kernel/fs/qnx6/super_mmi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * QNX6 file system, Linux implementation.
  *
diff --git a/kernel/fs/quota/Makefile b/kernel/fs/quota/Makefile
index c66c37cda..f2b49d0f0 100644
--- a/kernel/fs/quota/Makefile
+++ b/kernel/fs/quota/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_QUOTA)		+= dquot.o
 obj-$(CONFIG_QFMT_V1)		+= quota_v1.o
 obj-$(CONFIG_QFMT_V2)		+= quota_v2.o
diff --git a/kernel/fs/quota/compat.c b/kernel/fs/quota/compat.c
index fb1892fe3..779caed4f 100644
--- a/kernel/fs/quota/compat.c
+++ b/kernel/fs/quota/compat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/syscalls.h>
 #include <linux/compat.h>
diff --git a/kernel/fs/quota/dquot.c b/kernel/fs/quota/dquot.c
index 52ad15192..9f78b5015 100644
--- a/kernel/fs/quota/dquot.c
+++ b/kernel/fs/quota/dquot.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of the diskquota system for the LINUX operating system. QUOTA
  * is implemented using the BSD system call interface as the means of
diff --git a/kernel/fs/quota/kqid.c b/kernel/fs/quota/kqid.c
index ebc5e6285..f814fa90a 100644
--- a/kernel/fs/quota/kqid.c
+++ b/kernel/fs/quota/kqid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fs.h>
 #include <linux/quota.h>
 #include <linux/export.h>
diff --git a/kernel/fs/quota/netlink.c b/kernel/fs/quota/netlink.c
index e99b1a72d..95acdae39 100644
--- a/kernel/fs/quota/netlink.c
+++ b/kernel/fs/quota/netlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cred.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/kernel/fs/quota/quota.c b/kernel/fs/quota/quota.c
index a9c5dfe6b..43612e2a7 100644
--- a/kernel/fs/quota/quota.c
+++ b/kernel/fs/quota/quota.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Quota code necessary even when VFS quota support is not compiled
  * into the kernel.  The interesting stuff is over in dquot.c, here
diff --git a/kernel/fs/quota/quota_tree.h b/kernel/fs/quota/quota_tree.h
index a1ab8db81..31cf27e0e 100644
--- a/kernel/fs/quota/quota_tree.h
+++ b/kernel/fs/quota/quota_tree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Definitions of structures for vfsv0 quota format
  */
diff --git a/kernel/fs/quota/quotaio_v1.h b/kernel/fs/quota/quotaio_v1.h
index 746654b5d..bd11e2c08 100644
--- a/kernel/fs/quota/quotaio_v1.h
+++ b/kernel/fs/quota/quotaio_v1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_QUOTAIO_V1_H
 #define _LINUX_QUOTAIO_V1_H
 
diff --git a/kernel/fs/quota/quotaio_v2.h b/kernel/fs/quota/quotaio_v2.h
index 4e9543009..43cf0f0e2 100644
--- a/kernel/fs/quota/quotaio_v2.h
+++ b/kernel/fs/quota/quotaio_v2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Definitions of structures for vfsv0 quota format
  */
diff --git a/kernel/fs/read_write.c b/kernel/fs/read_write.c
index f0d4b1687..0046d72ef 100644
--- a/kernel/fs/read_write.c
+++ b/kernel/fs/read_write.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/read_write.c
  *
diff --git a/kernel/fs/readdir.c b/kernel/fs/readdir.c
index 89659549c..d336db65a 100644
--- a/kernel/fs/readdir.c
+++ b/kernel/fs/readdir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/readdir.c
  *
diff --git a/kernel/fs/reiserfs/Makefile b/kernel/fs/reiserfs/Makefile
index 3c3b00165..a39a562c1 100644
--- a/kernel/fs/reiserfs/Makefile
+++ b/kernel/fs/reiserfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux reiser-filesystem routines.
 #
diff --git a/kernel/fs/reiserfs/acl.h b/kernel/fs/reiserfs/acl.h
index 4a211f5b3..0c1c847f9 100644
--- a/kernel/fs/reiserfs/acl.h
+++ b/kernel/fs/reiserfs/acl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/init.h>
 #include <linux/posix_acl.h>
 
diff --git a/kernel/fs/reiserfs/journal.c b/kernel/fs/reiserfs/journal.c
index f59c667df..69ff280bd 100644
--- a/kernel/fs/reiserfs/journal.c
+++ b/kernel/fs/reiserfs/journal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Write ahead logging implementation copyright Chris Mason 2000
  *
diff --git a/kernel/fs/reiserfs/lock.c b/kernel/fs/reiserfs/lock.c
index 045b83ef9..46bd7bd63 100644
--- a/kernel/fs/reiserfs/lock.c
+++ b/kernel/fs/reiserfs/lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "reiserfs.h"
 #include <linux/mutex.h>
 
diff --git a/kernel/fs/reiserfs/reiserfs.h b/kernel/fs/reiserfs/reiserfs.h
index 1d34377fe..48835a659 100644
--- a/kernel/fs/reiserfs/reiserfs.h
+++ b/kernel/fs/reiserfs/reiserfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 1996, 1997, 1998 Hans Reiser, see reiserfs/README for
  * licensing and copyright details
diff --git a/kernel/fs/reiserfs/tail_conversion.c b/kernel/fs/reiserfs/tail_conversion.c
index 2d5489b0a..b0ae088df 100644
--- a/kernel/fs/reiserfs/tail_conversion.c
+++ b/kernel/fs/reiserfs/tail_conversion.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright 1999 Hans Reiser, see reiserfs/README for licensing and copyright
  * details
diff --git a/kernel/fs/reiserfs/xattr.c b/kernel/fs/reiserfs/xattr.c
index e87aa21c3..46492fb37 100644
--- a/kernel/fs/reiserfs/xattr.c
+++ b/kernel/fs/reiserfs/xattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/reiserfs/xattr.c
  *
diff --git a/kernel/fs/reiserfs/xattr.h b/kernel/fs/reiserfs/xattr.h
index 613ff5aef..c76435244 100644
--- a/kernel/fs/reiserfs/xattr.h
+++ b/kernel/fs/reiserfs/xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/reiserfs_xattr.h>
 #include <linux/init.h>
 #include <linux/list.h>
diff --git a/kernel/fs/reiserfs/xattr_acl.c b/kernel/fs/reiserfs/xattr_acl.c
index 54415f0e3..aa9380bac 100644
--- a/kernel/fs/reiserfs/xattr_acl.c
+++ b/kernel/fs/reiserfs/xattr_acl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/posix_acl.h>
diff --git a/kernel/fs/reiserfs/xattr_security.c b/kernel/fs/reiserfs/xattr_security.c
index e4cbb7719..20be9a0e5 100644
--- a/kernel/fs/reiserfs/xattr_security.c
+++ b/kernel/fs/reiserfs/xattr_security.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "reiserfs.h"
 #include <linux/errno.h>
 #include <linux/fs.h>
diff --git a/kernel/fs/reiserfs/xattr_trusted.c b/kernel/fs/reiserfs/xattr_trusted.c
index f15a5f9e8..5ed48da3d 100644
--- a/kernel/fs/reiserfs/xattr_trusted.c
+++ b/kernel/fs/reiserfs/xattr_trusted.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "reiserfs.h"
 #include <linux/capability.h>
 #include <linux/errno.h>
diff --git a/kernel/fs/reiserfs/xattr_user.c b/kernel/fs/reiserfs/xattr_user.c
index dc59df43b..a573ca45b 100644
--- a/kernel/fs/reiserfs/xattr_user.c
+++ b/kernel/fs/reiserfs/xattr_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "reiserfs.h"
 #include <linux/errno.h>
 #include <linux/fs.h>
diff --git a/kernel/fs/romfs/Makefile b/kernel/fs/romfs/Makefile
index 420beb7d4..844928f15 100644
--- a/kernel/fs/romfs/Makefile
+++ b/kernel/fs/romfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux RomFS filesystem routines.
 #
diff --git a/kernel/fs/select.c b/kernel/fs/select.c
index c6362e38a..063067e60 100644
--- a/kernel/fs/select.c
+++ b/kernel/fs/select.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains the procedures for the handling of select and poll
  *
diff --git a/kernel/fs/seq_file.c b/kernel/fs/seq_file.c
index dc7c2be96..4be761c1a 100644
--- a/kernel/fs/seq_file.c
+++ b/kernel/fs/seq_file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/seq_file.c
  *
diff --git a/kernel/fs/signalfd.c b/kernel/fs/signalfd.c
index d2c434112..1c667af86 100644
--- a/kernel/fs/signalfd.c
+++ b/kernel/fs/signalfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/signalfd.c
  *
diff --git a/kernel/fs/squashfs/Makefile b/kernel/fs/squashfs/Makefile
index 6655631c5..7bd9b8b85 100644
--- a/kernel/fs/squashfs/Makefile
+++ b/kernel/fs/squashfs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux squashfs routines.
 #
diff --git a/kernel/fs/stat.c b/kernel/fs/stat.c
index 8a6aa8caf..873785dae 100644
--- a/kernel/fs/stat.c
+++ b/kernel/fs/stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/stat.c
  *
diff --git a/kernel/fs/statfs.c b/kernel/fs/statfs.c
index fab9b6a3c..c25dd9a26 100644
--- a/kernel/fs/statfs.c
+++ b/kernel/fs/statfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/syscalls.h>
 #include <linux/export.h>
 #include <linux/fs.h>
diff --git a/kernel/fs/super.c b/kernel/fs/super.c
index 166c4ee0d..994db21f5 100644
--- a/kernel/fs/super.c
+++ b/kernel/fs/super.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/super.c
  *
diff --git a/kernel/fs/sync.c b/kernel/fs/sync.c
index a576aa2e6..83ac79a96 100644
--- a/kernel/fs/sync.c
+++ b/kernel/fs/sync.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * High-level sync()-related operations
  */
diff --git a/kernel/fs/sysv/balloc.c b/kernel/fs/sysv/balloc.c
index 862c1f74a..0e69dbdf7 100644
--- a/kernel/fs/sysv/balloc.c
+++ b/kernel/fs/sysv/balloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/balloc.c
  *
diff --git a/kernel/fs/sysv/dir.c b/kernel/fs/sysv/dir.c
index f5191cb2c..88e38cd8f 100644
--- a/kernel/fs/sysv/dir.c
+++ b/kernel/fs/sysv/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/dir.c
  *
diff --git a/kernel/fs/sysv/file.c b/kernel/fs/sysv/file.c
index 7ba997e31..45fc79a18 100644
--- a/kernel/fs/sysv/file.c
+++ b/kernel/fs/sysv/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/file.c
  *
diff --git a/kernel/fs/sysv/ialloc.c b/kernel/fs/sysv/ialloc.c
index eb963fbb7..6c9801986 100644
--- a/kernel/fs/sysv/ialloc.c
+++ b/kernel/fs/sysv/ialloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/ialloc.c
  *
diff --git a/kernel/fs/sysv/inode.c b/kernel/fs/sysv/inode.c
index 1c8bf9453..3c47b7d5d 100644
--- a/kernel/fs/sysv/inode.c
+++ b/kernel/fs/sysv/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/inode.c
  *
diff --git a/kernel/fs/sysv/itree.c b/kernel/fs/sysv/itree.c
index 83809f5b5..bcb67b0ca 100644
--- a/kernel/fs/sysv/itree.c
+++ b/kernel/fs/sysv/itree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/itree.c
  *
diff --git a/kernel/fs/sysv/namei.c b/kernel/fs/sysv/namei.c
index d8817f139..250b0755b 100644
--- a/kernel/fs/sysv/namei.c
+++ b/kernel/fs/sysv/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/sysv/namei.c
  *
diff --git a/kernel/fs/sysv/sysv.h b/kernel/fs/sysv/sysv.h
index 1e7e27c72..e91369877 100644
--- a/kernel/fs/sysv/sysv.h
+++ b/kernel/fs/sysv/sysv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SYSV_H
 #define _SYSV_H
 
diff --git a/kernel/fs/timerfd.c b/kernel/fs/timerfd.c
index ece0c02d7..040612ec9 100644
--- a/kernel/fs/timerfd.c
+++ b/kernel/fs/timerfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  fs/timerfd.c
  *
diff --git a/kernel/fs/ubifs/Makefile b/kernel/fs/ubifs/Makefile
index 6f3251c2b..9758f709c 100644
--- a/kernel/fs/ubifs/Makefile
+++ b/kernel/fs/ubifs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_UBIFS_FS) += ubifs.o
 
 ubifs-y += shrinker.o journal.o file.o dir.o super.o sb.o io.o
diff --git a/kernel/fs/ubifs/crypto.c b/kernel/fs/ubifs/crypto.c
index 114ba455b..16a5d5c82 100644
--- a/kernel/fs/ubifs/crypto.c
+++ b/kernel/fs/ubifs/crypto.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "ubifs.h"
 
 static int ubifs_crypt_get_context(struct inode *inode, void *ctx, size_t len)
diff --git a/kernel/fs/ubifs/misc.c b/kernel/fs/ubifs/misc.c
index 486a28449..586fd5b57 100644
--- a/kernel/fs/ubifs/misc.c
+++ b/kernel/fs/ubifs/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include "ubifs.h"
 
diff --git a/kernel/fs/udf/udf_i.h b/kernel/fs/udf/udf_i.h
index b1b9a63d8..630426ffb 100644
--- a/kernel/fs/udf/udf_i.h
+++ b/kernel/fs/udf/udf_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UDF_I_H
 #define _UDF_I_H
 
diff --git a/kernel/fs/udf/udf_sb.h b/kernel/fs/udf/udf_sb.h
index c13875d66..68c9f1d61 100644
--- a/kernel/fs/udf/udf_sb.h
+++ b/kernel/fs/udf/udf_sb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_UDF_SB_H
 #define __LINUX_UDF_SB_H
 
diff --git a/kernel/fs/udf/udfdecl.h b/kernel/fs/udf/udfdecl.h
index 63b034984..fa2065581 100644
--- a/kernel/fs/udf/udfdecl.h
+++ b/kernel/fs/udf/udfdecl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UDF_DECL_H
 #define __UDF_DECL_H
 
diff --git a/kernel/fs/udf/udfend.h b/kernel/fs/udf/udfend.h
index 6a9f3a9cc..a4363ac2c 100644
--- a/kernel/fs/udf/udfend.h
+++ b/kernel/fs/udf/udfend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UDF_ENDIAN_H
 #define __UDF_ENDIAN_H
 
diff --git a/kernel/fs/ufs/balloc.c b/kernel/fs/ufs/balloc.c
index f80be4c5d..b5cd79065 100644
--- a/kernel/fs/ufs/balloc.c
+++ b/kernel/fs/ufs/balloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/balloc.c
  *
diff --git a/kernel/fs/ufs/cylinder.c b/kernel/fs/ufs/cylinder.c
index b4676322d..1abe5454d 100644
--- a/kernel/fs/ufs/cylinder.c
+++ b/kernel/fs/ufs/cylinder.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/cylinder.c
  *
diff --git a/kernel/fs/ufs/dir.c b/kernel/fs/ufs/dir.c
index 48609f1d9..2edc1755b 100644
--- a/kernel/fs/ufs/dir.c
+++ b/kernel/fs/ufs/dir.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/ufs_dir.c
  *
diff --git a/kernel/fs/ufs/file.c b/kernel/fs/ufs/file.c
index 042ddbf11..7e087581b 100644
--- a/kernel/fs/ufs/file.c
+++ b/kernel/fs/ufs/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/file.c
  *
diff --git a/kernel/fs/ufs/ialloc.c b/kernel/fs/ufs/ialloc.c
index d1dd8cc33..916b4a428 100644
--- a/kernel/fs/ufs/ialloc.c
+++ b/kernel/fs/ufs/ialloc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/ialloc.c
  *
diff --git a/kernel/fs/ufs/inode.c b/kernel/fs/ufs/inode.c
index f36d6a536..afb601c0d 100644
--- a/kernel/fs/ufs/inode.c
+++ b/kernel/fs/ufs/inode.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/inode.c
  *
diff --git a/kernel/fs/ufs/namei.c b/kernel/fs/ufs/namei.c
index 8eca4eda8..32545cd00 100644
--- a/kernel/fs/ufs/namei.c
+++ b/kernel/fs/ufs/namei.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/fs/ufs/namei.c
  *
diff --git a/kernel/fs/ufs/swab.h b/kernel/fs/ufs/swab.h
index 8d974c4fd..a0e1d8c82 100644
--- a/kernel/fs/ufs/swab.h
+++ b/kernel/fs/ufs/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/fs/ufs/swab.h
  *
diff --git a/kernel/fs/ufs/ufs.h b/kernel/fs/ufs/ufs.h
index c87f4c3fa..b49e0efdf 100644
--- a/kernel/fs/ufs/ufs.h
+++ b/kernel/fs/ufs/ufs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UFS_UFS_H
 #define _UFS_UFS_H 1
 
diff --git a/kernel/fs/ufs/ufs_fs.h b/kernel/fs/ufs/ufs_fs.h
index 150eef6f1..ef9ead447 100644
--- a/kernel/fs/ufs/ufs_fs.h
+++ b/kernel/fs/ufs/ufs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/ufs_fs.h
  *
diff --git a/kernel/fs/ufs/util.c b/kernel/fs/ufs/util.c
index 02497a492..4fa633f84 100644
--- a/kernel/fs/ufs/util.c
+++ b/kernel/fs/ufs/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/fs/ufs/util.c
  *
diff --git a/kernel/fs/ufs/util.h b/kernel/fs/ufs/util.h
index 9fc7119a1..1907be6d5 100644
--- a/kernel/fs/ufs/util.h
+++ b/kernel/fs/ufs/util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/fs/ufs/util.h
  *
diff --git a/kernel/fs/utimes.c b/kernel/fs/utimes.c
index 51edb9f95..e4b3d7c2c 100644
--- a/kernel/fs/utimes.c
+++ b/kernel/fs/utimes.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/namei.h>
diff --git a/kernel/fs/xfs/libxfs/xfs_cksum.h b/kernel/fs/xfs/libxfs/xfs_cksum.h
index 8211f48b9..999a290cf 100644
--- a/kernel/fs/xfs/libxfs/xfs_cksum.h
+++ b/kernel/fs/xfs/libxfs/xfs_cksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XFS_CKSUM_H
 #define _XFS_CKSUM_H 1
 
diff --git a/kernel/fs/xfs/xfs_discard.h b/kernel/fs/xfs/xfs_discard.h
index 0f070f9e4..de92d9cc9 100644
--- a/kernel/fs/xfs/xfs_discard.h
+++ b/kernel/fs/xfs/xfs_discard.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef XFS_DISCARD_H
 #define XFS_DISCARD_H 1
 
diff --git a/kernel/fs/xfs/xfs_message.h b/kernel/fs/xfs/xfs_message.h
index 854011557..34447dca9 100644
--- a/kernel/fs/xfs/xfs_message.h
+++ b/kernel/fs/xfs/xfs_message.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __XFS_MESSAGE_H
 #define __XFS_MESSAGE_H 1
 
diff --git a/kernel/fs/xfs/xfs_pnfs.c b/kernel/fs/xfs/xfs_pnfs.c
index 4246876df..aa6c5c193 100644
--- a/kernel/fs/xfs/xfs_pnfs.c
+++ b/kernel/fs/xfs/xfs_pnfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2014 Christoph Hellwig.
  */
diff --git a/kernel/fs/xfs/xfs_pnfs.h b/kernel/fs/xfs/xfs_pnfs.h
index b587cb99b..bf45951e2 100644
--- a/kernel/fs/xfs/xfs_pnfs.h
+++ b/kernel/fs/xfs/xfs_pnfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XFS_PNFS_H
 #define _XFS_PNFS_H 1
 
diff --git a/kernel/include/acpi/acpi_io.h b/kernel/include/acpi/acpi_io.h
index 303315b96..d0633fc1f 100644
--- a/kernel/include/acpi/acpi_io.h
+++ b/kernel/include/acpi/acpi_io.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ACPI_IO_H_
 #define _ACPI_IO_H_
 
diff --git a/kernel/include/acpi/acpi_numa.h b/kernel/include/acpi/acpi_numa.h
index 1e3a74f94..fdebcfc6c 100644
--- a/kernel/include/acpi/acpi_numa.h
+++ b/kernel/include/acpi/acpi_numa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACPI_NUMA_H
 #define __ACPI_NUMA_H
 
diff --git a/kernel/include/acpi/apei.h b/kernel/include/acpi/apei.h
index c46694abe..1797e81a3 100644
--- a/kernel/include/acpi/apei.h
+++ b/kernel/include/acpi/apei.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * apei.h - ACPI Platform Error Interface
  */
diff --git a/kernel/include/acpi/button.h b/kernel/include/acpi/button.h
index 1cad8b2d4..3a2b8535d 100644
--- a/kernel/include/acpi/button.h
+++ b/kernel/include/acpi/button.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ACPI_BUTTON_H
 #define ACPI_BUTTON_H
 
diff --git a/kernel/include/acpi/ghes.h b/kernel/include/acpi/ghes.h
index 9061c5c74..8feb0c866 100644
--- a/kernel/include/acpi/ghes.h
+++ b/kernel/include/acpi/ghes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GHES_H
 #define GHES_H
 
diff --git a/kernel/include/acpi/pdc_intel.h b/kernel/include/acpi/pdc_intel.h
index 552637b0d..967c552d1 100644
--- a/kernel/include/acpi/pdc_intel.h
+++ b/kernel/include/acpi/pdc_intel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* _PDC bit definition for Intel processors */
 
diff --git a/kernel/include/acpi/processor.h b/kernel/include/acpi/processor.h
index c1ba00fc4..d591bb77f 100644
--- a/kernel/include/acpi/processor.h
+++ b/kernel/include/acpi/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACPI_PROCESSOR_H
 #define __ACPI_PROCESSOR_H
 
diff --git a/kernel/include/acpi/reboot.h b/kernel/include/acpi/reboot.h
index 0419184ce..14122fc55 100644
--- a/kernel/include/acpi/reboot.h
+++ b/kernel/include/acpi/reboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACPI_REBOOT_H
 #define __ACPI_REBOOT_H
 
diff --git a/kernel/include/acpi/video.h b/kernel/include/acpi/video.h
index bfe484da5..db8548ff0 100644
--- a/kernel/include/acpi/video.h
+++ b/kernel/include/acpi/video.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACPI_VIDEO_H
 #define __ACPI_VIDEO_H
 
diff --git a/kernel/include/asm-generic/4level-fixup.h b/kernel/include/asm-generic/4level-fixup.h
index 928fd66b1..89f3b03b1 100644
--- a/kernel/include/asm-generic/4level-fixup.h
+++ b/kernel/include/asm-generic/4level-fixup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _4LEVEL_FIXUP_H
 #define _4LEVEL_FIXUP_H
 
diff --git a/kernel/include/asm-generic/5level-fixup.h b/kernel/include/asm-generic/5level-fixup.h
index b5ca82dc4..dfbd9d990 100644
--- a/kernel/include/asm-generic/5level-fixup.h
+++ b/kernel/include/asm-generic/5level-fixup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _5LEVEL_FIXUP_H
 #define _5LEVEL_FIXUP_H
 
diff --git a/kernel/include/asm-generic/asm-prototypes.h b/kernel/include/asm-generic/asm-prototypes.h
index 939869c77..2fa2bc208 100644
--- a/kernel/include/asm-generic/asm-prototypes.h
+++ b/kernel/include/asm-generic/asm-prototypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/bitops.h>
 #undef __memset
 extern void *__memset(void *, int, __kernel_size_t);
diff --git a/kernel/include/asm-generic/atomic-long.h b/kernel/include/asm-generic/atomic-long.h
index 288cc9e96..49be4bba1 100644
--- a/kernel/include/asm-generic/atomic-long.h
+++ b/kernel/include/asm-generic/atomic-long.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_ATOMIC_LONG_H
 #define _ASM_GENERIC_ATOMIC_LONG_H
 /*
diff --git a/kernel/include/asm-generic/audit_change_attr.h b/kernel/include/asm-generic/audit_change_attr.h
index a18655373..331670807 100644
--- a/kernel/include/asm-generic/audit_change_attr.h
+++ b/kernel/include/asm-generic/audit_change_attr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __NR_chmod
 __NR_chmod,
 #endif
diff --git a/kernel/include/asm-generic/audit_dir_write.h b/kernel/include/asm-generic/audit_dir_write.h
index 7b61db4fe..8fb83b430 100644
--- a/kernel/include/asm-generic/audit_dir_write.h
+++ b/kernel/include/asm-generic/audit_dir_write.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __NR_rename
 __NR_rename,
 #endif
diff --git a/kernel/include/asm-generic/audit_read.h b/kernel/include/asm-generic/audit_read.h
index 3b249cb85..7bb7b5a83 100644
--- a/kernel/include/asm-generic/audit_read.h
+++ b/kernel/include/asm-generic/audit_read.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __NR_readlink
 __NR_readlink,
 #endif
diff --git a/kernel/include/asm-generic/audit_write.h b/kernel/include/asm-generic/audit_write.h
index 274575d71..dfc52b3c1 100644
--- a/kernel/include/asm-generic/audit_write.h
+++ b/kernel/include/asm-generic/audit_write.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <asm-generic/audit_dir_write.h>
 __NR_acct,
 #ifdef __NR_swapon
diff --git a/kernel/include/asm-generic/bitops.h b/kernel/include/asm-generic/bitops.h
index dcdcacf2f..bfc96bf66 100644
--- a/kernel/include/asm-generic/bitops.h
+++ b/kernel/include/asm-generic/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_BITOPS_H
 #define __ASM_GENERIC_BITOPS_H
 
diff --git a/kernel/include/asm-generic/bitops/__ffs.h b/kernel/include/asm-generic/bitops/__ffs.h
index 937d7c435..39e56e1c7 100644
--- a/kernel/include/asm-generic/bitops/__ffs.h
+++ b/kernel/include/asm-generic/bitops/__ffs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS___FFS_H_
 #define _ASM_GENERIC_BITOPS___FFS_H_
 
diff --git a/kernel/include/asm-generic/bitops/__fls.h b/kernel/include/asm-generic/bitops/__fls.h
index a60a7ccb6..03f721a8a 100644
--- a/kernel/include/asm-generic/bitops/__fls.h
+++ b/kernel/include/asm-generic/bitops/__fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS___FLS_H_
 #define _ASM_GENERIC_BITOPS___FLS_H_
 
diff --git a/kernel/include/asm-generic/bitops/arch_hweight.h b/kernel/include/asm-generic/bitops/arch_hweight.h
index 6a211f406..c2705e1d2 100644
--- a/kernel/include/asm-generic/bitops/arch_hweight.h
+++ b/kernel/include/asm-generic/bitops/arch_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
 
diff --git a/kernel/include/asm-generic/bitops/atomic.h b/kernel/include/asm-generic/bitops/atomic.h
index 49673510b..04deffaf5 100644
--- a/kernel/include/asm-generic/bitops/atomic.h
+++ b/kernel/include/asm-generic/bitops/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_ATOMIC_H_
 #define _ASM_GENERIC_BITOPS_ATOMIC_H_
 
diff --git a/kernel/include/asm-generic/bitops/builtin-__ffs.h b/kernel/include/asm-generic/bitops/builtin-__ffs.h
index 90041e3a4..87024da44 100644
--- a/kernel/include/asm-generic/bitops/builtin-__ffs.h
+++ b/kernel/include/asm-generic/bitops/builtin-__ffs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_BUILTIN___FFS_H_
 #define _ASM_GENERIC_BITOPS_BUILTIN___FFS_H_
 
diff --git a/kernel/include/asm-generic/bitops/builtin-__fls.h b/kernel/include/asm-generic/bitops/builtin-__fls.h
index 0248f3866..43a5aa9af 100644
--- a/kernel/include/asm-generic/bitops/builtin-__fls.h
+++ b/kernel/include/asm-generic/bitops/builtin-__fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_BUILTIN___FLS_H_
 #define _ASM_GENERIC_BITOPS_BUILTIN___FLS_H_
 
diff --git a/kernel/include/asm-generic/bitops/builtin-ffs.h b/kernel/include/asm-generic/bitops/builtin-ffs.h
index 064825829..458c85ebc 100644
--- a/kernel/include/asm-generic/bitops/builtin-ffs.h
+++ b/kernel/include/asm-generic/bitops/builtin-ffs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_BUILTIN_FFS_H_
 #define _ASM_GENERIC_BITOPS_BUILTIN_FFS_H_
 
diff --git a/kernel/include/asm-generic/bitops/builtin-fls.h b/kernel/include/asm-generic/bitops/builtin-fls.h
index eda652d0a..62daf9409 100644
--- a/kernel/include/asm-generic/bitops/builtin-fls.h
+++ b/kernel/include/asm-generic/bitops/builtin-fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_BUILTIN_FLS_H_
 #define _ASM_GENERIC_BITOPS_BUILTIN_FLS_H_
 
diff --git a/kernel/include/asm-generic/bitops/const_hweight.h b/kernel/include/asm-generic/bitops/const_hweight.h
index 0a7e06623..149faeeee 100644
--- a/kernel/include/asm-generic/bitops/const_hweight.h
+++ b/kernel/include/asm-generic/bitops/const_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
 
diff --git a/kernel/include/asm-generic/bitops/ext2-atomic-setbit.h b/kernel/include/asm-generic/bitops/ext2-atomic-setbit.h
index 5a0997857..b041cbf0d 100644
--- a/kernel/include/asm-generic/bitops/ext2-atomic-setbit.h
+++ b/kernel/include/asm-generic/bitops/ext2-atomic-setbit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_
 #define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_
 
diff --git a/kernel/include/asm-generic/bitops/ext2-atomic.h b/kernel/include/asm-generic/bitops/ext2-atomic.h
index 87f0f109d..0cfc3180b 100644
--- a/kernel/include/asm-generic/bitops/ext2-atomic.h
+++ b/kernel/include/asm-generic/bitops/ext2-atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_
 #define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_H_
 
diff --git a/kernel/include/asm-generic/bitops/ffs.h b/kernel/include/asm-generic/bitops/ffs.h
index fbbb43af7..e81868b2c 100644
--- a/kernel/include/asm-generic/bitops/ffs.h
+++ b/kernel/include/asm-generic/bitops/ffs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FFS_H_
 #define _ASM_GENERIC_BITOPS_FFS_H_
 
diff --git a/kernel/include/asm-generic/bitops/ffz.h b/kernel/include/asm-generic/bitops/ffz.h
index 6744bd4cd..0d010085f 100644
--- a/kernel/include/asm-generic/bitops/ffz.h
+++ b/kernel/include/asm-generic/bitops/ffz.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FFZ_H_
 #define _ASM_GENERIC_BITOPS_FFZ_H_
 
diff --git a/kernel/include/asm-generic/bitops/find.h b/kernel/include/asm-generic/bitops/find.h
index 998d4d544..1ba611e16 100644
--- a/kernel/include/asm-generic/bitops/find.h
+++ b/kernel/include/asm-generic/bitops/find.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FIND_H_
 #define _ASM_GENERIC_BITOPS_FIND_H_
 
diff --git a/kernel/include/asm-generic/bitops/fls.h b/kernel/include/asm-generic/bitops/fls.h
index 0576d1f42..753aecaab 100644
--- a/kernel/include/asm-generic/bitops/fls.h
+++ b/kernel/include/asm-generic/bitops/fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FLS_H_
 #define _ASM_GENERIC_BITOPS_FLS_H_
 
diff --git a/kernel/include/asm-generic/bitops/fls64.h b/kernel/include/asm-generic/bitops/fls64.h
index b097cf844..866f2b230 100644
--- a/kernel/include/asm-generic/bitops/fls64.h
+++ b/kernel/include/asm-generic/bitops/fls64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FLS64_H_
 #define _ASM_GENERIC_BITOPS_FLS64_H_
 
diff --git a/kernel/include/asm-generic/bitops/hweight.h b/kernel/include/asm-generic/bitops/hweight.h
index a94d6519c..6bf1bba83 100644
--- a/kernel/include/asm-generic/bitops/hweight.h
+++ b/kernel/include/asm-generic/bitops/hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_HWEIGHT_H_
 
diff --git a/kernel/include/asm-generic/bitops/le.h b/kernel/include/asm-generic/bitops/le.h
index 61731543c..188d3eba3 100644
--- a/kernel/include/asm-generic/bitops/le.h
+++ b/kernel/include/asm-generic/bitops/le.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_LE_H_
 #define _ASM_GENERIC_BITOPS_LE_H_
 
diff --git a/kernel/include/asm-generic/bitops/lock.h b/kernel/include/asm-generic/bitops/lock.h
index 8ef0ccbf8..bc397573c 100644
--- a/kernel/include/asm-generic/bitops/lock.h
+++ b/kernel/include/asm-generic/bitops/lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_LOCK_H_
 #define _ASM_GENERIC_BITOPS_LOCK_H_
 
diff --git a/kernel/include/asm-generic/bitops/non-atomic.h b/kernel/include/asm-generic/bitops/non-atomic.h
index 697cc2b7e..7e10c4b50 100644
--- a/kernel/include/asm-generic/bitops/non-atomic.h
+++ b/kernel/include/asm-generic/bitops/non-atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_NON_ATOMIC_H_
 #define _ASM_GENERIC_BITOPS_NON_ATOMIC_H_
 
diff --git a/kernel/include/asm-generic/bitops/sched.h b/kernel/include/asm-generic/bitops/sched.h
index 604fab703..86470cfce 100644
--- a/kernel/include/asm-generic/bitops/sched.h
+++ b/kernel/include/asm-generic/bitops/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_SCHED_H_
 #define _ASM_GENERIC_BITOPS_SCHED_H_
 
diff --git a/kernel/include/asm-generic/bitsperlong.h b/kernel/include/asm-generic/bitsperlong.h
index d1d70aa19..3905c1c93 100644
--- a/kernel/include/asm-generic/bitsperlong.h
+++ b/kernel/include/asm-generic/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_BITS_PER_LONG
 #define __ASM_GENERIC_BITS_PER_LONG
 
diff --git a/kernel/include/asm-generic/bug.h b/kernel/include/asm-generic/bug.h
index 87191357d..af2cc94a6 100644
--- a/kernel/include/asm-generic/bug.h
+++ b/kernel/include/asm-generic/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BUG_H
 #define _ASM_GENERIC_BUG_H
 
diff --git a/kernel/include/asm-generic/bugs.h b/kernel/include/asm-generic/bugs.h
index 6c4f62ea7..69021830f 100644
--- a/kernel/include/asm-generic/bugs.h
+++ b/kernel/include/asm-generic/bugs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_BUGS_H
 #define __ASM_GENERIC_BUGS_H
 /*
diff --git a/kernel/include/asm-generic/cache.h b/kernel/include/asm-generic/cache.h
index 1bfcfe5c2..60386e164 100644
--- a/kernel/include/asm-generic/cache.h
+++ b/kernel/include/asm-generic/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_CACHE_H
 #define __ASM_GENERIC_CACHE_H
 /*
diff --git a/kernel/include/asm-generic/cacheflush.h b/kernel/include/asm-generic/cacheflush.h
index 87bc536cc..0dd47a6db 100644
--- a/kernel/include/asm-generic/cacheflush.h
+++ b/kernel/include/asm-generic/cacheflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_CACHEFLUSH_H
 #define __ASM_CACHEFLUSH_H
 
diff --git a/kernel/include/asm-generic/checksum.h b/kernel/include/asm-generic/checksum.h
index 3150cbd8e..34785c0f5 100644
--- a/kernel/include/asm-generic/checksum.h
+++ b/kernel/include/asm-generic/checksum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_CHECKSUM_H
 #define __ASM_GENERIC_CHECKSUM_H
 
diff --git a/kernel/include/asm-generic/cmpxchg-local.h b/kernel/include/asm-generic/cmpxchg-local.h
index 70bef7891..f17f14f84 100644
--- a/kernel/include/asm-generic/cmpxchg-local.h
+++ b/kernel/include/asm-generic/cmpxchg-local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_CMPXCHG_LOCAL_H
 #define __ASM_GENERIC_CMPXCHG_LOCAL_H
 
diff --git a/kernel/include/asm-generic/cmpxchg.h b/kernel/include/asm-generic/cmpxchg.h
index e5f9080e8..9a24510cd 100644
--- a/kernel/include/asm-generic/cmpxchg.h
+++ b/kernel/include/asm-generic/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generic UP xchg and cmpxchg using interrupt disablement.  Does not
  * support SMP.
diff --git a/kernel/include/asm-generic/current.h b/kernel/include/asm-generic/current.h
index 5e86f6ae7..3a2e224b9 100644
--- a/kernel/include/asm-generic/current.h
+++ b/kernel/include/asm-generic/current.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_CURRENT_H
 #define __ASM_GENERIC_CURRENT_H
 
diff --git a/kernel/include/asm-generic/delay.h b/kernel/include/asm-generic/delay.h
index 0f79054ce..e448ac614 100644
--- a/kernel/include/asm-generic/delay.h
+++ b/kernel/include/asm-generic/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_DELAY_H
 #define __ASM_GENERIC_DELAY_H
 
diff --git a/kernel/include/asm-generic/div64.h b/kernel/include/asm-generic/div64.h
index 163f77999..d2013064d 100644
--- a/kernel/include/asm-generic/div64.h
+++ b/kernel/include/asm-generic/div64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_DIV64_H
 #define _ASM_GENERIC_DIV64_H
 /*
diff --git a/kernel/include/asm-generic/dma-contiguous.h b/kernel/include/asm-generic/dma-contiguous.h
index 292c57175..f24b0f9a4 100644
--- a/kernel/include/asm-generic/dma-contiguous.h
+++ b/kernel/include/asm-generic/dma-contiguous.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_DMA_CONTIGUOUS_H
 #define _ASM_GENERIC_DMA_CONTIGUOUS_H
 
diff --git a/kernel/include/asm-generic/dma.h b/kernel/include/asm-generic/dma.h
index 9dfc3a7f3..43d0c8af8 100644
--- a/kernel/include/asm-generic/dma.h
+++ b/kernel/include/asm-generic/dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_DMA_H
 #define __ASM_GENERIC_DMA_H
 /*
diff --git a/kernel/include/asm-generic/early_ioremap.h b/kernel/include/asm-generic/early_ioremap.h
index 2edef8d7f..9def22e6e 100644
--- a/kernel/include/asm-generic/early_ioremap.h
+++ b/kernel/include/asm-generic/early_ioremap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_EARLY_IOREMAP_H_
 #define _ASM_EARLY_IOREMAP_H_
 
diff --git a/kernel/include/asm-generic/emergency-restart.h b/kernel/include/asm-generic/emergency-restart.h
index 0d68a1eae..445de38b7 100644
--- a/kernel/include/asm-generic/emergency-restart.h
+++ b/kernel/include/asm-generic/emergency-restart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
 #define _ASM_GENERIC_EMERGENCY_RESTART_H
 
diff --git a/kernel/include/asm-generic/extable.h b/kernel/include/asm-generic/extable.h
index ca14c6664..f9618bd07 100644
--- a/kernel/include/asm-generic/extable.h
+++ b/kernel/include/asm-generic/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_EXTABLE_H
 #define __ASM_GENERIC_EXTABLE_H
 
diff --git a/kernel/include/asm-generic/fb.h b/kernel/include/asm-generic/fb.h
index fe8ca7fce..f9f18101e 100644
--- a/kernel/include/asm-generic/fb.h
+++ b/kernel/include/asm-generic/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_FB_H_
 #define __ASM_GENERIC_FB_H_
 #include <linux/fb.h>
diff --git a/kernel/include/asm-generic/futex.h b/kernel/include/asm-generic/futex.h
index f0d8b1c51..fcb61b465 100644
--- a/kernel/include/asm-generic/futex.h
+++ b/kernel/include/asm-generic/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_FUTEX_H
 #define _ASM_GENERIC_FUTEX_H
 
diff --git a/kernel/include/asm-generic/getorder.h b/kernel/include/asm-generic/getorder.h
index 65e4468ac..c64bea7a5 100644
--- a/kernel/include/asm-generic/getorder.h
+++ b/kernel/include/asm-generic/getorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_GETORDER_H
 #define __ASM_GENERIC_GETORDER_H
 
diff --git a/kernel/include/asm-generic/gpio.h b/kernel/include/asm-generic/gpio.h
index 8ca627dce..19eadac41 100644
--- a/kernel/include/asm-generic/gpio.h
+++ b/kernel/include/asm-generic/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_GPIO_H
 #define _ASM_GENERIC_GPIO_H
 
diff --git a/kernel/include/asm-generic/hardirq.h b/kernel/include/asm-generic/hardirq.h
index 04d0a977c..d14214dfc 100644
--- a/kernel/include/asm-generic/hardirq.h
+++ b/kernel/include/asm-generic/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_HARDIRQ_H
 #define __ASM_GENERIC_HARDIRQ_H
 
diff --git a/kernel/include/asm-generic/hugetlb.h b/kernel/include/asm-generic/hugetlb.h
index 540354f94..9d0cde8ab 100644
--- a/kernel/include/asm-generic/hugetlb.h
+++ b/kernel/include/asm-generic/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_HUGETLB_H
 #define _ASM_GENERIC_HUGETLB_H
 
diff --git a/kernel/include/asm-generic/ide_iops.h b/kernel/include/asm-generic/ide_iops.h
index 1b91d0681..81dfa3ee5 100644
--- a/kernel/include/asm-generic/ide_iops.h
+++ b/kernel/include/asm-generic/ide_iops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Generic I/O and MEMIO string operations.  */
 
 #define __ide_insw	insw
diff --git a/kernel/include/asm-generic/int-ll64.h b/kernel/include/asm-generic/int-ll64.h
index 4cd84855c..ffb68d67b 100644
--- a/kernel/include/asm-generic/int-ll64.h
+++ b/kernel/include/asm-generic/int-ll64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * asm-generic/int-ll64.h
  *
diff --git a/kernel/include/asm-generic/ioctl.h b/kernel/include/asm-generic/ioctl.h
index 297fb0d7c..9fda9ed00 100644
--- a/kernel/include/asm-generic/ioctl.h
+++ b/kernel/include/asm-generic/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_IOCTL_H
 #define _ASM_GENERIC_IOCTL_H
 
diff --git a/kernel/include/asm-generic/iomap.h b/kernel/include/asm-generic/iomap.h
index 650fede33..5b63b94ef 100644
--- a/kernel/include/asm-generic/iomap.h
+++ b/kernel/include/asm-generic/iomap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GENERIC_IO_H
 #define __GENERIC_IO_H
 
diff --git a/kernel/include/asm-generic/irq.h b/kernel/include/asm-generic/irq.h
index b90ec0bc4..da21de991 100644
--- a/kernel/include/asm-generic/irq.h
+++ b/kernel/include/asm-generic/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_IRQ_H
 #define __ASM_GENERIC_IRQ_H
 
diff --git a/kernel/include/asm-generic/irq_work.h b/kernel/include/asm-generic/irq_work.h
index a44f452c6..d5dce06f7 100644
--- a/kernel/include/asm-generic/irq_work.h
+++ b/kernel/include/asm-generic/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_IRQ_WORK_H
 #define __ASM_IRQ_WORK_H
 
diff --git a/kernel/include/asm-generic/irqflags.h b/kernel/include/asm-generic/irqflags.h
index 1f40d0024..19ccbf483 100644
--- a/kernel/include/asm-generic/irqflags.h
+++ b/kernel/include/asm-generic/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_IRQFLAGS_H
 #define __ASM_GENERIC_IRQFLAGS_H
 
diff --git a/kernel/include/asm-generic/kdebug.h b/kernel/include/asm-generic/kdebug.h
index d1814497b..2b10b31b0 100644
--- a/kernel/include/asm-generic/kdebug.h
+++ b/kernel/include/asm-generic/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_KDEBUG_H
 #define _ASM_GENERIC_KDEBUG_H
 
diff --git a/kernel/include/asm-generic/kmap_types.h b/kernel/include/asm-generic/kmap_types.h
index 90f99c74d..9f95b7b63 100644
--- a/kernel/include/asm-generic/kmap_types.h
+++ b/kernel/include/asm-generic/kmap_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_KMAP_TYPES_H
 #define _ASM_GENERIC_KMAP_TYPES_H
 
diff --git a/kernel/include/asm-generic/kprobes.h b/kernel/include/asm-generic/kprobes.h
index 57af9f21d..4a982089c 100644
--- a/kernel/include/asm-generic/kprobes.h
+++ b/kernel/include/asm-generic/kprobes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_KPROBES_H
 #define _ASM_GENERIC_KPROBES_H
 
diff --git a/kernel/include/asm-generic/kvm_para.h b/kernel/include/asm-generic/kvm_para.h
index fa25becbd..18c6abe81 100644
--- a/kernel/include/asm-generic/kvm_para.h
+++ b/kernel/include/asm-generic/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_KVM_PARA_H
 #define _ASM_GENERIC_KVM_PARA_H
 
diff --git a/kernel/include/asm-generic/local.h b/kernel/include/asm-generic/local.h
index 9ceb03b4f..fca7f1d84 100644
--- a/kernel/include/asm-generic/local.h
+++ b/kernel/include/asm-generic/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_LOCAL_H
 #define _ASM_GENERIC_LOCAL_H
 
diff --git a/kernel/include/asm-generic/local64.h b/kernel/include/asm-generic/local64.h
index 5980002b8..765be0b7d 100644
--- a/kernel/include/asm-generic/local64.h
+++ b/kernel/include/asm-generic/local64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_LOCAL64_H
 #define _ASM_GENERIC_LOCAL64_H
 
diff --git a/kernel/include/asm-generic/memory_model.h b/kernel/include/asm-generic/memory_model.h
index 5148150cc..7637fb46b 100644
--- a/kernel/include/asm-generic/memory_model.h
+++ b/kernel/include/asm-generic/memory_model.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MEMORY_MODEL_H
 #define __ASM_MEMORY_MODEL_H
 
diff --git a/kernel/include/asm-generic/mm_hooks.h b/kernel/include/asm-generic/mm_hooks.h
index 41e5b6784..ea189d88a 100644
--- a/kernel/include/asm-generic/mm_hooks.h
+++ b/kernel/include/asm-generic/mm_hooks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Define generic no-op hooks for arch_dup_mmap, arch_exit_mmap
  * and arch_unmap to be included in asm-FOO/mmu_context.h for any
diff --git a/kernel/include/asm-generic/mmu.h b/kernel/include/asm-generic/mmu.h
index 0ed3f1cfb..061838037 100644
--- a/kernel/include/asm-generic/mmu.h
+++ b/kernel/include/asm-generic/mmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_MMU_H
 #define __ASM_GENERIC_MMU_H
 
diff --git a/kernel/include/asm-generic/mmu_context.h b/kernel/include/asm-generic/mmu_context.h
index a7eec910b..6be9106fb 100644
--- a/kernel/include/asm-generic/mmu_context.h
+++ b/kernel/include/asm-generic/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_MMU_CONTEXT_H
 #define __ASM_GENERIC_MMU_CONTEXT_H
 
diff --git a/kernel/include/asm-generic/module.h b/kernel/include/asm-generic/module.h
index 14dc41d18..98e1541b7 100644
--- a/kernel/include/asm-generic/module.h
+++ b/kernel/include/asm-generic/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_MODULE_H
 #define __ASM_GENERIC_MODULE_H
 
diff --git a/kernel/include/asm-generic/msi.h b/kernel/include/asm-generic/msi.h
index 61c58d887..e6795f088 100644
--- a/kernel/include/asm-generic/msi.h
+++ b/kernel/include/asm-generic/msi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_MSI_H
 #define __ASM_GENERIC_MSI_H
 
diff --git a/kernel/include/asm-generic/page.h b/kernel/include/asm-generic/page.h
index 67cfb7dbc..27bf3377b 100644
--- a/kernel/include/asm-generic/page.h
+++ b/kernel/include/asm-generic/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_PAGE_H
 #define __ASM_GENERIC_PAGE_H
 /*
diff --git a/kernel/include/asm-generic/param.h b/kernel/include/asm-generic/param.h
index 04e715bcc..8d3009dd2 100644
--- a/kernel/include/asm-generic/param.h
+++ b/kernel/include/asm-generic/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_PARAM_H
 #define __ASM_GENERIC_PARAM_H
 
diff --git a/kernel/include/asm-generic/parport.h b/kernel/include/asm-generic/parport.h
index 2c9f9d433..483991d61 100644
--- a/kernel/include/asm-generic/parport.h
+++ b/kernel/include/asm-generic/parport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_PARPORT_H
 #define __ASM_GENERIC_PARPORT_H
 
diff --git a/kernel/include/asm-generic/pci.h b/kernel/include/asm-generic/pci.h
index f24bc519b..830d76592 100644
--- a/kernel/include/asm-generic/pci.h
+++ b/kernel/include/asm-generic/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/asm-generic/pci.h
  *
diff --git a/kernel/include/asm-generic/percpu.h b/kernel/include/asm-generic/percpu.h
index 976f8ac26..1817a8415 100644
--- a/kernel/include/asm-generic/percpu.h
+++ b/kernel/include/asm-generic/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_PERCPU_H_
 #define _ASM_GENERIC_PERCPU_H_
 
diff --git a/kernel/include/asm-generic/pgalloc.h b/kernel/include/asm-generic/pgalloc.h
index 9e429d08b..948714c15 100644
--- a/kernel/include/asm-generic/pgalloc.h
+++ b/kernel/include/asm-generic/pgalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_PGALLOC_H
 #define __ASM_GENERIC_PGALLOC_H
 /*
diff --git a/kernel/include/asm-generic/pgtable-nop4d-hack.h b/kernel/include/asm-generic/pgtable-nop4d-hack.h
index 752fb7511..0c3421526 100644
--- a/kernel/include/asm-generic/pgtable-nop4d-hack.h
+++ b/kernel/include/asm-generic/pgtable-nop4d-hack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PGTABLE_NOP4D_HACK_H
 #define _PGTABLE_NOP4D_HACK_H
 
diff --git a/kernel/include/asm-generic/pgtable-nop4d.h b/kernel/include/asm-generic/pgtable-nop4d.h
index de364ecb8..8f22f55de 100644
--- a/kernel/include/asm-generic/pgtable-nop4d.h
+++ b/kernel/include/asm-generic/pgtable-nop4d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PGTABLE_NOP4D_H
 #define _PGTABLE_NOP4D_H
 
diff --git a/kernel/include/asm-generic/pgtable-nopmd.h b/kernel/include/asm-generic/pgtable-nopmd.h
index 725612b79..f35f6e814 100644
--- a/kernel/include/asm-generic/pgtable-nopmd.h
+++ b/kernel/include/asm-generic/pgtable-nopmd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PGTABLE_NOPMD_H
 #define _PGTABLE_NOPMD_H
 
diff --git a/kernel/include/asm-generic/pgtable-nopud.h b/kernel/include/asm-generic/pgtable-nopud.h
index c2b9b96d6..e950b9c50 100644
--- a/kernel/include/asm-generic/pgtable-nopud.h
+++ b/kernel/include/asm-generic/pgtable-nopud.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PGTABLE_NOPUD_H
 #define _PGTABLE_NOPUD_H
 
diff --git a/kernel/include/asm-generic/pgtable.h b/kernel/include/asm-generic/pgtable.h
index 8e0243036..757dc6ffc 100644
--- a/kernel/include/asm-generic/pgtable.h
+++ b/kernel/include/asm-generic/pgtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_PGTABLE_H
 #define _ASM_GENERIC_PGTABLE_H
 
diff --git a/kernel/include/asm-generic/preempt.h b/kernel/include/asm-generic/preempt.h
index c1cde3577..c3046c920 100644
--- a/kernel/include/asm-generic/preempt.h
+++ b/kernel/include/asm-generic/preempt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_PREEMPT_H
 #define __ASM_PREEMPT_H
 
diff --git a/kernel/include/asm-generic/qrwlock_types.h b/kernel/include/asm-generic/qrwlock_types.h
index 0abc6b606..d93573eff 100644
--- a/kernel/include/asm-generic/qrwlock_types.h
+++ b/kernel/include/asm-generic/qrwlock_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_QRWLOCK_TYPES_H
 #define __ASM_GENERIC_QRWLOCK_TYPES_H
 
diff --git a/kernel/include/asm-generic/resource.h b/kernel/include/asm-generic/resource.h
index 5e752b959..8874f681b 100644
--- a/kernel/include/asm-generic/resource.h
+++ b/kernel/include/asm-generic/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_RESOURCE_H
 #define _ASM_GENERIC_RESOURCE_H
 
diff --git a/kernel/include/asm-generic/rwsem.h b/kernel/include/asm-generic/rwsem.h
index 6c6a2141f..bdbe43bac 100644
--- a/kernel/include/asm-generic/rwsem.h
+++ b/kernel/include/asm-generic/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_RWSEM_H
 #define _ASM_GENERIC_RWSEM_H
 
diff --git a/kernel/include/asm-generic/sections.h b/kernel/include/asm-generic/sections.h
index e5da44edd..6d9576931 100644
--- a/kernel/include/asm-generic/sections.h
+++ b/kernel/include/asm-generic/sections.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_SECTIONS_H_
 #define _ASM_GENERIC_SECTIONS_H_
 
diff --git a/kernel/include/asm-generic/serial.h b/kernel/include/asm-generic/serial.h
index 5e291090f..ca9f7b6be 100644
--- a/kernel/include/asm-generic/serial.h
+++ b/kernel/include/asm-generic/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_SERIAL_H
 #define __ASM_GENERIC_SERIAL_H
 
diff --git a/kernel/include/asm-generic/set_memory.h b/kernel/include/asm-generic/set_memory.h
index 83e81f899..c86abf6bc 100644
--- a/kernel/include/asm-generic/set_memory.h
+++ b/kernel/include/asm-generic/set_memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SET_MEMORY_H
 #define __ASM_SET_MEMORY_H
 
diff --git a/kernel/include/asm-generic/signal.h b/kernel/include/asm-generic/signal.h
index d840c90a1..c53984fa9 100644
--- a/kernel/include/asm-generic/signal.h
+++ b/kernel/include/asm-generic/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_SIGNAL_H
 #define __ASM_GENERIC_SIGNAL_H
 
diff --git a/kernel/include/asm-generic/simd.h b/kernel/include/asm-generic/simd.h
index f57eb7b5c..d0343d58a 100644
--- a/kernel/include/asm-generic/simd.h
+++ b/kernel/include/asm-generic/simd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/hardirq.h>
 
diff --git a/kernel/include/asm-generic/spinlock.h b/kernel/include/asm-generic/spinlock.h
index 1547a03ac..adaf6acab 100644
--- a/kernel/include/asm-generic/spinlock.h
+++ b/kernel/include/asm-generic/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_SPINLOCK_H
 #define __ASM_GENERIC_SPINLOCK_H
 /*
diff --git a/kernel/include/asm-generic/statfs.h b/kernel/include/asm-generic/statfs.h
index 4b934e9ec..f88dcd8ed 100644
--- a/kernel/include/asm-generic/statfs.h
+++ b/kernel/include/asm-generic/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GENERIC_STATFS_H
 #define _GENERIC_STATFS_H
 
diff --git a/kernel/include/asm-generic/syscalls.h b/kernel/include/asm-generic/syscalls.h
index 1f74be511..933ca6581 100644
--- a/kernel/include/asm-generic/syscalls.h
+++ b/kernel/include/asm-generic/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_SYSCALLS_H
 #define __ASM_GENERIC_SYSCALLS_H
 
diff --git a/kernel/include/asm-generic/termios-base.h b/kernel/include/asm-generic/termios-base.h
index 157bbf6f4..59c5a3bd4 100644
--- a/kernel/include/asm-generic/termios-base.h
+++ b/kernel/include/asm-generic/termios-base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* termios.h: generic termios/termio user copying/translation
  */
 
diff --git a/kernel/include/asm-generic/termios.h b/kernel/include/asm-generic/termios.h
index 8c13a16b0..b1398d0d4 100644
--- a/kernel/include/asm-generic/termios.h
+++ b/kernel/include/asm-generic/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_TERMIOS_H
 #define _ASM_GENERIC_TERMIOS_H
 
diff --git a/kernel/include/asm-generic/timex.h b/kernel/include/asm-generic/timex.h
index b2243cb8d..50ba9b5ce 100644
--- a/kernel/include/asm-generic/timex.h
+++ b/kernel/include/asm-generic/timex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_TIMEX_H
 #define __ASM_GENERIC_TIMEX_H
 
diff --git a/kernel/include/asm-generic/tlbflush.h b/kernel/include/asm-generic/tlbflush.h
index d6d0a8843..dc2669289 100644
--- a/kernel/include/asm-generic/tlbflush.h
+++ b/kernel/include/asm-generic/tlbflush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_TLBFLUSH_H
 #define __ASM_GENERIC_TLBFLUSH_H
 /*
diff --git a/kernel/include/asm-generic/trace_clock.h b/kernel/include/asm-generic/trace_clock.h
index 6726f1baf..cbbca2959 100644
--- a/kernel/include/asm-generic/trace_clock.h
+++ b/kernel/include/asm-generic/trace_clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_TRACE_CLOCK_H
 #define _ASM_GENERIC_TRACE_CLOCK_H
 /*
diff --git a/kernel/include/asm-generic/uaccess.h b/kernel/include/asm-generic/uaccess.h
index 2e51f6e7b..6b2e63df2 100644
--- a/kernel/include/asm-generic/uaccess.h
+++ b/kernel/include/asm-generic/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_UACCESS_H
 #define __ASM_GENERIC_UACCESS_H
 
diff --git a/kernel/include/asm-generic/unaligned.h b/kernel/include/asm-generic/unaligned.h
index 1ac097279..374c940e9 100644
--- a/kernel/include/asm-generic/unaligned.h
+++ b/kernel/include/asm-generic/unaligned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_UNALIGNED_H
 #define __ASM_GENERIC_UNALIGNED_H
 
diff --git a/kernel/include/asm-generic/unistd.h b/kernel/include/asm-generic/unistd.h
index cccc86ecf..cdf904265 100644
--- a/kernel/include/asm-generic/unistd.h
+++ b/kernel/include/asm-generic/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <uapi/asm-generic/unistd.h>
 #include <linux/export.h>
 
diff --git a/kernel/include/asm-generic/vga.h b/kernel/include/asm-generic/vga.h
index 36c8ff520..adf91a783 100644
--- a/kernel/include/asm-generic/vga.h
+++ b/kernel/include/asm-generic/vga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Access to VGA videoram
  *
diff --git a/kernel/include/asm-generic/word-at-a-time.h b/kernel/include/asm-generic/word-at-a-time.h
index 011dde083..20c93f08c 100644
--- a/kernel/include/asm-generic/word-at-a-time.h
+++ b/kernel/include/asm-generic/word-at-a-time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_WORD_AT_A_TIME_H
 #define _ASM_WORD_AT_A_TIME_H
 
diff --git a/kernel/include/clocksource/timer-sp804.h b/kernel/include/clocksource/timer-sp804.h
index 7654d7124..a5b41f31a 100644
--- a/kernel/include/clocksource/timer-sp804.h
+++ b/kernel/include/clocksource/timer-sp804.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CLKSOURCE_TIMER_SP804_H
 #define __CLKSOURCE_TIMER_SP804_H
 
diff --git a/kernel/include/crypto/ablk_helper.h b/kernel/include/crypto/ablk_helper.h
index 4f93df50c..4e655c2a4 100644
--- a/kernel/include/crypto/ablk_helper.h
+++ b/kernel/include/crypto/ablk_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared async block cipher helpers
  */
diff --git a/kernel/include/crypto/aes.h b/kernel/include/crypto/aes.h
index 7524ba3b6..852eaa9cd 100644
--- a/kernel/include/crypto/aes.h
+++ b/kernel/include/crypto/aes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for AES algorithms
  */
diff --git a/kernel/include/crypto/blowfish.h b/kernel/include/crypto/blowfish.h
index 1450d4a27..9b384670b 100644
--- a/kernel/include/crypto/blowfish.h
+++ b/kernel/include/crypto/blowfish.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for blowfish algorithms
  */
diff --git a/kernel/include/crypto/cast5.h b/kernel/include/crypto/cast5.h
index 14fbf39d6..3d4ed4ea9 100644
--- a/kernel/include/crypto/cast5.h
+++ b/kernel/include/crypto/cast5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_CAST5_H
 #define _CRYPTO_CAST5_H
 
diff --git a/kernel/include/crypto/cast6.h b/kernel/include/crypto/cast6.h
index 32b60eb8b..c71f6ef47 100644
--- a/kernel/include/crypto/cast6.h
+++ b/kernel/include/crypto/cast6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_CAST6_H
 #define _CRYPTO_CAST6_H
 
diff --git a/kernel/include/crypto/cast_common.h b/kernel/include/crypto/cast_common.h
index b7df35cd9..b90090244 100644
--- a/kernel/include/crypto/cast_common.h
+++ b/kernel/include/crypto/cast_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_CAST_COMMON_H
 #define _CRYPTO_CAST_COMMON_H
 
diff --git a/kernel/include/crypto/chacha20.h b/kernel/include/crypto/chacha20.h
index 445fc45f4..caaa47038 100644
--- a/kernel/include/crypto/chacha20.h
+++ b/kernel/include/crypto/chacha20.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for the ChaCha20 algorithm
  */
diff --git a/kernel/include/crypto/cryptd.h b/kernel/include/crypto/cryptd.h
index 94418cbf9..1e64f354c 100644
--- a/kernel/include/crypto/cryptd.h
+++ b/kernel/include/crypto/cryptd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Software async crypto daemon
  *
diff --git a/kernel/include/crypto/crypto_wq.h b/kernel/include/crypto/crypto_wq.h
index a7d252daf..23114746a 100644
--- a/kernel/include/crypto/crypto_wq.h
+++ b/kernel/include/crypto/crypto_wq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CRYPTO_WQ_H
 #define CRYPTO_WQ_H
 
diff --git a/kernel/include/crypto/des.h b/kernel/include/crypto/des.h
index fc6274c6b..d4094d58a 100644
--- a/kernel/include/crypto/des.h
+++ b/kernel/include/crypto/des.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* 
  * DES & Triple DES EDE Cipher Algorithms.
  */
diff --git a/kernel/include/crypto/ghash.h b/kernel/include/crypto/ghash.h
index 2a61c9bba..913630106 100644
--- a/kernel/include/crypto/ghash.h
+++ b/kernel/include/crypto/ghash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for GHASH algorithms
  */
diff --git a/kernel/include/crypto/hmac.h b/kernel/include/crypto/hmac.h
index ef09f7938..66774132a 100644
--- a/kernel/include/crypto/hmac.h
+++ b/kernel/include/crypto/hmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_HMAC_H
 #define _CRYPTO_HMAC_H
 
diff --git a/kernel/include/crypto/internal/simd.h b/kernel/include/crypto/internal/simd.h
index 429509968..32ceb6929 100644
--- a/kernel/include/crypto/internal/simd.h
+++ b/kernel/include/crypto/internal/simd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared crypto simd helpers
  */
diff --git a/kernel/include/crypto/lrw.h b/kernel/include/crypto/lrw.h
index 25a2c8716..a9d44c06d 100644
--- a/kernel/include/crypto/lrw.h
+++ b/kernel/include/crypto/lrw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_LRW_H
 #define _CRYPTO_LRW_H
 
diff --git a/kernel/include/crypto/mcryptd.h b/kernel/include/crypto/mcryptd.h
index 4a53c0d38..cceafa01f 100644
--- a/kernel/include/crypto/mcryptd.h
+++ b/kernel/include/crypto/mcryptd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Software async multibuffer crypto daemon headers
  *
diff --git a/kernel/include/crypto/md5.h b/kernel/include/crypto/md5.h
index 327deac96..cf9e9dec3 100644
--- a/kernel/include/crypto/md5.h
+++ b/kernel/include/crypto/md5.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_MD5_H
 #define _CRYPTO_MD5_H
 
diff --git a/kernel/include/crypto/null.h b/kernel/include/crypto/null.h
index 3f0c59fb0..5757c0a4b 100644
--- a/kernel/include/crypto/null.h
+++ b/kernel/include/crypto/null.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Values for NULL algorithms */
 
 #ifndef _CRYPTO_NULL_H
diff --git a/kernel/include/crypto/poly1305.h b/kernel/include/crypto/poly1305.h
index 894df59b7..c65567d01 100644
--- a/kernel/include/crypto/poly1305.h
+++ b/kernel/include/crypto/poly1305.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for the Poly1305 algorithm
  */
diff --git a/kernel/include/crypto/serpent.h b/kernel/include/crypto/serpent.h
index b7e0941eb..7dd780c5d 100644
--- a/kernel/include/crypto/serpent.h
+++ b/kernel/include/crypto/serpent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for serpent algorithms
  */
diff --git a/kernel/include/crypto/sha.h b/kernel/include/crypto/sha.h
index c94d3eb1c..0555b571d 100644
--- a/kernel/include/crypto/sha.h
+++ b/kernel/include/crypto/sha.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for SHA algorithms
  */
diff --git a/kernel/include/crypto/sha3.h b/kernel/include/crypto/sha3.h
index f4c9f68f5..b9d9bd553 100644
--- a/kernel/include/crypto/sha3.h
+++ b/kernel/include/crypto/sha3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common values for SHA-3 algorithms
  */
diff --git a/kernel/include/crypto/twofish.h b/kernel/include/crypto/twofish.h
index 095c901a8..2e2c09673 100644
--- a/kernel/include/crypto/twofish.h
+++ b/kernel/include/crypto/twofish.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_TWOFISH_H
 #define _CRYPTO_TWOFISH_H
 
diff --git a/kernel/include/crypto/xts.h b/kernel/include/crypto/xts.h
index c0bde308b..322aab6e7 100644
--- a/kernel/include/crypto/xts.h
+++ b/kernel/include/crypto/xts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CRYPTO_XTS_H
 #define _CRYPTO_XTS_H
 
diff --git a/kernel/include/drm/ati_pcigart.h b/kernel/include/drm/ati_pcigart.h
index 5765648b5..a728a1364 100644
--- a/kernel/include/drm/ati_pcigart.h
+++ b/kernel/include/drm/ati_pcigart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DRM_ATI_PCIGART_H
 #define DRM_ATI_PCIGART_H
 
diff --git a/kernel/include/drm/drm_agpsupport.h b/kernel/include/drm/drm_agpsupport.h
index b2d912670..b05e46227 100644
--- a/kernel/include/drm/drm_agpsupport.h
+++ b/kernel/include/drm/drm_agpsupport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DRM_AGPSUPPORT_H_
 #define _DRM_AGPSUPPORT_H_
 
diff --git a/kernel/include/drm/drm_fb_cma_helper.h b/kernel/include/drm/drm_fb_cma_helper.h
index a323781af..1df291d11 100644
--- a/kernel/include/drm/drm_fb_cma_helper.h
+++ b/kernel/include/drm/drm_fb_cma_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRM_FB_CMA_HELPER_H__
 #define __DRM_FB_CMA_HELPER_H__
 
diff --git a/kernel/include/drm/drm_gem_cma_helper.h b/kernel/include/drm/drm_gem_cma_helper.h
index 58a739bf1..520e3feb5 100644
--- a/kernel/include/drm/drm_gem_cma_helper.h
+++ b/kernel/include/drm/drm_gem_cma_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRM_GEM_CMA_HELPER_H__
 #define __DRM_GEM_CMA_HELPER_H__
 
diff --git a/kernel/include/drm/drm_of.h b/kernel/include/drm/drm_of.h
index 104dd517f..4f835490d 100644
--- a/kernel/include/drm/drm_of.h
+++ b/kernel/include/drm/drm_of.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRM_OF_H__
 #define __DRM_OF_H__
 
diff --git a/kernel/include/drm/drm_os_linux.h b/kernel/include/drm/drm_os_linux.h
index 10122353b..ee8d61b64 100644
--- a/kernel/include/drm/drm_os_linux.h
+++ b/kernel/include/drm/drm_os_linux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
  * \file drm_os_linux.h
  * OS abstraction macros.
diff --git a/kernel/include/drm/drm_pciids.h b/kernel/include/drm/drm_pciids.h
index 8bc073d29..683742826 100644
--- a/kernel/include/drm/drm_pciids.h
+++ b/kernel/include/drm/drm_pciids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define radeon_PCI_IDS \
 	{0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
 	{0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
diff --git a/kernel/include/drm/drm_sysfs.h b/kernel/include/drm/drm_sysfs.h
index 70c9a1074..4f311e836 100644
--- a/kernel/include/drm/drm_sysfs.h
+++ b/kernel/include/drm/drm_sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DRM_SYSFS_H_
 #define _DRM_SYSFS_H_
 
diff --git a/kernel/include/drm/i2c/tda998x.h b/kernel/include/drm/i2c/tda998x.h
index a25483090..3cb25ccbe 100644
--- a/kernel/include/drm/i2c/tda998x.h
+++ b/kernel/include/drm/i2c/tda998x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DRM_I2C_TDA998X_H__
 #define __DRM_I2C_TDA998X_H__
 
diff --git a/kernel/include/drm/intel-gtt.h b/kernel/include/drm/intel-gtt.h
index b3bf717cf..c5db7975c 100644
--- a/kernel/include/drm/intel-gtt.h
+++ b/kernel/include/drm/intel-gtt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Common header for intel-gtt.ko and i915.ko */
 
 #ifndef _DRM_INTEL_GTT_H
diff --git a/kernel/include/dt-bindings/clock/berlin2.h b/kernel/include/dt-bindings/clock/berlin2.h
index 0c3080017..b07b8efab 100644
--- a/kernel/include/dt-bindings/clock/berlin2.h
+++ b/kernel/include/dt-bindings/clock/berlin2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Berlin2 BG2/BG2CD clock tree IDs
  */
diff --git a/kernel/include/dt-bindings/clock/berlin2q.h b/kernel/include/dt-bindings/clock/berlin2q.h
index 72eaf91c9..44b4ac382 100644
--- a/kernel/include/dt-bindings/clock/berlin2q.h
+++ b/kernel/include/dt-bindings/clock/berlin2q.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Berlin2 BG2Q clock tree IDs
  */
diff --git a/kernel/include/dt-bindings/clock/cortina,gemini-clock.h b/kernel/include/dt-bindings/clock/cortina,gemini-clock.h
index acf5cd550..04c3404b2 100644
--- a/kernel/include/dt-bindings/clock/cortina,gemini-clock.h
+++ b/kernel/include/dt-bindings/clock/cortina,gemini-clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DT_BINDINGS_CORTINA_GEMINI_CLOCK_H
 #define DT_BINDINGS_CORTINA_GEMINI_CLOCK_H
 
diff --git a/kernel/include/dt-bindings/clock/efm32-cmu.h b/kernel/include/dt-bindings/clock/efm32-cmu.h
index b21b91e73..4b48d15fe 100644
--- a/kernel/include/dt-bindings/clock/efm32-cmu.h
+++ b/kernel/include/dt-bindings/clock/efm32-cmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_BINDINGS_CLOCK_EFM32_CMU_H
 #define __DT_BINDINGS_CLOCK_EFM32_CMU_H
 
diff --git a/kernel/include/dt-bindings/clock/exynos-audss-clk.h b/kernel/include/dt-bindings/clock/exynos-audss-clk.h
index 0ae6f5a75..eee9fcc6e 100644
--- a/kernel/include/dt-bindings/clock/exynos-audss-clk.h
+++ b/kernel/include/dt-bindings/clock/exynos-audss-clk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for Samsung audio subsystem
  * clock controller.
diff --git a/kernel/include/dt-bindings/clock/gxbb-clkc.h b/kernel/include/dt-bindings/clock/gxbb-clkc.h
index c04a76d8f..8c92528aa 100644
--- a/kernel/include/dt-bindings/clock/gxbb-clkc.h
+++ b/kernel/include/dt-bindings/clock/gxbb-clkc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * GXBB clock tree IDs
  */
diff --git a/kernel/include/dt-bindings/clock/jz4740-cgu.h b/kernel/include/dt-bindings/clock/jz4740-cgu.h
index 43153d3e9..6ed83f926 100644
--- a/kernel/include/dt-bindings/clock/jz4740-cgu.h
+++ b/kernel/include/dt-bindings/clock/jz4740-cgu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides clock numbers for the ingenic,jz4740-cgu DT binding.
  *
diff --git a/kernel/include/dt-bindings/clock/jz4780-cgu.h b/kernel/include/dt-bindings/clock/jz4780-cgu.h
index 467165e3c..1859ce53e 100644
--- a/kernel/include/dt-bindings/clock/jz4780-cgu.h
+++ b/kernel/include/dt-bindings/clock/jz4780-cgu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides clock numbers for the ingenic,jz4780-cgu DT binding.
  *
diff --git a/kernel/include/dt-bindings/clock/marvell,mmp2.h b/kernel/include/dt-bindings/clock/marvell,mmp2.h
index 7a510384a..228a5e234 100644
--- a/kernel/include/dt-bindings/clock/marvell,mmp2.h
+++ b/kernel/include/dt-bindings/clock/marvell,mmp2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DTS_MARVELL_MMP2_CLOCK_H
 #define __DTS_MARVELL_MMP2_CLOCK_H
 
diff --git a/kernel/include/dt-bindings/clock/marvell,pxa168.h b/kernel/include/dt-bindings/clock/marvell,pxa168.h
index 3e45bdfe1..caf90436b 100644
--- a/kernel/include/dt-bindings/clock/marvell,pxa168.h
+++ b/kernel/include/dt-bindings/clock/marvell,pxa168.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DTS_MARVELL_PXA168_CLOCK_H
 #define __DTS_MARVELL_PXA168_CLOCK_H
 
diff --git a/kernel/include/dt-bindings/clock/marvell,pxa1928.h b/kernel/include/dt-bindings/clock/marvell,pxa1928.h
index d4f2e1891..5dca48202 100644
--- a/kernel/include/dt-bindings/clock/marvell,pxa1928.h
+++ b/kernel/include/dt-bindings/clock/marvell,pxa1928.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DTS_MARVELL_PXA1928_CLOCK_H
 #define __DTS_MARVELL_PXA1928_CLOCK_H
 
diff --git a/kernel/include/dt-bindings/clock/marvell,pxa910.h b/kernel/include/dt-bindings/clock/marvell,pxa910.h
index 135082a0b..7bf462389 100644
--- a/kernel/include/dt-bindings/clock/marvell,pxa910.h
+++ b/kernel/include/dt-bindings/clock/marvell,pxa910.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DTS_MARVELL_PXA910_CLOCK_H
 #define __DTS_MARVELL_PXA910_CLOCK_H
 
diff --git a/kernel/include/dt-bindings/clock/meson8b-clkc.h b/kernel/include/dt-bindings/clock/meson8b-clkc.h
index a9c030633..dea9d46d4 100644
--- a/kernel/include/dt-bindings/clock/meson8b-clkc.h
+++ b/kernel/include/dt-bindings/clock/meson8b-clkc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Meson8b clock tree IDs
  */
diff --git a/kernel/include/dt-bindings/clock/mpc512x-clock.h b/kernel/include/dt-bindings/clock/mpc512x-clock.h
index 4f9491932..13c316bf2 100644
--- a/kernel/include/dt-bindings/clock/mpc512x-clock.h
+++ b/kernel/include/dt-bindings/clock/mpc512x-clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for MPC512x clock specs in DT bindings.
  */
diff --git a/kernel/include/dt-bindings/clock/rockchip,rk808.h b/kernel/include/dt-bindings/clock/rockchip,rk808.h
index 1a873432f..75dabfc6a 100644
--- a/kernel/include/dt-bindings/clock/rockchip,rk808.h
+++ b/kernel/include/dt-bindings/clock/rockchip,rk808.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants clk index RK808 pmic clkout
  */
diff --git a/kernel/include/dt-bindings/clock/ste-ab8500.h b/kernel/include/dt-bindings/clock/ste-ab8500.h
index 6731f1f00..fb42dd0ca 100644
--- a/kernel/include/dt-bindings/clock/ste-ab8500.h
+++ b/kernel/include/dt-bindings/clock/ste-ab8500.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __STE_CLK_AB8500_H__
 #define __STE_CLK_AB8500_H__
 
diff --git a/kernel/include/dt-bindings/clock/stih407-clks.h b/kernel/include/dt-bindings/clock/stih407-clks.h
index 082edd9ba..f0936c133 100644
--- a/kernel/include/dt-bindings/clock/stih407-clks.h
+++ b/kernel/include/dt-bindings/clock/stih407-clks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants clk index STMicroelectronics
  * STiH407 SoC.
diff --git a/kernel/include/dt-bindings/clock/stih410-clks.h b/kernel/include/dt-bindings/clock/stih410-clks.h
index 2097a4bbe..90cbe6154 100644
--- a/kernel/include/dt-bindings/clock/stih410-clks.h
+++ b/kernel/include/dt-bindings/clock/stih410-clks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants clk index STMicroelectronics
  * STiH410 SoC.
diff --git a/kernel/include/dt-bindings/clock/stih416-clks.h b/kernel/include/dt-bindings/clock/stih416-clks.h
index f9bdbd135..743022780 100644
--- a/kernel/include/dt-bindings/clock/stih416-clks.h
+++ b/kernel/include/dt-bindings/clock/stih416-clks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants clk index STMicroelectronics
  * STiH416 SoC.
diff --git a/kernel/include/dt-bindings/clock/stih418-clks.h b/kernel/include/dt-bindings/clock/stih418-clks.h
index b62aa0b20..0e7fba0c5 100644
--- a/kernel/include/dt-bindings/clock/stih418-clks.h
+++ b/kernel/include/dt-bindings/clock/stih418-clks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants clk index STMicroelectronics
  * STiH418 SoC.
diff --git a/kernel/include/dt-bindings/clock/tegra114-car.h b/kernel/include/dt-bindings/clock/tegra114-car.h
index ed5ca218c..bb5c2c999 100644
--- a/kernel/include/dt-bindings/clock/tegra114-car.h
+++ b/kernel/include/dt-bindings/clock/tegra114-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra114-car.
  *
diff --git a/kernel/include/dt-bindings/clock/tegra124-car-common.h b/kernel/include/dt-bindings/clock/tegra124-car-common.h
index 9352c7e2c..4331f1df6 100644
--- a/kernel/include/dt-bindings/clock/tegra124-car-common.h
+++ b/kernel/include/dt-bindings/clock/tegra124-car-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra124-car or
  * nvidia,tegra132-car.
diff --git a/kernel/include/dt-bindings/clock/tegra124-car.h b/kernel/include/dt-bindings/clock/tegra124-car.h
index 2860737f0..c520ee231 100644
--- a/kernel/include/dt-bindings/clock/tegra124-car.h
+++ b/kernel/include/dt-bindings/clock/tegra124-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides Tegra124-specific constants for binding
  * nvidia,tegra124-car.
diff --git a/kernel/include/dt-bindings/clock/tegra186-clock.h b/kernel/include/dt-bindings/clock/tegra186-clock.h
index f73d32098..d6b525f45 100644
--- a/kernel/include/dt-bindings/clock/tegra186-clock.h
+++ b/kernel/include/dt-bindings/clock/tegra186-clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /** @file */
 
 #ifndef _MACH_T186_CLK_T186_H
diff --git a/kernel/include/dt-bindings/clock/tegra20-car.h b/kernel/include/dt-bindings/clock/tegra20-car.h
index 04500b243..b21a0eb32 100644
--- a/kernel/include/dt-bindings/clock/tegra20-car.h
+++ b/kernel/include/dt-bindings/clock/tegra20-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra20-car.
  *
diff --git a/kernel/include/dt-bindings/clock/tegra210-car.h b/kernel/include/dt-bindings/clock/tegra210-car.h
index 46689cd37..a9dc1457c 100644
--- a/kernel/include/dt-bindings/clock/tegra210-car.h
+++ b/kernel/include/dt-bindings/clock/tegra210-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra210-car.
  *
diff --git a/kernel/include/dt-bindings/clock/tegra30-car.h b/kernel/include/dt-bindings/clock/tegra30-car.h
index 7213354b9..3c90f1535 100644
--- a/kernel/include/dt-bindings/clock/tegra30-car.h
+++ b/kernel/include/dt-bindings/clock/tegra30-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra30-car.
  *
diff --git a/kernel/include/dt-bindings/display/tda998x.h b/kernel/include/dt-bindings/display/tda998x.h
index 34757a384..746831ff3 100644
--- a/kernel/include/dt-bindings/display/tda998x.h
+++ b/kernel/include/dt-bindings/display/tda998x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_TDA998X_H
 #define _DT_BINDINGS_TDA998X_H
 
diff --git a/kernel/include/dt-bindings/gpio/gpio.h b/kernel/include/dt-bindings/gpio/gpio.h
index c50745845..32dd58a3d 100644
--- a/kernel/include/dt-bindings/gpio/gpio.h
+++ b/kernel/include/dt-bindings/gpio/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for most GPIO bindings.
  *
diff --git a/kernel/include/dt-bindings/gpio/tegra-gpio.h b/kernel/include/dt-bindings/gpio/tegra-gpio.h
index a1c09e88e..7625dbc57 100644
--- a/kernel/include/dt-bindings/gpio/tegra-gpio.h
+++ b/kernel/include/dt-bindings/gpio/tegra-gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra*-gpio.
  *
diff --git a/kernel/include/dt-bindings/gpio/tegra186-gpio.h b/kernel/include/dt-bindings/gpio/tegra186-gpio.h
index 38001c702..463ad398f 100644
--- a/kernel/include/dt-bindings/gpio/tegra186-gpio.h
+++ b/kernel/include/dt-bindings/gpio/tegra186-gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra186-gpio*.
  *
diff --git a/kernel/include/dt-bindings/iio/adc/fsl-imx25-gcq.h b/kernel/include/dt-bindings/iio/adc/fsl-imx25-gcq.h
index 87abdd4a7..08ef4d298 100644
--- a/kernel/include/dt-bindings/iio/adc/fsl-imx25-gcq.h
+++ b/kernel/include/dt-bindings/iio/adc/fsl-imx25-gcq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for configuring the I.MX25 ADC
  */
diff --git a/kernel/include/dt-bindings/iio/adi,ad5592r.h b/kernel/include/dt-bindings/iio/adi,ad5592r.h
index c48aca1dc..9f8c7b808 100644
--- a/kernel/include/dt-bindings/iio/adi,ad5592r.h
+++ b/kernel/include/dt-bindings/iio/adi,ad5592r.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _DT_BINDINGS_ADI_AD5592R_H
 #define _DT_BINDINGS_ADI_AD5592R_H
diff --git a/kernel/include/dt-bindings/input/input.h b/kernel/include/dt-bindings/input/input.h
index a21413324..bcf0ae100 100644
--- a/kernel/include/dt-bindings/input/input.h
+++ b/kernel/include/dt-bindings/input/input.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for most input bindings.
  *
diff --git a/kernel/include/dt-bindings/interrupt-controller/arm-gic.h b/kernel/include/dt-bindings/interrupt-controller/arm-gic.h
index d4110d5ca..0c85f65c8 100644
--- a/kernel/include/dt-bindings/interrupt-controller/arm-gic.h
+++ b/kernel/include/dt-bindings/interrupt-controller/arm-gic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the ARM GIC.
  */
diff --git a/kernel/include/dt-bindings/interrupt-controller/irq.h b/kernel/include/dt-bindings/interrupt-controller/irq.h
index 33a1003c5..a8b310555 100644
--- a/kernel/include/dt-bindings/interrupt-controller/irq.h
+++ b/kernel/include/dt-bindings/interrupt-controller/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for most IRQ bindings.
  *
diff --git a/kernel/include/dt-bindings/interrupt-controller/mips-gic.h b/kernel/include/dt-bindings/interrupt-controller/mips-gic.h
index cf35a577e..bd45cee0c 100644
--- a/kernel/include/dt-bindings/interrupt-controller/mips-gic.h
+++ b/kernel/include/dt-bindings/interrupt-controller/mips-gic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_MIPS_GIC_H
 #define _DT_BINDINGS_INTERRUPT_CONTROLLER_MIPS_GIC_H
 
diff --git a/kernel/include/dt-bindings/interrupt-controller/mvebu-icu.h b/kernel/include/dt-bindings/interrupt-controller/mvebu-icu.h
index 824955854..bb5217c64 100644
--- a/kernel/include/dt-bindings/interrupt-controller/mvebu-icu.h
+++ b/kernel/include/dt-bindings/interrupt-controller/mvebu-icu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the MVEBU ICU driver.
  */
diff --git a/kernel/include/dt-bindings/leds/common.h b/kernel/include/dt-bindings/leds/common.h
index 7958bec7d..e171d0a6b 100644
--- a/kernel/include/dt-bindings/leds/common.h
+++ b/kernel/include/dt-bindings/leds/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides macros for the common LEDs device tree bindings.
  *
diff --git a/kernel/include/dt-bindings/leds/leds-ns2.h b/kernel/include/dt-bindings/leds/leds-ns2.h
index 491c5f974..fd615749e 100644
--- a/kernel/include/dt-bindings/leds/leds-ns2.h
+++ b/kernel/include/dt-bindings/leds/leds-ns2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_LEDS_NS2_H
 #define _DT_BINDINGS_LEDS_NS2_H
 
diff --git a/kernel/include/dt-bindings/mailbox/tegra186-hsp.h b/kernel/include/dt-bindings/mailbox/tegra186-hsp.h
index f5d66e5f5..bcab5b7ca 100644
--- a/kernel/include/dt-bindings/mailbox/tegra186-hsp.h
+++ b/kernel/include/dt-bindings/mailbox/tegra186-hsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra186-hsp.
  */
diff --git a/kernel/include/dt-bindings/media/c8sectpfe.h b/kernel/include/dt-bindings/media/c8sectpfe.h
index a0b5c7be6..6b1fb6f54 100644
--- a/kernel/include/dt-bindings/media/c8sectpfe.h
+++ b/kernel/include/dt-bindings/media/c8sectpfe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_C8SECTPFE_H
 #define __DT_C8SECTPFE_H
 
diff --git a/kernel/include/dt-bindings/memory/tegra114-mc.h b/kernel/include/dt-bindings/memory/tegra114-mc.h
index 8f48985a3..27c838698 100644
--- a/kernel/include/dt-bindings/memory/tegra114-mc.h
+++ b/kernel/include/dt-bindings/memory/tegra114-mc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DT_BINDINGS_MEMORY_TEGRA114_MC_H
 #define DT_BINDINGS_MEMORY_TEGRA114_MC_H
 
diff --git a/kernel/include/dt-bindings/memory/tegra124-mc.h b/kernel/include/dt-bindings/memory/tegra124-mc.h
index 7d8ee798f..f534d7c06 100644
--- a/kernel/include/dt-bindings/memory/tegra124-mc.h
+++ b/kernel/include/dt-bindings/memory/tegra124-mc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DT_BINDINGS_MEMORY_TEGRA124_MC_H
 #define DT_BINDINGS_MEMORY_TEGRA124_MC_H
 
diff --git a/kernel/include/dt-bindings/memory/tegra210-mc.h b/kernel/include/dt-bindings/memory/tegra210-mc.h
index d1731bc14..4490f7cf4 100644
--- a/kernel/include/dt-bindings/memory/tegra210-mc.h
+++ b/kernel/include/dt-bindings/memory/tegra210-mc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DT_BINDINGS_MEMORY_TEGRA210_MC_H
 #define DT_BINDINGS_MEMORY_TEGRA210_MC_H
 
diff --git a/kernel/include/dt-bindings/memory/tegra30-mc.h b/kernel/include/dt-bindings/memory/tegra30-mc.h
index 502beb03d..3cac81919 100644
--- a/kernel/include/dt-bindings/memory/tegra30-mc.h
+++ b/kernel/include/dt-bindings/memory/tegra30-mc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DT_BINDINGS_MEMORY_TEGRA30_MC_H
 #define DT_BINDINGS_MEMORY_TEGRA30_MC_H
 
diff --git a/kernel/include/dt-bindings/mfd/as3722.h b/kernel/include/dt-bindings/mfd/as3722.h
index e66c0898c..9ef0cba90 100644
--- a/kernel/include/dt-bindings/mfd/as3722.h
+++ b/kernel/include/dt-bindings/mfd/as3722.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides macros for ams AS3722 device bindings.
  *
diff --git a/kernel/include/dt-bindings/mfd/dbx500-prcmu.h b/kernel/include/dt-bindings/mfd/dbx500-prcmu.h
index 552a2d174..0404bcc47 100644
--- a/kernel/include/dt-bindings/mfd/dbx500-prcmu.h
+++ b/kernel/include/dt-bindings/mfd/dbx500-prcmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the PRCMU bindings.
  *
diff --git a/kernel/include/dt-bindings/mfd/max77620.h b/kernel/include/dt-bindings/mfd/max77620.h
index b911a0720..1e19c5f90 100644
--- a/kernel/include/dt-bindings/mfd/max77620.h
+++ b/kernel/include/dt-bindings/mfd/max77620.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides macros for MAXIM MAX77620 device bindings.
  *
diff --git a/kernel/include/dt-bindings/mfd/palmas.h b/kernel/include/dt-bindings/mfd/palmas.h
index cdb075aae..c4f1d57ff 100644
--- a/kernel/include/dt-bindings/mfd/palmas.h
+++ b/kernel/include/dt-bindings/mfd/palmas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides macros for Palmas device bindings.
  *
diff --git a/kernel/include/dt-bindings/mfd/qcom-rpm.h b/kernel/include/dt-bindings/mfd/qcom-rpm.h
index 54aef5e21..c9204c4df 100644
--- a/kernel/include/dt-bindings/mfd/qcom-rpm.h
+++ b/kernel/include/dt-bindings/mfd/qcom-rpm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the Qualcomm RPM bindings.
  */
diff --git a/kernel/include/dt-bindings/mfd/st-lpc.h b/kernel/include/dt-bindings/mfd/st-lpc.h
index d05894afa..88a7f5684 100644
--- a/kernel/include/dt-bindings/mfd/st-lpc.h
+++ b/kernel/include/dt-bindings/mfd/st-lpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides shared DT/Driver defines for ST's LPC device
  *
diff --git a/kernel/include/dt-bindings/mfd/stm32f4-rcc.h b/kernel/include/dt-bindings/mfd/stm32f4-rcc.h
index 082a81c94..309e8c79f 100644
--- a/kernel/include/dt-bindings/mfd/stm32f4-rcc.h
+++ b/kernel/include/dt-bindings/mfd/stm32f4-rcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the STM32F4 RCC IP
  */
diff --git a/kernel/include/dt-bindings/mfd/stm32f7-rcc.h b/kernel/include/dt-bindings/mfd/stm32f7-rcc.h
index e36cc6995..8b7b7197f 100644
--- a/kernel/include/dt-bindings/mfd/stm32f7-rcc.h
+++ b/kernel/include/dt-bindings/mfd/stm32f7-rcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the STM32F7 RCC IP
  */
diff --git a/kernel/include/dt-bindings/mux/mux.h b/kernel/include/dt-bindings/mux/mux.h
index c8e855c4a..042719218 100644
--- a/kernel/include/dt-bindings/mux/mux.h
+++ b/kernel/include/dt-bindings/mux/mux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for most Multiplexer bindings.
  *
diff --git a/kernel/include/dt-bindings/pinctrl/am33xx.h b/kernel/include/dt-bindings/pinctrl/am33xx.h
index 226f77246..7d947a597 100644
--- a/kernel/include/dt-bindings/pinctrl/am33xx.h
+++ b/kernel/include/dt-bindings/pinctrl/am33xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants specific to AM33XX pinctrl bindings.
  */
diff --git a/kernel/include/dt-bindings/pinctrl/am43xx.h b/kernel/include/dt-bindings/pinctrl/am43xx.h
index 344bd1eb3..467891576 100644
--- a/kernel/include/dt-bindings/pinctrl/am43xx.h
+++ b/kernel/include/dt-bindings/pinctrl/am43xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants specific to AM43XX pinctrl bindings.
  */
diff --git a/kernel/include/dt-bindings/pinctrl/dm814x.h b/kernel/include/dt-bindings/pinctrl/dm814x.h
index 0f484273d..afbabbc4d 100644
--- a/kernel/include/dt-bindings/pinctrl/dm814x.h
+++ b/kernel/include/dt-bindings/pinctrl/dm814x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants specific to DM814X pinctrl bindings.
  */
diff --git a/kernel/include/dt-bindings/pinctrl/mt6397-pinfunc.h b/kernel/include/dt-bindings/pinctrl/mt6397-pinfunc.h
index 85739b308..f393fbd68 100644
--- a/kernel/include/dt-bindings/pinctrl/mt6397-pinfunc.h
+++ b/kernel/include/dt-bindings/pinctrl/mt6397-pinfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DTS_MT6397_PINFUNC_H
 #define __DTS_MT6397_PINFUNC_H
 
diff --git a/kernel/include/dt-bindings/pinctrl/mt7623-pinfunc.h b/kernel/include/dt-bindings/pinctrl/mt7623-pinfunc.h
index 436a87be8..2d6a7b1d7 100644
--- a/kernel/include/dt-bindings/pinctrl/mt7623-pinfunc.h
+++ b/kernel/include/dt-bindings/pinctrl/mt7623-pinfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DTS_MT7623_PINFUNC_H
 #define __DTS_MT7623_PINFUNC_H
 
diff --git a/kernel/include/dt-bindings/pinctrl/omap.h b/kernel/include/dt-bindings/pinctrl/omap.h
index fbd6f7202..49b5dea2b 100644
--- a/kernel/include/dt-bindings/pinctrl/omap.h
+++ b/kernel/include/dt-bindings/pinctrl/omap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for OMAP pinctrl bindings.
  *
diff --git a/kernel/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h b/kernel/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
index 914d56da9..ac63c399b 100644
--- a/kernel/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
+++ b/kernel/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_PINCTRL_TEGRA_XUSB_H
 #define _DT_BINDINGS_PINCTRL_TEGRA_XUSB_H 1
 
diff --git a/kernel/include/dt-bindings/pinctrl/qcom,pmic-gpio.h b/kernel/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
index b8ff8824e..e5df5ce45 100644
--- a/kernel/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
+++ b/kernel/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the Qualcomm PMIC GPIO binding.
  */
diff --git a/kernel/include/dt-bindings/pinctrl/qcom,pmic-mpp.h b/kernel/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
index 2e360d8f7..32e66ee7e 100644
--- a/kernel/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
+++ b/kernel/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the Qualcomm PMIC's
  * Multi-Purpose Pin binding.
diff --git a/kernel/include/dt-bindings/pinctrl/r7s72100-pinctrl.h b/kernel/include/dt-bindings/pinctrl/r7s72100-pinctrl.h
index 6b609fe10..cdb950246 100644
--- a/kernel/include/dt-bindings/pinctrl/r7s72100-pinctrl.h
+++ b/kernel/include/dt-bindings/pinctrl/r7s72100-pinctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Defines macros and constants for Renesas RZ/A1 pin controller pin
  * muxing functions.
diff --git a/kernel/include/dt-bindings/pinctrl/stm32f429-pinfunc.h b/kernel/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
index 26f18798d..9a5a028f0 100644
--- a/kernel/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
+++ b/kernel/include/dt-bindings/pinctrl/stm32f429-pinfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_STM32F429_PINFUNC_H
 #define _DT_BINDINGS_STM32F429_PINFUNC_H
 
diff --git a/kernel/include/dt-bindings/pinctrl/stm32f746-pinfunc.h b/kernel/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
index 6348c6a83..4c28f8f41 100644
--- a/kernel/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
+++ b/kernel/include/dt-bindings/pinctrl/stm32f746-pinfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_STM32F746_PINFUNC_H
 #define _DT_BINDINGS_STM32F746_PINFUNC_H
 
diff --git a/kernel/include/dt-bindings/pinctrl/stm32h7-pinfunc.h b/kernel/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
index cb673b5e8..06d99a8dd 100644
--- a/kernel/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
+++ b/kernel/include/dt-bindings/pinctrl/stm32h7-pinfunc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_STM32H7_PINFUNC_H
 #define _DT_BINDINGS_STM32H7_PINFUNC_H
 
diff --git a/kernel/include/dt-bindings/power/mt8173-power.h b/kernel/include/dt-bindings/power/mt8173-power.h
index b34cee95a..15d531aa6 100644
--- a/kernel/include/dt-bindings/power/mt8173-power.h
+++ b/kernel/include/dt-bindings/power/mt8173-power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_POWER_MT8183_POWER_H
 #define _DT_BINDINGS_POWER_MT8183_POWER_H
 
diff --git a/kernel/include/dt-bindings/power/rk3288-power.h b/kernel/include/dt-bindings/power/rk3288-power.h
index b8b1045f3..f710b56cc 100644
--- a/kernel/include/dt-bindings/power/rk3288-power.h
+++ b/kernel/include/dt-bindings/power/rk3288-power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_BINDINGS_POWER_RK3288_POWER_H__
 #define __DT_BINDINGS_POWER_RK3288_POWER_H__
 
diff --git a/kernel/include/dt-bindings/power/rk3328-power.h b/kernel/include/dt-bindings/power/rk3328-power.h
index 10c3c3715..02e3d7fc1 100644
--- a/kernel/include/dt-bindings/power/rk3328-power.h
+++ b/kernel/include/dt-bindings/power/rk3328-power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_BINDINGS_POWER_RK3328_POWER_H__
 #define __DT_BINDINGS_POWER_RK3328_POWER_H__
 
diff --git a/kernel/include/dt-bindings/power/rk3368-power.h b/kernel/include/dt-bindings/power/rk3368-power.h
index 93633d57e..5e602dbd6 100644
--- a/kernel/include/dt-bindings/power/rk3368-power.h
+++ b/kernel/include/dt-bindings/power/rk3368-power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_BINDINGS_POWER_RK3368_POWER_H__
 #define __DT_BINDINGS_POWER_RK3368_POWER_H__
 
diff --git a/kernel/include/dt-bindings/power/rk3399-power.h b/kernel/include/dt-bindings/power/rk3399-power.h
index 168b3bfbd..aedd8b180 100644
--- a/kernel/include/dt-bindings/power/rk3399-power.h
+++ b/kernel/include/dt-bindings/power/rk3399-power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_BINDINGS_POWER_RK3399_POWER_H__
 #define __DT_BINDINGS_POWER_RK3399_POWER_H__
 
diff --git a/kernel/include/dt-bindings/pwm/pwm.h b/kernel/include/dt-bindings/pwm/pwm.h
index 96f49e822..ab9a077e3 100644
--- a/kernel/include/dt-bindings/pwm/pwm.h
+++ b/kernel/include/dt-bindings/pwm/pwm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for most PWM bindings.
  *
diff --git a/kernel/include/dt-bindings/reset/cortina,gemini-reset.h b/kernel/include/dt-bindings/reset/cortina,gemini-reset.h
index 0b886aee6..f48aff238 100644
--- a/kernel/include/dt-bindings/reset/cortina,gemini-reset.h
+++ b/kernel/include/dt-bindings/reset/cortina,gemini-reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_RESET_CORTINA_GEMINI_H
 #define _DT_BINDINGS_RESET_CORTINA_GEMINI_H
 
diff --git a/kernel/include/dt-bindings/reset/hisi,hi6220-resets.h b/kernel/include/dt-bindings/reset/hisi,hi6220-resets.h
index 322ec5335..e7c362a81 100644
--- a/kernel/include/dt-bindings/reset/hisi,hi6220-resets.h
+++ b/kernel/include/dt-bindings/reset/hisi,hi6220-resets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
  * This header provides index for the reset controller
  * based on hi6220 SoC.
diff --git a/kernel/include/dt-bindings/reset/pistachio-resets.h b/kernel/include/dt-bindings/reset/pistachio-resets.h
index 60a189b1f..5bb4dd0d6 100644
--- a/kernel/include/dt-bindings/reset/pistachio-resets.h
+++ b/kernel/include/dt-bindings/reset/pistachio-resets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the reset controller
  * present in the Pistachio SoC
diff --git a/kernel/include/dt-bindings/reset/stih407-resets.h b/kernel/include/dt-bindings/reset/stih407-resets.h
index 4ab3a1c94..f2a2c4f7f 100644
--- a/kernel/include/dt-bindings/reset/stih407-resets.h
+++ b/kernel/include/dt-bindings/reset/stih407-resets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the reset controller
  * based peripheral powerdown requests on the STMicroelectronics
diff --git a/kernel/include/dt-bindings/reset/stih415-resets.h b/kernel/include/dt-bindings/reset/stih415-resets.h
index c2329fe29..96f7831a1 100644
--- a/kernel/include/dt-bindings/reset/stih415-resets.h
+++ b/kernel/include/dt-bindings/reset/stih415-resets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the reset controller
  * based peripheral powerdown requests on the STMicroelectronics
diff --git a/kernel/include/dt-bindings/reset/stih416-resets.h b/kernel/include/dt-bindings/reset/stih416-resets.h
index fcf9af1ac..f682c906e 100644
--- a/kernel/include/dt-bindings/reset/stih416-resets.h
+++ b/kernel/include/dt-bindings/reset/stih416-resets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the reset controller
  * based peripheral powerdown requests on the STMicroelectronics
diff --git a/kernel/include/dt-bindings/reset/tegra124-car.h b/kernel/include/dt-bindings/reset/tegra124-car.h
index 070e4f6e7..97d2f3db8 100644
--- a/kernel/include/dt-bindings/reset/tegra124-car.h
+++ b/kernel/include/dt-bindings/reset/tegra124-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides Tegra124-specific constants for binding
  * nvidia,tegra124-car.
diff --git a/kernel/include/dt-bindings/reset/tegra210-car.h b/kernel/include/dt-bindings/reset/tegra210-car.h
index 296ec6e3f..9dc84ec76 100644
--- a/kernel/include/dt-bindings/reset/tegra210-car.h
+++ b/kernel/include/dt-bindings/reset/tegra210-car.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides Tegra210-specific constants for binding
  * nvidia,tegra210-car.
diff --git a/kernel/include/dt-bindings/soc/rockchip,boot-mode.h b/kernel/include/dt-bindings/soc/rockchip,boot-mode.h
index ae7c867e7..4b0914c09 100644
--- a/kernel/include/dt-bindings/soc/rockchip,boot-mode.h
+++ b/kernel/include/dt-bindings/soc/rockchip,boot-mode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ROCKCHIP_BOOT_MODE_H
 #define __ROCKCHIP_BOOT_MODE_H
 
diff --git a/kernel/include/dt-bindings/sound/apq8016-lpass.h b/kernel/include/dt-bindings/sound/apq8016-lpass.h
index 499076e98..3c3e16c0a 100644
--- a/kernel/include/dt-bindings/sound/apq8016-lpass.h
+++ b/kernel/include/dt-bindings/sound/apq8016-lpass.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_APQ8016_LPASS_H
 #define __DT_APQ8016_LPASS_H
 
diff --git a/kernel/include/dt-bindings/sound/audio-jack-events.h b/kernel/include/dt-bindings/sound/audio-jack-events.h
index 378349f28..1b29b2951 100644
--- a/kernel/include/dt-bindings/sound/audio-jack-events.h
+++ b/kernel/include/dt-bindings/sound/audio-jack-events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __AUDIO_JACK_EVENTS_H
 #define __AUDIO_JACK_EVENTS_H
 
diff --git a/kernel/include/dt-bindings/sound/cs35l32.h b/kernel/include/dt-bindings/sound/cs35l32.h
index 0c6d6a3c1..7549d5019 100644
--- a/kernel/include/dt-bindings/sound/cs35l32.h
+++ b/kernel/include/dt-bindings/sound/cs35l32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_CS35L32_H
 #define __DT_CS35L32_H
 
diff --git a/kernel/include/dt-bindings/sound/fsl-imx-audmux.h b/kernel/include/dt-bindings/sound/fsl-imx-audmux.h
index 50b09e96f..751fe1416 100644
--- a/kernel/include/dt-bindings/sound/fsl-imx-audmux.h
+++ b/kernel/include/dt-bindings/sound/fsl-imx-audmux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_FSL_IMX_AUDMUX_H
 #define __DT_FSL_IMX_AUDMUX_H
 
diff --git a/kernel/include/dt-bindings/sound/samsung-i2s.h b/kernel/include/dt-bindings/sound/samsung-i2s.h
index 0c69818d5..77545f14c 100644
--- a/kernel/include/dt-bindings/sound/samsung-i2s.h
+++ b/kernel/include/dt-bindings/sound/samsung-i2s.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DT_BINDINGS_SAMSUNG_I2S_H
 #define _DT_BINDINGS_SAMSUNG_I2S_H
 
diff --git a/kernel/include/dt-bindings/sound/tas2552.h b/kernel/include/dt-bindings/sound/tas2552.h
index a4e1a0799..0daeb8385 100644
--- a/kernel/include/dt-bindings/sound/tas2552.h
+++ b/kernel/include/dt-bindings/sound/tas2552.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_TAS2552_H
 #define __DT_TAS2552_H
 
diff --git a/kernel/include/dt-bindings/sound/tlv320aic31xx-micbias.h b/kernel/include/dt-bindings/sound/tlv320aic31xx-micbias.h
index f5cb772ab..c6895a18a 100644
--- a/kernel/include/dt-bindings/sound/tlv320aic31xx-micbias.h
+++ b/kernel/include/dt-bindings/sound/tlv320aic31xx-micbias.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DT_TLV320AIC31XX_MICBIAS_H
 #define __DT_TLV320AIC31XX_MICBIAS_H
 
diff --git a/kernel/include/dt-bindings/thermal/lm90.h b/kernel/include/dt-bindings/thermal/lm90.h
index 8c2e3095f..eed91a16c 100644
--- a/kernel/include/dt-bindings/thermal/lm90.h
+++ b/kernel/include/dt-bindings/thermal/lm90.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for the LM90 thermal bindings.
  */
diff --git a/kernel/include/dt-bindings/thermal/tegra124-soctherm.h b/kernel/include/dt-bindings/thermal/tegra124-soctherm.h
index 2a99f1d52..c15e8b709 100644
--- a/kernel/include/dt-bindings/thermal/tegra124-soctherm.h
+++ b/kernel/include/dt-bindings/thermal/tegra124-soctherm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header provides constants for binding nvidia,tegra124-soctherm.
  */
diff --git a/kernel/include/keys/ceph-type.h b/kernel/include/keys/ceph-type.h
index f69c4ac19..aa6d3e050 100644
--- a/kernel/include/keys/ceph-type.h
+++ b/kernel/include/keys/ceph-type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KEYS_CEPH_TYPE_H
 #define _KEYS_CEPH_TYPE_H
 
diff --git a/kernel/include/linux/8250_pci.h b/kernel/include/linux/8250_pci.h
index b24ff086a..9c777d2c9 100644
--- a/kernel/include/linux/8250_pci.h
+++ b/kernel/include/linux/8250_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for PCI support.
  */
diff --git a/kernel/include/linux/a.out.h b/kernel/include/linux/a.out.h
index ee8841689..600cf4564 100644
--- a/kernel/include/linux/a.out.h
+++ b/kernel/include/linux/a.out.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __A_OUT_GNU_H__
 #define __A_OUT_GNU_H__
 
diff --git a/kernel/include/linux/acct.h b/kernel/include/linux/acct.h
index dccc2d4fe..18e1955f8 100644
--- a/kernel/include/linux/acct.h
+++ b/kernel/include/linux/acct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  BSD Process Accounting for Linux - Definitions
  *
diff --git a/kernel/include/linux/acpi_pmtmr.h b/kernel/include/linux/acpi_pmtmr.h
index 1d0ef1ae8..50d88bf14 100644
--- a/kernel/include/linux/acpi_pmtmr.h
+++ b/kernel/include/linux/acpi_pmtmr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ACPI_PMTMR_H_
 #define _ACPI_PMTMR_H_
 
diff --git a/kernel/include/linux/adb.h b/kernel/include/linux/adb.h
index cde41300c..f6306fc86 100644
--- a/kernel/include/linux/adb.h
+++ b/kernel/include/linux/adb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for ADB (Apple Desktop Bus) support.
  */
diff --git a/kernel/include/linux/adfs_fs.h b/kernel/include/linux/adfs_fs.h
index 0d991071a..4836e382a 100644
--- a/kernel/include/linux/adfs_fs.h
+++ b/kernel/include/linux/adfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ADFS_FS_H
 #define _ADFS_FS_H
 
diff --git a/kernel/include/linux/aer.h b/kernel/include/linux/aer.h
index 43799bd17..8f87bbece 100644
--- a/kernel/include/linux/aer.h
+++ b/kernel/include/linux/aer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2006 Intel Corp.
  *     Tom Long Nguyen (tom.l.nguyen@intel.com)
diff --git a/kernel/include/linux/ahci-remap.h b/kernel/include/linux/ahci-remap.h
index 62be3a402..230c871ba 100644
--- a/kernel/include/linux/ahci-remap.h
+++ b/kernel/include/linux/ahci-remap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_AHCI_REMAP_H
 #define _LINUX_AHCI_REMAP_H
 
diff --git a/kernel/include/linux/aio.h b/kernel/include/linux/aio.h
index fdd0a343f..9d8aabecf 100644
--- a/kernel/include/linux/aio.h
+++ b/kernel/include/linux/aio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX__AIO_H
 #define __LINUX__AIO_H
 
diff --git a/kernel/include/linux/alarmtimer.h b/kernel/include/linux/alarmtimer.h
index c70aac132..0760ca1cb 100644
--- a/kernel/include/linux/alarmtimer.h
+++ b/kernel/include/linux/alarmtimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ALARMTIMER_H
 #define _LINUX_ALARMTIMER_H
 
diff --git a/kernel/include/linux/altera_jtaguart.h b/kernel/include/linux/altera_jtaguart.h
index 953b178a1..527a142cd 100644
--- a/kernel/include/linux/altera_jtaguart.h
+++ b/kernel/include/linux/altera_jtaguart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * altera_jtaguart.h -- Altera JTAG UART driver defines.
  */
diff --git a/kernel/include/linux/altera_uart.h b/kernel/include/linux/altera_uart.h
index c022c82db..3eb73b8c4 100644
--- a/kernel/include/linux/altera_uart.h
+++ b/kernel/include/linux/altera_uart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * altera_uart.h -- Altera UART driver defines.
  */
diff --git a/kernel/include/linux/amba/mmci.h b/kernel/include/linux/amba/mmci.h
index 8c9811306..da8357ba1 100644
--- a/kernel/include/linux/amba/mmci.h
+++ b/kernel/include/linux/amba/mmci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/amba/mmci.h
  */
diff --git a/kernel/include/linux/amifd.h b/kernel/include/linux/amifd.h
index 346993268..202a77dbe 100644
--- a/kernel/include/linux/amifd.h
+++ b/kernel/include/linux/amifd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AMIFD_H
 #define _AMIFD_H
 
diff --git a/kernel/include/linux/amifdreg.h b/kernel/include/linux/amifdreg.h
index 76188bf48..9b514d05e 100644
--- a/kernel/include/linux/amifdreg.h
+++ b/kernel/include/linux/amifdreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_AMIFDREG_H
 #define _LINUX_AMIFDREG_H
 
diff --git a/kernel/include/linux/anon_inodes.h b/kernel/include/linux/anon_inodes.h
index 8013a4524..d0d7d9626 100644
--- a/kernel/include/linux/anon_inodes.h
+++ b/kernel/include/linux/anon_inodes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/anon_inodes.h
  *
diff --git a/kernel/include/linux/apple_bl.h b/kernel/include/linux/apple_bl.h
index 0a95e730f..445af2e3c 100644
--- a/kernel/include/linux/apple_bl.h
+++ b/kernel/include/linux/apple_bl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * apple_bl exported symbols
  */
diff --git a/kernel/include/linux/arch_topology.h b/kernel/include/linux/arch_topology.h
index 716ce5872..d4fcb0efb 100644
--- a/kernel/include/linux/arch_topology.h
+++ b/kernel/include/linux/arch_topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/arch_topology.h - arch specific cpu topology information
  */
diff --git a/kernel/include/linux/ata_platform.h b/kernel/include/linux/ata_platform.h
index 619d9e78e..ff2120215 100644
--- a/kernel/include/linux/ata_platform.h
+++ b/kernel/include/linux/ata_platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_ATA_PLATFORM_H
 #define __LINUX_ATA_PLATFORM_H
 
diff --git a/kernel/include/linux/atalk.h b/kernel/include/linux/atalk.h
index 73fd8b7e9..4d356e168 100644
--- a/kernel/include/linux/atalk.h
+++ b/kernel/include/linux/atalk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_ATALK_H__
 #define __LINUX_ATALK_H__
 
diff --git a/kernel/include/linux/atm.h b/kernel/include/linux/atm.h
index 30006c435..4b50fd0a6 100644
--- a/kernel/include/linux/atm.h
+++ b/kernel/include/linux/atm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* atm.h - general ATM declarations */
 #ifndef _LINUX_ATM_H
 #define _LINUX_ATM_H
diff --git a/kernel/include/linux/atm_tcp.h b/kernel/include/linux/atm_tcp.h
index db6b65fc0..c8ecf6f68 100644
--- a/kernel/include/linux/atm_tcp.h
+++ b/kernel/include/linux/atm_tcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by
 	       driver-specific utilities) */
 
diff --git a/kernel/include/linux/atmdev.h b/kernel/include/linux/atmdev.h
index 0ec9bdb1c..0c27515d2 100644
--- a/kernel/include/linux/atmdev.h
+++ b/kernel/include/linux/atmdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* atmdev.h - ATM device driver declarations and various related items */
 #ifndef LINUX_ATMDEV_H
 #define LINUX_ATMDEV_H
diff --git a/kernel/include/linux/atmel-mci.h b/kernel/include/linux/atmel-mci.h
index 42a9e1884..1491af38c 100644
--- a/kernel/include/linux/atmel-mci.h
+++ b/kernel/include/linux/atmel-mci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_ATMEL_MCI_H
 #define __LINUX_ATMEL_MCI_H
 
diff --git a/kernel/include/linux/atmel-ssc.h b/kernel/include/linux/atmel-ssc.h
index fdb545101..6091d2abc 100644
--- a/kernel/include/linux/atmel-ssc.h
+++ b/kernel/include/linux/atmel-ssc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INCLUDE_ATMEL_SSC_H
 #define __INCLUDE_ATMEL_SSC_H
 
diff --git a/kernel/include/linux/atomic.h b/kernel/include/linux/atomic.h
index 40d6bfec0..cd18203d6 100644
--- a/kernel/include/linux/atomic.h
+++ b/kernel/include/linux/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Atomic operations usable in machine independent code */
 #ifndef _LINUX_ATOMIC_H
 #define _LINUX_ATOMIC_H
diff --git a/kernel/include/linux/auxvec.h b/kernel/include/linux/auxvec.h
index 3e0fbe441..f68d0ec2d 100644
--- a/kernel/include/linux/auxvec.h
+++ b/kernel/include/linux/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_AUXVEC_H
 #define _LINUX_AUXVEC_H
 
diff --git a/kernel/include/linux/average.h b/kernel/include/linux/average.h
index 7ddaf340d..1b6f5560c 100644
--- a/kernel/include/linux/average.h
+++ b/kernel/include/linux/average.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_AVERAGE_H
 #define _LINUX_AVERAGE_H
 
diff --git a/kernel/include/linux/backing-dev-defs.h b/kernel/include/linux/backing-dev-defs.h
index 866c433e7..fff4cfa0c 100644
--- a/kernel/include/linux/backing-dev-defs.h
+++ b/kernel/include/linux/backing-dev-defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BACKING_DEV_DEFS_H
 #define __LINUX_BACKING_DEV_DEFS_H
 
diff --git a/kernel/include/linux/backing-dev.h b/kernel/include/linux/backing-dev.h
index 854e1bdd0..16621579a 100644
--- a/kernel/include/linux/backing-dev.h
+++ b/kernel/include/linux/backing-dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/backing-dev.h
  *
diff --git a/kernel/include/linux/backlight.h b/kernel/include/linux/backlight.h
index 5f2fd61ef..af7003548 100644
--- a/kernel/include/linux/backlight.h
+++ b/kernel/include/linux/backlight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Backlight Lowlevel Control Abstraction
  *
diff --git a/kernel/include/linux/badblocks.h b/kernel/include/linux/badblocks.h
index c3bdf8c59..2426276b9 100644
--- a/kernel/include/linux/badblocks.h
+++ b/kernel/include/linux/badblocks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BADBLOCKS_H
 #define _LINUX_BADBLOCKS_H
 
diff --git a/kernel/include/linux/balloon_compaction.h b/kernel/include/linux/balloon_compaction.h
index 79542b269..fbbe6da40 100644
--- a/kernel/include/linux/balloon_compaction.h
+++ b/kernel/include/linux/balloon_compaction.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/balloon_compaction.h
  *
diff --git a/kernel/include/linux/bcd.h b/kernel/include/linux/bcd.h
index 18fff11fb..118bea36d 100644
--- a/kernel/include/linux/bcd.h
+++ b/kernel/include/linux/bcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCD_H
 #define _BCD_H
 
diff --git a/kernel/include/linux/bcm47xx_wdt.h b/kernel/include/linux/bcm47xx_wdt.h
index 8d9d07ec2..fc9dcdb4b 100644
--- a/kernel/include/linux/bcm47xx_wdt.h
+++ b/kernel/include/linux/bcm47xx_wdt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCM47XX_WDT_H_
 #define LINUX_BCM47XX_WDT_H_
 
diff --git a/kernel/include/linux/bcm963xx_nvram.h b/kernel/include/linux/bcm963xx_nvram.h
index 290c231b8..c8c7f0115 100644
--- a/kernel/include/linux/bcm963xx_nvram.h
+++ b/kernel/include/linux/bcm963xx_nvram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BCM963XX_NVRAM_H__
 #define __LINUX_BCM963XX_NVRAM_H__
 
diff --git a/kernel/include/linux/bcm963xx_tag.h b/kernel/include/linux/bcm963xx_tag.h
index 161c7b37a..b87945cb6 100644
--- a/kernel/include/linux/bcm963xx_tag.h
+++ b/kernel/include/linux/bcm963xx_tag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BCM963XX_TAG_H__
 #define __LINUX_BCM963XX_TAG_H__
 
diff --git a/kernel/include/linux/bcma/bcma.h b/kernel/include/linux/bcma/bcma.h
index 8eeedb2db..ef61f3607 100644
--- a/kernel/include/linux/bcma/bcma.h
+++ b/kernel/include/linux/bcma/bcma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_H_
 #define LINUX_BCMA_H_
 
diff --git a/kernel/include/linux/bcma/bcma_driver_arm_c9.h b/kernel/include/linux/bcma/bcma_driver_arm_c9.h
index 93bd73d67..688cf590c 100644
--- a/kernel/include/linux/bcma/bcma_driver_arm_c9.h
+++ b/kernel/include/linux/bcma/bcma_driver_arm_c9.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_DRIVER_ARM_C9_H_
 #define LINUX_BCMA_DRIVER_ARM_C9_H_
 
diff --git a/kernel/include/linux/bcma/bcma_driver_chipcommon.h b/kernel/include/linux/bcma/bcma_driver_chipcommon.h
index 2f1c690a3..d35b92060 100644
--- a/kernel/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/kernel/include/linux/bcma/bcma_driver_chipcommon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_DRIVER_CC_H_
 #define LINUX_BCMA_DRIVER_CC_H_
 
diff --git a/kernel/include/linux/bcma/bcma_driver_gmac_cmn.h b/kernel/include/linux/bcma/bcma_driver_gmac_cmn.h
index 4354d4ea6..420e222d7 100644
--- a/kernel/include/linux/bcma/bcma_driver_gmac_cmn.h
+++ b/kernel/include/linux/bcma/bcma_driver_gmac_cmn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_DRIVER_GMAC_CMN_H_
 #define LINUX_BCMA_DRIVER_GMAC_CMN_H_
 
diff --git a/kernel/include/linux/bcma/bcma_driver_mips.h b/kernel/include/linux/bcma/bcma_driver_mips.h
index 8eea7f9e3..798013fab 100644
--- a/kernel/include/linux/bcma/bcma_driver_mips.h
+++ b/kernel/include/linux/bcma/bcma_driver_mips.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_DRIVER_MIPS_H_
 #define LINUX_BCMA_DRIVER_MIPS_H_
 
diff --git a/kernel/include/linux/bcma/bcma_driver_pci.h b/kernel/include/linux/bcma/bcma_driver_pci.h
index bca6a5e4c..68da8dba5 100644
--- a/kernel/include/linux/bcma/bcma_driver_pci.h
+++ b/kernel/include/linux/bcma/bcma_driver_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_DRIVER_PCI_H_
 #define LINUX_BCMA_DRIVER_PCI_H_
 
diff --git a/kernel/include/linux/bcma/bcma_driver_pcie2.h b/kernel/include/linux/bcma/bcma_driver_pcie2.h
index 31e6d17ab..91ce515e3 100644
--- a/kernel/include/linux/bcma/bcma_driver_pcie2.h
+++ b/kernel/include/linux/bcma/bcma_driver_pcie2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_DRIVER_PCIE2_H_
 #define LINUX_BCMA_DRIVER_PCIE2_H_
 
diff --git a/kernel/include/linux/bcma/bcma_regs.h b/kernel/include/linux/bcma/bcma_regs.h
index 9986f8288..944105cbd 100644
--- a/kernel/include/linux/bcma/bcma_regs.h
+++ b/kernel/include/linux/bcma/bcma_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_REGS_H_
 #define LINUX_BCMA_REGS_H_
 
diff --git a/kernel/include/linux/bcma/bcma_soc.h b/kernel/include/linux/bcma/bcma_soc.h
index 1b5fc0c3b..7cca5f859 100644
--- a/kernel/include/linux/bcma/bcma_soc.h
+++ b/kernel/include/linux/bcma/bcma_soc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_BCMA_SOC_H_
 #define LINUX_BCMA_SOC_H_
 
diff --git a/kernel/include/linux/binfmts.h b/kernel/include/linux/binfmts.h
index 18d05b549..b0abe21d6 100644
--- a/kernel/include/linux/binfmts.h
+++ b/kernel/include/linux/binfmts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BINFMTS_H
 #define _LINUX_BINFMTS_H
 
diff --git a/kernel/include/linux/bit_spinlock.h b/kernel/include/linux/bit_spinlock.h
index 3b5bafce4..bbc4730a6 100644
--- a/kernel/include/linux/bit_spinlock.h
+++ b/kernel/include/linux/bit_spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BIT_SPINLOCK_H
 #define __LINUX_BIT_SPINLOCK_H
 
diff --git a/kernel/include/linux/bitmap.h b/kernel/include/linux/bitmap.h
index 700cf5f67..19748a5b0 100644
--- a/kernel/include/linux/bitmap.h
+++ b/kernel/include/linux/bitmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BITMAP_H
 #define __LINUX_BITMAP_H
 
diff --git a/kernel/include/linux/bitops.h b/kernel/include/linux/bitops.h
index 8fbe259b1..d03c5dd61 100644
--- a/kernel/include/linux/bitops.h
+++ b/kernel/include/linux/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BITOPS_H
 #define _LINUX_BITOPS_H
 #include <asm/types.h>
diff --git a/kernel/include/linux/bitrev.h b/kernel/include/linux/bitrev.h
index b97be27e5..50fb0dee2 100644
--- a/kernel/include/linux/bitrev.h
+++ b/kernel/include/linux/bitrev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BITREV_H
 #define _LINUX_BITREV_H
 
diff --git a/kernel/include/linux/blk-cgroup.h b/kernel/include/linux/blk-cgroup.h
index 9d92153dd..8bbc37165 100644
--- a/kernel/include/linux/blk-cgroup.h
+++ b/kernel/include/linux/blk-cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BLK_CGROUP_H
 #define _BLK_CGROUP_H
 /*
diff --git a/kernel/include/linux/blk-mq-pci.h b/kernel/include/linux/blk-mq-pci.h
index 6ab595259..6338551e0 100644
--- a/kernel/include/linux/blk-mq-pci.h
+++ b/kernel/include/linux/blk-mq-pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BLK_MQ_PCI_H
 #define _LINUX_BLK_MQ_PCI_H
 
diff --git a/kernel/include/linux/blk-mq-virtio.h b/kernel/include/linux/blk-mq-virtio.h
index b1ef6e147..69b4da262 100644
--- a/kernel/include/linux/blk-mq-virtio.h
+++ b/kernel/include/linux/blk-mq-virtio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BLK_MQ_VIRTIO_H
 #define _LINUX_BLK_MQ_VIRTIO_H
 
diff --git a/kernel/include/linux/blk-mq.h b/kernel/include/linux/blk-mq.h
index 50c6485cb..994cbb0f7 100644
--- a/kernel/include/linux/blk-mq.h
+++ b/kernel/include/linux/blk-mq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BLK_MQ_H
 #define BLK_MQ_H
 
diff --git a/kernel/include/linux/blk_types.h b/kernel/include/linux/blk_types.h
index a2d2aa709..96ac38155 100644
--- a/kernel/include/linux/blk_types.h
+++ b/kernel/include/linux/blk_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Block data types and constants.  Directly include this file only to
  * break include dependency loop.
diff --git a/kernel/include/linux/blkdev.h b/kernel/include/linux/blkdev.h
index 02fa42d24..8da66379f 100644
--- a/kernel/include/linux/blkdev.h
+++ b/kernel/include/linux/blkdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BLKDEV_H
 #define _LINUX_BLKDEV_H
 
diff --git a/kernel/include/linux/blkpg.h b/kernel/include/linux/blkpg.h
index bef124fde..1c91753c3 100644
--- a/kernel/include/linux/blkpg.h
+++ b/kernel/include/linux/blkpg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BLKPG_H
 #define _LINUX_BLKPG_H
 
diff --git a/kernel/include/linux/blktrace_api.h b/kernel/include/linux/blktrace_api.h
index 67b4d4dfc..880475380 100644
--- a/kernel/include/linux/blktrace_api.h
+++ b/kernel/include/linux/blktrace_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BLKTRACE_H
 #define BLKTRACE_H
 
diff --git a/kernel/include/linux/blockgroup_lock.h b/kernel/include/linux/blockgroup_lock.h
index 225bdb7da..511ab123a 100644
--- a/kernel/include/linux/blockgroup_lock.h
+++ b/kernel/include/linux/blockgroup_lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BLOCKGROUP_LOCK_H
 #define _LINUX_BLOCKGROUP_LOCK_H
 /*
diff --git a/kernel/include/linux/bootmem.h b/kernel/include/linux/bootmem.h
index e223d91b6..fdf40ca04 100644
--- a/kernel/include/linux/bootmem.h
+++ b/kernel/include/linux/bootmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Discontiguous memory support, Kanoj Sarcar, SGI, Nov 1999
  */
diff --git a/kernel/include/linux/bottom_half.h b/kernel/include/linux/bottom_half.h
index 8fdcb7831..a19519f42 100644
--- a/kernel/include/linux/bottom_half.h
+++ b/kernel/include/linux/bottom_half.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BH_H
 #define _LINUX_BH_H
 
diff --git a/kernel/include/linux/bpf-cgroup.h b/kernel/include/linux/bpf-cgroup.h
index d41d40ac3..44dfae288 100644
--- a/kernel/include/linux/bpf-cgroup.h
+++ b/kernel/include/linux/bpf-cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BPF_CGROUP_H
 #define _BPF_CGROUP_H
 
diff --git a/kernel/include/linux/bpf_trace.h b/kernel/include/linux/bpf_trace.h
index b22efbdd2..e6fe98ae3 100644
--- a/kernel/include/linux/bpf_trace.h
+++ b/kernel/include/linux/bpf_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BPF_TRACE_H__
 #define __LINUX_BPF_TRACE_H__
 
diff --git a/kernel/include/linux/bpf_types.h b/kernel/include/linux/bpf_types.h
index 6f1a56766..e1149327a 100644
--- a/kernel/include/linux/bpf_types.h
+++ b/kernel/include/linux/bpf_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* internal file - do not include directly */
 
 #ifdef CONFIG_NET
diff --git a/kernel/include/linux/brcmphy.h b/kernel/include/linux/brcmphy.h
index abcda9b45..4f087f86a 100644
--- a/kernel/include/linux/brcmphy.h
+++ b/kernel/include/linux/brcmphy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BRCMPHY_H
 #define _LINUX_BRCMPHY_H
 
diff --git a/kernel/include/linux/bsearch.h b/kernel/include/linux/bsearch.h
index 90b1aa867..62b1eb348 100644
--- a/kernel/include/linux/bsearch.h
+++ b/kernel/include/linux/bsearch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BSEARCH_H
 #define _LINUX_BSEARCH_H
 
diff --git a/kernel/include/linux/bsg.h b/kernel/include/linux/bsg.h
index 7173f6e9d..2a202e41a 100644
--- a/kernel/include/linux/bsg.h
+++ b/kernel/include/linux/bsg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BSG_H
 #define BSG_H
 
diff --git a/kernel/include/linux/btree-128.h b/kernel/include/linux/btree-128.h
index 0b3414c4c..22c09f5c3 100644
--- a/kernel/include/linux/btree-128.h
+++ b/kernel/include/linux/btree-128.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern struct btree_geo btree_geo128;
 
 struct btree_head128 { struct btree_head h; };
diff --git a/kernel/include/linux/btree-type.h b/kernel/include/linux/btree-type.h
index 9a1147ef8..fb34a52c7 100644
--- a/kernel/include/linux/btree-type.h
+++ b/kernel/include/linux/btree-type.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define __BTREE_TP(pfx, type, sfx)	pfx ## type ## sfx
 #define _BTREE_TP(pfx, type, sfx)	__BTREE_TP(pfx, type, sfx)
 #define BTREE_TP(pfx)			_BTREE_TP(pfx, BTREE_TYPE_SUFFIX,)
diff --git a/kernel/include/linux/btree.h b/kernel/include/linux/btree.h
index 65b5bb058..68f858c83 100644
--- a/kernel/include/linux/btree.h
+++ b/kernel/include/linux/btree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BTREE_H
 #define BTREE_H
 
diff --git a/kernel/include/linux/btrfs.h b/kernel/include/linux/btrfs.h
index 22d799147..9a37a45ec 100644
--- a/kernel/include/linux/btrfs.h
+++ b/kernel/include/linux/btrfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BTRFS_H
 #define _LINUX_BTRFS_H
 
diff --git a/kernel/include/linux/buffer_head.h b/kernel/include/linux/buffer_head.h
index 446b24cac..afa37f807 100644
--- a/kernel/include/linux/buffer_head.h
+++ b/kernel/include/linux/buffer_head.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/buffer_head.h
  *
diff --git a/kernel/include/linux/bug.h b/kernel/include/linux/bug.h
index 5d5554c87..da4231c90 100644
--- a/kernel/include/linux/bug.h
+++ b/kernel/include/linux/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BUG_H
 #define _LINUX_BUG_H
 
diff --git a/kernel/include/linux/build_bug.h b/kernel/include/linux/build_bug.h
index b7d22d600..3efed0d74 100644
--- a/kernel/include/linux/build_bug.h
+++ b/kernel/include/linux/build_bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BUILD_BUG_H
 #define _LINUX_BUILD_BUG_H
 
diff --git a/kernel/include/linux/byteorder/big_endian.h b/kernel/include/linux/byteorder/big_endian.h
index ffd215988..d64a524d3 100644
--- a/kernel/include/linux/byteorder/big_endian.h
+++ b/kernel/include/linux/byteorder/big_endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BYTEORDER_BIG_ENDIAN_H
 #define _LINUX_BYTEORDER_BIG_ENDIAN_H
 
diff --git a/kernel/include/linux/byteorder/generic.h b/kernel/include/linux/byteorder/generic.h
index 89f67c1c3..133b76d0d 100644
--- a/kernel/include/linux/byteorder/generic.h
+++ b/kernel/include/linux/byteorder/generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BYTEORDER_GENERIC_H
 #define _LINUX_BYTEORDER_GENERIC_H
 
diff --git a/kernel/include/linux/byteorder/little_endian.h b/kernel/include/linux/byteorder/little_endian.h
index ba910bb9a..1ec650ff7 100644
--- a/kernel/include/linux/byteorder/little_endian.h
+++ b/kernel/include/linux/byteorder/little_endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_BYTEORDER_LITTLE_ENDIAN_H
 #define _LINUX_BYTEORDER_LITTLE_ENDIAN_H
 
diff --git a/kernel/include/linux/cache.h b/kernel/include/linux/cache.h
index 1be04f8c5..750621e41 100644
--- a/kernel/include/linux/cache.h
+++ b/kernel/include/linux/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_CACHE_H
 #define __LINUX_CACHE_H
 
diff --git a/kernel/include/linux/cacheinfo.h b/kernel/include/linux/cacheinfo.h
index 6a524bf6a..3d9805297 100644
--- a/kernel/include/linux/cacheinfo.h
+++ b/kernel/include/linux/cacheinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CACHEINFO_H
 #define _LINUX_CACHEINFO_H
 
diff --git a/kernel/include/linux/can/core.h b/kernel/include/linux/can/core.h
index c9a17bb12..6099bc18b 100644
--- a/kernel/include/linux/can/core.h
+++ b/kernel/include/linux/can/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/can/core.h
  *
diff --git a/kernel/include/linux/can/dev.h b/kernel/include/linux/can/dev.h
index 141b05aad..61f1cf2d9 100644
--- a/kernel/include/linux/can/dev.h
+++ b/kernel/include/linux/can/dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/can/dev.h
  *
diff --git a/kernel/include/linux/can/platform/cc770.h b/kernel/include/linux/can/platform/cc770.h
index 78b2d44f0..9587d6882 100644
--- a/kernel/include/linux/can/platform/cc770.h
+++ b/kernel/include/linux/can/platform/cc770.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CAN_PLATFORM_CC770_H
 #define _CAN_PLATFORM_CC770_H
 
diff --git a/kernel/include/linux/can/platform/mcp251x.h b/kernel/include/linux/can/platform/mcp251x.h
index d44fcae27..9e5ac27fb 100644
--- a/kernel/include/linux/can/platform/mcp251x.h
+++ b/kernel/include/linux/can/platform/mcp251x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CAN_PLATFORM_MCP251X_H
 #define _CAN_PLATFORM_MCP251X_H
 
diff --git a/kernel/include/linux/can/platform/rcar_can.h b/kernel/include/linux/can/platform/rcar_can.h
index 0f4a2f3df..a43dcd0cf 100644
--- a/kernel/include/linux/can/platform/rcar_can.h
+++ b/kernel/include/linux/can/platform/rcar_can.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CAN_PLATFORM_RCAR_CAN_H_
 #define _CAN_PLATFORM_RCAR_CAN_H_
 
diff --git a/kernel/include/linux/can/platform/sja1000.h b/kernel/include/linux/can/platform/sja1000.h
index 93570b61e..5755ae5a4 100644
--- a/kernel/include/linux/can/platform/sja1000.h
+++ b/kernel/include/linux/can/platform/sja1000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CAN_PLATFORM_SJA1000_H
 #define _CAN_PLATFORM_SJA1000_H
 
diff --git a/kernel/include/linux/can/skb.h b/kernel/include/linux/can/skb.h
index 51bb65327..b3379a972 100644
--- a/kernel/include/linux/can/skb.h
+++ b/kernel/include/linux/can/skb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/can/skb.h
  *
diff --git a/kernel/include/linux/capability.h b/kernel/include/linux/capability.h
index b52e278e4..f640dcbc8 100644
--- a/kernel/include/linux/capability.h
+++ b/kernel/include/linux/capability.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is <linux/capability.h>
  *
diff --git a/kernel/include/linux/cciss_ioctl.h b/kernel/include/linux/cciss_ioctl.h
index 84b6e2d0f..1d5229200 100644
--- a/kernel/include/linux/cciss_ioctl.h
+++ b/kernel/include/linux/cciss_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CCISS_IOCTLH
 #define CCISS_IOCTLH
 
diff --git a/kernel/include/linux/cdev.h b/kernel/include/linux/cdev.h
index cb28eb21e..0e8cd6293 100644
--- a/kernel/include/linux/cdev.h
+++ b/kernel/include/linux/cdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CDEV_H
 #define _LINUX_CDEV_H
 
diff --git a/kernel/include/linux/cdrom.h b/kernel/include/linux/cdrom.h
index 6e8f209a6..e75dfd1f1 100644
--- a/kernel/include/linux/cdrom.h
+++ b/kernel/include/linux/cdrom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * -- <linux/cdrom.h>
  * General header file for linux CD-ROM drivers 
diff --git a/kernel/include/linux/ceph/auth.h b/kernel/include/linux/ceph/auth.h
index a6747789f..e931da842 100644
--- a/kernel/include/linux/ceph/auth.h
+++ b/kernel/include/linux/ceph/auth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_AUTH_H
 #define _FS_CEPH_AUTH_H
 
diff --git a/kernel/include/linux/ceph/buffer.h b/kernel/include/linux/ceph/buffer.h
index 07ca15e76..5e58bb29b 100644
--- a/kernel/include/linux/ceph/buffer.h
+++ b/kernel/include/linux/ceph/buffer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __FS_CEPH_BUFFER_H
 #define __FS_CEPH_BUFFER_H
 
diff --git a/kernel/include/linux/ceph/ceph_debug.h b/kernel/include/linux/ceph/ceph_debug.h
index 51c5bd64b..d5a5da838 100644
--- a/kernel/include/linux/ceph/ceph_debug.h
+++ b/kernel/include/linux/ceph/ceph_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_DEBUG_H
 #define _FS_CEPH_DEBUG_H
 
diff --git a/kernel/include/linux/ceph/ceph_features.h b/kernel/include/linux/ceph/ceph_features.h
index 040dd105c..59042d5ac 100644
--- a/kernel/include/linux/ceph/ceph_features.h
+++ b/kernel/include/linux/ceph/ceph_features.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CEPH_FEATURES
 #define __CEPH_FEATURES
 
diff --git a/kernel/include/linux/ceph/ceph_frag.h b/kernel/include/linux/ceph/ceph_frag.h
index 146507df8..97bab0adc 100644
--- a/kernel/include/linux/ceph/ceph_frag.h
+++ b/kernel/include/linux/ceph/ceph_frag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_CEPH_FRAG_H
 #define FS_CEPH_FRAG_H
 
diff --git a/kernel/include/linux/ceph/ceph_fs.h b/kernel/include/linux/ceph/ceph_fs.h
index b422170b7..88dd51381 100644
--- a/kernel/include/linux/ceph/ceph_fs.h
+++ b/kernel/include/linux/ceph/ceph_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ceph_fs.h - Ceph constants and data types to share between kernel and
  * user space.
diff --git a/kernel/include/linux/ceph/ceph_hash.h b/kernel/include/linux/ceph/ceph_hash.h
index d099c3f90..fda474c7a 100644
--- a/kernel/include/linux/ceph/ceph_hash.h
+++ b/kernel/include/linux/ceph/ceph_hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FS_CEPH_HASH_H
 #define FS_CEPH_HASH_H
 
diff --git a/kernel/include/linux/ceph/cls_lock_client.h b/kernel/include/linux/ceph/cls_lock_client.h
index 0594d3bba..bea6c77d2 100644
--- a/kernel/include/linux/ceph/cls_lock_client.h
+++ b/kernel/include/linux/ceph/cls_lock_client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CEPH_CLS_LOCK_CLIENT_H
 #define _LINUX_CEPH_CLS_LOCK_CLIENT_H
 
diff --git a/kernel/include/linux/ceph/debugfs.h b/kernel/include/linux/ceph/debugfs.h
index 29cf897cc..fa5f9b7f5 100644
--- a/kernel/include/linux/ceph/debugfs.h
+++ b/kernel/include/linux/ceph/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_DEBUGFS_H
 #define _FS_CEPH_DEBUGFS_H
 
diff --git a/kernel/include/linux/ceph/decode.h b/kernel/include/linux/ceph/decode.h
index 14af9b70d..d143ac887 100644
--- a/kernel/include/linux/ceph/decode.h
+++ b/kernel/include/linux/ceph/decode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CEPH_DECODE_H
 #define __CEPH_DECODE_H
 
diff --git a/kernel/include/linux/ceph/libceph.h b/kernel/include/linux/ceph/libceph.h
index 4c846aabd..c2ec44cf5 100644
--- a/kernel/include/linux/ceph/libceph.h
+++ b/kernel/include/linux/ceph/libceph.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_LIBCEPH_H
 #define _FS_CEPH_LIBCEPH_H
 
diff --git a/kernel/include/linux/ceph/mdsmap.h b/kernel/include/linux/ceph/mdsmap.h
index d5f783f32..0067d767c 100644
--- a/kernel/include/linux/ceph/mdsmap.h
+++ b/kernel/include/linux/ceph/mdsmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_MDSMAP_H
 #define _FS_CEPH_MDSMAP_H
 
diff --git a/kernel/include/linux/ceph/messenger.h b/kernel/include/linux/ceph/messenger.h
index fbd94d9fa..ead9d85f1 100644
--- a/kernel/include/linux/ceph/messenger.h
+++ b/kernel/include/linux/ceph/messenger.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __FS_CEPH_MESSENGER_H
 #define __FS_CEPH_MESSENGER_H
 
diff --git a/kernel/include/linux/ceph/mon_client.h b/kernel/include/linux/ceph/mon_client.h
index 0fa990bf8..3a4688af7 100644
--- a/kernel/include/linux/ceph/mon_client.h
+++ b/kernel/include/linux/ceph/mon_client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_MON_CLIENT_H
 #define _FS_CEPH_MON_CLIENT_H
 
diff --git a/kernel/include/linux/ceph/msgpool.h b/kernel/include/linux/ceph/msgpool.h
index ddd0d48d0..76c98a512 100644
--- a/kernel/include/linux/ceph/msgpool.h
+++ b/kernel/include/linux/ceph/msgpool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_MSGPOOL
 #define _FS_CEPH_MSGPOOL
 
diff --git a/kernel/include/linux/ceph/msgr.h b/kernel/include/linux/ceph/msgr.h
index 0fe2656ac..73ae2a926 100644
--- a/kernel/include/linux/ceph/msgr.h
+++ b/kernel/include/linux/ceph/msgr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CEPH_MSGR_H
 #define CEPH_MSGR_H
 
diff --git a/kernel/include/linux/ceph/osd_client.h b/kernel/include/linux/ceph/osd_client.h
index adf670eca..52fb37d1c 100644
--- a/kernel/include/linux/ceph/osd_client.h
+++ b/kernel/include/linux/ceph/osd_client.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_OSD_CLIENT_H
 #define _FS_CEPH_OSD_CLIENT_H
 
diff --git a/kernel/include/linux/ceph/osdmap.h b/kernel/include/linux/ceph/osdmap.h
index af3444a5b..d41fad99c 100644
--- a/kernel/include/linux/ceph/osdmap.h
+++ b/kernel/include/linux/ceph/osdmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_OSDMAP_H
 #define _FS_CEPH_OSDMAP_H
 
diff --git a/kernel/include/linux/ceph/pagelist.h b/kernel/include/linux/ceph/pagelist.h
index 75a7db214..7edcded07 100644
--- a/kernel/include/linux/ceph/pagelist.h
+++ b/kernel/include/linux/ceph/pagelist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __FS_CEPH_PAGELIST_H
 #define __FS_CEPH_PAGELIST_H
 
diff --git a/kernel/include/linux/ceph/rados.h b/kernel/include/linux/ceph/rados.h
index 01408841c..f1988387c 100644
--- a/kernel/include/linux/ceph/rados.h
+++ b/kernel/include/linux/ceph/rados.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CEPH_RADOS_H
 #define CEPH_RADOS_H
 
diff --git a/kernel/include/linux/ceph/string_table.h b/kernel/include/linux/ceph/string_table.h
index 1b02c96da..a4a9962d1 100644
--- a/kernel/include/linux/ceph/string_table.h
+++ b/kernel/include/linux/ceph/string_table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_STRING_TABLE_H
 #define _FS_CEPH_STRING_TABLE_H
 
diff --git a/kernel/include/linux/ceph/types.h b/kernel/include/linux/ceph/types.h
index d3ff1cf2d..27cd973d3 100644
--- a/kernel/include/linux/ceph/types.h
+++ b/kernel/include/linux/ceph/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_TYPES_H
 #define _FS_CEPH_TYPES_H
 
diff --git a/kernel/include/linux/cgroup-defs.h b/kernel/include/linux/cgroup-defs.h
index ade4a78a5..1dff0a478 100644
--- a/kernel/include/linux/cgroup-defs.h
+++ b/kernel/include/linux/cgroup-defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/cgroup-defs.h - basic definitions for cgroup
  *
diff --git a/kernel/include/linux/cgroup.h b/kernel/include/linux/cgroup.h
index d023ac5e3..dddbc29e2 100644
--- a/kernel/include/linux/cgroup.h
+++ b/kernel/include/linux/cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CGROUP_H
 #define _LINUX_CGROUP_H
 /*
diff --git a/kernel/include/linux/cgroup_subsys.h b/kernel/include/linux/cgroup_subsys.h
index d0e597c44..acb77dcff 100644
--- a/kernel/include/linux/cgroup_subsys.h
+++ b/kernel/include/linux/cgroup_subsys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * List of cgroup subsystems.
  *
diff --git a/kernel/include/linux/circ_buf.h b/kernel/include/linux/circ_buf.h
index 90f2471dc..7cf262a42 100644
--- a/kernel/include/linux/circ_buf.h
+++ b/kernel/include/linux/circ_buf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * See Documentation/circular-buffers.txt for more information.
  */
diff --git a/kernel/include/linux/cleancache.h b/kernel/include/linux/cleancache.h
index bbb3712dd..5f5730c1d 100644
--- a/kernel/include/linux/cleancache.h
+++ b/kernel/include/linux/cleancache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CLEANCACHE_H
 #define _LINUX_CLEANCACHE_H
 
diff --git a/kernel/include/linux/clk/mmp.h b/kernel/include/linux/clk/mmp.h
index 607321fa2..445130460 100644
--- a/kernel/include/linux/clk/mmp.h
+++ b/kernel/include/linux/clk/mmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CLK_MMP_H
 #define __CLK_MMP_H
 
diff --git a/kernel/include/linux/clockchips.h b/kernel/include/linux/clockchips.h
index a11692659..8ae9a95eb 100644
--- a/kernel/include/linux/clockchips.h
+++ b/kernel/include/linux/clockchips.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*  linux/include/linux/clockchips.h
  *
  *  This file contains the structure definitions for clockchips.
diff --git a/kernel/include/linux/clocksource.h b/kernel/include/linux/clocksource.h
index a78cb1848..7dff1963c 100644
--- a/kernel/include/linux/clocksource.h
+++ b/kernel/include/linux/clocksource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*  linux/include/linux/clocksource.h
  *
  *  This file contains the structure definitions for clocksources.
diff --git a/kernel/include/linux/cm4000_cs.h b/kernel/include/linux/cm4000_cs.h
index 88bee3a33..ea4958e07 100644
--- a/kernel/include/linux/cm4000_cs.h
+++ b/kernel/include/linux/cm4000_cs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	_CM4000_H_
 #define	_CM4000_H_
 
diff --git a/kernel/include/linux/cma.h b/kernel/include/linux/cma.h
index 3e8fbf5a5..bf90f0bb4 100644
--- a/kernel/include/linux/cma.h
+++ b/kernel/include/linux/cma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CMA_H__
 #define __CMA_H__
 
diff --git a/kernel/include/linux/cmdline-parser.h b/kernel/include/linux/cmdline-parser.h
index 2e6dce6e5..68a541807 100644
--- a/kernel/include/linux/cmdline-parser.h
+++ b/kernel/include/linux/cmdline-parser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Parsing command line, get the partitions information.
  *
diff --git a/kernel/include/linux/coda_psdev.h b/kernel/include/linux/coda_psdev.h
index 31e4e1f15..15170954a 100644
--- a/kernel/include/linux/coda_psdev.h
+++ b/kernel/include/linux/coda_psdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CODA_PSDEV_H
 #define __CODA_PSDEV_H
 
diff --git a/kernel/include/linux/compaction.h b/kernel/include/linux/compaction.h
index 0d8415820..68250a57a 100644
--- a/kernel/include/linux/compaction.h
+++ b/kernel/include/linux/compaction.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_COMPACTION_H
 #define _LINUX_COMPACTION_H
 
diff --git a/kernel/include/linux/compat.h b/kernel/include/linux/compat.h
index a5619de34..3e838a828 100644
--- a/kernel/include/linux/compat.h
+++ b/kernel/include/linux/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_COMPAT_H
 #define _LINUX_COMPAT_H
 /*
diff --git a/kernel/include/linux/compiler-clang.h b/kernel/include/linux/compiler-clang.h
index de179993e..54dfef70a 100644
--- a/kernel/include/linux/compiler-clang.h
+++ b/kernel/include/linux/compiler-clang.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_COMPILER_H
 #error "Please don't include <linux/compiler-clang.h> directly, include <linux/compiler.h> instead."
 #endif
diff --git a/kernel/include/linux/compiler-gcc.h b/kernel/include/linux/compiler-gcc.h
index 16d41de92..bb78e5bdf 100644
--- a/kernel/include/linux/compiler-gcc.h
+++ b/kernel/include/linux/compiler-gcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_COMPILER_H
 #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
 #endif
diff --git a/kernel/include/linux/compiler-intel.h b/kernel/include/linux/compiler-intel.h
index d4c71132d..523d1b745 100644
--- a/kernel/include/linux/compiler-intel.h
+++ b/kernel/include/linux/compiler-intel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_COMPILER_H
 #error "Please don't include <linux/compiler-intel.h> directly, include <linux/compiler.h> instead."
 #endif
diff --git a/kernel/include/linux/compiler.h b/kernel/include/linux/compiler.h
index e95a2631e..202710420 100644
--- a/kernel/include/linux/compiler.h
+++ b/kernel/include/linux/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_COMPILER_H
 #define __LINUX_COMPILER_H
 
@@ -190,13 +191,13 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
 	asm("%c0:\n\t"							\
 	    ".pushsection .discard.reachable\n\t"			\
 	    ".long %c0b - .\n\t"					\
-	    ".popsection\n\t" : : "i" (__LINE__));			\
+	    ".popsection\n\t" : : "i" (__COUNTER__));			\
 })
 #define annotate_unreachable() ({					\
 	asm("%c0:\n\t"							\
 	    ".pushsection .discard.unreachable\n\t"			\
 	    ".long %c0b - .\n\t"					\
-	    ".popsection\n\t" : : "i" (__LINE__));			\
+	    ".popsection\n\t" : : "i" (__COUNTER__));			\
 })
 #define ASM_UNREACHABLE							\
 	"999:\n\t"							\
diff --git a/kernel/include/linux/completion.h b/kernel/include/linux/completion.h
index cae540002..7828451e1 100644
--- a/kernel/include/linux/completion.h
+++ b/kernel/include/linux/completion.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_COMPLETION_H
 #define __LINUX_COMPLETION_H
 
diff --git a/kernel/include/linux/component.h b/kernel/include/linux/component.h
index a559eebc0..e71fbbbc7 100644
--- a/kernel/include/linux/component.h
+++ b/kernel/include/linux/component.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef COMPONENT_H
 #define COMPONENT_H
 
diff --git a/kernel/include/linux/console_struct.h b/kernel/include/linux/console_struct.h
index 6fd3c908a..c0ec478ea 100644
--- a/kernel/include/linux/console_struct.h
+++ b/kernel/include/linux/console_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * console_struct.h
  *
diff --git a/kernel/include/linux/consolemap.h b/kernel/include/linux/consolemap.h
index c4811da13..254246673 100644
--- a/kernel/include/linux/consolemap.h
+++ b/kernel/include/linux/consolemap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * consolemap.h
  *
diff --git a/kernel/include/linux/context_tracking.h b/kernel/include/linux/context_tracking.h
index c78fc2741..d05609ad3 100644
--- a/kernel/include/linux/context_tracking.h
+++ b/kernel/include/linux/context_tracking.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CONTEXT_TRACKING_H
 #define _LINUX_CONTEXT_TRACKING_H
 
diff --git a/kernel/include/linux/context_tracking_state.h b/kernel/include/linux/context_tracking_state.h
index 1d34fe68f..f128dc3be 100644
--- a/kernel/include/linux/context_tracking_state.h
+++ b/kernel/include/linux/context_tracking_state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CONTEXT_TRACKING_STATE_H
 #define _LINUX_CONTEXT_TRACKING_STATE_H
 
diff --git a/kernel/include/linux/coredump.h b/kernel/include/linux/coredump.h
index 28ffa94ae..207aed96a 100644
--- a/kernel/include/linux/coredump.h
+++ b/kernel/include/linux/coredump.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_COREDUMP_H
 #define _LINUX_COREDUMP_H
 
diff --git a/kernel/include/linux/coresight-stm.h b/kernel/include/linux/coresight-stm.h
index a978bb855..74714b59f 100644
--- a/kernel/include/linux/coresight-stm.h
+++ b/kernel/include/linux/coresight-stm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_CORESIGHT_STM_H_
 #define __LINUX_CORESIGHT_STM_H_
 
diff --git a/kernel/include/linux/cpu.h b/kernel/include/linux/cpu.h
index ca73bc156..938ea8ae0 100644
--- a/kernel/include/linux/cpu.h
+++ b/kernel/include/linux/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/cpu.h - generic cpu definition
  *
diff --git a/kernel/include/linux/cpuhotplug.h b/kernel/include/linux/cpuhotplug.h
index 6d508767e..2477a5cb5 100644
--- a/kernel/include/linux/cpuhotplug.h
+++ b/kernel/include/linux/cpuhotplug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPUHOTPLUG_H
 #define __CPUHOTPLUG_H
 
diff --git a/kernel/include/linux/cpumask.h b/kernel/include/linux/cpumask.h
index cd415b733..8d3125c49 100644
--- a/kernel/include/linux/cpumask.h
+++ b/kernel/include/linux/cpumask.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_CPUMASK_H
 #define __LINUX_CPUMASK_H
 
diff --git a/kernel/include/linux/cpuset.h b/kernel/include/linux/cpuset.h
index a1e6a33a4..1b8e41597 100644
--- a/kernel/include/linux/cpuset.h
+++ b/kernel/include/linux/cpuset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CPUSET_H
 #define _LINUX_CPUSET_H
 /*
diff --git a/kernel/include/linux/crash_core.h b/kernel/include/linux/crash_core.h
index 2df2118fb..06097ef30 100644
--- a/kernel/include/linux/crash_core.h
+++ b/kernel/include/linux/crash_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_CRASH_CORE_H
 #define LINUX_CRASH_CORE_H
 
diff --git a/kernel/include/linux/crash_dump.h b/kernel/include/linux/crash_dump.h
index 3873697ba..a992e6ca2 100644
--- a/kernel/include/linux/crash_dump.h
+++ b/kernel/include/linux/crash_dump.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_CRASH_DUMP_H
 #define LINUX_CRASH_DUMP_H
 
diff --git a/kernel/include/linux/crc-ccitt.h b/kernel/include/linux/crc-ccitt.h
index f52696a1f..cd4f42023 100644
--- a/kernel/include/linux/crc-ccitt.h
+++ b/kernel/include/linux/crc-ccitt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CRC_CCITT_H
 #define _LINUX_CRC_CCITT_H
 
diff --git a/kernel/include/linux/crc-t10dif.h b/kernel/include/linux/crc-t10dif.h
index d81961e9e..1fe0cfcde 100644
--- a/kernel/include/linux/crc-t10dif.h
+++ b/kernel/include/linux/crc-t10dif.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CRC_T10DIF_H
 #define _LINUX_CRC_T10DIF_H
 
diff --git a/kernel/include/linux/crc32c.h b/kernel/include/linux/crc32c.h
index bd8b44d96..357ae4611 100644
--- a/kernel/include/linux/crc32c.h
+++ b/kernel/include/linux/crc32c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CRC32C_H
 #define _LINUX_CRC32C_H
 
diff --git a/kernel/include/linux/crc4.h b/kernel/include/linux/crc4.h
index 8f739f1d7..bd2c90556 100644
--- a/kernel/include/linux/crc4.h
+++ b/kernel/include/linux/crc4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CRC4_H
 #define _LINUX_CRC4_H
 
diff --git a/kernel/include/linux/crc7.h b/kernel/include/linux/crc7.h
index d59076510..b462842f3 100644
--- a/kernel/include/linux/crc7.h
+++ b/kernel/include/linux/crc7.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CRC7_H
 #define _LINUX_CRC7_H
 #include <linux/types.h>
diff --git a/kernel/include/linux/crush/crush.h b/kernel/include/linux/crush/crush.h
index 07eed95e1..54741295c 100644
--- a/kernel/include/linux/crush/crush.h
+++ b/kernel/include/linux/crush/crush.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CEPH_CRUSH_CRUSH_H
 #define CEPH_CRUSH_CRUSH_H
 
diff --git a/kernel/include/linux/crush/hash.h b/kernel/include/linux/crush/hash.h
index d1d902582..904df41f7 100644
--- a/kernel/include/linux/crush/hash.h
+++ b/kernel/include/linux/crush/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CEPH_CRUSH_HASH_H
 #define CEPH_CRUSH_HASH_H
 
diff --git a/kernel/include/linux/crush/mapper.h b/kernel/include/linux/crush/mapper.h
index 141edabb9..f9b99232f 100644
--- a/kernel/include/linux/crush/mapper.h
+++ b/kernel/include/linux/crush/mapper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CEPH_CRUSH_MAPPER_H
 #define CEPH_CRUSH_MAPPER_H
 
diff --git a/kernel/include/linux/cryptohash.h b/kernel/include/linux/cryptohash.h
index df4d3e943..f6ba4c3e6 100644
--- a/kernel/include/linux/cryptohash.h
+++ b/kernel/include/linux/cryptohash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CRYPTOHASH_H
 #define __CRYPTOHASH_H
 
diff --git a/kernel/include/linux/ctype.h b/kernel/include/linux/ctype.h
index f13e4ff68..363b00442 100644
--- a/kernel/include/linux/ctype.h
+++ b/kernel/include/linux/ctype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CTYPE_H
 #define _LINUX_CTYPE_H
 
diff --git a/kernel/include/linux/cuda.h b/kernel/include/linux/cuda.h
index b72332823..056867f09 100644
--- a/kernel/include/linux/cuda.h
+++ b/kernel/include/linux/cuda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for talking to the CUDA.  The CUDA is a microcontroller
  * which controls the ADB, system power, RTC, and various other things.
diff --git a/kernel/include/linux/cyclades.h b/kernel/include/linux/cyclades.h
index 19ae518f5..83925bd12 100644
--- a/kernel/include/linux/cyclades.h
+++ b/kernel/include/linux/cyclades.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Revision: 3.0 $$Date: 1998/11/02 14:20:59 $
  * linux/include/linux/cyclades.h
  *
diff --git a/kernel/include/linux/dax.h b/kernel/include/linux/dax.h
index 122197124..895e16fcc 100644
--- a/kernel/include/linux/dax.h
+++ b/kernel/include/linux/dax.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DAX_H
 #define _LINUX_DAX_H
 
diff --git a/kernel/include/linux/dcache.h b/kernel/include/linux/dcache.h
index ed1a7cf69..f05a659cd 100644
--- a/kernel/include/linux/dcache.h
+++ b/kernel/include/linux/dcache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_DCACHE_H
 #define __LINUX_DCACHE_H
 
diff --git a/kernel/include/linux/dccp.h b/kernel/include/linux/dccp.h
index 68449293c..6b64b6cc2 100644
--- a/kernel/include/linux/dccp.h
+++ b/kernel/include/linux/dccp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DCCP_H
 #define _LINUX_DCCP_H
 
diff --git a/kernel/include/linux/dcookies.h b/kernel/include/linux/dcookies.h
index 699b6c499..ddfdac20c 100644
--- a/kernel/include/linux/dcookies.h
+++ b/kernel/include/linux/dcookies.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * dcookies.h
  *
diff --git a/kernel/include/linux/debug_locks.h b/kernel/include/linux/debug_locks.h
index 822c1354f..120225e9a 100644
--- a/kernel/include/linux/debug_locks.h
+++ b/kernel/include/linux/debug_locks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_DEBUG_LOCKING_H
 #define __LINUX_DEBUG_LOCKING_H
 
diff --git a/kernel/include/linux/debugobjects.h b/kernel/include/linux/debugobjects.h
index d82bf1994..afc416e5d 100644
--- a/kernel/include/linux/debugobjects.h
+++ b/kernel/include/linux/debugobjects.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DEBUGOBJECTS_H
 #define _LINUX_DEBUGOBJECTS_H
 
diff --git a/kernel/include/linux/decompress/bunzip2.h b/kernel/include/linux/decompress/bunzip2.h
index 4d683df89..586016394 100644
--- a/kernel/include/linux/decompress/bunzip2.h
+++ b/kernel/include/linux/decompress/bunzip2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DECOMPRESS_BUNZIP2_H
 #define DECOMPRESS_BUNZIP2_H
 
diff --git a/kernel/include/linux/decompress/generic.h b/kernel/include/linux/decompress/generic.h
index 1fcfd64b5..207d80138 100644
--- a/kernel/include/linux/decompress/generic.h
+++ b/kernel/include/linux/decompress/generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DECOMPRESS_GENERIC_H
 #define DECOMPRESS_GENERIC_H
 
diff --git a/kernel/include/linux/decompress/inflate.h b/kernel/include/linux/decompress/inflate.h
index e4f411fdb..b65f24e7d 100644
--- a/kernel/include/linux/decompress/inflate.h
+++ b/kernel/include/linux/decompress/inflate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_DECOMPRESS_INFLATE_H
 #define LINUX_DECOMPRESS_INFLATE_H
 
diff --git a/kernel/include/linux/decompress/mm.h b/kernel/include/linux/decompress/mm.h
index 7925bf0ee..868e9eacd 100644
--- a/kernel/include/linux/decompress/mm.h
+++ b/kernel/include/linux/decompress/mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/compr_mm.h
  *
diff --git a/kernel/include/linux/decompress/unlz4.h b/kernel/include/linux/decompress/unlz4.h
index 3273c2f36..5a235f605 100644
--- a/kernel/include/linux/decompress/unlz4.h
+++ b/kernel/include/linux/decompress/unlz4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DECOMPRESS_UNLZ4_H
 #define DECOMPRESS_UNLZ4_H
 
diff --git a/kernel/include/linux/decompress/unlzma.h b/kernel/include/linux/decompress/unlzma.h
index 8a891a193..1c930f125 100644
--- a/kernel/include/linux/decompress/unlzma.h
+++ b/kernel/include/linux/decompress/unlzma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DECOMPRESS_UNLZMA_H
 #define DECOMPRESS_UNLZMA_H
 
diff --git a/kernel/include/linux/decompress/unlzo.h b/kernel/include/linux/decompress/unlzo.h
index af18f95d6..550ae8783 100644
--- a/kernel/include/linux/decompress/unlzo.h
+++ b/kernel/include/linux/decompress/unlzo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DECOMPRESS_UNLZO_H
 #define DECOMPRESS_UNLZO_H
 
diff --git a/kernel/include/linux/delay.h b/kernel/include/linux/delay.h
index 2ecb3c46b..b78bab439 100644
--- a/kernel/include/linux/delay.h
+++ b/kernel/include/linux/delay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DELAY_H
 #define _LINUX_DELAY_H
 
diff --git a/kernel/include/linux/delayed_call.h b/kernel/include/linux/delayed_call.h
index f7fa76ae1..a26c3b95b 100644
--- a/kernel/include/linux/delayed_call.h
+++ b/kernel/include/linux/delayed_call.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DELAYED_CALL_H
 #define _DELAYED_CALL_H
 
diff --git a/kernel/include/linux/dell-led.h b/kernel/include/linux/dell-led.h
index 3f033c480..925214715 100644
--- a/kernel/include/linux/dell-led.h
+++ b/kernel/include/linux/dell-led.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DELL_LED_H__
 #define __DELL_LED_H__
 
diff --git a/kernel/include/linux/device_cgroup.h b/kernel/include/linux/device_cgroup.h
index 8b64221b4..cdbc344a9 100644
--- a/kernel/include/linux/device_cgroup.h
+++ b/kernel/include/linux/device_cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fs.h>
 
 #ifdef CONFIG_CGROUP_DEVICE
diff --git a/kernel/include/linux/dio.h b/kernel/include/linux/dio.h
index 2cc0fd004..1470d1d94 100644
--- a/kernel/include/linux/dio.h
+++ b/kernel/include/linux/dio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* header file for DIO boards for the HP300 architecture.
  * Maybe this should handle DIO-II later?
  * The general structure of this is vaguely based on how
diff --git a/kernel/include/linux/dirent.h b/kernel/include/linux/dirent.h
index f072fb8d1..fc61f3cff 100644
--- a/kernel/include/linux/dirent.h
+++ b/kernel/include/linux/dirent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DIRENT_H
 #define _LINUX_DIRENT_H
 
diff --git a/kernel/include/linux/dma-direction.h b/kernel/include/linux/dma-direction.h
index 95b6a82f5..3649a0318 100644
--- a/kernel/include/linux/dma-direction.h
+++ b/kernel/include/linux/dma-direction.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DMA_DIRECTION_H
 #define _LINUX_DMA_DIRECTION_H
 /*
diff --git a/kernel/include/linux/dma-mapping.h b/kernel/include/linux/dma-mapping.h
index 29ce9815d..7653ea668 100644
--- a/kernel/include/linux/dma-mapping.h
+++ b/kernel/include/linux/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DMA_MAPPING_H
 #define _LINUX_DMA_MAPPING_H
 
diff --git a/kernel/include/linux/dma/mmp-pdma.h b/kernel/include/linux/dma/mmp-pdma.h
index 2dc9b2bc1..25cab62a2 100644
--- a/kernel/include/linux/dma/mmp-pdma.h
+++ b/kernel/include/linux/dma/mmp-pdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MMP_PDMA_H_
 #define _MMP_PDMA_H_
 
diff --git a/kernel/include/linux/dma/pxa-dma.h b/kernel/include/linux/dma/pxa-dma.h
index 3edc99294..e56ec7af4 100644
--- a/kernel/include/linux/dma/pxa-dma.h
+++ b/kernel/include/linux/dma/pxa-dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PXA_DMA_H_
 #define _PXA_DMA_H_
 
diff --git a/kernel/include/linux/dma_remapping.h b/kernel/include/linux/dma_remapping.h
index 90884072f..21b3e7d33 100644
--- a/kernel/include/linux/dma_remapping.h
+++ b/kernel/include/linux/dma_remapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DMA_REMAPPING_H
 #define _DMA_REMAPPING_H
 
diff --git a/kernel/include/linux/dmi.h b/kernel/include/linux/dmi.h
index 9bbf21a51..46e151172 100644
--- a/kernel/include/linux/dmi.h
+++ b/kernel/include/linux/dmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DMI_H__
 #define __DMI_H__
 
diff --git a/kernel/include/linux/dnotify.h b/kernel/include/linux/dnotify.h
index 3290555a5..0aad774be 100644
--- a/kernel/include/linux/dnotify.h
+++ b/kernel/include/linux/dnotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DNOTIFY_H
 #define _LINUX_DNOTIFY_H
 /*
diff --git a/kernel/include/linux/dqblk_qtree.h b/kernel/include/linux/dqblk_qtree.h
index 0de21e935..100d22a46 100644
--- a/kernel/include/linux/dqblk_qtree.h
+++ b/kernel/include/linux/dqblk_qtree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Definitions of structures and functions for quota formats using trie
  */
diff --git a/kernel/include/linux/dqblk_v1.h b/kernel/include/linux/dqblk_v1.h
index c0d4d1e2a..85d837a14 100644
--- a/kernel/include/linux/dqblk_v1.h
+++ b/kernel/include/linux/dqblk_v1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	File with in-memory structures of old quota format
  */
diff --git a/kernel/include/linux/dqblk_v2.h b/kernel/include/linux/dqblk_v2.h
index 18000a542..da95932ad 100644
--- a/kernel/include/linux/dqblk_v2.h
+++ b/kernel/include/linux/dqblk_v2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Definitions for vfsv0 quota format
  */
diff --git a/kernel/include/linux/drbd_genl.h b/kernel/include/linux/drbd_genl.h
index 4e6d4d4c7..53f44b8cd 100644
--- a/kernel/include/linux/drbd_genl.h
+++ b/kernel/include/linux/drbd_genl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * General overview:
  * full generic netlink message:
diff --git a/kernel/include/linux/drbd_genl_api.h b/kernel/include/linux/drbd_genl_api.h
index 9ef50d51e..bd62efc29 100644
--- a/kernel/include/linux/drbd_genl_api.h
+++ b/kernel/include/linux/drbd_genl_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef DRBD_GENL_STRUCT_H
 #define DRBD_GENL_STRUCT_H
 
diff --git a/kernel/include/linux/drbd_limits.h b/kernel/include/linux/drbd_limits.h
index 24ae1b9b7..9e33f7038 100644
--- a/kernel/include/linux/drbd_limits.h
+++ b/kernel/include/linux/drbd_limits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   drbd_limits.h
   This file is part of DRBD by Philipp Reisner and Lars Ellenberg.
diff --git a/kernel/include/linux/ds2782_battery.h b/kernel/include/linux/ds2782_battery.h
index b4e281f65..fb6c97e10 100644
--- a/kernel/include/linux/ds2782_battery.h
+++ b/kernel/include/linux/ds2782_battery.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_DS2782_BATTERY_H
 #define __LINUX_DS2782_BATTERY_H
 
diff --git a/kernel/include/linux/dtlk.h b/kernel/include/linux/dtlk.h
index 22a7b9a5f..27b95e70b 100644
--- a/kernel/include/linux/dtlk.h
+++ b/kernel/include/linux/dtlk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define DTLK_MINOR	0
 #define DTLK_IO_EXTENT	0x02
 
diff --git a/kernel/include/linux/dynamic_debug.h b/kernel/include/linux/dynamic_debug.h
index 546d68057..2fd800615 100644
--- a/kernel/include/linux/dynamic_debug.h
+++ b/kernel/include/linux/dynamic_debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DYNAMIC_DEBUG_H
 #define _DYNAMIC_DEBUG_H
 
diff --git a/kernel/include/linux/dynamic_queue_limits.h b/kernel/include/linux/dynamic_queue_limits.h
index a4be70398..34c0a5464 100644
--- a/kernel/include/linux/dynamic_queue_limits.h
+++ b/kernel/include/linux/dynamic_queue_limits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Dynamic queue limits (dql) - Definitions
  *
diff --git a/kernel/include/linux/earlycpio.h b/kernel/include/linux/earlycpio.h
index 111f46d83..c70519267 100644
--- a/kernel/include/linux/earlycpio.h
+++ b/kernel/include/linux/earlycpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_EARLYCPIO_H
 #define _LINUX_EARLYCPIO_H
 
diff --git a/kernel/include/linux/ecryptfs.h b/kernel/include/linux/ecryptfs.h
index 8d5ab998a..91e142abf 100644
--- a/kernel/include/linux/ecryptfs.h
+++ b/kernel/include/linux/ecryptfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ECRYPTFS_H
 #define _LINUX_ECRYPTFS_H
 
diff --git a/kernel/include/linux/eeprom_93xx46.h b/kernel/include/linux/eeprom_93xx46.h
index 915898759..eec7928ff 100644
--- a/kernel/include/linux/eeprom_93xx46.h
+++ b/kernel/include/linux/eeprom_93xx46.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Module: eeprom_93xx46
  * platform description for 93xx46 EEPROMs.
diff --git a/kernel/include/linux/efi-bgrt.h b/kernel/include/linux/efi-bgrt.h
index e6f624b53..e6cd51005 100644
--- a/kernel/include/linux/efi-bgrt.h
+++ b/kernel/include/linux/efi-bgrt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_EFI_BGRT_H
 #define _LINUX_EFI_BGRT_H
 
diff --git a/kernel/include/linux/efi.h b/kernel/include/linux/efi.h
index 66f4a4e79..d813f7b04 100644
--- a/kernel/include/linux/efi.h
+++ b/kernel/include/linux/efi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_EFI_H
 #define _LINUX_EFI_H
 
diff --git a/kernel/include/linux/efs_vh.h b/kernel/include/linux/efs_vh.h
index 8a11150c6..206c5270f 100644
--- a/kernel/include/linux/efs_vh.h
+++ b/kernel/include/linux/efs_vh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * efs_vh.h
  *
diff --git a/kernel/include/linux/eisa.h b/kernel/include/linux/eisa.h
index 6925249a5..b012e30af 100644
--- a/kernel/include/linux/eisa.h
+++ b/kernel/include/linux/eisa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_EISA_H
 #define _LINUX_EISA_H
 
diff --git a/kernel/include/linux/elevator.h b/kernel/include/linux/elevator.h
index 5bc8f8682..ddb7632d7 100644
--- a/kernel/include/linux/elevator.h
+++ b/kernel/include/linux/elevator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ELEVATOR_H
 #define _LINUX_ELEVATOR_H
 
diff --git a/kernel/include/linux/elf-randomize.h b/kernel/include/linux/elf-randomize.h
index b5f0bda94..da0dbb7b6 100644
--- a/kernel/include/linux/elf-randomize.h
+++ b/kernel/include/linux/elf-randomize.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ELF_RANDOMIZE_H
 #define _ELF_RANDOMIZE_H
 
diff --git a/kernel/include/linux/elf.h b/kernel/include/linux/elf.h
index ba069e8f4..e3649b3e9 100644
--- a/kernel/include/linux/elf.h
+++ b/kernel/include/linux/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ELF_H
 #define _LINUX_ELF_H
 
diff --git a/kernel/include/linux/elfcore-compat.h b/kernel/include/linux/elfcore-compat.h
index 0a90e1c3a..b5f2efdd0 100644
--- a/kernel/include/linux/elfcore-compat.h
+++ b/kernel/include/linux/elfcore-compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ELFCORE_COMPAT_H
 #define _LINUX_ELFCORE_COMPAT_H
 
diff --git a/kernel/include/linux/elfcore.h b/kernel/include/linux/elfcore.h
index c8240a12c..4cad0e784 100644
--- a/kernel/include/linux/elfcore.h
+++ b/kernel/include/linux/elfcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ELFCORE_H
 #define _LINUX_ELFCORE_H
 
diff --git a/kernel/include/linux/elfnote.h b/kernel/include/linux/elfnote.h
index 278e3ef05..f236f5b93 100644
--- a/kernel/include/linux/elfnote.h
+++ b/kernel/include/linux/elfnote.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ELFNOTE_H
 #define _LINUX_ELFNOTE_H
 /*
diff --git a/kernel/include/linux/err.h b/kernel/include/linux/err.h
index 1e3558845..87be24350 100644
--- a/kernel/include/linux/err.h
+++ b/kernel/include/linux/err.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ERR_H
 #define _LINUX_ERR_H
 
diff --git a/kernel/include/linux/errno.h b/kernel/include/linux/errno.h
index 7ce9fb1b7..3cba62757 100644
--- a/kernel/include/linux/errno.h
+++ b/kernel/include/linux/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ERRNO_H
 #define _LINUX_ERRNO_H
 
diff --git a/kernel/include/linux/errqueue.h b/kernel/include/linux/errqueue.h
index 6fdfc884f..be1cf7291 100644
--- a/kernel/include/linux/errqueue.h
+++ b/kernel/include/linux/errqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ERRQUEUE_H
 #define _LINUX_ERRQUEUE_H 1
 
diff --git a/kernel/include/linux/errseq.h b/kernel/include/linux/errseq.h
index f746bd8fe..6ffae9c50 100644
--- a/kernel/include/linux/errseq.h
+++ b/kernel/include/linux/errseq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * See Documentation/errseq.rst and lib/errseq.c
  */
diff --git a/kernel/include/linux/ethtool.h b/kernel/include/linux/ethtool.h
index 4587a4c36..0c0146e7e 100644
--- a/kernel/include/linux/ethtool.h
+++ b/kernel/include/linux/ethtool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ethtool.h: Defines for Linux ethtool.
  *
diff --git a/kernel/include/linux/eventfd.h b/kernel/include/linux/eventfd.h
index 9e4befd95..60b2985e8 100644
--- a/kernel/include/linux/eventfd.h
+++ b/kernel/include/linux/eventfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/eventfd.h
  *
diff --git a/kernel/include/linux/evm.h b/kernel/include/linux/evm.h
index 35ed9a8a4..8302bc29b 100644
--- a/kernel/include/linux/evm.h
+++ b/kernel/include/linux/evm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * evm.h
  *
diff --git a/kernel/include/linux/exportfs.h b/kernel/include/linux/exportfs.h
index 5ab958cdc..0d3037419 100644
--- a/kernel/include/linux/exportfs.h
+++ b/kernel/include/linux/exportfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_EXPORTFS_H
 #define LINUX_EXPORTFS_H 1
 
diff --git a/kernel/include/linux/ext2_fs.h b/kernel/include/linux/ext2_fs.h
index 2723e715f..1fef88569 100644
--- a/kernel/include/linux/ext2_fs.h
+++ b/kernel/include/linux/ext2_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/ext2_fs.h
  *
diff --git a/kernel/include/linux/extable.h b/kernel/include/linux/extable.h
index 28addad0d..41c5b3a25 100644
--- a/kernel/include/linux/extable.h
+++ b/kernel/include/linux/extable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_EXTABLE_H
 #define _LINUX_EXTABLE_H
 
diff --git a/kernel/include/linux/falloc.h b/kernel/include/linux/falloc.h
index 7494dc67c..674d59f4d 100644
--- a/kernel/include/linux/falloc.h
+++ b/kernel/include/linux/falloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FALLOC_H_
 #define _FALLOC_H_
 
diff --git a/kernel/include/linux/fanotify.h b/kernel/include/linux/fanotify.h
index cef93ddcc..096c96f4f 100644
--- a/kernel/include/linux/fanotify.h
+++ b/kernel/include/linux/fanotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FANOTIFY_H
 #define _LINUX_FANOTIFY_H
 
diff --git a/kernel/include/linux/fault-inject.h b/kernel/include/linux/fault-inject.h
index 728d4e029..c3c95d18b 100644
--- a/kernel/include/linux/fault-inject.h
+++ b/kernel/include/linux/fault-inject.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FAULT_INJECT_H
 #define _LINUX_FAULT_INJECT_H
 
diff --git a/kernel/include/linux/fb.h b/kernel/include/linux/fb.h
index f4386b0cc..bc24e48e3 100644
--- a/kernel/include/linux/fb.h
+++ b/kernel/include/linux/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FB_H
 #define _LINUX_FB_H
 
diff --git a/kernel/include/linux/fcntl.h b/kernel/include/linux/fcntl.h
index 1b48d9c9a..27dc7a606 100644
--- a/kernel/include/linux/fcntl.h
+++ b/kernel/include/linux/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FCNTL_H
 #define _LINUX_FCNTL_H
 
diff --git a/kernel/include/linux/fd.h b/kernel/include/linux/fd.h
index 69275bccc..ece5ea532 100644
--- a/kernel/include/linux/fd.h
+++ b/kernel/include/linux/fd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FD_H
 #define _LINUX_FD_H
 
diff --git a/kernel/include/linux/fdtable.h b/kernel/include/linux/fdtable.h
index 6e84b2cae..1c6581767 100644
--- a/kernel/include/linux/fdtable.h
+++ b/kernel/include/linux/fdtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * descriptor table internals; you almost certainly want file.h instead.
  */
diff --git a/kernel/include/linux/file.h b/kernel/include/linux/file.h
index 61eb82cba..279720db9 100644
--- a/kernel/include/linux/file.h
+++ b/kernel/include/linux/file.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Wrapper functions for accessing the file_struct fd array.
  */
diff --git a/kernel/include/linux/filter.h b/kernel/include/linux/filter.h
index 818a0b262..48ec57e70 100644
--- a/kernel/include/linux/filter.h
+++ b/kernel/include/linux/filter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux Socket Filter Data Structures
  */
diff --git a/kernel/include/linux/fips.h b/kernel/include/linux/fips.h
index f8fb07b0b..afeeece92 100644
--- a/kernel/include/linux/fips.h
+++ b/kernel/include/linux/fips.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FIPS_H
 #define _FIPS_H
 
diff --git a/kernel/include/linux/firewire.h b/kernel/include/linux/firewire.h
index d4b7683c7..aec8f30ab 100644
--- a/kernel/include/linux/firewire.h
+++ b/kernel/include/linux/firewire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FIREWIRE_H
 #define _LINUX_FIREWIRE_H
 
diff --git a/kernel/include/linux/firmware.h b/kernel/include/linux/firmware.h
index b1f9f0ccb..d45080803 100644
--- a/kernel/include/linux/firmware.h
+++ b/kernel/include/linux/firmware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FIRMWARE_H
 #define _LINUX_FIRMWARE_H
 
diff --git a/kernel/include/linux/flat.h b/kernel/include/linux/flat.h
index 7d542dfd0..569b67d64 100644
--- a/kernel/include/linux/flat.h
+++ b/kernel/include/linux/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2002-2003  David McCullough <davidm@snapgear.com>
  * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
diff --git a/kernel/include/linux/flex_array.h b/kernel/include/linux/flex_array.h
index 11366b3ff..b94fa61b5 100644
--- a/kernel/include/linux/flex_array.h
+++ b/kernel/include/linux/flex_array.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FLEX_ARRAY_H
 #define _FLEX_ARRAY_H
 
diff --git a/kernel/include/linux/flex_proportions.h b/kernel/include/linux/flex_proportions.h
index 0d348e011..c12df59d3 100644
--- a/kernel/include/linux/flex_proportions.h
+++ b/kernel/include/linux/flex_proportions.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Floating proportions with flexible aging period
  *
diff --git a/kernel/include/linux/fmc-sdb.h b/kernel/include/linux/fmc-sdb.h
index 599bd6bab..bec899f08 100644
--- a/kernel/include/linux/fmc-sdb.h
+++ b/kernel/include/linux/fmc-sdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file is separate from sdb.h, because I want that one to remain
  * unchanged (as far as possible) from the official sdb distribution
diff --git a/kernel/include/linux/fpga/fpga-bridge.h b/kernel/include/linux/fpga/fpga-bridge.h
index dba6e3c69..aa66c87c1 100644
--- a/kernel/include/linux/fpga/fpga-bridge.h
+++ b/kernel/include/linux/fpga/fpga-bridge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/device.h>
 #include <linux/fpga/fpga-mgr.h>
 
diff --git a/kernel/include/linux/frame.h b/kernel/include/linux/frame.h
index d772c61c3..02d3ca2d9 100644
--- a/kernel/include/linux/frame.h
+++ b/kernel/include/linux/frame.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FRAME_H
 #define _LINUX_FRAME_H
 
diff --git a/kernel/include/linux/freezer.h b/kernel/include/linux/freezer.h
index dd03e837e..3995df1d0 100644
--- a/kernel/include/linux/freezer.h
+++ b/kernel/include/linux/freezer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Freezer declarations */
 
 #ifndef FREEZER_H_INCLUDED
diff --git a/kernel/include/linux/frontswap.h b/kernel/include/linux/frontswap.h
index 1d18af034..011965c08 100644
--- a/kernel/include/linux/frontswap.h
+++ b/kernel/include/linux/frontswap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FRONTSWAP_H
 #define _LINUX_FRONTSWAP_H
 
diff --git a/kernel/include/linux/fs.h b/kernel/include/linux/fs.h
index 13dab191a..885266aae 100644
--- a/kernel/include/linux/fs.h
+++ b/kernel/include/linux/fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FS_H
 #define _LINUX_FS_H
 
diff --git a/kernel/include/linux/fs_pin.h b/kernel/include/linux/fs_pin.h
index 3886b3bff..7cab74d66 100644
--- a/kernel/include/linux/fs_pin.h
+++ b/kernel/include/linux/fs_pin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/wait.h>
 
 struct fs_pin {
diff --git a/kernel/include/linux/fs_stack.h b/kernel/include/linux/fs_stack.h
index da317c716..54210a42c 100644
--- a/kernel/include/linux/fs_stack.h
+++ b/kernel/include/linux/fs_stack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FS_STACK_H
 #define _LINUX_FS_STACK_H
 
diff --git a/kernel/include/linux/fs_struct.h b/kernel/include/linux/fs_struct.h
index 7a026240c..cf1015abf 100644
--- a/kernel/include/linux/fs_struct.h
+++ b/kernel/include/linux/fs_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FS_STRUCT_H
 #define _LINUX_FS_STRUCT_H
 
diff --git a/kernel/include/linux/fscrypt_common.h b/kernel/include/linux/fscrypt_common.h
index 97f738628..854d72497 100644
--- a/kernel/include/linux/fscrypt_common.h
+++ b/kernel/include/linux/fscrypt_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fscrypt_common.h: common declarations for per-file encryption
  *
diff --git a/kernel/include/linux/fscrypt_notsupp.h b/kernel/include/linux/fscrypt_notsupp.h
index ec406aed2..19609ceea 100644
--- a/kernel/include/linux/fscrypt_notsupp.h
+++ b/kernel/include/linux/fscrypt_notsupp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fscrypt_notsupp.h
  *
diff --git a/kernel/include/linux/fscrypt_supp.h b/kernel/include/linux/fscrypt_supp.h
index 32e2fcf13..5153dce22 100644
--- a/kernel/include/linux/fscrypt_supp.h
+++ b/kernel/include/linux/fscrypt_supp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * fscrypt_supp.h
  *
diff --git a/kernel/include/linux/fsl/edac.h b/kernel/include/linux/fsl/edac.h
index 90d64d4ec..148a297d7 100644
--- a/kernel/include/linux/fsl/edac.h
+++ b/kernel/include/linux/fsl/edac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef FSL_EDAC_H
 #define FSL_EDAC_H
 
diff --git a/kernel/include/linux/fsnotify.h b/kernel/include/linux/fsnotify.h
index b78aa7ac7..bdaf22582 100644
--- a/kernel/include/linux/fsnotify.h
+++ b/kernel/include/linux/fsnotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FS_NOTIFY_H
 #define _LINUX_FS_NOTIFY_H
 
diff --git a/kernel/include/linux/fsnotify_backend.h b/kernel/include/linux/fsnotify_backend.h
index c6c693187..3597ef78d 100644
--- a/kernel/include/linux/fsnotify_backend.h
+++ b/kernel/include/linux/fsnotify_backend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Filesystem access notification for Linux
  *
diff --git a/kernel/include/linux/ftrace.h b/kernel/include/linux/ftrace.h
index 2e028854b..e54d25798 100644
--- a/kernel/include/linux/ftrace.h
+++ b/kernel/include/linux/ftrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Ftrace header.  For implementation details beyond the random comments
  * scattered below, see: Documentation/trace/ftrace-design.txt
diff --git a/kernel/include/linux/ftrace_irq.h b/kernel/include/linux/ftrace_irq.h
index 4ec2c9b20..ccda97dc7 100644
--- a/kernel/include/linux/ftrace_irq.h
+++ b/kernel/include/linux/ftrace_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FTRACE_IRQ_H
 #define _LINUX_FTRACE_IRQ_H
 
diff --git a/kernel/include/linux/futex.h b/kernel/include/linux/futex.h
index f36bfd26f..c0fb9a24b 100644
--- a/kernel/include/linux/futex.h
+++ b/kernel/include/linux/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_FUTEX_H
 #define _LINUX_FUTEX_H
 
diff --git a/kernel/include/linux/gcd.h b/kernel/include/linux/gcd.h
index 69f5e8a01..cb572677f 100644
--- a/kernel/include/linux/gcd.h
+++ b/kernel/include/linux/gcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GCD_H
 #define _GCD_H
 
diff --git a/kernel/include/linux/genetlink.h b/kernel/include/linux/genetlink.h
index a4c61cbce..b96dd4e1e 100644
--- a/kernel/include/linux/genetlink.h
+++ b/kernel/include/linux/genetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GENERIC_NETLINK_H
 #define __LINUX_GENERIC_NETLINK_H
 
diff --git a/kernel/include/linux/genhd.h b/kernel/include/linux/genhd.h
index ea652bfcd..447905230 100644
--- a/kernel/include/linux/genhd.h
+++ b/kernel/include/linux/genhd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_GENHD_H
 #define _LINUX_GENHD_H
 
diff --git a/kernel/include/linux/genl_magic_func.h b/kernel/include/linux/genl_magic_func.h
index 377257d8f..604967609 100644
--- a/kernel/include/linux/genl_magic_func.h
+++ b/kernel/include/linux/genl_magic_func.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GENL_MAGIC_FUNC_H
 #define GENL_MAGIC_FUNC_H
 
diff --git a/kernel/include/linux/genl_magic_struct.h b/kernel/include/linux/genl_magic_struct.h
index 6270a56e5..5972e4969 100644
--- a/kernel/include/linux/genl_magic_struct.h
+++ b/kernel/include/linux/genl_magic_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GENL_MAGIC_STRUCT_H
 #define GENL_MAGIC_STRUCT_H
 
diff --git a/kernel/include/linux/getcpu.h b/kernel/include/linux/getcpu.h
index c7372d7a9..c304dcdb4 100644
--- a/kernel/include/linux/getcpu.h
+++ b/kernel/include/linux/getcpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_GETCPU_H
 #define _LINUX_GETCPU_H 1
 
diff --git a/kernel/include/linux/gfp.h b/kernel/include/linux/gfp.h
index f780718b7..710143741 100644
--- a/kernel/include/linux/gfp.h
+++ b/kernel/include/linux/gfp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GFP_H
 #define __LINUX_GFP_H
 
diff --git a/kernel/include/linux/glob.h b/kernel/include/linux/glob.h
index 861d8347d..861327b33 100644
--- a/kernel/include/linux/glob.h
+++ b/kernel/include/linux/glob.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_GLOB_H
 #define _LINUX_GLOB_H
 
diff --git a/kernel/include/linux/goldfish.h b/kernel/include/linux/goldfish.h
index 93e080b39..2835c150c 100644
--- a/kernel/include/linux/goldfish.h
+++ b/kernel/include/linux/goldfish.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GOLDFISH_H
 #define __LINUX_GOLDFISH_H
 
diff --git a/kernel/include/linux/gpio-pxa.h b/kernel/include/linux/gpio-pxa.h
index d90ebbe02..1e1fa0160 100644
--- a/kernel/include/linux/gpio-pxa.h
+++ b/kernel/include/linux/gpio-pxa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GPIO_PXA_H
 #define __GPIO_PXA_H
 
diff --git a/kernel/include/linux/gpio.h b/kernel/include/linux/gpio.h
index d12b5d566..8ef7fc0ce 100644
--- a/kernel/include/linux/gpio.h
+++ b/kernel/include/linux/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GPIO_H
 #define __LINUX_GPIO_H
 
diff --git a/kernel/include/linux/gpio/consumer.h b/kernel/include/linux/gpio/consumer.h
index 8f702fcbe..c4a350d83 100644
--- a/kernel/include/linux/gpio/consumer.h
+++ b/kernel/include/linux/gpio/consumer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GPIO_CONSUMER_H
 #define __LINUX_GPIO_CONSUMER_H
 
diff --git a/kernel/include/linux/gpio/driver.h b/kernel/include/linux/gpio/driver.h
index c97f8325e..424e5139f 100644
--- a/kernel/include/linux/gpio/driver.h
+++ b/kernel/include/linux/gpio/driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GPIO_DRIVER_H
 #define __LINUX_GPIO_DRIVER_H
 
diff --git a/kernel/include/linux/gpio/gpio-reg.h b/kernel/include/linux/gpio/gpio-reg.h
index 90e0b9060..5c6efd394 100644
--- a/kernel/include/linux/gpio/gpio-reg.h
+++ b/kernel/include/linux/gpio/gpio-reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GPIO_REG_H
 #define GPIO_REG_H
 
diff --git a/kernel/include/linux/gpio/machine.h b/kernel/include/linux/gpio/machine.h
index ba4ccfd90..b7225369e 100644
--- a/kernel/include/linux/gpio/machine.h
+++ b/kernel/include/linux/gpio/machine.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GPIO_MACHINE_H
 #define __LINUX_GPIO_MACHINE_H
 
diff --git a/kernel/include/linux/gpio_keys.h b/kernel/include/linux/gpio_keys.h
index 0b71024c0..d06bf7740 100644
--- a/kernel/include/linux/gpio_keys.h
+++ b/kernel/include/linux/gpio_keys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GPIO_KEYS_H
 #define _GPIO_KEYS_H
 
diff --git a/kernel/include/linux/hardirq.h b/kernel/include/linux/hardirq.h
index c68399611..0fbbcdf0c 100644
--- a/kernel/include/linux/hardirq.h
+++ b/kernel/include/linux/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_HARDIRQ_H
 #define LINUX_HARDIRQ_H
 
diff --git a/kernel/include/linux/hashtable.h b/kernel/include/linux/hashtable.h
index 082dc1bd0..417d2c4bc 100644
--- a/kernel/include/linux/hashtable.h
+++ b/kernel/include/linux/hashtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Statically sized hash table implementation
  * (C) 2012  Sasha Levin <levinsasha928@gmail.com>
diff --git a/kernel/include/linux/hdlcdrv.h b/kernel/include/linux/hdlcdrv.h
index be3be25bb..d4d633a49 100644
--- a/kernel/include/linux/hdlcdrv.h
+++ b/kernel/include/linux/hdlcdrv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * hdlcdrv.h  -- HDLC packet radio network driver.
  * The Linux soundcard driver for 1200 baud and 9600 baud packet radio
diff --git a/kernel/include/linux/highmem.h b/kernel/include/linux/highmem.h
index bb3f32970..776f90f3a 100644
--- a/kernel/include/linux/highmem.h
+++ b/kernel/include/linux/highmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HIGHMEM_H
 #define _LINUX_HIGHMEM_H
 
diff --git a/kernel/include/linux/highuid.h b/kernel/include/linux/highuid.h
index 434e56246..50d383fd6 100644
--- a/kernel/include/linux/highuid.h
+++ b/kernel/include/linux/highuid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HIGHUID_H
 #define _LINUX_HIGHUID_H
 
diff --git a/kernel/include/linux/hpet.h b/kernel/include/linux/hpet.h
index 9427ab4e0..8604564b9 100644
--- a/kernel/include/linux/hpet.h
+++ b/kernel/include/linux/hpet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	__HPET__
 #define	__HPET__ 1
 
diff --git a/kernel/include/linux/htcpld.h b/kernel/include/linux/htcpld.h
index ab3f6cb4d..842fce69a 100644
--- a/kernel/include/linux/htcpld.h
+++ b/kernel/include/linux/htcpld.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_HTCPLD_H
 #define __LINUX_HTCPLD_H
 
diff --git a/kernel/include/linux/htirq.h b/kernel/include/linux/htirq.h
index d4a527e58..127c39d81 100644
--- a/kernel/include/linux/htirq.h
+++ b/kernel/include/linux/htirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_HTIRQ_H
 #define LINUX_HTIRQ_H
 
diff --git a/kernel/include/linux/huge_mm.h b/kernel/include/linux/huge_mm.h
index 14bc21c2e..87067d23a 100644
--- a/kernel/include/linux/huge_mm.h
+++ b/kernel/include/linux/huge_mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HUGE_MM_H
 #define _LINUX_HUGE_MM_H
 
diff --git a/kernel/include/linux/hugetlb.h b/kernel/include/linux/hugetlb.h
index 8bbbd37ab..fbf5b31d4 100644
--- a/kernel/include/linux/hugetlb.h
+++ b/kernel/include/linux/hugetlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HUGETLB_H
 #define _LINUX_HUGETLB_H
 
diff --git a/kernel/include/linux/hugetlb_inline.h b/kernel/include/linux/hugetlb_inline.h
index a4e7ca0f3..0660a03d3 100644
--- a/kernel/include/linux/hugetlb_inline.h
+++ b/kernel/include/linux/hugetlb_inline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HUGETLB_INLINE_H
 #define _LINUX_HUGETLB_INLINE_H
 
diff --git a/kernel/include/linux/hw_breakpoint.h b/kernel/include/linux/hw_breakpoint.h
index 0464c85e6..cf045885a 100644
--- a/kernel/include/linux/hw_breakpoint.h
+++ b/kernel/include/linux/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HW_BREAKPOINT_H
 #define _LINUX_HW_BREAKPOINT_H
 
diff --git a/kernel/include/linux/hypervisor.h b/kernel/include/linux/hypervisor.h
index 3fa5ef2b3..b4054fd5b 100644
--- a/kernel/include/linux/hypervisor.h
+++ b/kernel/include/linux/hypervisor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_HYPEVISOR_H
 #define __LINUX_HYPEVISOR_H
 
diff --git a/kernel/include/linux/i2c-algo-pca.h b/kernel/include/linux/i2c-algo-pca.h
index a3c3ecd59..d03071732 100644
--- a/kernel/include/linux/i2c-algo-pca.h
+++ b/kernel/include/linux/i2c-algo-pca.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_I2C_ALGO_PCA_H
 #define _LINUX_I2C_ALGO_PCA_H
 
diff --git a/kernel/include/linux/i2c-omap.h b/kernel/include/linux/i2c-omap.h
index babe0cf6d..3444265ee 100644
--- a/kernel/include/linux/i2c-omap.h
+++ b/kernel/include/linux/i2c-omap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __I2C_OMAP_H__
 #define __I2C_OMAP_H__
 
diff --git a/kernel/include/linux/i2c-pca-platform.h b/kernel/include/linux/i2c-pca-platform.h
index aba33759d..0e5f7c77d 100644
--- a/kernel/include/linux/i2c-pca-platform.h
+++ b/kernel/include/linux/i2c-pca-platform.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef I2C_PCA9564_PLATFORM_H
 #define I2C_PCA9564_PLATFORM_H
 
diff --git a/kernel/include/linux/i2c-pxa.h b/kernel/include/linux/i2c-pxa.h
index 41dcdfe7f..a897e2b50 100644
--- a/kernel/include/linux/i2c-pxa.h
+++ b/kernel/include/linux/i2c-pxa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_I2C_ALGO_PXA_H
 #define _LINUX_I2C_ALGO_PXA_H
 
diff --git a/kernel/include/linux/i7300_idle.h b/kernel/include/linux/i7300_idle.h
index 1587b7dec..4dbe651f7 100644
--- a/kernel/include/linux/i7300_idle.h
+++ b/kernel/include/linux/i7300_idle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef I7300_IDLE_H
 #define I7300_IDLE_H
diff --git a/kernel/include/linux/icmpv6.h b/kernel/include/linux/icmpv6.h
index 57086e9fc..a8f888976 100644
--- a/kernel/include/linux/icmpv6.h
+++ b/kernel/include/linux/icmpv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ICMPV6_H
 #define _LINUX_ICMPV6_H
 
diff --git a/kernel/include/linux/ide.h b/kernel/include/linux/ide.h
index dc152e4b7..70db3af04 100644
--- a/kernel/include/linux/ide.h
+++ b/kernel/include/linux/ide.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IDE_H
 #define _IDE_H
 /*
diff --git a/kernel/include/linux/if_link.h b/kernel/include/linux/if_link.h
index 0b17c585b..4c54611e0 100644
--- a/kernel/include/linux/if_link.h
+++ b/kernel/include/linux/if_link.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IF_LINK_H
 #define _LINUX_IF_LINK_H
 
diff --git a/kernel/include/linux/if_ltalk.h b/kernel/include/linux/if_ltalk.h
index 81e434c50..4cc1c0b77 100644
--- a/kernel/include/linux/if_ltalk.h
+++ b/kernel/include/linux/if_ltalk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_LTALK_H
 #define __LINUX_LTALK_H
 
diff --git a/kernel/include/linux/if_macvlan.h b/kernel/include/linux/if_macvlan.h
index c9ec1343d..0e2c60efa 100644
--- a/kernel/include/linux/if_macvlan.h
+++ b/kernel/include/linux/if_macvlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IF_MACVLAN_H
 #define _LINUX_IF_MACVLAN_H
 
diff --git a/kernel/include/linux/if_phonet.h b/kernel/include/linux/if_phonet.h
index bbcdb0a76..3b5c60da2 100644
--- a/kernel/include/linux/if_phonet.h
+++ b/kernel/include/linux/if_phonet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File: if_phonet.h
  *
diff --git a/kernel/include/linux/if_tap.h b/kernel/include/linux/if_tap.h
index 9ae41cdd0..13edf19ce 100644
--- a/kernel/include/linux/if_tap.h
+++ b/kernel/include/linux/if_tap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IF_TAP_H_
 #define _LINUX_IF_TAP_H_
 
diff --git a/kernel/include/linux/if_tunnel.h b/kernel/include/linux/if_tunnel.h
index 712710bc0..26606523e 100644
--- a/kernel/include/linux/if_tunnel.h
+++ b/kernel/include/linux/if_tunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IF_TUNNEL_H_
 #define _IF_TUNNEL_H_
 
diff --git a/kernel/include/linux/ihex.h b/kernel/include/linux/ihex.h
index 31d8629e7..75c194391 100644
--- a/kernel/include/linux/ihex.h
+++ b/kernel/include/linux/ihex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Compact binary representation of ihex records. Some devices need their
  * firmware loaded in strange orders rather than a single big blob, but
diff --git a/kernel/include/linux/iio/buffer_impl.h b/kernel/include/linux/iio/buffer_impl.h
index 8daba198f..b9e22b7e2 100644
--- a/kernel/include/linux/iio/buffer_impl.h
+++ b/kernel/include/linux/iio/buffer_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IIO_BUFFER_GENERIC_IMPL_H_
 #define _IIO_BUFFER_GENERIC_IMPL_H_
 #include <linux/sysfs.h>
diff --git a/kernel/include/linux/iio/dac/ad5421.h b/kernel/include/linux/iio/dac/ad5421.h
index 8fd8f057a..d8ee9a7f8 100644
--- a/kernel/include/linux/iio/dac/ad5421.h
+++ b/kernel/include/linux/iio/dac/ad5421.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IIO_DAC_AD5421_H__
 #define __IIO_DAC_AD5421_H__
 
diff --git a/kernel/include/linux/iio/kfifo_buf.h b/kernel/include/linux/iio/kfifo_buf.h
index 027cfa9c3..764659e01 100644
--- a/kernel/include/linux/iio/kfifo_buf.h
+++ b/kernel/include/linux/iio/kfifo_buf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_IIO_KFIFO_BUF_H__
 #define __LINUX_IIO_KFIFO_BUF_H__
 
diff --git a/kernel/include/linux/iio/magnetometer/ak8975.h b/kernel/include/linux/iio/magnetometer/ak8975.h
index c8400959d..ac9366f80 100644
--- a/kernel/include/linux/iio/magnetometer/ak8975.h
+++ b/kernel/include/linux/iio/magnetometer/ak8975.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IIO_MAGNETOMETER_AK8975_H__
 #define __IIO_MAGNETOMETER_AK8975_H__
 
diff --git a/kernel/include/linux/iio/triggered_buffer.h b/kernel/include/linux/iio/triggered_buffer.h
index 301456167..238ad30ce 100644
--- a/kernel/include/linux/iio/triggered_buffer.h
+++ b/kernel/include/linux/iio/triggered_buffer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IIO_TRIGGERED_BUFFER_H_
 #define _LINUX_IIO_TRIGGERED_BUFFER_H_
 
diff --git a/kernel/include/linux/iio/triggered_event.h b/kernel/include/linux/iio/triggered_event.h
index 8fe853708..13250fd99 100644
--- a/kernel/include/linux/iio/triggered_event.h
+++ b/kernel/include/linux/iio/triggered_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IIO_TRIGGERED_EVENT_H_
 #define _LINUX_IIO_TRIGGERED_EVENT_H_
 
diff --git a/kernel/include/linux/inet_diag.h b/kernel/include/linux/inet_diag.h
index ee251c585..39faaaf84 100644
--- a/kernel/include/linux/inet_diag.h
+++ b/kernel/include/linux/inet_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INET_DIAG_H_
 #define _INET_DIAG_H_ 1
 
diff --git a/kernel/include/linux/inetdevice.h b/kernel/include/linux/inetdevice.h
index fb3f809e3..5058f061c 100644
--- a/kernel/include/linux/inetdevice.h
+++ b/kernel/include/linux/inetdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_INETDEVICE_H
 #define _LINUX_INETDEVICE_H
 
diff --git a/kernel/include/linux/init.h b/kernel/include/linux/init.h
index 94769d687..f38b993ed 100644
--- a/kernel/include/linux/init.h
+++ b/kernel/include/linux/init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_INIT_H
 #define _LINUX_INIT_H
 
diff --git a/kernel/include/linux/init_ohci1394_dma.h b/kernel/include/linux/init_ohci1394_dma.h
index 3c03a4bba..228afca43 100644
--- a/kernel/include/linux/init_ohci1394_dma.h
+++ b/kernel/include/linux/init_ohci1394_dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
 extern int __initdata init_ohci1394_dma_early;
 extern void __init init_ohci1394_dma_on_all_controllers(void);
diff --git a/kernel/include/linux/init_task.h b/kernel/include/linux/init_task.h
index 3c07ace5b..8062e6cc6 100644
--- a/kernel/include/linux/init_task.h
+++ b/kernel/include/linux/init_task.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX__INIT_TASK_H
 #define _LINUX__INIT_TASK_H
 
diff --git a/kernel/include/linux/initrd.h b/kernel/include/linux/initrd.h
index bc67b767f..84b423044 100644
--- a/kernel/include/linux/initrd.h
+++ b/kernel/include/linux/initrd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #define INITRD_MINOR 250 /* shouldn't collide with /dev/ram* too soon ... */
 
diff --git a/kernel/include/linux/inotify.h b/kernel/include/linux/inotify.h
index 23aede0b5..44f9ffe72 100644
--- a/kernel/include/linux/inotify.h
+++ b/kernel/include/linux/inotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Inode based directory notification for Linux
  *
diff --git a/kernel/include/linux/input/cy8ctmg110_pdata.h b/kernel/include/linux/input/cy8ctmg110_pdata.h
index 09522cb59..77582ae17 100644
--- a/kernel/include/linux/input/cy8ctmg110_pdata.h
+++ b/kernel/include/linux/input/cy8ctmg110_pdata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CY8CTMG110_PDATA_H
 #define _LINUX_CY8CTMG110_PDATA_H
 
diff --git a/kernel/include/linux/input/gp2ap002a00f.h b/kernel/include/linux/input/gp2ap002a00f.h
index aad2fd44a..3614a13a8 100644
--- a/kernel/include/linux/input/gp2ap002a00f.h
+++ b/kernel/include/linux/input/gp2ap002a00f.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GP2AP002A00F_H_
 #define _GP2AP002A00F_H_
 
diff --git a/kernel/include/linux/input/gpio_tilt.h b/kernel/include/linux/input/gpio_tilt.h
index c1cc52d38..f9d932476 100644
--- a/kernel/include/linux/input/gpio_tilt.h
+++ b/kernel/include/linux/input/gpio_tilt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INPUT_GPIO_TILT_H
 #define _INPUT_GPIO_TILT_H
 
diff --git a/kernel/include/linux/input/ili210x.h b/kernel/include/linux/input/ili210x.h
index a5471245a..b76e7c140 100644
--- a/kernel/include/linux/input/ili210x.h
+++ b/kernel/include/linux/input/ili210x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ILI210X_H
 #define _ILI210X_H
 
diff --git a/kernel/include/linux/input/matrix_keypad.h b/kernel/include/linux/input/matrix_keypad.h
index 6174733a5..9476768c3 100644
--- a/kernel/include/linux/input/matrix_keypad.h
+++ b/kernel/include/linux/input/matrix_keypad.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MATRIX_KEYPAD_H
 #define _MATRIX_KEYPAD_H
 
diff --git a/kernel/include/linux/input/sh_keysc.h b/kernel/include/linux/input/sh_keysc.h
index 5d253cd93..b3c4f3b66 100644
--- a/kernel/include/linux/input/sh_keysc.h
+++ b/kernel/include/linux/input/sh_keysc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SH_KEYSC_H__
 #define __SH_KEYSC_H__
 
diff --git a/kernel/include/linux/interrupt.h b/kernel/include/linux/interrupt.h
index 59ba11661..baeb87228 100644
--- a/kernel/include/linux/interrupt.h
+++ b/kernel/include/linux/interrupt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* interrupt.h */
 #ifndef _LINUX_INTERRUPT_H
 #define _LINUX_INTERRUPT_H
diff --git a/kernel/include/linux/interval_tree.h b/kernel/include/linux/interval_tree.h
index 202ee1283..288c26f50 100644
--- a/kernel/include/linux/interval_tree.h
+++ b/kernel/include/linux/interval_tree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_INTERVAL_TREE_H
 #define _LINUX_INTERVAL_TREE_H
 
diff --git a/kernel/include/linux/io-64-nonatomic-hi-lo.h b/kernel/include/linux/io-64-nonatomic-hi-lo.h
index defcc4644..862d786a9 100644
--- a/kernel/include/linux/io-64-nonatomic-hi-lo.h
+++ b/kernel/include/linux/io-64-nonatomic-hi-lo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IO_64_NONATOMIC_HI_LO_H_
 #define _LINUX_IO_64_NONATOMIC_HI_LO_H_
 
diff --git a/kernel/include/linux/io-64-nonatomic-lo-hi.h b/kernel/include/linux/io-64-nonatomic-lo-hi.h
index 084461a4e..d042e7bb5 100644
--- a/kernel/include/linux/io-64-nonatomic-lo-hi.h
+++ b/kernel/include/linux/io-64-nonatomic-lo-hi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IO_64_NONATOMIC_LO_HI_H_
 #define _LINUX_IO_64_NONATOMIC_LO_HI_H_
 
diff --git a/kernel/include/linux/iocontext.h b/kernel/include/linux/iocontext.h
index df38db2ef..dba15ca8e 100644
--- a/kernel/include/linux/iocontext.h
+++ b/kernel/include/linux/iocontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef IOCONTEXT_H
 #define IOCONTEXT_H
 
diff --git a/kernel/include/linux/iomap.h b/kernel/include/linux/iomap.h
index f64dc6ce5..8a7c6d26b 100644
--- a/kernel/include/linux/iomap.h
+++ b/kernel/include/linux/iomap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_IOMAP_H
 #define LINUX_IOMAP_H 1
 
diff --git a/kernel/include/linux/iommu-common.h b/kernel/include/linux/iommu-common.h
index 376a27c9c..802c90c79 100644
--- a/kernel/include/linux/iommu-common.h
+++ b/kernel/include/linux/iommu-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IOMMU_COMMON_H
 #define _LINUX_IOMMU_COMMON_H
 
diff --git a/kernel/include/linux/iommu-helper.h b/kernel/include/linux/iommu-helper.h
index 86bdeffe4..cb9a9248c 100644
--- a/kernel/include/linux/iommu-helper.h
+++ b/kernel/include/linux/iommu-helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IOMMU_HELPER_H
 #define _LINUX_IOMMU_HELPER_H
 
diff --git a/kernel/include/linux/ioport.h b/kernel/include/linux/ioport.h
index f5cf32e80..83c8d6530 100644
--- a/kernel/include/linux/ioport.h
+++ b/kernel/include/linux/ioport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ioport.h	Definitions of routines for detecting, reserving and
  *		allocating system resources.
diff --git a/kernel/include/linux/ioprio.h b/kernel/include/linux/ioprio.h
index 8c1239020..2cdd74809 100644
--- a/kernel/include/linux/ioprio.h
+++ b/kernel/include/linux/ioprio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef IOPRIO_H
 #define IOPRIO_H
 
diff --git a/kernel/include/linux/ipc.h b/kernel/include/linux/ipc.h
index 92a2ccff8..821b2f260 100644
--- a/kernel/include/linux/ipc.h
+++ b/kernel/include/linux/ipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IPC_H
 #define _LINUX_IPC_H
 
diff --git a/kernel/include/linux/ipc_namespace.h b/kernel/include/linux/ipc_namespace.h
index 83f0bf7a5..474812abe 100644
--- a/kernel/include/linux/ipc_namespace.h
+++ b/kernel/include/linux/ipc_namespace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IPC_NAMESPACE_H__
 #define __IPC_NAMESPACE_H__
 
diff --git a/kernel/include/linux/ipv6.h b/kernel/include/linux/ipv6.h
index ac2da4e11..ea04ca024 100644
--- a/kernel/include/linux/ipv6.h
+++ b/kernel/include/linux/ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IPV6_H
 #define _IPV6_H
 
diff --git a/kernel/include/linux/irq.h b/kernel/include/linux/irq.h
index 5ad10948e..4536286cc 100644
--- a/kernel/include/linux/irq.h
+++ b/kernel/include/linux/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IRQ_H
 #define _LINUX_IRQ_H
 
diff --git a/kernel/include/linux/irq_cpustat.h b/kernel/include/linux/irq_cpustat.h
index 77e4bac29..4954948d1 100644
--- a/kernel/include/linux/irq_cpustat.h
+++ b/kernel/include/linux/irq_cpustat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __irq_cpustat_h
 #define __irq_cpustat_h
 
diff --git a/kernel/include/linux/irq_poll.h b/kernel/include/linux/irq_poll.h
index 3e8c1b8fb..16aaeccb6 100644
--- a/kernel/include/linux/irq_poll.h
+++ b/kernel/include/linux/irq_poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef IRQ_POLL_H
 #define IRQ_POLL_H
 
diff --git a/kernel/include/linux/irq_work.h b/kernel/include/linux/irq_work.h
index 47b9ebd4a..9270d73ea 100644
--- a/kernel/include/linux/irq_work.h
+++ b/kernel/include/linux/irq_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IRQ_WORK_H
 #define _LINUX_IRQ_WORK_H
 
diff --git a/kernel/include/linux/irqchip/metag-ext.h b/kernel/include/linux/irqchip/metag-ext.h
index 697af0fe7..d12049637 100644
--- a/kernel/include/linux/irqchip/metag-ext.h
+++ b/kernel/include/linux/irqchip/metag-ext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2012 Imagination Technologies
  */
diff --git a/kernel/include/linux/irqchip/metag.h b/kernel/include/linux/irqchip/metag.h
index 4ebdfb310..0adcf449e 100644
--- a/kernel/include/linux/irqchip/metag.h
+++ b/kernel/include/linux/irqchip/metag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2011 Imagination Technologies
  */
diff --git a/kernel/include/linux/irqchip/mmp.h b/kernel/include/linux/irqchip/mmp.h
index c78a89211..cb8455c87 100644
--- a/kernel/include/linux/irqchip/mmp.h
+++ b/kernel/include/linux/irqchip/mmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	__IRQCHIP_MMP_H
 #define	__IRQCHIP_MMP_H
 
diff --git a/kernel/include/linux/irqchip/versatile-fpga.h b/kernel/include/linux/irqchip/versatile-fpga.h
index 1fac9651d..a978fc8c7 100644
--- a/kernel/include/linux/irqchip/versatile-fpga.h
+++ b/kernel/include/linux/irqchip/versatile-fpga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PLAT_FPGA_IRQ_H
 #define PLAT_FPGA_IRQ_H
 
diff --git a/kernel/include/linux/irqdesc.h b/kernel/include/linux/irqdesc.h
index 3e90a0947..b6084898d 100644
--- a/kernel/include/linux/irqdesc.h
+++ b/kernel/include/linux/irqdesc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IRQDESC_H
 #define _LINUX_IRQDESC_H
 
diff --git a/kernel/include/linux/irqdomain.h b/kernel/include/linux/irqdomain.h
index 81e4889ca..b1037dfc4 100644
--- a/kernel/include/linux/irqdomain.h
+++ b/kernel/include/linux/irqdomain.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * irq_domain - IRQ translation domains
  *
diff --git a/kernel/include/linux/irqflags.h b/kernel/include/linux/irqflags.h
index 5fdd93bb9..46cb57d5e 100644
--- a/kernel/include/linux/irqflags.h
+++ b/kernel/include/linux/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/irqflags.h
  *
diff --git a/kernel/include/linux/irqhandler.h b/kernel/include/linux/irqhandler.h
index 661bed0ed..1e6f4e712 100644
--- a/kernel/include/linux/irqhandler.h
+++ b/kernel/include/linux/irqhandler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IRQHANDLER_H
 #define _LINUX_IRQHANDLER_H
 
diff --git a/kernel/include/linux/irqnr.h b/kernel/include/linux/irqnr.h
index 9669bf9d4..3496baa0b 100644
--- a/kernel/include/linux/irqnr.h
+++ b/kernel/include/linux/irqnr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IRQNR_H
 #define _LINUX_IRQNR_H
 
diff --git a/kernel/include/linux/irqreturn.h b/kernel/include/linux/irqreturn.h
index eb1bdcf95..bd4c066ad 100644
--- a/kernel/include/linux/irqreturn.h
+++ b/kernel/include/linux/irqreturn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_IRQRETURN_H
 #define _LINUX_IRQRETURN_H
 
diff --git a/kernel/include/linux/isa.h b/kernel/include/linux/isa.h
index f2d025841..41336da0f 100644
--- a/kernel/include/linux/isa.h
+++ b/kernel/include/linux/isa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ISA bus.
  */
diff --git a/kernel/include/linux/isicom.h b/kernel/include/linux/isicom.h
index b92e05650..7de6822d7 100644
--- a/kernel/include/linux/isicom.h
+++ b/kernel/include/linux/isicom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ISICOM_H
 #define _LINUX_ISICOM_H
 
diff --git a/kernel/include/linux/jiffies.h b/kernel/include/linux/jiffies.h
index 734377ad4..9385aa574 100644
--- a/kernel/include/linux/jiffies.h
+++ b/kernel/include/linux/jiffies.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_JIFFIES_H
 #define _LINUX_JIFFIES_H
 
diff --git a/kernel/include/linux/journal-head.h b/kernel/include/linux/journal-head.h
index 98cd41bb3..9fb870524 100644
--- a/kernel/include/linux/journal-head.h
+++ b/kernel/include/linux/journal-head.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/journal-head.h
  *
diff --git a/kernel/include/linux/jump_label.h b/kernel/include/linux/jump_label.h
index cd5861651..3b7675bcc 100644
--- a/kernel/include/linux/jump_label.h
+++ b/kernel/include/linux/jump_label.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_JUMP_LABEL_H
 #define _LINUX_JUMP_LABEL_H
 
diff --git a/kernel/include/linux/jump_label_ratelimit.h b/kernel/include/linux/jump_label_ratelimit.h
index 23da3af45..fc13ff289 100644
--- a/kernel/include/linux/jump_label_ratelimit.h
+++ b/kernel/include/linux/jump_label_ratelimit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_JUMP_LABEL_RATELIMIT_H
 #define _LINUX_JUMP_LABEL_RATELIMIT_H
 
diff --git a/kernel/include/linux/jz4740-adc.h b/kernel/include/linux/jz4740-adc.h
index 8184578fb..19d995c8b 100644
--- a/kernel/include/linux/jz4740-adc.h
+++ b/kernel/include/linux/jz4740-adc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __LINUX_JZ4740_ADC
 #define __LINUX_JZ4740_ADC
diff --git a/kernel/include/linux/kallsyms.h b/kernel/include/linux/kallsyms.h
index 6883e197a..11dd93e42 100644
--- a/kernel/include/linux/kallsyms.h
+++ b/kernel/include/linux/kallsyms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Rewritten and vastly simplified by Rusty Russell for in-kernel
  * module loader:
  *   Copyright 2002 Rusty Russell <rusty@rustcorp.com.au> IBM Corporation
diff --git a/kernel/include/linux/kasan-checks.h b/kernel/include/linux/kasan-checks.h
index 41960fecf..d31415065 100644
--- a/kernel/include/linux/kasan-checks.h
+++ b/kernel/include/linux/kasan-checks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KASAN_CHECKS_H
 #define _LINUX_KASAN_CHECKS_H
 
diff --git a/kernel/include/linux/kasan.h b/kernel/include/linux/kasan.h
index a5c7046f2..5017269e3 100644
--- a/kernel/include/linux/kasan.h
+++ b/kernel/include/linux/kasan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KASAN_H
 #define _LINUX_KASAN_H
 
diff --git a/kernel/include/linux/kbd_diacr.h b/kernel/include/linux/kbd_diacr.h
index 7274ec68c..738c7340c 100644
--- a/kernel/include/linux/kbd_diacr.h
+++ b/kernel/include/linux/kbd_diacr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _DIACR_H
 #define _DIACR_H
 #include <linux/kd.h>
diff --git a/kernel/include/linux/kbd_kern.h b/kernel/include/linux/kbd_kern.h
index cbfb171bb..bb2246c8e 100644
--- a/kernel/include/linux/kbd_kern.h
+++ b/kernel/include/linux/kbd_kern.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KBD_KERN_H
 #define _KBD_KERN_H
 
diff --git a/kernel/include/linux/kbuild.h b/kernel/include/linux/kbuild.h
index 4e80f3a9a..e7be517aa 100644
--- a/kernel/include/linux/kbuild.h
+++ b/kernel/include/linux/kbuild.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_KBUILD_H
 #define __LINUX_KBUILD_H
 
diff --git a/kernel/include/linux/kconfig.h b/kernel/include/linux/kconfig.h
index 4d748603e..fec5076ed 100644
--- a/kernel/include/linux/kconfig.h
+++ b/kernel/include/linux/kconfig.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_KCONFIG_H
 #define __LINUX_KCONFIG_H
 
diff --git a/kernel/include/linux/kcore.h b/kernel/include/linux/kcore.h
index d92762286..7ff25a808 100644
--- a/kernel/include/linux/kcore.h
+++ b/kernel/include/linux/kcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * /proc/kcore definitions
  */
diff --git a/kernel/include/linux/kcov.h b/kernel/include/linux/kcov.h
index 2883ac98c..f5d8ce4f4 100644
--- a/kernel/include/linux/kcov.h
+++ b/kernel/include/linux/kcov.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KCOV_H
 #define _LINUX_KCOV_H
 
diff --git a/kernel/include/linux/kd.h b/kernel/include/linux/kd.h
index 25bd17fad..b130a18f8 100644
--- a/kernel/include/linux/kd.h
+++ b/kernel/include/linux/kd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KD_H
 #define _LINUX_KD_H
 
diff --git a/kernel/include/linux/kdebug.h b/kernel/include/linux/kdebug.h
index ed815090b..fd311565f 100644
--- a/kernel/include/linux/kdebug.h
+++ b/kernel/include/linux/kdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KDEBUG_H
 #define _LINUX_KDEBUG_H
 
diff --git a/kernel/include/linux/kdev_t.h b/kernel/include/linux/kdev_t.h
index 8e9e288b0..85b515191 100644
--- a/kernel/include/linux/kdev_t.h
+++ b/kernel/include/linux/kdev_t.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KDEV_T_H
 #define _LINUX_KDEV_T_H
 
diff --git a/kernel/include/linux/kern_levels.h b/kernel/include/linux/kern_levels.h
index f282d4e87..d237fe854 100644
--- a/kernel/include/linux/kern_levels.h
+++ b/kernel/include/linux/kern_levels.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KERN_LEVELS_H__
 #define __KERN_LEVELS_H__
 
diff --git a/kernel/include/linux/kernel-page-flags.h b/kernel/include/linux/kernel-page-flags.h
index f65ce0978..abd20ef93 100644
--- a/kernel/include/linux/kernel-page-flags.h
+++ b/kernel/include/linux/kernel-page-flags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_KERNEL_PAGE_FLAGS_H
 #define LINUX_KERNEL_PAGE_FLAGS_H
 
diff --git a/kernel/include/linux/kernel.h b/kernel/include/linux/kernel.h
index 91189bb0c..4b484ab9e 100644
--- a/kernel/include/linux/kernel.h
+++ b/kernel/include/linux/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KERNEL_H
 #define _LINUX_KERNEL_H
 
diff --git a/kernel/include/linux/kernel_stat.h b/kernel/include/linux/kernel_stat.h
index 66be8b6be..7ee2bb43b 100644
--- a/kernel/include/linux/kernel_stat.h
+++ b/kernel/include/linux/kernel_stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KERNEL_STAT_H
 #define _LINUX_KERNEL_STAT_H
 
diff --git a/kernel/include/linux/kernelcapi.h b/kernel/include/linux/kernelcapi.h
index e985ba679..075fab5f9 100644
--- a/kernel/include/linux/kernelcapi.h
+++ b/kernel/include/linux/kernelcapi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * $Id: kernelcapi.h,v 1.8.6.2 2001/02/07 11:31:31 kai Exp $
  * 
diff --git a/kernel/include/linux/kexec.h b/kernel/include/linux/kexec.h
index 2b7590f54..1c08c925c 100644
--- a/kernel/include/linux/kexec.h
+++ b/kernel/include/linux/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_KEXEC_H
 #define LINUX_KEXEC_H
 
diff --git a/kernel/include/linux/keyboard.h b/kernel/include/linux/keyboard.h
index 131ed5146..73d11e409 100644
--- a/kernel/include/linux/keyboard.h
+++ b/kernel/include/linux/keyboard.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_KEYBOARD_H
 #define __LINUX_KEYBOARD_H
 
diff --git a/kernel/include/linux/khugepaged.h b/kernel/include/linux/khugepaged.h
index f0d733533..082d1d2a5 100644
--- a/kernel/include/linux/khugepaged.h
+++ b/kernel/include/linux/khugepaged.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KHUGEPAGED_H
 #define _LINUX_KHUGEPAGED_H
 
diff --git a/kernel/include/linux/kmemcheck.h b/kernel/include/linux/kmemcheck.h
index 39f845323..7b1d7bead 100644
--- a/kernel/include/linux/kmemcheck.h
+++ b/kernel/include/linux/kmemcheck.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_KMEMCHECK_H
 #define LINUX_KMEMCHECK_H
 
diff --git a/kernel/include/linux/kobj_map.h b/kernel/include/linux/kobj_map.h
index 18ca75ffc..c9919f8b2 100644
--- a/kernel/include/linux/kobj_map.h
+++ b/kernel/include/linux/kobj_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * kobj_map.h
  */
diff --git a/kernel/include/linux/ksm.h b/kernel/include/linux/ksm.h
index 78b44a024..44368b19b 100644
--- a/kernel/include/linux/ksm.h
+++ b/kernel/include/linux/ksm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_KSM_H
 #define __LINUX_KSM_H
 /*
diff --git a/kernel/include/linux/kthread.h b/kernel/include/linux/kthread.h
index 82e197eea..4e26609c7 100644
--- a/kernel/include/linux/kthread.h
+++ b/kernel/include/linux/kthread.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KTHREAD_H
 #define _LINUX_KTHREAD_H
 /* Simple interface for creating and stopping kernel threads without mess. */
diff --git a/kernel/include/linux/kvm_para.h b/kernel/include/linux/kvm_para.h
index 35e568f04..51f6ef2c2 100644
--- a/kernel/include/linux/kvm_para.h
+++ b/kernel/include/linux/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_KVM_PARA_H
 #define __LINUX_KVM_PARA_H
 
diff --git a/kernel/include/linux/l2tp.h b/kernel/include/linux/l2tp.h
index bffdb962f..0402eda1a 100644
--- a/kernel/include/linux/l2tp.h
+++ b/kernel/include/linux/l2tp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * L2TP-over-IP socket for L2TPv3.
  *
diff --git a/kernel/include/linux/lapb.h b/kernel/include/linux/lapb.h
index 873c1eb63..eb56472f2 100644
--- a/kernel/include/linux/lapb.h
+++ b/kernel/include/linux/lapb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * These are the public elements of the Linux LAPB module.
  */
diff --git a/kernel/include/linux/latencytop.h b/kernel/include/linux/latencytop.h
index 59ccab297..7c560e0dc 100644
--- a/kernel/include/linux/latencytop.h
+++ b/kernel/include/linux/latencytop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * latencytop.h: Infrastructure for displaying latency
  *
diff --git a/kernel/include/linux/lcd.h b/kernel/include/linux/lcd.h
index 504f6246f..851eee8ff 100644
--- a/kernel/include/linux/lcd.h
+++ b/kernel/include/linux/lcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * LCD Lowlevel Control Abstraction
  *
diff --git a/kernel/include/linux/lcm.h b/kernel/include/linux/lcm.h
index 1ce79a7f1..0db3efd56 100644
--- a/kernel/include/linux/lcm.h
+++ b/kernel/include/linux/lcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LCM_H
 #define _LCM_H
 
diff --git a/kernel/include/linux/leds_pwm.h b/kernel/include/linux/leds_pwm.h
index a65e9646e..93d101d28 100644
--- a/kernel/include/linux/leds_pwm.h
+++ b/kernel/include/linux/leds_pwm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PWM LED driver data - see drivers/leds/leds-pwm.c
  */
diff --git a/kernel/include/linux/libfdt.h b/kernel/include/linux/libfdt.h
index 4c0306c69..27ba06e5d 100644
--- a/kernel/include/linux/libfdt.h
+++ b/kernel/include/linux/libfdt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INCLUDE_LIBFDT_H_
 #define _INCLUDE_LIBFDT_H_
 
diff --git a/kernel/include/linux/libfdt_env.h b/kernel/include/linux/libfdt_env.h
index 2a663c6bb..14997285e 100644
--- a/kernel/include/linux/libfdt_env.h
+++ b/kernel/include/linux/libfdt_env.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
diff --git a/kernel/include/linux/lightnvm.h b/kernel/include/linux/lightnvm.h
index 7dfa56ebb..a29a8db5c 100644
--- a/kernel/include/linux/lightnvm.h
+++ b/kernel/include/linux/lightnvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef NVM_H
 #define NVM_H
 
diff --git a/kernel/include/linux/linkage.h b/kernel/include/linux/linkage.h
index a6a42dd02..2e6f90bd5 100644
--- a/kernel/include/linux/linkage.h
+++ b/kernel/include/linux/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_LINKAGE_H
 #define _LINUX_LINKAGE_H
 
diff --git a/kernel/include/linux/linux_logo.h b/kernel/include/linux/linux_logo.h
index ca5bd91d1..5e3581d76 100644
--- a/kernel/include/linux/linux_logo.h
+++ b/kernel/include/linux/linux_logo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_LINUX_LOGO_H
 #define _LINUX_LINUX_LOGO_H
 
diff --git a/kernel/include/linux/lis3lv02d.h b/kernel/include/linux/lis3lv02d.h
index f1664c636..b72b8cdba 100644
--- a/kernel/include/linux/lis3lv02d.h
+++ b/kernel/include/linux/lis3lv02d.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LIS3LV02D_H_
 #define __LIS3LV02D_H_
 
diff --git a/kernel/include/linux/list.h b/kernel/include/linux/list.h
index ae537fa46..4b129df4d 100644
--- a/kernel/include/linux/list.h
+++ b/kernel/include/linux/list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_LIST_H
 #define _LINUX_LIST_H
 
diff --git a/kernel/include/linux/list_bl.h b/kernel/include/linux/list_bl.h
index cb483305e..3fc2cc57b 100644
--- a/kernel/include/linux/list_bl.h
+++ b/kernel/include/linux/list_bl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_LIST_BL_H
 #define _LINUX_LIST_BL_H
 
diff --git a/kernel/include/linux/list_lru.h b/kernel/include/linux/list_lru.h
index fa7fd03cb..bb8129a34 100644
--- a/kernel/include/linux/list_lru.h
+++ b/kernel/include/linux/list_lru.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2013 Red Hat, Inc. and Parallels Inc. All rights reserved.
  * Authors: David Chinner and Glauber Costa
diff --git a/kernel/include/linux/list_nulls.h b/kernel/include/linux/list_nulls.h
index 87ff4f58a..3ef96743d 100644
--- a/kernel/include/linux/list_nulls.h
+++ b/kernel/include/linux/list_nulls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_LIST_NULLS_H
 #define _LINUX_LIST_NULLS_H
 
diff --git a/kernel/include/linux/list_sort.h b/kernel/include/linux/list_sort.h
index 1a2df2efb..ba79956e8 100644
--- a/kernel/include/linux/list_sort.h
+++ b/kernel/include/linux/list_sort.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_LIST_SORT_H
 #define _LINUX_LIST_SORT_H
 
diff --git a/kernel/include/linux/lockd/bind.h b/kernel/include/linux/lockd/bind.h
index 05728396a..053a4ef3d 100644
--- a/kernel/include/linux/lockd/bind.h
+++ b/kernel/include/linux/lockd/bind.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/bind.h
  *
diff --git a/kernel/include/linux/lockd/debug.h b/kernel/include/linux/lockd/debug.h
index 0ca810993..e536c5798 100644
--- a/kernel/include/linux/lockd/debug.h
+++ b/kernel/include/linux/lockd/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/debug.h
  *
diff --git a/kernel/include/linux/lockd/lockd.h b/kernel/include/linux/lockd/lockd.h
index 3eca67728..d7d313fb9 100644
--- a/kernel/include/linux/lockd/lockd.h
+++ b/kernel/include/linux/lockd/lockd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/lockd.h
  *
diff --git a/kernel/include/linux/lockd/nlm.h b/kernel/include/linux/lockd/nlm.h
index d9d46e442..6e343ef76 100644
--- a/kernel/include/linux/lockd/nlm.h
+++ b/kernel/include/linux/lockd/nlm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/nlm.h
  *
diff --git a/kernel/include/linux/lockd/share.h b/kernel/include/linux/lockd/share.h
index 630c5bf69..1f18a9faf 100644
--- a/kernel/include/linux/lockd/share.h
+++ b/kernel/include/linux/lockd/share.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/share.h
  *
diff --git a/kernel/include/linux/lockd/xdr.h b/kernel/include/linux/lockd/xdr.h
index 7acbecc21..7ab9f2643 100644
--- a/kernel/include/linux/lockd/xdr.h
+++ b/kernel/include/linux/lockd/xdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/xdr.h
  *
diff --git a/kernel/include/linux/lockd/xdr4.h b/kernel/include/linux/lockd/xdr4.h
index bf1645609..e709fe592 100644
--- a/kernel/include/linux/lockd/xdr4.h
+++ b/kernel/include/linux/lockd/xdr4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/lockd/xdr4.h
  *
diff --git a/kernel/include/linux/lockdep.h b/kernel/include/linux/lockdep.h
index bfa8e0b0d..f301d31b4 100644
--- a/kernel/include/linux/lockdep.h
+++ b/kernel/include/linux/lockdep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Runtime locking correctness validator
  *
diff --git a/kernel/include/linux/lockref.h b/kernel/include/linux/lockref.h
index b10b122dd..ef3c9342e 100644
--- a/kernel/include/linux/lockref.h
+++ b/kernel/include/linux/lockref.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_LOCKREF_H
 #define __LINUX_LOCKREF_H
 
diff --git a/kernel/include/linux/lp.h b/kernel/include/linux/lp.h
index 0dd276af9..be8a07eb2 100644
--- a/kernel/include/linux/lp.h
+++ b/kernel/include/linux/lp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * usr/include/linux/lp.h c.1991-1992 James Wiegand
  * many modifications copyright (C) 1992 Michael K. Johnson
diff --git a/kernel/include/linux/lsm_audit.h b/kernel/include/linux/lsm_audit.h
index d1c2901f1..915330abf 100644
--- a/kernel/include/linux/lsm_audit.h
+++ b/kernel/include/linux/lsm_audit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common LSM logging functions
  * Heavily borrowed from selinux/avc.h
diff --git a/kernel/include/linux/lzo.h b/kernel/include/linux/lzo.h
index a0848d937..2ae27cb89 100644
--- a/kernel/include/linux/lzo.h
+++ b/kernel/include/linux/lzo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LZO_H__
 #define __LZO_H__
 /*
diff --git a/kernel/include/linux/mISDNdsp.h b/kernel/include/linux/mISDNdsp.h
index 41d1eeb9b..00758f45f 100644
--- a/kernel/include/linux/mISDNdsp.h
+++ b/kernel/include/linux/mISDNdsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __mISDNdsp_H__
 #define __mISDNdsp_H__
 
diff --git a/kernel/include/linux/maple.h b/kernel/include/linux/maple.h
index c37288b23..9b140272e 100644
--- a/kernel/include/linux/maple.h
+++ b/kernel/include/linux/maple.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MAPLE_H
 #define __LINUX_MAPLE_H
 
diff --git a/kernel/include/linux/marvell_phy.h b/kernel/include/linux/marvell_phy.h
index 4055cf8cc..4f5f8c21e 100644
--- a/kernel/include/linux/marvell_phy.h
+++ b/kernel/include/linux/marvell_phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MARVELL_PHY_H
 #define _MARVELL_PHY_H
 
diff --git a/kernel/include/linux/math64.h b/kernel/include/linux/math64.h
index 80690c96c..082de345b 100644
--- a/kernel/include/linux/math64.h
+++ b/kernel/include/linux/math64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MATH64_H
 #define _LINUX_MATH64_H
 
diff --git a/kernel/include/linux/mbcache.h b/kernel/include/linux/mbcache.h
index e1bc73414..20f1e3ff6 100644
--- a/kernel/include/linux/mbcache.h
+++ b/kernel/include/linux/mbcache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MBCACHE_H
 #define _LINUX_MBCACHE_H
 
diff --git a/kernel/include/linux/mc6821.h b/kernel/include/linux/mc6821.h
index 28e301e29..8dffab19b 100644
--- a/kernel/include/linux/mc6821.h
+++ b/kernel/include/linux/mc6821.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MC6821_H_
 #define _MC6821_H_
 
diff --git a/kernel/include/linux/mdio-bitbang.h b/kernel/include/linux/mdio-bitbang.h
index 76f52bbbb..a8ac9cfa0 100644
--- a/kernel/include/linux/mdio-bitbang.h
+++ b/kernel/include/linux/mdio-bitbang.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MDIO_BITBANG_H
 #define __LINUX_MDIO_BITBANG_H
 
diff --git a/kernel/include/linux/mei_cl_bus.h b/kernel/include/linux/mei_cl_bus.h
index a0d274fe0..7fde40e17 100644
--- a/kernel/include/linux/mei_cl_bus.h
+++ b/kernel/include/linux/mei_cl_bus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MEI_CL_BUS_H
 #define _LINUX_MEI_CL_BUS_H
 
diff --git a/kernel/include/linux/memory.h b/kernel/include/linux/memory.h
index b723a686f..f71e732c7 100644
--- a/kernel/include/linux/memory.h
+++ b/kernel/include/linux/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/memory.h - generic memory definition
  *
diff --git a/kernel/include/linux/memory_hotplug.h b/kernel/include/linux/memory_hotplug.h
index 0995e1a2b..58e110aee 100644
--- a/kernel/include/linux/memory_hotplug.h
+++ b/kernel/include/linux/memory_hotplug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MEMORY_HOTPLUG_H
 #define __LINUX_MEMORY_HOTPLUG_H
 
diff --git a/kernel/include/linux/mempolicy.h b/kernel/include/linux/mempolicy.h
index 3a58b4be1..5228c62af 100644
--- a/kernel/include/linux/mempolicy.h
+++ b/kernel/include/linux/mempolicy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NUMA memory policies for Linux.
  * Copyright 2003,2004 Andi Kleen SuSE Labs
diff --git a/kernel/include/linux/mempool.h b/kernel/include/linux/mempool.h
index b1086c936..b51f5c430 100644
--- a/kernel/include/linux/mempool.h
+++ b/kernel/include/linux/mempool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * memory buffer pool support
  */
diff --git a/kernel/include/linux/memremap.h b/kernel/include/linux/memremap.h
index 79f8ba7c3..10d23c367 100644
--- a/kernel/include/linux/memremap.h
+++ b/kernel/include/linux/memremap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MEMREMAP_H_
 #define _LINUX_MEMREMAP_H_
 #include <linux/mm.h>
diff --git a/kernel/include/linux/mfd/da903x.h b/kernel/include/linux/mfd/da903x.h
index 0aa3a1a49..d1c57b8db 100644
--- a/kernel/include/linux/mfd/da903x.h
+++ b/kernel/include/linux/mfd/da903x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PMIC_DA903X_H
 #define __LINUX_PMIC_DA903X_H
 
diff --git a/kernel/include/linux/mfd/dln2.h b/kernel/include/linux/mfd/dln2.h
index 004b24576..4cade9aa8 100644
--- a/kernel/include/linux/mfd/dln2.h
+++ b/kernel/include/linux/mfd/dln2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_USB_DLN2_H
 #define __LINUX_USB_DLN2_H
 
diff --git a/kernel/include/linux/mfd/ds1wm.h b/kernel/include/linux/mfd/ds1wm.h
index 2227c6a75..43dfca1c9 100644
--- a/kernel/include/linux/mfd/ds1wm.h
+++ b/kernel/include/linux/mfd/ds1wm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* MFD cell driver data for the DS1WM driver
  *
  * to be defined in the MFD device that is
diff --git a/kernel/include/linux/mfd/ezx-pcap.h b/kernel/include/linux/mfd/ezx-pcap.h
index 32a1b5cfe..ffde195e1 100644
--- a/kernel/include/linux/mfd/ezx-pcap.h
+++ b/kernel/include/linux/mfd/ezx-pcap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2009 Daniel Ribeiro <drwyrm@gmail.com>
  *
diff --git a/kernel/include/linux/mfd/imx25-tsadc.h b/kernel/include/linux/mfd/imx25-tsadc.h
index 7fe4b8c3b..21f8adfef 100644
--- a/kernel/include/linux/mfd/imx25-tsadc.h
+++ b/kernel/include/linux/mfd/imx25-tsadc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_INCLUDE_MFD_IMX25_TSADC_H_
 #define _LINUX_INCLUDE_MFD_IMX25_TSADC_H_
 
diff --git a/kernel/include/linux/mfd/ipaq-micro.h b/kernel/include/linux/mfd/ipaq-micro.h
index 5c4d29f66..ee48a4321 100644
--- a/kernel/include/linux/mfd/ipaq-micro.h
+++ b/kernel/include/linux/mfd/ipaq-micro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Header file for the compaq Micro MFD
  */
diff --git a/kernel/include/linux/mfd/menelaus.h b/kernel/include/linux/mfd/menelaus.h
index 9e85ac06d..ce489aba8 100644
--- a/kernel/include/linux/mfd/menelaus.h
+++ b/kernel/include/linux/mfd/menelaus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Functions to access Menelaus power management chip
  */
diff --git a/kernel/include/linux/mfd/pcf50633/pmic.h b/kernel/include/linux/mfd/pcf50633/pmic.h
index 2d3dbe53b..eac0c3d8e 100644
--- a/kernel/include/linux/mfd/pcf50633/pmic.h
+++ b/kernel/include/linux/mfd/pcf50633/pmic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MFD_PCF50633_PMIC_H
 #define __LINUX_MFD_PCF50633_PMIC_H
 
diff --git a/kernel/include/linux/mfd/qcom_rpm.h b/kernel/include/linux/mfd/qcom_rpm.h
index 742ebf1b7..4b6b644f1 100644
--- a/kernel/include/linux/mfd/qcom_rpm.h
+++ b/kernel/include/linux/mfd/qcom_rpm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QCOM_RPM_H__
 #define __QCOM_RPM_H__
 
diff --git a/kernel/include/linux/mfd/rdc321x.h b/kernel/include/linux/mfd/rdc321x.h
index 442743a8f..697933b22 100644
--- a/kernel/include/linux/mfd/rdc321x.h
+++ b/kernel/include/linux/mfd/rdc321x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RDC321X_MFD_H
 #define __RDC321X_MFD_H
 
diff --git a/kernel/include/linux/mfd/tmio.h b/kernel/include/linux/mfd/tmio.h
index 15646740e..e1cfe9194 100644
--- a/kernel/include/linux/mfd/tmio.h
+++ b/kernel/include/linux/mfd/tmio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MFD_TMIO_H
 #define MFD_TMIO_H
 
diff --git a/kernel/include/linux/mfd/tps6586x.h b/kernel/include/linux/mfd/tps6586x.h
index 96187ed9f..2fe68e481 100644
--- a/kernel/include/linux/mfd/tps6586x.h
+++ b/kernel/include/linux/mfd/tps6586x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MFD_TPS6586X_H
 #define __LINUX_MFD_TPS6586X_H
 
diff --git a/kernel/include/linux/migrate.h b/kernel/include/linux/migrate.h
index 643c7ae7d..895ec0c49 100644
--- a/kernel/include/linux/migrate.h
+++ b/kernel/include/linux/migrate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MIGRATE_H
 #define _LINUX_MIGRATE_H
 
diff --git a/kernel/include/linux/migrate_mode.h b/kernel/include/linux/migrate_mode.h
index bdf66af9b..883c99249 100644
--- a/kernel/include/linux/migrate_mode.h
+++ b/kernel/include/linux/migrate_mode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MIGRATE_MODE_H_INCLUDED
 #define MIGRATE_MODE_H_INCLUDED
 /*
diff --git a/kernel/include/linux/mii.h b/kernel/include/linux/mii.h
index e870bfa6a..55000ee5c 100644
--- a/kernel/include/linux/mii.h
+++ b/kernel/include/linux/mii.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/mii.h: definitions for MII-compatible transceivers
  * Originally drivers/net/sunhme.h.
diff --git a/kernel/include/linux/miscdevice.h b/kernel/include/linux/miscdevice.h
index 58751eae5..4de703d9e 100644
--- a/kernel/include/linux/miscdevice.h
+++ b/kernel/include/linux/miscdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MISCDEVICE_H
 #define _LINUX_MISCDEVICE_H
 #include <linux/major.h>
diff --git a/kernel/include/linux/mm.h b/kernel/include/linux/mm.h
index 065d99deb..43edf6594 100644
--- a/kernel/include/linux/mm.h
+++ b/kernel/include/linux/mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MM_H
 #define _LINUX_MM_H
 
diff --git a/kernel/include/linux/mm_inline.h b/kernel/include/linux/mm_inline.h
index 25438b2b6..c30b32e3c 100644
--- a/kernel/include/linux/mm_inline.h
+++ b/kernel/include/linux/mm_inline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_MM_INLINE_H
 #define LINUX_MM_INLINE_H
 
diff --git a/kernel/include/linux/mm_types.h b/kernel/include/linux/mm_types.h
index 1861ea8db..c85f11daf 100644
--- a/kernel/include/linux/mm_types.h
+++ b/kernel/include/linux/mm_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MM_TYPES_H
 #define _LINUX_MM_TYPES_H
 
diff --git a/kernel/include/linux/mm_types_task.h b/kernel/include/linux/mm_types_task.h
index fc412fbd8..5fe876876 100644
--- a/kernel/include/linux/mm_types_task.h
+++ b/kernel/include/linux/mm_types_task.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MM_TYPES_TASK_H
 #define _LINUX_MM_TYPES_TASK_H
 
diff --git a/kernel/include/linux/mman.h b/kernel/include/linux/mman.h
index c8367041f..7c87b6652 100644
--- a/kernel/include/linux/mman.h
+++ b/kernel/include/linux/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MMAN_H
 #define _LINUX_MMAN_H
 
diff --git a/kernel/include/linux/mmc/sdhci-pci-data.h b/kernel/include/linux/mmc/sdhci-pci-data.h
index fda15b6d4..36f986d4a 100644
--- a/kernel/include/linux/mmc/sdhci-pci-data.h
+++ b/kernel/include/linux/mmc/sdhci-pci-data.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_MMC_SDHCI_PCI_DATA_H
 #define LINUX_MMC_SDHCI_PCI_DATA_H
 
diff --git a/kernel/include/linux/mmc/sdio_ids.h b/kernel/include/linux/mmc/sdio_ids.h
index abacd5484..cdd66a5fb 100644
--- a/kernel/include/linux/mmc/sdio_ids.h
+++ b/kernel/include/linux/mmc/sdio_ids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SDIO Classes, Interface Types, Manufacturer IDs, etc.
  */
diff --git a/kernel/include/linux/mmdebug.h b/kernel/include/linux/mmdebug.h
index 451a811f4..57b0030d3 100644
--- a/kernel/include/linux/mmdebug.h
+++ b/kernel/include/linux/mmdebug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_MM_DEBUG_H
 #define LINUX_MM_DEBUG_H 1
 
diff --git a/kernel/include/linux/mmiotrace.h b/kernel/include/linux/mmiotrace.h
index 3ba327af0..882368498 100644
--- a/kernel/include/linux/mmiotrace.h
+++ b/kernel/include/linux/mmiotrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MMIOTRACE_H
 #define _LINUX_MMIOTRACE_H
 
diff --git a/kernel/include/linux/mmu_context.h b/kernel/include/linux/mmu_context.h
index a44417845..d9a543a9e 100644
--- a/kernel/include/linux/mmu_context.h
+++ b/kernel/include/linux/mmu_context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MMU_CONTEXT_H
 #define _LINUX_MMU_CONTEXT_H
 
diff --git a/kernel/include/linux/mmu_notifier.h b/kernel/include/linux/mmu_notifier.h
index 6866e8126..2cf1c3c80 100644
--- a/kernel/include/linux/mmu_notifier.h
+++ b/kernel/include/linux/mmu_notifier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MMU_NOTIFIER_H
 #define _LINUX_MMU_NOTIFIER_H
 
diff --git a/kernel/include/linux/mmzone.h b/kernel/include/linux/mmzone.h
index c8f894177..c9c4a81b9 100644
--- a/kernel/include/linux/mmzone.h
+++ b/kernel/include/linux/mmzone.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MMZONE_H
 #define _LINUX_MMZONE_H
 
diff --git a/kernel/include/linux/mnt_namespace.h b/kernel/include/linux/mnt_namespace.h
index 12b2ab510..35942084c 100644
--- a/kernel/include/linux/mnt_namespace.h
+++ b/kernel/include/linux/mnt_namespace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NAMESPACE_H_
 #define _NAMESPACE_H_
 #ifdef __KERNEL__
diff --git a/kernel/include/linux/mod_devicetable.h b/kernel/include/linux/mod_devicetable.h
index 2657f9f51..1c2e8d6b7 100644
--- a/kernel/include/linux/mod_devicetable.h
+++ b/kernel/include/linux/mod_devicetable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Device tables which are exported to userspace via
  * scripts/mod/file2alias.c.  You must keep that file in sync with this
diff --git a/kernel/include/linux/moduleloader.h b/kernel/include/linux/moduleloader.h
index 4d0cb9bba..31013c2ef 100644
--- a/kernel/include/linux/moduleloader.h
+++ b/kernel/include/linux/moduleloader.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MODULELOADER_H
 #define _LINUX_MODULELOADER_H
 /* The stuff needed for archs to support modules. */
diff --git a/kernel/include/linux/moduleparam.h b/kernel/include/linux/moduleparam.h
index 1ee7b30da..1d7140fef 100644
--- a/kernel/include/linux/moduleparam.h
+++ b/kernel/include/linux/moduleparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MODULE_PARAMS_H
 #define _LINUX_MODULE_PARAMS_H
 /* (C) Copyright 2001, 2002 Rusty Russell IBM Corporation */
diff --git a/kernel/include/linux/mount.h b/kernel/include/linux/mount.h
index 1ce85e6fd..45b1f56c6 100644
--- a/kernel/include/linux/mount.h
+++ b/kernel/include/linux/mount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  * Definitions for mount interface. This describes the in the kernel build 
diff --git a/kernel/include/linux/mpage.h b/kernel/include/linux/mpage.h
index 068a0c994..001f1fcf9 100644
--- a/kernel/include/linux/mpage.h
+++ b/kernel/include/linux/mpage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/mpage.h
  *
diff --git a/kernel/include/linux/mpls.h b/kernel/include/linux/mpls.h
index 384fb22b6..ae1a188c0 100644
--- a/kernel/include/linux/mpls.h
+++ b/kernel/include/linux/mpls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MPLS_H
 #define _LINUX_MPLS_H
 
diff --git a/kernel/include/linux/mpls_iptunnel.h b/kernel/include/linux/mpls_iptunnel.h
index ef29eb2d6..140c56954 100644
--- a/kernel/include/linux/mpls_iptunnel.h
+++ b/kernel/include/linux/mpls_iptunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MPLS_IPTUNNEL_H
 #define _LINUX_MPLS_IPTUNNEL_H
 
diff --git a/kernel/include/linux/mroute.h b/kernel/include/linux/mroute.h
index d7f63339e..65a70a7c5 100644
--- a/kernel/include/linux/mroute.h
+++ b/kernel/include/linux/mroute.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MROUTE_H
 #define __LINUX_MROUTE_H
 
diff --git a/kernel/include/linux/mroute6.h b/kernel/include/linux/mroute6.h
index ce44e3e96..3014c52bf 100644
--- a/kernel/include/linux/mroute6.h
+++ b/kernel/include/linux/mroute6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MROUTE6_H
 #define __LINUX_MROUTE6_H
 
diff --git a/kernel/include/linux/msdos_fs.h b/kernel/include/linux/msdos_fs.h
index e1b163f91..b7a5d4c72 100644
--- a/kernel/include/linux/msdos_fs.h
+++ b/kernel/include/linux/msdos_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MSDOS_FS_H
 #define _LINUX_MSDOS_FS_H
 
diff --git a/kernel/include/linux/msg.h b/kernel/include/linux/msg.h
index 81263fe3f..0a7eefeee 100644
--- a/kernel/include/linux/msg.h
+++ b/kernel/include/linux/msg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MSG_H
 #define _LINUX_MSG_H
 
diff --git a/kernel/include/linux/msi.h b/kernel/include/linux/msi.h
index 80e3b562b..cdd069cf9 100644
--- a/kernel/include/linux/msi.h
+++ b/kernel/include/linux/msi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_MSI_H
 #define LINUX_MSI_H
 
diff --git a/kernel/include/linux/mtd/inftl.h b/kernel/include/linux/mtd/inftl.h
index 8255118be..fdfff8706 100644
--- a/kernel/include/linux/mtd/inftl.h
+++ b/kernel/include/linux/mtd/inftl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	inftl.h -- defines to support the Inverse NAND Flash Translation Layer
  *
diff --git a/kernel/include/linux/mtd/mtdram.h b/kernel/include/linux/mtd/mtdram.h
index 628a6a21d..ee8f95643 100644
--- a/kernel/include/linux/mtd/mtdram.h
+++ b/kernel/include/linux/mtd/mtdram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MTD_MTDRAM_H__
 #define __MTD_MTDRAM_H__
 
diff --git a/kernel/include/linux/mtd/nand-gpio.h b/kernel/include/linux/mtd/nand-gpio.h
index be4f45d89..fdef72d6e 100644
--- a/kernel/include/linux/mtd/nand-gpio.h
+++ b/kernel/include/linux/mtd/nand-gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MTD_NAND_GPIO_H
 #define __LINUX_MTD_NAND_GPIO_H
 
diff --git a/kernel/include/linux/mtd/pfow.h b/kernel/include/linux/mtd/pfow.h
index 42ff7ff09..122f3439e 100644
--- a/kernel/include/linux/mtd/pfow.h
+++ b/kernel/include/linux/mtd/pfow.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Primary function overlay window definitions
  * and service functions used by LPDDR chips
  */
diff --git a/kernel/include/linux/mtd/qinfo.h b/kernel/include/linux/mtd/qinfo.h
index b532ce524..df5b9fdde 100644
--- a/kernel/include/linux/mtd/qinfo.h
+++ b/kernel/include/linux/mtd/qinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_MTD_QINFO_H
 #define __LINUX_MTD_QINFO_H
 
diff --git a/kernel/include/linux/mutex.h b/kernel/include/linux/mutex.h
index ffcba1f33..153274f78 100644
--- a/kernel/include/linux/mutex.h
+++ b/kernel/include/linux/mutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Mutexes: blocking mutual exclusion locks
  *
diff --git a/kernel/include/linux/mv643xx_eth.h b/kernel/include/linux/mv643xx_eth.h
index 61a0da38d..3682ae75c 100644
--- a/kernel/include/linux/mv643xx_eth.h
+++ b/kernel/include/linux/mv643xx_eth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * MV-643XX ethernet platform device data definition file.
  */
diff --git a/kernel/include/linux/namei.h b/kernel/include/linux/namei.h
index 8b4794e83..a982bb7cd 100644
--- a/kernel/include/linux/namei.h
+++ b/kernel/include/linux/namei.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NAMEI_H
 #define _LINUX_NAMEI_H
 
diff --git a/kernel/include/linux/netfilter.h b/kernel/include/linux/netfilter.h
index f84bca170..b24e9b101 100644
--- a/kernel/include/linux/netfilter.h
+++ b/kernel/include/linux/netfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_NETFILTER_H
 #define __LINUX_NETFILTER_H
 
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h b/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
index 366d6c0ea..2dddbc6dc 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_bitmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IP_SET_BITMAP_H
 #define __IP_SET_BITMAP_H
 
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_getport.h b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
index 90d09300e..ac6a11d38 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_getport.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IP_SET_GETPORT_H
 #define _IP_SET_GETPORT_H
 
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_hash.h b/kernel/include/linux/netfilter/ipset/ip_set_hash.h
index f98ddfb09..838abab67 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_hash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IP_SET_HASH_H
 #define __IP_SET_HASH_H
 
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_list.h b/kernel/include/linux/netfilter/ipset/ip_set_list.h
index fe2622a00..a61fe2a7e 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_list.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IP_SET_LIST_H
 #define __IP_SET_LIST_H
 
diff --git a/kernel/include/linux/netfilter/ipset/pfxlen.h b/kernel/include/linux/netfilter/ipset/pfxlen.h
index 1afbb94b4..f59094e61 100644
--- a/kernel/include/linux/netfilter/ipset/pfxlen.h
+++ b/kernel/include/linux/netfilter/ipset/pfxlen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PFXLEN_H
 #define _PFXLEN_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_amanda.h b/kernel/include/linux/netfilter/nf_conntrack_amanda.h
index 4b59a1584..34345e543 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_amanda.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_amanda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_AMANDA_H
 #define _NF_CONNTRACK_AMANDA_H
 /* AMANDA tracking. */
diff --git a/kernel/include/linux/netfilter/nf_conntrack_common.h b/kernel/include/linux/netfilter/nf_conntrack_common.h
index 1d1ef4e20..03097fa70 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_common.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_COMMON_H
 #define _NF_CONNTRACK_COMMON_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_dccp.h b/kernel/include/linux/netfilter/nf_conntrack_dccp.h
index ff721d732..ace0f952d 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_dccp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_dccp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_DCCP_H
 #define _NF_CONNTRACK_DCCP_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_ftp.h b/kernel/include/linux/netfilter/nf_conntrack_ftp.h
index 5f818b01e..73a296dfd 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_ftp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_FTP_H
 #define _NF_CONNTRACK_FTP_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_h323.h b/kernel/include/linux/netfilter/nf_conntrack_h323.h
index 858d9b214..f76ed373a 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_h323.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_h323.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_H323_H
 #define _NF_CONNTRACK_H323_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_irc.h b/kernel/include/linux/netfilter/nf_conntrack_irc.h
index 4bb9bae67..00c2b7420 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_irc.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_irc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_IRC_H
 #define _NF_CONNTRACK_IRC_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_pptp.h b/kernel/include/linux/netfilter/nf_conntrack_pptp.h
index 2ab283031..833a5b225 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_pptp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_pptp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* PPTP constants and structs */
 #ifndef _NF_CONNTRACK_PPTP_H
 #define _NF_CONNTRACK_PPTP_H
diff --git a/kernel/include/linux/netfilter/nf_conntrack_proto_gre.h b/kernel/include/linux/netfilter/nf_conntrack_proto_gre.h
index dee0acd0d..b8d95564b 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_proto_gre.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_proto_gre.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CONNTRACK_PROTO_GRE_H
 #define _CONNTRACK_PROTO_GRE_H
 #include <asm/byteorder.h>
diff --git a/kernel/include/linux/netfilter/nf_conntrack_sane.h b/kernel/include/linux/netfilter/nf_conntrack_sane.h
index 4767d6e23..7d2de44ed 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_sane.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_sane.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_SANE_H
 #define _NF_CONNTRACK_SANE_H
 /* SANE tracking. */
diff --git a/kernel/include/linux/netfilter/nf_conntrack_sctp.h b/kernel/include/linux/netfilter/nf_conntrack_sctp.h
index 22a16a23c..9a33f171a 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_sctp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_sctp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_SCTP_H
 #define _NF_CONNTRACK_SCTP_H
 /* SCTP tracking. */
diff --git a/kernel/include/linux/netfilter/nf_conntrack_sip.h b/kernel/include/linux/netfilter/nf_conntrack_sip.h
index d5af3c27f..c7fc38807 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_sip.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_sip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NF_CONNTRACK_SIP_H__
 #define __NF_CONNTRACK_SIP_H__
 #ifdef __KERNEL__
diff --git a/kernel/include/linux/netfilter/nf_conntrack_snmp.h b/kernel/include/linux/netfilter/nf_conntrack_snmp.h
index 064bc63a5..818088c47 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_snmp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_snmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_SNMP_H
 #define _NF_CONNTRACK_SNMP_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_tcp.h b/kernel/include/linux/netfilter/nf_conntrack_tcp.h
index 22db9614b..f9e3a6630 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_tcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_TCP_H
 #define _NF_CONNTRACK_TCP_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_tftp.h b/kernel/include/linux/netfilter/nf_conntrack_tftp.h
index c78d38fdb..5769e12dd 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_tftp.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_tftp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_TFTP_H
 #define _NF_CONNTRACK_TFTP_H
 
diff --git a/kernel/include/linux/netfilter/nf_conntrack_zones_common.h b/kernel/include/linux/netfilter/nf_conntrack_zones_common.h
index 5d7cf36d4..8f3905e12 100644
--- a/kernel/include/linux/netfilter/nf_conntrack_zones_common.h
+++ b/kernel/include/linux/netfilter/nf_conntrack_zones_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_ZONES_COMMON_H
 #define _NF_CONNTRACK_ZONES_COMMON_H
 
diff --git a/kernel/include/linux/netfilter/nfnetlink.h b/kernel/include/linux/netfilter/nfnetlink.h
index 41d04e9d0..414a5e769 100644
--- a/kernel/include/linux/netfilter/nfnetlink.h
+++ b/kernel/include/linux/netfilter/nfnetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFNETLINK_H
 #define _NFNETLINK_H
 
diff --git a/kernel/include/linux/netfilter/nfnetlink_acct.h b/kernel/include/linux/netfilter/nfnetlink_acct.h
index 664da0048..b4d741195 100644
--- a/kernel/include/linux/netfilter/nfnetlink_acct.h
+++ b/kernel/include/linux/netfilter/nfnetlink_acct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFNL_ACCT_H_
 #define _NFNL_ACCT_H_
 
diff --git a/kernel/include/linux/netfilter/x_tables.h b/kernel/include/linux/netfilter/x_tables.h
index b3044c2c6..33f7530f9 100644
--- a/kernel/include/linux/netfilter/x_tables.h
+++ b/kernel/include/linux/netfilter/x_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _X_TABLES_H
 #define _X_TABLES_H
 
diff --git a/kernel/include/linux/netfilter/xt_hashlimit.h b/kernel/include/linux/netfilter/xt_hashlimit.h
index 0fc458bde..169d03983 100644
--- a/kernel/include/linux/netfilter/xt_hashlimit.h
+++ b/kernel/include/linux/netfilter/xt_hashlimit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XT_HASHLIMIT_H
 #define _XT_HASHLIMIT_H
 
diff --git a/kernel/include/linux/netfilter/xt_physdev.h b/kernel/include/linux/netfilter/xt_physdev.h
index 5b5e41716..4ca059394 100644
--- a/kernel/include/linux/netfilter/xt_physdev.h
+++ b/kernel/include/linux/netfilter/xt_physdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XT_PHYSDEV_H
 #define _XT_PHYSDEV_H
 
diff --git a/kernel/include/linux/netfilter_arp/arp_tables.h b/kernel/include/linux/netfilter_arp/arp_tables.h
index 029b95e89..e98028f00 100644
--- a/kernel/include/linux/netfilter_arp/arp_tables.h
+++ b/kernel/include/linux/netfilter_arp/arp_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * 	Format of an ARP firewall descriptor
  *
diff --git a/kernel/include/linux/netfilter_bridge.h b/kernel/include/linux/netfilter_bridge.h
index 2ed40c402..b671fdfd2 100644
--- a/kernel/include/linux/netfilter_bridge.h
+++ b/kernel/include/linux/netfilter_bridge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BRIDGE_NETFILTER_H
 #define __LINUX_BRIDGE_NETFILTER_H
 
diff --git a/kernel/include/linux/netfilter_bridge/ebt_802_3.h b/kernel/include/linux/netfilter_bridge/ebt_802_3.h
index e17e8bfb4..c6147f9c0 100644
--- a/kernel/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/kernel/include/linux/netfilter_bridge/ebt_802_3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BRIDGE_EBT_802_3_H
 #define __LINUX_BRIDGE_EBT_802_3_H
 
diff --git a/kernel/include/linux/netfilter_bridge/ebtables.h b/kernel/include/linux/netfilter_bridge/ebtables.h
index 528b24c78..0773b5a03 100644
--- a/kernel/include/linux/netfilter_bridge/ebtables.h
+++ b/kernel/include/linux/netfilter_bridge/ebtables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  ebtables
  *
diff --git a/kernel/include/linux/netfilter_defs.h b/kernel/include/linux/netfilter_defs.h
index d3a7f8597..dc6111ade 100644
--- a/kernel/include/linux/netfilter_defs.h
+++ b/kernel/include/linux/netfilter_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_NETFILTER_CORE_H_
 #define __LINUX_NETFILTER_CORE_H_
 
diff --git a/kernel/include/linux/netfilter_ingress.h b/kernel/include/linux/netfilter_ingress.h
index 8d5dae1e2..554c92069 100644
--- a/kernel/include/linux/netfilter_ingress.h
+++ b/kernel/include/linux/netfilter_ingress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NETFILTER_INGRESS_H_
 #define _NETFILTER_INGRESS_H_
 
diff --git a/kernel/include/linux/netfilter_ipv4/ip_tables.h b/kernel/include/linux/netfilter_ipv4/ip_tables.h
index 7bfc5893e..d026e63a5 100644
--- a/kernel/include/linux/netfilter_ipv4/ip_tables.h
+++ b/kernel/include/linux/netfilter_ipv4/ip_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * 25-Jul-1998 Major changes to allow for ip chain table
  *
diff --git a/kernel/include/linux/netfilter_ipv6/ip6_tables.h b/kernel/include/linux/netfilter_ipv6/ip6_tables.h
index b21c392d6..99cbfd3ad 100644
--- a/kernel/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/kernel/include/linux/netfilter_ipv6/ip6_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * 25-Jul-1998 Major changes to allow for ip chain table
  *
diff --git a/kernel/include/linux/netlink.h b/kernel/include/linux/netlink.h
index 8664fd26e..6ddb4a5da 100644
--- a/kernel/include/linux/netlink.h
+++ b/kernel/include/linux/netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_NETLINK_H
 #define __LINUX_NETLINK_H
 
diff --git a/kernel/include/linux/netpoll.h b/kernel/include/linux/netpoll.h
index 27c0aaa22..67662d011 100644
--- a/kernel/include/linux/netpoll.h
+++ b/kernel/include/linux/netpoll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common code for low-level network console, dump, and debugger code
  *
diff --git a/kernel/include/linux/nfs.h b/kernel/include/linux/nfs.h
index 610af5155..0dc7ad38a 100644
--- a/kernel/include/linux/nfs.h
+++ b/kernel/include/linux/nfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NFS protocol definitions
  *
diff --git a/kernel/include/linux/nfs3.h b/kernel/include/linux/nfs3.h
index a778ad8e3..404b8f724 100644
--- a/kernel/include/linux/nfs3.h
+++ b/kernel/include/linux/nfs3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * NFSv3 protocol definitions
  */
diff --git a/kernel/include/linux/nfs4.h b/kernel/include/linux/nfs4.h
index 47239c336..47adac640 100644
--- a/kernel/include/linux/nfs4.h
+++ b/kernel/include/linux/nfs4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/nfs4.h
  *
diff --git a/kernel/include/linux/nfs_fs.h b/kernel/include/linux/nfs_fs.h
index a0282ceaa..f0015f801 100644
--- a/kernel/include/linux/nfs_fs.h
+++ b/kernel/include/linux/nfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/nfs_fs.h
  *
diff --git a/kernel/include/linux/nfs_fs_i.h b/kernel/include/linux/nfs_fs_i.h
index a5c50d973..98f9268fc 100644
--- a/kernel/include/linux/nfs_fs_i.h
+++ b/kernel/include/linux/nfs_fs_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFS_FS_I
 #define _NFS_FS_I
 
diff --git a/kernel/include/linux/nfs_fs_sb.h b/kernel/include/linux/nfs_fs_sb.h
index 74c44665e..286b71c41 100644
--- a/kernel/include/linux/nfs_fs_sb.h
+++ b/kernel/include/linux/nfs_fs_sb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFS_FS_SB
 #define _NFS_FS_SB
 
diff --git a/kernel/include/linux/nfs_iostat.h b/kernel/include/linux/nfs_iostat.h
index 9dcbbe9a5..027874c36 100644
--- a/kernel/include/linux/nfs_iostat.h
+++ b/kernel/include/linux/nfs_iostat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  User-space visible declarations for NFS client per-mount
  *  point statistics
diff --git a/kernel/include/linux/nfs_page.h b/kernel/include/linux/nfs_page.h
index d117120c9..e27572d30 100644
--- a/kernel/include/linux/nfs_page.h
+++ b/kernel/include/linux/nfs_page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/nfs_page.h
  *
diff --git a/kernel/include/linux/nfs_xdr.h b/kernel/include/linux/nfs_xdr.h
index 164d5359d..6959968dc 100644
--- a/kernel/include/linux/nfs_xdr.h
+++ b/kernel/include/linux/nfs_xdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NFS_XDR_H
 #define _LINUX_NFS_XDR_H
 
diff --git a/kernel/include/linux/nfsacl.h b/kernel/include/linux/nfsacl.h
index 5e69e67b3..103d44695 100644
--- a/kernel/include/linux/nfsacl.h
+++ b/kernel/include/linux/nfsacl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File: linux/nfsacl.h
  *
diff --git a/kernel/include/linux/nls.h b/kernel/include/linux/nls.h
index 520681b68..499e486b3 100644
--- a/kernel/include/linux/nls.h
+++ b/kernel/include/linux/nls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NLS_H
 #define _LINUX_NLS_H
 
diff --git a/kernel/include/linux/nmi.h b/kernel/include/linux/nmi.h
index 27e249ed7..b8d868d23 100644
--- a/kernel/include/linux/nmi.h
+++ b/kernel/include/linux/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/nmi.h
  */
diff --git a/kernel/include/linux/node.h b/kernel/include/linux/node.h
index d1751beb4..4ece0fee0 100644
--- a/kernel/include/linux/node.h
+++ b/kernel/include/linux/node.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/node.h - generic node definition
  *
diff --git a/kernel/include/linux/nodemask.h b/kernel/include/linux/nodemask.h
index cf0b91c3e..de1c50b93 100644
--- a/kernel/include/linux/nodemask.h
+++ b/kernel/include/linux/nodemask.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_NODEMASK_H
 #define __LINUX_NODEMASK_H
 
diff --git a/kernel/include/linux/notifier.h b/kernel/include/linux/notifier.h
index 4149868de..6d731110e 100644
--- a/kernel/include/linux/notifier.h
+++ b/kernel/include/linux/notifier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Routines to manage notifier chains for passing status changes to any
  *	interested routines. We need this instead of hard coded call lists so
diff --git a/kernel/include/linux/ns_common.h b/kernel/include/linux/ns_common.h
index 85a5c8c16..5fbc40003 100644
--- a/kernel/include/linux/ns_common.h
+++ b/kernel/include/linux/ns_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NS_COMMON_H
 #define _LINUX_NS_COMMON_H
 
diff --git a/kernel/include/linux/nsc_gpio.h b/kernel/include/linux/nsc_gpio.h
index 7da0cf370..d7a04a6e3 100644
--- a/kernel/include/linux/nsc_gpio.h
+++ b/kernel/include/linux/nsc_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
    nsc_gpio.c
 
diff --git a/kernel/include/linux/nsproxy.h b/kernel/include/linux/nsproxy.h
index ac0d65bef..2ae1b1a4d 100644
--- a/kernel/include/linux/nsproxy.h
+++ b/kernel/include/linux/nsproxy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NSPROXY_H
 #define _LINUX_NSPROXY_H
 
diff --git a/kernel/include/linux/nubus.h b/kernel/include/linux/nubus.h
index 6165b2c62..11ce6b111 100644
--- a/kernel/include/linux/nubus.h
+++ b/kernel/include/linux/nubus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   nubus.h: various definitions and prototypes for NuBus drivers to use.
 
diff --git a/kernel/include/linux/numa.h b/kernel/include/linux/numa.h
index 3aaa31603..110b0e5d0 100644
--- a/kernel/include/linux/numa.h
+++ b/kernel/include/linux/numa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NUMA_H
 #define _LINUX_NUMA_H
 
diff --git a/kernel/include/linux/nvram.h b/kernel/include/linux/nvram.h
index cf0ff555a..28bfb9ab9 100644
--- a/kernel/include/linux/nvram.h
+++ b/kernel/include/linux/nvram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NVRAM_H
 #define _LINUX_NVRAM_H
 
diff --git a/kernel/include/linux/of_address.h b/kernel/include/linux/of_address.h
index 37864734c..b8ac44c97 100644
--- a/kernel/include/linux/of_address.h
+++ b/kernel/include/linux/of_address.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OF_ADDRESS_H
 #define __OF_ADDRESS_H
 #include <linux/ioport.h>
diff --git a/kernel/include/linux/of_device.h b/kernel/include/linux/of_device.h
index 611502524..8da5a1b31 100644
--- a/kernel/include/linux/of_device.h
+++ b/kernel/include/linux/of_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_OF_DEVICE_H
 #define _LINUX_OF_DEVICE_H
 
diff --git a/kernel/include/linux/of_iommu.h b/kernel/include/linux/of_iommu.h
index 13394ac83..cddfaff4d 100644
--- a/kernel/include/linux/of_iommu.h
+++ b/kernel/include/linux/of_iommu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OF_IOMMU_H
 #define __OF_IOMMU_H
 
diff --git a/kernel/include/linux/of_irq.h b/kernel/include/linux/of_irq.h
index 1e0deb8e8..1214cabb2 100644
--- a/kernel/include/linux/of_irq.h
+++ b/kernel/include/linux/of_irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OF_IRQ_H
 #define __OF_IRQ_H
 
diff --git a/kernel/include/linux/of_pci.h b/kernel/include/linux/of_pci.h
index 518c8d206..bf588a05d 100644
--- a/kernel/include/linux/of_pci.h
+++ b/kernel/include/linux/of_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OF_PCI_H
 #define __OF_PCI_H
 
diff --git a/kernel/include/linux/of_reserved_mem.h b/kernel/include/linux/of_reserved_mem.h
index f8e1992d6..bb4fda731 100644
--- a/kernel/include/linux/of_reserved_mem.h
+++ b/kernel/include/linux/of_reserved_mem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OF_RESERVED_MEM_H
 #define __OF_RESERVED_MEM_H
 
diff --git a/kernel/include/linux/olpc-ec.h b/kernel/include/linux/olpc-ec.h
index 2925df3ce..79bdc6328 100644
--- a/kernel/include/linux/olpc-ec.h
+++ b/kernel/include/linux/olpc-ec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_OLPC_EC_H
 #define _LINUX_OLPC_EC_H
 
diff --git a/kernel/include/linux/omap-dma.h b/kernel/include/linux/omap-dma.h
index 290081620..840ce551e 100644
--- a/kernel/include/linux/omap-dma.h
+++ b/kernel/include/linux/omap-dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_OMAP_DMA_H
 #define __LINUX_OMAP_DMA_H
 #include <linux/omap-dmaengine.h>
diff --git a/kernel/include/linux/once.h b/kernel/include/linux/once.h
index 9c98aaa87..6790884d3 100644
--- a/kernel/include/linux/once.h
+++ b/kernel/include/linux/once.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ONCE_H
 #define _LINUX_ONCE_H
 
diff --git a/kernel/include/linux/oom.h b/kernel/include/linux/oom.h
index 76aac4ce3..01c91d874 100644
--- a/kernel/include/linux/oom.h
+++ b/kernel/include/linux/oom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INCLUDE_LINUX_OOM_H
 #define __INCLUDE_LINUX_OOM_H
 
diff --git a/kernel/include/linux/osq_lock.h b/kernel/include/linux/osq_lock.h
index 703ea5c30..5581dbd3b 100644
--- a/kernel/include/linux/osq_lock.h
+++ b/kernel/include/linux/osq_lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_OSQ_LOCK_H
 #define __LINUX_OSQ_LOCK_H
 
diff --git a/kernel/include/linux/oxu210hp.h b/kernel/include/linux/oxu210hp.h
index 0bf96eae5..94cd25165 100644
--- a/kernel/include/linux/oxu210hp.h
+++ b/kernel/include/linux/oxu210hp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* platform data for the OXU210HP HCD */
 
 struct oxu210hp_platform_data {
diff --git a/kernel/include/linux/page-flags-layout.h b/kernel/include/linux/page-flags-layout.h
index 77b078c10..7ec86bf31 100644
--- a/kernel/include/linux/page-flags-layout.h
+++ b/kernel/include/linux/page-flags-layout.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PAGE_FLAGS_LAYOUT_H
 #define PAGE_FLAGS_LAYOUT_H
 
diff --git a/kernel/include/linux/page-flags.h b/kernel/include/linux/page-flags.h
index ba2d470d2..584b14c77 100644
--- a/kernel/include/linux/page-flags.h
+++ b/kernel/include/linux/page-flags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Macros for manipulating and testing page->flags
  */
diff --git a/kernel/include/linux/page-isolation.h b/kernel/include/linux/page-isolation.h
index d4cd2014f..05a04e603 100644
--- a/kernel/include/linux/page-isolation.h
+++ b/kernel/include/linux/page-isolation.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PAGEISOLATION_H
 #define __LINUX_PAGEISOLATION_H
 
diff --git a/kernel/include/linux/page_counter.h b/kernel/include/linux/page_counter.h
index 7e62920a3..c15ab80ad 100644
--- a/kernel/include/linux/page_counter.h
+++ b/kernel/include/linux/page_counter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PAGE_COUNTER_H
 #define _LINUX_PAGE_COUNTER_H
 
diff --git a/kernel/include/linux/page_ext.h b/kernel/include/linux/page_ext.h
index 9298c393d..ca5461efa 100644
--- a/kernel/include/linux/page_ext.h
+++ b/kernel/include/linux/page_ext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PAGE_EXT_H
 #define __LINUX_PAGE_EXT_H
 
diff --git a/kernel/include/linux/page_idle.h b/kernel/include/linux/page_idle.h
index fec402713..1e894d34b 100644
--- a/kernel/include/linux/page_idle.h
+++ b/kernel/include/linux/page_idle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MM_PAGE_IDLE_H
 #define _LINUX_MM_PAGE_IDLE_H
 
diff --git a/kernel/include/linux/page_owner.h b/kernel/include/linux/page_owner.h
index 2be728d15..8679ccd72 100644
--- a/kernel/include/linux/page_owner.h
+++ b/kernel/include/linux/page_owner.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PAGE_OWNER_H
 #define __LINUX_PAGE_OWNER_H
 
diff --git a/kernel/include/linux/page_ref.h b/kernel/include/linux/page_ref.h
index 1fd71733a..760d74a0e 100644
--- a/kernel/include/linux/page_ref.h
+++ b/kernel/include/linux/page_ref.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PAGE_REF_H
 #define _LINUX_PAGE_REF_H
 
diff --git a/kernel/include/linux/pagemap.h b/kernel/include/linux/pagemap.h
index 5bbd6780f..e08b53390 100644
--- a/kernel/include/linux/pagemap.h
+++ b/kernel/include/linux/pagemap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PAGEMAP_H
 #define _LINUX_PAGEMAP_H
 
diff --git a/kernel/include/linux/pagevec.h b/kernel/include/linux/pagevec.h
index 4dcd5506f..2636c0c0f 100644
--- a/kernel/include/linux/pagevec.h
+++ b/kernel/include/linux/pagevec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/pagevec.h
  *
diff --git a/kernel/include/linux/parport_pc.h b/kernel/include/linux/parport_pc.h
index cc1767f5c..3d6fc576d 100644
--- a/kernel/include/linux/parport_pc.h
+++ b/kernel/include/linux/parport_pc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PARPORT_PC_H
 #define __LINUX_PARPORT_PC_H
 
diff --git a/kernel/include/linux/parser.h b/kernel/include/linux/parser.h
index 884c1e6eb..12fc3482f 100644
--- a/kernel/include/linux/parser.h
+++ b/kernel/include/linux/parser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/parser.h
  *
diff --git a/kernel/include/linux/patchkey.h b/kernel/include/linux/patchkey.h
index 97a919fc9..f581defb2 100644
--- a/kernel/include/linux/patchkey.h
+++ b/kernel/include/linux/patchkey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * <linux/patchkey.h> -- definition of _PATCHKEY macro
  *
diff --git a/kernel/include/linux/path.h b/kernel/include/linux/path.h
index cde895cc4..81e65a5be 100644
--- a/kernel/include/linux/path.h
+++ b/kernel/include/linux/path.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PATH_H
 #define _LINUX_PATH_H
 
diff --git a/kernel/include/linux/pci-acpi.h b/kernel/include/linux/pci-acpi.h
index dd86c97f2..8082b612f 100644
--- a/kernel/include/linux/pci-acpi.h
+++ b/kernel/include/linux/pci-acpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File		pci-acpi.h
  *
diff --git a/kernel/include/linux/pci-aspm.h b/kernel/include/linux/pci-aspm.h
index 207c561fb..3cc06b059 100644
--- a/kernel/include/linux/pci-aspm.h
+++ b/kernel/include/linux/pci-aspm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	aspm.h
  *
diff --git a/kernel/include/linux/pci-ats.h b/kernel/include/linux/pci-ats.h
index 782fb8e07..7c4b8e272 100644
--- a/kernel/include/linux/pci-ats.h
+++ b/kernel/include/linux/pci-ats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_PCI_ATS_H
 #define LINUX_PCI_ATS_H
 
diff --git a/kernel/include/linux/pci-dma-compat.h b/kernel/include/linux/pci-dma-compat.h
index 39726caef..d1f9fdade 100644
--- a/kernel/include/linux/pci-dma-compat.h
+++ b/kernel/include/linux/pci-dma-compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* include this file if the platform implements the dma_ DMA Mapping API
  * and wants to provide the pci_ DMA Mapping API in terms of it */
 
diff --git a/kernel/include/linux/pci-dma.h b/kernel/include/linux/pci-dma.h
index 549a041f9..0f7aa7353 100644
--- a/kernel/include/linux/pci-dma.h
+++ b/kernel/include/linux/pci-dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PCI_DMA_H
 #define _LINUX_PCI_DMA_H
 
diff --git a/kernel/include/linux/pci.h b/kernel/include/linux/pci.h
index f4f8ee5a7..d16a7c037 100644
--- a/kernel/include/linux/pci.h
+++ b/kernel/include/linux/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	pci.h
  *
diff --git a/kernel/include/linux/pci_ids.h b/kernel/include/linux/pci_ids.h
index 4adf6161e..ab20dc5db 100644
--- a/kernel/include/linux/pci_ids.h
+++ b/kernel/include/linux/pci_ids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	PCI Class, Vendor and Device IDs
  *
diff --git a/kernel/include/linux/pcieport_if.h b/kernel/include/linux/pcieport_if.h
index e8f3f7479..b69769dbf 100644
--- a/kernel/include/linux/pcieport_if.h
+++ b/kernel/include/linux/pcieport_if.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * File:	pcieport_if.h
  * Purpose:	PCI Express Port Bus Driver's IF Data Structure
diff --git a/kernel/include/linux/percpu-refcount.h b/kernel/include/linux/percpu-refcount.h
index c13dceb87..6658d9ee5 100644
--- a/kernel/include/linux/percpu-refcount.h
+++ b/kernel/include/linux/percpu-refcount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Percpu refcounts:
  * (C) 2012 Google, Inc.
diff --git a/kernel/include/linux/percpu-rwsem.h b/kernel/include/linux/percpu-rwsem.h
index 93664f022..b1f37a89e 100644
--- a/kernel/include/linux/percpu-rwsem.h
+++ b/kernel/include/linux/percpu-rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PERCPU_RWSEM_H
 #define _LINUX_PERCPU_RWSEM_H
 
diff --git a/kernel/include/linux/percpu.h b/kernel/include/linux/percpu.h
index 6a5fb939d..296bbe49d 100644
--- a/kernel/include/linux/percpu.h
+++ b/kernel/include/linux/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PERCPU_H
 #define __LINUX_PERCPU_H
 
diff --git a/kernel/include/linux/percpu_counter.h b/kernel/include/linux/percpu_counter.h
index ec065387f..73a7bf30f 100644
--- a/kernel/include/linux/percpu_counter.h
+++ b/kernel/include/linux/percpu_counter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PERCPU_COUNTER_H
 #define _LINUX_PERCPU_COUNTER_H
 /*
diff --git a/kernel/include/linux/percpu_ida.h b/kernel/include/linux/percpu_ida.h
index f5cfdd6a5..07d78e465 100644
--- a/kernel/include/linux/percpu_ida.h
+++ b/kernel/include/linux/percpu_ida.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERCPU_IDA_H__
 #define __PERCPU_IDA_H__
 
diff --git a/kernel/include/linux/perf_regs.h b/kernel/include/linux/perf_regs.h
index 9b7dd59fe..476747456 100644
--- a/kernel/include/linux/perf_regs.h
+++ b/kernel/include/linux/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PERF_REGS_H
 #define _LINUX_PERF_REGS_H
 
diff --git a/kernel/include/linux/personality.h b/kernel/include/linux/personality.h
index aeb7892b2..fc16fbc65 100644
--- a/kernel/include/linux/personality.h
+++ b/kernel/include/linux/personality.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PERSONALITY_H
 #define _LINUX_PERSONALITY_H
 
diff --git a/kernel/include/linux/pfn.h b/kernel/include/linux/pfn.h
index 113295323..14bc053c5 100644
--- a/kernel/include/linux/pfn.h
+++ b/kernel/include/linux/pfn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PFN_H_
 #define _LINUX_PFN_H_
 
diff --git a/kernel/include/linux/pfn_t.h b/kernel/include/linux/pfn_t.h
index a49b3259c..43b1d7648 100644
--- a/kernel/include/linux/pfn_t.h
+++ b/kernel/include/linux/pfn_t.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PFN_T_H_
 #define _LINUX_PFN_T_H_
 #include <linux/mm.h>
diff --git a/kernel/include/linux/phy/ulpi_phy.h b/kernel/include/linux/phy/ulpi_phy.h
index f2ebe490a..7054b4403 100644
--- a/kernel/include/linux/phy/ulpi_phy.h
+++ b/kernel/include/linux/phy/ulpi_phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/phy/phy.h>
 
 /**
diff --git a/kernel/include/linux/phy_fixed.h b/kernel/include/linux/phy_fixed.h
index 1d41ec44e..cf6392de6 100644
--- a/kernel/include/linux/phy_fixed.h
+++ b/kernel/include/linux/phy_fixed.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PHY_FIXED_H
 #define __PHY_FIXED_H
 
diff --git a/kernel/include/linux/pid.h b/kernel/include/linux/pid.h
index 719582744..dfd684ce0 100644
--- a/kernel/include/linux/pid.h
+++ b/kernel/include/linux/pid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PID_H
 #define _LINUX_PID_H
 
diff --git a/kernel/include/linux/pid_namespace.h b/kernel/include/linux/pid_namespace.h
index b09136f88..c78af6061 100644
--- a/kernel/include/linux/pid_namespace.h
+++ b/kernel/include/linux/pid_namespace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PID_NS_H
 #define _LINUX_PID_NS_H
 
diff --git a/kernel/include/linux/pim.h b/kernel/include/linux/pim.h
index 0e81b2778..290d4d2ed 100644
--- a/kernel/include/linux/pim.h
+++ b/kernel/include/linux/pim.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PIM_H
 #define __LINUX_PIM_H
 
diff --git a/kernel/include/linux/pinctrl/pinctrl-state.h b/kernel/include/linux/pinctrl/pinctrl-state.h
index 230735193..a0e785815 100644
--- a/kernel/include/linux/pinctrl/pinctrl-state.h
+++ b/kernel/include/linux/pinctrl/pinctrl-state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Standard pin control state definitions
  */
diff --git a/kernel/include/linux/pipe_fs_i.h b/kernel/include/linux/pipe_fs_i.h
index e7497c9dd..6a80cfc63 100644
--- a/kernel/include/linux/pipe_fs_i.h
+++ b/kernel/include/linux/pipe_fs_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PIPE_FS_I_H
 #define _LINUX_PIPE_FS_I_H
 
diff --git a/kernel/include/linux/pkeys.h b/kernel/include/linux/pkeys.h
index a1bacf115..0794ca78c 100644
--- a/kernel/include/linux/pkeys.h
+++ b/kernel/include/linux/pkeys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PKEYS_H
 #define _LINUX_PKEYS_H
 
diff --git a/kernel/include/linux/platform_data/ad7291.h b/kernel/include/linux/platform_data/ad7291.h
index bbd89fa51..b1fd1530c 100644
--- a/kernel/include/linux/platform_data/ad7291.h
+++ b/kernel/include/linux/platform_data/ad7291.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IIO_AD7291_H__
 #define __IIO_AD7291_H__
 
diff --git a/kernel/include/linux/platform_data/ad7791.h b/kernel/include/linux/platform_data/ad7791.h
index f9e4db1b8..cc7533049 100644
--- a/kernel/include/linux/platform_data/ad7791.h
+++ b/kernel/include/linux/platform_data/ad7791.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PLATFORM_DATA_AD7791__
 #define __LINUX_PLATFORM_DATA_AD7791__
 
diff --git a/kernel/include/linux/platform_data/ad7879.h b/kernel/include/linux/platform_data/ad7879.h
index 69e2e1fd2..6655cc845 100644
--- a/kernel/include/linux/platform_data/ad7879.h
+++ b/kernel/include/linux/platform_data/ad7879.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/platform_data/ad7879.h */
 
 /* Touchscreen characteristics vary between boards and models.  The
diff --git a/kernel/include/linux/platform_data/asoc-imx-ssi.h b/kernel/include/linux/platform_data/asoc-imx-ssi.h
index 92c7fd72f..902851aeb 100644
--- a/kernel/include/linux/platform_data/asoc-imx-ssi.h
+++ b/kernel/include/linux/platform_data/asoc-imx-ssi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_SSI_H
 #define __MACH_SSI_H
 
diff --git a/kernel/include/linux/platform_data/asoc-kirkwood.h b/kernel/include/linux/platform_data/asoc-kirkwood.h
index d6a55bd2e..d442cefa3 100644
--- a/kernel/include/linux/platform_data/asoc-kirkwood.h
+++ b/kernel/include/linux/platform_data/asoc-kirkwood.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PLAT_AUDIO_H
 #define __PLAT_AUDIO_H
 
diff --git a/kernel/include/linux/platform_data/asoc-mx27vis.h b/kernel/include/linux/platform_data/asoc-mx27vis.h
index 409adcd04..2107d0d99 100644
--- a/kernel/include/linux/platform_data/asoc-mx27vis.h
+++ b/kernel/include/linux/platform_data/asoc-mx27vis.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PLATFORM_DATA_ASOC_MX27VIS_H
 #define __PLATFORM_DATA_ASOC_MX27VIS_H
 
diff --git a/kernel/include/linux/platform_data/asoc-palm27x.h b/kernel/include/linux/platform_data/asoc-palm27x.h
index 58afb30d5..22b69a393 100644
--- a/kernel/include/linux/platform_data/asoc-palm27x.h
+++ b/kernel/include/linux/platform_data/asoc-palm27x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INCLUDE_PALMASOC_H_
 #define _INCLUDE_PALMASOC_H_
 
diff --git a/kernel/include/linux/platform_data/bcmgenet.h b/kernel/include/linux/platform_data/bcmgenet.h
index 26af54321..d8f873862 100644
--- a/kernel/include/linux/platform_data/bcmgenet.h
+++ b/kernel/include/linux/platform_data/bcmgenet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PLATFORM_DATA_BCMGENET_H__
 #define __LINUX_PLATFORM_DATA_BCMGENET_H__
 
diff --git a/kernel/include/linux/platform_data/crypto-atmel.h b/kernel/include/linux/platform_data/crypto-atmel.h
index b46e0d906..0471aaf69 100644
--- a/kernel/include/linux/platform_data/crypto-atmel.h
+++ b/kernel/include/linux/platform_data/crypto-atmel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_CRYPTO_ATMEL_H
 #define __LINUX_CRYPTO_ATMEL_H
 
diff --git a/kernel/include/linux/platform_data/dma-ep93xx.h b/kernel/include/linux/platform_data/dma-ep93xx.h
index e82c642fa..f8f1f6b95 100644
--- a/kernel/include/linux/platform_data/dma-ep93xx.h
+++ b/kernel/include/linux/platform_data/dma-ep93xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
diff --git a/kernel/include/linux/platform_data/dma-imx-sdma.h b/kernel/include/linux/platform_data/dma-imx-sdma.h
index 2d0881672..6eaa53cef 100644
--- a/kernel/include/linux/platform_data/dma-imx-sdma.h
+++ b/kernel/include/linux/platform_data/dma-imx-sdma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MACH_MXC_SDMA_H__
 #define __MACH_MXC_SDMA_H__
 
diff --git a/kernel/include/linux/platform_data/dma-mv_xor.h b/kernel/include/linux/platform_data/dma-mv_xor.h
index 92ffd3245..6867a7ea3 100644
--- a/kernel/include/linux/platform_data/dma-mv_xor.h
+++ b/kernel/include/linux/platform_data/dma-mv_xor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Marvell XOR platform device data definition file.
  */
diff --git a/kernel/include/linux/platform_data/ds620.h b/kernel/include/linux/platform_data/ds620.h
index 736bb87ac..6ef58bb77 100644
--- a/kernel/include/linux/platform_data/ds620.h
+++ b/kernel/include/linux/platform_data/ds620.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DS620_H
 #define _LINUX_DS620_H
 
diff --git a/kernel/include/linux/platform_data/efm32-spi.h b/kernel/include/linux/platform_data/efm32-spi.h
index 31b19ca1d..a2c56fcd0 100644
--- a/kernel/include/linux/platform_data/efm32-spi.h
+++ b/kernel/include/linux/platform_data/efm32-spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PLATFORM_DATA_EFM32_SPI_H__
 #define __LINUX_PLATFORM_DATA_EFM32_SPI_H__
 
diff --git a/kernel/include/linux/platform_data/efm32-uart.h b/kernel/include/linux/platform_data/efm32-uart.h
index ed0e975b3..ccbb8f11d 100644
--- a/kernel/include/linux/platform_data/efm32-uart.h
+++ b/kernel/include/linux/platform_data/efm32-uart.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *
diff --git a/kernel/include/linux/platform_data/gpio-htc-egpio.h b/kernel/include/linux/platform_data/gpio-htc-egpio.h
index b4201c971..b7baf1e42 100644
--- a/kernel/include/linux/platform_data/gpio-htc-egpio.h
+++ b/kernel/include/linux/platform_data/gpio-htc-egpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * HTC simple EGPIO irq and gpio extender
  */
diff --git a/kernel/include/linux/platform_data/i2c-nuc900.h b/kernel/include/linux/platform_data/i2c-nuc900.h
index 9ffb12d06..23036273a 100644
--- a/kernel/include/linux/platform_data/i2c-nuc900.h
+++ b/kernel/include/linux/platform_data/i2c-nuc900.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_NUC900_I2C_H
 #define __ASM_ARCH_NUC900_I2C_H
 
diff --git a/kernel/include/linux/platform_data/irda-pxaficp.h b/kernel/include/linux/platform_data/irda-pxaficp.h
index 3cd41f77d..bd35ddcf3 100644
--- a/kernel/include/linux/platform_data/irda-pxaficp.h
+++ b/kernel/include/linux/platform_data/irda-pxaficp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_ARCH_IRDA_H
 #define ASMARM_ARCH_IRDA_H
 
diff --git a/kernel/include/linux/platform_data/itco_wdt.h b/kernel/include/linux/platform_data/itco_wdt.h
index 0e95527ed..2ccdce6a4 100644
--- a/kernel/include/linux/platform_data/itco_wdt.h
+++ b/kernel/include/linux/platform_data/itco_wdt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Platform data for the Intel TCO Watchdog
  */
diff --git a/kernel/include/linux/platform_data/keyboard-pxa930_rotary.h b/kernel/include/linux/platform_data/keyboard-pxa930_rotary.h
index 053587caf..3271aa01c 100644
--- a/kernel/include/linux/platform_data/keyboard-pxa930_rotary.h
+++ b/kernel/include/linux/platform_data/keyboard-pxa930_rotary.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_PXA930_ROTARY_H
 #define __ASM_ARCH_PXA930_ROTARY_H
 
diff --git a/kernel/include/linux/platform_data/keypad-ep93xx.h b/kernel/include/linux/platform_data/keypad-ep93xx.h
index adccee25b..0e36818e3 100644
--- a/kernel/include/linux/platform_data/keypad-ep93xx.h
+++ b/kernel/include/linux/platform_data/keypad-ep93xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KEYPAD_EP93XX_H
 #define __KEYPAD_EP93XX_H
 
diff --git a/kernel/include/linux/platform_data/keypad-pxa27x.h b/kernel/include/linux/platform_data/keypad-pxa27x.h
index 24625569d..a376442b9 100644
--- a/kernel/include/linux/platform_data/keypad-pxa27x.h
+++ b/kernel/include/linux/platform_data/keypad-pxa27x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_PXA27x_KEYPAD_H
 #define __ASM_ARCH_PXA27x_KEYPAD_H
 
diff --git a/kernel/include/linux/platform_data/keypad-w90p910.h b/kernel/include/linux/platform_data/keypad-w90p910.h
index 556778e8d..206ca4ecd 100644
--- a/kernel/include/linux/platform_data/keypad-w90p910.h
+++ b/kernel/include/linux/platform_data/keypad-w90p910.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_W90P910_KEYPAD_H
 #define __ASM_ARCH_W90P910_KEYPAD_H
 
diff --git a/kernel/include/linux/platform_data/lcd-mipid.h b/kernel/include/linux/platform_data/lcd-mipid.h
index 8e52c6572..63f05eb23 100644
--- a/kernel/include/linux/platform_data/lcd-mipid.h
+++ b/kernel/include/linux/platform_data/lcd-mipid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LCD_MIPID_H
 #define __LCD_MIPID_H
 
diff --git a/kernel/include/linux/platform_data/max3421-hcd.h b/kernel/include/linux/platform_data/max3421-hcd.h
index 0303d1970..5947a6f43 100644
--- a/kernel/include/linux/platform_data/max3421-hcd.h
+++ b/kernel/include/linux/platform_data/max3421-hcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2014 eGauge Systems LLC
  *	Contributed by David Mosberger-Tang <davidm@egauge.net>
diff --git a/kernel/include/linux/platform_data/max6639.h b/kernel/include/linux/platform_data/max6639.h
index 6011c4203..65bfdb4fd 100644
--- a/kernel/include/linux/platform_data/max6639.h
+++ b/kernel/include/linux/platform_data/max6639.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_MAX6639_H
 #define _LINUX_MAX6639_H
 
diff --git a/kernel/include/linux/platform_data/max732x.h b/kernel/include/linux/platform_data/max732x.h
index c04bac8bf..f231c635f 100644
--- a/kernel/include/linux/platform_data/max732x.h
+++ b/kernel/include/linux/platform_data/max732x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_I2C_MAX732X_H
 #define __LINUX_I2C_MAX732X_H
 
diff --git a/kernel/include/linux/platform_data/media/ir-rx51.h b/kernel/include/linux/platform_data/media/ir-rx51.h
index 2c94ab568..9d127aa64 100644
--- a/kernel/include/linux/platform_data/media/ir-rx51.h
+++ b/kernel/include/linux/platform_data/media/ir-rx51.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IR_RX51_H
 #define _IR_RX51_H
 
diff --git a/kernel/include/linux/platform_data/media/mmp-camera.h b/kernel/include/linux/platform_data/media/mmp-camera.h
index 7611963a2..838040281 100644
--- a/kernel/include/linux/platform_data/media/mmp-camera.h
+++ b/kernel/include/linux/platform_data/media/mmp-camera.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Information for the Marvell Armada MMP camera
  */
diff --git a/kernel/include/linux/platform_data/media/omap4iss.h b/kernel/include/linux/platform_data/media/omap4iss.h
index 0d7620db5..2a511a8fc 100644
--- a/kernel/include/linux/platform_data/media/omap4iss.h
+++ b/kernel/include/linux/platform_data/media/omap4iss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_ARM_PLAT_OMAP4_ISS_H
 #define ARCH_ARM_PLAT_OMAP4_ISS_H
 
diff --git a/kernel/include/linux/platform_data/mmc-davinci.h b/kernel/include/linux/platform_data/mmc-davinci.h
index 9cea4ee37..87a8bed3b 100644
--- a/kernel/include/linux/platform_data/mmc-davinci.h
+++ b/kernel/include/linux/platform_data/mmc-davinci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Board-specific MMC configuration
  */
diff --git a/kernel/include/linux/platform_data/mmc-mxcmmc.h b/kernel/include/linux/platform_data/mmc-mxcmmc.h
index b0fdaa9bd..ac6773513 100644
--- a/kernel/include/linux/platform_data/mmc-mxcmmc.h
+++ b/kernel/include/linux/platform_data/mmc-mxcmmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_ARCH_MMC_H
 #define ASMARM_ARCH_MMC_H
 
diff --git a/kernel/include/linux/platform_data/mmc-pxamci.h b/kernel/include/linux/platform_data/mmc-pxamci.h
index 1706b3597..752f97c62 100644
--- a/kernel/include/linux/platform_data/mmc-pxamci.h
+++ b/kernel/include/linux/platform_data/mmc-pxamci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_ARCH_MMC_H
 #define ASMARM_ARCH_MMC_H
 
diff --git a/kernel/include/linux/platform_data/mmc-s3cmci.h b/kernel/include/linux/platform_data/mmc-s3cmci.h
index c42d31711..b68d9f0bd 100644
--- a/kernel/include/linux/platform_data/mmc-s3cmci.h
+++ b/kernel/include/linux/platform_data/mmc-s3cmci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ARCH_MCI_H
 #define _ARCH_MCI_H
 
diff --git a/kernel/include/linux/platform_data/mmc-sdhci-s3c.h b/kernel/include/linux/platform_data/mmc-sdhci-s3c.h
index 249f02387..74a54eeb2 100644
--- a/kernel/include/linux/platform_data/mmc-sdhci-s3c.h
+++ b/kernel/include/linux/platform_data/mmc-sdhci-s3c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PLATFORM_DATA_SDHCI_S3C_H
 #define __PLATFORM_DATA_SDHCI_S3C_H
 
diff --git a/kernel/include/linux/platform_data/mouse-pxa930_trkball.h b/kernel/include/linux/platform_data/mouse-pxa930_trkball.h
index 5e0789bc4..ba0ac7a30 100644
--- a/kernel/include/linux/platform_data/mouse-pxa930_trkball.h
+++ b/kernel/include/linux/platform_data/mouse-pxa930_trkball.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_PXA930_TRKBALL_H
 #define __ASM_ARCH_PXA930_TRKBALL_H
 
diff --git a/kernel/include/linux/platform_data/mtd-nand-pxa3xx.h b/kernel/include/linux/platform_data/mtd-nand-pxa3xx.h
index 394d15597..b42ad83cb 100644
--- a/kernel/include/linux/platform_data/mtd-nand-pxa3xx.h
+++ b/kernel/include/linux/platform_data/mtd-nand-pxa3xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_ARCH_PXA3XX_NAND_H
 #define __ASM_ARCH_PXA3XX_NAND_H
 
diff --git a/kernel/include/linux/platform_data/omap1_bl.h b/kernel/include/linux/platform_data/omap1_bl.h
index 881a8e92d..5e8b17d77 100644
--- a/kernel/include/linux/platform_data/omap1_bl.h
+++ b/kernel/include/linux/platform_data/omap1_bl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OMAP1_BL_H__
 #define __OMAP1_BL_H__
 
diff --git a/kernel/include/linux/platform_data/pca953x.h b/kernel/include/linux/platform_data/pca953x.h
index 3c98dd4f9..4eb53e023 100644
--- a/kernel/include/linux/platform_data/pca953x.h
+++ b/kernel/include/linux/platform_data/pca953x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PCA953X_H
 #define _LINUX_PCA953X_H
 
diff --git a/kernel/include/linux/platform_data/pcf857x.h b/kernel/include/linux/platform_data/pcf857x.h
index 0767a2a6b..11d4ed78c 100644
--- a/kernel/include/linux/platform_data/pcf857x.h
+++ b/kernel/include/linux/platform_data/pcf857x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PCF857X_H
 #define __LINUX_PCF857X_H
 
diff --git a/kernel/include/linux/platform_data/pcmcia-pxa2xx_viper.h b/kernel/include/linux/platform_data/pcmcia-pxa2xx_viper.h
index d428be4db..a23b58aff 100644
--- a/kernel/include/linux/platform_data/pcmcia-pxa2xx_viper.h
+++ b/kernel/include/linux/platform_data/pcmcia-pxa2xx_viper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ARCOM_PCMCIA_H
 #define __ARCOM_PCMCIA_H
 
diff --git a/kernel/include/linux/platform_data/pinctrl-single.h b/kernel/include/linux/platform_data/pinctrl-single.h
index 72eacda9b..1cf36fdf9 100644
--- a/kernel/include/linux/platform_data/pinctrl-single.h
+++ b/kernel/include/linux/platform_data/pinctrl-single.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
  * irq:		optional wake-up interrupt
  * rearm:	optional soc specific rearm function
diff --git a/kernel/include/linux/platform_data/pixcir_i2c_ts.h b/kernel/include/linux/platform_data/pixcir_i2c_ts.h
index 646af6f8b..4ab3cd6f1 100644
--- a/kernel/include/linux/platform_data/pixcir_i2c_ts.h
+++ b/kernel/include/linux/platform_data/pixcir_i2c_ts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	_PIXCIR_I2C_TS_H
 #define	_PIXCIR_I2C_TS_H
 
diff --git a/kernel/include/linux/platform_data/pxa2xx_udc.h b/kernel/include/linux/platform_data/pxa2xx_udc.h
index c6c5e98b5..ff9c35dca 100644
--- a/kernel/include/linux/platform_data/pxa2xx_udc.h
+++ b/kernel/include/linux/platform_data/pxa2xx_udc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This supports machine-specific differences in how the PXA2xx
  * USB Device Controller (UDC) is wired.
diff --git a/kernel/include/linux/platform_data/sa11x0-serial.h b/kernel/include/linux/platform_data/sa11x0-serial.h
index 009e1d83f..8b79ab08a 100644
--- a/kernel/include/linux/platform_data/sa11x0-serial.h
+++ b/kernel/include/linux/platform_data/sa11x0-serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Author: Nicolas Pitre
  *
diff --git a/kernel/include/linux/platform_data/si5351.h b/kernel/include/linux/platform_data/si5351.h
index 533d9807e..818c5c6e2 100644
--- a/kernel/include/linux/platform_data/si5351.h
+++ b/kernel/include/linux/platform_data/si5351.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Si5351A/B/C programmable clock generator platform_data.
  */
diff --git a/kernel/include/linux/platform_data/spi-ep93xx.h b/kernel/include/linux/platform_data/spi-ep93xx.h
index 171a271c2..eb16c6739 100644
--- a/kernel/include/linux/platform_data/spi-ep93xx.h
+++ b/kernel/include/linux/platform_data/spi-ep93xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_MACH_EP93XX_SPI_H
 #define __ASM_MACH_EP93XX_SPI_H
 
diff --git a/kernel/include/linux/platform_data/spi-imx.h b/kernel/include/linux/platform_data/spi-imx.h
index 08be445e8..6f012fefa 100644
--- a/kernel/include/linux/platform_data/spi-imx.h
+++ b/kernel/include/linux/platform_data/spi-imx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __MACH_SPI_H_
 #define __MACH_SPI_H_
diff --git a/kernel/include/linux/platform_data/spi-omap2-mcspi.h b/kernel/include/linux/platform_data/spi-omap2-mcspi.h
index c100456ea..13c83a259 100644
--- a/kernel/include/linux/platform_data/spi-omap2-mcspi.h
+++ b/kernel/include/linux/platform_data/spi-omap2-mcspi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _OMAP2_MCSPI_H
 #define _OMAP2_MCSPI_H
 
diff --git a/kernel/include/linux/platform_data/st1232_pdata.h b/kernel/include/linux/platform_data/st1232_pdata.h
index cac3e7b4c..1dcd23bee 100644
--- a/kernel/include/linux/platform_data/st1232_pdata.h
+++ b/kernel/include/linux/platform_data/st1232_pdata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_ST1232_PDATA_H
 #define _LINUX_ST1232_PDATA_H
 
diff --git a/kernel/include/linux/platform_data/syscon.h b/kernel/include/linux/platform_data/syscon.h
index 2354c6fa3..2c089dd3e 100644
--- a/kernel/include/linux/platform_data/syscon.h
+++ b/kernel/include/linux/platform_data/syscon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PLATFORM_DATA_SYSCON_H
 #define PLATFORM_DATA_SYSCON_H
 
diff --git a/kernel/include/linux/platform_data/tsc2007.h b/kernel/include/linux/platform_data/tsc2007.h
index c2d3aa1da..a0ca52c41 100644
--- a/kernel/include/linux/platform_data/tsc2007.h
+++ b/kernel/include/linux/platform_data/tsc2007.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_I2C_TSC2007_H
 #define __LINUX_I2C_TSC2007_H
 
diff --git a/kernel/include/linux/platform_data/tsl2563.h b/kernel/include/linux/platform_data/tsl2563.h
index c90d7a09d..9cf9309c3 100644
--- a/kernel/include/linux/platform_data/tsl2563.h
+++ b/kernel/include/linux/platform_data/tsl2563.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_TSL2563_H
 #define __LINUX_TSL2563_H
 
diff --git a/kernel/include/linux/platform_data/usb-ehci-mxc.h b/kernel/include/linux/platform_data/usb-ehci-mxc.h
index 157e71f79..ad9794d09 100644
--- a/kernel/include/linux/platform_data/usb-ehci-mxc.h
+++ b/kernel/include/linux/platform_data/usb-ehci-mxc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
 #define __INCLUDE_ASM_ARCH_MXC_EHCI_H
 
diff --git a/kernel/include/linux/platform_data/usb-ohci-pxa27x.h b/kernel/include/linux/platform_data/usb-ohci-pxa27x.h
index 95b6e2a6e..69adea769 100644
--- a/kernel/include/linux/platform_data/usb-ohci-pxa27x.h
+++ b/kernel/include/linux/platform_data/usb-ohci-pxa27x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASMARM_ARCH_OHCI_H
 #define ASMARM_ARCH_OHCI_H
 
diff --git a/kernel/include/linux/platform_data/usb3503.h b/kernel/include/linux/platform_data/usb3503.h
index 1d1b6ef87..e049d51c1 100644
--- a/kernel/include/linux/platform_data/usb3503.h
+++ b/kernel/include/linux/platform_data/usb3503.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USB3503_H__
 #define __USB3503_H__
 
diff --git a/kernel/include/linux/platform_data/video-clcd-versatile.h b/kernel/include/linux/platform_data/video-clcd-versatile.h
index 09ccf182a..305ebaec3 100644
--- a/kernel/include/linux/platform_data/video-clcd-versatile.h
+++ b/kernel/include/linux/platform_data/video-clcd-versatile.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PLAT_CLCD_H
 #define PLAT_CLCD_H
 
diff --git a/kernel/include/linux/platform_data/video-ep93xx.h b/kernel/include/linux/platform_data/video-ep93xx.h
index 699ac4109..a6f3ccdec 100644
--- a/kernel/include/linux/platform_data/video-ep93xx.h
+++ b/kernel/include/linux/platform_data/video-ep93xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __VIDEO_EP93XX_H
 #define __VIDEO_EP93XX_H
 
diff --git a/kernel/include/linux/platform_data/video-imxfb.h b/kernel/include/linux/platform_data/video-imxfb.h
index cf9348b37..02812651a 100644
--- a/kernel/include/linux/platform_data/video-imxfb.h
+++ b/kernel/include/linux/platform_data/video-imxfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This structure describes the machine which we are running on.
  */
diff --git a/kernel/include/linux/platform_data/video_s3c.h b/kernel/include/linux/platform_data/video_s3c.h
index 48883995f..dd7747ba3 100644
--- a/kernel/include/linux/platform_data/video_s3c.h
+++ b/kernel/include/linux/platform_data/video_s3c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PLATFORM_DATA_VIDEO_S3C
 #define __PLATFORM_DATA_VIDEO_S3C
 
diff --git a/kernel/include/linux/pm-trace.h b/kernel/include/linux/pm-trace.h
index 7b78793f0..b8604f884 100644
--- a/kernel/include/linux/pm-trace.h
+++ b/kernel/include/linux/pm-trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PM_TRACE_H
 #define PM_TRACE_H
 
diff --git a/kernel/include/linux/pm_qos.h b/kernel/include/linux/pm_qos.h
index 6737a8c9e..2a3acf4db 100644
--- a/kernel/include/linux/pm_qos.h
+++ b/kernel/include/linux/pm_qos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PM_QOS_H
 #define _LINUX_PM_QOS_H
 /* interface for the pm_qos_power infrastructure of the linux kernel.
@@ -27,17 +28,16 @@ enum pm_qos_flags_status {
 	PM_QOS_FLAGS_ALL,
 };
 
-#define PM_QOS_DEFAULT_VALUE	(-1)
-#define PM_QOS_LATENCY_ANY	S32_MAX
+#define PM_QOS_DEFAULT_VALUE -1
 
 #define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE	(2000 * USEC_PER_SEC)
 #define PM_QOS_NETWORK_LAT_DEFAULT_VALUE	(2000 * USEC_PER_SEC)
 #define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE	0
 #define PM_QOS_MEMORY_BANDWIDTH_DEFAULT_VALUE	0
 #define PM_QOS_RESUME_LATENCY_DEFAULT_VALUE	0
-#define PM_QOS_RESUME_LATENCY_NO_CONSTRAINT	PM_QOS_LATENCY_ANY
 #define PM_QOS_LATENCY_TOLERANCE_DEFAULT_VALUE	0
 #define PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT	(-1)
+#define PM_QOS_LATENCY_ANY			((s32)(~(__u32)0 >> 1))
 
 #define PM_QOS_FLAG_NO_POWER_OFF	(1 << 0)
 #define PM_QOS_FLAG_REMOTE_WAKEUP	(1 << 1)
diff --git a/kernel/include/linux/pmu.h b/kernel/include/linux/pmu.h
index 99b400b8a..9ac8fc60a 100644
--- a/kernel/include/linux/pmu.h
+++ b/kernel/include/linux/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for talking to the PMU.  The PMU is a microcontroller
  * which controls battery charging and system power on PowerBook 3400
diff --git a/kernel/include/linux/pnp.h b/kernel/include/linux/pnp.h
index 2588ca6a9..3b12fd28a 100644
--- a/kernel/include/linux/pnp.h
+++ b/kernel/include/linux/pnp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux Plug and Play Support
  * Copyright by Adam Belay <ambx1@neo.rr.com>
diff --git a/kernel/include/linux/poison.h b/kernel/include/linux/poison.h
index a39540326..15927ebc2 100644
--- a/kernel/include/linux/poison.h
+++ b/kernel/include/linux/poison.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_POISON_H
 #define _LINUX_POISON_H
 
diff --git a/kernel/include/linux/poll.h b/kernel/include/linux/poll.h
index 2889f09a1..d384f12ab 100644
--- a/kernel/include/linux/poll.h
+++ b/kernel/include/linux/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_POLL_H
 #define _LINUX_POLL_H
 
diff --git a/kernel/include/linux/posix-timers.h b/kernel/include/linux/posix-timers.h
index 62839fd04..672c4f323 100644
--- a/kernel/include/linux/posix-timers.h
+++ b/kernel/include/linux/posix-timers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _linux_POSIX_TIMERS_H
 #define _linux_POSIX_TIMERS_H
 
diff --git a/kernel/include/linux/posix_acl.h b/kernel/include/linux/posix_acl.h
index 5a9a739ac..b2b7255ec 100644
--- a/kernel/include/linux/posix_acl.h
+++ b/kernel/include/linux/posix_acl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: linux/posix_acl.h
 
diff --git a/kernel/include/linux/posix_acl_xattr.h b/kernel/include/linux/posix_acl_xattr.h
index 8b867e3bf..238770999 100644
--- a/kernel/include/linux/posix_acl_xattr.h
+++ b/kernel/include/linux/posix_acl_xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: linux/posix_acl_xattr.h
 
diff --git a/kernel/include/linux/power/bq27xxx_battery.h b/kernel/include/linux/power/bq27xxx_battery.h
index 43194e02c..e6187f524 100644
--- a/kernel/include/linux/power/bq27xxx_battery.h
+++ b/kernel/include/linux/power/bq27xxx_battery.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_BQ27X00_BATTERY_H__
 #define __LINUX_BQ27X00_BATTERY_H__
 
diff --git a/kernel/include/linux/pr.h b/kernel/include/linux/pr.h
index 65c01c10b..94ceec713 100644
--- a/kernel/include/linux/pr.h
+++ b/kernel/include/linux/pr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_PR_H
 #define LINUX_PR_H
 
diff --git a/kernel/include/linux/preempt.h b/kernel/include/linux/preempt.h
index cae461224..5bd3f151d 100644
--- a/kernel/include/linux/preempt.h
+++ b/kernel/include/linux/preempt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PREEMPT_H
 #define __LINUX_PREEMPT_H
 
diff --git a/kernel/include/linux/prefetch.h b/kernel/include/linux/prefetch.h
index a3bfbdf63..13eafebf3 100644
--- a/kernel/include/linux/prefetch.h
+++ b/kernel/include/linux/prefetch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Generic cache management functions. Everything is arch-specific,  
  *  but this header exists to make sure the defines/functions can be
diff --git a/kernel/include/linux/prime_numbers.h b/kernel/include/linux/prime_numbers.h
index 14ec4f567..2b8e99c94 100644
--- a/kernel/include/linux/prime_numbers.h
+++ b/kernel/include/linux/prime_numbers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PRIME_NUMBERS_H
 #define __LINUX_PRIME_NUMBERS_H
 
diff --git a/kernel/include/linux/printk.h b/kernel/include/linux/printk.h
index e10f27468..335926039 100644
--- a/kernel/include/linux/printk.h
+++ b/kernel/include/linux/printk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KERNEL_PRINTK__
 #define __KERNEL_PRINTK__
 
diff --git a/kernel/include/linux/proc_fs.h b/kernel/include/linux/proc_fs.h
index 76124dd4e..928ef9e4d 100644
--- a/kernel/include/linux/proc_fs.h
+++ b/kernel/include/linux/proc_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The proc filesystem constants/structures
  */
diff --git a/kernel/include/linux/proc_ns.h b/kernel/include/linux/proc_ns.h
index 06844b54d..2ff18c984 100644
--- a/kernel/include/linux/proc_ns.h
+++ b/kernel/include/linux/proc_ns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * procfs namespace bits
  */
diff --git a/kernel/include/linux/processor.h b/kernel/include/linux/processor.h
index da0c5e56c..dbc952eec 100644
--- a/kernel/include/linux/processor.h
+++ b/kernel/include/linux/processor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Misc low level processor primitives */
 #ifndef _LINUX_PROCESSOR_H
 #define _LINUX_PROCESSOR_H
diff --git a/kernel/include/linux/profile.h b/kernel/include/linux/profile.h
index b537a25ff..bad18ca43 100644
--- a/kernel/include/linux/profile.h
+++ b/kernel/include/linux/profile.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PROFILE_H
 #define _LINUX_PROFILE_H
 
diff --git a/kernel/include/linux/projid.h b/kernel/include/linux/projid.h
index 8c1f2c552..613730622 100644
--- a/kernel/include/linux/projid.h
+++ b/kernel/include/linux/projid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PROJID_H
 #define _LINUX_PROJID_H
 
diff --git a/kernel/include/linux/ptrace.h b/kernel/include/linux/ptrace.h
index 0e5fcc11b..919b2a0b0 100644
--- a/kernel/include/linux/ptrace.h
+++ b/kernel/include/linux/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PTRACE_H
 #define _LINUX_PTRACE_H
 
diff --git a/kernel/include/linux/purgatory.h b/kernel/include/linux/purgatory.h
index d60d4e278..b950e961c 100644
--- a/kernel/include/linux/purgatory.h
+++ b/kernel/include/linux/purgatory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_PURGATORY_H
 #define _LINUX_PURGATORY_H
 
diff --git a/kernel/include/linux/pvclock_gtod.h b/kernel/include/linux/pvclock_gtod.h
index a71d2dbd3..f63549581 100644
--- a/kernel/include/linux/pvclock_gtod.h
+++ b/kernel/include/linux/pvclock_gtod.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PVCLOCK_GTOD_H
 #define _PVCLOCK_GTOD_H
 
diff --git a/kernel/include/linux/pwm.h b/kernel/include/linux/pwm.h
index 08fad7c6a..56518adc3 100644
--- a/kernel/include/linux/pwm.h
+++ b/kernel/include/linux/pwm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PWM_H
 #define __LINUX_PWM_H
 
diff --git a/kernel/include/linux/pwm_backlight.h b/kernel/include/linux/pwm_backlight.h
index efdd9227a..e8afbd71a 100644
--- a/kernel/include/linux/pwm_backlight.h
+++ b/kernel/include/linux/pwm_backlight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generic PWM backlight driver data - see drivers/video/backlight/pwm_bl.c
  */
diff --git a/kernel/include/linux/pxa168_eth.h b/kernel/include/linux/pxa168_eth.h
index e1ab6e86c..fb09c2c7c 100644
--- a/kernel/include/linux/pxa168_eth.h
+++ b/kernel/include/linux/pxa168_eth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *pxa168 ethernet platform device data definition file.
  */
diff --git a/kernel/include/linux/qed/qed_fcoe_if.h b/kernel/include/linux/qed/qed_fcoe_if.h
index 1e015c50e..46082480a 100644
--- a/kernel/include/linux/qed/qed_fcoe_if.h
+++ b/kernel/include/linux/qed/qed_fcoe_if.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _QED_FCOE_IF_H
 #define _QED_FCOE_IF_H
 #include <linux/types.h>
diff --git a/kernel/include/linux/qnx6_fs.h b/kernel/include/linux/qnx6_fs.h
index 26049eab9..13373d437 100644
--- a/kernel/include/linux/qnx6_fs.h
+++ b/kernel/include/linux/qnx6_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Name                 : qnx6_fs.h
  *  Author               : Kai Bankett
diff --git a/kernel/include/linux/quicklist.h b/kernel/include/linux/quicklist.h
index 3bdfa70bc..034982c98 100644
--- a/kernel/include/linux/quicklist.h
+++ b/kernel/include/linux/quicklist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_QUICKLIST_H
 #define LINUX_QUICKLIST_H
 /*
diff --git a/kernel/include/linux/quotaops.h b/kernel/include/linux/quotaops.h
index 0ce6fc499..2fb6fb111 100644
--- a/kernel/include/linux/quotaops.h
+++ b/kernel/include/linux/quotaops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions for diskquota-operations. When diskquota is configured these
  * macros expand to the right source-code.
diff --git a/kernel/include/linux/raid/xor.h b/kernel/include/linux/raid/xor.h
index 5a210959e..2a9fee8dd 100644
--- a/kernel/include/linux/raid/xor.h
+++ b/kernel/include/linux/raid/xor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XOR_H
 #define _XOR_H
 
diff --git a/kernel/include/linux/ramfs.h b/kernel/include/linux/ramfs.h
index ecc730977..5ef7d54ca 100644
--- a/kernel/include/linux/ramfs.h
+++ b/kernel/include/linux/ramfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RAMFS_H
 #define _LINUX_RAMFS_H
 
diff --git a/kernel/include/linux/random.h b/kernel/include/linux/random.h
index eafea6a09..4024f7d9c 100644
--- a/kernel/include/linux/random.h
+++ b/kernel/include/linux/random.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/random.h
  *
diff --git a/kernel/include/linux/range.h b/kernel/include/linux/range.h
index bd184a5db..d1fbeb664 100644
--- a/kernel/include/linux/range.h
+++ b/kernel/include/linux/range.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RANGE_H
 #define _LINUX_RANGE_H
 
diff --git a/kernel/include/linux/ras.h b/kernel/include/linux/ras.h
index be5338a35..7c3debb47 100644
--- a/kernel/include/linux/ras.h
+++ b/kernel/include/linux/ras.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RAS_H__
 #define __RAS_H__
 
diff --git a/kernel/include/linux/ratelimit.h b/kernel/include/linux/ratelimit.h
index 56375edf2..8ddf79e92 100644
--- a/kernel/include/linux/ratelimit.h
+++ b/kernel/include/linux/ratelimit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RATELIMIT_H
 #define _LINUX_RATELIMIT_H
 
diff --git a/kernel/include/linux/rational.h b/kernel/include/linux/rational.h
index bfa6a2bcf..33f5f5fc3 100644
--- a/kernel/include/linux/rational.h
+++ b/kernel/include/linux/rational.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * rational fractions
  *
diff --git a/kernel/include/linux/rbtree_latch.h b/kernel/include/linux/rbtree_latch.h
index 4f3432c61..ece43e882 100644
--- a/kernel/include/linux/rbtree_latch.h
+++ b/kernel/include/linux/rbtree_latch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Latched RB-trees
  *
diff --git a/kernel/include/linux/rculist.h b/kernel/include/linux/rculist.h
index 2bea1d5e9..c2cdd45a8 100644
--- a/kernel/include/linux/rculist.h
+++ b/kernel/include/linux/rculist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RCULIST_H
 #define _LINUX_RCULIST_H
 
diff --git a/kernel/include/linux/rculist_bl.h b/kernel/include/linux/rculist_bl.h
index 4f216c59e..66e73ec1a 100644
--- a/kernel/include/linux/rculist_bl.h
+++ b/kernel/include/linux/rculist_bl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RCULIST_BL_H
 #define _LINUX_RCULIST_BL_H
 
diff --git a/kernel/include/linux/rculist_nulls.h b/kernel/include/linux/rculist_nulls.h
index a23a33153..a328e8181 100644
--- a/kernel/include/linux/rculist_nulls.h
+++ b/kernel/include/linux/rculist_nulls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RCULIST_NULLS_H
 #define _LINUX_RCULIST_NULLS_H
 
diff --git a/kernel/include/linux/rcupdate_wait.h b/kernel/include/linux/rcupdate_wait.h
index e774b4f5f..57f371344 100644
--- a/kernel/include/linux/rcupdate_wait.h
+++ b/kernel/include/linux/rcupdate_wait.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_RCUPDATE_WAIT_H
 #define _LINUX_SCHED_RCUPDATE_WAIT_H
 
diff --git a/kernel/include/linux/rcuwait.h b/kernel/include/linux/rcuwait.h
index a4ede51b3..90bfa3279 100644
--- a/kernel/include/linux/rcuwait.h
+++ b/kernel/include/linux/rcuwait.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RCUWAIT_H_
 #define _LINUX_RCUWAIT_H_
 
diff --git a/kernel/include/linux/reboot-mode.h b/kernel/include/linux/reboot-mode.h
index 75f7fe5c8..4a2abb38d 100644
--- a/kernel/include/linux/reboot-mode.h
+++ b/kernel/include/linux/reboot-mode.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __REBOOT_MODE_H__
 #define __REBOOT_MODE_H__
 
diff --git a/kernel/include/linux/reboot.h b/kernel/include/linux/reboot.h
index a7ff409f3..d03da0eb9 100644
--- a/kernel/include/linux/reboot.h
+++ b/kernel/include/linux/reboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_REBOOT_H
 #define _LINUX_REBOOT_H
 
diff --git a/kernel/include/linux/reciprocal_div.h b/kernel/include/linux/reciprocal_div.h
index 8c5a3fb6c..e031e9f2f 100644
--- a/kernel/include/linux/reciprocal_div.h
+++ b/kernel/include/linux/reciprocal_div.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RECIPROCAL_DIV_H
 #define _LINUX_RECIPROCAL_DIV_H
 
diff --git a/kernel/include/linux/refcount.h b/kernel/include/linux/refcount.h
index 48b7c9c68..e8286585e 100644
--- a/kernel/include/linux/refcount.h
+++ b/kernel/include/linux/refcount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_REFCOUNT_H
 #define _LINUX_REFCOUNT_H
 
diff --git a/kernel/include/linux/regulator/of_regulator.h b/kernel/include/linux/regulator/of_regulator.h
index 763953f7e..df7f154a2 100644
--- a/kernel/include/linux/regulator/of_regulator.h
+++ b/kernel/include/linux/regulator/of_regulator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * OpenFirmware regulator support routines
  *
diff --git a/kernel/include/linux/regulator/userspace-consumer.h b/kernel/include/linux/regulator/userspace-consumer.h
index b4554ce9d..b5dba0628 100644
--- a/kernel/include/linux/regulator/userspace-consumer.h
+++ b/kernel/include/linux/regulator/userspace-consumer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __REGULATOR_PLATFORM_CONSUMER_H_
 #define __REGULATOR_PLATFORM_CONSUMER_H_
 
diff --git a/kernel/include/linux/relay.h b/kernel/include/linux/relay.h
index 68c1448e5..e1bdf01a8 100644
--- a/kernel/include/linux/relay.h
+++ b/kernel/include/linux/relay.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/relay.h
  *
diff --git a/kernel/include/linux/reset-controller.h b/kernel/include/linux/reset-controller.h
index db1fe6772..adb88f8ce 100644
--- a/kernel/include/linux/reset-controller.h
+++ b/kernel/include/linux/reset-controller.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RESET_CONTROLLER_H_
 #define _LINUX_RESET_CONTROLLER_H_
 
diff --git a/kernel/include/linux/reset.h b/kernel/include/linux/reset.h
index 56463f37f..4c7871ddf 100644
--- a/kernel/include/linux/reset.h
+++ b/kernel/include/linux/reset.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RESET_H_
 #define _LINUX_RESET_H_
 
diff --git a/kernel/include/linux/resource.h b/kernel/include/linux/resource.h
index 277afdad6..bdf491cbc 100644
--- a/kernel/include/linux/resource.h
+++ b/kernel/include/linux/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RESOURCE_H
 #define _LINUX_RESOURCE_H
 
diff --git a/kernel/include/linux/restart_block.h b/kernel/include/linux/restart_block.h
index 19df84226..bcfdb918c 100644
--- a/kernel/include/linux/restart_block.h
+++ b/kernel/include/linux/restart_block.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common syscall restarting data
  */
diff --git a/kernel/include/linux/ring_buffer.h b/kernel/include/linux/ring_buffer.h
index ee9b461af..fa6ace66f 100644
--- a/kernel/include/linux/ring_buffer.h
+++ b/kernel/include/linux/ring_buffer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RING_BUFFER_H
 #define _LINUX_RING_BUFFER_H
 
diff --git a/kernel/include/linux/rmap.h b/kernel/include/linux/rmap.h
index 733d3d818..988d17647 100644
--- a/kernel/include/linux/rmap.h
+++ b/kernel/include/linux/rmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_RMAP_H
 #define _LINUX_RMAP_H
 /*
diff --git a/kernel/include/linux/rndis.h b/kernel/include/linux/rndis.h
index 93c0a64ae..882587c2b 100644
--- a/kernel/include/linux/rndis.h
+++ b/kernel/include/linux/rndis.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Remote Network Driver Interface Specification (RNDIS)
  * definitions of the magic numbers used by this protocol
diff --git a/kernel/include/linux/root_dev.h b/kernel/include/linux/root_dev.h
index ed241aad7..bab671b07 100644
--- a/kernel/include/linux/root_dev.h
+++ b/kernel/include/linux/root_dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ROOT_DEV_H_
 #define _ROOT_DEV_H_
 
diff --git a/kernel/include/linux/rpmsg/qcom_smd.h b/kernel/include/linux/rpmsg/qcom_smd.h
index f27917e0a..2e92d7407 100644
--- a/kernel/include/linux/rpmsg/qcom_smd.h
+++ b/kernel/include/linux/rpmsg/qcom_smd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _LINUX_RPMSG_QCOM_SMD_H
 #define _LINUX_RPMSG_QCOM_SMD_H
diff --git a/kernel/include/linux/rtc.h b/kernel/include/linux/rtc.h
index e6d0f9c1c..f6d7ee98d 100644
--- a/kernel/include/linux/rtc.h
+++ b/kernel/include/linux/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generic RTC interface.
  * This version contains the part of the user interface to the Real Time Clock
diff --git a/kernel/include/linux/rtmutex.h b/kernel/include/linux/rtmutex.h
index 53fcbe9de..1b92a28dd 100644
--- a/kernel/include/linux/rtmutex.h
+++ b/kernel/include/linux/rtmutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * RT Mutexes: blocking mutual exclusion locks with PI support
  *
diff --git a/kernel/include/linux/rtnetlink.h b/kernel/include/linux/rtnetlink.h
index dea59c8ee..ff3dd2ec4 100644
--- a/kernel/include/linux/rtnetlink.h
+++ b/kernel/include/linux/rtnetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_RTNETLINK_H
 #define __LINUX_RTNETLINK_H
 
diff --git a/kernel/include/linux/rwsem-spinlock.h b/kernel/include/linux/rwsem-spinlock.h
index e784761a4..e47568363 100644
--- a/kernel/include/linux/rwsem-spinlock.h
+++ b/kernel/include/linux/rwsem-spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* rwsem-spinlock.h: fallback C implementation
  *
  * Copyright (c) 2001   David Howells (dhowells@redhat.com).
diff --git a/kernel/include/linux/rwsem.h b/kernel/include/linux/rwsem.h
index 0ad7318ff..dfa34d803 100644
--- a/kernel/include/linux/rwsem.h
+++ b/kernel/include/linux/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* rwsem.h: R/W semaphores, public interface
  *
  * Written by David Howells (dhowells@redhat.com).
diff --git a/kernel/include/linux/s3c_adc_battery.h b/kernel/include/linux/s3c_adc_battery.h
index 99dadbffd..833871dcf 100644
--- a/kernel/include/linux/s3c_adc_battery.h
+++ b/kernel/include/linux/s3c_adc_battery.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S3C_ADC_BATTERY_H
 #define _S3C_ADC_BATTERY_H
 
diff --git a/kernel/include/linux/scatterlist.h b/kernel/include/linux/scatterlist.h
index 4b3286ac6..d87dfa411 100644
--- a/kernel/include/linux/scatterlist.h
+++ b/kernel/include/linux/scatterlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCATTERLIST_H
 #define _LINUX_SCATTERLIST_H
 
diff --git a/kernel/include/linux/scc.h b/kernel/include/linux/scc.h
index c5a004962..745eabd17 100644
--- a/kernel/include/linux/scc.h
+++ b/kernel/include/linux/scc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: scc.h,v 1.29 1997/04/02 14:56:45 jreuter Exp jreuter $ */
 #ifndef	_SCC_H
 #define	_SCC_H
diff --git a/kernel/include/linux/sched.h b/kernel/include/linux/sched.h
index 26a7df4e5..fdf74f27a 100644
--- a/kernel/include/linux/sched.h
+++ b/kernel/include/linux/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_H
 #define _LINUX_SCHED_H
 
diff --git a/kernel/include/linux/sched/autogroup.h b/kernel/include/linux/sched/autogroup.h
index 55cd496df..704391cc1 100644
--- a/kernel/include/linux/sched/autogroup.h
+++ b/kernel/include/linux/sched/autogroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_AUTOGROUP_H
 #define _LINUX_SCHED_AUTOGROUP_H
 
diff --git a/kernel/include/linux/sched/clock.h b/kernel/include/linux/sched/clock.h
index a55600ffd..867d58831 100644
--- a/kernel/include/linux/sched/clock.h
+++ b/kernel/include/linux/sched/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_CLOCK_H
 #define _LINUX_SCHED_CLOCK_H
 
diff --git a/kernel/include/linux/sched/coredump.h b/kernel/include/linux/sched/coredump.h
index 98ae0d05a..9c8847395 100644
--- a/kernel/include/linux/sched/coredump.h
+++ b/kernel/include/linux/sched/coredump.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_COREDUMP_H
 #define _LINUX_SCHED_COREDUMP_H
 
diff --git a/kernel/include/linux/sched/cpufreq.h b/kernel/include/linux/sched/cpufreq.h
index d2be2ccbb..d1ad3d825 100644
--- a/kernel/include/linux/sched/cpufreq.h
+++ b/kernel/include/linux/sched/cpufreq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_CPUFREQ_H
 #define _LINUX_SCHED_CPUFREQ_H
 
diff --git a/kernel/include/linux/sched/cputime.h b/kernel/include/linux/sched/cputime.h
index 4c5b9735c..d0677f673 100644
--- a/kernel/include/linux/sched/cputime.h
+++ b/kernel/include/linux/sched/cputime.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_CPUTIME_H
 #define _LINUX_SCHED_CPUTIME_H
 
diff --git a/kernel/include/linux/sched/deadline.h b/kernel/include/linux/sched/deadline.h
index 975be862e..a5bc8728e 100644
--- a/kernel/include/linux/sched/deadline.h
+++ b/kernel/include/linux/sched/deadline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_DEADLINE_H
 #define _LINUX_SCHED_DEADLINE_H
 
diff --git a/kernel/include/linux/sched/debug.h b/kernel/include/linux/sched/debug.h
index 5d58d49e9..95fb9e025 100644
--- a/kernel/include/linux/sched/debug.h
+++ b/kernel/include/linux/sched/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_DEBUG_H
 #define _LINUX_SCHED_DEBUG_H
 
diff --git a/kernel/include/linux/sched/hotplug.h b/kernel/include/linux/sched/hotplug.h
index 752ac7e62..9a62ffdd2 100644
--- a/kernel/include/linux/sched/hotplug.h
+++ b/kernel/include/linux/sched/hotplug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_HOTPLUG_H
 #define _LINUX_SCHED_HOTPLUG_H
 
diff --git a/kernel/include/linux/sched/idle.h b/kernel/include/linux/sched/idle.h
index 5ca63ebad..22873d276 100644
--- a/kernel/include/linux/sched/idle.h
+++ b/kernel/include/linux/sched/idle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_IDLE_H
 #define _LINUX_SCHED_IDLE_H
 
diff --git a/kernel/include/linux/sched/init.h b/kernel/include/linux/sched/init.h
index 127215045..03542575f 100644
--- a/kernel/include/linux/sched/init.h
+++ b/kernel/include/linux/sched/init.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_INIT_H
 #define _LINUX_SCHED_INIT_H
 
diff --git a/kernel/include/linux/sched/jobctl.h b/kernel/include/linux/sched/jobctl.h
index 016afa0fb..98228bd48 100644
--- a/kernel/include/linux/sched/jobctl.h
+++ b/kernel/include/linux/sched/jobctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_JOBCTL_H
 #define _LINUX_SCHED_JOBCTL_H
 
diff --git a/kernel/include/linux/sched/loadavg.h b/kernel/include/linux/sched/loadavg.h
index 4264bc6b2..80bc84ba5 100644
--- a/kernel/include/linux/sched/loadavg.h
+++ b/kernel/include/linux/sched/loadavg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_LOADAVG_H
 #define _LINUX_SCHED_LOADAVG_H
 
diff --git a/kernel/include/linux/sched/mm.h b/kernel/include/linux/sched/mm.h
index ab9bf7b73..3d49b91b6 100644
--- a/kernel/include/linux/sched/mm.h
+++ b/kernel/include/linux/sched/mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_MM_H
 #define _LINUX_SCHED_MM_H
 
diff --git a/kernel/include/linux/sched/nohz.h b/kernel/include/linux/sched/nohz.h
index 028d17b91..3d3a97d93 100644
--- a/kernel/include/linux/sched/nohz.h
+++ b/kernel/include/linux/sched/nohz.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_NOHZ_H
 #define _LINUX_SCHED_NOHZ_H
 
diff --git a/kernel/include/linux/sched/numa_balancing.h b/kernel/include/linux/sched/numa_balancing.h
index 35d5fc77b..e7dd04a84 100644
--- a/kernel/include/linux/sched/numa_balancing.h
+++ b/kernel/include/linux/sched/numa_balancing.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_NUMA_BALANCING_H
 #define _LINUX_SCHED_NUMA_BALANCING_H
 
diff --git a/kernel/include/linux/sched/prio.h b/kernel/include/linux/sched/prio.h
index 2cc450f6e..7d64feafc 100644
--- a/kernel/include/linux/sched/prio.h
+++ b/kernel/include/linux/sched/prio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_PRIO_H
 #define _LINUX_SCHED_PRIO_H
 
diff --git a/kernel/include/linux/sched/rt.h b/kernel/include/linux/sched/rt.h
index f93329aba..db865ed25 100644
--- a/kernel/include/linux/sched/rt.h
+++ b/kernel/include/linux/sched/rt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_RT_H
 #define _LINUX_SCHED_RT_H
 
diff --git a/kernel/include/linux/sched/signal.h b/kernel/include/linux/sched/signal.h
index 2a0dd40b1..0aa4548fb 100644
--- a/kernel/include/linux/sched/signal.h
+++ b/kernel/include/linux/sched/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_SIGNAL_H
 #define _LINUX_SCHED_SIGNAL_H
 
diff --git a/kernel/include/linux/sched/stat.h b/kernel/include/linux/sched/stat.h
index 141b74c53..04f1321d1 100644
--- a/kernel/include/linux/sched/stat.h
+++ b/kernel/include/linux/sched/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_STAT_H
 #define _LINUX_SCHED_STAT_H
 
diff --git a/kernel/include/linux/sched/sysctl.h b/kernel/include/linux/sched/sysctl.h
index 0f5ecd4d2..d6a18a383 100644
--- a/kernel/include/linux/sched/sysctl.h
+++ b/kernel/include/linux/sched/sysctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_SYSCTL_H
 #define _LINUX_SCHED_SYSCTL_H
 
diff --git a/kernel/include/linux/sched/task.h b/kernel/include/linux/sched/task.h
index 79a2a7446..05b8650f0 100644
--- a/kernel/include/linux/sched/task.h
+++ b/kernel/include/linux/sched/task.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_TASK_H
 #define _LINUX_SCHED_TASK_H
 
diff --git a/kernel/include/linux/sched/task_stack.h b/kernel/include/linux/sched/task_stack.h
index df6ea6665..cb4828aaa 100644
--- a/kernel/include/linux/sched/task_stack.h
+++ b/kernel/include/linux/sched/task_stack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_TASK_STACK_H
 #define _LINUX_SCHED_TASK_STACK_H
 
diff --git a/kernel/include/linux/sched/topology.h b/kernel/include/linux/sched/topology.h
index 7d065abc7..cf257c2e7 100644
--- a/kernel/include/linux/sched/topology.h
+++ b/kernel/include/linux/sched/topology.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_TOPOLOGY_H
 #define _LINUX_SCHED_TOPOLOGY_H
 
diff --git a/kernel/include/linux/sched/user.h b/kernel/include/linux/sched/user.h
index 3c07e4135..0dcf4e480 100644
--- a/kernel/include/linux/sched/user.h
+++ b/kernel/include/linux/sched/user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_USER_H
 #define _LINUX_SCHED_USER_H
 
diff --git a/kernel/include/linux/sched/wake_q.h b/kernel/include/linux/sched/wake_q.h
index d03d8a904..10b19a192 100644
--- a/kernel/include/linux/sched/wake_q.h
+++ b/kernel/include/linux/sched/wake_q.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_WAKE_Q_H
 #define _LINUX_SCHED_WAKE_Q_H
 
diff --git a/kernel/include/linux/sched/xacct.h b/kernel/include/linux/sched/xacct.h
index a28156a0d..c078f0a94 100644
--- a/kernel/include/linux/sched/xacct.h
+++ b/kernel/include/linux/sched/xacct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SCHED_XACCT_H
 #define _LINUX_SCHED_XACCT_H
 
diff --git a/kernel/include/linux/screen_info.h b/kernel/include/linux/screen_info.h
index f0f8bad54..eab708139 100644
--- a/kernel/include/linux/screen_info.h
+++ b/kernel/include/linux/screen_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCREEN_INFO_H
 #define _SCREEN_INFO_H
 
diff --git a/kernel/include/linux/scx200.h b/kernel/include/linux/scx200.h
index de466e11e..652ec1a45 100644
--- a/kernel/include/linux/scx200.h
+++ b/kernel/include/linux/scx200.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/include/linux/scx200.h
 
    Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
diff --git a/kernel/include/linux/scx200_gpio.h b/kernel/include/linux/scx200_gpio.h
index ece4e553e..6386ddbb6 100644
--- a/kernel/include/linux/scx200_gpio.h
+++ b/kernel/include/linux/scx200_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear);
 
 extern unsigned scx200_gpio_base;
diff --git a/kernel/include/linux/sdb.h b/kernel/include/linux/sdb.h
index fbb76a46c..a2404a2bb 100644
--- a/kernel/include/linux/sdb.h
+++ b/kernel/include/linux/sdb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is the official version 1.1 of sdb.h
  */
diff --git a/kernel/include/linux/seccomp.h b/kernel/include/linux/seccomp.h
index c8bef436b..10f25f7e4 100644
--- a/kernel/include/linux/seccomp.h
+++ b/kernel/include/linux/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SECCOMP_H
 #define _LINUX_SECCOMP_H
 
diff --git a/kernel/include/linux/securebits.h b/kernel/include/linux/securebits.h
index da1b33b33..656528673 100644
--- a/kernel/include/linux/securebits.h
+++ b/kernel/include/linux/securebits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SECUREBITS_H
 #define _LINUX_SECUREBITS_H 1
 
diff --git a/kernel/include/linux/seg6.h b/kernel/include/linux/seg6.h
index 7a66d2b4c..369066a33 100644
--- a/kernel/include/linux/seg6.h
+++ b/kernel/include/linux/seg6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEG6_H
 #define _LINUX_SEG6_H
 
diff --git a/kernel/include/linux/seg6_genl.h b/kernel/include/linux/seg6_genl.h
index d6c3fb4f3..2f25a3cd7 100644
--- a/kernel/include/linux/seg6_genl.h
+++ b/kernel/include/linux/seg6_genl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEG6_GENL_H
 #define _LINUX_SEG6_GENL_H
 
diff --git a/kernel/include/linux/seg6_hmac.h b/kernel/include/linux/seg6_hmac.h
index da437ebdc..16e59595e 100644
--- a/kernel/include/linux/seg6_hmac.h
+++ b/kernel/include/linux/seg6_hmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEG6_HMAC_H
 #define _LINUX_SEG6_HMAC_H
 
diff --git a/kernel/include/linux/seg6_iptunnel.h b/kernel/include/linux/seg6_iptunnel.h
index 5377cf6a5..d07df7fc9 100644
--- a/kernel/include/linux/seg6_iptunnel.h
+++ b/kernel/include/linux/seg6_iptunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEG6_IPTUNNEL_H
 #define _LINUX_SEG6_IPTUNNEL_H
 
diff --git a/kernel/include/linux/selection.h b/kernel/include/linux/selection.h
index 8e4624efd..5b278ce99 100644
--- a/kernel/include/linux/selection.h
+++ b/kernel/include/linux/selection.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * selection.h
  *
diff --git a/kernel/include/linux/sem.h b/kernel/include/linux/sem.h
index 008312831..9badd322d 100644
--- a/kernel/include/linux/sem.h
+++ b/kernel/include/linux/sem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEM_H
 #define _LINUX_SEM_H
 
diff --git a/kernel/include/linux/seq_buf.h b/kernel/include/linux/seq_buf.h
index fb7eb9ccb..aa5deb041 100644
--- a/kernel/include/linux/seq_buf.h
+++ b/kernel/include/linux/seq_buf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEQ_BUF_H
 #define _LINUX_SEQ_BUF_H
 
diff --git a/kernel/include/linux/seq_file.h b/kernel/include/linux/seq_file.h
index e305b66a9..09c6e2874 100644
--- a/kernel/include/linux/seq_file.h
+++ b/kernel/include/linux/seq_file.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SEQ_FILE_H
 #define _LINUX_SEQ_FILE_H
 
diff --git a/kernel/include/linux/seq_file_net.h b/kernel/include/linux/seq_file_net.h
index 32c89bbe2..43ccd8412 100644
--- a/kernel/include/linux/seq_file_net.h
+++ b/kernel/include/linux/seq_file_net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SEQ_FILE_NET_H__
 #define __SEQ_FILE_NET_H__
 
diff --git a/kernel/include/linux/seqlock.h b/kernel/include/linux/seqlock.h
index ead97654c..f189a8a3b 100644
--- a/kernel/include/linux/seqlock.h
+++ b/kernel/include/linux/seqlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SEQLOCK_H
 #define __LINUX_SEQLOCK_H
 /*
diff --git a/kernel/include/linux/serial_bcm63xx.h b/kernel/include/linux/serial_bcm63xx.h
index 570e964dc..b5e48ef89 100644
--- a/kernel/include/linux/serial_bcm63xx.h
+++ b/kernel/include/linux/serial_bcm63xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SERIAL_BCM63XX_H
 #define _LINUX_SERIAL_BCM63XX_H
 
diff --git a/kernel/include/linux/serial_sci.h b/kernel/include/linux/serial_sci.h
index e598eaef3..c0e795d95 100644
--- a/kernel/include/linux/serial_sci.h
+++ b/kernel/include/linux/serial_sci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SERIAL_SCI_H
 #define __LINUX_SERIAL_SCI_H
 
diff --git a/kernel/include/linux/sh_clk.h b/kernel/include/linux/sh_clk.h
index 645896b81..7bed5be88 100644
--- a/kernel/include/linux/sh_clk.h
+++ b/kernel/include/linux/sh_clk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SH_CLOCK_H
 #define __SH_CLOCK_H
 
diff --git a/kernel/include/linux/sh_eth.h b/kernel/include/linux/sh_eth.h
index f2e27e078..ff3642d26 100644
--- a/kernel/include/linux/sh_eth.h
+++ b/kernel/include/linux/sh_eth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_ETH_H__
 #define __ASM_SH_ETH_H__
 
diff --git a/kernel/include/linux/sh_intc.h b/kernel/include/linux/sh_intc.h
index 32383285d..c255273b0 100644
--- a/kernel/include/linux/sh_intc.h
+++ b/kernel/include/linux/sh_intc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SH_INTC_H
 #define __SH_INTC_H
 
diff --git a/kernel/include/linux/sh_timer.h b/kernel/include/linux/sh_timer.h
index 64638b058..74fd5140b 100644
--- a/kernel/include/linux/sh_timer.h
+++ b/kernel/include/linux/sh_timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SH_TIMER_H__
 #define __SH_TIMER_H__
 
diff --git a/kernel/include/linux/shm.h b/kernel/include/linux/shm.h
index 74a4b3b64..2bbafacfb 100644
--- a/kernel/include/linux/shm.h
+++ b/kernel/include/linux/shm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SHM_H_
 #define _LINUX_SHM_H_
 
diff --git a/kernel/include/linux/shmem_fs.h b/kernel/include/linux/shmem_fs.h
index b6c3540e0..ed91ce57c 100644
--- a/kernel/include/linux/shmem_fs.h
+++ b/kernel/include/linux/shmem_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SHMEM_FS_H
 #define __SHMEM_FS_H
 
diff --git a/kernel/include/linux/shrinker.h b/kernel/include/linux/shrinker.h
index 51d189615..388ff2936 100644
--- a/kernel/include/linux/shrinker.h
+++ b/kernel/include/linux/shrinker.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SHRINKER_H
 #define _LINUX_SHRINKER_H
 
diff --git a/kernel/include/linux/signal.h b/kernel/include/linux/signal.h
index 38564e3e5..042968dd9 100644
--- a/kernel/include/linux/signal.h
+++ b/kernel/include/linux/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SIGNAL_H
 #define _LINUX_SIGNAL_H
 
diff --git a/kernel/include/linux/signal_types.h b/kernel/include/linux/signal_types.h
index 16d862a3d..222ae6960 100644
--- a/kernel/include/linux/signal_types.h
+++ b/kernel/include/linux/signal_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SIGNAL_TYPES_H
 #define _LINUX_SIGNAL_TYPES_H
 
diff --git a/kernel/include/linux/signalfd.h b/kernel/include/linux/signalfd.h
index 498504864..9a47c380b 100644
--- a/kernel/include/linux/signalfd.h
+++ b/kernel/include/linux/signalfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/signalfd.h
  *
diff --git a/kernel/include/linux/sirfsoc_dma.h b/kernel/include/linux/sirfsoc_dma.h
index 29d959333..50161b6af 100644
--- a/kernel/include/linux/sirfsoc_dma.h
+++ b/kernel/include/linux/sirfsoc_dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SIRFSOC_DMA_H_
 #define _SIRFSOC_DMA_H_
 
diff --git a/kernel/include/linux/slab.h b/kernel/include/linux/slab.h
index 41473df6d..af5aa65c7 100644
--- a/kernel/include/linux/slab.h
+++ b/kernel/include/linux/slab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Written by Mark Hemment, 1996 (markhe@nextd.demon.co.uk).
  *
diff --git a/kernel/include/linux/slab_def.h b/kernel/include/linux/slab_def.h
index 4ad2c5a26..8f7d2b165 100644
--- a/kernel/include/linux/slab_def.h
+++ b/kernel/include/linux/slab_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SLAB_DEF_H
 #define	_LINUX_SLAB_DEF_H
 
diff --git a/kernel/include/linux/slub_def.h b/kernel/include/linux/slub_def.h
index 0783b6223..39fa09bcd 100644
--- a/kernel/include/linux/slub_def.h
+++ b/kernel/include/linux/slub_def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SLUB_DEF_H
 #define _LINUX_SLUB_DEF_H
 
diff --git a/kernel/include/linux/smc911x.h b/kernel/include/linux/smc911x.h
index 521f37143..8cace8189 100644
--- a/kernel/include/linux/smc911x.h
+++ b/kernel/include/linux/smc911x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SMC911X_H__
 #define __SMC911X_H__
 
diff --git a/kernel/include/linux/smc91x.h b/kernel/include/linux/smc91x.h
index 129bc674d..f3b195fa7 100644
--- a/kernel/include/linux/smc91x.h
+++ b/kernel/include/linux/smc91x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SMC91X_H__
 #define __SMC91X_H__
 
diff --git a/kernel/include/linux/smp.h b/kernel/include/linux/smp.h
index 98b1fe027..9fb239e12 100644
--- a/kernel/include/linux/smp.h
+++ b/kernel/include/linux/smp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SMP_H
 #define __LINUX_SMP_H
 
diff --git a/kernel/include/linux/smpboot.h b/kernel/include/linux/smpboot.h
index c149aa7be..c174844cf 100644
--- a/kernel/include/linux/smpboot.h
+++ b/kernel/include/linux/smpboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SMPBOOT_H
 #define _LINUX_SMPBOOT_H
 
diff --git a/kernel/include/linux/smscphy.h b/kernel/include/linux/smscphy.h
index f4bf16e16..1a136271b 100644
--- a/kernel/include/linux/smscphy.h
+++ b/kernel/include/linux/smscphy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SMSCPHY_H__
 #define __LINUX_SMSCPHY_H__
 
diff --git a/kernel/include/linux/soc/brcmstb/brcmstb.h b/kernel/include/linux/soc/brcmstb/brcmstb.h
index 337ce414e..003f3dd5b 100644
--- a/kernel/include/linux/soc/brcmstb/brcmstb.h
+++ b/kernel/include/linux/soc/brcmstb/brcmstb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BRCMSTB_SOC_H
 #define __BRCMSTB_SOC_H
 
diff --git a/kernel/include/linux/soc/dove/pmu.h b/kernel/include/linux/soc/dove/pmu.h
index 765386972..1955c01de 100644
--- a/kernel/include/linux/soc/dove/pmu.h
+++ b/kernel/include/linux/soc/dove/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SOC_DOVE_PMU_H
 #define LINUX_SOC_DOVE_PMU_H
 
diff --git a/kernel/include/linux/soc/mediatek/infracfg.h b/kernel/include/linux/soc/mediatek/infracfg.h
index a0182ec2a..e8d9f0d52 100644
--- a/kernel/include/linux/soc/mediatek/infracfg.h
+++ b/kernel/include/linux/soc/mediatek/infracfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOC_MEDIATEK_INFRACFG_H
 #define __SOC_MEDIATEK_INFRACFG_H
 
diff --git a/kernel/include/linux/soc/qcom/mdt_loader.h b/kernel/include/linux/soc/qcom/mdt_loader.h
index f423001db..bd8e0864b 100644
--- a/kernel/include/linux/soc/qcom/mdt_loader.h
+++ b/kernel/include/linux/soc/qcom/mdt_loader.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QCOM_MDT_LOADER_H__
 #define __QCOM_MDT_LOADER_H__
 
diff --git a/kernel/include/linux/soc/qcom/smd-rpm.h b/kernel/include/linux/soc/qcom/smd-rpm.h
index 2a53dcaee..4eff6e686 100644
--- a/kernel/include/linux/soc/qcom/smd-rpm.h
+++ b/kernel/include/linux/soc/qcom/smd-rpm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QCOM_SMD_RPM_H__
 #define __QCOM_SMD_RPM_H__
 
diff --git a/kernel/include/linux/soc/qcom/smem.h b/kernel/include/linux/soc/qcom/smem.h
index 785e196ee..c1657ed27 100644
--- a/kernel/include/linux/soc/qcom/smem.h
+++ b/kernel/include/linux/soc/qcom/smem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QCOM_SMEM_H__
 #define __QCOM_SMEM_H__
 
diff --git a/kernel/include/linux/soc/qcom/smem_state.h b/kernel/include/linux/soc/qcom/smem_state.h
index b8478ee7a..63ad8cdda 100644
--- a/kernel/include/linux/soc/qcom/smem_state.h
+++ b/kernel/include/linux/soc/qcom/smem_state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QCOM_SMEM_STATE__
 #define __QCOM_SMEM_STATE__
 
diff --git a/kernel/include/linux/soc/qcom/wcnss_ctrl.h b/kernel/include/linux/soc/qcom/wcnss_ctrl.h
index a4dd4d7c7..bbeb6b9c0 100644
--- a/kernel/include/linux/soc/qcom/wcnss_ctrl.h
+++ b/kernel/include/linux/soc/qcom/wcnss_ctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __WCNSS_CTRL_H__
 #define __WCNSS_CTRL_H__
 
diff --git a/kernel/include/linux/soc/renesas/rcar-rst.h b/kernel/include/linux/soc/renesas/rcar-rst.h
index 2c231f228..7899a5b8c 100644
--- a/kernel/include/linux/soc/renesas/rcar-rst.h
+++ b/kernel/include/linux/soc/renesas/rcar-rst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__
 #define __LINUX_SOC_RENESAS_RCAR_RST_H__
 
diff --git a/kernel/include/linux/soc/renesas/rcar-sysc.h b/kernel/include/linux/soc/renesas/rcar-sysc.h
index 7b8b280c1..8a6086d2e 100644
--- a/kernel/include/linux/soc/renesas/rcar-sysc.h
+++ b/kernel/include/linux/soc/renesas/rcar-sysc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SOC_RENESAS_RCAR_SYSC_H__
 #define __LINUX_SOC_RENESAS_RCAR_SYSC_H__
 
diff --git a/kernel/include/linux/sock_diag.h b/kernel/include/linux/sock_diag.h
index a2f8109bb..15fe980a2 100644
--- a/kernel/include/linux/sock_diag.h
+++ b/kernel/include/linux/sock_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
 
diff --git a/kernel/include/linux/socket.h b/kernel/include/linux/socket.h
index 8ad963cdc..9286a5a8c 100644
--- a/kernel/include/linux/socket.h
+++ b/kernel/include/linux/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SOCKET_H
 #define _LINUX_SOCKET_H
 
diff --git a/kernel/include/linux/sonet.h b/kernel/include/linux/sonet.h
index 680f9a31d..2b802b6d1 100644
--- a/kernel/include/linux/sonet.h
+++ b/kernel/include/linux/sonet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sonet.h - SONET/SHD physical layer control */
 #ifndef LINUX_SONET_H
 #define LINUX_SONET_H
diff --git a/kernel/include/linux/sony-laptop.h b/kernel/include/linux/sony-laptop.h
index e2e036d94..1a4b77317 100644
--- a/kernel/include/linux/sony-laptop.h
+++ b/kernel/include/linux/sony-laptop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SONYLAPTOP_H_
 #define _SONYLAPTOP_H_
 
diff --git a/kernel/include/linux/sort.h b/kernel/include/linux/sort.h
index d534da2b5..2b99a5dd0 100644
--- a/kernel/include/linux/sort.h
+++ b/kernel/include/linux/sort.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SORT_H
 #define _LINUX_SORT_H
 
diff --git a/kernel/include/linux/sound.h b/kernel/include/linux/sound.h
index 73ded040f..3c6d393c7 100644
--- a/kernel/include/linux/sound.h
+++ b/kernel/include/linux/sound.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SOUND_H
 #define _LINUX_SOUND_H
 
diff --git a/kernel/include/linux/spi/ad7877.h b/kernel/include/linux/spi/ad7877.h
index cdbed816f..b7be843c8 100644
--- a/kernel/include/linux/spi/ad7877.h
+++ b/kernel/include/linux/spi/ad7877.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/spi/ad7877.h */
 
 /* Touchscreen characteristics vary between boards and models.  The
diff --git a/kernel/include/linux/spi/ads7846.h b/kernel/include/linux/spi/ads7846.h
index 2f694f384..1a5eaef3b 100644
--- a/kernel/include/linux/spi/ads7846.h
+++ b/kernel/include/linux/spi/ads7846.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/spi/ads7846.h */
 
 /* Touchscreen characteristics vary between boards and models.  The
diff --git a/kernel/include/linux/spi/at73c213.h b/kernel/include/linux/spi/at73c213.h
index 0f20a70e5..cbca6654a 100644
--- a/kernel/include/linux/spi/at73c213.h
+++ b/kernel/include/linux/spi/at73c213.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Board-specific data used to set up AT73c213 audio DAC driver.
  */
diff --git a/kernel/include/linux/spi/corgi_lcd.h b/kernel/include/linux/spi/corgi_lcd.h
index 6692b3418..edf4beccd 100644
--- a/kernel/include/linux/spi/corgi_lcd.h
+++ b/kernel/include/linux/spi/corgi_lcd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPI_CORGI_LCD_H
 #define __LINUX_SPI_CORGI_LCD_H
 
diff --git a/kernel/include/linux/spi/ds1305.h b/kernel/include/linux/spi/ds1305.h
index 287ec830e..82db6cd15 100644
--- a/kernel/include/linux/spi/ds1305.h
+++ b/kernel/include/linux/spi/ds1305.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPI_DS1305_H
 #define __LINUX_SPI_DS1305_H
 
diff --git a/kernel/include/linux/spi/eeprom.h b/kernel/include/linux/spi/eeprom.h
index e34e169f9..aceccf9c7 100644
--- a/kernel/include/linux/spi/eeprom.h
+++ b/kernel/include/linux/spi/eeprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPI_EEPROM_H
 #define __LINUX_SPI_EEPROM_H
 
diff --git a/kernel/include/linux/spi/flash.h b/kernel/include/linux/spi/flash.h
index f4199e758..2401a0887 100644
--- a/kernel/include/linux/spi/flash.h
+++ b/kernel/include/linux/spi/flash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SPI_FLASH_H
 #define LINUX_SPI_FLASH_H
 
diff --git a/kernel/include/linux/spi/ifx_modem.h b/kernel/include/linux/spi/ifx_modem.h
index 394fec9e7..694268c78 100644
--- a/kernel/include/linux/spi/ifx_modem.h
+++ b/kernel/include/linux/spi/ifx_modem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_IFX_MODEM_H
 #define LINUX_IFX_MODEM_H
 
diff --git a/kernel/include/linux/spi/max7301.h b/kernel/include/linux/spi/max7301.h
index bcaa2f762..433c20e2f 100644
--- a/kernel/include/linux/spi/max7301.h
+++ b/kernel/include/linux/spi/max7301.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SPI_MAX7301_H
 #define LINUX_SPI_MAX7301_H
 
diff --git a/kernel/include/linux/spi/mc33880.h b/kernel/include/linux/spi/mc33880.h
index 82ffccd6f..205a49cb9 100644
--- a/kernel/include/linux/spi/mc33880.h
+++ b/kernel/include/linux/spi/mc33880.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SPI_MC33880_H
 #define LINUX_SPI_MC33880_H
 
diff --git a/kernel/include/linux/spi/mcp23s08.h b/kernel/include/linux/spi/mcp23s08.h
index 82d96a346..738a45b43 100644
--- a/kernel/include/linux/spi/mcp23s08.h
+++ b/kernel/include/linux/spi/mcp23s08.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 struct mcp23s08_platform_data {
 	/* For mcp23s08, up to 4 slaves (numbered 0..3) can share one SPI
 	 * chipselect, each providing 1 gpio_chip instance with 8 gpios.
diff --git a/kernel/include/linux/spi/mmc_spi.h b/kernel/include/linux/spi/mmc_spi.h
index 274bc0fa0..bfde741a5 100644
--- a/kernel/include/linux/spi/mmc_spi.h
+++ b/kernel/include/linux/spi/mmc_spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPI_MMC_SPI_H
 #define __LINUX_SPI_MMC_SPI_H
 
diff --git a/kernel/include/linux/spi/sh_msiof.h b/kernel/include/linux/spi/sh_msiof.h
index f74b581f2..dc2a0cbd2 100644
--- a/kernel/include/linux/spi/sh_msiof.h
+++ b/kernel/include/linux/spi/sh_msiof.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SPI_SH_MSIOF_H__
 #define __SPI_SH_MSIOF_H__
 
diff --git a/kernel/include/linux/spi/spi_bitbang.h b/kernel/include/linux/spi/spi_bitbang.h
index 154788ed2..51d8c060e 100644
--- a/kernel/include/linux/spi/spi_bitbang.h
+++ b/kernel/include/linux/spi/spi_bitbang.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef	__SPI_BITBANG_H
 #define	__SPI_BITBANG_H
 
diff --git a/kernel/include/linux/spi/spi_gpio.h b/kernel/include/linux/spi/spi_gpio.h
index 1634ce31c..e7bd89a59 100644
--- a/kernel/include/linux/spi/spi_gpio.h
+++ b/kernel/include/linux/spi/spi_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPI_GPIO_H
 #define __LINUX_SPI_GPIO_H
 
diff --git a/kernel/include/linux/spi/spi_oc_tiny.h b/kernel/include/linux/spi/spi_oc_tiny.h
index 1ac529cf4..a3ecf2fea 100644
--- a/kernel/include/linux/spi/spi_oc_tiny.h
+++ b/kernel/include/linux/spi/spi_oc_tiny.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SPI_SPI_OC_TINY_H
 #define _LINUX_SPI_SPI_OC_TINY_H
 
diff --git a/kernel/include/linux/spi/tdo24m.h b/kernel/include/linux/spi/tdo24m.h
index 7572d4e1f..48dd58ac5 100644
--- a/kernel/include/linux/spi/tdo24m.h
+++ b/kernel/include/linux/spi/tdo24m.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TDO24M_H__
 #define __TDO24M_H__
 
diff --git a/kernel/include/linux/spi/xilinx_spi.h b/kernel/include/linux/spi/xilinx_spi.h
index 333ecdfee..c15d69d28 100644
--- a/kernel/include/linux/spi/xilinx_spi.h
+++ b/kernel/include/linux/spi/xilinx_spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPI_XILINX_SPI_H
 #define __LINUX_SPI_XILINX_SPI_H
 
diff --git a/kernel/include/linux/spinlock.h b/kernel/include/linux/spinlock.h
index 69e079c5f..341e1a12b 100644
--- a/kernel/include/linux/spinlock.h
+++ b/kernel/include/linux/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPINLOCK_H
 #define __LINUX_SPINLOCK_H
 
diff --git a/kernel/include/linux/splice.h b/kernel/include/linux/splice.h
index db42746bd..74b4911ac 100644
--- a/kernel/include/linux/splice.h
+++ b/kernel/include/linux/splice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Function declerations and data structures related to the splice
  * implementation.
diff --git a/kernel/include/linux/ssb/ssb.h b/kernel/include/linux/ssb/ssb.h
index 26a0b3c3c..3b43655ca 100644
--- a/kernel/include/linux/ssb/ssb.h
+++ b/kernel/include/linux/ssb/ssb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_H_
 #define LINUX_SSB_H_
 
diff --git a/kernel/include/linux/ssb/ssb_driver_gige.h b/kernel/include/linux/ssb/ssb_driver_gige.h
index 068847250..31593b346 100644
--- a/kernel/include/linux/ssb/ssb_driver_gige.h
+++ b/kernel/include/linux/ssb/ssb_driver_gige.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_DRIVER_GIGE_H_
 #define LINUX_SSB_DRIVER_GIGE_H_
 
diff --git a/kernel/include/linux/ssb/ssb_driver_mips.h b/kernel/include/linux/ssb/ssb_driver_mips.h
index 6535e4718..bef6bba32 100644
--- a/kernel/include/linux/ssb/ssb_driver_mips.h
+++ b/kernel/include/linux/ssb/ssb_driver_mips.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_MIPSCORE_H_
 #define LINUX_SSB_MIPSCORE_H_
 
diff --git a/kernel/include/linux/ssb/ssb_driver_pci.h b/kernel/include/linux/ssb/ssb_driver_pci.h
index 41e330e51..42824bdfe 100644
--- a/kernel/include/linux/ssb/ssb_driver_pci.h
+++ b/kernel/include/linux/ssb/ssb_driver_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_PCICORE_H_
 #define LINUX_SSB_PCICORE_H_
 
diff --git a/kernel/include/linux/ssb/ssb_embedded.h b/kernel/include/linux/ssb/ssb_embedded.h
index 8d8dedff0..49604ac3d 100644
--- a/kernel/include/linux/ssb/ssb_embedded.h
+++ b/kernel/include/linux/ssb/ssb_embedded.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_EMBEDDED_H_
 #define LINUX_SSB_EMBEDDED_H_
 
diff --git a/kernel/include/linux/ssb/ssb_regs.h b/kernel/include/linux/ssb/ssb_regs.h
index c0f707ac1..210f46494 100644
--- a/kernel/include/linux/ssb/ssb_regs.h
+++ b/kernel/include/linux/ssb/ssb_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SSB_REGS_H_
 #define LINUX_SSB_REGS_H_
 
diff --git a/kernel/include/linux/stackprotector.h b/kernel/include/linux/stackprotector.h
index 6f3e54c70..03696c729 100644
--- a/kernel/include/linux/stackprotector.h
+++ b/kernel/include/linux/stackprotector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STACKPROTECTOR_H
 #define _LINUX_STACKPROTECTOR_H 1
 
diff --git a/kernel/include/linux/stacktrace.h b/kernel/include/linux/stacktrace.h
index 4205f71a5..ba29a0613 100644
--- a/kernel/include/linux/stacktrace.h
+++ b/kernel/include/linux/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_STACKTRACE_H
 #define __LINUX_STACKTRACE_H
 
diff --git a/kernel/include/linux/start_kernel.h b/kernel/include/linux/start_kernel.h
index d3e5f2756..4b268d86a 100644
--- a/kernel/include/linux/start_kernel.h
+++ b/kernel/include/linux/start_kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_START_KERNEL_H
 #define _LINUX_START_KERNEL_H
 
diff --git a/kernel/include/linux/stat.h b/kernel/include/linux/stat.h
index 64b6b3aec..22484e445 100644
--- a/kernel/include/linux/stat.h
+++ b/kernel/include/linux/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STAT_H
 #define _LINUX_STAT_H
 
diff --git a/kernel/include/linux/statfs.h b/kernel/include/linux/statfs.h
index 0166d320a..3142e9854 100644
--- a/kernel/include/linux/statfs.h
+++ b/kernel/include/linux/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STATFS_H
 #define _LINUX_STATFS_H
 
diff --git a/kernel/include/linux/stddef.h b/kernel/include/linux/stddef.h
index 9c61c7cda..2181719fd 100644
--- a/kernel/include/linux/stddef.h
+++ b/kernel/include/linux/stddef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STDDEF_H
 #define _LINUX_STDDEF_H
 
diff --git a/kernel/include/linux/stmmac.h b/kernel/include/linux/stmmac.h
index 108739ff9..32feac5bb 100644
--- a/kernel/include/linux/stmmac.h
+++ b/kernel/include/linux/stmmac.h
@@ -126,14 +126,14 @@ struct stmmac_axi {
 
 struct stmmac_rxq_cfg {
 	u8 mode_to_use;
-	u8 chan;
+	u32 chan;
 	u8 pkt_route;
 	bool use_prio;
 	u32 prio;
 };
 
 struct stmmac_txq_cfg {
-	u8 weight;
+	u32 weight;
 	u8 mode_to_use;
 	/* Credit Base Shaper parameters */
 	u32 send_slope;
@@ -168,8 +168,8 @@ struct plat_stmmacenet_data {
 	int unicast_filter_entries;
 	int tx_fifo_size;
 	int rx_fifo_size;
-	u8 rx_queues_to_use;
-	u8 tx_queues_to_use;
+	u32 rx_queues_to_use;
+	u32 tx_queues_to_use;
 	u8 rx_sched_algorithm;
 	u8 tx_sched_algorithm;
 	struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];
diff --git a/kernel/include/linux/stop_machine.h b/kernel/include/linux/stop_machine.h
index 3d60275e3..6d3635c86 100644
--- a/kernel/include/linux/stop_machine.h
+++ b/kernel/include/linux/stop_machine.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STOP_MACHINE
 #define _LINUX_STOP_MACHINE
 
diff --git a/kernel/include/linux/string.h b/kernel/include/linux/string.h
index 54d21783e..410ecf17d 100644
--- a/kernel/include/linux/string.h
+++ b/kernel/include/linux/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STRING_H_
 #define _LINUX_STRING_H_
 
diff --git a/kernel/include/linux/string_helpers.h b/kernel/include/linux/string_helpers.h
index 5ce9538f2..4397c52ec 100644
--- a/kernel/include/linux/string_helpers.h
+++ b/kernel/include/linux/string_helpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_STRING_HELPERS_H_
 #define _LINUX_STRING_HELPERS_H_
 
diff --git a/kernel/include/linux/stringhash.h b/kernel/include/linux/stringhash.h
index 7c2d95170..e8f0f8529 100644
--- a/kernel/include/linux/stringhash.h
+++ b/kernel/include/linux/stringhash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_STRINGHASH_H
 #define __LINUX_STRINGHASH_H
 
diff --git a/kernel/include/linux/sungem_phy.h b/kernel/include/linux/sungem_phy.h
index bd9be9f59..3a11fa41a 100644
--- a/kernel/include/linux/sungem_phy.h
+++ b/kernel/include/linux/sungem_phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUNGEM_PHY_H__
 #define __SUNGEM_PHY_H__
 
diff --git a/kernel/include/linux/sunrpc/addr.h b/kernel/include/linux/sunrpc/addr.h
index 5c9c6cd08..07d454873 100644
--- a/kernel/include/linux/sunrpc/addr.h
+++ b/kernel/include/linux/sunrpc/addr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/addr.h
  *
diff --git a/kernel/include/linux/sunrpc/auth.h b/kernel/include/linux/sunrpc/auth.h
index 8fd350494..d9af474a8 100644
--- a/kernel/include/linux/sunrpc/auth.h
+++ b/kernel/include/linux/sunrpc/auth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/auth.h
  *
diff --git a/kernel/include/linux/sunrpc/auth_gss.h b/kernel/include/linux/sunrpc/auth_gss.h
index cebdf8745..0c9eac351 100644
--- a/kernel/include/linux/sunrpc/auth_gss.h
+++ b/kernel/include/linux/sunrpc/auth_gss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/auth_gss.h
  *
diff --git a/kernel/include/linux/sunrpc/clnt.h b/kernel/include/linux/sunrpc/clnt.h
index 55ef67bea..71c237e82 100644
--- a/kernel/include/linux/sunrpc/clnt.h
+++ b/kernel/include/linux/sunrpc/clnt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/sunrpc/clnt.h
  *
diff --git a/kernel/include/linux/sunrpc/debug.h b/kernel/include/linux/sunrpc/debug.h
index 8da0f37f3..f6aeed07f 100644
--- a/kernel/include/linux/sunrpc/debug.h
+++ b/kernel/include/linux/sunrpc/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/debug.h
  *
diff --git a/kernel/include/linux/sunrpc/gss_api.h b/kernel/include/linux/sunrpc/gss_api.h
index 68ec78c1a..5ac5db4d2 100644
--- a/kernel/include/linux/sunrpc/gss_api.h
+++ b/kernel/include/linux/sunrpc/gss_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/gss_api.h
  *
diff --git a/kernel/include/linux/sunrpc/metrics.h b/kernel/include/linux/sunrpc/metrics.h
index 694eecb2f..9baed7b35 100644
--- a/kernel/include/linux/sunrpc/metrics.h
+++ b/kernel/include/linux/sunrpc/metrics.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/sunrpc/metrics.h
  *
diff --git a/kernel/include/linux/sunrpc/msg_prot.h b/kernel/include/linux/sunrpc/msg_prot.h
index 59cbf16ea..4722b28ec 100644
--- a/kernel/include/linux/sunrpc/msg_prot.h
+++ b/kernel/include/linux/sunrpc/msg_prot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/msg_prot.h
  *
diff --git a/kernel/include/linux/sunrpc/rpc_pipe_fs.h b/kernel/include/linux/sunrpc/rpc_pipe_fs.h
index 7f490bef9..a5704daf5 100644
--- a/kernel/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/kernel/include/linux/sunrpc/rpc_pipe_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SUNRPC_RPC_PIPE_FS_H
 #define _LINUX_SUNRPC_RPC_PIPE_FS_H
 
diff --git a/kernel/include/linux/sunrpc/sched.h b/kernel/include/linux/sunrpc/sched.h
index c1768f9d9..d96e74e11 100644
--- a/kernel/include/linux/sunrpc/sched.h
+++ b/kernel/include/linux/sunrpc/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/sched.h
  *
diff --git a/kernel/include/linux/sunrpc/stats.h b/kernel/include/linux/sunrpc/stats.h
index edc64219f..84b92b4ad 100644
--- a/kernel/include/linux/sunrpc/stats.h
+++ b/kernel/include/linux/sunrpc/stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/stats.h
  *
diff --git a/kernel/include/linux/sunrpc/svc.h b/kernel/include/linux/sunrpc/svc.h
index 38f561b2d..3b9f0d1db 100644
--- a/kernel/include/linux/sunrpc/svc.h
+++ b/kernel/include/linux/sunrpc/svc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/svc.h
  *
diff --git a/kernel/include/linux/sunrpc/svc_xprt.h b/kernel/include/linux/sunrpc/svc_xprt.h
index 6a2ad38f5..1caf7bc83 100644
--- a/kernel/include/linux/sunrpc/svc_xprt.h
+++ b/kernel/include/linux/sunrpc/svc_xprt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/svc_xprt.h
  *
diff --git a/kernel/include/linux/sunrpc/svcauth.h b/kernel/include/linux/sunrpc/svcauth.h
index d03932055..7c3656505 100644
--- a/kernel/include/linux/sunrpc/svcauth.h
+++ b/kernel/include/linux/sunrpc/svcauth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/svcauth.h
  *
diff --git a/kernel/include/linux/sunrpc/svcauth_gss.h b/kernel/include/linux/sunrpc/svcauth_gss.h
index 726aff1a5..a4528b26c 100644
--- a/kernel/include/linux/sunrpc/svcauth_gss.h
+++ b/kernel/include/linux/sunrpc/svcauth_gss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/svcauth_gss.h
  *
diff --git a/kernel/include/linux/sunrpc/svcsock.h b/kernel/include/linux/sunrpc/svcsock.h
index 2e780134f..119718a92 100644
--- a/kernel/include/linux/sunrpc/svcsock.h
+++ b/kernel/include/linux/sunrpc/svcsock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/svcsock.h
  *
diff --git a/kernel/include/linux/sunrpc/timer.h b/kernel/include/linux/sunrpc/timer.h
index 697d6e69d..242dbe00b 100644
--- a/kernel/include/linux/sunrpc/timer.h
+++ b/kernel/include/linux/sunrpc/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/sunrpc/timer.h
  *
diff --git a/kernel/include/linux/sunrpc/types.h b/kernel/include/linux/sunrpc/types.h
index 11a7536c0..bd3c8e056 100644
--- a/kernel/include/linux/sunrpc/types.h
+++ b/kernel/include/linux/sunrpc/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/include/linux/sunrpc/types.h
  *
diff --git a/kernel/include/linux/sunrpc/xdr.h b/kernel/include/linux/sunrpc/xdr.h
index 86b59e352..d950223c6 100644
--- a/kernel/include/linux/sunrpc/xdr.h
+++ b/kernel/include/linux/sunrpc/xdr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * XDR standard data types and function declarations
  *
diff --git a/kernel/include/linux/sunrpc/xprt.h b/kernel/include/linux/sunrpc/xprt.h
index 5a7bff41f..7fad83881 100644
--- a/kernel/include/linux/sunrpc/xprt.h
+++ b/kernel/include/linux/sunrpc/xprt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/sunrpc/xprt.h
  *
diff --git a/kernel/include/linux/sunrpc/xprtmultipath.h b/kernel/include/linux/sunrpc/xprtmultipath.h
index 507418c1c..af1257c03 100644
--- a/kernel/include/linux/sunrpc/xprtmultipath.h
+++ b/kernel/include/linux/sunrpc/xprtmultipath.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * RPC client multipathing definitions
  *
diff --git a/kernel/include/linux/sunrpc/xprtsock.h b/kernel/include/linux/sunrpc/xprtsock.h
index c9959d7e3..ae0f99b9b 100644
--- a/kernel/include/linux/sunrpc/xprtsock.h
+++ b/kernel/include/linux/sunrpc/xprtsock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/include/linux/sunrpc/xprtsock.h
  *
diff --git a/kernel/include/linux/sunserialcore.h b/kernel/include/linux/sunserialcore.h
index dbe4d7fca..c12d1c7fa 100644
--- a/kernel/include/linux/sunserialcore.h
+++ b/kernel/include/linux/sunserialcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* sunserialcore.h
  *
  * Generic SUN serial/kbd/ms layer.  Based entirely
diff --git a/kernel/include/linux/suspend.h b/kernel/include/linux/suspend.h
index d10b79807..d60b0f5c3 100644
--- a/kernel/include/linux/suspend.h
+++ b/kernel/include/linux/suspend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SUSPEND_H
 #define _LINUX_SUSPEND_H
 
diff --git a/kernel/include/linux/svga.h b/kernel/include/linux/svga.h
index bfa68e837..3bfe46269 100644
--- a/kernel/include/linux/svga.h
+++ b/kernel/include/linux/svga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SVGA_H
 #define _LINUX_SVGA_H
 
diff --git a/kernel/include/linux/sw842.h b/kernel/include/linux/sw842.h
index 109ba041c..3e29f5dcc 100644
--- a/kernel/include/linux/sw842.h
+++ b/kernel/include/linux/sw842.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SW842_H__
 #define __SW842_H__
 
diff --git a/kernel/include/linux/swab.h b/kernel/include/linux/swab.h
index 9ad3c60f6..e466fd159 100644
--- a/kernel/include/linux/swab.h
+++ b/kernel/include/linux/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SWAB_H
 #define _LINUX_SWAB_H
 
diff --git a/kernel/include/linux/swait.h b/kernel/include/linux/swait.h
index cf30f5022..c98aaf677 100644
--- a/kernel/include/linux/swait.h
+++ b/kernel/include/linux/swait.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SWAIT_H
 #define _LINUX_SWAIT_H
 
diff --git a/kernel/include/linux/swap.h b/kernel/include/linux/swap.h
index 8a8072920..f02fb5db8 100644
--- a/kernel/include/linux/swap.h
+++ b/kernel/include/linux/swap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SWAP_H
 #define _LINUX_SWAP_H
 
@@ -265,6 +266,10 @@ struct swap_info_struct {
 					 * both locks need hold, hold swap_lock
 					 * first.
 					 */
+	spinlock_t cont_lock;		/*
+					 * protect swap count continuation page
+					 * list.
+					 */
 	struct work_struct discard_work; /* discard worker */
 	struct swap_cluster_list discard_clusters; /* discard clusters list */
 };
diff --git a/kernel/include/linux/swap_cgroup.h b/kernel/include/linux/swap_cgroup.h
index b2b8ec7bd..a12dd1c39 100644
--- a/kernel/include/linux/swap_cgroup.h
+++ b/kernel/include/linux/swap_cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SWAP_CGROUP_H
 #define __LINUX_SWAP_CGROUP_H
 
diff --git a/kernel/include/linux/swap_slots.h b/kernel/include/linux/swap_slots.h
index 6ef92d176..e36b200c2 100644
--- a/kernel/include/linux/swap_slots.h
+++ b/kernel/include/linux/swap_slots.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SWAP_SLOTS_H
 #define _LINUX_SWAP_SLOTS_H
 
diff --git a/kernel/include/linux/swapfile.h b/kernel/include/linux/swapfile.h
index 388293a91..06bd7b096 100644
--- a/kernel/include/linux/swapfile.h
+++ b/kernel/include/linux/swapfile.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SWAPFILE_H
 #define _LINUX_SWAPFILE_H
 
diff --git a/kernel/include/linux/swapops.h b/kernel/include/linux/swapops.h
index 291c4b534..9c5a2628d 100644
--- a/kernel/include/linux/swapops.h
+++ b/kernel/include/linux/swapops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SWAPOPS_H
 #define _LINUX_SWAPOPS_H
 
diff --git a/kernel/include/linux/swiotlb.h b/kernel/include/linux/swiotlb.h
index 15e716075..24ed81708 100644
--- a/kernel/include/linux/swiotlb.h
+++ b/kernel/include/linux/swiotlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SWIOTLB_H
 #define __LINUX_SWIOTLB_H
 
diff --git a/kernel/include/linux/sys.h b/kernel/include/linux/sys.h
index daa6008bf..3ebd9812f 100644
--- a/kernel/include/linux/sys.h
+++ b/kernel/include/linux/sys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SYS_H
 #define _LINUX_SYS_H
 
diff --git a/kernel/include/linux/sysctl.h b/kernel/include/linux/sysctl.h
index 1d4dba490..74f91eefe 100644
--- a/kernel/include/linux/sysctl.h
+++ b/kernel/include/linux/sysctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * sysctl.h: General linux system control interface
  *
diff --git a/kernel/include/linux/sysfs.h b/kernel/include/linux/sysfs.h
index aa02c328d..e32dfe098 100644
--- a/kernel/include/linux/sysfs.h
+++ b/kernel/include/linux/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * sysfs.h - definitions for the device driver filesystem
  *
diff --git a/kernel/include/linux/sysrq.h b/kernel/include/linux/sysrq.h
index 387fa7d05..8c71874e8 100644
--- a/kernel/include/linux/sysrq.h
+++ b/kernel/include/linux/sysrq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* -*- linux-c -*-
  *
  *	$Id: sysrq.h,v 1.3 1997/07/17 11:54:33 mj Exp $
diff --git a/kernel/include/linux/sysv_fs.h b/kernel/include/linux/sysv_fs.h
index e47d6d900..5cf77dbb8 100644
--- a/kernel/include/linux/sysv_fs.h
+++ b/kernel/include/linux/sysv_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_SYSV_FS_H
 #define _LINUX_SYSV_FS_H
 
diff --git a/kernel/include/linux/t10-pi.h b/kernel/include/linux/t10-pi.h
index 635a3c570..c6aa8a3c4 100644
--- a/kernel/include/linux/t10-pi.h
+++ b/kernel/include/linux/t10-pi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_T10_PI_H
 #define _LINUX_T10_PI_H
 
diff --git a/kernel/include/linux/task_io_accounting.h b/kernel/include/linux/task_io_accounting.h
index bdf855c28..6f6acce06 100644
--- a/kernel/include/linux/task_io_accounting.h
+++ b/kernel/include/linux/task_io_accounting.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * task_io_accounting: a structure which is used for recording a single task's
  * IO statistics.
diff --git a/kernel/include/linux/task_io_accounting_ops.h b/kernel/include/linux/task_io_accounting_ops.h
index 4d090f9ee..bb5498bcd 100644
--- a/kernel/include/linux/task_io_accounting_ops.h
+++ b/kernel/include/linux/task_io_accounting_ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Task I/O accounting operations
  */
diff --git a/kernel/include/linux/task_work.h b/kernel/include/linux/task_work.h
index ca5a1cf27..bd9a6a91c 100644
--- a/kernel/include/linux/task_work.h
+++ b/kernel/include/linux/task_work.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TASK_WORK_H
 #define _LINUX_TASK_WORK_H
 
diff --git a/kernel/include/linux/taskstats_kern.h b/kernel/include/linux/taskstats_kern.h
index e2a5daf8d..dbb4d124c 100644
--- a/kernel/include/linux/taskstats_kern.h
+++ b/kernel/include/linux/taskstats_kern.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* taskstats_kern.h - kernel header for per-task statistics interface
  *
  * Copyright (C) Shailabh Nagar, IBM Corp. 2006
diff --git a/kernel/include/linux/textsearch.h b/kernel/include/linux/textsearch.h
index cfaee8691..0494db3fd 100644
--- a/kernel/include/linux/textsearch.h
+++ b/kernel/include/linux/textsearch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_TEXTSEARCH_H
 #define __LINUX_TEXTSEARCH_H
 
diff --git a/kernel/include/linux/textsearch_fsm.h b/kernel/include/linux/textsearch_fsm.h
index fdfa078c6..b57231ff6 100644
--- a/kernel/include/linux/textsearch_fsm.h
+++ b/kernel/include/linux/textsearch_fsm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_TEXTSEARCH_FSM_H
 #define __LINUX_TEXTSEARCH_FSM_H
 
diff --git a/kernel/include/linux/thinkpad_acpi.h b/kernel/include/linux/thinkpad_acpi.h
index 361de59a2..9fb317970 100644
--- a/kernel/include/linux/thinkpad_acpi.h
+++ b/kernel/include/linux/thinkpad_acpi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __THINKPAD_ACPI_H__
 #define __THINKPAD_ACPI_H__
 
diff --git a/kernel/include/linux/thread_info.h b/kernel/include/linux/thread_info.h
index 5f7eeab99..4bcdf00c1 100644
--- a/kernel/include/linux/thread_info.h
+++ b/kernel/include/linux/thread_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* thread_info.h: common low-level thread information accessors
  *
  * Copyright (C) 2002  David Howells (dhowells@redhat.com)
diff --git a/kernel/include/linux/threads.h b/kernel/include/linux/threads.h
index 383ab9592..3086dba52 100644
--- a/kernel/include/linux/threads.h
+++ b/kernel/include/linux/threads.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_THREADS_H
 #define _LINUX_THREADS_H
 
diff --git a/kernel/include/linux/tick.h b/kernel/include/linux/tick.h
index fe01e68bf..cf413b344 100644
--- a/kernel/include/linux/tick.h
+++ b/kernel/include/linux/tick.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Tick related global functions
  */
diff --git a/kernel/include/linux/time.h b/kernel/include/linux/time.h
index 9bc1f9457..87c36cf1c 100644
--- a/kernel/include/linux/time.h
+++ b/kernel/include/linux/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TIME_H
 #define _LINUX_TIME_H
 
diff --git a/kernel/include/linux/time64.h b/kernel/include/linux/time64.h
index 980c71b30..ad3326061 100644
--- a/kernel/include/linux/time64.h
+++ b/kernel/include/linux/time64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TIME64_H
 #define _LINUX_TIME64_H
 
diff --git a/kernel/include/linux/timekeeper_internal.h b/kernel/include/linux/timekeeper_internal.h
index 0a0a53daf..97154c61e 100644
--- a/kernel/include/linux/timekeeper_internal.h
+++ b/kernel/include/linux/timekeeper_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * You SHOULD NOT be including this unless you're vsyscall
  * handling code or timekeeping internal code!
diff --git a/kernel/include/linux/timekeeping.h b/kernel/include/linux/timekeeping.h
index ddc229ff6..0021575fe 100644
--- a/kernel/include/linux/timekeeping.h
+++ b/kernel/include/linux/timekeeping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TIMEKEEPING_H
 #define _LINUX_TIMEKEEPING_H
 
diff --git a/kernel/include/linux/timer.h b/kernel/include/linux/timer.h
index 6383c528b..ac66f29c6 100644
--- a/kernel/include/linux/timer.h
+++ b/kernel/include/linux/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TIMER_H
 #define _LINUX_TIMER_H
 
diff --git a/kernel/include/linux/timerfd.h b/kernel/include/linux/timerfd.h
index bab0b1ad0..0c33260e5 100644
--- a/kernel/include/linux/timerfd.h
+++ b/kernel/include/linux/timerfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/timerfd.h
  *
diff --git a/kernel/include/linux/timerqueue.h b/kernel/include/linux/timerqueue.h
index 7eec17ad7..78b8cc73f 100644
--- a/kernel/include/linux/timerqueue.h
+++ b/kernel/include/linux/timerqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TIMERQUEUE_H
 #define _LINUX_TIMERQUEUE_H
 
diff --git a/kernel/include/linux/tpm_command.h b/kernel/include/linux/tpm_command.h
index 727512e24..f5c03e9c3 100644
--- a/kernel/include/linux/tpm_command.h
+++ b/kernel/include/linux/tpm_command.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_TPM_COMMAND_H__
 #define __LINUX_TPM_COMMAND_H__
 
diff --git a/kernel/include/linux/trace.h b/kernel/include/linux/trace.h
index 9330a58e2..d24991c1f 100644
--- a/kernel/include/linux/trace.h
+++ b/kernel/include/linux/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TRACE_H
 #define _LINUX_TRACE_H
 
diff --git a/kernel/include/linux/trace_clock.h b/kernel/include/linux/trace_clock.h
index 1d7ca2739..00e8f98c9 100644
--- a/kernel/include/linux/trace_clock.h
+++ b/kernel/include/linux/trace_clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TRACE_CLOCK_H
 #define _LINUX_TRACE_CLOCK_H
 
diff --git a/kernel/include/linux/trace_events.h b/kernel/include/linux/trace_events.h
index 2e0f22298..2bcb4dc6d 100644
--- a/kernel/include/linux/trace_events.h
+++ b/kernel/include/linux/trace_events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _LINUX_TRACE_EVENT_H
 #define _LINUX_TRACE_EVENT_H
diff --git a/kernel/include/linux/trace_seq.h b/kernel/include/linux/trace_seq.h
index cfaf5a1d4..6609b39a7 100644
--- a/kernel/include/linux/trace_seq.h
+++ b/kernel/include/linux/trace_seq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TRACE_SEQ_H
 #define _LINUX_TRACE_SEQ_H
 
diff --git a/kernel/include/linux/tracepoint-defs.h b/kernel/include/linux/tracepoint-defs.h
index a03192052..64ed7064f 100644
--- a/kernel/include/linux/tracepoint-defs.h
+++ b/kernel/include/linux/tracepoint-defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TRACEPOINT_DEFS_H
 #define TRACEPOINT_DEFS_H 1
 
diff --git a/kernel/include/linux/tsacct_kern.h b/kernel/include/linux/tsacct_kern.h
index 3251965bf..d8ddce26e 100644
--- a/kernel/include/linux/tsacct_kern.h
+++ b/kernel/include/linux/tsacct_kern.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tsacct_kern.h - kernel header for system accounting over taskstats interface
  *
diff --git a/kernel/include/linux/tty.h b/kernel/include/linux/tty.h
index cf53eb539..7ac8ba208 100644
--- a/kernel/include/linux/tty.h
+++ b/kernel/include/linux/tty.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TTY_H
 #define _LINUX_TTY_H
 
diff --git a/kernel/include/linux/tty_driver.h b/kernel/include/linux/tty_driver.h
index fcdc0f5d9..31c2b5b16 100644
--- a/kernel/include/linux/tty_driver.h
+++ b/kernel/include/linux/tty_driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TTY_DRIVER_H
 #define _LINUX_TTY_DRIVER_H
 
diff --git a/kernel/include/linux/tty_flip.h b/kernel/include/linux/tty_flip.h
index d43837f2c..767f62086 100644
--- a/kernel/include/linux/tty_flip.h
+++ b/kernel/include/linux/tty_flip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TTY_FLIP_H
 #define _LINUX_TTY_FLIP_H
 
diff --git a/kernel/include/linux/tty_ldisc.h b/kernel/include/linux/tty_ldisc.h
index 3971cf0eb..3bc5144b1 100644
--- a/kernel/include/linux/tty_ldisc.h
+++ b/kernel/include/linux/tty_ldisc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TTY_LDISC_H
 #define _LINUX_TTY_LDISC_H
 
diff --git a/kernel/include/linux/typecheck.h b/kernel/include/linux/typecheck.h
index eb5b74a57..20d310331 100644
--- a/kernel/include/linux/typecheck.h
+++ b/kernel/include/linux/typecheck.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TYPECHECK_H_INCLUDED
 #define TYPECHECK_H_INCLUDED
 
diff --git a/kernel/include/linux/types.h b/kernel/include/linux/types.h
index 258099a4e..34fce54e4 100644
--- a/kernel/include/linux/types.h
+++ b/kernel/include/linux/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
diff --git a/kernel/include/linux/u64_stats_sync.h b/kernel/include/linux/u64_stats_sync.h
index 650f3dd6b..5bdbd9f49 100644
--- a/kernel/include/linux/u64_stats_sync.h
+++ b/kernel/include/linux/u64_stats_sync.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_U64_STATS_SYNC_H
 #define _LINUX_U64_STATS_SYNC_H
 
diff --git a/kernel/include/linux/uaccess.h b/kernel/include/linux/uaccess.h
index 20ef8e6ec..251e655d4 100644
--- a/kernel/include/linux/uaccess.h
+++ b/kernel/include/linux/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_UACCESS_H__
 #define __LINUX_UACCESS_H__
 
diff --git a/kernel/include/linux/ucs2_string.h b/kernel/include/linux/ucs2_string.h
index bb679b48f..cf3ada3e8 100644
--- a/kernel/include/linux/ucs2_string.h
+++ b/kernel/include/linux/ucs2_string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UCS2_STRING_H_
 #define _LINUX_UCS2_STRING_H_
 
diff --git a/kernel/include/linux/uidgid.h b/kernel/include/linux/uidgid.h
index 25e9d9216..b0542cd11 100644
--- a/kernel/include/linux/uidgid.h
+++ b/kernel/include/linux/uidgid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UIDGID_H
 #define _LINUX_UIDGID_H
 
diff --git a/kernel/include/linux/ulpi/driver.h b/kernel/include/linux/ulpi/driver.h
index a7af21a55..c7a181037 100644
--- a/kernel/include/linux/ulpi/driver.h
+++ b/kernel/include/linux/ulpi/driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_ULPI_DRIVER_H
 #define __LINUX_ULPI_DRIVER_H
 
diff --git a/kernel/include/linux/ulpi/interface.h b/kernel/include/linux/ulpi/interface.h
index a2011a919..e93cfa36c 100644
--- a/kernel/include/linux/ulpi/interface.h
+++ b/kernel/include/linux/ulpi/interface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_ULPI_INTERFACE_H
 #define __LINUX_ULPI_INTERFACE_H
 
diff --git a/kernel/include/linux/ulpi/regs.h b/kernel/include/linux/ulpi/regs.h
index b5b8b8804..9f607872b 100644
--- a/kernel/include/linux/ulpi/regs.h
+++ b/kernel/include/linux/ulpi/regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_ULPI_REGS_H
 #define __LINUX_ULPI_REGS_H
 
diff --git a/kernel/include/linux/unaligned/access_ok.h b/kernel/include/linux/unaligned/access_ok.h
index 33383ca23..167aa849c 100644
--- a/kernel/include/linux/unaligned/access_ok.h
+++ b/kernel/include/linux/unaligned/access_ok.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_ACCESS_OK_H
 #define _LINUX_UNALIGNED_ACCESS_OK_H
 
diff --git a/kernel/include/linux/unaligned/be_byteshift.h b/kernel/include/linux/unaligned/be_byteshift.h
index 9356b2422..8bdb8fa01 100644
--- a/kernel/include/linux/unaligned/be_byteshift.h
+++ b/kernel/include/linux/unaligned/be_byteshift.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_BE_BYTESHIFT_H
 #define _LINUX_UNALIGNED_BE_BYTESHIFT_H
 
diff --git a/kernel/include/linux/unaligned/be_memmove.h b/kernel/include/linux/unaligned/be_memmove.h
index c2a76c5c9..7164214a4 100644
--- a/kernel/include/linux/unaligned/be_memmove.h
+++ b/kernel/include/linux/unaligned/be_memmove.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_BE_MEMMOVE_H
 #define _LINUX_UNALIGNED_BE_MEMMOVE_H
 
diff --git a/kernel/include/linux/unaligned/be_struct.h b/kernel/include/linux/unaligned/be_struct.h
index 132415836..15ea503a1 100644
--- a/kernel/include/linux/unaligned/be_struct.h
+++ b/kernel/include/linux/unaligned/be_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_BE_STRUCT_H
 #define _LINUX_UNALIGNED_BE_STRUCT_H
 
diff --git a/kernel/include/linux/unaligned/generic.h b/kernel/include/linux/unaligned/generic.h
index 02d97ff3d..57d311465 100644
--- a/kernel/include/linux/unaligned/generic.h
+++ b/kernel/include/linux/unaligned/generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_GENERIC_H
 #define _LINUX_UNALIGNED_GENERIC_H
 
diff --git a/kernel/include/linux/unaligned/le_byteshift.h b/kernel/include/linux/unaligned/le_byteshift.h
index be376fb79..1628b7586 100644
--- a/kernel/include/linux/unaligned/le_byteshift.h
+++ b/kernel/include/linux/unaligned/le_byteshift.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_LE_BYTESHIFT_H
 #define _LINUX_UNALIGNED_LE_BYTESHIFT_H
 
diff --git a/kernel/include/linux/unaligned/le_memmove.h b/kernel/include/linux/unaligned/le_memmove.h
index 269849bee..9202e864d 100644
--- a/kernel/include/linux/unaligned/le_memmove.h
+++ b/kernel/include/linux/unaligned/le_memmove.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_LE_MEMMOVE_H
 #define _LINUX_UNALIGNED_LE_MEMMOVE_H
 
diff --git a/kernel/include/linux/unaligned/le_struct.h b/kernel/include/linux/unaligned/le_struct.h
index 088c4572f..997798788 100644
--- a/kernel/include/linux/unaligned/le_struct.h
+++ b/kernel/include/linux/unaligned/le_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_LE_STRUCT_H
 #define _LINUX_UNALIGNED_LE_STRUCT_H
 
diff --git a/kernel/include/linux/unaligned/memmove.h b/kernel/include/linux/unaligned/memmove.h
index eeb5a779a..ac71b53bc 100644
--- a/kernel/include/linux/unaligned/memmove.h
+++ b/kernel/include/linux/unaligned/memmove.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_MEMMOVE_H
 #define _LINUX_UNALIGNED_MEMMOVE_H
 
diff --git a/kernel/include/linux/usb.h b/kernel/include/linux/usb.h
index cb9fbd543..9c63792a8 100644
--- a/kernel/include/linux/usb.h
+++ b/kernel/include/linux/usb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_USB_H
 #define __LINUX_USB_H
 
diff --git a/kernel/include/linux/usb/atmel_usba_udc.h b/kernel/include/linux/usb/atmel_usba_udc.h
index ba99af275..9bb00df3b 100644
--- a/kernel/include/linux/usb/atmel_usba_udc.h
+++ b/kernel/include/linux/usb/atmel_usba_udc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Platform data definitions for Atmel USBA gadget driver.
  */
diff --git a/kernel/include/linux/usb/ch9.h b/kernel/include/linux/usb/ch9.h
index 6cc96bb12..523aa088f 100644
--- a/kernel/include/linux/usb/ch9.h
+++ b/kernel/include/linux/usb/ch9.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file holds USB constants and structures that are needed for
  * USB device APIs.  These are used by the USB device model, which is
diff --git a/kernel/include/linux/usb/chipidea.h b/kernel/include/linux/usb/chipidea.h
index d725cff72..07f99362b 100644
--- a/kernel/include/linux/usb/chipidea.h
+++ b/kernel/include/linux/usb/chipidea.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Platform data for the chipidea USB dual role controller
  */
diff --git a/kernel/include/linux/usb/ehci-dbgp.h b/kernel/include/linux/usb/ehci-dbgp.h
index 7344d9e59..62ab38051 100644
--- a/kernel/include/linux/usb/ehci-dbgp.h
+++ b/kernel/include/linux/usb/ehci-dbgp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Standalone EHCI usb debug driver
  *
diff --git a/kernel/include/linux/usb/ezusb.h b/kernel/include/linux/usb/ezusb.h
index 639ee4577..487047162 100644
--- a/kernel/include/linux/usb/ezusb.h
+++ b/kernel/include/linux/usb/ezusb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __EZUSB_H
 #define __EZUSB_H
 
diff --git a/kernel/include/linux/usb/functionfs.h b/kernel/include/linux/usb/functionfs.h
index 71190663f..570578cc9 100644
--- a/kernel/include/linux/usb/functionfs.h
+++ b/kernel/include/linux/usb/functionfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_FUNCTIONFS_H__
 #define __LINUX_FUNCTIONFS_H__ 1
 
diff --git a/kernel/include/linux/usb/gadget_configfs.h b/kernel/include/linux/usb/gadget_configfs.h
index c36e95730..d61aebd68 100644
--- a/kernel/include/linux/usb/gadget_configfs.h
+++ b/kernel/include/linux/usb/gadget_configfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GADGET_CONFIGFS__
 #define __GADGET_CONFIGFS__
 
diff --git a/kernel/include/linux/usb/iowarrior.h b/kernel/include/linux/usb/iowarrior.h
index 4fd6513d5..56559bc53 100644
--- a/kernel/include/linux/usb/iowarrior.h
+++ b/kernel/include/linux/usb/iowarrior.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_USB_IOWARRIOR_H
 #define __LINUX_USB_IOWARRIOR_H
 
diff --git a/kernel/include/linux/usb/irda.h b/kernel/include/linux/usb/irda.h
index e345ceaf7..396d2b043 100644
--- a/kernel/include/linux/usb/irda.h
+++ b/kernel/include/linux/usb/irda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * USB IrDA Bridge Device Definition
  */
diff --git a/kernel/include/linux/usb/isp116x.h b/kernel/include/linux/usb/isp116x.h
index 96ca114e8..1f331c28b 100644
--- a/kernel/include/linux/usb/isp116x.h
+++ b/kernel/include/linux/usb/isp116x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Board initialization code should put one of these into dev->platform_data
  * and place the isp116x onto platform_bus.
diff --git a/kernel/include/linux/usb/isp1362.h b/kernel/include/linux/usb/isp1362.h
index 642684bb9..5356c4ae3 100644
--- a/kernel/include/linux/usb/isp1362.h
+++ b/kernel/include/linux/usb/isp1362.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * board initialization code should put one of these into dev->platform_data
  * and place the isp1362 onto platform_bus.
diff --git a/kernel/include/linux/usb/isp1760.h b/kernel/include/linux/usb/isp1760.h
index de7de53c5..b75ded28d 100644
--- a/kernel/include/linux/usb/isp1760.h
+++ b/kernel/include/linux/usb/isp1760.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * board initialization should put one of these into dev->platform_data
  * and place the isp1760 onto platform_bus named "isp1760-hcd".
diff --git a/kernel/include/linux/usb/musb.h b/kernel/include/linux/usb/musb.h
index d315c8907..5d19e6730 100644
--- a/kernel/include/linux/usb/musb.h
+++ b/kernel/include/linux/usb/musb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This is used to for host and peripheral modes of the driver for
  * Inventra (Multidrop) Highspeed Dual-Role Controllers:  (M)HDRC.
diff --git a/kernel/include/linux/usb/otg.h b/kernel/include/linux/usb/otg.h
index 67929df86..69f1b6328 100644
--- a/kernel/include/linux/usb/otg.h
+++ b/kernel/include/linux/usb/otg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* USB OTG (On The Go) defines */
 /*
  *
diff --git a/kernel/include/linux/usb/phy.h b/kernel/include/linux/usb/phy.h
index 8c6914873..b7a262594 100644
--- a/kernel/include/linux/usb/phy.h
+++ b/kernel/include/linux/usb/phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * USB PHY defines
  *
diff --git a/kernel/include/linux/usb/quirks.h b/kernel/include/linux/usb/quirks.h
index de2a722fe..7cd553a3c 100644
--- a/kernel/include/linux/usb/quirks.h
+++ b/kernel/include/linux/usb/quirks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file holds the definitions of quirks found in USB devices.
  * Only quirks that affect the whole device, not an interface,
diff --git a/kernel/include/linux/usb/sl811.h b/kernel/include/linux/usb/sl811.h
index 3afe4d16f..6c97f8e66 100644
--- a/kernel/include/linux/usb/sl811.h
+++ b/kernel/include/linux/usb/sl811.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * board initialization should put one of these into dev->platform_data
  * and place the sl811hs onto platform_bus named "sl811-hcd".
diff --git a/kernel/include/linux/usb/typec.h b/kernel/include/linux/usb/typec.h
index ffe748788..0d44ce6af 100644
--- a/kernel/include/linux/usb/typec.h
+++ b/kernel/include/linux/usb/typec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __LINUX_USB_TYPEC_H
 #define __LINUX_USB_TYPEC_H
diff --git a/kernel/include/linux/usb/uas.h b/kernel/include/linux/usb/uas.h
index 3fc8e8b9f..aa3ad39d3 100644
--- a/kernel/include/linux/usb/uas.h
+++ b/kernel/include/linux/usb/uas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USB_UAS_H__
 #define __USB_UAS_H__
 
diff --git a/kernel/include/linux/usb/usb_phy_generic.h b/kernel/include/linux/usb/usb_phy_generic.h
index c13632d52..7408cf52c 100644
--- a/kernel/include/linux/usb/usb_phy_generic.h
+++ b/kernel/include/linux/usb/usb_phy_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_USB_NOP_XCEIV_H
 #define __LINUX_USB_NOP_XCEIV_H
 
diff --git a/kernel/include/linux/usb_usual.h b/kernel/include/linux/usb_usual.h
index 0aae1b2ee..000a5954b 100644
--- a/kernel/include/linux/usb_usual.h
+++ b/kernel/include/linux/usb_usual.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Interface to the libusual.
  *
diff --git a/kernel/include/linux/user-return-notifier.h b/kernel/include/linux/user-return-notifier.h
index 9c4a445bb..c07b386a9 100644
--- a/kernel/include/linux/user-return-notifier.h
+++ b/kernel/include/linux/user-return-notifier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_USER_RETURN_NOTIFIER_H
 #define _LINUX_USER_RETURN_NOTIFIER_H
 
diff --git a/kernel/include/linux/user_namespace.h b/kernel/include/linux/user_namespace.h
index c18e01252..3fe714da7 100644
--- a/kernel/include/linux/user_namespace.h
+++ b/kernel/include/linux/user_namespace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_USER_NAMESPACE_H
 #define _LINUX_USER_NAMESPACE_H
 
diff --git a/kernel/include/linux/userfaultfd_k.h b/kernel/include/linux/userfaultfd_k.h
index 48a3483dc..f2f3b68ba 100644
--- a/kernel/include/linux/userfaultfd_k.h
+++ b/kernel/include/linux/userfaultfd_k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  include/linux/userfaultfd_k.h
  *
diff --git a/kernel/include/linux/util_macros.h b/kernel/include/linux/util_macros.h
index f9b2ce580..72299f261 100644
--- a/kernel/include/linux/util_macros.h
+++ b/kernel/include/linux/util_macros.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_HELPER_MACROS_H_
 #define _LINUX_HELPER_MACROS_H_
 
diff --git a/kernel/include/linux/uts.h b/kernel/include/linux/uts.h
index 6ddbd8637..d62829530 100644
--- a/kernel/include/linux/uts.h
+++ b/kernel/include/linux/uts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UTS_H
 #define _LINUX_UTS_H
 
diff --git a/kernel/include/linux/utsname.h b/kernel/include/linux/utsname.h
index da826ed05..c8060c2ec 100644
--- a/kernel/include/linux/utsname.h
+++ b/kernel/include/linux/utsname.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UTSNAME_H
 #define _LINUX_UTSNAME_H
 
diff --git a/kernel/include/linux/vermagic.h b/kernel/include/linux/vermagic.h
index af6c03f7f..bae807eb2 100644
--- a/kernel/include/linux/vermagic.h
+++ b/kernel/include/linux/vermagic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <generated/utsrelease.h>
 
 /* Simply sanity version stamp for modules. */
diff --git a/kernel/include/linux/vfs.h b/kernel/include/linux/vfs.h
index e701d0541..33952ac00 100644
--- a/kernel/include/linux/vfs.h
+++ b/kernel/include/linux/vfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VFS_H
 #define _LINUX_VFS_H
 
diff --git a/kernel/include/linux/via.h b/kernel/include/linux/via.h
index 86ae3bcdb..38ea9a774 100644
--- a/kernel/include/linux/via.h
+++ b/kernel/include/linux/via.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Miscellaneous definitions for VIA chipsets
    Currently used only by drivers/parport/parport_pc.c */
 
diff --git a/kernel/include/linux/virtio.h b/kernel/include/linux/virtio.h
index 28b0e9653..988c7355b 100644
--- a/kernel/include/linux/virtio.h
+++ b/kernel/include/linux/virtio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_H
 #define _LINUX_VIRTIO_H
 /* Everything a virtio driver needs to work with any particular virtio
diff --git a/kernel/include/linux/virtio_byteorder.h b/kernel/include/linux/virtio_byteorder.h
index ce63a2c3a..825aaefac 100644
--- a/kernel/include/linux/virtio_byteorder.h
+++ b/kernel/include/linux/virtio_byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_BYTEORDER_H
 #define _LINUX_VIRTIO_BYTEORDER_H
 #include <linux/types.h>
diff --git a/kernel/include/linux/virtio_config.h b/kernel/include/linux/virtio_config.h
index 0133d8a12..5559a2d31 100644
--- a/kernel/include/linux/virtio_config.h
+++ b/kernel/include/linux/virtio_config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_CONFIG_H
 #define _LINUX_VIRTIO_CONFIG_H
 
diff --git a/kernel/include/linux/virtio_net.h b/kernel/include/linux/virtio_net.h
index 32fb046f2..210034c89 100644
--- a/kernel/include/linux/virtio_net.h
+++ b/kernel/include/linux/virtio_net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_NET_H
 #define _LINUX_VIRTIO_NET_H
 
diff --git a/kernel/include/linux/virtio_ring.h b/kernel/include/linux/virtio_ring.h
index 270cfa818..bbf32524a 100644
--- a/kernel/include/linux/virtio_ring.h
+++ b/kernel/include/linux/virtio_ring.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_RING_H
 #define _LINUX_VIRTIO_RING_H
 
diff --git a/kernel/include/linux/virtio_vsock.h b/kernel/include/linux/virtio_vsock.h
index ab13f0743..e223e2632 100644
--- a/kernel/include/linux/virtio_vsock.h
+++ b/kernel/include/linux/virtio_vsock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_VSOCK_H
 #define _LINUX_VIRTIO_VSOCK_H
 
diff --git a/kernel/include/linux/vm_event_item.h b/kernel/include/linux/vm_event_item.h
index d77bc3527..5c7f01067 100644
--- a/kernel/include/linux/vm_event_item.h
+++ b/kernel/include/linux/vm_event_item.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef VM_EVENT_ITEM_H_INCLUDED
 #define VM_EVENT_ITEM_H_INCLUDED
 
diff --git a/kernel/include/linux/vmacache.h b/kernel/include/linux/vmacache.h
index 1081db987..a5b3aa8d2 100644
--- a/kernel/include/linux/vmacache.h
+++ b/kernel/include/linux/vmacache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_VMACACHE_H
 #define __LINUX_VMACACHE_H
 
diff --git a/kernel/include/linux/vmalloc.h b/kernel/include/linux/vmalloc.h
index 2d92dd002..1e5d8c392 100644
--- a/kernel/include/linux/vmalloc.h
+++ b/kernel/include/linux/vmalloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VMALLOC_H
 #define _LINUX_VMALLOC_H
 
diff --git a/kernel/include/linux/vme.h b/kernel/include/linux/vme.h
index 25874da3f..7e82bf500 100644
--- a/kernel/include/linux/vme.h
+++ b/kernel/include/linux/vme.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VME_H_
 #define _VME_H_
 
diff --git a/kernel/include/linux/vmpressure.h b/kernel/include/linux/vmpressure.h
index 3347cc3ec..61e6fddfb 100644
--- a/kernel/include/linux/vmpressure.h
+++ b/kernel/include/linux/vmpressure.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_VMPRESSURE_H
 #define __LINUX_VMPRESSURE_H
 
diff --git a/kernel/include/linux/vmstat.h b/kernel/include/linux/vmstat.h
index ade7cb5f1..1e0cb72e0 100644
--- a/kernel/include/linux/vmstat.h
+++ b/kernel/include/linux/vmstat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VMSTAT_H
 #define _LINUX_VMSTAT_H
 
diff --git a/kernel/include/linux/vt.h b/kernel/include/linux/vt.h
index b186e0435..9820ae4f9 100644
--- a/kernel/include/linux/vt.h
+++ b/kernel/include/linux/vt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VT_H
 #define _LINUX_VT_H
 
diff --git a/kernel/include/linux/vt_buffer.h b/kernel/include/linux/vt_buffer.h
index 30b6e0d2a..848db1b15 100644
--- a/kernel/include/linux/vt_buffer.h
+++ b/kernel/include/linux/vt_buffer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	include/linux/vt_buffer.h -- Access to VT screen buffer
  *
diff --git a/kernel/include/linux/vt_kern.h b/kernel/include/linux/vt_kern.h
index 833fdd479..3fd079129 100644
--- a/kernel/include/linux/vt_kern.h
+++ b/kernel/include/linux/vt_kern.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VT_KERN_H
 #define _VT_KERN_H
 
diff --git a/kernel/include/linux/vtime.h b/kernel/include/linux/vtime.h
index 18b405e3c..a26ed10a4 100644
--- a/kernel/include/linux/vtime.h
+++ b/kernel/include/linux/vtime.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_KERNEL_VTIME_H
 #define _LINUX_KERNEL_VTIME_H
 
diff --git a/kernel/include/linux/wait.h b/kernel/include/linux/wait.h
index 87c464102..158715445 100644
--- a/kernel/include/linux/wait.h
+++ b/kernel/include/linux/wait.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_WAIT_H
 #define _LINUX_WAIT_H
 /*
diff --git a/kernel/include/linux/wait_bit.h b/kernel/include/linux/wait_bit.h
index 12b26660d..af0d49543 100644
--- a/kernel/include/linux/wait_bit.h
+++ b/kernel/include/linux/wait_bit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_WAIT_BIT_H
 #define _LINUX_WAIT_BIT_H
 
diff --git a/kernel/include/linux/wanrouter.h b/kernel/include/linux/wanrouter.h
index 8198a63cf..f6358558f 100644
--- a/kernel/include/linux/wanrouter.h
+++ b/kernel/include/linux/wanrouter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * wanrouter.h	Legacy declarations kept around until X25 is removed
  */
diff --git a/kernel/include/linux/watchdog.h b/kernel/include/linux/watchdog.h
index a786e5e89..44985c4a1 100644
--- a/kernel/include/linux/watchdog.h
+++ b/kernel/include/linux/watchdog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Generic watchdog defines. Derived from..
  *
diff --git a/kernel/include/linux/win_minmax.h b/kernel/include/linux/win_minmax.h
index 565696042..4ca2842d2 100644
--- a/kernel/include/linux/win_minmax.h
+++ b/kernel/include/linux/win_minmax.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
  * lib/minmax.c: windowed min/max tracker by Kathleen Nichols.
  *
diff --git a/kernel/include/linux/wireless.h b/kernel/include/linux/wireless.h
index 4ea4c6e23..2d1b54556 100644
--- a/kernel/include/linux/wireless.h
+++ b/kernel/include/linux/wireless.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file define a set of standard wireless extensions
  *
diff --git a/kernel/include/linux/wm97xx.h b/kernel/include/linux/wm97xx.h
index fd98bb968..58e082dad 100644
--- a/kernel/include/linux/wm97xx.h
+++ b/kernel/include/linux/wm97xx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  * Register bits and API for Wolfson WM97xx series of codecs
diff --git a/kernel/include/linux/workqueue.h b/kernel/include/linux/workqueue.h
index 1c49431f3..0eae11fc7 100644
--- a/kernel/include/linux/workqueue.h
+++ b/kernel/include/linux/workqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * workqueue.h --- work queue handling for Linux.
  */
diff --git a/kernel/include/linux/writeback.h b/kernel/include/linux/writeback.h
index d58157944..e12d92808 100644
--- a/kernel/include/linux/writeback.h
+++ b/kernel/include/linux/writeback.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/linux/writeback.h
  */
diff --git a/kernel/include/linux/ww_mutex.h b/kernel/include/linux/ww_mutex.h
index 5dd9a7682..39fda195b 100644
--- a/kernel/include/linux/ww_mutex.h
+++ b/kernel/include/linux/ww_mutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Wound/Wait Mutexes: blocking mutual exclusion locks with deadlock avoidance
  *
diff --git a/kernel/include/linux/xattr.h b/kernel/include/linux/xattr.h
index e77605a0c..d70f77a4b 100644
--- a/kernel/include/linux/xattr.h
+++ b/kernel/include/linux/xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   File: linux/xattr.h
 
diff --git a/kernel/include/linux/z2_battery.h b/kernel/include/linux/z2_battery.h
index 7b9750404..eaba53ff3 100644
--- a/kernel/include/linux/z2_battery.h
+++ b/kernel/include/linux/z2_battery.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_Z2_BATTERY_H
 #define _LINUX_Z2_BATTERY_H
 
diff --git a/kernel/include/linux/zbud.h b/kernel/include/linux/zbud.h
index e183a0a65..b1eaf6e31 100644
--- a/kernel/include/linux/zbud.h
+++ b/kernel/include/linux/zbud.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ZBUD_H_
 #define _ZBUD_H_
 
diff --git a/kernel/include/linux/zpool.h b/kernel/include/linux/zpool.h
index 2e97b7707..004ba807d 100644
--- a/kernel/include/linux/zpool.h
+++ b/kernel/include/linux/zpool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * zpool memory storage api
  *
diff --git a/kernel/include/media/blackfin/bfin_capture.h b/kernel/include/media/blackfin/bfin_capture.h
index 56b9ce447..a999a3970 100644
--- a/kernel/include/media/blackfin/bfin_capture.h
+++ b/kernel/include/media/blackfin/bfin_capture.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BFIN_CAPTURE_H_
 #define _BFIN_CAPTURE_H_
 
diff --git a/kernel/include/media/drv-intf/saa7146.h b/kernel/include/media/drv-intf/saa7146.h
index 452943286..769c6cf7e 100644
--- a/kernel/include/media/drv-intf/saa7146.h
+++ b/kernel/include/media/drv-intf/saa7146.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SAA7146__
 #define __SAA7146__
 
diff --git a/kernel/include/media/drv-intf/saa7146_vv.h b/kernel/include/media/drv-intf/saa7146_vv.h
index 0da6ccc06..4e89e9f12 100644
--- a/kernel/include/media/drv-intf/saa7146_vv.h
+++ b/kernel/include/media/drv-intf/saa7146_vv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SAA7146_VV__
 #define __SAA7146_VV__
 
diff --git a/kernel/include/media/drv-intf/sh_mobile_ceu.h b/kernel/include/media/drv-intf/sh_mobile_ceu.h
index 2f43f7d9e..555f0ecc0 100644
--- a/kernel/include/media/drv-intf/sh_mobile_ceu.h
+++ b/kernel/include/media/drv-intf/sh_mobile_ceu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_MOBILE_CEU_H__
 #define __ASM_SH_MOBILE_CEU_H__
 
diff --git a/kernel/include/media/i2c-addr.h b/kernel/include/media/i2c-addr.h
index 5d0f56054..1b6872f5e 100644
--- a/kernel/include/media/i2c-addr.h
+++ b/kernel/include/media/i2c-addr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	V4L I2C address list
  *
diff --git a/kernel/include/media/i2c/ir-kbd-i2c.h b/kernel/include/media/i2c/ir-kbd-i2c.h
index ac8c55617..76491c62c 100644
--- a/kernel/include/media/i2c/ir-kbd-i2c.h
+++ b/kernel/include/media/i2c/ir-kbd-i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IR_I2C
 #define _IR_I2C
 
diff --git a/kernel/include/media/i2c/mt9p031.h b/kernel/include/media/i2c/mt9p031.h
index 1ba361205..7c29c53aa 100644
--- a/kernel/include/media/i2c/mt9p031.h
+++ b/kernel/include/media/i2c/mt9p031.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MT9P031_H
 #define MT9P031_H
 
diff --git a/kernel/include/media/i2c/mt9t001.h b/kernel/include/media/i2c/mt9t001.h
index 03fd63edd..4b1090554 100644
--- a/kernel/include/media/i2c/mt9t001.h
+++ b/kernel/include/media/i2c/mt9t001.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MEDIA_MT9T001_H
 #define _MEDIA_MT9T001_H
 
diff --git a/kernel/include/media/i2c/mt9v032.h b/kernel/include/media/i2c/mt9v032.h
index 12175a63c..83a37ccfb 100644
--- a/kernel/include/media/i2c/mt9v032.h
+++ b/kernel/include/media/i2c/mt9v032.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MEDIA_MT9V032_H
 #define _MEDIA_MT9V032_H
 
diff --git a/kernel/include/media/tuner-types.h b/kernel/include/media/tuner-types.h
index aed539068..78f0654d9 100644
--- a/kernel/include/media/tuner-types.h
+++ b/kernel/include/media/tuner-types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * descriptions for simple tuners.
  */
diff --git a/kernel/include/media/tveeprom.h b/kernel/include/media/tveeprom.h
index 630bcf3d8..b56eaee82 100644
--- a/kernel/include/media/tveeprom.h
+++ b/kernel/include/media/tveeprom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*
  * tveeprom - Contains structures and functions to work with Hauppauge
diff --git a/kernel/include/media/v4l2-dev.h b/kernel/include/media/v4l2-dev.h
index e65761452..28a686eb7 100644
--- a/kernel/include/media/v4l2-dev.h
+++ b/kernel/include/media/v4l2-dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *	V 4 L 2   D R I V E R   H E L P E R   A P I
diff --git a/kernel/include/media/v4l2-ioctl.h b/kernel/include/media/v4l2-ioctl.h
index bd5312118..a7b3f7c75 100644
--- a/kernel/include/media/v4l2-ioctl.h
+++ b/kernel/include/media/v4l2-ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *	V 4 L 2   D R I V E R   H E L P E R   A P I
diff --git a/kernel/include/media/videobuf-dvb.h b/kernel/include/media/videobuf-dvb.h
index c3bfa473c..a14ac7711 100644
--- a/kernel/include/media/videobuf-dvb.h
+++ b/kernel/include/media/videobuf-dvb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <dvbdev.h>
 #include <dmxdev.h>
 #include <dvb_demux.h>
diff --git a/kernel/include/media/videobuf2-dvb.h b/kernel/include/media/videobuf2-dvb.h
index 87b559024..5a31faa24 100644
--- a/kernel/include/media/videobuf2-dvb.h
+++ b/kernel/include/media/videobuf2-dvb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _VIDEOBUF2_DVB_H_
 #define	_VIDEOBUF2_DVB_H_
 
diff --git a/kernel/include/net/Space.h b/kernel/include/net/Space.h
index 8a32771e4..27fb5c937 100644
--- a/kernel/include/net/Space.h
+++ b/kernel/include/net/Space.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* A unified ethernet device probe.  This is the easiest way to have every
  * ethernet adaptor have the name "eth[0123...]".
  */
diff --git a/kernel/include/net/act_api.h b/kernel/include/net/act_api.h
index b944e0eb9..1e6df0eb0 100644
--- a/kernel/include/net/act_api.h
+++ b/kernel/include/net/act_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_ACT_API_H
 #define __NET_ACT_API_H
 
@@ -13,6 +14,7 @@
 struct tcf_idrinfo {
 	spinlock_t	lock;
 	struct idr	action_idr;
+	struct net	*net;
 };
 
 struct tc_action_ops;
@@ -104,7 +106,7 @@ struct tc_action_net {
 
 static inline
 int tc_action_net_init(struct tc_action_net *tn,
-		       const struct tc_action_ops *ops)
+		       const struct tc_action_ops *ops, struct net *net)
 {
 	int err = 0;
 
@@ -112,6 +114,7 @@ int tc_action_net_init(struct tc_action_net *tn,
 	if (!tn->idrinfo)
 		return -ENOMEM;
 	tn->ops = ops;
+	tn->idrinfo->net = net;
 	spin_lock_init(&tn->idrinfo->lock);
 	idr_init(&tn->idrinfo->action_idr);
 	return err;
@@ -122,7 +125,9 @@ void tcf_idrinfo_destroy(const struct tc_action_ops *ops,
 
 static inline void tc_action_net_exit(struct tc_action_net *tn)
 {
+	rtnl_lock();
 	tcf_idrinfo_destroy(tn->ops, tn->idrinfo);
+	rtnl_unlock();
 	kfree(tn->idrinfo);
 }
 
diff --git a/kernel/include/net/addrconf.h b/kernel/include/net/addrconf.h
index f44ff2476..35f5aabd4 100644
--- a/kernel/include/net/addrconf.h
+++ b/kernel/include/net/addrconf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ADDRCONF_H
 #define _ADDRCONF_H
 
diff --git a/kernel/include/net/af_unix.h b/kernel/include/net/af_unix.h
index afb37f835..a5ba41b3b 100644
--- a/kernel/include/net/af_unix.h
+++ b/kernel/include/net/af_unix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_NET_AFUNIX_H
 #define __LINUX_NET_AFUNIX_H
 
diff --git a/kernel/include/net/ah.h b/kernel/include/net/ah.h
index 4e2dfa474..2d2dea521 100644
--- a/kernel/include/net/ah.h
+++ b/kernel/include/net/ah.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_AH_H
 #define _NET_AH_H
 
diff --git a/kernel/include/net/arp.h b/kernel/include/net/arp.h
index 17d90e4e8..dc8cd47f8 100644
--- a/kernel/include/net/arp.h
+++ b/kernel/include/net/arp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* linux/net/inet/arp.h */
 #ifndef _ARP_H
 #define _ARP_H
diff --git a/kernel/include/net/atmclip.h b/kernel/include/net/atmclip.h
index 5865924d4..70e350e0d 100644
--- a/kernel/include/net/atmclip.h
+++ b/kernel/include/net/atmclip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* net/atm/atmarp.h - RFC1577 ATM ARP */
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/net/ax25.h b/kernel/include/net/ax25.h
index c4a0cf6f0..76fb39c27 100644
--- a/kernel/include/net/ax25.h
+++ b/kernel/include/net/ax25.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Declarations of AX.25 type objects.
  *
diff --git a/kernel/include/net/compat.h b/kernel/include/net/compat.h
index 13de0ccaa..a91bea80b 100644
--- a/kernel/include/net/compat.h
+++ b/kernel/include/net/compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef NET_COMPAT_H
 #define NET_COMPAT_H
 
diff --git a/kernel/include/net/datalink.h b/kernel/include/net/datalink.h
index 93cb18f72..a9663229b 100644
--- a/kernel/include/net/datalink.h
+++ b/kernel/include/net/datalink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_INET_DATALINK_H_
 #define _NET_INET_DATALINK_H_
 
diff --git a/kernel/include/net/dn.h b/kernel/include/net/dn.h
index 913b73d23..fc0036228 100644
--- a/kernel/include/net/dn.h
+++ b/kernel/include/net/dn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_DN_H
 #define _NET_DN_H
 
diff --git a/kernel/include/net/dn_dev.h b/kernel/include/net/dn_dev.h
index 197886cd7..595b4f6c1 100644
--- a/kernel/include/net/dn_dev.h
+++ b/kernel/include/net/dn_dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_DN_DEV_H
 #define _NET_DN_DEV_H
 
diff --git a/kernel/include/net/dn_fib.h b/kernel/include/net/dn_fib.h
index 81210a8b8..6dd2213c5 100644
--- a/kernel/include/net/dn_fib.h
+++ b/kernel/include/net/dn_fib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_DN_FIB_H
 #define _NET_DN_FIB_H
 
diff --git a/kernel/include/net/dn_neigh.h b/kernel/include/net/dn_neigh.h
index 5e902fc3f..2e3e77939 100644
--- a/kernel/include/net/dn_neigh.h
+++ b/kernel/include/net/dn_neigh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_DN_NEIGH_H
 #define _NET_DN_NEIGH_H
 
diff --git a/kernel/include/net/dsfield.h b/kernel/include/net/dsfield.h
index e1ad903a8..1a245ee10 100644
--- a/kernel/include/net/dsfield.h
+++ b/kernel/include/net/dsfield.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* include/net/dsfield.h - Manipulation of the Differentiated Services field */
 
 /* Written 1998-2000 by Werner Almesberger, EPFL ICA */
diff --git a/kernel/include/net/dst.h b/kernel/include/net/dst.h
index 06a6765da..694c2e6ae 100644
--- a/kernel/include/net/dst.h
+++ b/kernel/include/net/dst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * net/dst.h	Protocol independent destination cache definitions.
  *
diff --git a/kernel/include/net/dst_cache.h b/kernel/include/net/dst_cache.h
index 151accae7..72fd5067c 100644
--- a/kernel/include/net/dst_cache.h
+++ b/kernel/include/net/dst_cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_DST_CACHE_H
 #define _NET_DST_CACHE_H
 
diff --git a/kernel/include/net/dst_metadata.h b/kernel/include/net/dst_metadata.h
index a803129a4..91bc7bdf6 100644
--- a/kernel/include/net/dst_metadata.h
+++ b/kernel/include/net/dst_metadata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_DST_METADATA_H
 #define __NET_DST_METADATA_H 1
 
diff --git a/kernel/include/net/dst_ops.h b/kernel/include/net/dst_ops.h
index c84b3287e..5ec645f27 100644
--- a/kernel/include/net/dst_ops.h
+++ b/kernel/include/net/dst_ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_DST_OPS_H
 #define _NET_DST_OPS_H
 #include <linux/types.h>
diff --git a/kernel/include/net/esp.h b/kernel/include/net/esp.h
index c41994d1b..117652eb6 100644
--- a/kernel/include/net/esp.h
+++ b/kernel/include/net/esp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_ESP_H
 #define _NET_ESP_H
 
diff --git a/kernel/include/net/fib_rules.h b/kernel/include/net/fib_rules.h
index 3d7f1cefc..648caf90e 100644
--- a/kernel/include/net/fib_rules.h
+++ b/kernel/include/net/fib_rules.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_FIB_RULES_H
 #define __NET_FIB_RULES_H
 
diff --git a/kernel/include/net/firewire.h b/kernel/include/net/firewire.h
index 31bcbfe7a..299e5df38 100644
--- a/kernel/include/net/firewire.h
+++ b/kernel/include/net/firewire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_FIREWIRE_H
 #define _NET_FIREWIRE_H
 
diff --git a/kernel/include/net/flow.h b/kernel/include/net/flow.h
index eb60cee30..f1624fd5b 100644
--- a/kernel/include/net/flow.h
+++ b/kernel/include/net/flow.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *
  *	Generic internet FLOW.
diff --git a/kernel/include/net/flow_dissector.h b/kernel/include/net/flow_dissector.h
index fc3dce730..22aba3212 100644
--- a/kernel/include/net/flow_dissector.h
+++ b/kernel/include/net/flow_dissector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_FLOW_DISSECTOR_H
 #define _NET_FLOW_DISSECTOR_H
 
diff --git a/kernel/include/net/fou.h b/kernel/include/net/fou.h
index f5cc6910a..80f56e275 100644
--- a/kernel/include/net/fou.h
+++ b/kernel/include/net/fou.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_FOU_H
 #define __NET_FOU_H
 
diff --git a/kernel/include/net/garp.h b/kernel/include/net/garp.h
index abf33bbd2..c41833bd4 100644
--- a/kernel/include/net/garp.h
+++ b/kernel/include/net/garp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_GARP_H
 #define _NET_GARP_H
 
diff --git a/kernel/include/net/gen_stats.h b/kernel/include/net/gen_stats.h
index 8b7aa370e..304f7aa9c 100644
--- a/kernel/include/net/gen_stats.h
+++ b/kernel/include/net/gen_stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_GEN_STATS_H
 #define __NET_GEN_STATS_H
 
diff --git a/kernel/include/net/genetlink.h b/kernel/include/net/genetlink.h
index c59a09822..5ac169a73 100644
--- a/kernel/include/net/genetlink.h
+++ b/kernel/include/net/genetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_GENERIC_NETLINK_H
 #define __NET_GENERIC_NETLINK_H
 
diff --git a/kernel/include/net/geneve.h b/kernel/include/net/geneve.h
index ec0327d43..a7600ed55 100644
--- a/kernel/include/net/geneve.h
+++ b/kernel/include/net/geneve.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_GENEVE_H
 #define __NET_GENEVE_H  1
 
diff --git a/kernel/include/net/gre.h b/kernel/include/net/gre.h
index d25d836c1..f90585dec 100644
--- a/kernel/include/net/gre.h
+++ b/kernel/include/net/gre.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_GRE_H
 #define __LINUX_GRE_H
 
diff --git a/kernel/include/net/gro_cells.h b/kernel/include/net/gro_cells.h
index fcaf8f479..596688b67 100644
--- a/kernel/include/net/gro_cells.h
+++ b/kernel/include/net/gro_cells.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_GRO_CELLS_H
 #define _NET_GRO_CELLS_H
 
diff --git a/kernel/include/net/gtp.h b/kernel/include/net/gtp.h
index 6398891b9..0e16ebb2a 100644
--- a/kernel/include/net/gtp.h
+++ b/kernel/include/net/gtp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GTP_H_
 #define _GTP_H_
 
diff --git a/kernel/include/net/gue.h b/kernel/include/net/gue.h
index 3f28ec7f1..2fdb29ca7 100644
--- a/kernel/include/net/gue.h
+++ b/kernel/include/net/gue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_GUE_H
 #define __NET_GUE_H
 
diff --git a/kernel/include/net/hwbm.h b/kernel/include/net/hwbm.h
index 47d086625..89085e2e2 100644
--- a/kernel/include/net/hwbm.h
+++ b/kernel/include/net/hwbm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _HWBM_H
 #define _HWBM_H
 
diff --git a/kernel/include/net/ife.h b/kernel/include/net/ife.h
index 2d87d6898..44b9c00f7 100644
--- a/kernel/include/net/ife.h
+++ b/kernel/include/net/ife.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_IFE_H
 #define __NET_IFE_H
 
diff --git a/kernel/include/net/inet_common.h b/kernel/include/net/inet_common.h
index f39ae6973..5a54c9570 100644
--- a/kernel/include/net/inet_common.h
+++ b/kernel/include/net/inet_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INET_COMMON_H
 #define _INET_COMMON_H
 
diff --git a/kernel/include/net/inet_ecn.h b/kernel/include/net/inet_ecn.h
index dce2d586d..d30e4c869 100644
--- a/kernel/include/net/inet_ecn.h
+++ b/kernel/include/net/inet_ecn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INET_ECN_H_
 #define _INET_ECN_H_
 
diff --git a/kernel/include/net/inet_frag.h b/kernel/include/net/inet_frag.h
index fc59e0775..a6e4edd8d 100644
--- a/kernel/include/net/inet_frag.h
+++ b/kernel/include/net/inet_frag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_FRAG_H__
 #define __NET_FRAG_H__
 
diff --git a/kernel/include/net/inetpeer.h b/kernel/include/net/inetpeer.h
index 950ed182f..00b5e7825 100644
--- a/kernel/include/net/inetpeer.h
+++ b/kernel/include/net/inetpeer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *		INETPEER - A storage for permanent information about peers
  *
diff --git a/kernel/include/net/ip6_route.h b/kernel/include/net/ip6_route.h
index ee96f402c..bee528135 100644
--- a/kernel/include/net/ip6_route.h
+++ b/kernel/include/net/ip6_route.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_IP6_ROUTE_H
 #define _NET_IP6_ROUTE_H
 
diff --git a/kernel/include/net/ip6_tunnel.h b/kernel/include/net/ip6_tunnel.h
index 08fbc7f7d..d66f70f63 100644
--- a/kernel/include/net/ip6_tunnel.h
+++ b/kernel/include/net/ip6_tunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_IP6_TUNNEL_H
 #define _NET_IP6_TUNNEL_H
 
diff --git a/kernel/include/net/ip_tunnels.h b/kernel/include/net/ip_tunnels.h
index 992652856..eb2321a13 100644
--- a/kernel/include/net/ip_tunnels.h
+++ b/kernel/include/net/ip_tunnels.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_IP_TUNNELS_H
 #define __NET_IP_TUNNELS_H 1
 
diff --git a/kernel/include/net/ip_vs.h b/kernel/include/net/ip_vs.h
index 4f4f78625..5d08c1950 100644
--- a/kernel/include/net/ip_vs.h
+++ b/kernel/include/net/ip_vs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* IP Virtual Server
  * data structure and functionality definitions
  */
diff --git a/kernel/include/net/ipcomp.h b/kernel/include/net/ipcomp.h
index cc4f30cd7..fee6fc451 100644
--- a/kernel/include/net/ipcomp.h
+++ b/kernel/include/net/ipcomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_IPCOMP_H
 #define _NET_IPCOMP_H
 
diff --git a/kernel/include/net/ipconfig.h b/kernel/include/net/ipconfig.h
index c74cc1bd5..e3534299b 100644
--- a/kernel/include/net/ipconfig.h
+++ b/kernel/include/net/ipconfig.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Copyright (C) 1997 Martin Mares
  *
diff --git a/kernel/include/net/ipx.h b/kernel/include/net/ipx.h
index af32b97b5..baf090390 100644
--- a/kernel/include/net/ipx.h
+++ b/kernel/include/net/ipx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_INET_IPX_H_
 #define _NET_INET_IPX_H_
 /*
diff --git a/kernel/include/net/iucv/af_iucv.h b/kernel/include/net/iucv/af_iucv.h
index 714cc9a54..070e93a17 100644
--- a/kernel/include/net/iucv/af_iucv.h
+++ b/kernel/include/net/iucv/af_iucv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright 2006 IBM Corporation
  * IUCV protocol stack for Linux on zSeries
diff --git a/kernel/include/net/iucv/iucv.h b/kernel/include/net/iucv/iucv.h
index b867b0cf7..f9e88401d 100644
--- a/kernel/include/net/iucv/iucv.h
+++ b/kernel/include/net/iucv/iucv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  drivers/s390/net/iucv.h
  *    IUCV base support.
diff --git a/kernel/include/net/iw_handler.h b/kernel/include/net/iw_handler.h
index 250972865..725282095 100644
--- a/kernel/include/net/iw_handler.h
+++ b/kernel/include/net/iw_handler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file define the new driver API for Wireless Extensions
  *
diff --git a/kernel/include/net/lapb.h b/kernel/include/net/lapb.h
index 85e773742..ccc3d1f02 100644
--- a/kernel/include/net/lapb.h
+++ b/kernel/include/net/lapb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LAPB_H
 #define _LAPB_H 
 #include <linux/lapb.h>
diff --git a/kernel/include/net/lib80211.h b/kernel/include/net/lib80211.h
index aab0f427e..8b47d3a51 100644
--- a/kernel/include/net/lib80211.h
+++ b/kernel/include/net/lib80211.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * lib80211.h -- common bits for IEEE802.11 wireless drivers
  *
diff --git a/kernel/include/net/lwtunnel.h b/kernel/include/net/lwtunnel.h
index 7c26863b8..d747ef975 100644
--- a/kernel/include/net/lwtunnel.h
+++ b/kernel/include/net/lwtunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_LWTUNNEL_H
 #define __NET_LWTUNNEL_H 1
 
diff --git a/kernel/include/net/mld.h b/kernel/include/net/mld.h
index 01d751303..b0f5b3105 100644
--- a/kernel/include/net/mld.h
+++ b/kernel/include/net/mld.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_MLD_H
 #define LINUX_MLD_H
 
diff --git a/kernel/include/net/mrp.h b/kernel/include/net/mrp.h
index 31912c3be..ef58b4a07 100644
--- a/kernel/include/net/mrp.h
+++ b/kernel/include/net/mrp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_MRP_H
 #define _NET_MRP_H
 
diff --git a/kernel/include/net/ncsi.h b/kernel/include/net/ncsi.h
index fdc60ff25..fbefe8036 100644
--- a/kernel/include/net/ncsi.h
+++ b/kernel/include/net/ncsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_NCSI_H
 #define __NET_NCSI_H
 
diff --git a/kernel/include/net/ndisc.h b/kernel/include/net/ndisc.h
index 31b1bb11b..ddfbb591e 100644
--- a/kernel/include/net/ndisc.h
+++ b/kernel/include/net/ndisc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NDISC_H
 #define _NDISC_H
 
diff --git a/kernel/include/net/neighbour.h b/kernel/include/net/neighbour.h
index 9816df225..a964366a7 100644
--- a/kernel/include/net/neighbour.h
+++ b/kernel/include/net/neighbour.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_NEIGHBOUR_H
 #define _NET_NEIGHBOUR_H
 
diff --git a/kernel/include/net/net_namespace.h b/kernel/include/net/net_namespace.h
index 57faa375e..10f99dafd 100644
--- a/kernel/include/net/net_namespace.h
+++ b/kernel/include/net/net_namespace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Operations on the network namespace
  */
diff --git a/kernel/include/net/net_ratelimit.h b/kernel/include/net/net_ratelimit.h
index 7727b4247..93c1bd513 100644
--- a/kernel/include/net/net_ratelimit.h
+++ b/kernel/include/net/net_ratelimit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NET_RATELIMIT_H
 #define _LINUX_NET_RATELIMIT_H
 
diff --git a/kernel/include/net/netevent.h b/kernel/include/net/netevent.h
index f440df172..f728d9cad 100644
--- a/kernel/include/net/netevent.h
+++ b/kernel/include/net/netevent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_EVENT_H
 #define _NET_EVENT_H
 
diff --git a/kernel/include/net/netfilter/br_netfilter.h b/kernel/include/net/netfilter/br_netfilter.h
index 925524ede..74af19c3a 100644
--- a/kernel/include/net/netfilter/br_netfilter.h
+++ b/kernel/include/net/netfilter/br_netfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BR_NETFILTER_H_
 #define _BR_NETFILTER_H_
 
diff --git a/kernel/include/net/netfilter/ipv4/nf_conntrack_ipv4.h b/kernel/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
index 919e4e8af..2cc728ef8 100644
--- a/kernel/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
+++ b/kernel/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IPv4 support for nf_conntrack.
  *
diff --git a/kernel/include/net/netfilter/ipv4/nf_defrag_ipv4.h b/kernel/include/net/netfilter/ipv4/nf_defrag_ipv4.h
index db405f70e..bcbd724cc 100644
--- a/kernel/include/net/netfilter/ipv4/nf_defrag_ipv4.h
+++ b/kernel/include/net/netfilter/ipv4/nf_defrag_ipv4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_DEFRAG_IPV4_H
 #define _NF_DEFRAG_IPV4_H
 
diff --git a/kernel/include/net/netfilter/ipv4/nf_dup_ipv4.h b/kernel/include/net/netfilter/ipv4/nf_dup_ipv4.h
index 0a14733e8..c962e0be3 100644
--- a/kernel/include/net/netfilter/ipv4/nf_dup_ipv4.h
+++ b/kernel/include/net/netfilter/ipv4/nf_dup_ipv4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_DUP_IPV4_H_
 #define _NF_DUP_IPV4_H_
 
diff --git a/kernel/include/net/netfilter/ipv4/nf_nat_masquerade.h b/kernel/include/net/netfilter/ipv4/nf_nat_masquerade.h
index a9c001c64..ebd869473 100644
--- a/kernel/include/net/netfilter/ipv4/nf_nat_masquerade.h
+++ b/kernel/include/net/netfilter/ipv4/nf_nat_masquerade.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_MASQUERADE_IPV4_H_
 #define _NF_NAT_MASQUERADE_IPV4_H_
 
diff --git a/kernel/include/net/netfilter/ipv4/nf_reject.h b/kernel/include/net/netfilter/ipv4/nf_reject.h
index df7ecd806..2eb43fcef 100644
--- a/kernel/include/net/netfilter/ipv4/nf_reject.h
+++ b/kernel/include/net/netfilter/ipv4/nf_reject.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IPV4_NF_REJECT_H
 #define _IPV4_NF_REJECT_H
 
diff --git a/kernel/include/net/netfilter/ipv6/nf_conntrack_icmpv6.h b/kernel/include/net/netfilter/ipv6/nf_conntrack_icmpv6.h
index 67edd50a3..c86895bc5 100644
--- a/kernel/include/net/netfilter/ipv6/nf_conntrack_icmpv6.h
+++ b/kernel/include/net/netfilter/ipv6/nf_conntrack_icmpv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ICMPv6 tracking.
  *
diff --git a/kernel/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/kernel/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
index eaea968f8..79a335c0d 100644
--- a/kernel/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
+++ b/kernel/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_IPV6_H
 #define _NF_CONNTRACK_IPV6_H
 
diff --git a/kernel/include/net/netfilter/ipv6/nf_defrag_ipv6.h b/kernel/include/net/netfilter/ipv6/nf_defrag_ipv6.h
index 7664efe37..9d7e28736 100644
--- a/kernel/include/net/netfilter/ipv6/nf_defrag_ipv6.h
+++ b/kernel/include/net/netfilter/ipv6/nf_defrag_ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_DEFRAG_IPV6_H
 #define _NF_DEFRAG_IPV6_H
 
diff --git a/kernel/include/net/netfilter/ipv6/nf_dup_ipv6.h b/kernel/include/net/netfilter/ipv6/nf_dup_ipv6.h
index fa6237b38..caf0c2dd8 100644
--- a/kernel/include/net/netfilter/ipv6/nf_dup_ipv6.h
+++ b/kernel/include/net/netfilter/ipv6/nf_dup_ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_DUP_IPV6_H_
 #define _NF_DUP_IPV6_H_
 
diff --git a/kernel/include/net/netfilter/ipv6/nf_nat_masquerade.h b/kernel/include/net/netfilter/ipv6/nf_nat_masquerade.h
index 0a13396cd..1ed4f2631 100644
--- a/kernel/include/net/netfilter/ipv6/nf_nat_masquerade.h
+++ b/kernel/include/net/netfilter/ipv6/nf_nat_masquerade.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_MASQUERADE_IPV6_H_
 #define _NF_NAT_MASQUERADE_IPV6_H_
 
diff --git a/kernel/include/net/netfilter/ipv6/nf_reject.h b/kernel/include/net/netfilter/ipv6/nf_reject.h
index 0ea4fa37d..3a5a9a36a 100644
--- a/kernel/include/net/netfilter/ipv6/nf_reject.h
+++ b/kernel/include/net/netfilter/ipv6/nf_reject.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _IPV6_NF_REJECT_H
 #define _IPV6_NF_REJECT_H
 
diff --git a/kernel/include/net/netfilter/nf_conntrack.h b/kernel/include/net/netfilter/nf_conntrack.h
index 8f3bd3051..792c3f6d3 100644
--- a/kernel/include/net/netfilter/nf_conntrack.h
+++ b/kernel/include/net/netfilter/nf_conntrack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Connection state tracking for netfilter.  This is separated from,
  * but required by, the (future) NAT layer; it can also be used by an iptables
diff --git a/kernel/include/net/netfilter/nf_conntrack_core.h b/kernel/include/net/netfilter/nf_conntrack_core.h
index 81d7f8a30..9b5e76347 100644
--- a/kernel/include/net/netfilter/nf_conntrack_core.h
+++ b/kernel/include/net/netfilter/nf_conntrack_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header is used to share core functionality between the
  * standalone connection tracking module, and the compatibility layer's use
diff --git a/kernel/include/net/netfilter/nf_conntrack_ecache.h b/kernel/include/net/netfilter/nf_conntrack_ecache.h
index 2a10c6570..3f1ce9a87 100644
--- a/kernel/include/net/netfilter/nf_conntrack_ecache.h
+++ b/kernel/include/net/netfilter/nf_conntrack_ecache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * connection tracking event cache.
  */
diff --git a/kernel/include/net/netfilter/nf_conntrack_expect.h b/kernel/include/net/netfilter/nf_conntrack_expect.h
index 818def011..006e430d1 100644
--- a/kernel/include/net/netfilter/nf_conntrack_expect.h
+++ b/kernel/include/net/netfilter/nf_conntrack_expect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * connection tracking expectations.
  */
diff --git a/kernel/include/net/netfilter/nf_conntrack_extend.h b/kernel/include/net/netfilter/nf_conntrack_extend.h
index 4944bc915..21f887c50 100644
--- a/kernel/include/net/netfilter/nf_conntrack_extend.h
+++ b/kernel/include/net/netfilter/nf_conntrack_extend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_EXTEND_H
 #define _NF_CONNTRACK_EXTEND_H
 
diff --git a/kernel/include/net/netfilter/nf_conntrack_helper.h b/kernel/include/net/netfilter/nf_conntrack_helper.h
index c519bb5b5..fc39bbaf1 100644
--- a/kernel/include/net/netfilter/nf_conntrack_helper.h
+++ b/kernel/include/net/netfilter/nf_conntrack_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * connection tracking helpers.
  *
diff --git a/kernel/include/net/netfilter/nf_conntrack_l3proto.h b/kernel/include/net/netfilter/nf_conntrack_l3proto.h
index 6269deecb..d5808f3e2 100644
--- a/kernel/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/kernel/include/net/netfilter/nf_conntrack_l3proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C)2003,2004 USAGI/WIDE Project
  *
diff --git a/kernel/include/net/netfilter/nf_conntrack_l4proto.h b/kernel/include/net/netfilter/nf_conntrack_l4proto.h
index 738a0307a..510192eb7 100644
--- a/kernel/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/kernel/include/net/netfilter/nf_conntrack_l4proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Header for use in defining a given L4 protocol for connection tracking.
  *
diff --git a/kernel/include/net/netfilter/nf_conntrack_labels.h b/kernel/include/net/netfilter/nf_conntrack_labels.h
index 1723a67c0..4eacce6f3 100644
--- a/kernel/include/net/netfilter/nf_conntrack_labels.h
+++ b/kernel/include/net/netfilter/nf_conntrack_labels.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/types.h>
 #include <net/net_namespace.h>
 #include <linux/netfilter/nf_conntrack_common.h>
diff --git a/kernel/include/net/netfilter/nf_conntrack_seqadj.h b/kernel/include/net/netfilter/nf_conntrack_seqadj.h
index 4b3362991..0a10b5053 100644
--- a/kernel/include/net/netfilter/nf_conntrack_seqadj.h
+++ b/kernel/include/net/netfilter/nf_conntrack_seqadj.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_SEQADJ_H
 #define _NF_CONNTRACK_SEQADJ_H
 
diff --git a/kernel/include/net/netfilter/nf_conntrack_synproxy.h b/kernel/include/net/netfilter/nf_conntrack_synproxy.h
index a2fcb5271..2c7559a54 100644
--- a/kernel/include/net/netfilter/nf_conntrack_synproxy.h
+++ b/kernel/include/net/netfilter/nf_conntrack_synproxy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_SYNPROXY_H
 #define _NF_CONNTRACK_SYNPROXY_H
 
diff --git a/kernel/include/net/netfilter/nf_conntrack_timeout.h b/kernel/include/net/netfilter/nf_conntrack_timeout.h
index 483d104fa..9468ab4ad 100644
--- a/kernel/include/net/netfilter/nf_conntrack_timeout.h
+++ b/kernel/include/net/netfilter/nf_conntrack_timeout.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_TIMEOUT_H
 #define _NF_CONNTRACK_TIMEOUT_H
 
diff --git a/kernel/include/net/netfilter/nf_conntrack_timestamp.h b/kernel/include/net/netfilter/nf_conntrack_timestamp.h
index 300ae2209..3b661986b 100644
--- a/kernel/include/net/netfilter/nf_conntrack_timestamp.h
+++ b/kernel/include/net/netfilter/nf_conntrack_timestamp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_TSTAMP_H
 #define _NF_CONNTRACK_TSTAMP_H
 
diff --git a/kernel/include/net/netfilter/nf_conntrack_tuple.h b/kernel/include/net/netfilter/nf_conntrack_tuple.h
index aea3f8221..bf0444e11 100644
--- a/kernel/include/net/netfilter/nf_conntrack_tuple.h
+++ b/kernel/include/net/netfilter/nf_conntrack_tuple.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Definitions and Declarations for tuple.
  *
diff --git a/kernel/include/net/netfilter/nf_conntrack_zones.h b/kernel/include/net/netfilter/nf_conntrack_zones.h
index 64a718b60..52950baa3 100644
--- a/kernel/include/net/netfilter/nf_conntrack_zones.h
+++ b/kernel/include/net/netfilter/nf_conntrack_zones.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_CONNTRACK_ZONES_H
 #define _NF_CONNTRACK_ZONES_H
 
diff --git a/kernel/include/net/netfilter/nf_dup_netdev.h b/kernel/include/net/netfilter/nf_dup_netdev.h
index 3e919356b..2a6f6dcad 100644
--- a/kernel/include/net/netfilter/nf_dup_netdev.h
+++ b/kernel/include/net/netfilter/nf_dup_netdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_DUP_NETDEV_H_
 #define _NF_DUP_NETDEV_H_
 
diff --git a/kernel/include/net/netfilter/nf_log.h b/kernel/include/net/netfilter/nf_log.h
index 42e0696f3..e811ac07e 100644
--- a/kernel/include/net/netfilter/nf_log.h
+++ b/kernel/include/net/netfilter/nf_log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_LOG_H
 #define _NF_LOG_H
 
diff --git a/kernel/include/net/netfilter/nf_nat.h b/kernel/include/net/netfilter/nf_nat.h
index b71701302..207a467e7 100644
--- a/kernel/include/net/netfilter/nf_nat.h
+++ b/kernel/include/net/netfilter/nf_nat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_H
 #define _NF_NAT_H
 #include <linux/netfilter_ipv4.h>
diff --git a/kernel/include/net/netfilter/nf_nat_core.h b/kernel/include/net/netfilter/nf_nat_core.h
index 186c54138..235bd0e9a 100644
--- a/kernel/include/net/netfilter/nf_nat_core.h
+++ b/kernel/include/net/netfilter/nf_nat_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_CORE_H
 #define _NF_NAT_CORE_H
 #include <linux/list.h>
diff --git a/kernel/include/net/netfilter/nf_nat_helper.h b/kernel/include/net/netfilter/nf_nat_helper.h
index fbfa5acf4..97d7033e9 100644
--- a/kernel/include/net/netfilter/nf_nat_helper.h
+++ b/kernel/include/net/netfilter/nf_nat_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_HELPER_H
 #define _NF_NAT_HELPER_H
 /* NAT protocol helper routines. */
diff --git a/kernel/include/net/netfilter/nf_nat_l3proto.h b/kernel/include/net/netfilter/nf_nat_l3proto.h
index aef3e5fc9..ce7c2b4e6 100644
--- a/kernel/include/net/netfilter/nf_nat_l3proto.h
+++ b/kernel/include/net/netfilter/nf_nat_l3proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_L3PROTO_H
 #define _NF_NAT_L3PROTO_H
 
diff --git a/kernel/include/net/netfilter/nf_nat_l4proto.h b/kernel/include/net/netfilter/nf_nat_l4proto.h
index 3923150f2..67835ff8a 100644
--- a/kernel/include/net/netfilter/nf_nat_l4proto.h
+++ b/kernel/include/net/netfilter/nf_nat_l4proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Header for use in defining a given protocol. */
 #ifndef _NF_NAT_L4PROTO_H
 #define _NF_NAT_L4PROTO_H
diff --git a/kernel/include/net/netfilter/nf_nat_redirect.h b/kernel/include/net/netfilter/nf_nat_redirect.h
index 73b729543..5ddabb08c 100644
--- a/kernel/include/net/netfilter/nf_nat_redirect.h
+++ b/kernel/include/net/netfilter/nf_nat_redirect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_NAT_REDIRECT_H_
 #define _NF_NAT_REDIRECT_H_
 
diff --git a/kernel/include/net/netfilter/nf_queue.h b/kernel/include/net/netfilter/nf_queue.h
index 39468720f..814058d0f 100644
--- a/kernel/include/net/netfilter/nf_queue.h
+++ b/kernel/include/net/netfilter/nf_queue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_QUEUE_H
 #define _NF_QUEUE_H
 
diff --git a/kernel/include/net/netfilter/nf_socket.h b/kernel/include/net/netfilter/nf_socket.h
index f2fc39c97..8230fefff 100644
--- a/kernel/include/net/netfilter/nf_socket.h
+++ b/kernel/include/net/netfilter/nf_socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_SOCK_H_
 #define _NF_SOCK_H_
 
diff --git a/kernel/include/net/netfilter/nf_tables.h b/kernel/include/net/netfilter/nf_tables.h
index 0f5b12a4a..079c69cae 100644
--- a/kernel/include/net/netfilter/nf_tables.h
+++ b/kernel/include/net/netfilter/nf_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_NF_TABLES_H
 #define _NET_NF_TABLES_H
 
diff --git a/kernel/include/net/netfilter/nf_tables_core.h b/kernel/include/net/netfilter/nf_tables_core.h
index 424684c33..ea5aab568 100644
--- a/kernel/include/net/netfilter/nf_tables_core.h
+++ b/kernel/include/net/netfilter/nf_tables_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_NF_TABLES_CORE_H
 #define _NET_NF_TABLES_CORE_H
 
diff --git a/kernel/include/net/netfilter/nf_tables_ipv4.h b/kernel/include/net/netfilter/nf_tables_ipv4.h
index 25e33aee9..f0896ba45 100644
--- a/kernel/include/net/netfilter/nf_tables_ipv4.h
+++ b/kernel/include/net/netfilter/nf_tables_ipv4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_TABLES_IPV4_H_
 #define _NF_TABLES_IPV4_H_
 
diff --git a/kernel/include/net/netfilter/nf_tables_ipv6.h b/kernel/include/net/netfilter/nf_tables_ipv6.h
index 97983d1c0..b8065b72f 100644
--- a/kernel/include/net/netfilter/nf_tables_ipv6.h
+++ b/kernel/include/net/netfilter/nf_tables_ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_TABLES_IPV6_H_
 #define _NF_TABLES_IPV6_H_
 
diff --git a/kernel/include/net/netfilter/nfnetlink_log.h b/kernel/include/net/netfilter/nfnetlink_log.h
index 5ca3f14f0..612cfb63a 100644
--- a/kernel/include/net/netfilter/nfnetlink_log.h
+++ b/kernel/include/net/netfilter/nfnetlink_log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KER_NFNETLINK_LOG_H
 #define _KER_NFNETLINK_LOG_H
 
diff --git a/kernel/include/net/netfilter/nft_dup.h b/kernel/include/net/netfilter/nft_dup.h
index 6b84cf649..4d9d51298 100644
--- a/kernel/include/net/netfilter/nft_dup.h
+++ b/kernel/include/net/netfilter/nft_dup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFT_DUP_H_
 #define _NFT_DUP_H_
 
diff --git a/kernel/include/net/netfilter/nft_fib.h b/kernel/include/net/netfilter/nft_fib.h
index 381af9469..a88f92737 100644
--- a/kernel/include/net/netfilter/nft_fib.h
+++ b/kernel/include/net/netfilter/nft_fib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFT_FIB_H_
 #define _NFT_FIB_H_
 
diff --git a/kernel/include/net/netfilter/nft_masq.h b/kernel/include/net/netfilter/nft_masq.h
index a3f3c11b2..e51ab3815 100644
--- a/kernel/include/net/netfilter/nft_masq.h
+++ b/kernel/include/net/netfilter/nft_masq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFT_MASQ_H_
 #define _NFT_MASQ_H_
 
diff --git a/kernel/include/net/netfilter/nft_meta.h b/kernel/include/net/netfilter/nft_meta.h
index 1139cde0f..5c69e9b09 100644
--- a/kernel/include/net/netfilter/nft_meta.h
+++ b/kernel/include/net/netfilter/nft_meta.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFT_META_H_
 #define _NFT_META_H_
 
diff --git a/kernel/include/net/netfilter/nft_redir.h b/kernel/include/net/netfilter/nft_redir.h
index a2d67546a..4a970737c 100644
--- a/kernel/include/net/netfilter/nft_redir.h
+++ b/kernel/include/net/netfilter/nft_redir.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFT_REDIR_H_
 #define _NFT_REDIR_H_
 
diff --git a/kernel/include/net/netfilter/nft_reject.h b/kernel/include/net/netfilter/nft_reject.h
index 02e28c529..de80c5076 100644
--- a/kernel/include/net/netfilter/nft_reject.h
+++ b/kernel/include/net/netfilter/nft_reject.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NFT_REJECT_H_
 #define _NFT_REJECT_H_
 
diff --git a/kernel/include/net/netfilter/xt_rateest.h b/kernel/include/net/netfilter/xt_rateest.h
index 130e58361..b1db13772 100644
--- a/kernel/include/net/netfilter/xt_rateest.h
+++ b/kernel/include/net/netfilter/xt_rateest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XT_RATEEST_H
 #define _XT_RATEEST_H
 
diff --git a/kernel/include/net/netlink.h b/kernel/include/net/netlink.h
index 14c289393..0c154f98e 100644
--- a/kernel/include/net/netlink.h
+++ b/kernel/include/net/netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_NETLINK_H
 #define __NET_NETLINK_H
 
diff --git a/kernel/include/net/netns/can.h b/kernel/include/net/netns/can.h
index b106e6ae2..ecf238b88 100644
--- a/kernel/include/net/netns/can.h
+++ b/kernel/include/net/netns/can.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * can in net namespaces
  */
diff --git a/kernel/include/net/netns/conntrack.h b/kernel/include/net/netns/conntrack.h
index 17724c62d..9795d628a 100644
--- a/kernel/include/net/netns/conntrack.h
+++ b/kernel/include/net/netns/conntrack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_CONNTRACK_H
 #define __NETNS_CONNTRACK_H
 
diff --git a/kernel/include/net/netns/core.h b/kernel/include/net/netns/core.h
index 78eb1ff75..0ad4d0c71 100644
--- a/kernel/include/net/netns/core.h
+++ b/kernel/include/net/netns/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_CORE_H__
 #define __NETNS_CORE_H__
 
diff --git a/kernel/include/net/netns/dccp.h b/kernel/include/net/netns/dccp.h
index 98d2a7ce1..cdbc4f5b8 100644
--- a/kernel/include/net/netns/dccp.h
+++ b/kernel/include/net/netns/dccp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_DCCP_H__
 #define __NETNS_DCCP_H__
 
diff --git a/kernel/include/net/netns/generic.h b/kernel/include/net/netns/generic.h
index f15daaa89..8a1ab47c3 100644
--- a/kernel/include/net/netns/generic.h
+++ b/kernel/include/net/netns/generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * generic net pointers
  */
diff --git a/kernel/include/net/netns/hash.h b/kernel/include/net/netns/hash.h
index 69a6715d9..24c78183a 100644
--- a/kernel/include/net/netns/hash.h
+++ b/kernel/include/net/netns/hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_NS_HASH_H__
 #define __NET_NS_HASH_H__
 
diff --git a/kernel/include/net/netns/ieee802154_6lowpan.h b/kernel/include/net/netns/ieee802154_6lowpan.h
index 8170f8d70..736aeac52 100644
--- a/kernel/include/net/netns/ieee802154_6lowpan.h
+++ b/kernel/include/net/netns/ieee802154_6lowpan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ieee802154 6lowpan in net namespaces
  */
diff --git a/kernel/include/net/netns/ipv4.h b/kernel/include/net/netns/ipv4.h
index 20d061c80..8fcff2837 100644
--- a/kernel/include/net/netns/ipv4.h
+++ b/kernel/include/net/netns/ipv4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ipv4 in net namespaces
  */
diff --git a/kernel/include/net/netns/ipv6.h b/kernel/include/net/netns/ipv6.h
index 2544f9760..dc825a5dd 100644
--- a/kernel/include/net/netns/ipv6.h
+++ b/kernel/include/net/netns/ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * ipv6 in net namespaces
  */
diff --git a/kernel/include/net/netns/mib.h b/kernel/include/net/netns/mib.h
index d542a4b28..830bdf345 100644
--- a/kernel/include/net/netns/mib.h
+++ b/kernel/include/net/netns/mib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_MIB_H__
 #define __NETNS_MIB_H__
 
diff --git a/kernel/include/net/netns/mpls.h b/kernel/include/net/netns/mpls.h
index 6608b3693..a7bdcfbb0 100644
--- a/kernel/include/net/netns/mpls.h
+++ b/kernel/include/net/netns/mpls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * mpls in net namespaces
  */
diff --git a/kernel/include/net/netns/netfilter.h b/kernel/include/net/netns/netfilter.h
index 72d66c876..cc00af2ac 100644
--- a/kernel/include/net/netns/netfilter.h
+++ b/kernel/include/net/netns/netfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_NETFILTER_H
 #define __NETNS_NETFILTER_H
 
diff --git a/kernel/include/net/netns/nftables.h b/kernel/include/net/netns/nftables.h
index c80781146..4109b5f30 100644
--- a/kernel/include/net/netns/nftables.h
+++ b/kernel/include/net/netns/nftables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NETNS_NFTABLES_H_
 #define _NETNS_NFTABLES_H_
 
diff --git a/kernel/include/net/netns/packet.h b/kernel/include/net/netns/packet.h
index 17ec2b95c..aae69bb43 100644
--- a/kernel/include/net/netns/packet.h
+++ b/kernel/include/net/netns/packet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Packet network namespace
  */
diff --git a/kernel/include/net/netns/sctp.h b/kernel/include/net/netns/sctp.h
index b7871d018..ebc813277 100644
--- a/kernel/include/net/netns/sctp.h
+++ b/kernel/include/net/netns/sctp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_SCTP_H__
 #define __NETNS_SCTP_H__
 
diff --git a/kernel/include/net/netns/unix.h b/kernel/include/net/netns/unix.h
index 284649d4d..91a3d7e39 100644
--- a/kernel/include/net/netns/unix.h
+++ b/kernel/include/net/netns/unix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Unix network namespace
  */
diff --git a/kernel/include/net/netns/x_tables.h b/kernel/include/net/netns/x_tables.h
index c8a7681ef..9bc5a12fd 100644
--- a/kernel/include/net/netns/x_tables.h
+++ b/kernel/include/net/netns/x_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_X_TABLES_H
 #define __NETNS_X_TABLES_H
 
diff --git a/kernel/include/net/netns/xfrm.h b/kernel/include/net/netns/xfrm.h
index 611521646..9991e5ef5 100644
--- a/kernel/include/net/netns/xfrm.h
+++ b/kernel/include/net/netns/xfrm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NETNS_XFRM_H
 #define __NETNS_XFRM_H
 
diff --git a/kernel/include/net/netrom.h b/kernel/include/net/netrom.h
index 443a4ffca..0dad2dd5f 100644
--- a/kernel/include/net/netrom.h
+++ b/kernel/include/net/netrom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Declarations of NET/ROM type objects.
  *
diff --git a/kernel/include/net/nexthop.h b/kernel/include/net/nexthop.h
index 3334dbfa5..36bb794f5 100644
--- a/kernel/include/net/nexthop.h
+++ b/kernel/include/net/nexthop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_NEXTHOP_H
 #define __NET_NEXTHOP_H
 
diff --git a/kernel/include/net/p8022.h b/kernel/include/net/p8022.h
index 05e413838..c2bacc66b 100644
--- a/kernel/include/net/p8022.h
+++ b/kernel/include/net/p8022.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_P8022_H
 #define _NET_P8022_H
 struct datalink_proto *
diff --git a/kernel/include/net/pkt_cls.h b/kernel/include/net/pkt_cls.h
index 3009547f3..70ca24377 100644
--- a/kernel/include/net/pkt_cls.h
+++ b/kernel/include/net/pkt_cls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_PKT_CLS_H
 #define __NET_PKT_CLS_H
 
diff --git a/kernel/include/net/pkt_sched.h b/kernel/include/net/pkt_sched.h
index 259bc191b..b3869f97d 100644
--- a/kernel/include/net/pkt_sched.h
+++ b/kernel/include/net/pkt_sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_PKT_SCHED_H
 #define __NET_PKT_SCHED_H
 
diff --git a/kernel/include/net/pptp.h b/kernel/include/net/pptp.h
index 92e9f1fe2..383e25ca5 100644
--- a/kernel/include/net/pptp.h
+++ b/kernel/include/net/pptp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_PPTP_H
 #define _NET_PPTP_H
 
diff --git a/kernel/include/net/psample.h b/kernel/include/net/psample.h
index 8888b0e1a..9b80f814a 100644
--- a/kernel/include/net/psample.h
+++ b/kernel/include/net/psample.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_PSAMPLE_H
 #define __NET_PSAMPLE_H
 
diff --git a/kernel/include/net/psnap.h b/kernel/include/net/psnap.h
index 78db4cc13..7cb0c8ab4 100644
--- a/kernel/include/net/psnap.h
+++ b/kernel/include/net/psnap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_PSNAP_H
 #define _NET_PSNAP_H
 
diff --git a/kernel/include/net/rawv6.h b/kernel/include/net/rawv6.h
index 4addc5c98..53d86b605 100644
--- a/kernel/include/net/rawv6.h
+++ b/kernel/include/net/rawv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_RAWV6_H
 #define _NET_RAWV6_H
 
diff --git a/kernel/include/net/red.h b/kernel/include/net/red.h
index 208e718e1..9a9347710 100644
--- a/kernel/include/net/red.h
+++ b/kernel/include/net/red.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_SCHED_RED_H
 #define __NET_SCHED_RED_H
 
diff --git a/kernel/include/net/rose.h b/kernel/include/net/rose.h
index 50811fe2c..04b72681f 100644
--- a/kernel/include/net/rose.h
+++ b/kernel/include/net/rose.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Declarations of Rose type objects.
  *
diff --git a/kernel/include/net/rtnetlink.h b/kernel/include/net/rtnetlink.h
index 21837ca68..7b938fbee 100644
--- a/kernel/include/net/rtnetlink.h
+++ b/kernel/include/net/rtnetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_RTNETLINK_H
 #define __NET_RTNETLINK_H
 
diff --git a/kernel/include/net/sch_generic.h b/kernel/include/net/sch_generic.h
index 0dec8a23b..236bfe5b2 100644
--- a/kernel/include/net/sch_generic.h
+++ b/kernel/include/net/sch_generic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_SCHED_GENERIC_H
 #define __NET_SCHED_GENERIC_H
 
diff --git a/kernel/include/net/scm.h b/kernel/include/net/scm.h
index 142ea9e7a..903771c8d 100644
--- a/kernel/include/net/scm.h
+++ b/kernel/include/net/scm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_NET_SCM_H
 #define __LINUX_NET_SCM_H
 
diff --git a/kernel/include/net/secure_seq.h b/kernel/include/net/secure_seq.h
index 031bf16d1..d7d2495f8 100644
--- a/kernel/include/net/secure_seq.h
+++ b/kernel/include/net/secure_seq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_SECURE_SEQ
 #define _NET_SECURE_SEQ
 
diff --git a/kernel/include/net/smc.h b/kernel/include/net/smc.h
index 12d26358a..8381d163f 100644
--- a/kernel/include/net/smc.h
+++ b/kernel/include/net/smc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/include/net/sock_reuseport.h b/kernel/include/net/sock_reuseport.h
index aecd30308..0054b3a9b 100644
--- a/kernel/include/net/sock_reuseport.h
+++ b/kernel/include/net/sock_reuseport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SOCK_REUSEPORT_H
 #define _SOCK_REUSEPORT_H
 
diff --git a/kernel/include/net/stp.h b/kernel/include/net/stp.h
index 3af174d70..2914e6d53 100644
--- a/kernel/include/net/stp.h
+++ b/kernel/include/net/stp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_STP_H
 #define _NET_STP_H
 
diff --git a/kernel/include/net/tc_act/tc_connmark.h b/kernel/include/net/tc_act/tc_connmark.h
index 59b515d32..1f4cb477b 100644
--- a/kernel/include/net/tc_act/tc_connmark.h
+++ b/kernel/include/net/tc_act/tc_connmark.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_CONNMARK_H
 #define __NET_TC_CONNMARK_H
 
diff --git a/kernel/include/net/tc_act/tc_csum.h b/kernel/include/net/tc_act/tc_csum.h
index 3248beaf1..781f3433a 100644
--- a/kernel/include/net/tc_act/tc_csum.h
+++ b/kernel/include/net/tc_act/tc_csum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_CSUM_H
 #define __NET_TC_CSUM_H
 
diff --git a/kernel/include/net/tc_act/tc_defact.h b/kernel/include/net/tc_act/tc_defact.h
index d47f040a3..d7ba0402a 100644
--- a/kernel/include/net/tc_act/tc_defact.h
+++ b/kernel/include/net/tc_act/tc_defact.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_DEF_H
 #define __NET_TC_DEF_H
 
diff --git a/kernel/include/net/tc_act/tc_gact.h b/kernel/include/net/tc_act/tc_gact.h
index 41afe1ce7..e82d93346 100644
--- a/kernel/include/net/tc_act/tc_gact.h
+++ b/kernel/include/net/tc_act/tc_gact.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_GACT_H
 #define __NET_TC_GACT_H
 
diff --git a/kernel/include/net/tc_act/tc_ife.h b/kernel/include/net/tc_act/tc_ife.h
index 30ba459dd..ba6667125 100644
--- a/kernel/include/net/tc_act/tc_ife.h
+++ b/kernel/include/net/tc_act/tc_ife.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_IFE_H
 #define __NET_TC_IFE_H
 
diff --git a/kernel/include/net/tc_act/tc_ipt.h b/kernel/include/net/tc_act/tc_ipt.h
index 31309766e..4225fcb1c 100644
--- a/kernel/include/net/tc_act/tc_ipt.h
+++ b/kernel/include/net/tc_act/tc_ipt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_IPT_H
 #define __NET_TC_IPT_H
 
diff --git a/kernel/include/net/tc_act/tc_mirred.h b/kernel/include/net/tc_act/tc_mirred.h
index 604bc31e2..b2dbbfaef 100644
--- a/kernel/include/net/tc_act/tc_mirred.h
+++ b/kernel/include/net/tc_act/tc_mirred.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_MIR_H
 #define __NET_TC_MIR_H
 
diff --git a/kernel/include/net/tc_act/tc_nat.h b/kernel/include/net/tc_act/tc_nat.h
index 56681a320..c14407160 100644
--- a/kernel/include/net/tc_act/tc_nat.h
+++ b/kernel/include/net/tc_act/tc_nat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_NAT_H
 #define __NET_TC_NAT_H
 
diff --git a/kernel/include/net/tc_act/tc_pedit.h b/kernel/include/net/tc_act/tc_pedit.h
index a46c3f2ac..227a6f1d0 100644
--- a/kernel/include/net/tc_act/tc_pedit.h
+++ b/kernel/include/net/tc_act/tc_pedit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_PED_H
 #define __NET_TC_PED_H
 
diff --git a/kernel/include/net/tc_act/tc_sample.h b/kernel/include/net/tc_act/tc_sample.h
index 89e9305be..524cee4f4 100644
--- a/kernel/include/net/tc_act/tc_sample.h
+++ b/kernel/include/net/tc_act/tc_sample.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_TC_SAMPLE_H
 #define __NET_TC_SAMPLE_H
 
diff --git a/kernel/include/net/tcp.h b/kernel/include/net/tcp.h
index 33599d175..e6d0002a1 100644
--- a/kernel/include/net/tcp.h
+++ b/kernel/include/net/tcp.h
@@ -1771,12 +1771,12 @@ static inline void tcp_highest_sack_reset(struct sock *sk)
 	tcp_sk(sk)->highest_sack = tcp_write_queue_head(sk);
 }
 
-/* Called when old skb is about to be deleted (to be combined with new skb) */
-static inline void tcp_highest_sack_combine(struct sock *sk,
+/* Called when old skb is about to be deleted and replaced by new skb */
+static inline void tcp_highest_sack_replace(struct sock *sk,
 					    struct sk_buff *old,
 					    struct sk_buff *new)
 {
-	if (tcp_sk(sk)->sacked_out && (old == tcp_sk(sk)->highest_sack))
+	if (old == tcp_highest_sack(sk))
 		tcp_sk(sk)->highest_sack = new;
 }
 
diff --git a/kernel/include/net/transp_v6.h b/kernel/include/net/transp_v6.h
index 276f9760a..c4f5caaf3 100644
--- a/kernel/include/net/transp_v6.h
+++ b/kernel/include/net/transp_v6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TRANSP_V6_H
 #define _TRANSP_V6_H
 
diff --git a/kernel/include/net/tso.h b/kernel/include/net/tso.h
index 9a56c39e6..7e166a570 100644
--- a/kernel/include/net/tso.h
+++ b/kernel/include/net/tso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TSO_H
 #define _TSO_H
 
diff --git a/kernel/include/net/udp_tunnel.h b/kernel/include/net/udp_tunnel.h
index 10cce0dd4..b95a6927c 100644
--- a/kernel/include/net/udp_tunnel.h
+++ b/kernel/include/net/udp_tunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_UDP_TUNNEL_H
 #define __NET_UDP_TUNNEL_H
 
diff --git a/kernel/include/net/udplite.h b/kernel/include/net/udplite.h
index b7a18f63d..81bdbf973 100644
--- a/kernel/include/net/udplite.h
+++ b/kernel/include/net/udplite.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Definitions for the UDP-Lite (RFC 3828) code.
  */
diff --git a/kernel/include/net/vxlan.h b/kernel/include/net/vxlan.h
index 4e3876dde..13223396d 100644
--- a/kernel/include/net/vxlan.h
+++ b/kernel/include/net/vxlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_VXLAN_H
 #define __NET_VXLAN_H 1
 
diff --git a/kernel/include/net/wext.h b/kernel/include/net/wext.h
index 454ff763e..e51f067fd 100644
--- a/kernel/include/net/wext.h
+++ b/kernel/include/net/wext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_WEXT_H
 #define __NET_WEXT_H
 
diff --git a/kernel/include/net/x25.h b/kernel/include/net/x25.h
index 2609b57bd..ed1acc304 100644
--- a/kernel/include/net/x25.h
+++ b/kernel/include/net/x25.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	Declarations of X.25 Packet Layer type objects.
  *
diff --git a/kernel/include/net/x25device.h b/kernel/include/net/x25device.h
index 1fa08b49f..cf749efca 100644
--- a/kernel/include/net/x25device.h
+++ b/kernel/include/net/x25device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _X25DEVICE_H
 #define _X25DEVICE_H
 
diff --git a/kernel/include/net/xfrm.h b/kernel/include/net/xfrm.h
index f002a2c5e..e015e164b 100644
--- a/kernel/include/net/xfrm.h
+++ b/kernel/include/net/xfrm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NET_XFRM_H
 #define _NET_XFRM_H
 
diff --git a/kernel/include/ras/ras_event.h b/kernel/include/ras/ras_event.h
index 429f46fb6..9c689868e 100644
--- a/kernel/include/ras/ras_event.h
+++ b/kernel/include/ras/ras_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ras
 #define TRACE_INCLUDE_FILE ras_event
diff --git a/kernel/include/rdma/rdma_netlink.h b/kernel/include/rdma/rdma_netlink.h
index 2d878596b..c369703fc 100644
--- a/kernel/include/rdma/rdma_netlink.h
+++ b/kernel/include/rdma/rdma_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDMA_NETLINK_H
 #define _RDMA_NETLINK_H
 
diff --git a/kernel/include/scsi/osd_attributes.h b/kernel/include/scsi/osd_attributes.h
index 303ba1118..8a6acd054 100644
--- a/kernel/include/scsi/osd_attributes.h
+++ b/kernel/include/scsi/osd_attributes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __OSD_ATTRIBUTES_H__
 #define __OSD_ATTRIBUTES_H__
 
diff --git a/kernel/include/scsi/scsi.h b/kernel/include/scsi/scsi.h
index a1e1930b7..cb85eddb4 100644
--- a/kernel/include/scsi/scsi.h
+++ b/kernel/include/scsi/scsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header file contains public constants and structures used by
  * the SCSI initiator code.
diff --git a/kernel/include/scsi/scsi_cmnd.h b/kernel/include/scsi/scsi_cmnd.h
index 3d3f8b342..7fb57e905 100644
--- a/kernel/include/scsi/scsi_cmnd.h
+++ b/kernel/include/scsi/scsi_cmnd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_CMND_H
 #define _SCSI_SCSI_CMND_H
 
diff --git a/kernel/include/scsi/scsi_common.h b/kernel/include/scsi/scsi_common.h
index 20bf7eaef..731ac09ed 100644
--- a/kernel/include/scsi/scsi_common.h
+++ b/kernel/include/scsi/scsi_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Functions used by both the SCSI initiator code and the SCSI target code.
  */
diff --git a/kernel/include/scsi/scsi_dbg.h b/kernel/include/scsi/scsi_dbg.h
index 56710e031..04e067976 100644
--- a/kernel/include/scsi/scsi_dbg.h
+++ b/kernel/include/scsi/scsi_dbg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_DBG_H
 #define _SCSI_SCSI_DBG_H
 
diff --git a/kernel/include/scsi/scsi_device.h b/kernel/include/scsi/scsi_device.h
index 67c5a9f22..571ddb49b 100644
--- a/kernel/include/scsi/scsi_device.h
+++ b/kernel/include/scsi/scsi_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_DEVICE_H
 #define _SCSI_SCSI_DEVICE_H
 
diff --git a/kernel/include/scsi/scsi_devinfo.h b/kernel/include/scsi/scsi_devinfo.h
index 36b03013d..3575693bb 100644
--- a/kernel/include/scsi/scsi_devinfo.h
+++ b/kernel/include/scsi/scsi_devinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_DEVINFO_H
 #define _SCSI_SCSI_DEVINFO_H
 /*
diff --git a/kernel/include/scsi/scsi_driver.h b/kernel/include/scsi/scsi_driver.h
index a5534ccad..fae8b4652 100644
--- a/kernel/include/scsi/scsi_driver.h
+++ b/kernel/include/scsi/scsi_driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_DRIVER_H
 #define _SCSI_SCSI_DRIVER_H
 
diff --git a/kernel/include/scsi/scsi_eh.h b/kernel/include/scsi/scsi_eh.h
index 64d30d80d..2b7e22796 100644
--- a/kernel/include/scsi/scsi_eh.h
+++ b/kernel/include/scsi/scsi_eh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_EH_H
 #define _SCSI_SCSI_EH_H
 
diff --git a/kernel/include/scsi/scsi_host.h b/kernel/include/scsi/scsi_host.h
index 0a804b1a4..a8b7bf879 100644
--- a/kernel/include/scsi/scsi_host.h
+++ b/kernel/include/scsi/scsi_host.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_HOST_H
 #define _SCSI_SCSI_HOST_H
 
diff --git a/kernel/include/scsi/scsi_ioctl.h b/kernel/include/scsi/scsi_ioctl.h
index 8d19d1d23..5101e987c 100644
--- a/kernel/include/scsi/scsi_ioctl.h
+++ b/kernel/include/scsi/scsi_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_IOCTL_H
 #define _SCSI_IOCTL_H 
 
diff --git a/kernel/include/scsi/scsi_proto.h b/kernel/include/scsi/scsi_proto.h
index 8c285d9a0..1c41dbcfc 100644
--- a/kernel/include/scsi/scsi_proto.h
+++ b/kernel/include/scsi/scsi_proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header file contains public constants and structures used by
  * both the SCSI initiator and the SCSI target code.
diff --git a/kernel/include/scsi/scsi_request.h b/kernel/include/scsi/scsi_request.h
index e0afa445e..b06f28c74 100644
--- a/kernel/include/scsi/scsi_request.h
+++ b/kernel/include/scsi/scsi_request.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_REQUEST_H
 #define _SCSI_SCSI_REQUEST_H
 
diff --git a/kernel/include/scsi/scsi_tcq.h b/kernel/include/scsi/scsi_tcq.h
index 5b416debf..e192a0caa 100644
--- a/kernel/include/scsi/scsi_tcq.h
+++ b/kernel/include/scsi/scsi_tcq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_SCSI_TCQ_H
 #define _SCSI_SCSI_TCQ_H
 
diff --git a/kernel/include/scsi/scsi_transport_sas.h b/kernel/include/scsi/scsi_transport_sas.h
index a23304b7f..62895b405 100644
--- a/kernel/include/scsi/scsi_transport_sas.h
+++ b/kernel/include/scsi/scsi_transport_sas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SCSI_TRANSPORT_SAS_H
 #define SCSI_TRANSPORT_SAS_H
 
diff --git a/kernel/include/scsi/scsi_transport_srp.h b/kernel/include/scsi/scsi_transport_srp.h
index 56ae198ac..d22df1258 100644
--- a/kernel/include/scsi/scsi_transport_srp.h
+++ b/kernel/include/scsi/scsi_transport_srp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SCSI_TRANSPORT_SRP_H
 #define SCSI_TRANSPORT_SRP_H
 
diff --git a/kernel/include/scsi/scsicam.h b/kernel/include/scsi/scsicam.h
index 24ede4747..57c729254 100644
--- a/kernel/include/scsi/scsicam.h
+++ b/kernel/include/scsi/scsicam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * scsicam.h - SCSI CAM support functions, use for HDIO_GETGEO, etc.
  *
diff --git a/kernel/include/scsi/sg.h b/kernel/include/scsi/sg.h
index 20bc71c3e..f91bcca60 100644
--- a/kernel/include/scsi/sg.h
+++ b/kernel/include/scsi/sg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SCSI_GENERIC_H
 #define _SCSI_GENERIC_H
 
diff --git a/kernel/include/sound/aci.h b/kernel/include/sound/aci.h
index ee639d355..6ebbd4223 100644
--- a/kernel/include/sound/aci.h
+++ b/kernel/include/sound/aci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ACI_H_
 #define _ACI_H_
 
diff --git a/kernel/include/sound/alc5623.h b/kernel/include/sound/alc5623.h
index 422c97d43..0ebb0f6fc 100644
--- a/kernel/include/sound/alc5623.h
+++ b/kernel/include/sound/alc5623.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _INCLUDE_SOUND_ALC5623_H
 #define _INCLUDE_SOUND_ALC5623_H
 struct alc5623_platform_data {
diff --git a/kernel/include/sound/hda_chmap.h b/kernel/include/sound/hda_chmap.h
index babd445c7..e508f3192 100644
--- a/kernel/include/sound/hda_chmap.h
+++ b/kernel/include/sound/hda_chmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * For multichannel support
  */
diff --git a/kernel/include/sound/hda_i915.h b/kernel/include/sound/hda_i915.h
index 5ab972e11..a94f5b6f9 100644
--- a/kernel/include/sound/hda_i915.h
+++ b/kernel/include/sound/hda_i915.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * HD-Audio helpers to sync with i915 driver
  */
diff --git a/kernel/include/sound/hda_register.h b/kernel/include/sound/hda_register.h
index 15fc6daf9..2ab39fb52 100644
--- a/kernel/include/sound/hda_register.h
+++ b/kernel/include/sound/hda_register.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * HD-audio controller (Azalia) registers and helpers
  *
diff --git a/kernel/include/sound/hda_regmap.h b/kernel/include/sound/hda_regmap.h
index ca64f0f50..5141f8ffb 100644
--- a/kernel/include/sound/hda_regmap.h
+++ b/kernel/include/sound/hda_regmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * HD-audio regmap helpers
  */
diff --git a/kernel/include/sound/hda_verbs.h b/kernel/include/sound/hda_verbs.h
index f89cd5ee1..2a8573a00 100644
--- a/kernel/include/sound/hda_verbs.h
+++ b/kernel/include/sound/hda_verbs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * HD-audio codec verbs
  */
diff --git a/kernel/include/sound/hdaudio.h b/kernel/include/sound/hdaudio.h
index 96546b30e..d8afd8a5b 100644
--- a/kernel/include/sound/hdaudio.h
+++ b/kernel/include/sound/hdaudio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * HD-audio core stuff
  */
diff --git a/kernel/include/sound/hdaudio_ext.h b/kernel/include/sound/hdaudio_ext.h
index 8660a7f10..ca00130cb 100644
--- a/kernel/include/sound/hdaudio_ext.h
+++ b/kernel/include/sound/hdaudio_ext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_HDAUDIO_EXT_H
 #define __SOUND_HDAUDIO_EXT_H
 
diff --git a/kernel/include/sound/l3.h b/kernel/include/sound/l3.h
index 1471da22a..b6f580722 100644
--- a/kernel/include/sound/l3.h
+++ b/kernel/include/sound/l3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _L3_H_
 #define _L3_H_ 1
 
diff --git a/kernel/include/sound/pcm_drm_eld.h b/kernel/include/sound/pcm_drm_eld.h
index 93357b25d..28a55a8be 100644
--- a/kernel/include/sound/pcm_drm_eld.h
+++ b/kernel/include/sound/pcm_drm_eld.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_PCM_DRM_ELD_H
 #define __SOUND_PCM_DRM_ELD_H
 
diff --git a/kernel/include/sound/pcm_iec958.h b/kernel/include/sound/pcm_iec958.h
index 36f023acb..0939aa45e 100644
--- a/kernel/include/sound/pcm_iec958.h
+++ b/kernel/include/sound/pcm_iec958.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_PCM_IEC958_H
 #define __SOUND_PCM_IEC958_H
 
diff --git a/kernel/include/sound/pxa2xx-lib.h b/kernel/include/sound/pxa2xx-lib.h
index 6ef629bde..5e710d848 100644
--- a/kernel/include/sound/pxa2xx-lib.h
+++ b/kernel/include/sound/pxa2xx-lib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PXA2XX_LIB_H
 #define PXA2XX_LIB_H
 
diff --git a/kernel/include/sound/s3c24xx_uda134x.h b/kernel/include/sound/s3c24xx_uda134x.h
index ffaf1f098..0232b80ff 100644
--- a/kernel/include/sound/s3c24xx_uda134x.h
+++ b/kernel/include/sound/s3c24xx_uda134x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _S3C24XX_UDA134X_H_
 #define _S3C24XX_UDA134X_H_ 1
 
diff --git a/kernel/include/sound/snd_wavefront.h b/kernel/include/sound/snd_wavefront.h
index cd0bab1ef..6231eb573 100644
--- a/kernel/include/sound/snd_wavefront.h
+++ b/kernel/include/sound/snd_wavefront.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_SND_WAVEFRONT_H__
 #define __SOUND_SND_WAVEFRONT_H__
 
diff --git a/kernel/include/sound/tas5086.h b/kernel/include/sound/tas5086.h
index aac481b7d..a0a1c380f 100644
--- a/kernel/include/sound/tas5086.h
+++ b/kernel/include/sound/tas5086.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SND_SOC_CODEC_TAS5086_H_
 #define _SND_SOC_CODEC_TAS5086_H_
 
diff --git a/kernel/include/target/iscsi/iscsi_target_core.h b/kernel/include/target/iscsi/iscsi_target_core.h
index fb87d32f5..cf5f3fff1 100644
--- a/kernel/include/target/iscsi/iscsi_target_core.h
+++ b/kernel/include/target/iscsi/iscsi_target_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_CORE_H
 #define ISCSI_TARGET_CORE_H
 
diff --git a/kernel/include/target/iscsi/iscsi_target_stat.h b/kernel/include/target/iscsi/iscsi_target_stat.h
index c27dd4716..b77d579e3 100644
--- a/kernel/include/target/iscsi/iscsi_target_stat.h
+++ b/kernel/include/target/iscsi/iscsi_target_stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ISCSI_TARGET_STAT_H
 #define ISCSI_TARGET_STAT_H
 
diff --git a/kernel/include/target/iscsi/iscsi_transport.h b/kernel/include/target/iscsi/iscsi_transport.h
index ff1a4f4cd..91948bc5b 100644
--- a/kernel/include/target/iscsi/iscsi_transport.h
+++ b/kernel/include/target/iscsi/iscsi_transport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "iscsi_target_core.h" /* struct iscsi_cmd */
 
 struct sockaddr_storage;
diff --git a/kernel/include/target/target_core_backend.h b/kernel/include/target/target_core_backend.h
index e150e3918..b6b3fb444 100644
--- a/kernel/include/target/target_core_backend.h
+++ b/kernel/include/target/target_core_backend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_BACKEND_H
 #define TARGET_CORE_BACKEND_H
 
diff --git a/kernel/include/target/target_core_base.h b/kernel/include/target/target_core_base.h
index 516764feb..f5db145e6 100644
--- a/kernel/include/target/target_core_base.h
+++ b/kernel/include/target/target_core_base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_BASE_H
 #define TARGET_CORE_BASE_H
 
diff --git a/kernel/include/target/target_core_fabric.h b/kernel/include/target/target_core_fabric.h
index 33d2e3e57..b297aa0d9 100644
--- a/kernel/include/target/target_core_fabric.h
+++ b/kernel/include/target/target_core_fabric.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TARGET_CORE_FABRIC_H
 #define TARGET_CORE_FABRIC_H
 
diff --git a/kernel/include/trace/define_trace.h b/kernel/include/trace/define_trace.h
index 6e3945f64..d9e3d4aa3 100644
--- a/kernel/include/trace/define_trace.h
+++ b/kernel/include/trace/define_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Trace files that want to automate creation of all tracepoints defined
  * in their file should include this file. The following are macros that the
diff --git a/kernel/include/trace/events/9p.h b/kernel/include/trace/events/9p.h
index 633ee9ee9..78c5608a1 100644
--- a/kernel/include/trace/events/9p.h
+++ b/kernel/include/trace/events/9p.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM 9p
 
diff --git a/kernel/include/trace/events/alarmtimer.h b/kernel/include/trace/events/alarmtimer.h
index ae4f358dd..13483c7ca 100644
--- a/kernel/include/trace/events/alarmtimer.h
+++ b/kernel/include/trace/events/alarmtimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM alarmtimer
 
diff --git a/kernel/include/trace/events/asoc.h b/kernel/include/trace/events/asoc.h
index 9130dd5a1..ccd1a3bdf 100644
--- a/kernel/include/trace/events/asoc.h
+++ b/kernel/include/trace/events/asoc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM asoc
 
diff --git a/kernel/include/trace/events/bcache.h b/kernel/include/trace/events/bcache.h
index daf749138..2cbd6e42a 100644
--- a/kernel/include/trace/events/bcache.h
+++ b/kernel/include/trace/events/bcache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM bcache
 
diff --git a/kernel/include/trace/events/block.h b/kernel/include/trace/events/block.h
index 1fd7ff1a4..81b43f5bd 100644
--- a/kernel/include/trace/events/block.h
+++ b/kernel/include/trace/events/block.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM block
 
diff --git a/kernel/include/trace/events/bpf.h b/kernel/include/trace/events/bpf.h
index 52c8425d1..cc749d709 100644
--- a/kernel/include/trace/events/bpf.h
+++ b/kernel/include/trace/events/bpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM bpf
 
diff --git a/kernel/include/trace/events/btrfs.h b/kernel/include/trace/events/btrfs.h
index dc1d0df91..32d0c1fe2 100644
--- a/kernel/include/trace/events/btrfs.h
+++ b/kernel/include/trace/events/btrfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM btrfs
 
diff --git a/kernel/include/trace/events/cgroup.h b/kernel/include/trace/events/cgroup.h
index c226f50e8..d74722c2a 100644
--- a/kernel/include/trace/events/cgroup.h
+++ b/kernel/include/trace/events/cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cgroup
 
diff --git a/kernel/include/trace/events/cma.h b/kernel/include/trace/events/cma.h
index d7cd96172..5017a8829 100644
--- a/kernel/include/trace/events/cma.h
+++ b/kernel/include/trace/events/cma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cma
 
diff --git a/kernel/include/trace/events/compaction.h b/kernel/include/trace/events/compaction.h
index 0a18ab648..6074eff3d 100644
--- a/kernel/include/trace/events/compaction.h
+++ b/kernel/include/trace/events/compaction.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM compaction
 
diff --git a/kernel/include/trace/events/context_tracking.h b/kernel/include/trace/events/context_tracking.h
index ce8007cf2..0aa6fd68f 100644
--- a/kernel/include/trace/events/context_tracking.h
+++ b/kernel/include/trace/events/context_tracking.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM context_tracking
 
diff --git a/kernel/include/trace/events/cpuhp.h b/kernel/include/trace/events/cpuhp.h
index 996953db9..fe1d6e8cd 100644
--- a/kernel/include/trace/events/cpuhp.h
+++ b/kernel/include/trace/events/cpuhp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cpuhp
 
diff --git a/kernel/include/trace/events/devlink.h b/kernel/include/trace/events/devlink.h
index 09f1df228..44acfbca1 100644
--- a/kernel/include/trace/events/devlink.h
+++ b/kernel/include/trace/events/devlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if IS_ENABLED(CONFIG_NET_DEVLINK)
 
 #undef TRACE_SYSTEM
diff --git a/kernel/include/trace/events/dma_fence.h b/kernel/include/trace/events/dma_fence.h
index 1157cb4c3..d61bfddcc 100644
--- a/kernel/include/trace/events/dma_fence.h
+++ b/kernel/include/trace/events/dma_fence.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM dma_fence
 
diff --git a/kernel/include/trace/events/ext4.h b/kernel/include/trace/events/ext4.h
index 9c3bc3883..4d0e3af4e 100644
--- a/kernel/include/trace/events/ext4.h
+++ b/kernel/include/trace/events/ext4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ext4
 
diff --git a/kernel/include/trace/events/f2fs.h b/kernel/include/trace/events/f2fs.h
index 5d216f7fb..7ab404914 100644
--- a/kernel/include/trace/events/f2fs.h
+++ b/kernel/include/trace/events/f2fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM f2fs
 
diff --git a/kernel/include/trace/events/fib.h b/kernel/include/trace/events/fib.h
index 833cfcb67..81b7e985b 100644
--- a/kernel/include/trace/events/fib.h
+++ b/kernel/include/trace/events/fib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fib
 
diff --git a/kernel/include/trace/events/fib6.h b/kernel/include/trace/events/fib6.h
index d60096cdd..d46e24702 100644
--- a/kernel/include/trace/events/fib6.h
+++ b/kernel/include/trace/events/fib6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fib6
 
diff --git a/kernel/include/trace/events/filelock.h b/kernel/include/trace/events/filelock.h
index 63a768034..d1faf3597 100644
--- a/kernel/include/trace/events/filelock.h
+++ b/kernel/include/trace/events/filelock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Events for filesystem locks
  *
diff --git a/kernel/include/trace/events/filemap.h b/kernel/include/trace/events/filemap.h
index ff91325b8..ee05db7ee 100644
--- a/kernel/include/trace/events/filemap.h
+++ b/kernel/include/trace/events/filemap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM filemap
 
diff --git a/kernel/include/trace/events/fs_dax.h b/kernel/include/trace/events/fs_dax.h
index fbc4a06f7..8a8df5423 100644
--- a/kernel/include/trace/events/fs_dax.h
+++ b/kernel/include/trace/events/fs_dax.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fs_dax
 
diff --git a/kernel/include/trace/events/fsi.h b/kernel/include/trace/events/fsi.h
index 697ee6678..92e5e89e5 100644
--- a/kernel/include/trace/events/fsi.h
+++ b/kernel/include/trace/events/fsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fsi
diff --git a/kernel/include/trace/events/fsi_master_gpio.h b/kernel/include/trace/events/fsi_master_gpio.h
index 11b36c119..f95cf3264 100644
--- a/kernel/include/trace/events/fsi_master_gpio.h
+++ b/kernel/include/trace/events/fsi_master_gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM fsi_master_gpio
diff --git a/kernel/include/trace/events/gpio.h b/kernel/include/trace/events/gpio.h
index 2da73b92d..5c189a22c 100644
--- a/kernel/include/trace/events/gpio.h
+++ b/kernel/include/trace/events/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM gpio
 
diff --git a/kernel/include/trace/events/hswadsp.h b/kernel/include/trace/events/hswadsp.h
index 0f78bbb02..939d7a09d 100644
--- a/kernel/include/trace/events/hswadsp.h
+++ b/kernel/include/trace/events/hswadsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM hswadsp
 
diff --git a/kernel/include/trace/events/huge_memory.h b/kernel/include/trace/events/huge_memory.h
index 04f58acda..dd4db334b 100644
--- a/kernel/include/trace/events/huge_memory.h
+++ b/kernel/include/trace/events/huge_memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM huge_memory
 
diff --git a/kernel/include/trace/events/intel-sst.h b/kernel/include/trace/events/intel-sst.h
index edc24e6de..0416e91f8 100644
--- a/kernel/include/trace/events/intel-sst.h
+++ b/kernel/include/trace/events/intel-sst.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM intel-sst
 
diff --git a/kernel/include/trace/events/intel_ish.h b/kernel/include/trace/events/intel_ish.h
index 92f7d5b23..e6d7ff55e 100644
--- a/kernel/include/trace/events/intel_ish.h
+++ b/kernel/include/trace/events/intel_ish.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM intel_ish
 
diff --git a/kernel/include/trace/events/iommu.h b/kernel/include/trace/events/iommu.h
index 99254ed89..72b458232 100644
--- a/kernel/include/trace/events/iommu.h
+++ b/kernel/include/trace/events/iommu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * iommu trace points
  *
diff --git a/kernel/include/trace/events/ipi.h b/kernel/include/trace/events/ipi.h
index 834a7362a..0be71dad6 100644
--- a/kernel/include/trace/events/ipi.h
+++ b/kernel/include/trace/events/ipi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM ipi
 
diff --git a/kernel/include/trace/events/irq.h b/kernel/include/trace/events/irq.h
index 1c41b7458..eeceafaae 100644
--- a/kernel/include/trace/events/irq.h
+++ b/kernel/include/trace/events/irq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM irq
 
diff --git a/kernel/include/trace/events/jbd2.h b/kernel/include/trace/events/jbd2.h
index c1d1f3eb2..2310b2593 100644
--- a/kernel/include/trace/events/jbd2.h
+++ b/kernel/include/trace/events/jbd2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM jbd2
 
diff --git a/kernel/include/trace/events/kmem.h b/kernel/include/trace/events/kmem.h
index 6b2e154fd..285feeada 100644
--- a/kernel/include/trace/events/kmem.h
+++ b/kernel/include/trace/events/kmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kmem
 
diff --git a/kernel/include/trace/events/kvm.h b/kernel/include/trace/events/kvm.h
index dcffedfac..e4b0b8e09 100644
--- a/kernel/include/trace/events/kvm.h
+++ b/kernel/include/trace/events/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_MAIN_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_MAIN_H
 
diff --git a/kernel/include/trace/events/libata.h b/kernel/include/trace/events/libata.h
index 2fbbf990e..ab69434e2 100644
--- a/kernel/include/trace/events/libata.h
+++ b/kernel/include/trace/events/libata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM libata
 
diff --git a/kernel/include/trace/events/lock.h b/kernel/include/trace/events/lock.h
index 2821b86de..d7512129a 100644
--- a/kernel/include/trace/events/lock.h
+++ b/kernel/include/trace/events/lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM lock
 
diff --git a/kernel/include/trace/events/mce.h b/kernel/include/trace/events/mce.h
index 70f021498..1391ada0d 100644
--- a/kernel/include/trace/events/mce.h
+++ b/kernel/include/trace/events/mce.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mce
 
diff --git a/kernel/include/trace/events/mdio.h b/kernel/include/trace/events/mdio.h
index 00d85f5f5..0f241cbe0 100644
--- a/kernel/include/trace/events/mdio.h
+++ b/kernel/include/trace/events/mdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mdio
 
diff --git a/kernel/include/trace/events/migrate.h b/kernel/include/trace/events/migrate.h
index 539b25a76..bcf4daccd 100644
--- a/kernel/include/trace/events/migrate.h
+++ b/kernel/include/trace/events/migrate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM migrate
 
diff --git a/kernel/include/trace/events/mmc.h b/kernel/include/trace/events/mmc.h
index f30a99ac6..200f731be 100644
--- a/kernel/include/trace/events/mmc.h
+++ b/kernel/include/trace/events/mmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mmc
 
diff --git a/kernel/include/trace/events/mmflags.h b/kernel/include/trace/events/mmflags.h
index fec6291a6..648cbf603 100644
--- a/kernel/include/trace/events/mmflags.h
+++ b/kernel/include/trace/events/mmflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/node.h>
 #include <linux/mmzone.h>
 #include <linux/compaction.h>
diff --git a/kernel/include/trace/events/module.h b/kernel/include/trace/events/module.h
index 28c45997e..097485c73 100644
--- a/kernel/include/trace/events/module.h
+++ b/kernel/include/trace/events/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Because linux/module.h has tracepoints in the header, and ftrace.h
  * used to include this file, define_trace.h includes linux/module.h
diff --git a/kernel/include/trace/events/napi.h b/kernel/include/trace/events/napi.h
index 0b9e5136a..f3a12566b 100644
--- a/kernel/include/trace/events/napi.h
+++ b/kernel/include/trace/events/napi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM napi
 
diff --git a/kernel/include/trace/events/net.h b/kernel/include/trace/events/net.h
index 49cc7c3de..9c8867392 100644
--- a/kernel/include/trace/events/net.h
+++ b/kernel/include/trace/events/net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM net
 
diff --git a/kernel/include/trace/events/nilfs2.h b/kernel/include/trace/events/nilfs2.h
index c7805818f..84ee31fc0 100644
--- a/kernel/include/trace/events/nilfs2.h
+++ b/kernel/include/trace/events/nilfs2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM nilfs2
 
diff --git a/kernel/include/trace/events/nmi.h b/kernel/include/trace/events/nmi.h
index da3ee96b8..18e041139 100644
--- a/kernel/include/trace/events/nmi.h
+++ b/kernel/include/trace/events/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM nmi
 
diff --git a/kernel/include/trace/events/oom.h b/kernel/include/trace/events/oom.h
index c3c19d47a..26a11e4a2 100644
--- a/kernel/include/trace/events/oom.h
+++ b/kernel/include/trace/events/oom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM oom
 
diff --git a/kernel/include/trace/events/page_isolation.h b/kernel/include/trace/events/page_isolation.h
index 8738a78e6..bf4c42e8d 100644
--- a/kernel/include/trace/events/page_isolation.h
+++ b/kernel/include/trace/events/page_isolation.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM page_isolation
 
diff --git a/kernel/include/trace/events/page_ref.h b/kernel/include/trace/events/page_ref.h
index 81001f8b0..5d2ea9395 100644
--- a/kernel/include/trace/events/page_ref.h
+++ b/kernel/include/trace/events/page_ref.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM page_ref
 
diff --git a/kernel/include/trace/events/pagemap.h b/kernel/include/trace/events/pagemap.h
index ce0803b8d..8fd1babae 100644
--- a/kernel/include/trace/events/pagemap.h
+++ b/kernel/include/trace/events/pagemap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM pagemap
 
diff --git a/kernel/include/trace/events/percpu.h b/kernel/include/trace/events/percpu.h
index ad34b1bae..df112a64f 100644
--- a/kernel/include/trace/events/percpu.h
+++ b/kernel/include/trace/events/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM percpu
 
diff --git a/kernel/include/trace/events/power.h b/kernel/include/trace/events/power.h
index 54e3aad32..908977d69 100644
--- a/kernel/include/trace/events/power.h
+++ b/kernel/include/trace/events/power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM power
 
diff --git a/kernel/include/trace/events/power_cpu_migrate.h b/kernel/include/trace/events/power_cpu_migrate.h
index f76dd4de6..e33881063 100644
--- a/kernel/include/trace/events/power_cpu_migrate.h
+++ b/kernel/include/trace/events/power_cpu_migrate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM power
 
diff --git a/kernel/include/trace/events/printk.h b/kernel/include/trace/events/printk.h
index f35017005..13d405b2f 100644
--- a/kernel/include/trace/events/printk.h
+++ b/kernel/include/trace/events/printk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM printk
 
diff --git a/kernel/include/trace/events/random.h b/kernel/include/trace/events/random.h
index 4684de344..0560dfc33 100644
--- a/kernel/include/trace/events/random.h
+++ b/kernel/include/trace/events/random.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM random
 
diff --git a/kernel/include/trace/events/rcu.h b/kernel/include/trace/events/rcu.h
index e91ae1f22..59d40c454 100644
--- a/kernel/include/trace/events/rcu.h
+++ b/kernel/include/trace/events/rcu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rcu
 
diff --git a/kernel/include/trace/events/regulator.h b/kernel/include/trace/events/regulator.h
index 37502a740..b70583c32 100644
--- a/kernel/include/trace/events/regulator.h
+++ b/kernel/include/trace/events/regulator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM regulator
 
diff --git a/kernel/include/trace/events/rpm.h b/kernel/include/trace/events/rpm.h
index 33f85b68c..26927a560 100644
--- a/kernel/include/trace/events/rpm.h
+++ b/kernel/include/trace/events/rpm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM rpm
diff --git a/kernel/include/trace/events/sched.h b/kernel/include/trace/events/sched.h
index 3c8b7f625..da10aa21b 100644
--- a/kernel/include/trace/events/sched.h
+++ b/kernel/include/trace/events/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sched
 
diff --git a/kernel/include/trace/events/scsi.h b/kernel/include/trace/events/scsi.h
index 9a9b3e255..f624969a4 100644
--- a/kernel/include/trace/events/scsi.h
+++ b/kernel/include/trace/events/scsi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM scsi
 
diff --git a/kernel/include/trace/events/signal.h b/kernel/include/trace/events/signal.h
index 39a8a430d..86582923d 100644
--- a/kernel/include/trace/events/signal.h
+++ b/kernel/include/trace/events/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM signal
 
diff --git a/kernel/include/trace/events/skb.h b/kernel/include/trace/events/skb.h
index 0c68ae22d..9e92f22eb 100644
--- a/kernel/include/trace/events/skb.h
+++ b/kernel/include/trace/events/skb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM skb
 
diff --git a/kernel/include/trace/events/sock.h b/kernel/include/trace/events/sock.h
index 779abb91d..6d31c0520 100644
--- a/kernel/include/trace/events/sock.h
+++ b/kernel/include/trace/events/sock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sock
 
diff --git a/kernel/include/trace/events/spi.h b/kernel/include/trace/events/spi.h
index f9f702b6a..277bb9d25 100644
--- a/kernel/include/trace/events/spi.h
+++ b/kernel/include/trace/events/spi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM spi
 
diff --git a/kernel/include/trace/events/spmi.h b/kernel/include/trace/events/spmi.h
index 62f005ef4..8b60efe18 100644
--- a/kernel/include/trace/events/spmi.h
+++ b/kernel/include/trace/events/spmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM spmi
 
diff --git a/kernel/include/trace/events/sunrpc.h b/kernel/include/trace/events/sunrpc.h
index 8a707f8a4..25a773951 100644
--- a/kernel/include/trace/events/sunrpc.h
+++ b/kernel/include/trace/events/sunrpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sunrpc
 
diff --git a/kernel/include/trace/events/sunvnet.h b/kernel/include/trace/events/sunvnet.h
index eb080b267..8d444f1bb 100644
--- a/kernel/include/trace/events/sunvnet.h
+++ b/kernel/include/trace/events/sunvnet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM sunvnet
 
diff --git a/kernel/include/trace/events/swiotlb.h b/kernel/include/trace/events/swiotlb.h
index 288c0c54a..705be43b7 100644
--- a/kernel/include/trace/events/swiotlb.h
+++ b/kernel/include/trace/events/swiotlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM swiotlb
 
diff --git a/kernel/include/trace/events/syscalls.h b/kernel/include/trace/events/syscalls.h
index b35533b94..44a3259ed 100644
--- a/kernel/include/trace/events/syscalls.h
+++ b/kernel/include/trace/events/syscalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM raw_syscalls
 #undef TRACE_INCLUDE_FILE
diff --git a/kernel/include/trace/events/target.h b/kernel/include/trace/events/target.h
index 50fea660c..914a872dd 100644
--- a/kernel/include/trace/events/target.h
+++ b/kernel/include/trace/events/target.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM target
 
diff --git a/kernel/include/trace/events/task.h b/kernel/include/trace/events/task.h
index 2cca6cd34..64d160930 100644
--- a/kernel/include/trace/events/task.h
+++ b/kernel/include/trace/events/task.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM task
 
diff --git a/kernel/include/trace/events/thermal.h b/kernel/include/trace/events/thermal.h
index 6cde5b351..466c09d88 100644
--- a/kernel/include/trace/events/thermal.h
+++ b/kernel/include/trace/events/thermal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM thermal
 
diff --git a/kernel/include/trace/events/thermal_power_allocator.h b/kernel/include/trace/events/thermal_power_allocator.h
index 5afae8fe3..1c8fb9554 100644
--- a/kernel/include/trace/events/thermal_power_allocator.h
+++ b/kernel/include/trace/events/thermal_power_allocator.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM thermal_power_allocator
 
diff --git a/kernel/include/trace/events/thp.h b/kernel/include/trace/events/thp.h
index b59b065e9..d7fbbe551 100644
--- a/kernel/include/trace/events/thp.h
+++ b/kernel/include/trace/events/thp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM thp
 
diff --git a/kernel/include/trace/events/timer.h b/kernel/include/trace/events/timer.h
index 80787eafb..16e305e69 100644
--- a/kernel/include/trace/events/timer.h
+++ b/kernel/include/trace/events/timer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM timer
 
diff --git a/kernel/include/trace/events/tlb.h b/kernel/include/trace/events/tlb.h
index 9d14b1992..b4d8e7dc3 100644
--- a/kernel/include/trace/events/tlb.h
+++ b/kernel/include/trace/events/tlb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM tlb
 
diff --git a/kernel/include/trace/events/udp.h b/kernel/include/trace/events/udp.h
index a664bb940..336fe2728 100644
--- a/kernel/include/trace/events/udp.h
+++ b/kernel/include/trace/events/udp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM udp
 
diff --git a/kernel/include/trace/events/v4l2.h b/kernel/include/trace/events/v4l2.h
index b3a85b3df..83860de12 100644
--- a/kernel/include/trace/events/v4l2.h
+++ b/kernel/include/trace/events/v4l2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM v4l2
 
diff --git a/kernel/include/trace/events/vb2.h b/kernel/include/trace/events/vb2.h
index c1a22416e..a40146dea 100644
--- a/kernel/include/trace/events/vb2.h
+++ b/kernel/include/trace/events/vb2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vb2
 
diff --git a/kernel/include/trace/events/vmscan.h b/kernel/include/trace/events/vmscan.h
index 27e8a5c77..dc23cf032 100644
--- a/kernel/include/trace/events/vmscan.h
+++ b/kernel/include/trace/events/vmscan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vmscan
 
diff --git a/kernel/include/trace/events/vsock_virtio_transport_common.h b/kernel/include/trace/events/vsock_virtio_transport_common.h
index b7f1d6278..678221377 100644
--- a/kernel/include/trace/events/vsock_virtio_transport_common.h
+++ b/kernel/include/trace/events/vsock_virtio_transport_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM vsock
 
diff --git a/kernel/include/trace/events/wbt.h b/kernel/include/trace/events/wbt.h
index 3c518e455..b04869407 100644
--- a/kernel/include/trace/events/wbt.h
+++ b/kernel/include/trace/events/wbt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM wbt
 
diff --git a/kernel/include/trace/events/workqueue.h b/kernel/include/trace/events/workqueue.h
index bf0e18ba6..2f057a494 100644
--- a/kernel/include/trace/events/workqueue.h
+++ b/kernel/include/trace/events/workqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM workqueue
 
diff --git a/kernel/include/trace/events/writeback.h b/kernel/include/trace/events/writeback.h
index 9b57f014d..2e1fa7910 100644
--- a/kernel/include/trace/events/writeback.h
+++ b/kernel/include/trace/events/writeback.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM writeback
 
diff --git a/kernel/include/trace/events/xdp.h b/kernel/include/trace/events/xdp.h
index 4e16c43fb..810e94160 100644
--- a/kernel/include/trace/events/xdp.h
+++ b/kernel/include/trace/events/xdp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM xdp
 
diff --git a/kernel/include/trace/events/xen.h b/kernel/include/trace/events/xen.h
index 1b4fed72f..a7c8b452a 100644
--- a/kernel/include/trace/events/xen.h
+++ b/kernel/include/trace/events/xen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM xen
 
diff --git a/kernel/include/trace/perf.h b/kernel/include/trace/perf.h
index 04fe68bbe..e4b249821 100644
--- a/kernel/include/trace/perf.h
+++ b/kernel/include/trace/perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #undef TRACE_SYSTEM_VAR
 
diff --git a/kernel/include/trace/syscall.h b/kernel/include/trace/syscall.h
index 7434f0f5d..dc8ac27d2 100644
--- a/kernel/include/trace/syscall.h
+++ b/kernel/include/trace/syscall.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TRACE_SYSCALL_H
 #define _TRACE_SYSCALL_H
 
diff --git a/kernel/include/trace/trace_events.h b/kernel/include/trace/trace_events.h
index 3976fa1f6..bfda803b0 100644
--- a/kernel/include/trace/trace_events.h
+++ b/kernel/include/trace/trace_events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Stage 1 of the trace events.
  *
diff --git a/kernel/include/uapi/asm-generic/bitsperlong.h b/kernel/include/uapi/asm-generic/bitsperlong.h
index 23e6c416b..693d9a40e 100644
--- a/kernel/include/uapi/asm-generic/bitsperlong.h
+++ b/kernel/include/uapi/asm-generic/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_GENERIC_BITS_PER_LONG
 #define _UAPI__ASM_GENERIC_BITS_PER_LONG
 
diff --git a/kernel/include/uapi/asm-generic/errno-base.h b/kernel/include/uapi/asm-generic/errno-base.h
index 651159785..9653140bf 100644
--- a/kernel/include/uapi/asm-generic/errno-base.h
+++ b/kernel/include/uapi/asm-generic/errno-base.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_GENERIC_ERRNO_BASE_H
 #define _ASM_GENERIC_ERRNO_BASE_H
 
diff --git a/kernel/include/uapi/asm-generic/errno.h b/kernel/include/uapi/asm-generic/errno.h
index 88e0914cf..cf9c51ac4 100644
--- a/kernel/include/uapi/asm-generic/errno.h
+++ b/kernel/include/uapi/asm-generic/errno.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_GENERIC_ERRNO_H
 #define _ASM_GENERIC_ERRNO_H
 
diff --git a/kernel/include/uapi/asm-generic/fcntl.h b/kernel/include/uapi/asm-generic/fcntl.h
index e063effe0..9dc0bf0c5 100644
--- a/kernel/include/uapi/asm-generic/fcntl.h
+++ b/kernel/include/uapi/asm-generic/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_GENERIC_FCNTL_H
 #define _ASM_GENERIC_FCNTL_H
 
diff --git a/kernel/include/uapi/asm-generic/int-l64.h b/kernel/include/uapi/asm-generic/int-l64.h
index 978f21cae..ed8bcd99c 100644
--- a/kernel/include/uapi/asm-generic/int-l64.h
+++ b/kernel/include/uapi/asm-generic/int-l64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * asm-generic/int-l64.h
  *
diff --git a/kernel/include/uapi/asm-generic/int-ll64.h b/kernel/include/uapi/asm-generic/int-ll64.h
index a8658b242..1ed069642 100644
--- a/kernel/include/uapi/asm-generic/int-ll64.h
+++ b/kernel/include/uapi/asm-generic/int-ll64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * asm-generic/int-ll64.h
  *
diff --git a/kernel/include/uapi/asm-generic/ioctl.h b/kernel/include/uapi/asm-generic/ioctl.h
index 749b32fe5..a84f4db8a 100644
--- a/kernel/include/uapi/asm-generic/ioctl.h
+++ b/kernel/include/uapi/asm-generic/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_GENERIC_IOCTL_H
 #define _UAPI_ASM_GENERIC_IOCTL_H
 
diff --git a/kernel/include/uapi/asm-generic/ioctls.h b/kernel/include/uapi/asm-generic/ioctls.h
index 14baf9f23..040651735 100644
--- a/kernel/include/uapi/asm-generic/ioctls.h
+++ b/kernel/include/uapi/asm-generic/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_IOCTLS_H
 #define __ASM_GENERIC_IOCTLS_H
 
diff --git a/kernel/include/uapi/asm-generic/ipcbuf.h b/kernel/include/uapi/asm-generic/ipcbuf.h
index 3dbcc1e77..7d80dbd33 100644
--- a/kernel/include/uapi/asm-generic/ipcbuf.h
+++ b/kernel/include/uapi/asm-generic/ipcbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_IPCBUF_H
 #define __ASM_GENERIC_IPCBUF_H
 
diff --git a/kernel/include/uapi/asm-generic/mman-common.h b/kernel/include/uapi/asm-generic/mman-common.h
index 203268f92..6d319c46f 100644
--- a/kernel/include/uapi/asm-generic/mman-common.h
+++ b/kernel/include/uapi/asm-generic/mman-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MMAN_COMMON_H
 #define __ASM_GENERIC_MMAN_COMMON_H
 
diff --git a/kernel/include/uapi/asm-generic/mman.h b/kernel/include/uapi/asm-generic/mman.h
index 7162cd4cc..2dffcbf70 100644
--- a/kernel/include/uapi/asm-generic/mman.h
+++ b/kernel/include/uapi/asm-generic/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MMAN_H
 #define __ASM_GENERIC_MMAN_H
 
diff --git a/kernel/include/uapi/asm-generic/msgbuf.h b/kernel/include/uapi/asm-generic/msgbuf.h
index f55ecc43c..fb306ebdb 100644
--- a/kernel/include/uapi/asm-generic/msgbuf.h
+++ b/kernel/include/uapi/asm-generic/msgbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MSGBUF_H
 #define __ASM_GENERIC_MSGBUF_H
 
diff --git a/kernel/include/uapi/asm-generic/param.h b/kernel/include/uapi/asm-generic/param.h
index 5becc8439..baad02ea7 100644
--- a/kernel/include/uapi/asm-generic/param.h
+++ b/kernel/include/uapi/asm-generic/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_GENERIC_PARAM_H
 #define _UAPI__ASM_GENERIC_PARAM_H
 
diff --git a/kernel/include/uapi/asm-generic/poll.h b/kernel/include/uapi/asm-generic/poll.h
index a96949826..fefb3d2c3 100644
--- a/kernel/include/uapi/asm-generic/poll.h
+++ b/kernel/include/uapi/asm-generic/poll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_POLL_H
 #define __ASM_GENERIC_POLL_H
 
diff --git a/kernel/include/uapi/asm-generic/posix_types.h b/kernel/include/uapi/asm-generic/posix_types.h
index fe74fccf1..5e6ea22bd 100644
--- a/kernel/include/uapi/asm-generic/posix_types.h
+++ b/kernel/include/uapi/asm-generic/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_POSIX_TYPES_H
 #define __ASM_GENERIC_POSIX_TYPES_H
 
diff --git a/kernel/include/uapi/asm-generic/resource.h b/kernel/include/uapi/asm-generic/resource.h
index c6d10af50..f12db7a0d 100644
--- a/kernel/include/uapi/asm-generic/resource.h
+++ b/kernel/include/uapi/asm-generic/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_GENERIC_RESOURCE_H
 #define _UAPI_ASM_GENERIC_RESOURCE_H
 
diff --git a/kernel/include/uapi/asm-generic/sembuf.h b/kernel/include/uapi/asm-generic/sembuf.h
index 4cb2c13e5..cbf9cfe97 100644
--- a/kernel/include/uapi/asm-generic/sembuf.h
+++ b/kernel/include/uapi/asm-generic/sembuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SEMBUF_H
 #define __ASM_GENERIC_SEMBUF_H
 
diff --git a/kernel/include/uapi/asm-generic/setup.h b/kernel/include/uapi/asm-generic/setup.h
index 6fc26a510..88ac5100d 100644
--- a/kernel/include/uapi/asm-generic/setup.h
+++ b/kernel/include/uapi/asm-generic/setup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SETUP_H
 #define __ASM_GENERIC_SETUP_H
 
diff --git a/kernel/include/uapi/asm-generic/shmbuf.h b/kernel/include/uapi/asm-generic/shmbuf.h
index 7e9fb2f08..2b6c3bb97 100644
--- a/kernel/include/uapi/asm-generic/shmbuf.h
+++ b/kernel/include/uapi/asm-generic/shmbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SHMBUF_H
 #define __ASM_GENERIC_SHMBUF_H
 
diff --git a/kernel/include/uapi/asm-generic/shmparam.h b/kernel/include/uapi/asm-generic/shmparam.h
index 51a3852de..8b78c0ba0 100644
--- a/kernel/include/uapi/asm-generic/shmparam.h
+++ b/kernel/include/uapi/asm-generic/shmparam.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SHMPARAM_H
 #define __ASM_GENERIC_SHMPARAM_H
 
diff --git a/kernel/include/uapi/asm-generic/siginfo.h b/kernel/include/uapi/asm-generic/siginfo.h
index e5aa6794c..e447283b8 100644
--- a/kernel/include/uapi/asm-generic/siginfo.h
+++ b/kernel/include/uapi/asm-generic/siginfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_GENERIC_SIGINFO_H
 #define _UAPI_ASM_GENERIC_SIGINFO_H
 
diff --git a/kernel/include/uapi/asm-generic/signal-defs.h b/kernel/include/uapi/asm-generic/signal-defs.h
index 00f95df54..e9304c95c 100644
--- a/kernel/include/uapi/asm-generic/signal-defs.h
+++ b/kernel/include/uapi/asm-generic/signal-defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SIGNAL_DEFS_H
 #define __ASM_GENERIC_SIGNAL_DEFS_H
 
diff --git a/kernel/include/uapi/asm-generic/signal.h b/kernel/include/uapi/asm-generic/signal.h
index 3094618d3..5c716a952 100644
--- a/kernel/include/uapi/asm-generic/signal.h
+++ b/kernel/include/uapi/asm-generic/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__ASM_GENERIC_SIGNAL_H
 #define _UAPI__ASM_GENERIC_SIGNAL_H
 
diff --git a/kernel/include/uapi/asm-generic/socket.h b/kernel/include/uapi/asm-generic/socket.h
index e47c9e436..0ae758c90 100644
--- a/kernel/include/uapi/asm-generic/socket.h
+++ b/kernel/include/uapi/asm-generic/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SOCKET_H
 #define __ASM_GENERIC_SOCKET_H
 
diff --git a/kernel/include/uapi/asm-generic/sockios.h b/kernel/include/uapi/asm-generic/sockios.h
index 9a61a369b..64f658c7c 100644
--- a/kernel/include/uapi/asm-generic/sockios.h
+++ b/kernel/include/uapi/asm-generic/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_SOCKIOS_H
 #define __ASM_GENERIC_SOCKIOS_H
 
diff --git a/kernel/include/uapi/asm-generic/stat.h b/kernel/include/uapi/asm-generic/stat.h
index bd8cad219..0d962ecd1 100644
--- a/kernel/include/uapi/asm-generic/stat.h
+++ b/kernel/include/uapi/asm-generic/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_STAT_H
 #define __ASM_GENERIC_STAT_H
 
diff --git a/kernel/include/uapi/asm-generic/statfs.h b/kernel/include/uapi/asm-generic/statfs.h
index cb89cc730..bd35c7619 100644
--- a/kernel/include/uapi/asm-generic/statfs.h
+++ b/kernel/include/uapi/asm-generic/statfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_GENERIC_STATFS_H
 #define _UAPI_GENERIC_STATFS_H
 
diff --git a/kernel/include/uapi/asm-generic/swab.h b/kernel/include/uapi/asm-generic/swab.h
index a8e9029d9..f2da4e4fd 100644
--- a/kernel/include/uapi/asm-generic/swab.h
+++ b/kernel/include/uapi/asm-generic/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_GENERIC_SWAB_H
 #define _ASM_GENERIC_SWAB_H
 
diff --git a/kernel/include/uapi/asm-generic/termbits.h b/kernel/include/uapi/asm-generic/termbits.h
index 232b4781a..2fbaf9ae8 100644
--- a/kernel/include/uapi/asm-generic/termbits.h
+++ b/kernel/include/uapi/asm-generic/termbits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_TERMBITS_H
 #define __ASM_GENERIC_TERMBITS_H
 
diff --git a/kernel/include/uapi/asm-generic/termios.h b/kernel/include/uapi/asm-generic/termios.h
index 088176062..cf892933a 100644
--- a/kernel/include/uapi/asm-generic/termios.h
+++ b/kernel/include/uapi/asm-generic/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_GENERIC_TERMIOS_H
 #define _UAPI_ASM_GENERIC_TERMIOS_H
 /*
diff --git a/kernel/include/uapi/asm-generic/types.h b/kernel/include/uapi/asm-generic/types.h
index a3877926b..dfaa50d99 100644
--- a/kernel/include/uapi/asm-generic/types.h
+++ b/kernel/include/uapi/asm-generic/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_GENERIC_TYPES_H
 #define _ASM_GENERIC_TYPES_H
 /*
diff --git a/kernel/include/uapi/asm-generic/ucontext.h b/kernel/include/uapi/asm-generic/ucontext.h
index ad77343e8..351868a72 100644
--- a/kernel/include/uapi/asm-generic/ucontext.h
+++ b/kernel/include/uapi/asm-generic/ucontext.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_UCONTEXT_H
 #define __ASM_GENERIC_UCONTEXT_H
 
diff --git a/kernel/include/uapi/asm-generic/unistd.h b/kernel/include/uapi/asm-generic/unistd.h
index 061185a5e..8b87de067 100644
--- a/kernel/include/uapi/asm-generic/unistd.h
+++ b/kernel/include/uapi/asm-generic/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm/bitsperlong.h>
 
 /*
diff --git a/kernel/include/uapi/drm/armada_drm.h b/kernel/include/uapi/drm/armada_drm.h
index 0cb932416..af1c14c83 100644
--- a/kernel/include/uapi/drm/armada_drm.h
+++ b/kernel/include/uapi/drm/armada_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 Russell King
  *  With inspiration from the i915 driver
diff --git a/kernel/include/uapi/drm/etnaviv_drm.h b/kernel/include/uapi/drm/etnaviv_drm.h
index 76f6f78a3..d4463f3fa 100644
--- a/kernel/include/uapi/drm/etnaviv_drm.h
+++ b/kernel/include/uapi/drm/etnaviv_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2015 Etnaviv Project
  *
diff --git a/kernel/include/uapi/drm/exynos_drm.h b/kernel/include/uapi/drm/exynos_drm.h
index cb3e9f9d0..d01087b2a 100644
--- a/kernel/include/uapi/drm/exynos_drm.h
+++ b/kernel/include/uapi/drm/exynos_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* exynos_drm.h
  *
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
diff --git a/kernel/include/uapi/drm/i810_drm.h b/kernel/include/uapi/drm/i810_drm.h
index 6e6cf86b7..d285d5e72 100644
--- a/kernel/include/uapi/drm/i810_drm.h
+++ b/kernel/include/uapi/drm/i810_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _I810_DRM_H_
 #define _I810_DRM_H_
 
diff --git a/kernel/include/uapi/drm/omap_drm.h b/kernel/include/uapi/drm/omap_drm.h
index fd5e3ea53..1fccffef9 100644
--- a/kernel/include/uapi/drm/omap_drm.h
+++ b/kernel/include/uapi/drm/omap_drm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/uapi/drm/omap_drm.h
  *
diff --git a/kernel/include/uapi/linux/a.out.h b/kernel/include/uapi/linux/a.out.h
index 295cd3ef6..5fafde379 100644
--- a/kernel/include/uapi/linux/a.out.h
+++ b/kernel/include/uapi/linux/a.out.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__A_OUT_GNU_H__
 #define _UAPI__A_OUT_GNU_H__
 
diff --git a/kernel/include/uapi/linux/acct.h b/kernel/include/uapi/linux/acct.h
index df2f9a0bb..0e72172cd 100644
--- a/kernel/include/uapi/linux/acct.h
+++ b/kernel/include/uapi/linux/acct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  BSD Process Accounting for Linux - Definitions
  *
diff --git a/kernel/include/uapi/linux/adb.h b/kernel/include/uapi/linux/adb.h
index 0ea1075fc..12b6db148 100644
--- a/kernel/include/uapi/linux/adb.h
+++ b/kernel/include/uapi/linux/adb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for ADB (Apple Desktop Bus) support.
  */
diff --git a/kernel/include/uapi/linux/adfs_fs.h b/kernel/include/uapi/linux/adfs_fs.h
index a1bf43754..151d93e27 100644
--- a/kernel/include/uapi/linux/adfs_fs.h
+++ b/kernel/include/uapi/linux/adfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ADFS_FS_H
 #define _UAPI_ADFS_FS_H
 
diff --git a/kernel/include/uapi/linux/affs_hardblocks.h b/kernel/include/uapi/linux/affs_hardblocks.h
index f1b948c1f..5e2fb8481 100644
--- a/kernel/include/uapi/linux/affs_hardblocks.h
+++ b/kernel/include/uapi/linux/affs_hardblocks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef	AFFS_HARDBLOCKS_H
 #define	AFFS_HARDBLOCKS_H
 
diff --git a/kernel/include/uapi/linux/am437x-vpfe.h b/kernel/include/uapi/linux/am437x-vpfe.h
index d75774317..beae3521c 100644
--- a/kernel/include/uapi/linux/am437x-vpfe.h
+++ b/kernel/include/uapi/linux/am437x-vpfe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2013 - 2014 Texas Instruments, Inc.
  *
diff --git a/kernel/include/uapi/linux/android/binder.h b/kernel/include/uapi/linux/android/binder.h
index 84a9a0944..bfaec6903 100644
--- a/kernel/include/uapi/linux/android/binder.h
+++ b/kernel/include/uapi/linux/android/binder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2008 Google, Inc.
  *
diff --git a/kernel/include/uapi/linux/apm_bios.h b/kernel/include/uapi/linux/apm_bios.h
index df79bca1b..37ee11dba 100644
--- a/kernel/include/uapi/linux/apm_bios.h
+++ b/kernel/include/uapi/linux/apm_bios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Include file for the interface to an APM BIOS
  * Copyright 1994-2001 Stephen Rothwell (sfr@canb.auug.org.au)
diff --git a/kernel/include/uapi/linux/arcfb.h b/kernel/include/uapi/linux/arcfb.h
index 721e7654d..7a9008b36 100644
--- a/kernel/include/uapi/linux/arcfb.h
+++ b/kernel/include/uapi/linux/arcfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_ARCFB_H__
 #define __LINUX_ARCFB_H__
 
diff --git a/kernel/include/uapi/linux/aspeed-lpc-ctrl.h b/kernel/include/uapi/linux/aspeed-lpc-ctrl.h
index c328c976c..53abffcde 100644
--- a/kernel/include/uapi/linux/aspeed-lpc-ctrl.h
+++ b/kernel/include/uapi/linux/aspeed-lpc-ctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2017 IBM Corp.
  *
diff --git a/kernel/include/uapi/linux/atalk.h b/kernel/include/uapi/linux/atalk.h
index 4bcd596e6..8b96460b4 100644
--- a/kernel/include/uapi/linux/atalk.h
+++ b/kernel/include/uapi/linux/atalk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_ATALK_H__
 #define _UAPI__LINUX_ATALK_H__
 
diff --git a/kernel/include/uapi/linux/atm.h b/kernel/include/uapi/linux/atm.h
index 88399db60..95ebdcf4f 100644
--- a/kernel/include/uapi/linux/atm.h
+++ b/kernel/include/uapi/linux/atm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atm.h - general ATM declarations */
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/atm_eni.h b/kernel/include/uapi/linux/atm_eni.h
index 34f317972..cf5bfd1a2 100644
--- a/kernel/include/uapi/linux/atm_eni.h
+++ b/kernel/include/uapi/linux/atm_eni.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atm_eni.h - Driver-specific declarations of the ENI driver (for use by
 	       driver-specific utilities) */
 
diff --git a/kernel/include/uapi/linux/atm_he.h b/kernel/include/uapi/linux/atm_he.h
index 2a7713b59..9f4b43293 100644
--- a/kernel/include/uapi/linux/atm_he.h
+++ b/kernel/include/uapi/linux/atm_he.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atm_he.h */
 
 #ifndef LINUX_ATM_HE_H
diff --git a/kernel/include/uapi/linux/atm_idt77105.h b/kernel/include/uapi/linux/atm_idt77105.h
index 8b724000a..f0fd6912a 100644
--- a/kernel/include/uapi/linux/atm_idt77105.h
+++ b/kernel/include/uapi/linux/atm_idt77105.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atm_idt77105.h - Driver-specific declarations of the IDT77105 driver (for
  * use by driver-specific utilities) */
 
diff --git a/kernel/include/uapi/linux/atm_nicstar.h b/kernel/include/uapi/linux/atm_nicstar.h
index 577b79f33..880d368b5 100644
--- a/kernel/include/uapi/linux/atm_nicstar.h
+++ b/kernel/include/uapi/linux/atm_nicstar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /******************************************************************************
  *
  * atm_nicstar.h
diff --git a/kernel/include/uapi/linux/atm_tcp.h b/kernel/include/uapi/linux/atm_tcp.h
index 914e821da..7309e1bc8 100644
--- a/kernel/include/uapi/linux/atm_tcp.h
+++ b/kernel/include/uapi/linux/atm_tcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atm_tcp.h - Driver-specific declarations of the ATMTCP driver (for use by
 	       driver-specific utilities) */
 
diff --git a/kernel/include/uapi/linux/atm_zatm.h b/kernel/include/uapi/linux/atm_zatm.h
index 9c9c6ad55..5135027b9 100644
--- a/kernel/include/uapi/linux/atm_zatm.h
+++ b/kernel/include/uapi/linux/atm_zatm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atm_zatm.h - Driver-specific declarations of the ZATM driver (for use by
 		driver-specific utilities) */
 
diff --git a/kernel/include/uapi/linux/atmapi.h b/kernel/include/uapi/linux/atmapi.h
index 8fe54d90d..c9bf5c23a 100644
--- a/kernel/include/uapi/linux/atmapi.h
+++ b/kernel/include/uapi/linux/atmapi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmapi.h - ATM API user space/kernel compatibility */
  
 /* Written 1999,2000 by Werner Almesberger, EPFL ICA */
diff --git a/kernel/include/uapi/linux/atmarp.h b/kernel/include/uapi/linux/atmarp.h
index 231f4bdec..8e44d121f 100644
--- a/kernel/include/uapi/linux/atmarp.h
+++ b/kernel/include/uapi/linux/atmarp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */
  
 /* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/atmbr2684.h b/kernel/include/uapi/linux/atmbr2684.h
index fdb2629b6..a9e2250cd 100644
--- a/kernel/include/uapi/linux/atmbr2684.h
+++ b/kernel/include/uapi/linux/atmbr2684.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_ATMBR2684_H
 #define _LINUX_ATMBR2684_H
 
diff --git a/kernel/include/uapi/linux/atmclip.h b/kernel/include/uapi/linux/atmclip.h
index 02c94c448..c818bb82b 100644
--- a/kernel/include/uapi/linux/atmclip.h
+++ b/kernel/include/uapi/linux/atmclip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmclip.h - Classical IP over ATM */
  
 /* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/atmdev.h b/kernel/include/uapi/linux/atmdev.h
index 93e0ec008..a5c15cf23 100644
--- a/kernel/include/uapi/linux/atmdev.h
+++ b/kernel/include/uapi/linux/atmdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmdev.h - ATM device driver declarations and various related items */
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/atmioc.h b/kernel/include/uapi/linux/atmioc.h
index 37f67aa8f..cd7655e40 100644
--- a/kernel/include/uapi/linux/atmioc.h
+++ b/kernel/include/uapi/linux/atmioc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmioc.h - ranges for ATM-related ioctl numbers */
  
 /* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/atmlec.h b/kernel/include/uapi/linux/atmlec.h
index 302791e3a..c68346bb4 100644
--- a/kernel/include/uapi/linux/atmlec.h
+++ b/kernel/include/uapi/linux/atmlec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ATM Lan Emulation Daemon driver interface
  *
diff --git a/kernel/include/uapi/linux/atmmpc.h b/kernel/include/uapi/linux/atmmpc.h
index 2aba5787f..cc17f4304 100644
--- a/kernel/include/uapi/linux/atmmpc.h
+++ b/kernel/include/uapi/linux/atmmpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ATMMPC_H_
 #define _ATMMPC_H_
 
diff --git a/kernel/include/uapi/linux/atmppp.h b/kernel/include/uapi/linux/atmppp.h
index 300dcce0c..504b99896 100644
--- a/kernel/include/uapi/linux/atmppp.h
+++ b/kernel/include/uapi/linux/atmppp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmppp.h - RFC2364 PPPoATM */
 
 /* Written 2000 by Mitchell Blank Jr */
diff --git a/kernel/include/uapi/linux/atmsap.h b/kernel/include/uapi/linux/atmsap.h
index 799b10451..fc052481e 100644
--- a/kernel/include/uapi/linux/atmsap.h
+++ b/kernel/include/uapi/linux/atmsap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmsap.h - ATM Service Access Point addressing definitions */
 
 /* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/atmsvc.h b/kernel/include/uapi/linux/atmsvc.h
index aa71583b8..137b5f853 100644
--- a/kernel/include/uapi/linux/atmsvc.h
+++ b/kernel/include/uapi/linux/atmsvc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* atmsvc.h - ATM signaling kernel-demon interface definitions */
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/audit.h b/kernel/include/uapi/linux/audit.h
index 0714a66f0..7668582db 100644
--- a/kernel/include/uapi/linux/audit.h
+++ b/kernel/include/uapi/linux/audit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* audit.h -- Auditing support
  *
  * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
diff --git a/kernel/include/uapi/linux/auto_dev-ioctl.h b/kernel/include/uapi/linux/auto_dev-ioctl.h
index 5558db8e6..374742651 100644
--- a/kernel/include/uapi/linux/auto_dev-ioctl.h
+++ b/kernel/include/uapi/linux/auto_dev-ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2008 Red Hat, Inc. All rights reserved.
  * Copyright 2008 Ian Kent <raven@themaw.net>
diff --git a/kernel/include/uapi/linux/auto_fs.h b/kernel/include/uapi/linux/auto_fs.h
index aa63451ef..2a4432c7a 100644
--- a/kernel/include/uapi/linux/auto_fs.h
+++ b/kernel/include/uapi/linux/auto_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *   Copyright 1997 Transmeta Corporation - All Rights Reserved
  *
diff --git a/kernel/include/uapi/linux/auto_fs4.h b/kernel/include/uapi/linux/auto_fs4.h
index 9453e9a07..1f608e27a 100644
--- a/kernel/include/uapi/linux/auto_fs4.h
+++ b/kernel/include/uapi/linux/auto_fs4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org>
  *
diff --git a/kernel/include/uapi/linux/auxvec.h b/kernel/include/uapi/linux/auxvec.h
index 835c065cc..abe5f2b65 100644
--- a/kernel/include/uapi/linux/auxvec.h
+++ b/kernel/include/uapi/linux/auxvec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_AUXVEC_H
 #define _UAPI_LINUX_AUXVEC_H
 
diff --git a/kernel/include/uapi/linux/ax25.h b/kernel/include/uapi/linux/ax25.h
index 74c89a417..b496b9d84 100644
--- a/kernel/include/uapi/linux/ax25.h
+++ b/kernel/include/uapi/linux/ax25.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * These are the public elements of the Linux kernel AX.25 code. A similar
  * file netrom.h exists for the NET/ROM protocol.
diff --git a/kernel/include/uapi/linux/b1lli.h b/kernel/include/uapi/linux/b1lli.h
index 713f71268..4ae6ac995 100644
--- a/kernel/include/uapi/linux/b1lli.h
+++ b/kernel/include/uapi/linux/b1lli.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: b1lli.h,v 1.8.8.3 2001/09/23 22:25:05 kai Exp $
  *
  * ISDN lowlevel-module for AVM B1-card.
diff --git a/kernel/include/uapi/linux/baycom.h b/kernel/include/uapi/linux/baycom.h
index 81249e029..478cb565a 100644
--- a/kernel/include/uapi/linux/baycom.h
+++ b/kernel/include/uapi/linux/baycom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * The Linux BAYCOM driver for the Baycom serial 1200 baud modem
  * and the parallel 9600 baud modem
diff --git a/kernel/include/uapi/linux/bcache.h b/kernel/include/uapi/linux/bcache.h
index e3bb0635e..90fc490f9 100644
--- a/kernel/include/uapi/linux/bcache.h
+++ b/kernel/include/uapi/linux/bcache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_BCACHE_H
 #define _LINUX_BCACHE_H
 
diff --git a/kernel/include/uapi/linux/bcm933xx_hcs.h b/kernel/include/uapi/linux/bcm933xx_hcs.h
index d22821831..f9fccf3c3 100644
--- a/kernel/include/uapi/linux/bcm933xx_hcs.h
+++ b/kernel/include/uapi/linux/bcm933xx_hcs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Broadcom Cable Modem firmware format
  */
diff --git a/kernel/include/uapi/linux/bfs_fs.h b/kernel/include/uapi/linux/bfs_fs.h
index 1c0b355aa..73445ef07 100644
--- a/kernel/include/uapi/linux/bfs_fs.h
+++ b/kernel/include/uapi/linux/bfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	include/linux/bfs_fs.h - BFS data structures on disk.
  *	Copyright (C) 1999 Tigran Aivazian <tigran@veritas.com>
diff --git a/kernel/include/uapi/linux/binfmts.h b/kernel/include/uapi/linux/binfmts.h
index 4eb597286..4abad03a8 100644
--- a/kernel/include/uapi/linux/binfmts.h
+++ b/kernel/include/uapi/linux/binfmts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_BINFMTS_H
 #define _UAPI_LINUX_BINFMTS_H
 
diff --git a/kernel/include/uapi/linux/blkpg.h b/kernel/include/uapi/linux/blkpg.h
index 63739a035..ac6474e4f 100644
--- a/kernel/include/uapi/linux/blkpg.h
+++ b/kernel/include/uapi/linux/blkpg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_BLKPG_H
 #define _UAPI__LINUX_BLKPG_H
 
diff --git a/kernel/include/uapi/linux/blktrace_api.h b/kernel/include/uapi/linux/blktrace_api.h
index 9cdaedead..20d1490d6 100644
--- a/kernel/include/uapi/linux/blktrace_api.h
+++ b/kernel/include/uapi/linux/blktrace_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPIBLKTRACE_H
 #define _UAPIBLKTRACE_H
 
diff --git a/kernel/include/uapi/linux/blkzoned.h b/kernel/include/uapi/linux/blkzoned.h
index 40d1d7bff..e3c70fe6b 100644
--- a/kernel/include/uapi/linux/blkzoned.h
+++ b/kernel/include/uapi/linux/blkzoned.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Zoned block devices handling.
  *
diff --git a/kernel/include/uapi/linux/bpf.h b/kernel/include/uapi/linux/bpf.h
index 0d7948ce2..30f2ce76b 100644
--- a/kernel/include/uapi/linux/bpf.h
+++ b/kernel/include/uapi/linux/bpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
  *
  * This program is free software; you can redistribute it and/or
@@ -788,7 +789,6 @@ struct xdp_md {
 enum sk_action {
 	SK_DROP = 0,
 	SK_PASS,
-	SK_REDIRECT,
 };
 
 #define BPF_TAG_SIZE	8
diff --git a/kernel/include/uapi/linux/bpf_common.h b/kernel/include/uapi/linux/bpf_common.h
index a5c220e08..18be90725 100644
--- a/kernel/include/uapi/linux/bpf_common.h
+++ b/kernel/include/uapi/linux/bpf_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_BPF_COMMON_H__
 #define _UAPI__LINUX_BPF_COMMON_H__
 
diff --git a/kernel/include/uapi/linux/bpf_perf_event.h b/kernel/include/uapi/linux/bpf_perf_event.h
index 067427259..af549d4ec 100644
--- a/kernel/include/uapi/linux/bpf_perf_event.h
+++ b/kernel/include/uapi/linux/bpf_perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (c) 2016 Facebook
  *
  * This program is free software; you can redistribute it and/or
diff --git a/kernel/include/uapi/linux/bpqether.h b/kernel/include/uapi/linux/bpqether.h
index 05865edae..d1d63e2ac 100644
--- a/kernel/include/uapi/linux/bpqether.h
+++ b/kernel/include/uapi/linux/bpqether.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef	__BPQETHER_H
 #define	__BPQETHER_H
 
diff --git a/kernel/include/uapi/linux/bsg.h b/kernel/include/uapi/linux/bsg.h
index 02986cf8b..cd6302def 100644
--- a/kernel/include/uapi/linux/bsg.h
+++ b/kernel/include/uapi/linux/bsg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPIBSG_H
 #define _UAPIBSG_H
 
diff --git a/kernel/include/uapi/linux/bt-bmc.h b/kernel/include/uapi/linux/bt-bmc.h
index d9ec766a6..2ffdccfcc 100644
--- a/kernel/include/uapi/linux/bt-bmc.h
+++ b/kernel/include/uapi/linux/bt-bmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2015-2016, IBM Corporation.
  *
diff --git a/kernel/include/uapi/linux/btrfs.h b/kernel/include/uapi/linux/btrfs.h
index 378230c16..6cdfd12cd 100644
--- a/kernel/include/uapi/linux/btrfs.h
+++ b/kernel/include/uapi/linux/btrfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2007 Oracle.  All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/btrfs_tree.h b/kernel/include/uapi/linux/btrfs_tree.h
index 10689e1fd..8f659bb7b 100644
--- a/kernel/include/uapi/linux/btrfs_tree.h
+++ b/kernel/include/uapi/linux/btrfs_tree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _BTRFS_CTREE_H_
 #define _BTRFS_CTREE_H_
 
diff --git a/kernel/include/uapi/linux/byteorder/big_endian.h b/kernel/include/uapi/linux/byteorder/big_endian.h
index cdab17ab9..2199adc6a 100644
--- a/kernel/include/uapi/linux/byteorder/big_endian.h
+++ b/kernel/include/uapi/linux/byteorder/big_endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H
 #define _UAPI_LINUX_BYTEORDER_BIG_ENDIAN_H
 
diff --git a/kernel/include/uapi/linux/byteorder/little_endian.h b/kernel/include/uapi/linux/byteorder/little_endian.h
index 4b93f2b26..601c904fd 100644
--- a/kernel/include/uapi/linux/byteorder/little_endian.h
+++ b/kernel/include/uapi/linux/byteorder/little_endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H
 #define _UAPI_LINUX_BYTEORDER_LITTLE_ENDIAN_H
 
diff --git a/kernel/include/uapi/linux/caif/caif_socket.h b/kernel/include/uapi/linux/caif/caif_socket.h
index 586e9f981..10ec1d1cf 100644
--- a/kernel/include/uapi/linux/caif/caif_socket.h
+++ b/kernel/include/uapi/linux/caif/caif_socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* linux/caif_socket.h
  * CAIF Definitions for CAIF socket and network layer
  * Copyright (C) ST-Ericsson AB 2010
diff --git a/kernel/include/uapi/linux/caif/if_caif.h b/kernel/include/uapi/linux/caif/if_caif.h
index 7618aabe8..74bca1940 100644
--- a/kernel/include/uapi/linux/caif/if_caif.h
+++ b/kernel/include/uapi/linux/caif/if_caif.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) ST-Ericsson AB 2010
  * Author:	Sjur Brendeland
diff --git a/kernel/include/uapi/linux/can.h b/kernel/include/uapi/linux/can.h
index c48d93a28..d7f97ac19 100644
--- a/kernel/include/uapi/linux/can.h
+++ b/kernel/include/uapi/linux/can.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * linux/can.h
  *
diff --git a/kernel/include/uapi/linux/can/bcm.h b/kernel/include/uapi/linux/can/bcm.h
index cefb30441..0fb328d93 100644
--- a/kernel/include/uapi/linux/can/bcm.h
+++ b/kernel/include/uapi/linux/can/bcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * linux/can/bcm.h
  *
diff --git a/kernel/include/uapi/linux/can/error.h b/kernel/include/uapi/linux/can/error.h
index 1c508be96..bfc4b5d22 100644
--- a/kernel/include/uapi/linux/can/error.h
+++ b/kernel/include/uapi/linux/can/error.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * linux/can/error.h
  *
diff --git a/kernel/include/uapi/linux/can/gw.h b/kernel/include/uapi/linux/can/gw.h
index 5079b9d57..7bee7a0b9 100644
--- a/kernel/include/uapi/linux/can/gw.h
+++ b/kernel/include/uapi/linux/can/gw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * linux/can/gw.h
  *
diff --git a/kernel/include/uapi/linux/can/netlink.h b/kernel/include/uapi/linux/can/netlink.h
index fdf75f74f..96710e76d 100644
--- a/kernel/include/uapi/linux/can/netlink.h
+++ b/kernel/include/uapi/linux/can/netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/can/netlink.h
  *
diff --git a/kernel/include/uapi/linux/can/raw.h b/kernel/include/uapi/linux/can/raw.h
index 8735f1080..be3b36e7f 100644
--- a/kernel/include/uapi/linux/can/raw.h
+++ b/kernel/include/uapi/linux/can/raw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * linux/can/raw.h
  *
diff --git a/kernel/include/uapi/linux/can/vxcan.h b/kernel/include/uapi/linux/can/vxcan.h
index ffb0b7156..066812d11 100644
--- a/kernel/include/uapi/linux/can/vxcan.h
+++ b/kernel/include/uapi/linux/can/vxcan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_CAN_VXCAN_H
 #define _UAPI_CAN_VXCAN_H
 
diff --git a/kernel/include/uapi/linux/capability.h b/kernel/include/uapi/linux/capability.h
index 230e05d35..240fdb9a6 100644
--- a/kernel/include/uapi/linux/capability.h
+++ b/kernel/include/uapi/linux/capability.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This is <linux/capability.h>
  *
diff --git a/kernel/include/uapi/linux/capi.h b/kernel/include/uapi/linux/capi.h
index 7b145fd7a..31f946f8a 100644
--- a/kernel/include/uapi/linux/capi.h
+++ b/kernel/include/uapi/linux/capi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: capi.h,v 1.4.6.1 2001/09/23 22:25:05 kai Exp $
  * 
  * CAPI 2.0 Interface for Linux
diff --git a/kernel/include/uapi/linux/cciss_defs.h b/kernel/include/uapi/linux/cciss_defs.h
index 316b670d4..5cbdfe993 100644
--- a/kernel/include/uapi/linux/cciss_defs.h
+++ b/kernel/include/uapi/linux/cciss_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef CCISS_DEFS_H
 #define CCISS_DEFS_H
 
diff --git a/kernel/include/uapi/linux/cciss_ioctl.h b/kernel/include/uapi/linux/cciss_ioctl.h
index bb0b9ddf7..562230199 100644
--- a/kernel/include/uapi/linux/cciss_ioctl.h
+++ b/kernel/include/uapi/linux/cciss_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPICCISS_IOCTLH
 #define _UAPICCISS_IOCTLH
 
diff --git a/kernel/include/uapi/linux/cdrom.h b/kernel/include/uapi/linux/cdrom.h
index bd17ad5aa..281723014 100644
--- a/kernel/include/uapi/linux/cdrom.h
+++ b/kernel/include/uapi/linux/cdrom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * -- <linux/cdrom.h>
  * General header file for linux CD-ROM drivers 
diff --git a/kernel/include/uapi/linux/cec-funcs.h b/kernel/include/uapi/linux/cec-funcs.h
index 270b251a3..28e8a2a86 100644
--- a/kernel/include/uapi/linux/cec-funcs.h
+++ b/kernel/include/uapi/linux/cec-funcs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * cec - HDMI Consumer Electronics Control message functions
  *
diff --git a/kernel/include/uapi/linux/cec.h b/kernel/include/uapi/linux/cec.h
index 4351c3481..c3114c989 100644
--- a/kernel/include/uapi/linux/cec.h
+++ b/kernel/include/uapi/linux/cec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * cec - HDMI Consumer Electronics Control public header
  *
diff --git a/kernel/include/uapi/linux/cgroupstats.h b/kernel/include/uapi/linux/cgroupstats.h
index 3753c3316..aa306e4cd 100644
--- a/kernel/include/uapi/linux/cgroupstats.h
+++ b/kernel/include/uapi/linux/cgroupstats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */
 /* cgroupstats.h - exporting per-cgroup statistics
  *
  * Copyright IBM Corporation, 2007
diff --git a/kernel/include/uapi/linux/chio.h b/kernel/include/uapi/linux/chio.h
index d9bac7f97..689fc93fa 100644
--- a/kernel/include/uapi/linux/chio.h
+++ b/kernel/include/uapi/linux/chio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ioctl interface for the scsi media changer driver
  */
diff --git a/kernel/include/uapi/linux/cifs/cifs_mount.h b/kernel/include/uapi/linux/cifs/cifs_mount.h
index d7e4c6ce6..69829205f 100644
--- a/kernel/include/uapi/linux/cifs/cifs_mount.h
+++ b/kernel/include/uapi/linux/cifs/cifs_mount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  *   include/uapi/linux/cifs/cifs_mount.h
  *
diff --git a/kernel/include/uapi/linux/cm4000_cs.h b/kernel/include/uapi/linux/cm4000_cs.h
index 1217f751a..c70a62ec8 100644
--- a/kernel/include/uapi/linux/cm4000_cs.h
+++ b/kernel/include/uapi/linux/cm4000_cs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_CM4000_H_
 #define _UAPI_CM4000_H_
 
diff --git a/kernel/include/uapi/linux/cn_proc.h b/kernel/include/uapi/linux/cn_proc.h
index f6c271035..68ff25414 100644
--- a/kernel/include/uapi/linux/cn_proc.h
+++ b/kernel/include/uapi/linux/cn_proc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */
 /*
  * cn_proc.h - process events connector
  *
diff --git a/kernel/include/uapi/linux/coda_psdev.h b/kernel/include/uapi/linux/coda_psdev.h
index 79d05981f..aa6623efd 100644
--- a/kernel/include/uapi/linux/coda_psdev.h
+++ b/kernel/include/uapi/linux/coda_psdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__CODA_PSDEV_H
 #define _UAPI__CODA_PSDEV_H
 
diff --git a/kernel/include/uapi/linux/coff.h b/kernel/include/uapi/linux/coff.h
index 6354a7fe2..e4a79f80b 100644
--- a/kernel/include/uapi/linux/coff.h
+++ b/kernel/include/uapi/linux/coff.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* This file is derived from the GAS 2.1.4 assembler control file.
    The GAS product is under the GNU General Public License, version 2 or later.
    As such, this file is also under that license.
diff --git a/kernel/include/uapi/linux/connector.h b/kernel/include/uapi/linux/connector.h
index 4cb283505..373893614 100644
--- a/kernel/include/uapi/linux/connector.h
+++ b/kernel/include/uapi/linux/connector.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * 	connector.h
  * 
diff --git a/kernel/include/uapi/linux/const.h b/kernel/include/uapi/linux/const.h
index c872bfd25..925377575 100644
--- a/kernel/include/uapi/linux/const.h
+++ b/kernel/include/uapi/linux/const.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* const.h: Macros for dealing with constants.  */
 
 #ifndef _LINUX_CONST_H
diff --git a/kernel/include/uapi/linux/coresight-stm.h b/kernel/include/uapi/linux/coresight-stm.h
index 7e4272cf1..aac550a52 100644
--- a/kernel/include/uapi/linux/coresight-stm.h
+++ b/kernel/include/uapi/linux/coresight-stm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __UAPI_CORESIGHT_STM_H_
 #define __UAPI_CORESIGHT_STM_H_
 
diff --git a/kernel/include/uapi/linux/cramfs_fs.h b/kernel/include/uapi/linux/cramfs_fs.h
index e4611a9b9..551950419 100644
--- a/kernel/include/uapi/linux/cramfs_fs.h
+++ b/kernel/include/uapi/linux/cramfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__CRAMFS_H
 #define _UAPI__CRAMFS_H
 
diff --git a/kernel/include/uapi/linux/cryptouser.h b/kernel/include/uapi/linux/cryptouser.h
index fdcbb3c29..19bf0ca6d 100644
--- a/kernel/include/uapi/linux/cryptouser.h
+++ b/kernel/include/uapi/linux/cryptouser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Crypto user configuration API.
  *
diff --git a/kernel/include/uapi/linux/cuda.h b/kernel/include/uapi/linux/cuda.h
index 286f9f10f..281825577 100644
--- a/kernel/include/uapi/linux/cuda.h
+++ b/kernel/include/uapi/linux/cuda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for talking to the CUDA.  The CUDA is a microcontroller
  * which controls the ADB, system power, RTC, and various other things.
diff --git a/kernel/include/uapi/linux/cyclades.h b/kernel/include/uapi/linux/cyclades.h
index 12b587aa3..8279bc3d6 100644
--- a/kernel/include/uapi/linux/cyclades.h
+++ b/kernel/include/uapi/linux/cyclades.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Revision: 3.0 $$Date: 1998/11/02 14:20:59 $
  * linux/include/linux/cyclades.h
  *
diff --git a/kernel/include/uapi/linux/cycx_cfm.h b/kernel/include/uapi/linux/cycx_cfm.h
index 032d26ed8..51f541942 100644
--- a/kernel/include/uapi/linux/cycx_cfm.h
+++ b/kernel/include/uapi/linux/cycx_cfm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
 * cycx_cfm.h	Cyclom 2X WAN Link Driver.
 *		Definitions for the Cyclom 2X Firmware Module (CFM).
diff --git a/kernel/include/uapi/linux/dcbnl.h b/kernel/include/uapi/linux/dcbnl.h
index 3ea470f35..b6170a6af 100644
--- a/kernel/include/uapi/linux/dcbnl.h
+++ b/kernel/include/uapi/linux/dcbnl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2008-2011, Intel Corporation.
  *
diff --git a/kernel/include/uapi/linux/dccp.h b/kernel/include/uapi/linux/dccp.h
index 52a9cd730..6e1978dbc 100644
--- a/kernel/include/uapi/linux/dccp.h
+++ b/kernel/include/uapi/linux/dccp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_DCCP_H
 #define _UAPI_LINUX_DCCP_H
 
diff --git a/kernel/include/uapi/linux/devlink.h b/kernel/include/uapi/linux/devlink.h
index 0cbca96c6..6665df69e 100644
--- a/kernel/include/uapi/linux/devlink.h
+++ b/kernel/include/uapi/linux/devlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * include/uapi/linux/devlink.h - Network physical device Netlink interface
  * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
diff --git a/kernel/include/uapi/linux/dlm.h b/kernel/include/uapi/linux/dlm.h
index 1f73cc061..0d2eca287 100644
--- a/kernel/include/uapi/linux/dlm.h
+++ b/kernel/include/uapi/linux/dlm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /******************************************************************************
 *******************************************************************************
 **
diff --git a/kernel/include/uapi/linux/dlm_device.h b/kernel/include/uapi/linux/dlm_device.h
index df56c8ff0..f880d2831 100644
--- a/kernel/include/uapi/linux/dlm_device.h
+++ b/kernel/include/uapi/linux/dlm_device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /******************************************************************************
 *******************************************************************************
 **
diff --git a/kernel/include/uapi/linux/dlm_netlink.h b/kernel/include/uapi/linux/dlm_netlink.h
index ef1e2e087..5dc3a67d3 100644
--- a/kernel/include/uapi/linux/dlm_netlink.h
+++ b/kernel/include/uapi/linux/dlm_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/dlm_plock.h b/kernel/include/uapi/linux/dlm_plock.h
index 6ae692c90..63b6c1fd9 100644
--- a/kernel/include/uapi/linux/dlm_plock.h
+++ b/kernel/include/uapi/linux/dlm_plock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/dlmconstants.h b/kernel/include/uapi/linux/dlmconstants.h
index 2857bdc5b..a8ae47c32 100644
--- a/kernel/include/uapi/linux/dlmconstants.h
+++ b/kernel/include/uapi/linux/dlmconstants.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /******************************************************************************
 *******************************************************************************
 **
diff --git a/kernel/include/uapi/linux/dm-ioctl.h b/kernel/include/uapi/linux/dm-ioctl.h
index ccaea5253..14c44ec8b 100644
--- a/kernel/include/uapi/linux/dm-ioctl.h
+++ b/kernel/include/uapi/linux/dm-ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited.
  * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved.
diff --git a/kernel/include/uapi/linux/dm-log-userspace.h b/kernel/include/uapi/linux/dm-log-userspace.h
index 05e91e14c..5c47a8603 100644
--- a/kernel/include/uapi/linux/dm-log-userspace.h
+++ b/kernel/include/uapi/linux/dm-log-userspace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2006-2009 Red Hat, Inc.
  *
diff --git a/kernel/include/uapi/linux/dma-buf.h b/kernel/include/uapi/linux/dma-buf.h
index fb0dedb7c..d75df5210 100644
--- a/kernel/include/uapi/linux/dma-buf.h
+++ b/kernel/include/uapi/linux/dma-buf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Framework for buffer objects that can be shared across devices/subsystems.
  *
diff --git a/kernel/include/uapi/linux/dn.h b/kernel/include/uapi/linux/dn.h
index 4295c745f..36ca71bd8 100644
--- a/kernel/include/uapi/linux/dn.h
+++ b/kernel/include/uapi/linux/dn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_DN_H
 #define _LINUX_DN_H
 
diff --git a/kernel/include/uapi/linux/dqblk_xfs.h b/kernel/include/uapi/linux/dqblk_xfs.h
index 11b3b31fa..03d890b80 100644
--- a/kernel/include/uapi/linux/dqblk_xfs.h
+++ b/kernel/include/uapi/linux/dqblk_xfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 1995-2001,2004 Silicon Graphics, Inc.  All Rights Reserved.
  *
diff --git a/kernel/include/uapi/linux/dvb/audio.h b/kernel/include/uapi/linux/dvb/audio.h
index d47bccd60..69f7a85d8 100644
--- a/kernel/include/uapi/linux/dvb/audio.h
+++ b/kernel/include/uapi/linux/dvb/audio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * audio.h
  *
diff --git a/kernel/include/uapi/linux/dvb/ca.h b/kernel/include/uapi/linux/dvb/ca.h
index cb150029f..dffa59e95 100644
--- a/kernel/include/uapi/linux/dvb/ca.h
+++ b/kernel/include/uapi/linux/dvb/ca.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * ca.h
  *
diff --git a/kernel/include/uapi/linux/dvb/dmx.h b/kernel/include/uapi/linux/dvb/dmx.h
index 4aa5f6a18..c10f1324b 100644
--- a/kernel/include/uapi/linux/dvb/dmx.h
+++ b/kernel/include/uapi/linux/dvb/dmx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * dmx.h
  *
diff --git a/kernel/include/uapi/linux/dvb/frontend.h b/kernel/include/uapi/linux/dvb/frontend.h
index 861cacd57..f46de499b 100644
--- a/kernel/include/uapi/linux/dvb/frontend.h
+++ b/kernel/include/uapi/linux/dvb/frontend.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * frontend.h
  *
diff --git a/kernel/include/uapi/linux/dvb/net.h b/kernel/include/uapi/linux/dvb/net.h
index 89d805f9a..0c550ef93 100644
--- a/kernel/include/uapi/linux/dvb/net.h
+++ b/kernel/include/uapi/linux/dvb/net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * net.h
  *
diff --git a/kernel/include/uapi/linux/dvb/osd.h b/kernel/include/uapi/linux/dvb/osd.h
index 880e68435..e163508b9 100644
--- a/kernel/include/uapi/linux/dvb/osd.h
+++ b/kernel/include/uapi/linux/dvb/osd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * osd.h
  *
diff --git a/kernel/include/uapi/linux/dvb/version.h b/kernel/include/uapi/linux/dvb/version.h
index e53e2ad44..02e32ea83 100644
--- a/kernel/include/uapi/linux/dvb/version.h
+++ b/kernel/include/uapi/linux/dvb/version.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * version.h
  *
diff --git a/kernel/include/uapi/linux/dvb/video.h b/kernel/include/uapi/linux/dvb/video.h
index c83d40b8a..4d51f9818 100644
--- a/kernel/include/uapi/linux/dvb/video.h
+++ b/kernel/include/uapi/linux/dvb/video.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * video.h
  *
diff --git a/kernel/include/uapi/linux/edd.h b/kernel/include/uapi/linux/edd.h
index 89240a04e..0fe3e02ae 100644
--- a/kernel/include/uapi/linux/edd.h
+++ b/kernel/include/uapi/linux/edd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/linux/edd.h
  *  Copyright (C) 2002, 2003, 2004 Dell Inc.
diff --git a/kernel/include/uapi/linux/efs_fs_sb.h b/kernel/include/uapi/linux/efs_fs_sb.h
index a01be90c5..6bad29a10 100644
--- a/kernel/include/uapi/linux/efs_fs_sb.h
+++ b/kernel/include/uapi/linux/efs_fs_sb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * efs_fs_sb.h
  *
diff --git a/kernel/include/uapi/linux/elf-em.h b/kernel/include/uapi/linux/elf-em.h
index 9cd1de954..31aa10178 100644
--- a/kernel/include/uapi/linux/elf-em.h
+++ b/kernel/include/uapi/linux/elf-em.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_ELF_EM_H
 #define _LINUX_ELF_EM_H
 
diff --git a/kernel/include/uapi/linux/elf-fdpic.h b/kernel/include/uapi/linux/elf-fdpic.h
index 3921e33ae..4fcc6cfeb 100644
--- a/kernel/include/uapi/linux/elf-fdpic.h
+++ b/kernel/include/uapi/linux/elf-fdpic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* elf-fdpic.h: FDPIC ELF load map
  *
  * Copyright (C) 2003 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/include/uapi/linux/elf.h b/kernel/include/uapi/linux/elf.h
index b5280db9e..c58627c0d 100644
--- a/kernel/include/uapi/linux/elf.h
+++ b/kernel/include/uapi/linux/elf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_ELF_H
 #define _UAPI_LINUX_ELF_H
 
diff --git a/kernel/include/uapi/linux/elfcore.h b/kernel/include/uapi/linux/elfcore.h
index 569737cfb..0b2c9e16e 100644
--- a/kernel/include/uapi/linux/elfcore.h
+++ b/kernel/include/uapi/linux/elfcore.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_ELFCORE_H
 #define _UAPI_LINUX_ELFCORE_H
 
diff --git a/kernel/include/uapi/linux/errqueue.h b/kernel/include/uapi/linux/errqueue.h
index 78fdf52d6..dc64cfaf1 100644
--- a/kernel/include/uapi/linux/errqueue.h
+++ b/kernel/include/uapi/linux/errqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_ERRQUEUE_H
 #define _UAPI_LINUX_ERRQUEUE_H
 
diff --git a/kernel/include/uapi/linux/ethtool.h b/kernel/include/uapi/linux/ethtool.h
index 5bd1b1de4..ac7155931 100644
--- a/kernel/include/uapi/linux/ethtool.h
+++ b/kernel/include/uapi/linux/ethtool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ethtool.h: Defines for Linux ethtool.
  *
diff --git a/kernel/include/uapi/linux/eventpoll.h b/kernel/include/uapi/linux/eventpoll.h
index f4d5c998c..63e21be30 100644
--- a/kernel/include/uapi/linux/eventpoll.h
+++ b/kernel/include/uapi/linux/eventpoll.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  include/linux/eventpoll.h ( Efficient event polling implementation )
  *  Copyright (C) 2001,...,2006	 Davide Libenzi
diff --git a/kernel/include/uapi/linux/fadvise.h b/kernel/include/uapi/linux/fadvise.h
index e8e747139..0862b8743 100644
--- a/kernel/include/uapi/linux/fadvise.h
+++ b/kernel/include/uapi/linux/fadvise.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef FADVISE_H_INCLUDED
 #define FADVISE_H_INCLUDED
 
diff --git a/kernel/include/uapi/linux/falloc.h b/kernel/include/uapi/linux/falloc.h
index b075f6019..51398fa57 100644
--- a/kernel/include/uapi/linux/falloc.h
+++ b/kernel/include/uapi/linux/falloc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_FALLOC_H_
 #define _UAPI_FALLOC_H_
 
diff --git a/kernel/include/uapi/linux/fanotify.h b/kernel/include/uapi/linux/fanotify.h
index 030508d19..f79c4e1a8 100644
--- a/kernel/include/uapi/linux/fanotify.h
+++ b/kernel/include/uapi/linux/fanotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FANOTIFY_H
 #define _UAPI_LINUX_FANOTIFY_H
 
diff --git a/kernel/include/uapi/linux/fb.h b/kernel/include/uapi/linux/fb.h
index fb795c3b3..6cd9b198b 100644
--- a/kernel/include/uapi/linux/fb.h
+++ b/kernel/include/uapi/linux/fb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FB_H
 #define _UAPI_LINUX_FB_H
 
diff --git a/kernel/include/uapi/linux/fcntl.h b/kernel/include/uapi/linux/fcntl.h
index ec69d55bc..6448cdd9a 100644
--- a/kernel/include/uapi/linux/fcntl.h
+++ b/kernel/include/uapi/linux/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FCNTL_H
 #define _UAPI_LINUX_FCNTL_H
 
diff --git a/kernel/include/uapi/linux/fd.h b/kernel/include/uapi/linux/fd.h
index 84c517cbc..90fb94712 100644
--- a/kernel/include/uapi/linux/fd.h
+++ b/kernel/include/uapi/linux/fd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FD_H
 #define _UAPI_LINUX_FD_H
 
diff --git a/kernel/include/uapi/linux/fdreg.h b/kernel/include/uapi/linux/fdreg.h
index 61ce64169..5e2981d5c 100644
--- a/kernel/include/uapi/linux/fdreg.h
+++ b/kernel/include/uapi/linux/fdreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_FDREG_H
 #define _LINUX_FDREG_H
 /*
diff --git a/kernel/include/uapi/linux/fib_rules.h b/kernel/include/uapi/linux/fib_rules.h
index bbf02a63a..2b642bf9b 100644
--- a/kernel/include/uapi/linux/fib_rules.h
+++ b/kernel/include/uapi/linux/fib_rules.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_FIB_RULES_H
 #define __LINUX_FIB_RULES_H
 
diff --git a/kernel/include/uapi/linux/fiemap.h b/kernel/include/uapi/linux/fiemap.h
index 0c51d617d..8c0bc24d5 100644
--- a/kernel/include/uapi/linux/fiemap.h
+++ b/kernel/include/uapi/linux/fiemap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * FS_IOC_FIEMAP ioctl infrastructure.
  *
diff --git a/kernel/include/uapi/linux/filter.h b/kernel/include/uapi/linux/filter.h
index c97340e43..13f5b65a8 100644
--- a/kernel/include/uapi/linux/filter.h
+++ b/kernel/include/uapi/linux/filter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Linux Socket Filter Data Structures
  */
diff --git a/kernel/include/uapi/linux/flat.h b/kernel/include/uapi/linux/flat.h
index 88cd6baba..27e595e44 100644
--- a/kernel/include/uapi/linux/flat.h
+++ b/kernel/include/uapi/linux/flat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2002-2003  David McCullough <davidm@snapgear.com>
  * Copyright (C) 1998       Kenneth Albanowski <kjahds@kjahds.com>
diff --git a/kernel/include/uapi/linux/fou.h b/kernel/include/uapi/linux/fou.h
index d2947c52d..f2ea833a2 100644
--- a/kernel/include/uapi/linux/fou.h
+++ b/kernel/include/uapi/linux/fou.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* fou.h - FOU Interface */
 
 #ifndef _UAPI_LINUX_FOU_H
diff --git a/kernel/include/uapi/linux/fs.h b/kernel/include/uapi/linux/fs.h
index 56235ddde..4199f8acb 100644
--- a/kernel/include/uapi/linux/fs.h
+++ b/kernel/include/uapi/linux/fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FS_H
 #define _UAPI_LINUX_FS_H
 
diff --git a/kernel/include/uapi/linux/fsl_hypervisor.h b/kernel/include/uapi/linux/fsl_hypervisor.h
index 1bf04967f..1e237fba9 100644
--- a/kernel/include/uapi/linux/fsl_hypervisor.h
+++ b/kernel/include/uapi/linux/fsl_hypervisor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * Freescale hypervisor ioctl and kernel interface
  *
diff --git a/kernel/include/uapi/linux/fsmap.h b/kernel/include/uapi/linux/fsmap.h
index e5213c3e3..91fd519a3 100644
--- a/kernel/include/uapi/linux/fsmap.h
+++ b/kernel/include/uapi/linux/fsmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * FS_IOC_GETFSMAP ioctl infrastructure.
  *
diff --git a/kernel/include/uapi/linux/fuse.h b/kernel/include/uapi/linux/fuse.h
index 42fa977e3..4b5001c57 100644
--- a/kernel/include/uapi/linux/fuse.h
+++ b/kernel/include/uapi/linux/fuse.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
     This file defines the kernel interface of FUSE
     Copyright (C) 2001-2008  Miklos Szeredi <miklos@szeredi.hu>
diff --git a/kernel/include/uapi/linux/futex.h b/kernel/include/uapi/linux/futex.h
index 0b1f71637..a89eb0acc 100644
--- a/kernel/include/uapi/linux/futex.h
+++ b/kernel/include/uapi/linux/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FUTEX_H
 #define _UAPI_LINUX_FUTEX_H
 
diff --git a/kernel/include/uapi/linux/gameport.h b/kernel/include/uapi/linux/gameport.h
index 49b29b068..8fb40b493 100644
--- a/kernel/include/uapi/linux/gameport.h
+++ b/kernel/include/uapi/linux/gameport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Copyright (c) 1999-2002 Vojtech Pavlik
  *
diff --git a/kernel/include/uapi/linux/gen_stats.h b/kernel/include/uapi/linux/gen_stats.h
index 52deccc21..24a861c0d 100644
--- a/kernel/include/uapi/linux/gen_stats.h
+++ b/kernel/include/uapi/linux/gen_stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_GEN_STATS_H
 #define __LINUX_GEN_STATS_H
 
diff --git a/kernel/include/uapi/linux/genetlink.h b/kernel/include/uapi/linux/genetlink.h
index adc899381..877f7fa95 100644
--- a/kernel/include/uapi/linux/genetlink.h
+++ b/kernel/include/uapi/linux/genetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_GENERIC_NETLINK_H
 #define _UAPI__LINUX_GENERIC_NETLINK_H
 
diff --git a/kernel/include/uapi/linux/genwqe/genwqe_card.h b/kernel/include/uapi/linux/genwqe/genwqe_card.h
index baa93fb4c..bc779a5d2 100644
--- a/kernel/include/uapi/linux/genwqe/genwqe_card.h
+++ b/kernel/include/uapi/linux/genwqe/genwqe_card.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __GENWQE_CARD_H__
 #define __GENWQE_CARD_H__
 
diff --git a/kernel/include/uapi/linux/gfs2_ondisk.h b/kernel/include/uapi/linux/gfs2_ondisk.h
index 7c4be7711..5156bad77 100644
--- a/kernel/include/uapi/linux/gfs2_ondisk.h
+++ b/kernel/include/uapi/linux/gfs2_ondisk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
  * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
diff --git a/kernel/include/uapi/linux/gigaset_dev.h b/kernel/include/uapi/linux/gigaset_dev.h
index 258ba8293..279551af8 100644
--- a/kernel/include/uapi/linux/gigaset_dev.h
+++ b/kernel/include/uapi/linux/gigaset_dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * interface to user space for the gigaset driver
  *
diff --git a/kernel/include/uapi/linux/gpio.h b/kernel/include/uapi/linux/gpio.h
index 333d3544c..1bf6e6df0 100644
--- a/kernel/include/uapi/linux/gpio.h
+++ b/kernel/include/uapi/linux/gpio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * <linux/gpio.h> - userspace ABI for the GPIO character devices
  *
diff --git a/kernel/include/uapi/linux/gsmmux.h b/kernel/include/uapi/linux/gsmmux.h
index ab055d8cd..101d3c469 100644
--- a/kernel/include/uapi/linux/gsmmux.h
+++ b/kernel/include/uapi/linux/gsmmux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_GSMMUX_H
 #define _LINUX_GSMMUX_H
 
diff --git a/kernel/include/uapi/linux/gtp.h b/kernel/include/uapi/linux/gtp.h
index 57d1edb8e..c7d66755d 100644
--- a/kernel/include/uapi/linux/gtp.h
+++ b/kernel/include/uapi/linux/gtp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_GTP_H_
 #define _UAPI_LINUX_GTP_H_
 
diff --git a/kernel/include/uapi/linux/hash_info.h b/kernel/include/uapi/linux/hash_info.h
index ebf8fd885..eea5d02c5 100644
--- a/kernel/include/uapi/linux/hash_info.h
+++ b/kernel/include/uapi/linux/hash_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Hash Info: Hash algorithms information
  *
diff --git a/kernel/include/uapi/linux/hdlc.h b/kernel/include/uapi/linux/hdlc.h
index 2c5f0aff4..d89cb3ee7 100644
--- a/kernel/include/uapi/linux/hdlc.h
+++ b/kernel/include/uapi/linux/hdlc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Generic HDLC support routines for Linux
  *
diff --git a/kernel/include/uapi/linux/hdlc/ioctl.h b/kernel/include/uapi/linux/hdlc/ioctl.h
index 04bc0274a..0fe4238e8 100644
--- a/kernel/include/uapi/linux/hdlc/ioctl.h
+++ b/kernel/include/uapi/linux/hdlc/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __HDLC_IOCTL_H__
 #define __HDLC_IOCTL_H__
 
diff --git a/kernel/include/uapi/linux/hdlcdrv.h b/kernel/include/uapi/linux/hdlcdrv.h
index ffc79c0b4..9fe949940 100644
--- a/kernel/include/uapi/linux/hdlcdrv.h
+++ b/kernel/include/uapi/linux/hdlcdrv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * hdlcdrv.h  -- HDLC packet radio network driver.
  * The Linux soundcard driver for 1200 baud and 9600 baud packet radio
diff --git a/kernel/include/uapi/linux/hdreg.h b/kernel/include/uapi/linux/hdreg.h
index 29ee2873f..aeee62ebf 100644
--- a/kernel/include/uapi/linux/hdreg.h
+++ b/kernel/include/uapi/linux/hdreg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_HDREG_H
 #define _LINUX_HDREG_H
 
diff --git a/kernel/include/uapi/linux/hid.h b/kernel/include/uapi/linux/hid.h
index b60f4842b..b34492a87 100644
--- a/kernel/include/uapi/linux/hid.h
+++ b/kernel/include/uapi/linux/hid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2001 Vojtech Pavlik
diff --git a/kernel/include/uapi/linux/hiddev.h b/kernel/include/uapi/linux/hiddev.h
index 7df7884bf..53d6cad7a 100644
--- a/kernel/include/uapi/linux/hiddev.h
+++ b/kernel/include/uapi/linux/hiddev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Copyright (c) 1999-2000 Vojtech Pavlik
  *
diff --git a/kernel/include/uapi/linux/hidraw.h b/kernel/include/uapi/linux/hidraw.h
index f5b732979..98e2c493d 100644
--- a/kernel/include/uapi/linux/hidraw.h
+++ b/kernel/include/uapi/linux/hidraw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Copyright (c) 2007 Jiri Kosina
  */
diff --git a/kernel/include/uapi/linux/hpet.h b/kernel/include/uapi/linux/hpet.h
index 8af3c70ab..30e535644 100644
--- a/kernel/include/uapi/linux/hpet.h
+++ b/kernel/include/uapi/linux/hpet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__HPET__
 #define _UAPI__HPET__
 
diff --git a/kernel/include/uapi/linux/hsi/cs-protocol.h b/kernel/include/uapi/linux/hsi/cs-protocol.h
index f153d6ea7..c7f6e7672 100644
--- a/kernel/include/uapi/linux/hsi/cs-protocol.h
+++ b/kernel/include/uapi/linux/hsi/cs-protocol.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * cmt-speech interface definitions
  *
diff --git a/kernel/include/uapi/linux/hsi/hsi_char.h b/kernel/include/uapi/linux/hsi/hsi_char.h
index c00a463d5..91623b039 100644
--- a/kernel/include/uapi/linux/hsi/hsi_char.h
+++ b/kernel/include/uapi/linux/hsi/hsi_char.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Part of the HSI character device driver.
  *
diff --git a/kernel/include/uapi/linux/hsr_netlink.h b/kernel/include/uapi/linux/hsr_netlink.h
index 2475cb8a5..c218ef9c3 100644
--- a/kernel/include/uapi/linux/hsr_netlink.h
+++ b/kernel/include/uapi/linux/hsr_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2011-2013 Autronica Fire and Security AS
  *
diff --git a/kernel/include/uapi/linux/hw_breakpoint.h b/kernel/include/uapi/linux/hw_breakpoint.h
index 2b65efd19..965e4d860 100644
--- a/kernel/include/uapi/linux/hw_breakpoint.h
+++ b/kernel/include/uapi/linux/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_HW_BREAKPOINT_H
 #define _UAPI_LINUX_HW_BREAKPOINT_H
 
diff --git a/kernel/include/uapi/linux/hyperv.h b/kernel/include/uapi/linux/hyperv.h
index e347b24ef..991b2b7ad 100644
--- a/kernel/include/uapi/linux/hyperv.h
+++ b/kernel/include/uapi/linux/hyperv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *
  * Copyright (c) 2011, Microsoft Corporation.
diff --git a/kernel/include/uapi/linux/hysdn_if.h b/kernel/include/uapi/linux/hysdn_if.h
index 00236ae3b..99f77c517 100644
--- a/kernel/include/uapi/linux/hysdn_if.h
+++ b/kernel/include/uapi/linux/hysdn_if.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: hysdn_if.h,v 1.1.8.3 2001/09/23 22:25:05 kai Exp $
  *
  * Linux driver for HYSDN cards
diff --git a/kernel/include/uapi/linux/i2c-dev.h b/kernel/include/uapi/linux/i2c-dev.h
index 2f05e66de..85f8047af 100644
--- a/kernel/include/uapi/linux/i2c-dev.h
+++ b/kernel/include/uapi/linux/i2c-dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
     i2c-dev.h - i2c-bus driver, char device interface
 
diff --git a/kernel/include/uapi/linux/i2c.h b/kernel/include/uapi/linux/i2c.h
index 009e27bb9..fe648032d 100644
--- a/kernel/include/uapi/linux/i2c.h
+++ b/kernel/include/uapi/linux/i2c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* ------------------------------------------------------------------------- */
 /*									     */
 /* i2c.h - definitions for the i2c-bus interface			     */
diff --git a/kernel/include/uapi/linux/i2o-dev.h b/kernel/include/uapi/linux/i2o-dev.h
index a8093bfec..b1cd407c4 100644
--- a/kernel/include/uapi/linux/i2o-dev.h
+++ b/kernel/include/uapi/linux/i2o-dev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * I2O user space accessible structures/APIs
  *
diff --git a/kernel/include/uapi/linux/i8k.h b/kernel/include/uapi/linux/i8k.h
index 133d02f03..268e6268f 100644
--- a/kernel/include/uapi/linux/i8k.h
+++ b/kernel/include/uapi/linux/i8k.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * i8k.h -- Linux driver for accessing the SMM BIOS on Dell laptops
  *
diff --git a/kernel/include/uapi/linux/icmp.h b/kernel/include/uapi/linux/icmp.h
index fddd9d736..5589eeb79 100644
--- a/kernel/include/uapi/linux/icmp.h
+++ b/kernel/include/uapi/linux/icmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/icmpv6.h b/kernel/include/uapi/linux/icmpv6.h
index 590beda78..caf8dc019 100644
--- a/kernel/include/uapi/linux/icmpv6.h
+++ b/kernel/include/uapi/linux/icmpv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_ICMPV6_H
 #define _UAPI_LINUX_ICMPV6_H
 
diff --git a/kernel/include/uapi/linux/if.h b/kernel/include/uapi/linux/if.h
index 259617a55..7fea0fd7d 100644
--- a/kernel/include/uapi/linux/if.h
+++ b/kernel/include/uapi/linux/if.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/if_addr.h b/kernel/include/uapi/linux/if_addr.h
index 4318ab163..2ef053d26 100644
--- a/kernel/include/uapi/linux/if_addr.h
+++ b/kernel/include/uapi/linux/if_addr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_IF_ADDR_H
 #define __LINUX_IF_ADDR_H
 
diff --git a/kernel/include/uapi/linux/if_addrlabel.h b/kernel/include/uapi/linux/if_addrlabel.h
index 54580c298..d1f5974c7 100644
--- a/kernel/include/uapi/linux/if_addrlabel.h
+++ b/kernel/include/uapi/linux/if_addrlabel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * if_addrlabel.h - netlink interface for address labels
  *
diff --git a/kernel/include/uapi/linux/if_alg.h b/kernel/include/uapi/linux/if_alg.h
index f2acd2fde..bc2bcdec3 100644
--- a/kernel/include/uapi/linux/if_alg.h
+++ b/kernel/include/uapi/linux/if_alg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * if_alg: User-space algorithm interface
  *
diff --git a/kernel/include/uapi/linux/if_arcnet.h b/kernel/include/uapi/linux/if_arcnet.h
index cfb642f8e..683878036 100644
--- a/kernel/include/uapi/linux/if_arcnet.h
+++ b/kernel/include/uapi/linux/if_arcnet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET         An implementation of the TCP/IP protocol suite for the LINUX
  *              operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/if_arp.h b/kernel/include/uapi/linux/if_arp.h
index a2a635620..4605527ca 100644
--- a/kernel/include/uapi/linux/if_arp.h
+++ b/kernel/include/uapi/linux/if_arp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/if_bonding.h b/kernel/include/uapi/linux/if_bonding.h
index 9635a62f6..61a1bf6e8 100644
--- a/kernel/include/uapi/linux/if_bonding.h
+++ b/kernel/include/uapi/linux/if_bonding.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.
  *
diff --git a/kernel/include/uapi/linux/if_bridge.h b/kernel/include/uapi/linux/if_bridge.h
index a9e6244ce..e41eda3c7 100644
--- a/kernel/include/uapi/linux/if_bridge.h
+++ b/kernel/include/uapi/linux/if_bridge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	Linux ethernet bridge
  *
diff --git a/kernel/include/uapi/linux/if_cablemodem.h b/kernel/include/uapi/linux/if_cablemodem.h
index ee6b3c442..1f65130bf 100644
--- a/kernel/include/uapi/linux/if_cablemodem.h
+++ b/kernel/include/uapi/linux/if_cablemodem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _LINUX_CABLEMODEM_H_
 #define _LINUX_CABLEMODEM_H_
 /*
diff --git a/kernel/include/uapi/linux/if_eql.h b/kernel/include/uapi/linux/if_eql.h
index 06e818c9e..d6865a2d8 100644
--- a/kernel/include/uapi/linux/if_eql.h
+++ b/kernel/include/uapi/linux/if_eql.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Equalizer Load-balancer for serial network interfaces.
  *
diff --git a/kernel/include/uapi/linux/if_ether.h b/kernel/include/uapi/linux/if_ether.h
index 9037065e2..3ee3bf7c8 100644
--- a/kernel/include/uapi/linux/if_ether.h
+++ b/kernel/include/uapi/linux/if_ether.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/if_fc.h b/kernel/include/uapi/linux/if_fc.h
index 6ed7f1bf3..3e3173282 100644
--- a/kernel/include/uapi/linux/if_fc.h
+++ b/kernel/include/uapi/linux/if_fc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/if_fddi.h b/kernel/include/uapi/linux/if_fddi.h
index 1086cd9f6..75eed8b62 100644
--- a/kernel/include/uapi/linux/if_fddi.h
+++ b/kernel/include/uapi/linux/if_fddi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the BSD Socket
diff --git a/kernel/include/uapi/linux/if_frad.h b/kernel/include/uapi/linux/if_frad.h
index f25b08d5e..3c6ee85f6 100644
--- a/kernel/include/uapi/linux/if_frad.h
+++ b/kernel/include/uapi/linux/if_frad.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * DLCI/FRAD	Definitions for Frame Relay Access Devices.  DLCI devices are
  *		created for each DLCI associated with a FRAD.  The FRAD driver
diff --git a/kernel/include/uapi/linux/if_hippi.h b/kernel/include/uapi/linux/if_hippi.h
index cdc049f18..785a1452a 100644
--- a/kernel/include/uapi/linux/if_hippi.h
+++ b/kernel/include/uapi/linux/if_hippi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/if_infiniband.h b/kernel/include/uapi/linux/if_infiniband.h
index 7d958475d..050b92dcf 100644
--- a/kernel/include/uapi/linux/if_infiniband.h
+++ b/kernel/include/uapi/linux/if_infiniband.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
diff --git a/kernel/include/uapi/linux/if_link.h b/kernel/include/uapi/linux/if_link.h
index 8d062c58d..1f00f0cd6 100644
--- a/kernel/include/uapi/linux/if_link.h
+++ b/kernel/include/uapi/linux/if_link.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_IF_LINK_H
 #define _UAPI_LINUX_IF_LINK_H
 
diff --git a/kernel/include/uapi/linux/if_ltalk.h b/kernel/include/uapi/linux/if_ltalk.h
index b92c1fb6a..fa61e776f 100644
--- a/kernel/include/uapi/linux/if_ltalk.h
+++ b/kernel/include/uapi/linux/if_ltalk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_LTALK_H
 #define _UAPI__LINUX_LTALK_H
 
diff --git a/kernel/include/uapi/linux/if_macsec.h b/kernel/include/uapi/linux/if_macsec.h
index 02fc49cb7..719d24347 100644
--- a/kernel/include/uapi/linux/if_macsec.h
+++ b/kernel/include/uapi/linux/if_macsec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * include/uapi/linux/if_macsec.h - MACsec device
  *
diff --git a/kernel/include/uapi/linux/if_packet.h b/kernel/include/uapi/linux/if_packet.h
index 4df96a7dd..67b61d91d 100644
--- a/kernel/include/uapi/linux/if_packet.h
+++ b/kernel/include/uapi/linux/if_packet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_IF_PACKET_H
 #define __LINUX_IF_PACKET_H
 
diff --git a/kernel/include/uapi/linux/if_phonet.h b/kernel/include/uapi/linux/if_phonet.h
index f7ad9e24e..9c22c969e 100644
--- a/kernel/include/uapi/linux/if_phonet.h
+++ b/kernel/include/uapi/linux/if_phonet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * File: if_phonet.h
  *
diff --git a/kernel/include/uapi/linux/if_plip.h b/kernel/include/uapi/linux/if_plip.h
index 6298c7e88..495a36611 100644
--- a/kernel/include/uapi/linux/if_plip.h
+++ b/kernel/include/uapi/linux/if_plip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	NET3	PLIP tuning facilities for the new Niibe PLIP.
  *
diff --git a/kernel/include/uapi/linux/if_pppol2tp.h b/kernel/include/uapi/linux/if_pppol2tp.h
index 6418c4d10..060b4d1f3 100644
--- a/kernel/include/uapi/linux/if_pppol2tp.h
+++ b/kernel/include/uapi/linux/if_pppol2tp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /***************************************************************************
  * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
  *
diff --git a/kernel/include/uapi/linux/if_pppox.h b/kernel/include/uapi/linux/if_pppox.h
index d37bbb17a..e7a693c28 100644
--- a/kernel/include/uapi/linux/if_pppox.h
+++ b/kernel/include/uapi/linux/if_pppox.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /***************************************************************************
  * Linux PPP over X - Generic PPP transport layer sockets
  * Linux PPP over Ethernet (PPPoE) Socket Implementation (RFC 2516) 
diff --git a/kernel/include/uapi/linux/if_slip.h b/kernel/include/uapi/linux/if_slip.h
index 1eb4e3a83..65937be53 100644
--- a/kernel/include/uapi/linux/if_slip.h
+++ b/kernel/include/uapi/linux/if_slip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	Swansea University Computer Society	NET3
  *	
diff --git a/kernel/include/uapi/linux/if_team.h b/kernel/include/uapi/linux/if_team.h
index 7b8fa339d..13c61fecb 100644
--- a/kernel/include/uapi/linux/if_team.h
+++ b/kernel/include/uapi/linux/if_team.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * include/linux/if_team.h - Network team device driver header
  * Copyright (c) 2011 Jiri Pirko <jpirko@redhat.com>
diff --git a/kernel/include/uapi/linux/if_tun.h b/kernel/include/uapi/linux/if_tun.h
index 3cb5e1d85..47ab4bc62 100644
--- a/kernel/include/uapi/linux/if_tun.h
+++ b/kernel/include/uapi/linux/if_tun.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Universal TUN/TAP device driver.
  *  Copyright (C) 1999-2000 Maxim Krasnyansky <max_mk@yahoo.com>
diff --git a/kernel/include/uapi/linux/if_tunnel.h b/kernel/include/uapi/linux/if_tunnel.h
index 2e520883c..383b850ae 100644
--- a/kernel/include/uapi/linux/if_tunnel.h
+++ b/kernel/include/uapi/linux/if_tunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_IF_TUNNEL_H_
 #define _UAPI_IF_TUNNEL_H_
 
diff --git a/kernel/include/uapi/linux/if_vlan.h b/kernel/include/uapi/linux/if_vlan.h
index 7e5e6b397..7a0e8bd65 100644
--- a/kernel/include/uapi/linux/if_vlan.h
+++ b/kernel/include/uapi/linux/if_vlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * VLAN		An implementation of 802.1Q VLAN tagging.
  *
diff --git a/kernel/include/uapi/linux/if_x25.h b/kernel/include/uapi/linux/if_x25.h
index 897765f5f..5d9624483 100644
--- a/kernel/include/uapi/linux/if_x25.h
+++ b/kernel/include/uapi/linux/if_x25.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Linux X.25 packet to device interface
  *
diff --git a/kernel/include/uapi/linux/ife.h b/kernel/include/uapi/linux/ife.h
index 2954da32e..bdd953c67 100644
--- a/kernel/include/uapi/linux/ife.h
+++ b/kernel/include/uapi/linux/ife.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __UAPI_IFE_H
 #define __UAPI_IFE_H
 
diff --git a/kernel/include/uapi/linux/igmp.h b/kernel/include/uapi/linux/igmp.h
index a97f9a756..7e44ac02c 100644
--- a/kernel/include/uapi/linux/igmp.h
+++ b/kernel/include/uapi/linux/igmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	Linux NET3:	Internet Group Management Protocol  [IGMP]
  *
diff --git a/kernel/include/uapi/linux/iio/events.h b/kernel/include/uapi/linux/iio/events.h
index 00bbdaed2..6ef413452 100644
--- a/kernel/include/uapi/linux/iio/events.h
+++ b/kernel/include/uapi/linux/iio/events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* The industrial I/O - event passing to userspace
  *
  * Copyright (c) 2008-2011 Jonathan Cameron
diff --git a/kernel/include/uapi/linux/iio/types.h b/kernel/include/uapi/linux/iio/types.h
index ffafd6c25..4213cdf88 100644
--- a/kernel/include/uapi/linux/iio/types.h
+++ b/kernel/include/uapi/linux/iio/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* industrial I/O data types needed both in and out of kernel
  *
  * Copyright (c) 2008 Jonathan Cameron
diff --git a/kernel/include/uapi/linux/ila.h b/kernel/include/uapi/linux/ila.h
index 948c0a91e..f54853288 100644
--- a/kernel/include/uapi/linux/ila.h
+++ b/kernel/include/uapi/linux/ila.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* ila.h - ILA Interface */
 
 #ifndef _UAPI_LINUX_ILA_H
diff --git a/kernel/include/uapi/linux/in.h b/kernel/include/uapi/linux/in.h
index 4e557f4e9..48e8a225b 100644
--- a/kernel/include/uapi/linux/in.h
+++ b/kernel/include/uapi/linux/in.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/in6.h b/kernel/include/uapi/linux/in6.h
index 46444f8fb..2c002ffa9 100644
--- a/kernel/include/uapi/linux/in6.h
+++ b/kernel/include/uapi/linux/in6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	Types and definitions for AF_INET6 
  *	Linux INET6 implementation 
diff --git a/kernel/include/uapi/linux/in_route.h b/kernel/include/uapi/linux/in_route.h
index b261b8c91..0cc2c23b4 100644
--- a/kernel/include/uapi/linux/in_route.h
+++ b/kernel/include/uapi/linux/in_route.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_IN_ROUTE_H
 #define _LINUX_IN_ROUTE_H
 
diff --git a/kernel/include/uapi/linux/inet_diag.h b/kernel/include/uapi/linux/inet_diag.h
index f52ff62bf..817d807e9 100644
--- a/kernel/include/uapi/linux/inet_diag.h
+++ b/kernel/include/uapi/linux/inet_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_INET_DIAG_H_
 #define _UAPI_INET_DIAG_H_
 
diff --git a/kernel/include/uapi/linux/inotify.h b/kernel/include/uapi/linux/inotify.h
index e6bf35b2d..547446168 100644
--- a/kernel/include/uapi/linux/inotify.h
+++ b/kernel/include/uapi/linux/inotify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Inode based directory notification for Linux
  *
diff --git a/kernel/include/uapi/linux/input-event-codes.h b/kernel/include/uapi/linux/input-event-codes.h
index 179891074..f4058bd4c 100644
--- a/kernel/include/uapi/linux/input-event-codes.h
+++ b/kernel/include/uapi/linux/input-event-codes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Input event codes
  *
diff --git a/kernel/include/uapi/linux/input.h b/kernel/include/uapi/linux/input.h
index f561c0eb7..8c5a0bf6e 100644
--- a/kernel/include/uapi/linux/input.h
+++ b/kernel/include/uapi/linux/input.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 1999-2002 Vojtech Pavlik
  *
diff --git a/kernel/include/uapi/linux/ioctl.h b/kernel/include/uapi/linux/ioctl.h
index aa91eb395..b292e8093 100644
--- a/kernel/include/uapi/linux/ioctl.h
+++ b/kernel/include/uapi/linux/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_IOCTL_H
 #define _LINUX_IOCTL_H
 
diff --git a/kernel/include/uapi/linux/ip.h b/kernel/include/uapi/linux/ip.h
index f29156976..b24a742be 100644
--- a/kernel/include/uapi/linux/ip.h
+++ b/kernel/include/uapi/linux/ip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/ip6_tunnel.h b/kernel/include/uapi/linux/ip6_tunnel.h
index 425926c46..51f29308a 100644
--- a/kernel/include/uapi/linux/ip6_tunnel.h
+++ b/kernel/include/uapi/linux/ip6_tunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6_TUNNEL_H
 #define _IP6_TUNNEL_H
 
diff --git a/kernel/include/uapi/linux/ip_vs.h b/kernel/include/uapi/linux/ip_vs.h
index 22d69894b..1c916b2f8 100644
--- a/kernel/include/uapi/linux/ip_vs.h
+++ b/kernel/include/uapi/linux/ip_vs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *      IP Virtual Server
  *      data structure and functionality definitions
diff --git a/kernel/include/uapi/linux/ipc.h b/kernel/include/uapi/linux/ipc.h
index de08dd46d..5995fc9d6 100644
--- a/kernel/include/uapi/linux/ipc.h
+++ b/kernel/include/uapi/linux/ipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_IPC_H
 #define _UAPI_LINUX_IPC_H
 
diff --git a/kernel/include/uapi/linux/ipmi.h b/kernel/include/uapi/linux/ipmi.h
index b9095a27a..b076f7a47 100644
--- a/kernel/include/uapi/linux/ipmi.h
+++ b/kernel/include/uapi/linux/ipmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * ipmi.h
  *
diff --git a/kernel/include/uapi/linux/ipmi_msgdefs.h b/kernel/include/uapi/linux/ipmi_msgdefs.h
index df97e6e31..17f349459 100644
--- a/kernel/include/uapi/linux/ipmi_msgdefs.h
+++ b/kernel/include/uapi/linux/ipmi_msgdefs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * ipmi_smi.h
  *
diff --git a/kernel/include/uapi/linux/ipsec.h b/kernel/include/uapi/linux/ipsec.h
index d17a6302a..50d8ee179 100644
--- a/kernel/include/uapi/linux/ipsec.h
+++ b/kernel/include/uapi/linux/ipsec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_IPSEC_H
 #define _LINUX_IPSEC_H
 
diff --git a/kernel/include/uapi/linux/ipv6.h b/kernel/include/uapi/linux/ipv6.h
index 2ae591781..b22a9c4e1 100644
--- a/kernel/include/uapi/linux/ipv6.h
+++ b/kernel/include/uapi/linux/ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_IPV6_H
 #define _UAPI_IPV6_H
 
diff --git a/kernel/include/uapi/linux/ipv6_route.h b/kernel/include/uapi/linux/ipv6_route.h
index d496c02e1..a96eb17ad 100644
--- a/kernel/include/uapi/linux/ipv6_route.h
+++ b/kernel/include/uapi/linux/ipv6_route.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	Linux INET6 implementation 
  *
diff --git a/kernel/include/uapi/linux/ipx.h b/kernel/include/uapi/linux/ipx.h
index 30f031db1..3168137ad 100644
--- a/kernel/include/uapi/linux/ipx.h
+++ b/kernel/include/uapi/linux/ipx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPX_H_
 #define _IPX_H_
 #include <linux/libc-compat.h>	/* for compatibility with glibc netipx/ipx.h */
diff --git a/kernel/include/uapi/linux/irda.h b/kernel/include/uapi/linux/irda.h
index a014c3252..2105c266a 100644
--- a/kernel/include/uapi/linux/irda.h
+++ b/kernel/include/uapi/linux/irda.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*********************************************************************
  *                
  * Filename:      irda.h
diff --git a/kernel/include/uapi/linux/isdn.h b/kernel/include/uapi/linux/isdn.h
index eb1995fff..f371fd52e 100644
--- a/kernel/include/uapi/linux/isdn.h
+++ b/kernel/include/uapi/linux/isdn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: isdn.h,v 1.125.2.3 2004/02/10 01:07:14 keil Exp $
  *
  * Main header for the Linux ISDN subsystem (linklevel).
diff --git a/kernel/include/uapi/linux/isdn/capicmd.h b/kernel/include/uapi/linux/isdn/capicmd.h
index b58635f72..4941628a4 100644
--- a/kernel/include/uapi/linux/isdn/capicmd.h
+++ b/kernel/include/uapi/linux/isdn/capicmd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: capicmd.h,v 1.2.6.2 2001/09/23 22:24:33 kai Exp $
  * 
  * CAPI 2.0 Interface for Linux
diff --git a/kernel/include/uapi/linux/isdn_divertif.h b/kernel/include/uapi/linux/isdn_divertif.h
index 3e3c2d898..0a17bb1bc 100644
--- a/kernel/include/uapi/linux/isdn_divertif.h
+++ b/kernel/include/uapi/linux/isdn_divertif.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: isdn_divertif.h,v 1.4.6.1 2001/09/23 22:25:05 kai Exp $
  *
  * Header for the diversion supplementary interface for i4l.
diff --git a/kernel/include/uapi/linux/isdn_ppp.h b/kernel/include/uapi/linux/isdn_ppp.h
index e7d7bd2ae..0bdc4efaa 100644
--- a/kernel/include/uapi/linux/isdn_ppp.h
+++ b/kernel/include/uapi/linux/isdn_ppp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /* Linux ISDN subsystem, sync PPP, interface to ipppd
  *
  * Copyright 1994-1999  by Fritz Elfert (fritz@isdn4linux.de)
diff --git a/kernel/include/uapi/linux/isdnif.h b/kernel/include/uapi/linux/isdnif.h
index 246138c01..611a69196 100644
--- a/kernel/include/uapi/linux/isdnif.h
+++ b/kernel/include/uapi/linux/isdnif.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /* $Id: isdnif.h,v 1.43.2.2 2004/01/12 23:08:35 keil Exp $
  *
  * Linux ISDN subsystem
diff --git a/kernel/include/uapi/linux/iso_fs.h b/kernel/include/uapi/linux/iso_fs.h
index 4688ac428..78b4ebcf8 100644
--- a/kernel/include/uapi/linux/iso_fs.h
+++ b/kernel/include/uapi/linux/iso_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ISOFS_FS_H
 #define _ISOFS_FS_H
 
diff --git a/kernel/include/uapi/linux/ivtv.h b/kernel/include/uapi/linux/ivtv.h
index 42bf72575..e74f18642 100644
--- a/kernel/include/uapi/linux/ivtv.h
+++ b/kernel/include/uapi/linux/ivtv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
     Public ivtv API header
     Copyright (C) 2003-2004  Kevin Thayer <nufan_wfk at yahoo.com>
diff --git a/kernel/include/uapi/linux/ivtvfb.h b/kernel/include/uapi/linux/ivtvfb.h
index e8b92f67f..9e9b07237 100644
--- a/kernel/include/uapi/linux/ivtvfb.h
+++ b/kernel/include/uapi/linux/ivtvfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
     On Screen Display cx23415 Framebuffer driver
 
diff --git a/kernel/include/uapi/linux/ixjuser.h b/kernel/include/uapi/linux/ixjuser.h
index 94ab5e942..ba245007c 100644
--- a/kernel/include/uapi/linux/ixjuser.h
+++ b/kernel/include/uapi/linux/ixjuser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef __LINUX_IXJUSER_H
 #define __LINUX_IXJUSER_H
 
diff --git a/kernel/include/uapi/linux/joystick.h b/kernel/include/uapi/linux/joystick.h
index b856fd11c..64aabb84a 100644
--- a/kernel/include/uapi/linux/joystick.h
+++ b/kernel/include/uapi/linux/joystick.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Copyright (C) 1996-2000 Vojtech Pavlik
  *
diff --git a/kernel/include/uapi/linux/kcm.h b/kernel/include/uapi/linux/kcm.h
index a5a530940..01361ea35 100644
--- a/kernel/include/uapi/linux/kcm.h
+++ b/kernel/include/uapi/linux/kcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Kernel Connection Multiplexor
  *
diff --git a/kernel/include/uapi/linux/kcmp.h b/kernel/include/uapi/linux/kcmp.h
index 481e103da..ef1305010 100644
--- a/kernel/include/uapi/linux/kcmp.h
+++ b/kernel/include/uapi/linux/kcmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_KCMP_H
 #define _UAPI_LINUX_KCMP_H
 
diff --git a/kernel/include/uapi/linux/kcov.h b/kernel/include/uapi/linux/kcov.h
index 574e22ec6..33eabbb8a 100644
--- a/kernel/include/uapi/linux/kcov.h
+++ b/kernel/include/uapi/linux/kcov.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_KCOV_IOCTLS_H
 #define _LINUX_KCOV_IOCTLS_H
 
diff --git a/kernel/include/uapi/linux/kd.h b/kernel/include/uapi/linux/kd.h
index 87b7cc439..4616b31f8 100644
--- a/kernel/include/uapi/linux/kd.h
+++ b/kernel/include/uapi/linux/kd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_KD_H
 #define _UAPI_LINUX_KD_H
 #include <linux/types.h>
diff --git a/kernel/include/uapi/linux/kdev_t.h b/kernel/include/uapi/linux/kdev_t.h
index 0d881fa7e..e1990f2e9 100644
--- a/kernel/include/uapi/linux/kdev_t.h
+++ b/kernel/include/uapi/linux/kdev_t.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_KDEV_T_H
 #define _UAPI_LINUX_KDEV_T_H
 #ifndef __KERNEL__
diff --git a/kernel/include/uapi/linux/kernel-page-flags.h b/kernel/include/uapi/linux/kernel-page-flags.h
index 5da5f8751..fa139841e 100644
--- a/kernel/include/uapi/linux/kernel-page-flags.h
+++ b/kernel/include/uapi/linux/kernel-page-flags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPILINUX_KERNEL_PAGE_FLAGS_H
 #define _UAPILINUX_KERNEL_PAGE_FLAGS_H
 
diff --git a/kernel/include/uapi/linux/kernel.h b/kernel/include/uapi/linux/kernel.h
index 466073f0c..0ff8f7477 100644
--- a/kernel/include/uapi/linux/kernel.h
+++ b/kernel/include/uapi/linux/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_KERNEL_H
 #define _UAPI_LINUX_KERNEL_H
 
diff --git a/kernel/include/uapi/linux/kernelcapi.h b/kernel/include/uapi/linux/kernelcapi.h
index 89bf40d36..325a856e0 100644
--- a/kernel/include/uapi/linux/kernelcapi.h
+++ b/kernel/include/uapi/linux/kernelcapi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * $Id: kernelcapi.h,v 1.8.6.2 2001/02/07 11:31:31 kai Exp $
  * 
diff --git a/kernel/include/uapi/linux/kexec.h b/kernel/include/uapi/linux/kexec.h
index aae5ebf20..6d1128682 100644
--- a/kernel/include/uapi/linux/kexec.h
+++ b/kernel/include/uapi/linux/kexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPILINUX_KEXEC_H
 #define _UAPILINUX_KEXEC_H
 
diff --git a/kernel/include/uapi/linux/keyboard.h b/kernel/include/uapi/linux/keyboard.h
index 5a6849721..ab4108c83 100644
--- a/kernel/include/uapi/linux/keyboard.h
+++ b/kernel/include/uapi/linux/keyboard.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_KEYBOARD_H
 #define _UAPI__LINUX_KEYBOARD_H
 
diff --git a/kernel/include/uapi/linux/keyctl.h b/kernel/include/uapi/linux/keyctl.h
index ef16df066..7b8c9e19b 100644
--- a/kernel/include/uapi/linux/keyctl.h
+++ b/kernel/include/uapi/linux/keyctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* keyctl.h: keyctl command IDs
  *
  * Copyright (C) 2004, 2008 Red Hat, Inc. All Rights Reserved.
diff --git a/kernel/include/uapi/linux/kvm.h b/kernel/include/uapi/linux/kvm.h
index 838887587..7e99999d6 100644
--- a/kernel/include/uapi/linux/kvm.h
+++ b/kernel/include/uapi/linux/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_KVM_H
 #define __LINUX_KVM_H
 
diff --git a/kernel/include/uapi/linux/kvm_para.h b/kernel/include/uapi/linux/kvm_para.h
index fed506aef..dcf629dd2 100644
--- a/kernel/include/uapi/linux/kvm_para.h
+++ b/kernel/include/uapi/linux/kvm_para.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_KVM_PARA_H
 #define _UAPI__LINUX_KVM_PARA_H
 
diff --git a/kernel/include/uapi/linux/l2tp.h b/kernel/include/uapi/linux/l2tp.h
index b23c1914a..d84ce5c1c 100644
--- a/kernel/include/uapi/linux/l2tp.h
+++ b/kernel/include/uapi/linux/l2tp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * L2TP-over-IP socket for L2TPv3.
  *
diff --git a/kernel/include/uapi/linux/libc-compat.h b/kernel/include/uapi/linux/libc-compat.h
index 44b8a6bd5..282875cf8 100644
--- a/kernel/include/uapi/linux/libc-compat.h
+++ b/kernel/include/uapi/linux/libc-compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Compatibility interface for userspace libc header coordination:
  *
diff --git a/kernel/include/uapi/linux/lightnvm.h b/kernel/include/uapi/linux/lightnvm.h
index c8aec4b9e..42d1a434a 100644
--- a/kernel/include/uapi/linux/lightnvm.h
+++ b/kernel/include/uapi/linux/lightnvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2015 CNEX Labs.  All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/limits.h b/kernel/include/uapi/linux/limits.h
index 2d0f94162..c3547f076 100644
--- a/kernel/include/uapi/linux/limits.h
+++ b/kernel/include/uapi/linux/limits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_LIMITS_H
 #define _LINUX_LIMITS_H
 
diff --git a/kernel/include/uapi/linux/lirc.h b/kernel/include/uapi/linux/lirc.h
index 991ab4570..c3aef4316 100644
--- a/kernel/include/uapi/linux/lirc.h
+++ b/kernel/include/uapi/linux/lirc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * lirc.h - linux infrared remote control header file
  * last modified 2010/07/13 by Jarod Wilson
diff --git a/kernel/include/uapi/linux/llc.h b/kernel/include/uapi/linux/llc.h
index a6c17f66e..cf8806b14 100644
--- a/kernel/include/uapi/linux/llc.h
+++ b/kernel/include/uapi/linux/llc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
  *
diff --git a/kernel/include/uapi/linux/loop.h b/kernel/include/uapi/linux/loop.h
index 23158dbe2..080a8df13 100644
--- a/kernel/include/uapi/linux/loop.h
+++ b/kernel/include/uapi/linux/loop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * include/linux/loop.h
  *
diff --git a/kernel/include/uapi/linux/lp.h b/kernel/include/uapi/linux/lp.h
index a3406a51f..dafcfe4e4 100644
--- a/kernel/include/uapi/linux/lp.h
+++ b/kernel/include/uapi/linux/lp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * usr/include/linux/lp.h c.1991-1992 James Wiegand
  * many modifications copyright (C) 1992 Michael K. Johnson
diff --git a/kernel/include/uapi/linux/lwtunnel.h b/kernel/include/uapi/linux/lwtunnel.h
index 7fdd19ca7..de696ca12 100644
--- a/kernel/include/uapi/linux/lwtunnel.h
+++ b/kernel/include/uapi/linux/lwtunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LWTUNNEL_H_
 #define _UAPI_LWTUNNEL_H_
 
diff --git a/kernel/include/uapi/linux/magic.h b/kernel/include/uapi/linux/magic.h
index e439565df..aa50113eb 100644
--- a/kernel/include/uapi/linux/magic.h
+++ b/kernel/include/uapi/linux/magic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_MAGIC_H__
 #define __LINUX_MAGIC_H__
 
diff --git a/kernel/include/uapi/linux/major.h b/kernel/include/uapi/linux/major.h
index 19e195bee..7e5fa8e15 100644
--- a/kernel/include/uapi/linux/major.h
+++ b/kernel/include/uapi/linux/major.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_MAJOR_H
 #define _LINUX_MAJOR_H
 
diff --git a/kernel/include/uapi/linux/map_to_7segment.h b/kernel/include/uapi/linux/map_to_7segment.h
index 12d62a54d..f9ed18134 100644
--- a/kernel/include/uapi/linux/map_to_7segment.h
+++ b/kernel/include/uapi/linux/map_to_7segment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2005 Henk Vergonet <Henk.Vergonet@gmail.com>
  *
diff --git a/kernel/include/uapi/linux/matroxfb.h b/kernel/include/uapi/linux/matroxfb.h
index 8c22a8938..23e025b7e 100644
--- a/kernel/include/uapi/linux/matroxfb.h
+++ b/kernel/include/uapi/linux/matroxfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_MATROXFB_H__
 #define __LINUX_MATROXFB_H__
 
diff --git a/kernel/include/uapi/linux/max2175.h b/kernel/include/uapi/linux/max2175.h
index 3ef5d2644..daedc4eb9 100644
--- a/kernel/include/uapi/linux/max2175.h
+++ b/kernel/include/uapi/linux/max2175.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * max2175.h
  *
diff --git a/kernel/include/uapi/linux/mdio.h b/kernel/include/uapi/linux/mdio.h
index c94a510a5..d435b00d6 100644
--- a/kernel/include/uapi/linux/mdio.h
+++ b/kernel/include/uapi/linux/mdio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/mdio.h: definitions for MDIO (clause 45) transceivers
  * Copyright 2006-2009 Solarflare Communications Inc.
diff --git a/kernel/include/uapi/linux/media-bus-format.h b/kernel/include/uapi/linux/media-bus-format.h
index ef6fb307d..9e3511742 100644
--- a/kernel/include/uapi/linux/media-bus-format.h
+++ b/kernel/include/uapi/linux/media-bus-format.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Media Bus API header
  *
diff --git a/kernel/include/uapi/linux/media.h b/kernel/include/uapi/linux/media.h
index 4865f1e71..b9b944609 100644
--- a/kernel/include/uapi/linux/media.h
+++ b/kernel/include/uapi/linux/media.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Multimedia device API
  *
diff --git a/kernel/include/uapi/linux/mei.h b/kernel/include/uapi/linux/mei.h
index 7c3b64f6a..0f681cbd3 100644
--- a/kernel/include/uapi/linux/mei.h
+++ b/kernel/include/uapi/linux/mei.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /******************************************************************************
  * Intel Management Engine Interface (Intel MEI) Linux driver
  * Intel MEI Interface Header
diff --git a/kernel/include/uapi/linux/memfd.h b/kernel/include/uapi/linux/memfd.h
index 7f3a722db..015a4c0bb 100644
--- a/kernel/include/uapi/linux/memfd.h
+++ b/kernel/include/uapi/linux/memfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MEMFD_H
 #define _UAPI_LINUX_MEMFD_H
 
diff --git a/kernel/include/uapi/linux/mempolicy.h b/kernel/include/uapi/linux/mempolicy.h
index 2a4d89508..3354774af 100644
--- a/kernel/include/uapi/linux/mempolicy.h
+++ b/kernel/include/uapi/linux/mempolicy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * NUMA memory policies for Linux.
  * Copyright 2003,2004 Andi Kleen SuSE Labs
diff --git a/kernel/include/uapi/linux/meye.h b/kernel/include/uapi/linux/meye.h
index 8ff50fe9e..de9e3a954 100644
--- a/kernel/include/uapi/linux/meye.h
+++ b/kernel/include/uapi/linux/meye.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Motion Eye video4linux driver for Sony Vaio PictureBook
  *
diff --git a/kernel/include/uapi/linux/mic_common.h b/kernel/include/uapi/linux/mic_common.h
index e96863720..504e523f7 100644
--- a/kernel/include/uapi/linux/mic_common.h
+++ b/kernel/include/uapi/linux/mic_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Intel MIC Platform Software Stack (MPSS)
  *
diff --git a/kernel/include/uapi/linux/mic_ioctl.h b/kernel/include/uapi/linux/mic_ioctl.h
index feb0b4c08..687b9cd9d 100644
--- a/kernel/include/uapi/linux/mic_ioctl.h
+++ b/kernel/include/uapi/linux/mic_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Intel MIC Platform Software Stack (MPSS)
  *
diff --git a/kernel/include/uapi/linux/mii.h b/kernel/include/uapi/linux/mii.h
index 15d8510cd..b5c2fdcf2 100644
--- a/kernel/include/uapi/linux/mii.h
+++ b/kernel/include/uapi/linux/mii.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/mii.h: definitions for MII-compatible transceivers
  * Originally drivers/net/sunhme.h.
diff --git a/kernel/include/uapi/linux/minix_fs.h b/kernel/include/uapi/linux/minix_fs.h
index 13fe09e05..95dbcb17e 100644
--- a/kernel/include/uapi/linux/minix_fs.h
+++ b/kernel/include/uapi/linux/minix_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_MINIX_FS_H
 #define _LINUX_MINIX_FS_H
 
diff --git a/kernel/include/uapi/linux/mman.h b/kernel/include/uapi/linux/mman.h
index a937480d7..bfd5938fe 100644
--- a/kernel/include/uapi/linux/mman.h
+++ b/kernel/include/uapi/linux/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MMAN_H
 #define _UAPI_LINUX_MMAN_H
 
diff --git a/kernel/include/uapi/linux/mmc/ioctl.h b/kernel/include/uapi/linux/mmc/ioctl.h
index 700a55156..45f369dc0 100644
--- a/kernel/include/uapi/linux/mmc/ioctl.h
+++ b/kernel/include/uapi/linux/mmc/ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef LINUX_MMC_IOCTL_H
 #define LINUX_MMC_IOCTL_H
 
diff --git a/kernel/include/uapi/linux/mmtimer.h b/kernel/include/uapi/linux/mmtimer.h
index 884cabf16..409fae1de 100644
--- a/kernel/include/uapi/linux/mmtimer.h
+++ b/kernel/include/uapi/linux/mmtimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Intel Multimedia Timer device interface
  *
diff --git a/kernel/include/uapi/linux/module.h b/kernel/include/uapi/linux/module.h
index 38da4258b..50d98ec5e 100644
--- a/kernel/include/uapi/linux/module.h
+++ b/kernel/include/uapi/linux/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MODULE_H
 #define _UAPI_LINUX_MODULE_H
 
diff --git a/kernel/include/uapi/linux/mpls.h b/kernel/include/uapi/linux/mpls.h
index 77a19dfe3..1ef5d6002 100644
--- a/kernel/include/uapi/linux/mpls.h
+++ b/kernel/include/uapi/linux/mpls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_MPLS_H
 #define _UAPI_MPLS_H
 
diff --git a/kernel/include/uapi/linux/mpls_iptunnel.h b/kernel/include/uapi/linux/mpls_iptunnel.h
index f5e45095b..521f2e605 100644
--- a/kernel/include/uapi/linux/mpls_iptunnel.h
+++ b/kernel/include/uapi/linux/mpls_iptunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	mpls tunnel api
  *
diff --git a/kernel/include/uapi/linux/mqueue.h b/kernel/include/uapi/linux/mqueue.h
index bbd5116ea..b516b6684 100644
--- a/kernel/include/uapi/linux/mqueue.h
+++ b/kernel/include/uapi/linux/mqueue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /* Copyright (C) 2003 Krzysztof Benedyczak & Michal Wronski
 
    This program is free software; you can redistribute it and/or
diff --git a/kernel/include/uapi/linux/mroute.h b/kernel/include/uapi/linux/mroute.h
index e8e5041de..10f9ff942 100644
--- a/kernel/include/uapi/linux/mroute.h
+++ b/kernel/include/uapi/linux/mroute.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_MROUTE_H
 #define _UAPI__LINUX_MROUTE_H
 
diff --git a/kernel/include/uapi/linux/mroute6.h b/kernel/include/uapi/linux/mroute6.h
index e4746816c..9999cc006 100644
--- a/kernel/include/uapi/linux/mroute6.h
+++ b/kernel/include/uapi/linux/mroute6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_MROUTE6_H
 #define _UAPI__LINUX_MROUTE6_H
 
diff --git a/kernel/include/uapi/linux/msdos_fs.h b/kernel/include/uapi/linux/msdos_fs.h
index e956704f5..a45d07541 100644
--- a/kernel/include/uapi/linux/msdos_fs.h
+++ b/kernel/include/uapi/linux/msdos_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MSDOS_FS_H
 #define _UAPI_LINUX_MSDOS_FS_H
 
diff --git a/kernel/include/uapi/linux/msg.h b/kernel/include/uapi/linux/msg.h
index f51c8001d..5d5ab81dc 100644
--- a/kernel/include/uapi/linux/msg.h
+++ b/kernel/include/uapi/linux/msg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MSG_H
 #define _UAPI_LINUX_MSG_H
 
diff --git a/kernel/include/uapi/linux/mtio.h b/kernel/include/uapi/linux/mtio.h
index 18543e2db..a1191fecc 100644
--- a/kernel/include/uapi/linux/mtio.h
+++ b/kernel/include/uapi/linux/mtio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* 
  * linux/mtio.h header file for Linux. Written by H. Bergman
  *
diff --git a/kernel/include/uapi/linux/n_r3964.h b/kernel/include/uapi/linux/n_r3964.h
index 81337cbf4..6bbd18520 100644
--- a/kernel/include/uapi/linux/n_r3964.h
+++ b/kernel/include/uapi/linux/n_r3964.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /* r3964 linediscipline for linux
  *
  * -----------------------------------------------------------
diff --git a/kernel/include/uapi/linux/nbd-netlink.h b/kernel/include/uapi/linux/nbd-netlink.h
index 6f7ca3d63..c5d0ef7aa 100644
--- a/kernel/include/uapi/linux/nbd-netlink.h
+++ b/kernel/include/uapi/linux/nbd-netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2017 Facebook.  All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/nbd.h b/kernel/include/uapi/linux/nbd.h
index a50527ebf..85a3fb65e 100644
--- a/kernel/include/uapi/linux/nbd.h
+++ b/kernel/include/uapi/linux/nbd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL.
  * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne)
diff --git a/kernel/include/uapi/linux/ncp.h b/kernel/include/uapi/linux/ncp.h
index 99f0adeeb..ca6f3d42c 100644
--- a/kernel/include/uapi/linux/ncp.h
+++ b/kernel/include/uapi/linux/ncp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  ncp.h
  *
diff --git a/kernel/include/uapi/linux/ncp_fs.h b/kernel/include/uapi/linux/ncp_fs.h
index e13eefef0..e76a44229 100644
--- a/kernel/include/uapi/linux/ncp_fs.h
+++ b/kernel/include/uapi/linux/ncp_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  ncp_fs.h
  *
diff --git a/kernel/include/uapi/linux/ncp_mount.h b/kernel/include/uapi/linux/ncp_mount.h
index dfcbea2d8..9bdbcd68c 100644
--- a/kernel/include/uapi/linux/ncp_mount.h
+++ b/kernel/include/uapi/linux/ncp_mount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  ncp_mount.h
  *
diff --git a/kernel/include/uapi/linux/ncp_no.h b/kernel/include/uapi/linux/ncp_no.h
index cddaa48fb..654d7c7f5 100644
--- a/kernel/include/uapi/linux/ncp_no.h
+++ b/kernel/include/uapi/linux/ncp_no.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NCP_NO
 #define _NCP_NO
 
diff --git a/kernel/include/uapi/linux/neighbour.h b/kernel/include/uapi/linux/neighbour.h
index 3199d2898..904db6148 100644
--- a/kernel/include/uapi/linux/neighbour.h
+++ b/kernel/include/uapi/linux/neighbour.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_NEIGHBOUR_H
 #define __LINUX_NEIGHBOUR_H
 
diff --git a/kernel/include/uapi/linux/net.h b/kernel/include/uapi/linux/net.h
index 9457239ed..4dabec6bd 100644
--- a/kernel/include/uapi/linux/net.h
+++ b/kernel/include/uapi/linux/net.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * NET		An implementation of the SOCKET network access protocol.
  *		This is the master header file for the Linux NET layer,
diff --git a/kernel/include/uapi/linux/net_dropmon.h b/kernel/include/uapi/linux/net_dropmon.h
index 2a739462c..5edbd0a67 100644
--- a/kernel/include/uapi/linux/net_dropmon.h
+++ b/kernel/include/uapi/linux/net_dropmon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __NET_DROPMON_H
 #define __NET_DROPMON_H
 
diff --git a/kernel/include/uapi/linux/net_namespace.h b/kernel/include/uapi/linux/net_namespace.h
index 778cd2c3e..0187c74d8 100644
--- a/kernel/include/uapi/linux/net_namespace.h
+++ b/kernel/include/uapi/linux/net_namespace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (c) 2015 6WIND S.A.
  * Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>
  *
diff --git a/kernel/include/uapi/linux/net_tstamp.h b/kernel/include/uapi/linux/net_tstamp.h
index 3d421d912..4fe104b24 100644
--- a/kernel/include/uapi/linux/net_tstamp.h
+++ b/kernel/include/uapi/linux/net_tstamp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Userspace API for hardware time stamping of network packets
  *
diff --git a/kernel/include/uapi/linux/netconf.h b/kernel/include/uapi/linux/netconf.h
index 7e5f0f3e3..c84fcdfca 100644
--- a/kernel/include/uapi/linux/netconf.h
+++ b/kernel/include/uapi/linux/netconf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_NETCONF_H_
 #define _UAPI_LINUX_NETCONF_H_
 
diff --git a/kernel/include/uapi/linux/netdevice.h b/kernel/include/uapi/linux/netdevice.h
index 558185433..f3770c5b0 100644
--- a/kernel/include/uapi/linux/netdevice.h
+++ b/kernel/include/uapi/linux/netdevice.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/netfilter.h b/kernel/include/uapi/linux/netfilter.h
index c111a91ad..cca10e767 100644
--- a/kernel/include/uapi/linux/netfilter.h
+++ b/kernel/include/uapi/linux/netfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_NETFILTER_H
 #define _UAPI__LINUX_NETFILTER_H
 
diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h
index ebb515497..60236f694 100644
--- a/kernel/include/uapi/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
  *                         Patrick Schaaf <bof@bof.de>
  *                         Martin Josefsson <gandalf@wlug.westbo.se>
diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
index fd5024d26..c6b146db9 100644
--- a/kernel/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
+++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set_bitmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__IP_SET_BITMAP_H
 #define _UAPI__IP_SET_BITMAP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set_hash.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set_hash.h
index 82deeb883..880749ace 100644
--- a/kernel/include/uapi/linux/netfilter/ipset/ip_set_hash.h
+++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set_hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__IP_SET_HASH_H
 #define _UAPI__IP_SET_HASH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/ipset/ip_set_list.h b/kernel/include/uapi/linux/netfilter/ipset/ip_set_list.h
index 84d430368..e6d7feb52 100644
--- a/kernel/include/uapi/linux/netfilter/ipset/ip_set_list.h
+++ b/kernel/include/uapi/linux/netfilter/ipset/ip_set_list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__IP_SET_LIST_H
 #define _UAPI__IP_SET_LIST_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nf_conntrack_common.h b/kernel/include/uapi/linux/netfilter/nf_conntrack_common.h
index dc947e59d..3fea7709a 100644
--- a/kernel/include/uapi/linux/netfilter/nf_conntrack_common.h
+++ b/kernel/include/uapi/linux/netfilter/nf_conntrack_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_NF_CONNTRACK_COMMON_H
 #define _UAPI_NF_CONNTRACK_COMMON_H
 /* Connection state tracking for netfilter.  This is separated from,
diff --git a/kernel/include/uapi/linux/netfilter/nf_conntrack_ftp.h b/kernel/include/uapi/linux/netfilter/nf_conntrack_ftp.h
index 1030315a4..8eb6b9ef2 100644
--- a/kernel/include/uapi/linux/netfilter/nf_conntrack_ftp.h
+++ b/kernel/include/uapi/linux/netfilter/nf_conntrack_ftp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_NF_CONNTRACK_FTP_H
 #define _UAPI_NF_CONNTRACK_FTP_H
 /* FTP tracking. */
diff --git a/kernel/include/uapi/linux/netfilter/nf_conntrack_sctp.h b/kernel/include/uapi/linux/netfilter/nf_conntrack_sctp.h
index 2cbc366c3..edc6ddab0 100644
--- a/kernel/include/uapi/linux/netfilter/nf_conntrack_sctp.h
+++ b/kernel/include/uapi/linux/netfilter/nf_conntrack_sctp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_NF_CONNTRACK_SCTP_H
 #define _UAPI_NF_CONNTRACK_SCTP_H
 /* SCTP tracking. */
diff --git a/kernel/include/uapi/linux/netfilter/nf_conntrack_tcp.h b/kernel/include/uapi/linux/netfilter/nf_conntrack_tcp.h
index ef9f80f0f..74b91151d 100644
--- a/kernel/include/uapi/linux/netfilter/nf_conntrack_tcp.h
+++ b/kernel/include/uapi/linux/netfilter/nf_conntrack_tcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_NF_CONNTRACK_TCP_H
 #define _UAPI_NF_CONNTRACK_TCP_H
 /* TCP tracking. */
diff --git a/kernel/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h b/kernel/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
index 526b42496..64390fac6 100644
--- a/kernel/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
+++ b/kernel/include/uapi/linux/netfilter/nf_conntrack_tuple_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NF_CONNTRACK_TUPLE_COMMON_H
 #define _NF_CONNTRACK_TUPLE_COMMON_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nf_log.h b/kernel/include/uapi/linux/netfilter/nf_log.h
index d0b5fa91f..2ae00932d 100644
--- a/kernel/include/uapi/linux/netfilter/nf_log.h
+++ b/kernel/include/uapi/linux/netfilter/nf_log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NETFILTER_NF_LOG_H
 #define _NETFILTER_NF_LOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nf_nat.h b/kernel/include/uapi/linux/netfilter/nf_nat.h
index 0880781ad..a33000da7 100644
--- a/kernel/include/uapi/linux/netfilter/nf_nat.h
+++ b/kernel/include/uapi/linux/netfilter/nf_nat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NETFILTER_NF_NAT_H
 #define _NETFILTER_NF_NAT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nf_tables.h b/kernel/include/uapi/linux/netfilter/nf_tables.h
index 871afa487..a3ee277b1 100644
--- a/kernel/include/uapi/linux/netfilter/nf_tables.h
+++ b/kernel/include/uapi/linux/netfilter/nf_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NF_TABLES_H
 #define _LINUX_NF_TABLES_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nf_tables_compat.h b/kernel/include/uapi/linux/netfilter/nf_tables_compat.h
index 8310f5f76..0e2b9fcb7 100644
--- a/kernel/include/uapi/linux/netfilter/nf_tables_compat.h
+++ b/kernel/include/uapi/linux/netfilter/nf_tables_compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NFT_COMPAT_NFNETLINK_H_
 #define _NFT_COMPAT_NFNETLINK_H_
 
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink.h b/kernel/include/uapi/linux/netfilter/nfnetlink.h
index a09906a30..5bc960f22 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_NFNETLINK_H
 #define _UAPI_NFNETLINK_H
 #include <linux/types.h>
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_acct.h b/kernel/include/uapi/linux/netfilter/nfnetlink_acct.h
index 36047ec70..7cb66d321 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_acct.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_acct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_NFNL_ACCT_H_
 #define _UAPI_NFNL_ACCT_H_
 
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_compat.h b/kernel/include/uapi/linux/netfilter/nfnetlink_compat.h
index ffb95036b..93bcdccef 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_compat.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NFNETLINK_COMPAT_H
 #define _NFNETLINK_COMPAT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/kernel/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index 6deb8867c..7397e022c 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_conntrack.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_conntrack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPCONNTRACK_NETLINK_H
 #define _IPCONNTRACK_NETLINK_H
 #include <linux/netfilter/nfnetlink.h>
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_cthelper.h b/kernel/include/uapi/linux/netfilter/nfnetlink_cthelper.h
index 33659f6fa..a13137afc 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_cthelper.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_cthelper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NFNL_CTHELPER_H_
 #define _NFNL_CTHELPER_H_
 
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_cttimeout.h b/kernel/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
index f2c10dc14..6b20fb227 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _CTTIMEOUT_NETLINK_H
 #define _CTTIMEOUT_NETLINK_H
 #include <linux/netfilter/nfnetlink.h>
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_log.h b/kernel/include/uapi/linux/netfilter/nfnetlink_log.h
index fb21f0c71..20983cb19 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_log.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NFNETLINK_LOG_H
 #define _NFNETLINK_LOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter/nfnetlink_queue.h b/kernel/include/uapi/linux/netfilter/nfnetlink_queue.h
index d42f0396f..bcb2cb5d4 100644
--- a/kernel/include/uapi/linux/netfilter/nfnetlink_queue.h
+++ b/kernel/include/uapi/linux/netfilter/nfnetlink_queue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NFNETLINK_QUEUE_H
 #define _NFNETLINK_QUEUE_H
 
diff --git a/kernel/include/uapi/linux/netfilter/x_tables.h b/kernel/include/uapi/linux/netfilter/x_tables.h
index c36969b91..a8283f7db 100644
--- a/kernel/include/uapi/linux/netfilter/x_tables.h
+++ b/kernel/include/uapi/linux/netfilter/x_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_X_TABLES_H
 #define _UAPI_X_TABLES_H
 #include <linux/kernel.h>
diff --git a/kernel/include/uapi/linux/netfilter/xt_AUDIT.h b/kernel/include/uapi/linux/netfilter/xt_AUDIT.h
index 38751d2ea..1b314e2f8 100644
--- a/kernel/include/uapi/linux/netfilter/xt_AUDIT.h
+++ b/kernel/include/uapi/linux/netfilter/xt_AUDIT.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Header file for iptables xt_AUDIT target
  *
diff --git a/kernel/include/uapi/linux/netfilter/xt_CHECKSUM.h b/kernel/include/uapi/linux/netfilter/xt_CHECKSUM.h
index 9a2e46616..c578088e6 100644
--- a/kernel/include/uapi/linux/netfilter/xt_CHECKSUM.h
+++ b/kernel/include/uapi/linux/netfilter/xt_CHECKSUM.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Header file for iptables ipt_CHECKSUM target
  *
  * (C) 2002 by Harald Welte <laforge@gnumonks.org>
diff --git a/kernel/include/uapi/linux/netfilter/xt_CLASSIFY.h b/kernel/include/uapi/linux/netfilter/xt_CLASSIFY.h
index a813bf14d..fe059a98c 100644
--- a/kernel/include/uapi/linux/netfilter/xt_CLASSIFY.h
+++ b/kernel/include/uapi/linux/netfilter/xt_CLASSIFY.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CLASSIFY_H
 #define _XT_CLASSIFY_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_CONNMARK.h b/kernel/include/uapi/linux/netfilter/xt_CONNMARK.h
index 2f2e48ec8..36cc956ea 100644
--- a/kernel/include/uapi/linux/netfilter/xt_CONNMARK.h
+++ b/kernel/include/uapi/linux/netfilter/xt_CONNMARK.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CONNMARK_H_target
 #define _XT_CONNMARK_H_target
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_CONNSECMARK.h b/kernel/include/uapi/linux/netfilter/xt_CONNSECMARK.h
index b973ff80f..ca078bb3c 100644
--- a/kernel/include/uapi/linux/netfilter/xt_CONNSECMARK.h
+++ b/kernel/include/uapi/linux/netfilter/xt_CONNSECMARK.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CONNSECMARK_H_target
 #define _XT_CONNSECMARK_H_target
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_CT.h b/kernel/include/uapi/linux/netfilter/xt_CT.h
index 9e520418b..868fa08e1 100644
--- a/kernel/include/uapi/linux/netfilter/xt_CT.h
+++ b/kernel/include/uapi/linux/netfilter/xt_CT.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CT_H
 #define _XT_CT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_DSCP.h b/kernel/include/uapi/linux/netfilter/xt_DSCP.h
index 648e0b3be..223d635e8 100644
--- a/kernel/include/uapi/linux/netfilter/xt_DSCP.h
+++ b/kernel/include/uapi/linux/netfilter/xt_DSCP.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* x_tables module for setting the IPv4/IPv6 DSCP field
  *
  * (C) 2002 Harald Welte <laforge@gnumonks.org>
diff --git a/kernel/include/uapi/linux/netfilter/xt_HMARK.h b/kernel/include/uapi/linux/netfilter/xt_HMARK.h
index 3fb48c8d8..2d4b751a7 100644
--- a/kernel/include/uapi/linux/netfilter/xt_HMARK.h
+++ b/kernel/include/uapi/linux/netfilter/xt_HMARK.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef XT_HMARK_H_
 #define XT_HMARK_H_
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_IDLETIMER.h b/kernel/include/uapi/linux/netfilter/xt_IDLETIMER.h
index 208ae9387..3c586a19b 100644
--- a/kernel/include/uapi/linux/netfilter/xt_IDLETIMER.h
+++ b/kernel/include/uapi/linux/netfilter/xt_IDLETIMER.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/linux/netfilter/xt_IDLETIMER.h
  *
diff --git a/kernel/include/uapi/linux/netfilter/xt_LED.h b/kernel/include/uapi/linux/netfilter/xt_LED.h
index f5509e752..4fe0f1395 100644
--- a/kernel/include/uapi/linux/netfilter/xt_LED.h
+++ b/kernel/include/uapi/linux/netfilter/xt_LED.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_LED_H
 #define _XT_LED_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_LOG.h b/kernel/include/uapi/linux/netfilter/xt_LOG.h
index cac079095..167d4ddd2 100644
--- a/kernel/include/uapi/linux/netfilter/xt_LOG.h
+++ b/kernel/include/uapi/linux/netfilter/xt_LOG.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_LOG_H
 #define _XT_LOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_MARK.h b/kernel/include/uapi/linux/netfilter/xt_MARK.h
index 41c456deb..f1fe2b4be 100644
--- a/kernel/include/uapi/linux/netfilter/xt_MARK.h
+++ b/kernel/include/uapi/linux/netfilter/xt_MARK.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_MARK_H_target
 #define _XT_MARK_H_target
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_NFLOG.h b/kernel/include/uapi/linux/netfilter/xt_NFLOG.h
index f33070730..517809771 100644
--- a/kernel/include/uapi/linux/netfilter/xt_NFLOG.h
+++ b/kernel/include/uapi/linux/netfilter/xt_NFLOG.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_NFLOG_TARGET
 #define _XT_NFLOG_TARGET
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_NFQUEUE.h b/kernel/include/uapi/linux/netfilter/xt_NFQUEUE.h
index 8bb5fe657..bb767fd73 100644
--- a/kernel/include/uapi/linux/netfilter/xt_NFQUEUE.h
+++ b/kernel/include/uapi/linux/netfilter/xt_NFQUEUE.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* iptables module for using NFQUEUE mechanism
  *
  * (C) 2005 Harald Welte <laforge@netfilter.org>
diff --git a/kernel/include/uapi/linux/netfilter/xt_RATEEST.h b/kernel/include/uapi/linux/netfilter/xt_RATEEST.h
index ec1b57047..2b87a71e6 100644
--- a/kernel/include/uapi/linux/netfilter/xt_RATEEST.h
+++ b/kernel/include/uapi/linux/netfilter/xt_RATEEST.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_RATEEST_TARGET_H
 #define _XT_RATEEST_TARGET_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_SECMARK.h b/kernel/include/uapi/linux/netfilter/xt_SECMARK.h
index 989092bd6..1f2a70841 100644
--- a/kernel/include/uapi/linux/netfilter/xt_SECMARK.h
+++ b/kernel/include/uapi/linux/netfilter/xt_SECMARK.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_SECMARK_H_target
 #define _XT_SECMARK_H_target
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_SYNPROXY.h b/kernel/include/uapi/linux/netfilter/xt_SYNPROXY.h
index ca67e61d2..ea5eba15d 100644
--- a/kernel/include/uapi/linux/netfilter/xt_SYNPROXY.h
+++ b/kernel/include/uapi/linux/netfilter/xt_SYNPROXY.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_SYNPROXY_H
 #define _XT_SYNPROXY_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_TCPMSS.h b/kernel/include/uapi/linux/netfilter/xt_TCPMSS.h
index 9a6960afc..65ea6c9da 100644
--- a/kernel/include/uapi/linux/netfilter/xt_TCPMSS.h
+++ b/kernel/include/uapi/linux/netfilter/xt_TCPMSS.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TCPMSS_H
 #define _XT_TCPMSS_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h b/kernel/include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h
index 715731849..6bd51cd6f 100644
--- a/kernel/include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h
+++ b/kernel/include/uapi/linux/netfilter/xt_TCPOPTSTRIP.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TCPOPTSTRIP_H
 #define _XT_TCPOPTSTRIP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_TEE.h b/kernel/include/uapi/linux/netfilter/xt_TEE.h
index 010920234..eb854917f 100644
--- a/kernel/include/uapi/linux/netfilter/xt_TEE.h
+++ b/kernel/include/uapi/linux/netfilter/xt_TEE.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TEE_TARGET_H
 #define _XT_TEE_TARGET_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_TPROXY.h b/kernel/include/uapi/linux/netfilter/xt_TPROXY.h
index 8d693eefd..348957b02 100644
--- a/kernel/include/uapi/linux/netfilter/xt_TPROXY.h
+++ b/kernel/include/uapi/linux/netfilter/xt_TPROXY.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TPROXY_H
 #define _XT_TPROXY_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_addrtype.h b/kernel/include/uapi/linux/netfilter/xt_addrtype.h
index b156baa9d..2102dff74 100644
--- a/kernel/include/uapi/linux/netfilter/xt_addrtype.h
+++ b/kernel/include/uapi/linux/netfilter/xt_addrtype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_ADDRTYPE_H
 #define _XT_ADDRTYPE_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_bpf.h b/kernel/include/uapi/linux/netfilter/xt_bpf.h
index da161b56c..a05adda26 100644
--- a/kernel/include/uapi/linux/netfilter/xt_bpf.h
+++ b/kernel/include/uapi/linux/netfilter/xt_bpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_BPF_H
 #define _XT_BPF_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_cgroup.h b/kernel/include/uapi/linux/netfilter/xt_cgroup.h
index 1e4b37b93..e96dfa1b3 100644
--- a/kernel/include/uapi/linux/netfilter/xt_cgroup.h
+++ b/kernel/include/uapi/linux/netfilter/xt_cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_XT_CGROUP_H
 #define _UAPI_XT_CGROUP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_cluster.h b/kernel/include/uapi/linux/netfilter/xt_cluster.h
index 9b883c8fb..ed8e0561f 100644
--- a/kernel/include/uapi/linux/netfilter/xt_cluster.h
+++ b/kernel/include/uapi/linux/netfilter/xt_cluster.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CLUSTER_MATCH_H
 #define _XT_CLUSTER_MATCH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_comment.h b/kernel/include/uapi/linux/netfilter/xt_comment.h
index 0ea5e79f5..85d284082 100644
--- a/kernel/include/uapi/linux/netfilter/xt_comment.h
+++ b/kernel/include/uapi/linux/netfilter/xt_comment.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_COMMENT_H
 #define _XT_COMMENT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_connbytes.h b/kernel/include/uapi/linux/netfilter/xt_connbytes.h
index f1d6c15bd..0bae507db 100644
--- a/kernel/include/uapi/linux/netfilter/xt_connbytes.h
+++ b/kernel/include/uapi/linux/netfilter/xt_connbytes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CONNBYTES_H
 #define _XT_CONNBYTES_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_connlabel.h b/kernel/include/uapi/linux/netfilter/xt_connlabel.h
index c4bc9ee9b..2312f0ec0 100644
--- a/kernel/include/uapi/linux/netfilter/xt_connlabel.h
+++ b/kernel/include/uapi/linux/netfilter/xt_connlabel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <linux/types.h>
 
 #define XT_CONNLABEL_MAXBIT 127
diff --git a/kernel/include/uapi/linux/netfilter/xt_connlimit.h b/kernel/include/uapi/linux/netfilter/xt_connlimit.h
index f16560961..07e5e9d47 100644
--- a/kernel/include/uapi/linux/netfilter/xt_connlimit.h
+++ b/kernel/include/uapi/linux/netfilter/xt_connlimit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CONNLIMIT_H
 #define _XT_CONNLIMIT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_connmark.h b/kernel/include/uapi/linux/netfilter/xt_connmark.h
index efc17a830..408a9654f 100644
--- a/kernel/include/uapi/linux/netfilter/xt_connmark.h
+++ b/kernel/include/uapi/linux/netfilter/xt_connmark.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef _XT_CONNMARK_H
 #define _XT_CONNMARK_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_conntrack.h b/kernel/include/uapi/linux/netfilter/xt_conntrack.h
index e5bd3083a..cdd14a83d 100644
--- a/kernel/include/uapi/linux/netfilter/xt_conntrack.h
+++ b/kernel/include/uapi/linux/netfilter/xt_conntrack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /* Header file for kernel module to match connection tracking information.
  * GPL (C) 2001  Marc Boucher (marc@mbsi.ca).
  */
diff --git a/kernel/include/uapi/linux/netfilter/xt_cpu.h b/kernel/include/uapi/linux/netfilter/xt_cpu.h
index 93c7f11d8..b442e1f6f 100644
--- a/kernel/include/uapi/linux/netfilter/xt_cpu.h
+++ b/kernel/include/uapi/linux/netfilter/xt_cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_CPU_H
 #define _XT_CPU_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_dccp.h b/kernel/include/uapi/linux/netfilter/xt_dccp.h
index a579e1b6f..564e61c57 100644
--- a/kernel/include/uapi/linux/netfilter/xt_dccp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_dccp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_DCCP_H_
 #define _XT_DCCP_H_
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_devgroup.h b/kernel/include/uapi/linux/netfilter/xt_devgroup.h
index 1babde0ec..79ed351a4 100644
--- a/kernel/include/uapi/linux/netfilter/xt_devgroup.h
+++ b/kernel/include/uapi/linux/netfilter/xt_devgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_DEVGROUP_H
 #define _XT_DEVGROUP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_dscp.h b/kernel/include/uapi/linux/netfilter/xt_dscp.h
index 15f8932ad..7594e4df8 100644
--- a/kernel/include/uapi/linux/netfilter/xt_dscp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_dscp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* x_tables module for matching the IPv4/IPv6 DSCP field
  *
  * (C) 2002 Harald Welte <laforge@gnumonks.org>
diff --git a/kernel/include/uapi/linux/netfilter/xt_ecn.h b/kernel/include/uapi/linux/netfilter/xt_ecn.h
index 7158fca36..2c301c1cb 100644
--- a/kernel/include/uapi/linux/netfilter/xt_ecn.h
+++ b/kernel/include/uapi/linux/netfilter/xt_ecn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* iptables module for matching the ECN header in IPv4 and TCP header
  *
  * (C) 2002 Harald Welte <laforge@gnumonks.org>
diff --git a/kernel/include/uapi/linux/netfilter/xt_esp.h b/kernel/include/uapi/linux/netfilter/xt_esp.h
index ee6882408..fa57a208f 100644
--- a/kernel/include/uapi/linux/netfilter/xt_esp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_esp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_ESP_H
 #define _XT_ESP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_hashlimit.h b/kernel/include/uapi/linux/netfilter/xt_hashlimit.h
index aa9857324..721a8de6c 100644
--- a/kernel/include/uapi/linux/netfilter/xt_hashlimit.h
+++ b/kernel/include/uapi/linux/netfilter/xt_hashlimit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_XT_HASHLIMIT_H
 #define _UAPI_XT_HASHLIMIT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_helper.h b/kernel/include/uapi/linux/netfilter/xt_helper.h
index 6b42763f9..53aa1458d 100644
--- a/kernel/include/uapi/linux/netfilter/xt_helper.h
+++ b/kernel/include/uapi/linux/netfilter/xt_helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_HELPER_H
 #define _XT_HELPER_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_ipcomp.h b/kernel/include/uapi/linux/netfilter/xt_ipcomp.h
index 45c7e40eb..69b12e76e 100644
--- a/kernel/include/uapi/linux/netfilter/xt_ipcomp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_ipcomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_IPCOMP_H
 #define _XT_IPCOMP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_iprange.h b/kernel/include/uapi/linux/netfilter/xt_iprange.h
index 25fd7cf85..551bec7a2 100644
--- a/kernel/include/uapi/linux/netfilter/xt_iprange.h
+++ b/kernel/include/uapi/linux/netfilter/xt_iprange.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NETFILTER_XT_IPRANGE_H
 #define _LINUX_NETFILTER_XT_IPRANGE_H 1
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_ipvs.h b/kernel/include/uapi/linux/netfilter/xt_ipvs.h
index e03b9c31a..925c76996 100644
--- a/kernel/include/uapi/linux/netfilter/xt_ipvs.h
+++ b/kernel/include/uapi/linux/netfilter/xt_ipvs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_IPVS_H
 #define _XT_IPVS_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_l2tp.h b/kernel/include/uapi/linux/netfilter/xt_l2tp.h
index 7dccfa0ac..990b52a49 100644
--- a/kernel/include/uapi/linux/netfilter/xt_l2tp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_l2tp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NETFILTER_XT_L2TP_H
 #define _LINUX_NETFILTER_XT_L2TP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_length.h b/kernel/include/uapi/linux/netfilter/xt_length.h
index b82ed7c4b..513f653e2 100644
--- a/kernel/include/uapi/linux/netfilter/xt_length.h
+++ b/kernel/include/uapi/linux/netfilter/xt_length.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_LENGTH_H
 #define _XT_LENGTH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_limit.h b/kernel/include/uapi/linux/netfilter/xt_limit.h
index bb47fc4d2..1d6e4ce9a 100644
--- a/kernel/include/uapi/linux/netfilter/xt_limit.h
+++ b/kernel/include/uapi/linux/netfilter/xt_limit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_RATE_H
 #define _XT_RATE_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_mac.h b/kernel/include/uapi/linux/netfilter/xt_mac.h
index 9a19a08a9..c4dd5185c 100644
--- a/kernel/include/uapi/linux/netfilter/xt_mac.h
+++ b/kernel/include/uapi/linux/netfilter/xt_mac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_MAC_H
 #define _XT_MAC_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_mark.h b/kernel/include/uapi/linux/netfilter/xt_mark.h
index ecadc40d5..9d0526ced 100644
--- a/kernel/include/uapi/linux/netfilter/xt_mark.h
+++ b/kernel/include/uapi/linux/netfilter/xt_mark.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_MARK_H
 #define _XT_MARK_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_multiport.h b/kernel/include/uapi/linux/netfilter/xt_multiport.h
index 5b7e72dff..ffecf6964 100644
--- a/kernel/include/uapi/linux/netfilter/xt_multiport.h
+++ b/kernel/include/uapi/linux/netfilter/xt_multiport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_MULTIPORT_H
 #define _XT_MULTIPORT_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_nfacct.h b/kernel/include/uapi/linux/netfilter/xt_nfacct.h
index 3e19c8a86..5c8a4d760 100644
--- a/kernel/include/uapi/linux/netfilter/xt_nfacct.h
+++ b/kernel/include/uapi/linux/netfilter/xt_nfacct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_NFACCT_MATCH_H
 #define _XT_NFACCT_MATCH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_osf.h b/kernel/include/uapi/linux/netfilter/xt_osf.h
index e6159958b..dad197e2a 100644
--- a/kernel/include/uapi/linux/netfilter/xt_osf.h
+++ b/kernel/include/uapi/linux/netfilter/xt_osf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2003+ Evgeniy Polyakov <johnpol@2ka.mxt.ru>
  *
diff --git a/kernel/include/uapi/linux/netfilter/xt_owner.h b/kernel/include/uapi/linux/netfilter/xt_owner.h
index 208176171..fa3ad8495 100644
--- a/kernel/include/uapi/linux/netfilter/xt_owner.h
+++ b/kernel/include/uapi/linux/netfilter/xt_owner.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_OWNER_MATCH_H
 #define _XT_OWNER_MATCH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_physdev.h b/kernel/include/uapi/linux/netfilter/xt_physdev.h
index ccdde87da..06ae115e9 100644
--- a/kernel/include/uapi/linux/netfilter/xt_physdev.h
+++ b/kernel/include/uapi/linux/netfilter/xt_physdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_XT_PHYSDEV_H
 #define _UAPI_XT_PHYSDEV_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_pkttype.h b/kernel/include/uapi/linux/netfilter/xt_pkttype.h
index f265cf52f..c31f29d2e 100644
--- a/kernel/include/uapi/linux/netfilter/xt_pkttype.h
+++ b/kernel/include/uapi/linux/netfilter/xt_pkttype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_PKTTYPE_H
 #define _XT_PKTTYPE_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_policy.h b/kernel/include/uapi/linux/netfilter/xt_policy.h
index d8a9800dc..323bfa307 100644
--- a/kernel/include/uapi/linux/netfilter/xt_policy.h
+++ b/kernel/include/uapi/linux/netfilter/xt_policy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_POLICY_H
 #define _XT_POLICY_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_quota.h b/kernel/include/uapi/linux/netfilter/xt_quota.h
index 9314723f3..f3ba5d9e5 100644
--- a/kernel/include/uapi/linux/netfilter/xt_quota.h
+++ b/kernel/include/uapi/linux/netfilter/xt_quota.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_QUOTA_H
 #define _XT_QUOTA_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_rateest.h b/kernel/include/uapi/linux/netfilter/xt_rateest.h
index 13fe50d4e..52a37bdc1 100644
--- a/kernel/include/uapi/linux/netfilter/xt_rateest.h
+++ b/kernel/include/uapi/linux/netfilter/xt_rateest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_RATEEST_MATCH_H
 #define _XT_RATEEST_MATCH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_realm.h b/kernel/include/uapi/linux/netfilter/xt_realm.h
index d4a82ee56..252aa9f79 100644
--- a/kernel/include/uapi/linux/netfilter/xt_realm.h
+++ b/kernel/include/uapi/linux/netfilter/xt_realm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_REALM_H
 #define _XT_REALM_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_recent.h b/kernel/include/uapi/linux/netfilter/xt_recent.h
index 955d56203..e2c33996a 100644
--- a/kernel/include/uapi/linux/netfilter/xt_recent.h
+++ b/kernel/include/uapi/linux/netfilter/xt_recent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NETFILTER_XT_RECENT_H
 #define _LINUX_NETFILTER_XT_RECENT_H 1
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_rpfilter.h b/kernel/include/uapi/linux/netfilter/xt_rpfilter.h
index 8358d4f71..9b3d0f25a 100644
--- a/kernel/include/uapi/linux/netfilter/xt_rpfilter.h
+++ b/kernel/include/uapi/linux/netfilter/xt_rpfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_RPATH_H
 #define _XT_RPATH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_sctp.h b/kernel/include/uapi/linux/netfilter/xt_sctp.h
index 58ffcfb79..4bc6d1a08 100644
--- a/kernel/include/uapi/linux/netfilter/xt_sctp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_sctp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_SCTP_H_
 #define _XT_SCTP_H_
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_set.h b/kernel/include/uapi/linux/netfilter/xt_set.h
index d4e023483..8c1ca66c8 100644
--- a/kernel/include/uapi/linux/netfilter/xt_set.h
+++ b/kernel/include/uapi/linux/netfilter/xt_set.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_SET_H
 #define _XT_SET_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_socket.h b/kernel/include/uapi/linux/netfilter/xt_socket.h
index 87644f832..a7bdc9d88 100644
--- a/kernel/include/uapi/linux/netfilter/xt_socket.h
+++ b/kernel/include/uapi/linux/netfilter/xt_socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_SOCKET_H
 #define _XT_SOCKET_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_state.h b/kernel/include/uapi/linux/netfilter/xt_state.h
index 7b32de886..fe5670ef6 100644
--- a/kernel/include/uapi/linux/netfilter/xt_state.h
+++ b/kernel/include/uapi/linux/netfilter/xt_state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_STATE_H
 #define _XT_STATE_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_statistic.h b/kernel/include/uapi/linux/netfilter/xt_statistic.h
index 4e983ef0c..bbce6fcb2 100644
--- a/kernel/include/uapi/linux/netfilter/xt_statistic.h
+++ b/kernel/include/uapi/linux/netfilter/xt_statistic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_STATISTIC_H
 #define _XT_STATISTIC_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_string.h b/kernel/include/uapi/linux/netfilter/xt_string.h
index 235347c02..bedb015d5 100644
--- a/kernel/include/uapi/linux/netfilter/xt_string.h
+++ b/kernel/include/uapi/linux/netfilter/xt_string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_STRING_H
 #define _XT_STRING_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_tcpmss.h b/kernel/include/uapi/linux/netfilter/xt_tcpmss.h
index fbac56b9e..2268f58b4 100644
--- a/kernel/include/uapi/linux/netfilter/xt_tcpmss.h
+++ b/kernel/include/uapi/linux/netfilter/xt_tcpmss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TCPMSS_MATCH_H
 #define _XT_TCPMSS_MATCH_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_tcpudp.h b/kernel/include/uapi/linux/netfilter/xt_tcpudp.h
index 38aa7b399..658c16999 100644
--- a/kernel/include/uapi/linux/netfilter/xt_tcpudp.h
+++ b/kernel/include/uapi/linux/netfilter/xt_tcpudp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TCPUDP_H
 #define _XT_TCPUDP_H
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_time.h b/kernel/include/uapi/linux/netfilter/xt_time.h
index 095886019..7f707c7ec 100644
--- a/kernel/include/uapi/linux/netfilter/xt_time.h
+++ b/kernel/include/uapi/linux/netfilter/xt_time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_TIME_H
 #define _XT_TIME_H 1
 
diff --git a/kernel/include/uapi/linux/netfilter/xt_u32.h b/kernel/include/uapi/linux/netfilter/xt_u32.h
index 04d1bfea0..a88505ca7 100644
--- a/kernel/include/uapi/linux/netfilter/xt_u32.h
+++ b/kernel/include/uapi/linux/netfilter/xt_u32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _XT_U32_H
 #define _XT_U32_H 1
 
diff --git a/kernel/include/uapi/linux/netfilter_arp.h b/kernel/include/uapi/linux/netfilter_arp.h
index 92bc6ddcb..81b6a4cbc 100644
--- a/kernel/include/uapi/linux/netfilter_arp.h
+++ b/kernel/include/uapi/linux/netfilter_arp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 #ifndef __LINUX_ARP_NETFILTER_H
 #define __LINUX_ARP_NETFILTER_H
 
diff --git a/kernel/include/uapi/linux/netfilter_arp/arp_tables.h b/kernel/include/uapi/linux/netfilter_arp/arp_tables.h
index ece3ad4ee..a2a0927d9 100644
--- a/kernel/include/uapi/linux/netfilter_arp/arp_tables.h
+++ b/kernel/include/uapi/linux/netfilter_arp/arp_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * 	Format of an ARP firewall descriptor
  *
diff --git a/kernel/include/uapi/linux/netfilter_arp/arpt_mangle.h b/kernel/include/uapi/linux/netfilter_arp/arpt_mangle.h
index 8c2b16a1f..60135d5cc 100644
--- a/kernel/include/uapi/linux/netfilter_arp/arpt_mangle.h
+++ b/kernel/include/uapi/linux/netfilter_arp/arpt_mangle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ARPT_MANGLE_H
 #define _ARPT_MANGLE_H
 #include <linux/netfilter_arp/arp_tables.h>
diff --git a/kernel/include/uapi/linux/netfilter_bridge.h b/kernel/include/uapi/linux/netfilter_bridge.h
index 514519b47..12fb77633 100644
--- a/kernel/include/uapi/linux/netfilter_bridge.h
+++ b/kernel/include/uapi/linux/netfilter_bridge.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_BRIDGE_NETFILTER_H
 #define _UAPI__LINUX_BRIDGE_NETFILTER_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_802_3.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_802_3.h
index f37522aad..03463e4b0 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_802_3.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_802_3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_BRIDGE_EBT_802_3_H
 #define _UAPI__LINUX_BRIDGE_EBT_802_3_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_among.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_among.h
index bd4e3ad0b..9acf757bc 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_among.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_among.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_AMONG_H
 #define __LINUX_BRIDGE_EBT_AMONG_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_arp.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_arp.h
index dd4df2533..628b4fdae 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_arp.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_arp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_ARP_H
 #define __LINUX_BRIDGE_EBT_ARP_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_arpreply.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_arpreply.h
index 6fee3402e..ed41ae053 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_arpreply.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_arpreply.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_ARPREPLY_H
 #define __LINUX_BRIDGE_EBT_ARPREPLY_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_ip.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_ip.h
index c4bbc41b0..8e462fb19 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_ip.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_ip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  ebt_ip
  *
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_ip6.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_ip6.h
index a062f0ce9..057945dd6 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_ip6.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_ip6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  ebt_ip6
  *
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_limit.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_limit.h
index 66d80b30b..c2ac02e1f 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_limit.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_limit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_LIMIT_H
 #define __LINUX_BRIDGE_EBT_LIMIT_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_log.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_log.h
index 7e7f1d1fe..f6724155a 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_log.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_LOG_H
 #define __LINUX_BRIDGE_EBT_LOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_m.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_m.h
index 410f9e5a7..098ac78cd 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_m.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_m.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_MARK_M_H
 #define __LINUX_BRIDGE_EBT_MARK_M_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_t.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_t.h
index 7d5a268a4..8810f1c12 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_t.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_mark_t.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_MARK_T_H
 #define __LINUX_BRIDGE_EBT_MARK_T_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_nat.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_nat.h
index c990d74ee..49da2f9be 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_nat.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_nat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_NAT_H
 #define __LINUX_BRIDGE_EBT_NAT_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_nflog.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_nflog.h
index df829fce9..f5cdc068c 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_nflog.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_nflog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_NFLOG_H
 #define __LINUX_BRIDGE_EBT_NFLOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_pkttype.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_pkttype.h
index c241badcd..32c5d08b3 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_pkttype.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_pkttype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H
 #define __LINUX_BRIDGE_EBT_PKTTYPE_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_redirect.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_redirect.h
index dd9622ce8..dc7a7ce25 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_redirect.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_redirect.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_REDIRECT_H
 #define __LINUX_BRIDGE_EBT_REDIRECT_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_stp.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_stp.h
index 1025b9f5f..94f68dedc 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_stp.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_stp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_STP_H
 #define __LINUX_BRIDGE_EBT_STP_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebt_vlan.h b/kernel/include/uapi/linux/netfilter_bridge/ebt_vlan.h
index 967d1d5cf..fb0d8f604 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebt_vlan.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebt_vlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_BRIDGE_EBT_VLAN_H
 #define __LINUX_BRIDGE_EBT_VLAN_H
 
diff --git a/kernel/include/uapi/linux/netfilter_bridge/ebtables.h b/kernel/include/uapi/linux/netfilter_bridge/ebtables.h
index e3cdf9f1a..9ff57c0a0 100644
--- a/kernel/include/uapi/linux/netfilter_bridge/ebtables.h
+++ b/kernel/include/uapi/linux/netfilter_bridge/ebtables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  ebtables
  *
diff --git a/kernel/include/uapi/linux/netfilter_decnet.h b/kernel/include/uapi/linux/netfilter_decnet.h
index 0b09732aa..9089c38f6 100644
--- a/kernel/include/uapi/linux/netfilter_decnet.h
+++ b/kernel/include/uapi/linux/netfilter_decnet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_DECNET_NETFILTER_H
 #define __LINUX_DECNET_NETFILTER_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4.h b/kernel/include/uapi/linux/netfilter_ipv4.h
index 91ddd1f6f..e6b1a84f5 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* IPv4-specific defines for netfilter. 
  * (C)1998 Rusty Russell -- This code is GPL.
  */
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ip_tables.h b/kernel/include/uapi/linux/netfilter_ipv4/ip_tables.h
index d0da53d96..6aaeb14bf 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ip_tables.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ip_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * 25-Jul-1998 Major changes to allow for ip chain table
  *
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h
index eac0f6548..ff6599494 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPT_CLUSTERIP_H_target
 #define _IPT_CLUSTERIP_H_target
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ECN.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
index bb88d5315..e3630fd04 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Header file for iptables ipt_ECN target
  *
  * (C) 2002 by Harald Welte <laforge@gnumonks.org>
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_LOG.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_LOG.h
index 5d8152077..6dec14ba8 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_LOG.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_LOG.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPT_LOG_H
 #define _IPT_LOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_REJECT.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_REJECT.h
index 4293a1ad1..ae61ddd32 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_REJECT.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_REJECT.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPT_REJECT_H
 #define _IPT_REJECT_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_TTL.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
index f6ac169d9..57d2fc67a 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_TTL.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* TTL modification module for IP tables
  * (C) 2000 by Harald Welte <laforge@netfilter.org> */
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ah.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ah.h
index 4e02bb011..606ce90db 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ah.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ah.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPT_AH_H
 #define _IPT_AH_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ecn.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
index 0e0c063db..8121bec47 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IPT_ECN_H
 #define _IPT_ECN_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
index 37bee4442..ad0226a86 100644
--- a/kernel/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
+++ b/kernel/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* IP tables module for matching the value of the TTL
  * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6.h b/kernel/include/uapi/linux/netfilter_ipv6.h
index 12497c6c7..2f9724611 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* IPv6-specific defines for netfilter. 
  * (C)1998 Rusty Russell -- This code is GPL.
  * (C)1999 David Jeffery
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6_tables.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6_tables.h
index d1b22653d..031d0a43b 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6_tables.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6_tables.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * 25-Jul-1998 Major changes to allow for ip chain table
  *
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_HL.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
index ebd8ead1b..eaed56a28 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_HL.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Hop Limit modification module for ip6tables
  * Maciej Soltysiak <solt@dns.toxicfilms.tv>
  * Based on HW's TTL module */
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_LOG.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_LOG.h
index 3dd0bc4e0..7553a434e 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_LOG.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_LOG.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_LOG_H
 #define _IP6T_LOG_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_NPT.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_NPT.h
index f76335548..422aef076 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_NPT.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_NPT.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __NETFILTER_IP6T_NPT
 #define __NETFILTER_IP6T_NPT
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
index cd2e940c8..158ffa5f4 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_REJECT.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_REJECT_H
 #define _IP6T_REJECT_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ah.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ah.h
index 5da2b65cb..9a4174e08 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ah.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ah.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_AH_H
 #define _IP6T_AH_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_frag.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_frag.h
index dfd8bc226..9acac816b 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_frag.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_frag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_FRAG_H
 #define _IP6T_FRAG_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_hl.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
index 6e76dbc6c..6b62f9418 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* ip6tables module for matching the Hop Limit value
  * Maciej Soltysiak <solt@dns.toxicfilms.tv>
  * Based on HW's ttl module */
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h
index efae3a20c..5a5196914 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_ipv6header.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* ipv6header match - matches IPv6 packets based
 on whether they contain certain headers */
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_mh.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_mh.h
index a7729a502..906196283 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_mh.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_mh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_MH_H
 #define _IP6T_MH_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_opts.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_opts.h
index 17d419a81..79f9a477c 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_opts.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_opts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_OPTS_H
 #define _IP6T_OPTS_H
 
diff --git a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_rt.h b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_rt.h
index 558f81e46..9c23e8ad2 100644
--- a/kernel/include/uapi/linux/netfilter_ipv6/ip6t_rt.h
+++ b/kernel/include/uapi/linux/netfilter_ipv6/ip6t_rt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _IP6T_RT_H
 #define _IP6T_RT_H
 
diff --git a/kernel/include/uapi/linux/netlink.h b/kernel/include/uapi/linux/netlink.h
index e8af60a7c..776bc92e9 100644
--- a/kernel/include/uapi/linux/netlink.h
+++ b/kernel/include/uapi/linux/netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_NETLINK_H
 #define _UAPI__LINUX_NETLINK_H
 
diff --git a/kernel/include/uapi/linux/netlink_diag.h b/kernel/include/uapi/linux/netlink_diag.h
index 6dcd4de33..dfa61be43 100644
--- a/kernel/include/uapi/linux/netlink_diag.h
+++ b/kernel/include/uapi/linux/netlink_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __NETLINK_DIAG_H__
 #define __NETLINK_DIAG_H__
 
diff --git a/kernel/include/uapi/linux/netrom.h b/kernel/include/uapi/linux/netrom.h
index af7313cc9..7498ea3c3 100644
--- a/kernel/include/uapi/linux/netrom.h
+++ b/kernel/include/uapi/linux/netrom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * These are the public elements of the Linux kernel NET/ROM implementation.
  * For kernel AX.25 see the file ax25.h. This file requires ax25.h for the
diff --git a/kernel/include/uapi/linux/nfs.h b/kernel/include/uapi/linux/nfs.h
index 5e6296160..057d22a48 100644
--- a/kernel/include/uapi/linux/nfs.h
+++ b/kernel/include/uapi/linux/nfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * NFS protocol definitions
  *
diff --git a/kernel/include/uapi/linux/nfs2.h b/kernel/include/uapi/linux/nfs2.h
index fde24b30c..e0237e098 100644
--- a/kernel/include/uapi/linux/nfs2.h
+++ b/kernel/include/uapi/linux/nfs2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * NFS protocol definitions
  *
diff --git a/kernel/include/uapi/linux/nfs3.h b/kernel/include/uapi/linux/nfs3.h
index 231ef4e69..37e4b34e6 100644
--- a/kernel/include/uapi/linux/nfs3.h
+++ b/kernel/include/uapi/linux/nfs3.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * NFSv3 protocol definitions
  */
diff --git a/kernel/include/uapi/linux/nfs4.h b/kernel/include/uapi/linux/nfs4.h
index 4ae62796b..8572930cf 100644
--- a/kernel/include/uapi/linux/nfs4.h
+++ b/kernel/include/uapi/linux/nfs4.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  include/linux/nfs4.h
  *
diff --git a/kernel/include/uapi/linux/nfs4_mount.h b/kernel/include/uapi/linux/nfs4_mount.h
index a0dcf6655..d20bb869b 100644
--- a/kernel/include/uapi/linux/nfs4_mount.h
+++ b/kernel/include/uapi/linux/nfs4_mount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NFS4_MOUNT_H
 #define _LINUX_NFS4_MOUNT_H
 
diff --git a/kernel/include/uapi/linux/nfs_fs.h b/kernel/include/uapi/linux/nfs_fs.h
index 491422879..7bcc8cd68 100644
--- a/kernel/include/uapi/linux/nfs_fs.h
+++ b/kernel/include/uapi/linux/nfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  linux/include/linux/nfs_fs.h
  *
diff --git a/kernel/include/uapi/linux/nfs_mount.h b/kernel/include/uapi/linux/nfs_mount.h
index 64b0f22f5..e44e00616 100644
--- a/kernel/include/uapi/linux/nfs_mount.h
+++ b/kernel/include/uapi/linux/nfs_mount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_NFS_MOUNT_H
 #define _LINUX_NFS_MOUNT_H
 
diff --git a/kernel/include/uapi/linux/nfsacl.h b/kernel/include/uapi/linux/nfsacl.h
index 552726631..ca9a8501f 100644
--- a/kernel/include/uapi/linux/nfsacl.h
+++ b/kernel/include/uapi/linux/nfsacl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * File: linux/nfsacl.h
  *
diff --git a/kernel/include/uapi/linux/nfsd/cld.h b/kernel/include/uapi/linux/nfsd/cld.h
index ec260274b..f8f5cccad 100644
--- a/kernel/include/uapi/linux/nfsd/cld.h
+++ b/kernel/include/uapi/linux/nfsd/cld.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Upcall description for nfsdcld communication
  *
diff --git a/kernel/include/uapi/linux/nfsd/debug.h b/kernel/include/uapi/linux/nfsd/debug.h
index 28ec6c9c4..7301cdc79 100644
--- a/kernel/include/uapi/linux/nfsd/debug.h
+++ b/kernel/include/uapi/linux/nfsd/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/linux/nfsd/debug.h
  *
diff --git a/kernel/include/uapi/linux/nfsd/export.h b/kernel/include/uapi/linux/nfsd/export.h
index c3be25610..2124ba904 100644
--- a/kernel/include/uapi/linux/nfsd/export.h
+++ b/kernel/include/uapi/linux/nfsd/export.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/linux/nfsd/export.h
  * 
diff --git a/kernel/include/uapi/linux/nfsd/nfsfh.h b/kernel/include/uapi/linux/nfsd/nfsfh.h
index 20391235d..ff0ca88b1 100644
--- a/kernel/include/uapi/linux/nfsd/nfsfh.h
+++ b/kernel/include/uapi/linux/nfsd/nfsfh.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file describes the layout of the file handles as passed
  * over the wire.
diff --git a/kernel/include/uapi/linux/nfsd/stats.h b/kernel/include/uapi/linux/nfsd/stats.h
index 9fb7a0644..b1a38ae14 100644
--- a/kernel/include/uapi/linux/nfsd/stats.h
+++ b/kernel/include/uapi/linux/nfsd/stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/linux/nfsd/stats.h
  *
diff --git a/kernel/include/uapi/linux/nilfs2_api.h b/kernel/include/uapi/linux/nilfs2_api.h
index ef4c1de89..8b9b89104 100644
--- a/kernel/include/uapi/linux/nilfs2_api.h
+++ b/kernel/include/uapi/linux/nilfs2_api.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * nilfs2_api.h - NILFS2 user space API
  *
diff --git a/kernel/include/uapi/linux/nilfs2_ondisk.h b/kernel/include/uapi/linux/nilfs2_ondisk.h
index 2a8a3addb..a7e66ab11 100644
--- a/kernel/include/uapi/linux/nilfs2_ondisk.h
+++ b/kernel/include/uapi/linux/nilfs2_ondisk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * nilfs2_ondisk.h - NILFS2 on-disk structures
  *
diff --git a/kernel/include/uapi/linux/nsfs.h b/kernel/include/uapi/linux/nsfs.h
index 1a3ca79f4..a0c8552b6 100644
--- a/kernel/include/uapi/linux/nsfs.h
+++ b/kernel/include/uapi/linux/nsfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_NSFS_H
 #define __LINUX_NSFS_H
 
diff --git a/kernel/include/uapi/linux/nubus.h b/kernel/include/uapi/linux/nubus.h
index ac516064f..f3776cc80 100644
--- a/kernel/include/uapi/linux/nubus.h
+++ b/kernel/include/uapi/linux/nubus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
   nubus.h: various definitions and prototypes for NuBus drivers to use.
 
diff --git a/kernel/include/uapi/linux/nvme_ioctl.h b/kernel/include/uapi/linux/nvme_ioctl.h
index 50ff21f74..6e74b1eaf 100644
--- a/kernel/include/uapi/linux/nvme_ioctl.h
+++ b/kernel/include/uapi/linux/nvme_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for the NVM Express ioctl interface
  * Copyright (c) 2011-2014, Intel Corporation.
diff --git a/kernel/include/uapi/linux/nvram.h b/kernel/include/uapi/linux/nvram.h
index 0986c4337..4bee8e72d 100644
--- a/kernel/include/uapi/linux/nvram.h
+++ b/kernel/include/uapi/linux/nvram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_NVRAM_H
 #define _UAPI_LINUX_NVRAM_H
 
diff --git a/kernel/include/uapi/linux/omap3isp.h b/kernel/include/uapi/linux/omap3isp.h
index c090cf924..1a920145d 100644
--- a/kernel/include/uapi/linux/omap3isp.h
+++ b/kernel/include/uapi/linux/omap3isp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * omap3isp.h
  *
diff --git a/kernel/include/uapi/linux/omapfb.h b/kernel/include/uapi/linux/omapfb.h
index 7c97bc00a..44f43af4c 100644
--- a/kernel/include/uapi/linux/omapfb.h
+++ b/kernel/include/uapi/linux/omapfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * File: include/linux/omapfb.h
  *
diff --git a/kernel/include/uapi/linux/oom.h b/kernel/include/uapi/linux/oom.h
index b29272d62..750b1c5a4 100644
--- a/kernel/include/uapi/linux/oom.h
+++ b/kernel/include/uapi/linux/oom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__INCLUDE_LINUX_OOM_H
 #define _UAPI__INCLUDE_LINUX_OOM_H
 
diff --git a/kernel/include/uapi/linux/openvswitch.h b/kernel/include/uapi/linux/openvswitch.h
index 156ee4cab..36d0b161e 100644
--- a/kernel/include/uapi/linux/openvswitch.h
+++ b/kernel/include/uapi/linux/openvswitch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
 /*
  * Copyright (c) 2007-2017 Nicira, Inc.
diff --git a/kernel/include/uapi/linux/packet_diag.h b/kernel/include/uapi/linux/packet_diag.h
index 0c5d5dd61..349ddf0a9 100644
--- a/kernel/include/uapi/linux/packet_diag.h
+++ b/kernel/include/uapi/linux/packet_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __PACKET_DIAG_H__
 #define __PACKET_DIAG_H__
 
diff --git a/kernel/include/uapi/linux/param.h b/kernel/include/uapi/linux/param.h
index 092e92f67..94e0c57a7 100644
--- a/kernel/include/uapi/linux/param.h
+++ b/kernel/include/uapi/linux/param.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_PARAM_H
 #define _LINUX_PARAM_H
 
diff --git a/kernel/include/uapi/linux/patchkey.h b/kernel/include/uapi/linux/patchkey.h
index 1bda0e56b..3eb246e94 100644
--- a/kernel/include/uapi/linux/patchkey.h
+++ b/kernel/include/uapi/linux/patchkey.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * <linux/patchkey.h> -- definition of _PATCHKEY macro
  *
diff --git a/kernel/include/uapi/linux/pci.h b/kernel/include/uapi/linux/pci.h
index 3c292bc0d..a769eefc5 100644
--- a/kernel/include/uapi/linux/pci.h
+++ b/kernel/include/uapi/linux/pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	pci.h
  *
diff --git a/kernel/include/uapi/linux/pci_regs.h b/kernel/include/uapi/linux/pci_regs.h
index f8d580459..87c2c840b 100644
--- a/kernel/include/uapi/linux/pci_regs.h
+++ b/kernel/include/uapi/linux/pci_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	pci_regs.h
  *
diff --git a/kernel/include/uapi/linux/pcitest.h b/kernel/include/uapi/linux/pcitest.h
index a6aa10c45..953cf036c 100644
--- a/kernel/include/uapi/linux/pcitest.h
+++ b/kernel/include/uapi/linux/pcitest.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /**
  * pcitest.h - PCI test uapi defines
  *
diff --git a/kernel/include/uapi/linux/perf_event.h b/kernel/include/uapi/linux/perf_event.h
index 140ae638c..362493a2f 100644
--- a/kernel/include/uapi/linux/perf_event.h
+++ b/kernel/include/uapi/linux/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Performance events:
  *
diff --git a/kernel/include/uapi/linux/personality.h b/kernel/include/uapi/linux/personality.h
index aa169c433..49796b775 100644
--- a/kernel/include/uapi/linux/personality.h
+++ b/kernel/include/uapi/linux/personality.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_PERSONALITY_H
 #define _UAPI_LINUX_PERSONALITY_H
 
diff --git a/kernel/include/uapi/linux/pfkeyv2.h b/kernel/include/uapi/linux/pfkeyv2.h
index ada7f0171..d65b11785 100644
--- a/kernel/include/uapi/linux/pfkeyv2.h
+++ b/kernel/include/uapi/linux/pfkeyv2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* PF_KEY user interface, this is defined by rfc2367 so
  * do not make arbitrary modifications or else this header
  * file will not be compliant.
diff --git a/kernel/include/uapi/linux/pg.h b/kernel/include/uapi/linux/pg.h
index db994bb0c..364c350e8 100644
--- a/kernel/include/uapi/linux/pg.h
+++ b/kernel/include/uapi/linux/pg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /* 	pg.h (c) 1998  Grant R. Guenther <grant@torque.net>
  		       Under the terms of the GNU General Public License
 
diff --git a/kernel/include/uapi/linux/phantom.h b/kernel/include/uapi/linux/phantom.h
index 94dd6645c..dbef708ab 100644
--- a/kernel/include/uapi/linux/phantom.h
+++ b/kernel/include/uapi/linux/phantom.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Copyright (C) 2005-2007 Jiri Slaby <jirislaby@gmail.com>
  *
diff --git a/kernel/include/uapi/linux/phonet.h b/kernel/include/uapi/linux/phonet.h
index a3e1d65b3..a2f6b37a5 100644
--- a/kernel/include/uapi/linux/phonet.h
+++ b/kernel/include/uapi/linux/phonet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /**
  * file phonet.h
  *
diff --git a/kernel/include/uapi/linux/pkt_cls.h b/kernel/include/uapi/linux/pkt_cls.h
index d5e2bf68d..46c506615 100644
--- a/kernel/include/uapi/linux/pkt_cls.h
+++ b/kernel/include/uapi/linux/pkt_cls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_PKT_CLS_H
 #define __LINUX_PKT_CLS_H
 
diff --git a/kernel/include/uapi/linux/pkt_sched.h b/kernel/include/uapi/linux/pkt_sched.h
index 099bf5528..703cd9df6 100644
--- a/kernel/include/uapi/linux/pkt_sched.h
+++ b/kernel/include/uapi/linux/pkt_sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_PKT_SCHED_H
 #define __LINUX_PKT_SCHED_H
 
diff --git a/kernel/include/uapi/linux/pktcdvd.h b/kernel/include/uapi/linux/pktcdvd.h
index 2640b9d4e..9cbb55d21 100644
--- a/kernel/include/uapi/linux/pktcdvd.h
+++ b/kernel/include/uapi/linux/pktcdvd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
  * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
diff --git a/kernel/include/uapi/linux/pmu.h b/kernel/include/uapi/linux/pmu.h
index caead364b..89cb1acea 100644
--- a/kernel/include/uapi/linux/pmu.h
+++ b/kernel/include/uapi/linux/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for talking to the PMU.  The PMU is a microcontroller
  * which controls battery charging and system power on PowerBook 3400
diff --git a/kernel/include/uapi/linux/posix_acl.h b/kernel/include/uapi/linux/posix_acl.h
index 1037cb19a..217e4e26a 100644
--- a/kernel/include/uapi/linux/posix_acl.h
+++ b/kernel/include/uapi/linux/posix_acl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2002 Andreas Gruenbacher <a.gruenbacher@computer.org>
  * Copyright (C) 2016 Red Hat, Inc.
diff --git a/kernel/include/uapi/linux/posix_acl_xattr.h b/kernel/include/uapi/linux/posix_acl_xattr.h
index 8b5798441..506380f0b 100644
--- a/kernel/include/uapi/linux/posix_acl_xattr.h
+++ b/kernel/include/uapi/linux/posix_acl_xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2002 Andreas Gruenbacher <a.gruenbacher@computer.org>
  * Copyright (C) 2016 Red Hat, Inc.
diff --git a/kernel/include/uapi/linux/posix_types.h b/kernel/include/uapi/linux/posix_types.h
index 988f76e63..9a7a740b3 100644
--- a/kernel/include/uapi/linux/posix_types.h
+++ b/kernel/include/uapi/linux/posix_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_POSIX_TYPES_H
 #define _LINUX_POSIX_TYPES_H
 
diff --git a/kernel/include/uapi/linux/ppdev.h b/kernel/include/uapi/linux/ppdev.h
index dc18c5d23..8fe3c64d1 100644
--- a/kernel/include/uapi/linux/ppdev.h
+++ b/kernel/include/uapi/linux/ppdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * linux/include/linux/ppdev.h
  *
diff --git a/kernel/include/uapi/linux/ppp-comp.h b/kernel/include/uapi/linux/ppp-comp.h
index 0a15bbb04..0fb7623e9 100644
--- a/kernel/include/uapi/linux/ppp-comp.h
+++ b/kernel/include/uapi/linux/ppp-comp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ppp-comp.h - Definitions for doing PPP packet compression.
  *
diff --git a/kernel/include/uapi/linux/ppp-ioctl.h b/kernel/include/uapi/linux/ppp-ioctl.h
index 63a23a3b8..b19a9c249 100644
--- a/kernel/include/uapi/linux/ppp-ioctl.h
+++ b/kernel/include/uapi/linux/ppp-ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ppp-ioctl.h - PPP ioctl definitions.
  *
diff --git a/kernel/include/uapi/linux/ppp_defs.h b/kernel/include/uapi/linux/ppp_defs.h
index 283fc05db..fff51b91b 100644
--- a/kernel/include/uapi/linux/ppp_defs.h
+++ b/kernel/include/uapi/linux/ppp_defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ppp_defs.h - PPP definitions.
  *
diff --git a/kernel/include/uapi/linux/pps.h b/kernel/include/uapi/linux/pps.h
index c29d6b791..009ebcd8c 100644
--- a/kernel/include/uapi/linux/pps.h
+++ b/kernel/include/uapi/linux/pps.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * PPS API header
  *
diff --git a/kernel/include/uapi/linux/pr.h b/kernel/include/uapi/linux/pr.h
index 645ef3cf3..ccc78cbf1 100644
--- a/kernel/include/uapi/linux/pr.h
+++ b/kernel/include/uapi/linux/pr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_PR_H
 #define _UAPI_PR_H
 
diff --git a/kernel/include/uapi/linux/prctl.h b/kernel/include/uapi/linux/prctl.h
index a8d0759a9..b64007142 100644
--- a/kernel/include/uapi/linux/prctl.h
+++ b/kernel/include/uapi/linux/prctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_PRCTL_H
 #define _LINUX_PRCTL_H
 
diff --git a/kernel/include/uapi/linux/psample.h b/kernel/include/uapi/linux/psample.h
index ed48996ec..ce1116cff 100644
--- a/kernel/include/uapi/linux/psample.h
+++ b/kernel/include/uapi/linux/psample.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __UAPI_PSAMPLE_H
 #define __UAPI_PSAMPLE_H
 
diff --git a/kernel/include/uapi/linux/psci.h b/kernel/include/uapi/linux/psci.h
index 3d7a0fc02..760e52a96 100644
--- a/kernel/include/uapi/linux/psci.h
+++ b/kernel/include/uapi/linux/psci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * ARM Power State and Coordination Interface (PSCI) header
  *
diff --git a/kernel/include/uapi/linux/ptp_clock.h b/kernel/include/uapi/linux/ptp_clock.h
index ac6dded80..3039bf6a7 100644
--- a/kernel/include/uapi/linux/ptp_clock.h
+++ b/kernel/include/uapi/linux/ptp_clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * PTP 1588 clock support - user space interface
  *
diff --git a/kernel/include/uapi/linux/ptrace.h b/kernel/include/uapi/linux/ptrace.h
index fb8106509..e3939e009 100644
--- a/kernel/include/uapi/linux/ptrace.h
+++ b/kernel/include/uapi/linux/ptrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_PTRACE_H
 #define _UAPI_LINUX_PTRACE_H
 /* ptrace.h */
diff --git a/kernel/include/uapi/linux/qnx4_fs.h b/kernel/include/uapi/linux/qnx4_fs.h
index 8b9aee1a9..31487325d 100644
--- a/kernel/include/uapi/linux/qnx4_fs.h
+++ b/kernel/include/uapi/linux/qnx4_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Name                         : qnx4_fs.h
  *  Author                       : Richard Frowijn
diff --git a/kernel/include/uapi/linux/qnxtypes.h b/kernel/include/uapi/linux/qnxtypes.h
index bebbe5cc4..eacfab10e 100644
--- a/kernel/include/uapi/linux/qnxtypes.h
+++ b/kernel/include/uapi/linux/qnxtypes.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Name                         : qnxtypes.h
  *  Author                       : Richard Frowijn
diff --git a/kernel/include/uapi/linux/qrtr.h b/kernel/include/uapi/linux/qrtr.h
index 9d76c566f..5d9aab1f1 100644
--- a/kernel/include/uapi/linux/qrtr.h
+++ b/kernel/include/uapi/linux/qrtr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_QRTR_H
 #define _LINUX_QRTR_H
 
diff --git a/kernel/include/uapi/linux/radeonfb.h b/kernel/include/uapi/linux/radeonfb.h
index 8c4bbdecc..86eafb805 100644
--- a/kernel/include/uapi/linux/radeonfb.h
+++ b/kernel/include/uapi/linux/radeonfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_RADEONFB_H__
 #define __LINUX_RADEONFB_H__
 
diff --git a/kernel/include/uapi/linux/raid/md_p.h b/kernel/include/uapi/linux/raid/md_p.h
index b9197976b..b0d15c73f 100644
--- a/kernel/include/uapi/linux/raid/md_p.h
+++ b/kernel/include/uapi/linux/raid/md_p.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
    md_p.h : physical layout of Linux RAID devices
           Copyright (C) 1996-98 Ingo Molnar, Gadi Oxman
diff --git a/kernel/include/uapi/linux/raid/md_u.h b/kernel/include/uapi/linux/raid/md_u.h
index 36cd8210a..105307244 100644
--- a/kernel/include/uapi/linux/raid/md_u.h
+++ b/kernel/include/uapi/linux/raid/md_u.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
    md_u.h : user <=> kernel API between Linux raidtools and RAID drivers
           Copyright (C) 1998 Ingo Molnar
diff --git a/kernel/include/uapi/linux/random.h b/kernel/include/uapi/linux/random.h
index 3f93d1695..c34f4490d 100644
--- a/kernel/include/uapi/linux/random.h
+++ b/kernel/include/uapi/linux/random.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/linux/random.h
  *
diff --git a/kernel/include/uapi/linux/raw.h b/kernel/include/uapi/linux/raw.h
index 62d543e70..dc96dda47 100644
--- a/kernel/include/uapi/linux/raw.h
+++ b/kernel/include/uapi/linux/raw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_RAW_H
 #define __LINUX_RAW_H
 
diff --git a/kernel/include/uapi/linux/rds.h b/kernel/include/uapi/linux/rds.h
index 198892b95..e71d4491f 100644
--- a/kernel/include/uapi/linux/rds.h
+++ b/kernel/include/uapi/linux/rds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2008 Oracle.  All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/reboot.h b/kernel/include/uapi/linux/reboot.h
index 09d056d4f..58e64398e 100644
--- a/kernel/include/uapi/linux/reboot.h
+++ b/kernel/include/uapi/linux/reboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_REBOOT_H
 #define _UAPI_LINUX_REBOOT_H
 
diff --git a/kernel/include/uapi/linux/reiserfs_fs.h b/kernel/include/uapi/linux/reiserfs_fs.h
index ea3700cd7..5bb921409 100644
--- a/kernel/include/uapi/linux/reiserfs_fs.h
+++ b/kernel/include/uapi/linux/reiserfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 1996, 1997, 1998 Hans Reiser, see reiserfs/README for licensing and copyright details
  */
diff --git a/kernel/include/uapi/linux/reiserfs_xattr.h b/kernel/include/uapi/linux/reiserfs_xattr.h
index 38fdd648b..28f10842f 100644
--- a/kernel/include/uapi/linux/reiserfs_xattr.h
+++ b/kernel/include/uapi/linux/reiserfs_xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
   File: linux/reiserfs_xattr.h
 */
diff --git a/kernel/include/uapi/linux/resource.h b/kernel/include/uapi/linux/resource.h
index 36fb3b5fb..cc00fd079 100644
--- a/kernel/include/uapi/linux/resource.h
+++ b/kernel/include/uapi/linux/resource.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_RESOURCE_H
 #define _UAPI_LINUX_RESOURCE_H
 
diff --git a/kernel/include/uapi/linux/rio_cm_cdev.h b/kernel/include/uapi/linux/rio_cm_cdev.h
index 6edb900d3..d05dc3226 100644
--- a/kernel/include/uapi/linux/rio_cm_cdev.h
+++ b/kernel/include/uapi/linux/rio_cm_cdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * Copyright (c) 2015, Integrated Device Technology Inc.
  * Copyright (c) 2015, Prodrive Technologies
diff --git a/kernel/include/uapi/linux/rio_mport_cdev.h b/kernel/include/uapi/linux/rio_mport_cdev.h
index 5796bf1d0..9bc9f98e3 100644
--- a/kernel/include/uapi/linux/rio_mport_cdev.h
+++ b/kernel/include/uapi/linux/rio_mport_cdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * Copyright (c) 2015-2016, Integrated Device Technology Inc.
  * Copyright (c) 2015, Prodrive Technologies
diff --git a/kernel/include/uapi/linux/romfs_fs.h b/kernel/include/uapi/linux/romfs_fs.h
index 5f57f93b2..a7f1585ac 100644
--- a/kernel/include/uapi/linux/romfs_fs.h
+++ b/kernel/include/uapi/linux/romfs_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_ROMFS_FS_H
 #define __LINUX_ROMFS_FS_H
 
diff --git a/kernel/include/uapi/linux/rose.h b/kernel/include/uapi/linux/rose.h
index 1fcfe9589..19aa4693c 100644
--- a/kernel/include/uapi/linux/rose.h
+++ b/kernel/include/uapi/linux/rose.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * These are the public elements of the Linux kernel Rose implementation.
  * For kernel AX.25 see the file ax25.h. This file requires ax25.h for the
diff --git a/kernel/include/uapi/linux/route.h b/kernel/include/uapi/linux/route.h
index 660070831..a0de9a733 100644
--- a/kernel/include/uapi/linux/route.h
+++ b/kernel/include/uapi/linux/route.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/rpmsg.h b/kernel/include/uapi/linux/rpmsg.h
index dedc226e0..225eb3870 100644
--- a/kernel/include/uapi/linux/rpmsg.h
+++ b/kernel/include/uapi/linux/rpmsg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2016, Linaro Ltd.
  *
diff --git a/kernel/include/uapi/linux/rtc.h b/kernel/include/uapi/linux/rtc.h
index f8c82e6f2..2ad178896 100644
--- a/kernel/include/uapi/linux/rtc.h
+++ b/kernel/include/uapi/linux/rtc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Generic RTC interface.
  * This version contains the part of the user interface to the Real Time Clock
diff --git a/kernel/include/uapi/linux/rtnetlink.h b/kernel/include/uapi/linux/rtnetlink.h
index dab7dad9e..a6d37c2ea 100644
--- a/kernel/include/uapi/linux/rtnetlink.h
+++ b/kernel/include/uapi/linux/rtnetlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_RTNETLINK_H
 #define _UAPI__LINUX_RTNETLINK_H
 
diff --git a/kernel/include/uapi/linux/scc.h b/kernel/include/uapi/linux/scc.h
index 72b6b8153..c5bc7f747 100644
--- a/kernel/include/uapi/linux/scc.h
+++ b/kernel/include/uapi/linux/scc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* $Id: scc.h,v 1.29 1997/04/02 14:56:45 jreuter Exp jreuter $ */
 
 #ifndef _UAPI_SCC_H
diff --git a/kernel/include/uapi/linux/sched.h b/kernel/include/uapi/linux/sched.h
index e2a6c7b35..30a9e51bb 100644
--- a/kernel/include/uapi/linux/sched.h
+++ b/kernel/include/uapi/linux/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SCHED_H
 #define _UAPI_LINUX_SCHED_H
 
diff --git a/kernel/include/uapi/linux/sched/types.h b/kernel/include/uapi/linux/sched/types.h
index 34b81aa1a..10fbb8031 100644
--- a/kernel/include/uapi/linux/sched/types.h
+++ b/kernel/include/uapi/linux/sched/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SCHED_TYPES_H
 #define _UAPI_LINUX_SCHED_TYPES_H
 
diff --git a/kernel/include/uapi/linux/scif_ioctl.h b/kernel/include/uapi/linux/scif_ioctl.h
index d9048918b..862a4cc90 100644
--- a/kernel/include/uapi/linux/scif_ioctl.h
+++ b/kernel/include/uapi/linux/scif_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * Intel MIC Platform Software Stack (MPSS)
  *
diff --git a/kernel/include/uapi/linux/screen_info.h b/kernel/include/uapi/linux/screen_info.h
index 8b8d39dfb..87e5c0869 100644
--- a/kernel/include/uapi/linux/screen_info.h
+++ b/kernel/include/uapi/linux/screen_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_SCREEN_INFO_H
 #define _UAPI_SCREEN_INFO_H
 
diff --git a/kernel/include/uapi/linux/sctp.h b/kernel/include/uapi/linux/sctp.h
index 84fc2914b..cfe971296 100644
--- a/kernel/include/uapi/linux/sctp.h
+++ b/kernel/include/uapi/linux/sctp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* SCTP kernel implementation
  * (C) Copyright IBM Corp. 2001, 2004
  * Copyright (c) 1999-2000 Cisco, Inc.
diff --git a/kernel/include/uapi/linux/sdla.h b/kernel/include/uapi/linux/sdla.h
index 95eaff9c9..1e3735be6 100644
--- a/kernel/include/uapi/linux/sdla.h
+++ b/kernel/include/uapi/linux/sdla.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/seccomp.h b/kernel/include/uapi/linux/seccomp.h
index f6bc1dea3..2a0bd9dd1 100644
--- a/kernel/include/uapi/linux/seccomp.h
+++ b/kernel/include/uapi/linux/seccomp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SECCOMP_H
 #define _UAPI_LINUX_SECCOMP_H
 
diff --git a/kernel/include/uapi/linux/securebits.h b/kernel/include/uapi/linux/securebits.h
index 35ac35cef..d6d98877f 100644
--- a/kernel/include/uapi/linux/securebits.h
+++ b/kernel/include/uapi/linux/securebits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SECUREBITS_H
 #define _UAPI_LINUX_SECUREBITS_H
 
diff --git a/kernel/include/uapi/linux/sed-opal.h b/kernel/include/uapi/linux/sed-opal.h
index c72e07355..627624d35 100644
--- a/kernel/include/uapi/linux/sed-opal.h
+++ b/kernel/include/uapi/linux/sed-opal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright © 2016 Intel Corporation
  *
diff --git a/kernel/include/uapi/linux/seg6.h b/kernel/include/uapi/linux/seg6.h
index 7278511d3..2f6fb0dd6 100644
--- a/kernel/include/uapi/linux/seg6.h
+++ b/kernel/include/uapi/linux/seg6.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  SR-IPv6 implementation
  *
diff --git a/kernel/include/uapi/linux/seg6_genl.h b/kernel/include/uapi/linux/seg6_genl.h
index fcf1c60d7..d995d48da 100644
--- a/kernel/include/uapi/linux/seg6_genl.h
+++ b/kernel/include/uapi/linux/seg6_genl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SEG6_GENL_H
 #define _UAPI_LINUX_SEG6_GENL_H
 
diff --git a/kernel/include/uapi/linux/seg6_hmac.h b/kernel/include/uapi/linux/seg6_hmac.h
index e691c753f..b877c7821 100644
--- a/kernel/include/uapi/linux/seg6_hmac.h
+++ b/kernel/include/uapi/linux/seg6_hmac.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SEG6_HMAC_H
 #define _UAPI_LINUX_SEG6_HMAC_H
 
diff --git a/kernel/include/uapi/linux/seg6_iptunnel.h b/kernel/include/uapi/linux/seg6_iptunnel.h
index b23df9f58..09fb608a3 100644
--- a/kernel/include/uapi/linux/seg6_iptunnel.h
+++ b/kernel/include/uapi/linux/seg6_iptunnel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  SR-IPv6 implementation
  *
diff --git a/kernel/include/uapi/linux/selinux_netlink.h b/kernel/include/uapi/linux/selinux_netlink.h
index d23979778..2fc054217 100644
--- a/kernel/include/uapi/linux/selinux_netlink.h
+++ b/kernel/include/uapi/linux/selinux_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Netlink event notifications for SELinux.
  *
diff --git a/kernel/include/uapi/linux/sem.h b/kernel/include/uapi/linux/sem.h
index 67eb90361..9c3e745b0 100644
--- a/kernel/include/uapi/linux/sem.h
+++ b/kernel/include/uapi/linux/sem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SEM_H
 #define _UAPI_LINUX_SEM_H
 
diff --git a/kernel/include/uapi/linux/serial.h b/kernel/include/uapi/linux/serial.h
index d2667ecd5..3fdd0dee8 100644
--- a/kernel/include/uapi/linux/serial.h
+++ b/kernel/include/uapi/linux/serial.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * include/linux/serial.h
  *
diff --git a/kernel/include/uapi/linux/serial_core.h b/kernel/include/uapi/linux/serial_core.h
index 50d71c436..1c8413f93 100644
--- a/kernel/include/uapi/linux/serial_core.h
+++ b/kernel/include/uapi/linux/serial_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  linux/drivers/char/serial_core.h
  *
diff --git a/kernel/include/uapi/linux/serial_reg.h b/kernel/include/uapi/linux/serial_reg.h
index 5db76880b..619fe6111 100644
--- a/kernel/include/uapi/linux/serial_reg.h
+++ b/kernel/include/uapi/linux/serial_reg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * include/linux/serial_reg.h
  *
diff --git a/kernel/include/uapi/linux/serio.h b/kernel/include/uapi/linux/serio.h
index ac217c6f0..a0cac1d86 100644
--- a/kernel/include/uapi/linux/serio.h
+++ b/kernel/include/uapi/linux/serio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 1999-2002 Vojtech Pavlik
 *
diff --git a/kernel/include/uapi/linux/shm.h b/kernel/include/uapi/linux/shm.h
index cf23c8737..4de12a39b 100644
--- a/kernel/include/uapi/linux/shm.h
+++ b/kernel/include/uapi/linux/shm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SHM_H_
 #define _UAPI_LINUX_SHM_H_
 
diff --git a/kernel/include/uapi/linux/signal.h b/kernel/include/uapi/linux/signal.h
index cd0804b6b..e03238f8d 100644
--- a/kernel/include/uapi/linux/signal.h
+++ b/kernel/include/uapi/linux/signal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SIGNAL_H
 #define _UAPI_LINUX_SIGNAL_H
 
diff --git a/kernel/include/uapi/linux/signalfd.h b/kernel/include/uapi/linux/signalfd.h
index 492c6def3..6f0da42fc 100644
--- a/kernel/include/uapi/linux/signalfd.h
+++ b/kernel/include/uapi/linux/signalfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  include/linux/signalfd.h
  *
diff --git a/kernel/include/uapi/linux/smc.h b/kernel/include/uapi/linux/smc.h
index ab1dea8e5..0e11ca421 100644
--- a/kernel/include/uapi/linux/smc.h
+++ b/kernel/include/uapi/linux/smc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/include/uapi/linux/smc_diag.h b/kernel/include/uapi/linux/smc_diag.h
index 87712bfaa..0ae5d4685 100644
--- a/kernel/include/uapi/linux/smc_diag.h
+++ b/kernel/include/uapi/linux/smc_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_SMC_DIAG_H_
 #define _UAPI_SMC_DIAG_H_
 
diff --git a/kernel/include/uapi/linux/smiapp.h b/kernel/include/uapi/linux/smiapp.h
index 53938f441..50438f8d9 100644
--- a/kernel/include/uapi/linux/smiapp.h
+++ b/kernel/include/uapi/linux/smiapp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * include/uapi/linux/smiapp.h
  *
diff --git a/kernel/include/uapi/linux/snmp.h b/kernel/include/uapi/linux/snmp.h
index 758f12b58..0d941cdd8 100644
--- a/kernel/include/uapi/linux/snmp.h
+++ b/kernel/include/uapi/linux/snmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for MIBs
  *
diff --git a/kernel/include/uapi/linux/sock_diag.h b/kernel/include/uapi/linux/sock_diag.h
index 7ff505d8a..e5925009a 100644
--- a/kernel/include/uapi/linux/sock_diag.h
+++ b/kernel/include/uapi/linux/sock_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SOCK_DIAG_H__
 #define _UAPI__SOCK_DIAG_H__
 
diff --git a/kernel/include/uapi/linux/socket.h b/kernel/include/uapi/linux/socket.h
index 76ab0c685..8eb960217 100644
--- a/kernel/include/uapi/linux/socket.h
+++ b/kernel/include/uapi/linux/socket.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SOCKET_H
 #define _UAPI_LINUX_SOCKET_H
 
diff --git a/kernel/include/uapi/linux/sockios.h b/kernel/include/uapi/linux/sockios.h
index 79d029d25..d393e9ed3 100644
--- a/kernel/include/uapi/linux/sockios.h
+++ b/kernel/include/uapi/linux/sockios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/sonet.h b/kernel/include/uapi/linux/sonet.h
index cc54acee8..9d02357c6 100644
--- a/kernel/include/uapi/linux/sonet.h
+++ b/kernel/include/uapi/linux/sonet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* sonet.h - SONET/SHD physical layer control */
  
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/include/uapi/linux/sonypi.h b/kernel/include/uapi/linux/sonypi.h
index 85078a283..88f122451 100644
--- a/kernel/include/uapi/linux/sonypi.h
+++ b/kernel/include/uapi/linux/sonypi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Sony Programmable I/O Control Device driver for VAIO
  *
diff --git a/kernel/include/uapi/linux/sound.h b/kernel/include/uapi/linux/sound.h
index 014c9117c..a62d74042 100644
--- a/kernel/include/uapi/linux/sound.h
+++ b/kernel/include/uapi/linux/sound.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SOUND_H
 #define _UAPI_LINUX_SOUND_H
 
diff --git a/kernel/include/uapi/linux/spi/spidev.h b/kernel/include/uapi/linux/spi/spidev.h
index 856de39d0..c4253f009 100644
--- a/kernel/include/uapi/linux/spi/spidev.h
+++ b/kernel/include/uapi/linux/spi/spidev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * include/linux/spi/spidev.h
  *
diff --git a/kernel/include/uapi/linux/stat.h b/kernel/include/uapi/linux/stat.h
index 17b10304c..7b35e98d3 100644
--- a/kernel/include/uapi/linux/stat.h
+++ b/kernel/include/uapi/linux/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_STAT_H
 #define _UAPI_LINUX_STAT_H
 
diff --git a/kernel/include/uapi/linux/stddef.h b/kernel/include/uapi/linux/stddef.h
index 621fa8ac4..f65b92e0e 100644
--- a/kernel/include/uapi/linux/stddef.h
+++ b/kernel/include/uapi/linux/stddef.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <linux/compiler.h>
 
 #ifndef __always_inline
diff --git a/kernel/include/uapi/linux/stm.h b/kernel/include/uapi/linux/stm.h
index 626a8d3f6..dbffdc23d 100644
--- a/kernel/include/uapi/linux/stm.h
+++ b/kernel/include/uapi/linux/stm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * System Trace Module (STM) userspace interfaces
  * Copyright (c) 2014, Intel Corporation.
diff --git a/kernel/include/uapi/linux/string.h b/kernel/include/uapi/linux/string.h
index e32e545cf..9d129c13f 100644
--- a/kernel/include/uapi/linux/string.h
+++ b/kernel/include/uapi/linux/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_STRING_H_
 #define _UAPI_LINUX_STRING_H_
 
diff --git a/kernel/include/uapi/linux/sunrpc/debug.h b/kernel/include/uapi/linux/sunrpc/debug.h
index 830e34493..ae54af3d3 100644
--- a/kernel/include/uapi/linux/sunrpc/debug.h
+++ b/kernel/include/uapi/linux/sunrpc/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * linux/include/linux/sunrpc/debug.h
  *
diff --git a/kernel/include/uapi/linux/suspend_ioctls.h b/kernel/include/uapi/linux/suspend_ioctls.h
index 0b3038298..bcce04e21 100644
--- a/kernel/include/uapi/linux/suspend_ioctls.h
+++ b/kernel/include/uapi/linux/suspend_ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_SUSPEND_IOCTLS_H
 #define _LINUX_SUSPEND_IOCTLS_H
 
diff --git a/kernel/include/uapi/linux/swab.h b/kernel/include/uapi/linux/swab.h
index 8f3a8f606..23cd84868 100644
--- a/kernel/include/uapi/linux/swab.h
+++ b/kernel/include/uapi/linux/swab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SWAB_H
 #define _UAPI_LINUX_SWAB_H
 
diff --git a/kernel/include/uapi/linux/switchtec_ioctl.h b/kernel/include/uapi/linux/switchtec_ioctl.h
index 5e392968b..75df44373 100644
--- a/kernel/include/uapi/linux/switchtec_ioctl.h
+++ b/kernel/include/uapi/linux/switchtec_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Microsemi Switchtec PCIe Driver
  * Copyright (c) 2017, Microsemi Corporation
diff --git a/kernel/include/uapi/linux/sync_file.h b/kernel/include/uapi/linux/sync_file.h
index 5b287d697..ee2dcfb3d 100644
--- a/kernel/include/uapi/linux/sync_file.h
+++ b/kernel/include/uapi/linux/sync_file.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 Google, Inc.
  *
diff --git a/kernel/include/uapi/linux/synclink.h b/kernel/include/uapi/linux/synclink.h
index 7dcb065a5..62f32d4e1 100644
--- a/kernel/include/uapi/linux/synclink.h
+++ b/kernel/include/uapi/linux/synclink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
  * SyncLink Multiprotocol Serial Adapter Driver
  *
diff --git a/kernel/include/uapi/linux/sysctl.h b/kernel/include/uapi/linux/sysctl.h
index e13d48058..0f272818a 100644
--- a/kernel/include/uapi/linux/sysctl.h
+++ b/kernel/include/uapi/linux/sysctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * sysctl.h: General linux system control interface
  *
diff --git a/kernel/include/uapi/linux/sysinfo.h b/kernel/include/uapi/linux/sysinfo.h
index 934335a22..435d5c23f 100644
--- a/kernel/include/uapi/linux/sysinfo.h
+++ b/kernel/include/uapi/linux/sysinfo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_SYSINFO_H
 #define _LINUX_SYSINFO_H
 
diff --git a/kernel/include/uapi/linux/target_core_user.h b/kernel/include/uapi/linux/target_core_user.h
index 24a1c4ec2..0be80f726 100644
--- a/kernel/include/uapi/linux/target_core_user.h
+++ b/kernel/include/uapi/linux/target_core_user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __TARGET_CORE_USER_H
 #define __TARGET_CORE_USER_H
 
diff --git a/kernel/include/uapi/linux/taskstats.h b/kernel/include/uapi/linux/taskstats.h
index 2466e550a..b7aa7bb23 100644
--- a/kernel/include/uapi/linux/taskstats.h
+++ b/kernel/include/uapi/linux/taskstats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */
 /* taskstats.h - exporting per-task statistics
  *
  * Copyright (C) Shailabh Nagar, IBM Corp. 2006
diff --git a/kernel/include/uapi/linux/tc_act/tc_bpf.h b/kernel/include/uapi/linux/tc_act/tc_bpf.h
index 8dc2ac05e..6e89a5df4 100644
--- a/kernel/include/uapi/linux/tc_act/tc_bpf.h
+++ b/kernel/include/uapi/linux/tc_act/tc_bpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2015 Jiri Pirko <jiri@resnulli.us>
  *
diff --git a/kernel/include/uapi/linux/tc_act/tc_connmark.h b/kernel/include/uapi/linux/tc_act/tc_connmark.h
index 62a5e944c..80caa47b1 100644
--- a/kernel/include/uapi/linux/tc_act/tc_connmark.h
+++ b/kernel/include/uapi/linux/tc_act/tc_connmark.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __UAPI_TC_CONNMARK_H
 #define __UAPI_TC_CONNMARK_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_csum.h b/kernel/include/uapi/linux/tc_act/tc_csum.h
index a11bb355d..0ecf4d29e 100644
--- a/kernel/include/uapi/linux/tc_act/tc_csum.h
+++ b/kernel/include/uapi/linux/tc_act/tc_csum.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_CSUM_H
 #define __LINUX_TC_CSUM_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_defact.h b/kernel/include/uapi/linux/tc_act/tc_defact.h
index d2a3abb77..e3ecd8bf3 100644
--- a/kernel/include/uapi/linux/tc_act/tc_defact.h
+++ b/kernel/include/uapi/linux/tc_act/tc_defact.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_DEF_H
 #define __LINUX_TC_DEF_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_gact.h b/kernel/include/uapi/linux/tc_act/tc_gact.h
index 70b536a8f..94273c3b8 100644
--- a/kernel/include/uapi/linux/tc_act/tc_gact.h
+++ b/kernel/include/uapi/linux/tc_act/tc_gact.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_GACT_H
 #define __LINUX_TC_GACT_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_ife.h b/kernel/include/uapi/linux/tc_act/tc_ife.h
index 7c2817866..2f48490ef 100644
--- a/kernel/include/uapi/linux/tc_act/tc_ife.h
+++ b/kernel/include/uapi/linux/tc_act/tc_ife.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __UAPI_TC_IFE_H
 #define __UAPI_TC_IFE_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_ipt.h b/kernel/include/uapi/linux/tc_act/tc_ipt.h
index 7c6e155dd..b743c8bdd 100644
--- a/kernel/include/uapi/linux/tc_act/tc_ipt.h
+++ b/kernel/include/uapi/linux/tc_act/tc_ipt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_IPT_H
 #define __LINUX_TC_IPT_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_mirred.h b/kernel/include/uapi/linux/tc_act/tc_mirred.h
index 3d7a2b352..020696e07 100644
--- a/kernel/include/uapi/linux/tc_act/tc_mirred.h
+++ b/kernel/include/uapi/linux/tc_act/tc_mirred.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_MIR_H
 #define __LINUX_TC_MIR_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_nat.h b/kernel/include/uapi/linux/tc_act/tc_nat.h
index 923457c9e..086be8425 100644
--- a/kernel/include/uapi/linux/tc_act/tc_nat.h
+++ b/kernel/include/uapi/linux/tc_act/tc_nat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_NAT_H
 #define __LINUX_TC_NAT_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_pedit.h b/kernel/include/uapi/linux/tc_act/tc_pedit.h
index 143d2b31a..162d1094c 100644
--- a/kernel/include/uapi/linux/tc_act/tc_pedit.h
+++ b/kernel/include/uapi/linux/tc_act/tc_pedit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_PED_H
 #define __LINUX_TC_PED_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_sample.h b/kernel/include/uapi/linux/tc_act/tc_sample.h
index edc9058bb..bd7e9f03a 100644
--- a/kernel/include/uapi/linux/tc_act/tc_sample.h
+++ b/kernel/include/uapi/linux/tc_act/tc_sample.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_SAMPLE_H
 #define __LINUX_TC_SAMPLE_H
 
diff --git a/kernel/include/uapi/linux/tc_act/tc_skbedit.h b/kernel/include/uapi/linux/tc_act/tc_skbedit.h
index 288442573..fbcfe27a4 100644
--- a/kernel/include/uapi/linux/tc_act/tc_skbedit.h
+++ b/kernel/include/uapi/linux/tc_act/tc_skbedit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2008, Intel Corporation.
  *
diff --git a/kernel/include/uapi/linux/tc_act/tc_skbmod.h b/kernel/include/uapi/linux/tc_act/tc_skbmod.h
index 10fc07da6..38c072f66 100644
--- a/kernel/include/uapi/linux/tc_act/tc_skbmod.h
+++ b/kernel/include/uapi/linux/tc_act/tc_skbmod.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2016, Jamal Hadi Salim
  *
diff --git a/kernel/include/uapi/linux/tc_act/tc_tunnel_key.h b/kernel/include/uapi/linux/tc_act/tc_tunnel_key.h
index afcd4be95..72bbefe5d 100644
--- a/kernel/include/uapi/linux/tc_act/tc_tunnel_key.h
+++ b/kernel/include/uapi/linux/tc_act/tc_tunnel_key.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2016, Amir Vadai <amir@vadai.me>
  * Copyright (c) 2016, Mellanox Technologies. All rights reserved.
diff --git a/kernel/include/uapi/linux/tc_act/tc_vlan.h b/kernel/include/uapi/linux/tc_act/tc_vlan.h
index bddb272b8..0d7b5fd66 100644
--- a/kernel/include/uapi/linux/tc_act/tc_vlan.h
+++ b/kernel/include/uapi/linux/tc_act/tc_vlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
  *
diff --git a/kernel/include/uapi/linux/tc_ematch/tc_em_cmp.h b/kernel/include/uapi/linux/tc_ematch/tc_em_cmp.h
index f34bb1bae..2549d9d6e 100644
--- a/kernel/include/uapi/linux/tc_ematch/tc_em_cmp.h
+++ b/kernel/include/uapi/linux/tc_ematch/tc_em_cmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_EM_CMP_H
 #define __LINUX_TC_EM_CMP_H
 
diff --git a/kernel/include/uapi/linux/tc_ematch/tc_em_meta.h b/kernel/include/uapi/linux/tc_ematch/tc_em_meta.h
index b11f8ce2d..cf30b5bc4 100644
--- a/kernel/include/uapi/linux/tc_ematch/tc_em_meta.h
+++ b/kernel/include/uapi/linux/tc_ematch/tc_em_meta.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_EM_META_H
 #define __LINUX_TC_EM_META_H
 
diff --git a/kernel/include/uapi/linux/tc_ematch/tc_em_nbyte.h b/kernel/include/uapi/linux/tc_ematch/tc_em_nbyte.h
index 7172cfb99..c76333f7f 100644
--- a/kernel/include/uapi/linux/tc_ematch/tc_em_nbyte.h
+++ b/kernel/include/uapi/linux/tc_ematch/tc_em_nbyte.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_EM_NBYTE_H
 #define __LINUX_TC_EM_NBYTE_H
 
diff --git a/kernel/include/uapi/linux/tc_ematch/tc_em_text.h b/kernel/include/uapi/linux/tc_ematch/tc_em_text.h
index 5aac4045b..b0a922579 100644
--- a/kernel/include/uapi/linux/tc_ematch/tc_em_text.h
+++ b/kernel/include/uapi/linux/tc_ematch/tc_em_text.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_TC_EM_TEXT_H
 #define __LINUX_TC_EM_TEXT_H
 
diff --git a/kernel/include/uapi/linux/tcp.h b/kernel/include/uapi/linux/tcp.h
index 15c25ecca..6a64beeec 100644
--- a/kernel/include/uapi/linux/tcp.h
+++ b/kernel/include/uapi/linux/tcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/tcp_metrics.h b/kernel/include/uapi/linux/tcp_metrics.h
index 80ad90d0c..7cb4a172f 100644
--- a/kernel/include/uapi/linux/tcp_metrics.h
+++ b/kernel/include/uapi/linux/tcp_metrics.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* tcp_metrics.h - TCP Metrics Interface */
 
 #ifndef _LINUX_TCP_METRICS_H
diff --git a/kernel/include/uapi/linux/telephony.h b/kernel/include/uapi/linux/telephony.h
index f63afe330..d2c9f7105 100644
--- a/kernel/include/uapi/linux/telephony.h
+++ b/kernel/include/uapi/linux/telephony.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /******************************************************************************
  *
  *		telephony.h
diff --git a/kernel/include/uapi/linux/termios.h b/kernel/include/uapi/linux/termios.h
index 2acd0c1f8..33961d4e4 100644
--- a/kernel/include/uapi/linux/termios.h
+++ b/kernel/include/uapi/linux/termios.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_TERMIOS_H
 #define _LINUX_TERMIOS_H
 
diff --git a/kernel/include/uapi/linux/thermal.h b/kernel/include/uapi/linux/thermal.h
index ac5535855..96218378d 100644
--- a/kernel/include/uapi/linux/thermal.h
+++ b/kernel/include/uapi/linux/thermal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_THERMAL_H
 #define _UAPI_LINUX_THERMAL_H
 
diff --git a/kernel/include/uapi/linux/time.h b/kernel/include/uapi/linux/time.h
index 09299fcb8..53f8dd84b 100644
--- a/kernel/include/uapi/linux/time.h
+++ b/kernel/include/uapi/linux/time.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_TIME_H
 #define _UAPI_LINUX_TIME_H
 
diff --git a/kernel/include/uapi/linux/timerfd.h b/kernel/include/uapi/linux/timerfd.h
index 6fcfaa8da..dd469944d 100644
--- a/kernel/include/uapi/linux/timerfd.h
+++ b/kernel/include/uapi/linux/timerfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  include/linux/timerfd.h
  *
diff --git a/kernel/include/uapi/linux/times.h b/kernel/include/uapi/linux/times.h
index 87b62615c..9c72df662 100644
--- a/kernel/include/uapi/linux/times.h
+++ b/kernel/include/uapi/linux/times.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_TIMES_H
 #define _LINUX_TIMES_H
 
diff --git a/kernel/include/uapi/linux/tiocl.h b/kernel/include/uapi/linux/tiocl.h
index 4756862c4..b32acc229 100644
--- a/kernel/include/uapi/linux/tiocl.h
+++ b/kernel/include/uapi/linux/tiocl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_TIOCL_H
 #define _LINUX_TIOCL_H
 
diff --git a/kernel/include/uapi/linux/tipc.h b/kernel/include/uapi/linux/tipc.h
index 5351b08c8..77123614e 100644
--- a/kernel/include/uapi/linux/tipc.h
+++ b/kernel/include/uapi/linux/tipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * include/uapi/linux/tipc.h: Header for TIPC socket interface
  *
diff --git a/kernel/include/uapi/linux/tipc_config.h b/kernel/include/uapi/linux/tipc_config.h
index 087b0ef82..3f29e3c8e 100644
--- a/kernel/include/uapi/linux/tipc_config.h
+++ b/kernel/include/uapi/linux/tipc_config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface
  *
diff --git a/kernel/include/uapi/linux/tipc_netlink.h b/kernel/include/uapi/linux/tipc_netlink.h
index f9edd20fe..469aa67a5 100644
--- a/kernel/include/uapi/linux/tipc_netlink.h
+++ b/kernel/include/uapi/linux/tipc_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * Copyright (c) 2014, Ericsson AB
  * All rights reserved.
diff --git a/kernel/include/uapi/linux/tls.h b/kernel/include/uapi/linux/tls.h
index cc1d21db3..d5e0682ab 100644
--- a/kernel/include/uapi/linux/tls.h
+++ b/kernel/include/uapi/linux/tls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.
  *
diff --git a/kernel/include/uapi/linux/toshiba.h b/kernel/include/uapi/linux/toshiba.h
index c58bf4b5b..7f1941935 100644
--- a/kernel/include/uapi/linux/toshiba.h
+++ b/kernel/include/uapi/linux/toshiba.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /* toshiba.h -- Linux driver for accessing the SMM on Toshiba laptops 
  *
  * Copyright (c) 1996-2000  Jonathan A. Buzzard (jonathan@buzzard.org.uk)
diff --git a/kernel/include/uapi/linux/tty.h b/kernel/include/uapi/linux/tty.h
index cf1455396..376cccf39 100644
--- a/kernel/include/uapi/linux/tty.h
+++ b/kernel/include/uapi/linux/tty.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_TTY_H
 #define _UAPI_LINUX_TTY_H
 
diff --git a/kernel/include/uapi/linux/tty_flags.h b/kernel/include/uapi/linux/tty_flags.h
index 66e4d8bcb..6ac609a00 100644
--- a/kernel/include/uapi/linux/tty_flags.h
+++ b/kernel/include/uapi/linux/tty_flags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_TTY_FLAGS_H
 #define _LINUX_TTY_FLAGS_H
 
diff --git a/kernel/include/uapi/linux/types.h b/kernel/include/uapi/linux/types.h
index 41e5914f0..e3d1d0c78 100644
--- a/kernel/include/uapi/linux/types.h
+++ b/kernel/include/uapi/linux/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_TYPES_H
 #define _UAPI_LINUX_TYPES_H
 
diff --git a/kernel/include/uapi/linux/udf_fs_i.h b/kernel/include/uapi/linux/udf_fs_i.h
index 353696591..c50863080 100644
--- a/kernel/include/uapi/linux/udf_fs_i.h
+++ b/kernel/include/uapi/linux/udf_fs_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * udf_fs_i.h
  *
diff --git a/kernel/include/uapi/linux/udp.h b/kernel/include/uapi/linux/udp.h
index 2c8180f91..efb7b5991 100644
--- a/kernel/include/uapi/linux/udp.h
+++ b/kernel/include/uapi/linux/udp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/include/uapi/linux/uhid.h b/kernel/include/uapi/linux/uhid.h
index aaa86d6bd..cef7534d2 100644
--- a/kernel/include/uapi/linux/uhid.h
+++ b/kernel/include/uapi/linux/uhid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef __UHID_H_
 #define __UHID_H_
 
diff --git a/kernel/include/uapi/linux/uinput.h b/kernel/include/uapi/linux/uinput.h
index dc652e224..c9e677e3a 100644
--- a/kernel/include/uapi/linux/uinput.h
+++ b/kernel/include/uapi/linux/uinput.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  User level driver support for input subsystem
  *
diff --git a/kernel/include/uapi/linux/uio.h b/kernel/include/uapi/linux/uio.h
index 2731d56a5..059b1a914 100644
--- a/kernel/include/uapi/linux/uio.h
+++ b/kernel/include/uapi/linux/uio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *	Berkeley style UIO structures	-	Alan Cox 1994.
  *
diff --git a/kernel/include/uapi/linux/uleds.h b/kernel/include/uapi/linux/uleds.h
index 95186578c..4d32a3996 100644
--- a/kernel/include/uapi/linux/uleds.h
+++ b/kernel/include/uapi/linux/uleds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Userspace driver support for the LED subsystem
  *
diff --git a/kernel/include/uapi/linux/ultrasound.h b/kernel/include/uapi/linux/ultrasound.h
index 71339dc53..73305bd1d 100644
--- a/kernel/include/uapi/linux/ultrasound.h
+++ b/kernel/include/uapi/linux/ultrasound.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ULTRASOUND_H_
 #define _ULTRASOUND_H_
 /*
diff --git a/kernel/include/uapi/linux/un.h b/kernel/include/uapi/linux/un.h
index 4f0ab3a54..0ad59dc8b 100644
--- a/kernel/include/uapi/linux/un.h
+++ b/kernel/include/uapi/linux/un.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_UN_H
 #define _LINUX_UN_H
 
diff --git a/kernel/include/uapi/linux/unistd.h b/kernel/include/uapi/linux/unistd.h
index aa8d5b5e2..a92361f5d 100644
--- a/kernel/include/uapi/linux/unistd.h
+++ b/kernel/include/uapi/linux/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_UNISTD_H_
 #define _LINUX_UNISTD_H_
 
diff --git a/kernel/include/uapi/linux/unix_diag.h b/kernel/include/uapi/linux/unix_diag.h
index 1eb0b8dd1..5c502fdf7 100644
--- a/kernel/include/uapi/linux/unix_diag.h
+++ b/kernel/include/uapi/linux/unix_diag.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __UNIX_DIAG_H__
 #define __UNIX_DIAG_H__
 
diff --git a/kernel/include/uapi/linux/usb/audio.h b/kernel/include/uapi/linux/usb/audio.h
index a4680a5bf..17a022c5b 100644
--- a/kernel/include/uapi/linux/usb/audio.h
+++ b/kernel/include/uapi/linux/usb/audio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * <linux/usb/audio.h> -- USB Audio definitions.
  *
diff --git a/kernel/include/uapi/linux/usb/cdc-wdm.h b/kernel/include/uapi/linux/usb/cdc-wdm.h
index 0dc132e75..a927c7f6f 100644
--- a/kernel/include/uapi/linux/usb/cdc-wdm.h
+++ b/kernel/include/uapi/linux/usb/cdc-wdm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * USB CDC Device Management userspace API definitions
  *
diff --git a/kernel/include/uapi/linux/usb/cdc.h b/kernel/include/uapi/linux/usb/cdc.h
index e2bc417b2..6d6155095 100644
--- a/kernel/include/uapi/linux/usb/cdc.h
+++ b/kernel/include/uapi/linux/usb/cdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * USB Communications Device Class (CDC) definitions
  *
diff --git a/kernel/include/uapi/linux/usb/ch11.h b/kernel/include/uapi/linux/usb/ch11.h
index 576c704e3..29c120c88 100644
--- a/kernel/include/uapi/linux/usb/ch11.h
+++ b/kernel/include/uapi/linux/usb/ch11.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file holds Hub protocol constants and data structures that are
  * defined in chapter 11 (Hub Specification) of the USB 2.0 specification.
diff --git a/kernel/include/uapi/linux/usb/ch9.h b/kernel/include/uapi/linux/usb/ch9.h
index 2a5d63040..cec06625f 100644
--- a/kernel/include/uapi/linux/usb/ch9.h
+++ b/kernel/include/uapi/linux/usb/ch9.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file holds USB constants and structures that are needed for
  * USB device APIs.  These are used by the USB device model, which is
diff --git a/kernel/include/uapi/linux/usb/functionfs.h b/kernel/include/uapi/linux/usb/functionfs.h
index f913d08ab..d77ee6b65 100644
--- a/kernel/include/uapi/linux/usb/functionfs.h
+++ b/kernel/include/uapi/linux/usb/functionfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_FUNCTIONFS_H__
 #define _UAPI__LINUX_FUNCTIONFS_H__
 
diff --git a/kernel/include/uapi/linux/usb/g_printer.h b/kernel/include/uapi/linux/usb/g_printer.h
index 6178fde50..7fc20e4b8 100644
--- a/kernel/include/uapi/linux/usb/g_printer.h
+++ b/kernel/include/uapi/linux/usb/g_printer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * g_printer.h -- Header file for USB Printer gadget driver
  *
diff --git a/kernel/include/uapi/linux/usb/gadgetfs.h b/kernel/include/uapi/linux/usb/gadgetfs.h
index 0bb12e0d4..835473910 100644
--- a/kernel/include/uapi/linux/usb/gadgetfs.h
+++ b/kernel/include/uapi/linux/usb/gadgetfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Filesystem based user-mode API to USB Gadget controller hardware
  *
diff --git a/kernel/include/uapi/linux/usb/midi.h b/kernel/include/uapi/linux/usb/midi.h
index c8c52e3c9..de6941ef7 100644
--- a/kernel/include/uapi/linux/usb/midi.h
+++ b/kernel/include/uapi/linux/usb/midi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * <linux/usb/midi.h> -- USB MIDI definitions.
  *
diff --git a/kernel/include/uapi/linux/usb/tmc.h b/kernel/include/uapi/linux/usb/tmc.h
index 2e59d9c50..03f6adc8f 100644
--- a/kernel/include/uapi/linux/usb/tmc.h
+++ b/kernel/include/uapi/linux/usb/tmc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2007 Stefan Kopp, Gechingen, Germany
  * Copyright (C) 2008 Novell, Inc.
diff --git a/kernel/include/uapi/linux/usb/video.h b/kernel/include/uapi/linux/usb/video.h
index 69ab695fa..ff6cc6cb4 100644
--- a/kernel/include/uapi/linux/usb/video.h
+++ b/kernel/include/uapi/linux/usb/video.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * USB Video Class definitions.
  *
diff --git a/kernel/include/uapi/linux/usbdevice_fs.h b/kernel/include/uapi/linux/usbdevice_fs.h
index 0bbfd4abd..70ed5338d 100644
--- a/kernel/include/uapi/linux/usbdevice_fs.h
+++ b/kernel/include/uapi/linux/usbdevice_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*****************************************************************************/
 
 /*
diff --git a/kernel/include/uapi/linux/usbip.h b/kernel/include/uapi/linux/usbip.h
index fa5db30ed..fd393d908 100644
--- a/kernel/include/uapi/linux/usbip.h
+++ b/kernel/include/uapi/linux/usbip.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	usbip.h
  *
diff --git a/kernel/include/uapi/linux/userfaultfd.h b/kernel/include/uapi/linux/userfaultfd.h
index d6d1f65cb..48f1a7c2f 100644
--- a/kernel/include/uapi/linux/userfaultfd.h
+++ b/kernel/include/uapi/linux/userfaultfd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  include/linux/userfaultfd.h
  *
diff --git a/kernel/include/uapi/linux/userio.h b/kernel/include/uapi/linux/userio.h
index 37d147f0a..74c9951d2 100644
--- a/kernel/include/uapi/linux/userio.h
+++ b/kernel/include/uapi/linux/userio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.0+ WITH Linux-syscall-note */
 /*
  * userio: virtual serio device support
  * Copyright (C) 2015 Red Hat
diff --git a/kernel/include/uapi/linux/utime.h b/kernel/include/uapi/linux/utime.h
index 5cdf673af..fd9aa26b6 100644
--- a/kernel/include/uapi/linux/utime.h
+++ b/kernel/include/uapi/linux/utime.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_UTIME_H
 #define _LINUX_UTIME_H
 
diff --git a/kernel/include/uapi/linux/utsname.h b/kernel/include/uapi/linux/utsname.h
index 872c2df10..c99edc662 100644
--- a/kernel/include/uapi/linux/utsname.h
+++ b/kernel/include/uapi/linux/utsname.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_UTSNAME_H
 #define _UAPI_LINUX_UTSNAME_H
 
diff --git a/kernel/include/uapi/linux/uuid.h b/kernel/include/uapi/linux/uuid.h
index 8ef82f433..5c04130bb 100644
--- a/kernel/include/uapi/linux/uuid.h
+++ b/kernel/include/uapi/linux/uuid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * UUID/GUID definition
  *
diff --git a/kernel/include/uapi/linux/uvcvideo.h b/kernel/include/uapi/linux/uvcvideo.h
index 3b081862b..e80b4655d 100644
--- a/kernel/include/uapi/linux/uvcvideo.h
+++ b/kernel/include/uapi/linux/uvcvideo.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_UVCVIDEO_H_
 #define __LINUX_UVCVIDEO_H_
 
diff --git a/kernel/include/uapi/linux/v4l2-common.h b/kernel/include/uapi/linux/v4l2-common.h
index 5b3f685a2..4f7b89237 100644
--- a/kernel/include/uapi/linux/v4l2-common.h
+++ b/kernel/include/uapi/linux/v4l2-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  * include/linux/v4l2-common.h
  *
diff --git a/kernel/include/uapi/linux/v4l2-controls.h b/kernel/include/uapi/linux/v4l2-controls.h
index 31bfc68f8..a692623e0 100644
--- a/kernel/include/uapi/linux/v4l2-controls.h
+++ b/kernel/include/uapi/linux/v4l2-controls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  *  Video for Linux Two controls header file
  *
diff --git a/kernel/include/uapi/linux/v4l2-dv-timings.h b/kernel/include/uapi/linux/v4l2-dv-timings.h
index da2955154..b52b67c62 100644
--- a/kernel/include/uapi/linux/v4l2-dv-timings.h
+++ b/kernel/include/uapi/linux/v4l2-dv-timings.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * V4L2 DV timings header.
  *
diff --git a/kernel/include/uapi/linux/v4l2-mediabus.h b/kernel/include/uapi/linux/v4l2-mediabus.h
index 9cac6325c..6e20de63e 100644
--- a/kernel/include/uapi/linux/v4l2-mediabus.h
+++ b/kernel/include/uapi/linux/v4l2-mediabus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Media Bus API header
  *
diff --git a/kernel/include/uapi/linux/v4l2-subdev.h b/kernel/include/uapi/linux/v4l2-subdev.h
index dbce2b554..c95a53e67 100644
--- a/kernel/include/uapi/linux/v4l2-subdev.h
+++ b/kernel/include/uapi/linux/v4l2-subdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * V4L2 subdev userspace API
  *
diff --git a/kernel/include/uapi/linux/veth.h b/kernel/include/uapi/linux/veth.h
index 3354c1eb4..52b58e587 100644
--- a/kernel/include/uapi/linux/veth.h
+++ b/kernel/include/uapi/linux/veth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __NET_VETH_H_
 #define __NET_VETH_H_
 
diff --git a/kernel/include/uapi/linux/vfio.h b/kernel/include/uapi/linux/vfio.h
index ae4610506..e3301dbd2 100644
--- a/kernel/include/uapi/linux/vfio.h
+++ b/kernel/include/uapi/linux/vfio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * VFIO API definition
  *
diff --git a/kernel/include/uapi/linux/vfio_ccw.h b/kernel/include/uapi/linux/vfio_ccw.h
index 34a7f6f9e..2ec5f367f 100644
--- a/kernel/include/uapi/linux/vfio_ccw.h
+++ b/kernel/include/uapi/linux/vfio_ccw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Interfaces for vfio-ccw
  *
diff --git a/kernel/include/uapi/linux/vhost.h b/kernel/include/uapi/linux/vhost.h
index 60180c0b5..c51f8e5cc 100644
--- a/kernel/include/uapi/linux/vhost.h
+++ b/kernel/include/uapi/linux/vhost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_VHOST_H
 #define _LINUX_VHOST_H
 /* Userspace interface for in-kernel virtio accelerators. */
diff --git a/kernel/include/uapi/linux/videodev2.h b/kernel/include/uapi/linux/videodev2.h
index 185d6a0ac..1c095b5a9 100644
--- a/kernel/include/uapi/linux/videodev2.h
+++ b/kernel/include/uapi/linux/videodev2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  *  Video for Linux Two header file
  *
diff --git a/kernel/include/uapi/linux/vm_sockets.h b/kernel/include/uapi/linux/vm_sockets.h
index b4ed5d895..68d57c5e9 100644
--- a/kernel/include/uapi/linux/vm_sockets.h
+++ b/kernel/include/uapi/linux/vm_sockets.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * VMware vSockets Driver
  *
diff --git a/kernel/include/uapi/linux/vsockmon.h b/kernel/include/uapi/linux/vsockmon.h
index a08b522ef..4a03b893a 100644
--- a/kernel/include/uapi/linux/vsockmon.h
+++ b/kernel/include/uapi/linux/vsockmon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_VSOCKMON_H
 #define _UAPI_VSOCKMON_H
 
diff --git a/kernel/include/uapi/linux/vt.h b/kernel/include/uapi/linux/vt.h
index f69034887..e9d39c485 100644
--- a/kernel/include/uapi/linux/vt.h
+++ b/kernel/include/uapi/linux/vt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_VT_H
 #define _UAPI_LINUX_VT_H
 
diff --git a/kernel/include/uapi/linux/vtpm_proxy.h b/kernel/include/uapi/linux/vtpm_proxy.h
index 58ac73cd3..31a30f33a 100644
--- a/kernel/include/uapi/linux/vtpm_proxy.h
+++ b/kernel/include/uapi/linux/vtpm_proxy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for the VTPM proxy driver
  * Copyright (c) 2015, 2016, IBM Corporation
diff --git a/kernel/include/uapi/linux/wait.h b/kernel/include/uapi/linux/wait.h
index 9393eead2..ac49a220c 100644
--- a/kernel/include/uapi/linux/wait.h
+++ b/kernel/include/uapi/linux/wait.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_WAIT_H
 #define _UAPI_LINUX_WAIT_H
 
diff --git a/kernel/include/uapi/linux/wanrouter.h b/kernel/include/uapi/linux/wanrouter.h
index 498d6c12c..2f1216d00 100644
--- a/kernel/include/uapi/linux/wanrouter.h
+++ b/kernel/include/uapi/linux/wanrouter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * wanrouter.h	Legacy declarations kept around until X25 is removed
  */
diff --git a/kernel/include/uapi/linux/watchdog.h b/kernel/include/uapi/linux/watchdog.h
index 2babe7287..b15cde5c9 100644
--- a/kernel/include/uapi/linux/watchdog.h
+++ b/kernel/include/uapi/linux/watchdog.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *	Generic watchdog defines. Derived from..
  *
diff --git a/kernel/include/uapi/linux/wireless.h b/kernel/include/uapi/linux/wireless.h
index d9ecd7c6d..86eca3208 100644
--- a/kernel/include/uapi/linux/wireless.h
+++ b/kernel/include/uapi/linux/wireless.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file define a set of standard wireless extensions
  *
diff --git a/kernel/include/uapi/linux/x25.h b/kernel/include/uapi/linux/x25.h
index 810cce673..034b7dc55 100644
--- a/kernel/include/uapi/linux/x25.h
+++ b/kernel/include/uapi/linux/x25.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * These are the public elements of the Linux kernel X.25 implementation.
  *
diff --git a/kernel/include/uapi/linux/xattr.h b/kernel/include/uapi/linux/xattr.h
index 1590c49ca..a92be0f49 100644
--- a/kernel/include/uapi/linux/xattr.h
+++ b/kernel/include/uapi/linux/xattr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
   File: linux/xattr.h
 
diff --git a/kernel/include/uapi/linux/xfrm.h b/kernel/include/uapi/linux/xfrm.h
index 5fe7370a2..e3af28591 100644
--- a/kernel/include/uapi/linux/xfrm.h
+++ b/kernel/include/uapi/linux/xfrm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_XFRM_H
 #define _LINUX_XFRM_H
 
diff --git a/kernel/include/uapi/linux/xilinx-v4l2-controls.h b/kernel/include/uapi/linux/xilinx-v4l2-controls.h
index fb495b91e..b6441fe70 100644
--- a/kernel/include/uapi/linux/xilinx-v4l2-controls.h
+++ b/kernel/include/uapi/linux/xilinx-v4l2-controls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Xilinx Controls Header
  *
diff --git a/kernel/include/uapi/linux/zorro.h b/kernel/include/uapi/linux/zorro.h
index 59d021b24..9798d1864 100644
--- a/kernel/include/uapi/linux/zorro.h
+++ b/kernel/include/uapi/linux/zorro.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  linux/zorro.h -- Amiga AutoConfig (Zorro) Bus Definitions
  *
diff --git a/kernel/include/uapi/linux/zorro_ids.h b/kernel/include/uapi/linux/zorro_ids.h
index 74bc53bcf..6e574d7b7 100644
--- a/kernel/include/uapi/linux/zorro_ids.h
+++ b/kernel/include/uapi/linux/zorro_ids.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  Zorro board IDs
  *
diff --git a/kernel/include/uapi/misc/cxl.h b/kernel/include/uapi/misc/cxl.h
index 180d526a5..49e8fd088 100644
--- a/kernel/include/uapi/misc/cxl.h
+++ b/kernel/include/uapi/misc/cxl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright 2014 IBM Corp.
  *
diff --git a/kernel/include/uapi/mtd/inftl-user.h b/kernel/include/uapi/mtd/inftl-user.h
index 8376bd1a9..8d5044e32 100644
--- a/kernel/include/uapi/mtd/inftl-user.h
+++ b/kernel/include/uapi/mtd/inftl-user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Parts of INFTL headers shared with userspace
  *
diff --git a/kernel/include/uapi/mtd/mtd-abi.h b/kernel/include/uapi/mtd/mtd-abi.h
index 0ec1da2ef..aff5b5e59 100644
--- a/kernel/include/uapi/mtd/mtd-abi.h
+++ b/kernel/include/uapi/mtd/mtd-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al.
  *
diff --git a/kernel/include/uapi/mtd/mtd-user.h b/kernel/include/uapi/mtd/mtd-user.h
index e71d5558c..7eca1b3f6 100644
--- a/kernel/include/uapi/mtd/mtd-user.h
+++ b/kernel/include/uapi/mtd/mtd-user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org>
  *
diff --git a/kernel/include/uapi/mtd/nftl-user.h b/kernel/include/uapi/mtd/nftl-user.h
index bdeabd86a..b23bdc91c 100644
--- a/kernel/include/uapi/mtd/nftl-user.h
+++ b/kernel/include/uapi/mtd/nftl-user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org>
  *
diff --git a/kernel/include/uapi/mtd/ubi-user.h b/kernel/include/uapi/mtd/ubi-user.h
index 1927b0d78..5b04a494d 100644
--- a/kernel/include/uapi/mtd/ubi-user.h
+++ b/kernel/include/uapi/mtd/ubi-user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright © International Business Machines Corp., 2006
  *
diff --git a/kernel/include/uapi/rdma/bnxt_re-abi.h b/kernel/include/uapi/rdma/bnxt_re-abi.h
index 74018bd18..398a514ee 100644
--- a/kernel/include/uapi/rdma/bnxt_re-abi.h
+++ b/kernel/include/uapi/rdma/bnxt_re-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Broadcom NetXtreme-E RoCE driver.
  *
diff --git a/kernel/include/uapi/rdma/cxgb3-abi.h b/kernel/include/uapi/rdma/cxgb3-abi.h
index d24eee121..d5745e43a 100644
--- a/kernel/include/uapi/rdma/cxgb3-abi.h
+++ b/kernel/include/uapi/rdma/cxgb3-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2006 Chelsio, Inc. All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/cxgb4-abi.h b/kernel/include/uapi/rdma/cxgb4-abi.h
index 472b15990..05f71f1bc 100644
--- a/kernel/include/uapi/rdma/cxgb4-abi.h
+++ b/kernel/include/uapi/rdma/cxgb4-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2009-2010 Chelsio, Inc. All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/hfi/hfi1_ioctl.h b/kernel/include/uapi/rdma/hfi/hfi1_ioctl.h
index 4791cc8cb..9de78c5ee 100644
--- a/kernel/include/uapi/rdma/hfi/hfi1_ioctl.h
+++ b/kernel/include/uapi/rdma/hfi/hfi1_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
diff --git a/kernel/include/uapi/rdma/hfi/hfi1_user.h b/kernel/include/uapi/rdma/hfi/hfi1_user.h
index 3f4ee93ae..791bea2f8 100644
--- a/kernel/include/uapi/rdma/hfi/hfi1_user.h
+++ b/kernel/include/uapi/rdma/hfi/hfi1_user.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /*
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
diff --git a/kernel/include/uapi/rdma/hns-abi.h b/kernel/include/uapi/rdma/hns-abi.h
index 5d7401963..a9c03b0ee 100644
--- a/kernel/include/uapi/rdma/hns-abi.h
+++ b/kernel/include/uapi/rdma/hns-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2016 Hisilicon Limited.
  *
diff --git a/kernel/include/uapi/rdma/ib_user_cm.h b/kernel/include/uapi/rdma/ib_user_cm.h
index f79014aa2..f4041bdc4 100644
--- a/kernel/include/uapi/rdma/ib_user_cm.h
+++ b/kernel/include/uapi/rdma/ib_user_cm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Intel Corporation.  All rights reserved.
diff --git a/kernel/include/uapi/rdma/ib_user_mad.h b/kernel/include/uapi/rdma/ib_user_mad.h
index 5c7abd859..330a3c5f1 100644
--- a/kernel/include/uapi/rdma/ib_user_mad.h
+++ b/kernel/include/uapi/rdma/ib_user_mad.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005 Voltaire, Inc. All rights reserved.
diff --git a/kernel/include/uapi/rdma/ib_user_sa.h b/kernel/include/uapi/rdma/ib_user_sa.h
index cfc7c9ba7..0d2607f0c 100644
--- a/kernel/include/uapi/rdma/ib_user_sa.h
+++ b/kernel/include/uapi/rdma/ib_user_sa.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2005 Intel Corporation.  All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/ib_user_verbs.h b/kernel/include/uapi/rdma/ib_user_verbs.h
index d4e0b53bf..e0e83a105 100644
--- a/kernel/include/uapi/rdma/ib_user_verbs.h
+++ b/kernel/include/uapi/rdma/ib_user_verbs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
diff --git a/kernel/include/uapi/rdma/mlx4-abi.h b/kernel/include/uapi/rdma/mlx4-abi.h
index c55f60e05..224b52b62 100644
--- a/kernel/include/uapi/rdma/mlx4-abi.h
+++ b/kernel/include/uapi/rdma/mlx4-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
  * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
diff --git a/kernel/include/uapi/rdma/mlx5-abi.h b/kernel/include/uapi/rdma/mlx5-abi.h
index 1791bf123..23dba2d40 100644
--- a/kernel/include/uapi/rdma/mlx5-abi.h
+++ b/kernel/include/uapi/rdma/mlx5-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2013-2015, Mellanox Technologies. All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/mthca-abi.h b/kernel/include/uapi/rdma/mthca-abi.h
index bcbf4ff2f..3020d8a90 100644
--- a/kernel/include/uapi/rdma/mthca-abi.h
+++ b/kernel/include/uapi/rdma/mthca-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
  * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
diff --git a/kernel/include/uapi/rdma/nes-abi.h b/kernel/include/uapi/rdma/nes-abi.h
index 6eb373439..f5b2437aa 100644
--- a/kernel/include/uapi/rdma/nes-abi.h
+++ b/kernel/include/uapi/rdma/nes-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2006 - 2011 Intel Corporation.  All rights reserved.
  * Copyright (c) 2005 Topspin Communications.  All rights reserved.
diff --git a/kernel/include/uapi/rdma/ocrdma-abi.h b/kernel/include/uapi/rdma/ocrdma-abi.h
index 9f28191be..ad64a3cea 100644
--- a/kernel/include/uapi/rdma/ocrdma-abi.h
+++ b/kernel/include/uapi/rdma/ocrdma-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /* This file is part of the Emulex RoCE Device Driver for
  * RoCE (RDMA over Converged Ethernet) adapters.
  * Copyright (C) 2012-2015 Emulex. All rights reserved.
diff --git a/kernel/include/uapi/rdma/qedr-abi.h b/kernel/include/uapi/rdma/qedr-abi.h
index 54b64357a..261c6db46 100644
--- a/kernel/include/uapi/rdma/qedr-abi.h
+++ b/kernel/include/uapi/rdma/qedr-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /* QLogic qedr NIC Driver
  * Copyright (c) 2015-2016  QLogic Corporation
  *
diff --git a/kernel/include/uapi/rdma/rdma_netlink.h b/kernel/include/uapi/rdma/rdma_netlink.h
index 861440a87..cc002e316 100644
--- a/kernel/include/uapi/rdma/rdma_netlink.h
+++ b/kernel/include/uapi/rdma/rdma_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_RDMA_NETLINK_H
 #define _UAPI_RDMA_NETLINK_H
 
diff --git a/kernel/include/uapi/rdma/rdma_user_cm.h b/kernel/include/uapi/rdma/rdma_user_cm.h
index d71da36e3..c83ef0026 100644
--- a/kernel/include/uapi/rdma/rdma_user_cm.h
+++ b/kernel/include/uapi/rdma/rdma_user_cm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/rdma_user_ioctl.h b/kernel/include/uapi/rdma/rdma_user_ioctl.h
index 165a27e96..03557b5f9 100644
--- a/kernel/include/uapi/rdma/rdma_user_ioctl.h
+++ b/kernel/include/uapi/rdma/rdma_user_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2016 Mellanox Technologies, LTD. All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/rdma_user_rxe.h b/kernel/include/uapi/rdma/rdma_user_rxe.h
index 1de99cfda..bdeea948b 100644
--- a/kernel/include/uapi/rdma/rdma_user_rxe.h
+++ b/kernel/include/uapi/rdma/rdma_user_rxe.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
  *
diff --git a/kernel/include/uapi/rdma/vmw_pvrdma-abi.h b/kernel/include/uapi/rdma/vmw_pvrdma-abi.h
index c6569b003..912ea1556 100644
--- a/kernel/include/uapi/rdma/vmw_pvrdma-abi.h
+++ b/kernel/include/uapi/rdma/vmw_pvrdma-abi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
 /*
  * Copyright (c) 2012-2016 VMware, Inc.  All rights reserved.
  *
diff --git a/kernel/include/uapi/scsi/cxlflash_ioctl.h b/kernel/include/uapi/scsi/cxlflash_ioctl.h
index 48d107e75..513da47aa 100644
--- a/kernel/include/uapi/scsi/cxlflash_ioctl.h
+++ b/kernel/include/uapi/scsi/cxlflash_ioctl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * CXL Flash Device Driver
  *
diff --git a/kernel/include/uapi/scsi/fc/fc_els.h b/kernel/include/uapi/scsi/fc/fc_els.h
index 481abbd48..b7e0a5ed4 100644
--- a/kernel/include/uapi/scsi/fc/fc_els.h
+++ b/kernel/include/uapi/scsi/fc/fc_els.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright(c) 2007 Intel Corporation. All rights reserved.
  *
diff --git a/kernel/include/uapi/scsi/fc/fc_fs.h b/kernel/include/uapi/scsi/fc/fc_fs.h
index dcf314dc2..8c0a292a6 100644
--- a/kernel/include/uapi/scsi/fc/fc_fs.h
+++ b/kernel/include/uapi/scsi/fc/fc_fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright(c) 2007 Intel Corporation. All rights reserved.
  *
diff --git a/kernel/include/uapi/scsi/fc/fc_gs.h b/kernel/include/uapi/scsi/fc/fc_gs.h
index a37346d47..2153f3524 100644
--- a/kernel/include/uapi/scsi/fc/fc_gs.h
+++ b/kernel/include/uapi/scsi/fc/fc_gs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright(c) 2007 Intel Corporation. All rights reserved.
  *
diff --git a/kernel/include/uapi/scsi/fc/fc_ns.h b/kernel/include/uapi/scsi/fc/fc_ns.h
index f7751d53f..015e5e1ce 100644
--- a/kernel/include/uapi/scsi/fc/fc_ns.h
+++ b/kernel/include/uapi/scsi/fc/fc_ns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright(c) 2007 Intel Corporation. All rights reserved.
  *
diff --git a/kernel/include/uapi/scsi/scsi_bsg_fc.h b/kernel/include/uapi/scsi/scsi_bsg_fc.h
index 3031b900b..62597d86b 100644
--- a/kernel/include/uapi/scsi/scsi_bsg_fc.h
+++ b/kernel/include/uapi/scsi/scsi_bsg_fc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  FC Transport BSG Interface
  *
diff --git a/kernel/include/uapi/scsi/scsi_netlink.h b/kernel/include/uapi/scsi/scsi_netlink.h
index 62b4edab1..5ccc2333a 100644
--- a/kernel/include/uapi/scsi/scsi_netlink.h
+++ b/kernel/include/uapi/scsi/scsi_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  SCSI Transport Netlink Interface
  *    Used for the posting of outbound SCSI transport events
diff --git a/kernel/include/uapi/scsi/scsi_netlink_fc.h b/kernel/include/uapi/scsi/scsi_netlink_fc.h
index cbf76e479..060f563c3 100644
--- a/kernel/include/uapi/scsi/scsi_netlink_fc.h
+++ b/kernel/include/uapi/scsi/scsi_netlink_fc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  FC Transport Netlink Interface
  *
diff --git a/kernel/include/uapi/sound/asequencer.h b/kernel/include/uapi/sound/asequencer.h
index 7b7659a79..a75e14edc 100644
--- a/kernel/include/uapi/sound/asequencer.h
+++ b/kernel/include/uapi/sound/asequencer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Main header file for the ALSA sequencer
  *  Copyright (c) 1998-1999 by Frank van de Pol <fvdpol@coil.demon.nl>
diff --git a/kernel/include/uapi/sound/asoc.h b/kernel/include/uapi/sound/asoc.h
index 78014ec56..69c37ecbf 100644
--- a/kernel/include/uapi/sound/asoc.h
+++ b/kernel/include/uapi/sound/asoc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * uapi/sound/asoc.h -- ALSA SoC Firmware Controls and DAPM
  *
diff --git a/kernel/include/uapi/sound/asound.h b/kernel/include/uapi/sound/asound.h
index 1949923a4..c227ccba6 100644
--- a/kernel/include/uapi/sound/asound.h
+++ b/kernel/include/uapi/sound/asound.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Advanced Linux Sound Architecture - ALSA - Driver
  *  Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,
@@ -93,7 +94,7 @@ enum {
 	SNDRV_HWDEP_IFACE_VX,		/* Digigram VX cards */
 	SNDRV_HWDEP_IFACE_MIXART,	/* Digigram miXart cards */
 	SNDRV_HWDEP_IFACE_USX2Y,	/* Tascam US122, US224 & US428 usb */
-	SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */	
+	SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */
 	SNDRV_HWDEP_IFACE_BLUETOOTH,	/* Bluetooth audio */
 	SNDRV_HWDEP_IFACE_USX2Y_PCM,	/* Tascam US122, US224 & US428 rawusb pcm */
 	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */
@@ -383,7 +384,7 @@ struct snd_mask {
 
 struct snd_pcm_hw_params {
 	unsigned int flags;
-	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 
+	struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
 			       SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
 	struct snd_mask mres[5];	/* reserved masks */
 	struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
@@ -856,7 +857,7 @@ typedef int __bitwise snd_ctl_elem_iface_t;
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE		(1<<8)	/* control does actually nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK		(1<<9)	/* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER		(1<<10)	/* write lock owner */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* kernel use a TLV callback */ 
+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* kernel use a TLV callback */
 #define SNDRV_CTL_ELEM_ACCESS_USER		(1<<29) /* user space element */
 /* bits 30 and 31 are obsoleted (for indirect access) */
 
diff --git a/kernel/include/uapi/sound/asound_fm.h b/kernel/include/uapi/sound/asound_fm.h
index c2a4b967d..8471f404f 100644
--- a/kernel/include/uapi/sound/asound_fm.h
+++ b/kernel/include/uapi/sound/asound_fm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef __SOUND_ASOUND_FM_H
 #define __SOUND_ASOUND_FM_H
 
diff --git a/kernel/include/uapi/sound/compress_offload.h b/kernel/include/uapi/sound/compress_offload.h
index e00d8cbfc..56d95673c 100644
--- a/kernel/include/uapi/sound/compress_offload.h
+++ b/kernel/include/uapi/sound/compress_offload.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  *  compress_offload.h - compress offload header definations
  *
diff --git a/kernel/include/uapi/sound/compress_params.h b/kernel/include/uapi/sound/compress_params.h
index 9625484a4..3d4d6de66 100644
--- a/kernel/include/uapi/sound/compress_params.h
+++ b/kernel/include/uapi/sound/compress_params.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) AND MIT) */
 /*
  *  compress_params.h - codec types and parameters for compressed data
  *  streaming interface
diff --git a/kernel/include/uapi/sound/emu10k1.h b/kernel/include/uapi/sound/emu10k1.h
index 5175e1669..042c5a6f1 100644
--- a/kernel/include/uapi/sound/emu10k1.h
+++ b/kernel/include/uapi/sound/emu10k1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *		     Creative Labs, Inc.
diff --git a/kernel/include/uapi/sound/firewire.h b/kernel/include/uapi/sound/firewire.h
index 622900488..f0a547d86 100644
--- a/kernel/include/uapi/sound/firewire.h
+++ b/kernel/include/uapi/sound/firewire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_SOUND_FIREWIRE_H_INCLUDED
 #define _UAPI_SOUND_FIREWIRE_H_INCLUDED
 
diff --git a/kernel/include/uapi/sound/hdsp.h b/kernel/include/uapi/sound/hdsp.h
index 0909a3843..5dc0c3db0 100644
--- a/kernel/include/uapi/sound/hdsp.h
+++ b/kernel/include/uapi/sound/hdsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef __SOUND_HDSP_H
 #define __SOUND_HDSP_H
 
diff --git a/kernel/include/uapi/sound/hdspm.h b/kernel/include/uapi/sound/hdspm.h
index c4db6f5b3..a38f3f79b 100644
--- a/kernel/include/uapi/sound/hdspm.h
+++ b/kernel/include/uapi/sound/hdspm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef __SOUND_HDSPM_H
 #define __SOUND_HDSPM_H
 /*
diff --git a/kernel/include/uapi/sound/sb16_csp.h b/kernel/include/uapi/sound/sb16_csp.h
index 3b96907e2..e64851481 100644
--- a/kernel/include/uapi/sound/sb16_csp.h
+++ b/kernel/include/uapi/sound/sb16_csp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Copyright (c) 1999 by Uros Bizjak <uros@kss-loka.si>
  *                        Takashi Iwai <tiwai@suse.de>
diff --git a/kernel/include/uapi/sound/sfnt_info.h b/kernel/include/uapi/sound/sfnt_info.h
index 1bce7fd17..c9a810a6e 100644
--- a/kernel/include/uapi/sound/sfnt_info.h
+++ b/kernel/include/uapi/sound/sfnt_info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 #ifndef __SOUND_SFNT_INFO_H
 #define __SOUND_SFNT_INFO_H
 
diff --git a/kernel/include/uapi/sound/snd_sst_tokens.h b/kernel/include/uapi/sound/snd_sst_tokens.h
index f691e421f..326054a72 100644
--- a/kernel/include/uapi/sound/snd_sst_tokens.h
+++ b/kernel/include/uapi/sound/snd_sst_tokens.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * snd_sst_tokens.h - Intel SST tokens definition
  *
diff --git a/kernel/include/uapi/sound/tlv.h b/kernel/include/uapi/sound/tlv.h
index b4df440c0..be5371f09 100644
--- a/kernel/include/uapi/sound/tlv.h
+++ b/kernel/include/uapi/sound/tlv.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/kernel/include/uapi/sound/usb_stream.h b/kernel/include/uapi/sound/usb_stream.h
index cfe8fba00..95419d8bb 100644
--- a/kernel/include/uapi/sound/usb_stream.h
+++ b/kernel/include/uapi/sound/usb_stream.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * Copyright (C) 2007, 2008 Karsten Wiese <fzu@wemgehoertderstaat.de>
  *
diff --git a/kernel/include/uapi/video/edid.h b/kernel/include/uapi/video/edid.h
index 8c0f03201..c6030dc10 100644
--- a/kernel/include/uapi/video/edid.h
+++ b/kernel/include/uapi/video/edid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__linux_video_edid_h__
 #define _UAPI__linux_video_edid_h__
 
diff --git a/kernel/include/uapi/video/sisfb.h b/kernel/include/uapi/video/sisfb.h
index 9250b22b1..f1e811951 100644
--- a/kernel/include/uapi/video/sisfb.h
+++ b/kernel/include/uapi/video/sisfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * sisfb.h - definitions for the SiS framebuffer driver
  *
diff --git a/kernel/include/uapi/video/uvesafb.h b/kernel/include/uapi/video/uvesafb.h
index cee063d72..a0d5c9213 100644
--- a/kernel/include/uapi/video/uvesafb.h
+++ b/kernel/include/uapi/video/uvesafb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_UVESAFB_H
 #define _UAPI_UVESAFB_H
 
diff --git a/kernel/include/uapi/xen/evtchn.h b/kernel/include/uapi/xen/evtchn.h
index cb4aa4bb9..7fbf732f1 100644
--- a/kernel/include/uapi/xen/evtchn.h
+++ b/kernel/include/uapi/xen/evtchn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */
 /******************************************************************************
  * evtchn.h
  *
diff --git a/kernel/include/uapi/xen/gntdev.h b/kernel/include/uapi/xen/gntdev.h
index d06619776..6d1163456 100644
--- a/kernel/include/uapi/xen/gntdev.h
+++ b/kernel/include/uapi/xen/gntdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */
 /******************************************************************************
  * gntdev.h
  * 
diff --git a/kernel/include/uapi/xen/privcmd.h b/kernel/include/uapi/xen/privcmd.h
index 63ee95c9d..39d3e7b8e 100644
--- a/kernel/include/uapi/xen/privcmd.h
+++ b/kernel/include/uapi/xen/privcmd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) */
 /******************************************************************************
  * privcmd.h
  *
diff --git a/kernel/include/video/aty128.h b/kernel/include/video/aty128.h
index f0851e3bb..cb6721ebf 100644
--- a/kernel/include/video/aty128.h
+++ b/kernel/include/video/aty128.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*  $Id: aty128.h,v 1.1 1999/10/12 11:00:40 geert Exp $
  *  linux/drivers/video/aty128.h
  *  Register definitions for ATI Rage128 boards
diff --git a/kernel/include/video/edid.h b/kernel/include/video/edid.h
index 0cb8b2a92..f614371e9 100644
--- a/kernel/include/video/edid.h
+++ b/kernel/include/video/edid.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __linux_video_edid_h__
 #define __linux_video_edid_h__
 
diff --git a/kernel/include/video/iga.h b/kernel/include/video/iga.h
index 5a48f1657..83ca18492 100644
--- a/kernel/include/video/iga.h
+++ b/kernel/include/video/iga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: iga.h,v 1.2 1999/09/11 22:56:31 zaitcev Exp $
  * iga1682.h: Sparc/PCI iga1682 driver constants etc.
  *
diff --git a/kernel/include/video/mbxfb.h b/kernel/include/video/mbxfb.h
index ea18961fc..35921cb6d 100644
--- a/kernel/include/video/mbxfb.h
+++ b/kernel/include/video/mbxfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MBX_FB_H
 #define __MBX_FB_H
 
diff --git a/kernel/include/video/newport.h b/kernel/include/video/newport.h
index de980a3b6..bcbb3d1b6 100644
--- a/kernel/include/video/newport.h
+++ b/kernel/include/video/newport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* $Id: newport.h,v 1.5 1999/08/04 06:01:51 ulfc Exp $
  *
  * newport.h: Defines and register layout for NEWPORT graphics
diff --git a/kernel/include/video/radeon.h b/kernel/include/video/radeon.h
index 56b188abf..005eae19e 100644
--- a/kernel/include/video/radeon.h
+++ b/kernel/include/video/radeon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RADEON_H
 #define _RADEON_H
 
diff --git a/kernel/include/video/sh_mobile_lcdc.h b/kernel/include/video/sh_mobile_lcdc.h
index 2605fa8ad..f706b0fed 100644
--- a/kernel/include/video/sh_mobile_lcdc.h
+++ b/kernel/include/video/sh_mobile_lcdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_SH_MOBILE_LCDC_H__
 #define __ASM_SH_MOBILE_LCDC_H__
 
diff --git a/kernel/include/video/sh_mobile_meram.h b/kernel/include/video/sh_mobile_meram.h
index 062e6e7f9..f4efc21e2 100644
--- a/kernel/include/video/sh_mobile_meram.h
+++ b/kernel/include/video/sh_mobile_meram.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __VIDEO_SH_MOBILE_MERAM_H__
 #define __VIDEO_SH_MOBILE_MERAM_H__
 
diff --git a/kernel/include/video/sstfb.h b/kernel/include/video/sstfb.h
index c449eace1..28384f354 100644
--- a/kernel/include/video/sstfb.h
+++ b/kernel/include/video/sstfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/drivers/video/sstfb.h -- voodoo graphics frame buffer
  *
diff --git a/kernel/include/video/tdfx.h b/kernel/include/video/tdfx.h
index 69674b94b..6144633ac 100644
--- a/kernel/include/video/tdfx.h
+++ b/kernel/include/video/tdfx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TDFX_H
 #define _TDFX_H
 
diff --git a/kernel/include/video/trident.h b/kernel/include/video/trident.h
index b6ce19d1b..5ccc0d6a0 100644
--- a/kernel/include/video/trident.h
+++ b/kernel/include/video/trident.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef TRIDENTFB_DEBUG
 #define TRIDENTFB_DEBUG 0
diff --git a/kernel/include/video/udlfb.h b/kernel/include/video/udlfb.h
index 3ea90aea5..1252a7a89 100644
--- a/kernel/include/video/udlfb.h
+++ b/kernel/include/video/udlfb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef UDLFB_H
 #define UDLFB_H
 
diff --git a/kernel/include/video/uvesafb.h b/kernel/include/video/uvesafb.h
index 30f536254..8d2a3bfc8 100644
--- a/kernel/include/video/uvesafb.h
+++ b/kernel/include/video/uvesafb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UVESAFB_H
 #define _UVESAFB_H
 
diff --git a/kernel/include/xen/arm/hypervisor.h b/kernel/include/xen/arm/hypervisor.h
index 44b587b49..2982571f7 100644
--- a/kernel/include/xen/arm/hypervisor.h
+++ b/kernel/include/xen/arm/hypervisor.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_XEN_HYPERVISOR_H
 #define _ASM_ARM_XEN_HYPERVISOR_H
 
diff --git a/kernel/include/xen/arm/interface.h b/kernel/include/xen/arm/interface.h
index 75d596862..c3eada264 100644
--- a/kernel/include/xen/arm/interface.h
+++ b/kernel/include/xen/arm/interface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * Guest OS interface to ARM Xen.
  *
diff --git a/kernel/include/xen/arm/page-coherent.h b/kernel/include/xen/arm/page-coherent.h
index b1b4ecdf3..59a260712 100644
--- a/kernel/include/xen/arm/page-coherent.h
+++ b/kernel/include/xen/arm/page-coherent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_XEN_PAGE_COHERENT_H
 #define _ASM_ARM_XEN_PAGE_COHERENT_H
 
diff --git a/kernel/include/xen/arm/page.h b/kernel/include/xen/arm/page.h
index 6adc2a955..f77dcbcba 100644
--- a/kernel/include/xen/arm/page.h
+++ b/kernel/include/xen/arm/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_ARM_XEN_PAGE_H
 #define _ASM_ARM_XEN_PAGE_H
 
diff --git a/kernel/include/xen/balloon.h b/kernel/include/xen/balloon.h
index 8906361bb..4914b93a2 100644
--- a/kernel/include/xen/balloon.h
+++ b/kernel/include/xen/balloon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * Xen balloon functionality
  */
diff --git a/kernel/include/xen/events.h b/kernel/include/xen/events.h
index f442ca5fc..c3e6bc643 100644
--- a/kernel/include/xen/events.h
+++ b/kernel/include/xen/events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_EVENTS_H
 #define _XEN_EVENTS_H
 
diff --git a/kernel/include/xen/features.h b/kernel/include/xen/features.h
index 27292d4d2..e4cb46438 100644
--- a/kernel/include/xen/features.h
+++ b/kernel/include/xen/features.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * features.h
  *
diff --git a/kernel/include/xen/hvc-console.h b/kernel/include/xen/hvc-console.h
index b62dfef15..d8949d5e2 100644
--- a/kernel/include/xen/hvc-console.h
+++ b/kernel/include/xen/hvc-console.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef XEN_HVC_CONSOLE_H
 #define XEN_HVC_CONSOLE_H
 
diff --git a/kernel/include/xen/hvm.h b/kernel/include/xen/hvm.h
index 63917a8de..0b15f8cb1 100644
--- a/kernel/include/xen/hvm.h
+++ b/kernel/include/xen/hvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Simple wrappers around HVM functions */
 #ifndef XEN_HVM_H__
 #define XEN_HVM_H__
diff --git a/kernel/include/xen/interface/event_channel.h b/kernel/include/xen/interface/event_channel.h
index 7e6acef54..45650c9a0 100644
--- a/kernel/include/xen/interface/event_channel.h
+++ b/kernel/include/xen/interface/event_channel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * event_channel.h
  *
diff --git a/kernel/include/xen/interface/features.h b/kernel/include/xen/interface/features.h
index 6ad3d110b..9b0eb574f 100644
--- a/kernel/include/xen/interface/features.h
+++ b/kernel/include/xen/interface/features.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * features.h
  *
diff --git a/kernel/include/xen/interface/io/blkif.h b/kernel/include/xen/interface/io/blkif.h
index 8b8cfadf7..5e40041c7 100644
--- a/kernel/include/xen/interface/io/blkif.h
+++ b/kernel/include/xen/interface/io/blkif.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * blkif.h
  *
diff --git a/kernel/include/xen/interface/io/console.h b/kernel/include/xen/interface/io/console.h
index e563de70f..85ca8b026 100644
--- a/kernel/include/xen/interface/io/console.h
+++ b/kernel/include/xen/interface/io/console.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * console.h
  *
diff --git a/kernel/include/xen/interface/io/protocols.h b/kernel/include/xen/interface/io/protocols.h
index 545a14ba0..6a89dc1bf 100644
--- a/kernel/include/xen/interface/io/protocols.h
+++ b/kernel/include/xen/interface/io/protocols.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __XEN_PROTOCOLS_H__
 #define __XEN_PROTOCOLS_H__
 
diff --git a/kernel/include/xen/interface/io/ring.h b/kernel/include/xen/interface/io/ring.h
index e547088ce..3f40501fc 100644
--- a/kernel/include/xen/interface/io/ring.h
+++ b/kernel/include/xen/interface/io/ring.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * ring.h
  *
diff --git a/kernel/include/xen/interface/io/xenbus.h b/kernel/include/xen/interface/io/xenbus.h
index 9fda53297..aaf2951b1 100644
--- a/kernel/include/xen/interface/io/xenbus.h
+++ b/kernel/include/xen/interface/io/xenbus.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*****************************************************************************
  * xenbus.h
  *
diff --git a/kernel/include/xen/interface/io/xs_wire.h b/kernel/include/xen/interface/io/xs_wire.h
index 794deb07e..1517c7e93 100644
--- a/kernel/include/xen/interface/io/xs_wire.h
+++ b/kernel/include/xen/interface/io/xs_wire.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Details of the "wire" protocol between Xen Store Daemon and client
  * library or guest kernel.
diff --git a/kernel/include/xen/interface/memory.h b/kernel/include/xen/interface/memory.h
index 9aa8988cb..583dd93b3 100644
--- a/kernel/include/xen/interface/memory.h
+++ b/kernel/include/xen/interface/memory.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * memory.h
  *
diff --git a/kernel/include/xen/interface/nmi.h b/kernel/include/xen/interface/nmi.h
index b47d9d06f..73d9b0a29 100644
--- a/kernel/include/xen/interface/nmi.h
+++ b/kernel/include/xen/interface/nmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * nmi.h
  *
diff --git a/kernel/include/xen/interface/version.h b/kernel/include/xen/interface/version.h
index 145f12f9e..8772b552c 100644
--- a/kernel/include/xen/interface/version.h
+++ b/kernel/include/xen/interface/version.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /******************************************************************************
  * version.h
  *
diff --git a/kernel/include/xen/interface/xenpmu.h b/kernel/include/xen/interface/xenpmu.h
index 139efc91b..ad603eab2 100644
--- a/kernel/include/xen/interface/xenpmu.h
+++ b/kernel/include/xen/interface/xenpmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __XEN_PUBLIC_XENPMU_H__
 #define __XEN_PUBLIC_XENPMU_H__
 
diff --git a/kernel/include/xen/page.h b/kernel/include/xen/page.h
index 064194f64..df6d6b6ec 100644
--- a/kernel/include/xen/page.h
+++ b/kernel/include/xen/page.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_PAGE_H
 #define _XEN_PAGE_H
 
diff --git a/kernel/include/xen/platform_pci.h b/kernel/include/xen/platform_pci.h
index 5c52b5583..e51e7cb71 100644
--- a/kernel/include/xen/platform_pci.h
+++ b/kernel/include/xen/platform_pci.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_PLATFORM_PCI_H
 #define _XEN_PLATFORM_PCI_H
 
diff --git a/kernel/include/xen/swiotlb-xen.h b/kernel/include/xen/swiotlb-xen.h
index ed2de363d..5e4b83f83 100644
--- a/kernel/include/xen/swiotlb-xen.h
+++ b/kernel/include/xen/swiotlb-xen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SWIOTLB_XEN_H
 #define __LINUX_SWIOTLB_XEN_H
 
diff --git a/kernel/include/xen/tmem.h b/kernel/include/xen/tmem.h
index 3930a9004..c80bafe31 100644
--- a/kernel/include/xen/tmem.h
+++ b/kernel/include/xen/tmem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_TMEM_H
 #define _XEN_TMEM_H
 
diff --git a/kernel/include/xen/xen-ops.h b/kernel/include/xen/xen-ops.h
index 218e6aae5..a95e65ec8 100644
--- a/kernel/include/xen/xen-ops.h
+++ b/kernel/include/xen/xen-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef INCLUDE_XEN_OPS_H
 #define INCLUDE_XEN_OPS_H
 
diff --git a/kernel/include/xen/xen.h b/kernel/include/xen/xen.h
index 28c59ca52..9d4340c90 100644
--- a/kernel/include/xen/xen.h
+++ b/kernel/include/xen/xen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XEN_XEN_H
 #define _XEN_XEN_H
 
diff --git a/kernel/init/Makefile b/kernel/init/Makefile
index c4fb45525..1dbb23787 100644
--- a/kernel/init/Makefile
+++ b/kernel/init/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/init/calibrate.c b/kernel/init/calibrate.c
index ce635dccf..f3831272f 100644
--- a/kernel/init/calibrate.c
+++ b/kernel/init/calibrate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* calibrate.c: default delay calibration
  *
  * Excised from init/main.c
diff --git a/kernel/init/do_mounts.h b/kernel/init/do_mounts.h
index 282d65bfd..5b05c8f93 100644
--- a/kernel/init/do_mounts.h
+++ b/kernel/init/do_mounts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/kernel.h>
 #include <linux/blkdev.h>
 #include <linux/init.h>
diff --git a/kernel/init/do_mounts_initrd.c b/kernel/init/do_mounts_initrd.c
index a1000ca29..53d4f0f32 100644
--- a/kernel/init/do_mounts_initrd.c
+++ b/kernel/init/do_mounts_initrd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Many of the syscalls used in this file expect some of the arguments
  * to be __user pointers not __kernel pointers.  To limit the sparse
diff --git a/kernel/init/do_mounts_md.c b/kernel/init/do_mounts_md.c
index 8cb6db542..3f733c760 100644
--- a/kernel/init/do_mounts_md.c
+++ b/kernel/init/do_mounts_md.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Many of the syscalls used in this file expect some of the arguments
  * to be __user pointers not __kernel pointers.  To limit the sparse
diff --git a/kernel/init/do_mounts_rd.c b/kernel/init/do_mounts_rd.c
index dd4104c9a..99e0b649f 100644
--- a/kernel/init/do_mounts_rd.c
+++ b/kernel/init/do_mounts_rd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Many of the syscalls used in this file expect some of the arguments
  * to be __user pointers not __kernel pointers.  To limit the sparse
diff --git a/kernel/init/init_task.c b/kernel/init/init_task.c
index 66787e30a..9325fee7d 100644
--- a/kernel/init/init_task.c
+++ b/kernel/init/init_task.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init_task.h>
 #include <linux/export.h>
 #include <linux/mqueue.h>
diff --git a/kernel/init/initramfs.c b/kernel/init/initramfs.c
index e64bf7b4c..7046feffe 100644
--- a/kernel/init/initramfs.c
+++ b/kernel/init/initramfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Many of the syscalls used in this file expect some of the arguments
  * to be __user pointers not __kernel pointers.  To limit the sparse
diff --git a/kernel/ipc/Makefile b/kernel/ipc/Makefile
index 9c200e544..c2558c430 100644
--- a/kernel/ipc/Makefile
+++ b/kernel/ipc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux ipc.
 #
diff --git a/kernel/ipc/compat.c b/kernel/ipc/compat.c
index b17bf93d7..5ab822592 100644
--- a/kernel/ipc/compat.c
+++ b/kernel/ipc/compat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 32 bit compatibility code for System V IPC
  *
diff --git a/kernel/ipc/msg.c b/kernel/ipc/msg.c
index 06be5a9ad..bce7ac1c8 100644
--- a/kernel/ipc/msg.c
+++ b/kernel/ipc/msg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/ipc/msg.c
  * Copyright (C) 1992 Krishna Balasubramanian
diff --git a/kernel/ipc/namespace.c b/kernel/ipc/namespace.c
index fc850c526..f59a89966 100644
--- a/kernel/ipc/namespace.c
+++ b/kernel/ipc/namespace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/ipc/namespace.c
  * Copyright (C) 2006 Pavel Emelyanov <xemul@openvz.org> OpenVZ, SWsoft Inc.
diff --git a/kernel/ipc/sem.c b/kernel/ipc/sem.c
index f7385bce5..b2698ebdc 100644
--- a/kernel/ipc/sem.c
+++ b/kernel/ipc/sem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/ipc/sem.c
  * Copyright (C) 1992 Krishna Balasubramanian
diff --git a/kernel/ipc/shm.c b/kernel/ipc/shm.c
index badac463e..bd652755d 100644
--- a/kernel/ipc/shm.c
+++ b/kernel/ipc/shm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/ipc/shm.c
  * Copyright (C) 1992, 1993 Krishna Balasubramanian
diff --git a/kernel/ipc/syscall.c b/kernel/ipc/syscall.c
index 667022746..26b45db2e 100644
--- a/kernel/ipc/syscall.c
+++ b/kernel/ipc/syscall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sys_ipc() is the old de-multiplexer for the SysV IPC calls.
  *
diff --git a/kernel/ipc/util.c b/kernel/ipc/util.c
index 78755873c..79b30eee3 100644
--- a/kernel/ipc/util.c
+++ b/kernel/ipc/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/ipc/util.c
  * Copyright (C) 1992 Krishna Balasubramanian
diff --git a/kernel/ipc/util.h b/kernel/ipc/util.h
index b21297bc1..579112d90 100644
--- a/kernel/ipc/util.h
+++ b/kernel/ipc/util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/ipc/util.h
  * Copyright (C) 1999 Christoph Rohland
diff --git a/kernel/kernel/Makefile b/kernel/kernel/Makefile
index ed470aac5..172d151d4 100644
--- a/kernel/kernel/Makefile
+++ b/kernel/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux kernel.
 #
diff --git a/kernel/kernel/acct.c b/kernel/kernel/acct.c
index 5e72af29a..6670fbd3e 100644
--- a/kernel/kernel/acct.c
+++ b/kernel/kernel/acct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/kernel/acct.c
  *
diff --git a/kernel/kernel/audit_tree.c b/kernel/kernel/audit_tree.c
index 011d46e5f..d4b050d9a 100644
--- a/kernel/kernel/audit_tree.c
+++ b/kernel/kernel/audit_tree.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "audit.h"
 #include <linux/fsnotify_backend.h>
 #include <linux/namei.h>
diff --git a/kernel/kernel/bounds.c b/kernel/kernel/bounds.c
index e1d1d1952..c373e887c 100644
--- a/kernel/kernel/bounds.c
+++ b/kernel/kernel/bounds.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generate definitions needed by the preprocessor.
  * This code generates raw asm output which is post-processed
diff --git a/kernel/kernel/bpf/Makefile b/kernel/kernel/bpf/Makefile
index 897daa005..af3ab6164 100644
--- a/kernel/kernel/bpf/Makefile
+++ b/kernel/kernel/bpf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y := core.o
 
 obj-$(CONFIG_BPF_SYSCALL) += syscall.o verifier.o inode.o helpers.o tnum.o
diff --git a/kernel/kernel/bpf/sockmap.c b/kernel/kernel/bpf/sockmap.c
index 66f00a2b2..dbd7b322a 100644
--- a/kernel/kernel/bpf/sockmap.c
+++ b/kernel/kernel/bpf/sockmap.c
@@ -101,13 +101,19 @@ static inline void bpf_compute_data_end_sk_skb(struct sk_buff *skb)
 	TCP_SKB_CB(skb)->bpf.data_end = skb->data + skb_headlen(skb);
 }
 
+enum __sk_action {
+	__SK_DROP = 0,
+	__SK_PASS,
+	__SK_REDIRECT,
+};
+
 static int smap_verdict_func(struct smap_psock *psock, struct sk_buff *skb)
 {
 	struct bpf_prog *prog = READ_ONCE(psock->bpf_verdict);
 	int rc;
 
 	if (unlikely(!prog))
-		return SK_DROP;
+		return __SK_DROP;
 
 	skb_orphan(skb);
 	/* We need to ensure that BPF metadata for maps is also cleared
@@ -122,8 +128,10 @@ static int smap_verdict_func(struct smap_psock *psock, struct sk_buff *skb)
 	preempt_enable();
 	skb->sk = NULL;
 
+	/* Moving return codes from UAPI namespace into internal namespace */
 	return rc == SK_PASS ?
-		(TCP_SKB_CB(skb)->bpf.map ? SK_REDIRECT : SK_PASS) : SK_DROP;
+		(TCP_SKB_CB(skb)->bpf.map ? __SK_REDIRECT : __SK_PASS) :
+		__SK_DROP;
 }
 
 static void smap_do_verdict(struct smap_psock *psock, struct sk_buff *skb)
@@ -133,7 +141,7 @@ static void smap_do_verdict(struct smap_psock *psock, struct sk_buff *skb)
 
 	rc = smap_verdict_func(psock, skb);
 	switch (rc) {
-	case SK_REDIRECT:
+	case __SK_REDIRECT:
 		sk = do_sk_redirect_map(skb);
 		if (likely(sk)) {
 			struct smap_psock *peer = smap_psock_sk(sk);
@@ -149,7 +157,7 @@ static void smap_do_verdict(struct smap_psock *psock, struct sk_buff *skb)
 			}
 		}
 	/* Fall through and free skb otherwise */
-	case SK_DROP:
+	case __SK_DROP:
 	default:
 		kfree_skb(skb);
 	}
diff --git a/kernel/kernel/capability.c b/kernel/kernel/capability.c
index f97fe77ce..1e1c0236f 100644
--- a/kernel/kernel/capability.c
+++ b/kernel/kernel/capability.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/capability.c
  *
diff --git a/kernel/kernel/cgroup/Makefile b/kernel/kernel/cgroup/Makefile
index ce693ccb8..ae448f763 100644
--- a/kernel/kernel/cgroup/Makefile
+++ b/kernel/kernel/cgroup/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y := cgroup.o namespace.o cgroup-v1.o
 
 obj-$(CONFIG_CGROUP_FREEZER) += freezer.o
diff --git a/kernel/kernel/cgroup/cgroup-internal.h b/kernel/kernel/cgroup/cgroup-internal.h
index 5151ff256..bf54ade00 100644
--- a/kernel/kernel/cgroup/cgroup-internal.h
+++ b/kernel/kernel/cgroup/cgroup-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CGROUP_INTERNAL_H
 #define __CGROUP_INTERNAL_H
 
diff --git a/kernel/kernel/cgroup/debug.c b/kernel/kernel/cgroup/debug.c
index f661b4cc5..5f780d8f6 100644
--- a/kernel/kernel/cgroup/debug.c
+++ b/kernel/kernel/cgroup/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Debug controller
  *
diff --git a/kernel/kernel/cgroup/namespace.c b/kernel/kernel/cgroup/namespace.c
index 66129eb43..b05f1dd58 100644
--- a/kernel/kernel/cgroup/namespace.c
+++ b/kernel/kernel/cgroup/namespace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "cgroup-internal.h"
 
 #include <linux/sched/task.h>
diff --git a/kernel/kernel/dma.c b/kernel/kernel/dma.c
index 6c6262f86..3506fc34a 100644
--- a/kernel/kernel/dma.c
+++ b/kernel/kernel/dma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/dma.c: A DMA channel allocator. Inspired by linux/kernel/irq.c.
  *
diff --git a/kernel/kernel/elfcore.c b/kernel/kernel/elfcore.c
index e556751d1..fc482c8e0 100644
--- a/kernel/kernel/elfcore.c
+++ b/kernel/kernel/elfcore.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/elf.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
diff --git a/kernel/kernel/events/Makefile b/kernel/kernel/events/Makefile
index 2925188f5..3c022e33c 100644
--- a/kernel/kernel/events/Makefile
+++ b/kernel/kernel/events/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_core.o = $(CC_FLAGS_FTRACE)
 endif
diff --git a/kernel/kernel/events/core.c b/kernel/kernel/events/core.c
index 9d93db81f..10cdb9c26 100644
--- a/kernel/kernel/events/core.c
+++ b/kernel/kernel/events/core.c
@@ -901,9 +901,11 @@ list_update_cgroup_event(struct perf_event *event,
 	cpuctx_entry = &cpuctx->cgrp_cpuctx_entry;
 	/* cpuctx->cgrp is NULL unless a cgroup event is active in this CPU .*/
 	if (add) {
+		struct perf_cgroup *cgrp = perf_cgroup_from_task(current, ctx);
+
 		list_add(cpuctx_entry, this_cpu_ptr(&cgrp_cpuctx_list));
-		if (perf_cgroup_from_task(current, ctx) == event->cgrp)
-			cpuctx->cgrp = event->cgrp;
+		if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
+			cpuctx->cgrp = cgrp;
 	} else {
 		list_del(cpuctx_entry);
 		cpuctx->cgrp = NULL;
diff --git a/kernel/kernel/events/internal.h b/kernel/kernel/events/internal.h
index 843e97047..09b1537ae 100644
--- a/kernel/kernel/events/internal.h
+++ b/kernel/kernel/events/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KERNEL_EVENTS_INTERNAL_H
 #define _KERNEL_EVENTS_INTERNAL_H
 
diff --git a/kernel/kernel/exec_domain.c b/kernel/kernel/exec_domain.c
index 6873bb3e6..0975b0268 100644
--- a/kernel/kernel/exec_domain.c
+++ b/kernel/kernel/exec_domain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Handling of different ABIs (personalities).
  *
diff --git a/kernel/kernel/futex.c b/kernel/kernel/futex.c
index 0518a0bfc..76ed59211 100644
--- a/kernel/kernel/futex.c
+++ b/kernel/kernel/futex.c
@@ -903,11 +903,27 @@ void exit_pi_state_list(struct task_struct *curr)
 	 */
 	raw_spin_lock_irq(&curr->pi_lock);
 	while (!list_empty(head)) {
-
 		next = head->next;
 		pi_state = list_entry(next, struct futex_pi_state, list);
 		key = pi_state->key;
 		hb = hash_futex(&key);
+
+		/*
+		 * We can race against put_pi_state() removing itself from the
+		 * list (a waiter going away). put_pi_state() will first
+		 * decrement the reference count and then modify the list, so
+		 * its possible to see the list entry but fail this reference
+		 * acquire.
+		 *
+		 * In that case; drop the locks to let put_pi_state() make
+		 * progress and retry the loop.
+		 */
+		if (!atomic_inc_not_zero(&pi_state->refcount)) {
+			raw_spin_unlock_irq(&curr->pi_lock);
+			cpu_relax();
+			raw_spin_lock_irq(&curr->pi_lock);
+			continue;
+		}
 		raw_spin_unlock_irq(&curr->pi_lock);
 
 		spin_lock(&hb->lock);
@@ -918,8 +934,10 @@ void exit_pi_state_list(struct task_struct *curr)
 		 * task still owns the PI-state:
 		 */
 		if (head->next != next) {
+			/* retain curr->pi_lock for the loop invariant */
 			raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
 			spin_unlock(&hb->lock);
+			put_pi_state(pi_state);
 			continue;
 		}
 
@@ -927,9 +945,8 @@ void exit_pi_state_list(struct task_struct *curr)
 		WARN_ON(list_empty(&pi_state->list));
 		list_del_init(&pi_state->list);
 		pi_state->owner = NULL;
-		raw_spin_unlock(&curr->pi_lock);
 
-		get_pi_state(pi_state);
+		raw_spin_unlock(&curr->pi_lock);
 		raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
 		spin_unlock(&hb->lock);
 
@@ -1570,8 +1587,16 @@ static int futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr)
 	int oldval, ret;
 
 	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) {
-		if (oparg < 0 || oparg > 31)
-			return -EINVAL;
+		if (oparg < 0 || oparg > 31) {
+			char comm[sizeof(current->comm)];
+			/*
+			 * kill this print and return -EINVAL when userspace
+			 * is sane again
+			 */
+			pr_info_ratelimited("futex_wake_op: %s tries to shift op by %d; fix this program\n",
+					get_task_comm(comm, current), oparg);
+			oparg &= 31;
+		}
 		oparg = 1 << oparg;
 	}
 
diff --git a/kernel/kernel/futex_compat.c b/kernel/kernel/futex_compat.c
index 3f409968e..83f830acb 100644
--- a/kernel/kernel/futex_compat.c
+++ b/kernel/kernel/futex_compat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/futex_compat.c
  *
diff --git a/kernel/kernel/gcov/Makefile b/kernel/kernel/gcov/Makefile
index 752d6486b..c6c50e5c6 100644
--- a/kernel/kernel/gcov/Makefile
+++ b/kernel/kernel/gcov/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -DSRCTREE='"$(srctree)"' -DOBJTREE='"$(objtree)"'
 
 obj-y := base.o fs.o
diff --git a/kernel/kernel/gcov/base.c b/kernel/kernel/gcov/base.c
index c51a49c9b..9c7c8d5c1 100644
--- a/kernel/kernel/gcov/base.c
+++ b/kernel/kernel/gcov/base.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  This code maintains a list of active profiling data structures.
  *
diff --git a/kernel/kernel/gcov/fs.c b/kernel/kernel/gcov/fs.c
index edf67c493..6e40ff6be 100644
--- a/kernel/kernel/gcov/fs.c
+++ b/kernel/kernel/gcov/fs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  This code exports profiling data as debugfs files to userspace.
  *
diff --git a/kernel/kernel/gcov/gcc_3_4.c b/kernel/kernel/gcov/gcc_3_4.c
index 27bc88a35..1e32e66c9 100644
--- a/kernel/kernel/gcov/gcc_3_4.c
+++ b/kernel/kernel/gcov/gcc_3_4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  This code provides functions to handle gcc's profiling data format
  *  introduced with gcc 3.4. Future versions of gcc may change the gcov
diff --git a/kernel/kernel/gcov/gcc_4_7.c b/kernel/kernel/gcov/gcc_4_7.c
index 46a18e72b..ca5e5c0ef 100644
--- a/kernel/kernel/gcov/gcc_4_7.c
+++ b/kernel/kernel/gcov/gcc_4_7.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  This code provides functions to handle gcc's profiling data format
  *  introduced with gcc 4.7.
diff --git a/kernel/kernel/gcov/gcov.h b/kernel/kernel/gcov/gcov.h
index 92c8e22a2..de118ad4a 100644
--- a/kernel/kernel/gcov/gcov.h
+++ b/kernel/kernel/gcov/gcov.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Profiling infrastructure declarations.
  *
diff --git a/kernel/kernel/groups.c b/kernel/kernel/groups.c
index 434f6665f..e357bc800 100644
--- a/kernel/kernel/groups.c
+++ b/kernel/kernel/groups.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Supplementary group IDs
  */
diff --git a/kernel/kernel/irq/Makefile b/kernel/kernel/irq/Makefile
index 1970cafe8..ed15d1426 100644
--- a/kernel/kernel/irq/Makefile
+++ b/kernel/kernel/irq/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-y := irqdesc.o handle.o manage.o spurious.o resend.o chip.o dummychip.o devres.o
 obj-$(CONFIG_IRQ_TIMINGS) += timings.o
diff --git a/kernel/kernel/irq/affinity.c b/kernel/kernel/irq/affinity.c
index d69bd7725..e12d35108 100644
--- a/kernel/kernel/irq/affinity.c
+++ b/kernel/kernel/irq/affinity.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2016 Thomas Gleixner.
  * Copyright (C) 2016-2017 Christoph Hellwig.
diff --git a/kernel/kernel/irq/autoprobe.c b/kernel/kernel/irq/autoprobe.c
index d30a0dd5c..befa671fb 100644
--- a/kernel/kernel/irq/autoprobe.c
+++ b/kernel/kernel/irq/autoprobe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/irq/autoprobe.c
  *
diff --git a/kernel/kernel/irq/debug.h b/kernel/kernel/irq/debug.h
index e75e29e44..17f05ef8f 100644
--- a/kernel/kernel/irq/debug.h
+++ b/kernel/kernel/irq/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Debugging printout:
  */
diff --git a/kernel/kernel/irq/internals.h b/kernel/kernel/irq/internals.h
index a4aa39009..44ed5f8c8 100644
--- a/kernel/kernel/irq/internals.h
+++ b/kernel/kernel/irq/internals.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * IRQ subsystem internal functions and variables:
  *
diff --git a/kernel/kernel/irq/migration.c b/kernel/kernel/irq/migration.c
index 6ca054a3f..86ae0eb80 100644
--- a/kernel/kernel/irq/migration.c
+++ b/kernel/kernel/irq/migration.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/irq.h>
 #include <linux/interrupt.h>
diff --git a/kernel/kernel/irq/proc.c b/kernel/kernel/irq/proc.c
index 6376b4a59..c010cc0da 100644
--- a/kernel/kernel/irq/proc.c
+++ b/kernel/kernel/irq/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/irq/proc.c
  *
diff --git a/kernel/kernel/irq/resend.c b/kernel/kernel/irq/resend.c
index b86886bee..1d08f4513 100644
--- a/kernel/kernel/irq/resend.c
+++ b/kernel/kernel/irq/resend.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/irq/resend.c
  *
diff --git a/kernel/kernel/irq/settings.h b/kernel/kernel/irq/settings.h
index 320579d89..e43795cd2 100644
--- a/kernel/kernel/irq/settings.h
+++ b/kernel/kernel/irq/settings.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Internal header to deal with irq_desc->status which will be renamed
  * to irq_desc->settings.
diff --git a/kernel/kernel/irq/spurious.c b/kernel/kernel/irq/spurious.c
index 061ba7eed..987d7bca4 100644
--- a/kernel/kernel/irq/spurious.c
+++ b/kernel/kernel/irq/spurious.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/irq/spurious.c
  *
diff --git a/kernel/kernel/kcmp.c b/kernel/kernel/kcmp.c
index 055bb2962..a0e3d7a0e 100644
--- a/kernel/kernel/kcmp.c
+++ b/kernel/kernel/kcmp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/syscalls.h>
 #include <linux/fdtable.h>
diff --git a/kernel/kernel/kcov.c b/kernel/kernel/kcov.c
index 3f693a0f6..fc6af9e13 100644
--- a/kernel/kernel/kcov.c
+++ b/kernel/kernel/kcov.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) "kcov: " fmt
 
 #define DISABLE_BRANCH_PROFILING
diff --git a/kernel/kernel/kexec_internal.h b/kernel/kernel/kexec_internal.h
index 50dfcb039..48aaf2ac0 100644
--- a/kernel/kernel/kexec_internal.h
+++ b/kernel/kernel/kexec_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_KEXEC_INTERNAL_H
 #define LINUX_KEXEC_INTERNAL_H
 
diff --git a/kernel/kernel/livepatch/core.h b/kernel/kernel/livepatch/core.h
index c74f24c47..a351601d7 100644
--- a/kernel/kernel/livepatch/core.h
+++ b/kernel/kernel/livepatch/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIVEPATCH_CORE_H
 #define _LIVEPATCH_CORE_H
 
diff --git a/kernel/kernel/livepatch/patch.h b/kernel/kernel/livepatch/patch.h
index 0db227170..e72d8250d 100644
--- a/kernel/kernel/livepatch/patch.h
+++ b/kernel/kernel/livepatch/patch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIVEPATCH_PATCH_H
 #define _LIVEPATCH_PATCH_H
 
diff --git a/kernel/kernel/livepatch/transition.h b/kernel/kernel/livepatch/transition.h
index ce09b3265..0f6e27c48 100644
--- a/kernel/kernel/livepatch/transition.h
+++ b/kernel/kernel/livepatch/transition.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIVEPATCH_TRANSITION_H
 #define _LIVEPATCH_TRANSITION_H
 
diff --git a/kernel/kernel/locking/Makefile b/kernel/kernel/locking/Makefile
index 760158d9d..392c7f23a 100644
--- a/kernel/kernel/locking/Makefile
+++ b/kernel/kernel/locking/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Any varying coverage in these files is non-deterministic
 # and is generally not a function of system call inputs.
 KCOV_INSTRUMENT		:= n
diff --git a/kernel/kernel/locking/lockdep_internals.h b/kernel/kernel/locking/lockdep_internals.h
index 1da4669d5..d459d624b 100644
--- a/kernel/kernel/locking/lockdep_internals.h
+++ b/kernel/kernel/locking/lockdep_internals.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * kernel/lockdep_internals.h
  *
diff --git a/kernel/kernel/locking/lockdep_proc.c b/kernel/kernel/locking/lockdep_proc.c
index 68d9e267c..ad69bbc9b 100644
--- a/kernel/kernel/locking/lockdep_proc.c
+++ b/kernel/kernel/locking/lockdep_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kernel/lockdep_proc.c
  *
diff --git a/kernel/kernel/locking/mcs_spinlock.h b/kernel/kernel/locking/mcs_spinlock.h
index 6a385aabc..f046b7ce9 100644
--- a/kernel/kernel/locking/mcs_spinlock.h
+++ b/kernel/kernel/locking/mcs_spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * MCS lock defines
  *
diff --git a/kernel/kernel/locking/mutex-debug.h b/kernel/kernel/locking/mutex-debug.h
index 4174417d5..1edd3f45a 100644
--- a/kernel/kernel/locking/mutex-debug.h
+++ b/kernel/kernel/locking/mutex-debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Mutexes: blocking mutual exclusion locks
  *
diff --git a/kernel/kernel/locking/mutex.h b/kernel/kernel/locking/mutex.h
index 6ebc1902f..1c2287d3f 100644
--- a/kernel/kernel/locking/mutex.h
+++ b/kernel/kernel/locking/mutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Mutexes: blocking mutual exclusion locks
  *
diff --git a/kernel/kernel/locking/osq_lock.c b/kernel/kernel/locking/osq_lock.c
index a74ee6abd..6ef600aa0 100644
--- a/kernel/kernel/locking/osq_lock.c
+++ b/kernel/kernel/locking/osq_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/percpu.h>
 #include <linux/sched.h>
 #include <linux/osq_lock.h>
diff --git a/kernel/kernel/locking/qspinlock_paravirt.h b/kernel/kernel/locking/qspinlock_paravirt.h
index 43555681c..15b6a3936 100644
--- a/kernel/kernel/locking/qspinlock_paravirt.h
+++ b/kernel/kernel/locking/qspinlock_paravirt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GEN_PV_LOCK_SLOWPATH
 #error "do not include this file"
 #endif
diff --git a/kernel/kernel/locking/rtmutex-debug.c b/kernel/kernel/locking/rtmutex-debug.c
index f4a74e78d..fd4fe1f5b 100644
--- a/kernel/kernel/locking/rtmutex-debug.c
+++ b/kernel/kernel/locking/rtmutex-debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * RT-Mutexes: blocking mutual exclusion locks with PI support
  *
diff --git a/kernel/kernel/locking/rtmutex-debug.h b/kernel/kernel/locking/rtmutex-debug.h
index 5078c6ddf..fc549713b 100644
--- a/kernel/kernel/locking/rtmutex-debug.h
+++ b/kernel/kernel/locking/rtmutex-debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * RT-Mutexes: blocking mutual exclusion locks with PI support
  *
diff --git a/kernel/kernel/locking/rtmutex.h b/kernel/kernel/locking/rtmutex.h
index 5c253caff..732f96abf 100644
--- a/kernel/kernel/locking/rtmutex.h
+++ b/kernel/kernel/locking/rtmutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * RT-Mutexes: blocking mutual exclusion locks with PI support
  *
diff --git a/kernel/kernel/locking/rtmutex_common.h b/kernel/kernel/locking/rtmutex_common.h
index 7453be048..124e98ca0 100644
--- a/kernel/kernel/locking/rtmutex_common.h
+++ b/kernel/kernel/locking/rtmutex_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * RT Mutexes: blocking mutual exclusion locks with PI support
  *
diff --git a/kernel/kernel/locking/rwsem-spinlock.c b/kernel/kernel/locking/rwsem-spinlock.c
index 0848634c5..a7ffb2a96 100644
--- a/kernel/kernel/locking/rwsem-spinlock.c
+++ b/kernel/kernel/locking/rwsem-spinlock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* rwsem-spinlock.c: R/W semaphores: contention handling functions for
  * generic spinlock implementation
  *
diff --git a/kernel/kernel/locking/rwsem-xadd.c b/kernel/kernel/locking/rwsem-xadd.c
index 1fefe6dca..e795908f3 100644
--- a/kernel/kernel/locking/rwsem-xadd.c
+++ b/kernel/kernel/locking/rwsem-xadd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* rwsem.c: R/W semaphores: contention handling functions
  *
  * Written by David Howells (dhowells@redhat.com).
diff --git a/kernel/kernel/locking/rwsem.c b/kernel/kernel/locking/rwsem.c
index 4d48b1c48..a6c76a483 100644
--- a/kernel/kernel/locking/rwsem.c
+++ b/kernel/kernel/locking/rwsem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* kernel/rwsem.c: R/W semaphores, public implementation
  *
  * Written by David Howells (dhowells@redhat.com).
diff --git a/kernel/kernel/locking/rwsem.h b/kernel/kernel/locking/rwsem.h
index a699f4048..a883b8f1f 100644
--- a/kernel/kernel/locking/rwsem.h
+++ b/kernel/kernel/locking/rwsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * The owner field of the rw_semaphore structure will be set to
  * RWSEM_READ_OWNED when a reader grabs the lock. A writer will clear
diff --git a/kernel/kernel/locking/spinlock.c b/kernel/kernel/locking/spinlock.c
index 4b082b5ca..6e40fdfba 100644
--- a/kernel/kernel/locking/spinlock.c
+++ b/kernel/kernel/locking/spinlock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (2004) Linus Torvalds
  *
diff --git a/kernel/kernel/power/Makefile b/kernel/kernel/power/Makefile
index eb4f71770..a3f79f0ee 100644
--- a/kernel/kernel/power/Makefile
+++ b/kernel/kernel/power/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 ccflags-$(CONFIG_PM_DEBUG)	:= -DDEBUG
 
diff --git a/kernel/kernel/power/autosleep.c b/kernel/kernel/power/autosleep.c
index 9012ecf7b..41e83a779 100644
--- a/kernel/kernel/power/autosleep.c
+++ b/kernel/kernel/power/autosleep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kernel/power/autosleep.c
  *
diff --git a/kernel/kernel/power/console.c b/kernel/kernel/power/console.c
index 0e781798b..fcdf0e14a 100644
--- a/kernel/kernel/power/console.c
+++ b/kernel/kernel/power/console.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions for saving/restoring console.
  *
diff --git a/kernel/kernel/power/power.h b/kernel/kernel/power/power.h
index 1d2d761e3..f29cd178d 100644
--- a/kernel/kernel/power/power.h
+++ b/kernel/kernel/power/power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/suspend.h>
 #include <linux/suspend_ioctls.h>
 #include <linux/utsname.h>
diff --git a/kernel/kernel/power/process.c b/kernel/kernel/power/process.c
index 50f25cb37..7381d49a4 100644
--- a/kernel/kernel/power/process.c
+++ b/kernel/kernel/power/process.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * drivers/power/process.c - Functions for starting/stopping processes on 
  *                           suspend transitions.
diff --git a/kernel/kernel/power/wakelock.c b/kernel/kernel/power/wakelock.c
index 1896386e1..dfba59be1 100644
--- a/kernel/kernel/power/wakelock.c
+++ b/kernel/kernel/power/wakelock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kernel/power/wakelock.c
  *
diff --git a/kernel/kernel/printk/braille.c b/kernel/kernel/printk/braille.c
index 61d41ca41..1d21ebacf 100644
--- a/kernel/kernel/printk/braille.c
+++ b/kernel/kernel/printk/braille.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
diff --git a/kernel/kernel/printk/braille.h b/kernel/kernel/printk/braille.h
index 749a67568..123154f86 100644
--- a/kernel/kernel/printk/braille.h
+++ b/kernel/kernel/printk/braille.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PRINTK_BRAILLE_H
 #define _PRINTK_BRAILLE_H
 
diff --git a/kernel/kernel/printk/console_cmdline.h b/kernel/kernel/printk/console_cmdline.h
index 2ca4a8b5f..11f19c466 100644
--- a/kernel/kernel/printk/console_cmdline.h
+++ b/kernel/kernel/printk/console_cmdline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CONSOLE_CMDLINE_H
 #define _CONSOLE_CMDLINE_H
 
diff --git a/kernel/kernel/range.c b/kernel/kernel/range.c
index 82cfc285b..d84de6766 100644
--- a/kernel/kernel/range.c
+++ b/kernel/kernel/range.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Range add and subtract
  */
diff --git a/kernel/kernel/rcu/Makefile b/kernel/kernel/rcu/Makefile
index 13c0fc852..020e8b6a6 100644
--- a/kernel/kernel/rcu/Makefile
+++ b/kernel/kernel/rcu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Any varying coverage in these files is non-deterministic
 # and is generally not a function of system call inputs.
 KCOV_INSTRUMENT := n
diff --git a/kernel/kernel/sched/Makefile b/kernel/kernel/sched/Makefile
index 78f54932e..a9ee16bbc 100644
--- a/kernel/kernel/sched/Makefile
+++ b/kernel/kernel/sched/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_clock.o = $(CC_FLAGS_FTRACE)
 endif
diff --git a/kernel/kernel/sched/autogroup.c b/kernel/kernel/sched/autogroup.c
index de6d7f4df..a43df5193 100644
--- a/kernel/kernel/sched/autogroup.c
+++ b/kernel/kernel/sched/autogroup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "sched.h"
 
 #include <linux/proc_fs.h>
diff --git a/kernel/kernel/sched/autogroup.h b/kernel/kernel/sched/autogroup.h
index ce40c810c..27cd22b89 100644
--- a/kernel/kernel/sched/autogroup.h
+++ b/kernel/kernel/sched/autogroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_SCHED_AUTOGROUP
 
 #include <linux/kref.h>
diff --git a/kernel/kernel/sched/completion.c b/kernel/kernel/sched/completion.c
index cc873075c..2ddaec409 100644
--- a/kernel/kernel/sched/completion.c
+++ b/kernel/kernel/sched/completion.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generic wait-for-completion handler;
  *
diff --git a/kernel/kernel/sched/cpuacct.c b/kernel/kernel/sched/cpuacct.c
index f95ab29a4..44ab32a4f 100644
--- a/kernel/kernel/sched/cpuacct.c
+++ b/kernel/kernel/sched/cpuacct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/cgroup.h>
 #include <linux/slab.h>
 #include <linux/percpu.h>
diff --git a/kernel/kernel/sched/cpuacct.h b/kernel/kernel/sched/cpuacct.h
index ba72807c7..a8358a57a 100644
--- a/kernel/kernel/sched/cpuacct.h
+++ b/kernel/kernel/sched/cpuacct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_CGROUP_CPUACCT
 
 extern void cpuacct_charge(struct task_struct *tsk, u64 cputime);
diff --git a/kernel/kernel/sched/cpudeadline.h b/kernel/kernel/sched/cpudeadline.h
index f7da8c55b..b010d26e1 100644
--- a/kernel/kernel/sched/cpudeadline.h
+++ b/kernel/kernel/sched/cpudeadline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CPUDL_H
 #define _LINUX_CPUDL_H
 
diff --git a/kernel/kernel/sched/cpupri.h b/kernel/kernel/sched/cpupri.h
index 63cbb9ca0..bab050019 100644
--- a/kernel/kernel/sched/cpupri.h
+++ b/kernel/kernel/sched/cpupri.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_CPUPRI_H
 #define _LINUX_CPUPRI_H
 
diff --git a/kernel/kernel/sched/deadline.c b/kernel/kernel/sched/deadline.c
index 0191ec766..4ae5c1ea9 100644
--- a/kernel/kernel/sched/deadline.c
+++ b/kernel/kernel/sched/deadline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Deadline Scheduling Class (SCHED_DEADLINE)
  *
diff --git a/kernel/kernel/sched/fair.c b/kernel/kernel/sched/fair.c
index d3f309485..5c09ddf8c 100644
--- a/kernel/kernel/sched/fair.c
+++ b/kernel/kernel/sched/fair.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Completely Fair Scheduling (CFS) Class (SCHED_NORMAL/SCHED_BATCH)
  *
diff --git a/kernel/kernel/sched/features.h b/kernel/kernel/sched/features.h
index 319ed0e8a..9552fd585 100644
--- a/kernel/kernel/sched/features.h
+++ b/kernel/kernel/sched/features.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Only give sleepers 50% of their service deficit. This allows
  * them to run sooner, but does not allow tons of sleepers to
diff --git a/kernel/kernel/sched/idle_task.c b/kernel/kernel/sched/idle_task.c
index 0c00172db..d518664cc 100644
--- a/kernel/kernel/sched/idle_task.c
+++ b/kernel/kernel/sched/idle_task.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "sched.h"
 
 /*
diff --git a/kernel/kernel/sched/loadavg.c b/kernel/kernel/sched/loadavg.c
index f14716a35..89a989e4d 100644
--- a/kernel/kernel/sched/loadavg.c
+++ b/kernel/kernel/sched/loadavg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kernel/sched/loadavg.c
  *
diff --git a/kernel/kernel/sched/rt.c b/kernel/kernel/sched/rt.c
index 0af5ca9e3..3c96c80e0 100644
--- a/kernel/kernel/sched/rt.c
+++ b/kernel/kernel/sched/rt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Real-Time Scheduling Class (mapped to the SCHED_FIFO and SCHED_RR
  * policies)
diff --git a/kernel/kernel/sched/sched-pelt.h b/kernel/kernel/sched/sched-pelt.h
index cd200d165..a26473674 100644
--- a/kernel/kernel/sched/sched-pelt.h
+++ b/kernel/kernel/sched/sched-pelt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Generated by Documentation/scheduler/sched-pelt; do not modify. */
 
 static const u32 runnable_avg_yN_inv[] = {
diff --git a/kernel/kernel/sched/sched.h b/kernel/kernel/sched/sched.h
index 14db76cd4..3b448ba82 100644
--- a/kernel/kernel/sched/sched.h
+++ b/kernel/kernel/sched/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/sched.h>
 #include <linux/sched/autogroup.h>
diff --git a/kernel/kernel/sched/stats.c b/kernel/kernel/sched/stats.c
index 87e2c9f0c..940b1fa1d 100644
--- a/kernel/kernel/sched/stats.c
+++ b/kernel/kernel/sched/stats.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/slab.h>
 #include <linux/fs.h>
diff --git a/kernel/kernel/sched/stats.h b/kernel/kernel/sched/stats.h
index d57106510..baf500d12 100644
--- a/kernel/kernel/sched/stats.h
+++ b/kernel/kernel/sched/stats.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef CONFIG_SCHEDSTATS
 
diff --git a/kernel/kernel/sched/stop_task.c b/kernel/kernel/sched/stop_task.c
index 9f69fb630..45caf90b2 100644
--- a/kernel/kernel/sched/stop_task.c
+++ b/kernel/kernel/sched/stop_task.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "sched.h"
 
 /*
diff --git a/kernel/kernel/sched/swait.c b/kernel/kernel/sched/swait.c
index 2227e183e..9ff155534 100644
--- a/kernel/kernel/sched/swait.c
+++ b/kernel/kernel/sched/swait.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sched/signal.h>
 #include <linux/swait.h>
 
diff --git a/kernel/kernel/sched/topology.c b/kernel/kernel/sched/topology.c
index f1cf4f306..6798276d2 100644
--- a/kernel/kernel/sched/topology.c
+++ b/kernel/kernel/sched/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Scheduler topology setup/handling methods
  */
diff --git a/kernel/kernel/seccomp.c b/kernel/kernel/seccomp.c
index 0ae832e13..418a1c045 100644
--- a/kernel/kernel/seccomp.c
+++ b/kernel/kernel/seccomp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/seccomp.c
  *
diff --git a/kernel/kernel/signal.c b/kernel/kernel/signal.c
index 800a18f77..8dcd8825b 100644
--- a/kernel/kernel/signal.c
+++ b/kernel/kernel/signal.c
@@ -2698,7 +2698,7 @@ enum siginfo_layout siginfo_layout(int sig, int si_code)
 			[SIGSEGV] = { NSIGSEGV, SIL_FAULT },
 			[SIGBUS]  = { NSIGBUS,  SIL_FAULT },
 			[SIGTRAP] = { NSIGTRAP, SIL_FAULT },
-#if defined(SIGMET) && defined(NSIGEMT)
+#if defined(SIGEMT) && defined(NSIGEMT)
 			[SIGEMT]  = { NSIGEMT,  SIL_FAULT },
 #endif
 			[SIGCHLD] = { NSIGCHLD, SIL_CHLD },
diff --git a/kernel/kernel/smpboot.h b/kernel/kernel/smpboot.h
index 485b81cfa..34dd3d7ba 100644
--- a/kernel/kernel/smpboot.h
+++ b/kernel/kernel/smpboot.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SMPBOOT_H
 #define SMPBOOT_H
 
diff --git a/kernel/kernel/sys.c b/kernel/kernel/sys.c
index 9aebc2935..524a4cb9b 100644
--- a/kernel/kernel/sys.c
+++ b/kernel/kernel/sys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/kernel/sys.c
  *
diff --git a/kernel/kernel/sys_ni.c b/kernel/kernel/sys_ni.c
index 8acef8576..b5189762d 100644
--- a/kernel/kernel/sys_ni.c
+++ b/kernel/kernel/sys_ni.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/linkage.h>
 #include <linux/errno.h>
diff --git a/kernel/kernel/sysctl_binary.c b/kernel/kernel/sysctl_binary.c
index 58ea8c036..e8c0dab4f 100644
--- a/kernel/kernel/sysctl_binary.c
+++ b/kernel/kernel/sysctl_binary.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/stat.h>
 #include <linux/sysctl.h>
 #include "../fs/xfs/xfs_sysctl.h"
diff --git a/kernel/kernel/task_work.c b/kernel/kernel/task_work.c
index 836a72a66..5718b3ea2 100644
--- a/kernel/kernel/task_work.c
+++ b/kernel/kernel/task_work.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/spinlock.h>
 #include <linux/task_work.h>
 #include <linux/tracehook.h>
diff --git a/kernel/kernel/time/Makefile b/kernel/kernel/time/Makefile
index 938dbf33e..f1e46f338 100644
--- a/kernel/kernel/time/Makefile
+++ b/kernel/kernel/time/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y += time.o timer.o hrtimer.o
 obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o
 obj-y += timeconv.o timecounter.o alarmtimer.o
diff --git a/kernel/kernel/time/itimer.c b/kernel/kernel/time/itimer.c
index 2ef98a023..f26acef5d 100644
--- a/kernel/kernel/time/itimer.c
+++ b/kernel/kernel/time/itimer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/itimer.c
  *
diff --git a/kernel/kernel/time/ntp.c b/kernel/kernel/time/ntp.c
index edf19cc53..99e03bec6 100644
--- a/kernel/kernel/time/ntp.c
+++ b/kernel/kernel/time/ntp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NTP state machine interfaces and logic.
  *
diff --git a/kernel/kernel/time/ntp_internal.h b/kernel/kernel/time/ntp_internal.h
index d8a7c11fa..0a53e6ea4 100644
--- a/kernel/kernel/time/ntp_internal.h
+++ b/kernel/kernel/time/ntp_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_NTP_INTERNAL_H
 #define _LINUX_NTP_INTERNAL_H
 
diff --git a/kernel/kernel/time/posix-cpu-timers.c b/kernel/kernel/time/posix-cpu-timers.c
index 8585ad6e4..5b117110b 100644
--- a/kernel/kernel/time/posix-cpu-timers.c
+++ b/kernel/kernel/time/posix-cpu-timers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement CPU time clocks for the POSIX clock interface.
  */
diff --git a/kernel/kernel/time/posix-timers.h b/kernel/kernel/time/posix-timers.h
index fb303c3be..151e28f5b 100644
--- a/kernel/kernel/time/posix-timers.h
+++ b/kernel/kernel/time/posix-timers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define TIMER_RETRY 1
 
 struct k_clock {
diff --git a/kernel/kernel/time/tick-broadcast-hrtimer.c b/kernel/kernel/time/tick-broadcast-hrtimer.c
index a7bb8f33a..58045eb97 100644
--- a/kernel/kernel/time/tick-broadcast-hrtimer.c
+++ b/kernel/kernel/time/tick-broadcast-hrtimer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/kernel/time/tick-broadcast-hrtimer.c
  * This file emulates a local clock event device
diff --git a/kernel/kernel/time/tick-internal.h b/kernel/kernel/time/tick-internal.h
index be0ac01f2..f8e1845aa 100644
--- a/kernel/kernel/time/tick-internal.h
+++ b/kernel/kernel/time/tick-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * tick internal variable and functions used by low/high res code
  */
diff --git a/kernel/kernel/time/tick-sched.h b/kernel/kernel/time/tick-sched.h
index 075444e3d..954b43dbf 100644
--- a/kernel/kernel/time/tick-sched.h
+++ b/kernel/kernel/time/tick-sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TICK_SCHED_H
 #define _TICK_SCHED_H
 
diff --git a/kernel/kernel/time/timekeeping.h b/kernel/kernel/time/timekeeping.h
index d0914676d..c9f9af339 100644
--- a/kernel/kernel/time/timekeeping.h
+++ b/kernel/kernel/time/timekeeping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KERNEL_TIME_TIMEKEEPING_H
 #define _KERNEL_TIME_TIMEKEEPING_H
 /*
diff --git a/kernel/kernel/time/timekeeping_internal.h b/kernel/kernel/time/timekeeping_internal.h
index 9a18f121f..fdbeeb02d 100644
--- a/kernel/kernel/time/timekeeping_internal.h
+++ b/kernel/kernel/time/timekeeping_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TIMEKEEPING_INTERNAL_H
 #define _TIMEKEEPING_INTERNAL_H
 /*
diff --git a/kernel/kernel/trace/Makefile b/kernel/kernel/trace/Makefile
index 90f2701d9..19a15b2f1 100644
--- a/kernel/kernel/trace/Makefile
+++ b/kernel/kernel/trace/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 # Do not instrument the tracer itself:
 
diff --git a/kernel/kernel/trace/power-traces.c b/kernel/kernel/trace/power-traces.c
index 0c7dee221..21bb161c2 100644
--- a/kernel/kernel/trace/power-traces.c
+++ b/kernel/kernel/trace/power-traces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power trace points
  *
diff --git a/kernel/kernel/trace/rpm-traces.c b/kernel/kernel/trace/rpm-traces.c
index 4b3b5eaf9..25dec0b00 100644
--- a/kernel/kernel/trace/rpm-traces.c
+++ b/kernel/kernel/trace/rpm-traces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Power trace points
  *
diff --git a/kernel/kernel/trace/trace.h b/kernel/kernel/trace/trace.h
index 652c68270..401b06391 100644
--- a/kernel/kernel/trace/trace.h
+++ b/kernel/kernel/trace/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef _LINUX_KERNEL_TRACE_H
 #define _LINUX_KERNEL_TRACE_H
diff --git a/kernel/kernel/trace/trace_benchmark.c b/kernel/kernel/trace/trace_benchmark.c
index 16a8cf02e..79f838a75 100644
--- a/kernel/kernel/trace/trace_benchmark.c
+++ b/kernel/kernel/trace/trace_benchmark.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/kthread.h>
diff --git a/kernel/kernel/trace/trace_benchmark.h b/kernel/kernel/trace/trace_benchmark.h
index ebdbfc2f2..be1d86ff7 100644
--- a/kernel/kernel/trace/trace_benchmark.h
+++ b/kernel/kernel/trace/trace_benchmark.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM benchmark
 
diff --git a/kernel/kernel/trace/trace_branch.c b/kernel/kernel/trace/trace_branch.c
index 4d8fdf318..4ad967453 100644
--- a/kernel/kernel/trace/trace_branch.c
+++ b/kernel/kernel/trace/trace_branch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * unlikely profiler
  *
diff --git a/kernel/kernel/trace/trace_entries.h b/kernel/kernel/trace/trace_entries.h
index adcdbbeae..e954ae3d8 100644
--- a/kernel/kernel/trace/trace_entries.h
+++ b/kernel/kernel/trace/trace_entries.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file defines the trace event structures that go into the ring
  * buffer directly. They are created via macros so that changes for them
diff --git a/kernel/kernel/trace/trace_events_filter_test.h b/kernel/kernel/trace/trace_events_filter_test.h
index bfd4dba0d..39d7ef4f5 100644
--- a/kernel/kernel/trace/trace_events_filter_test.h
+++ b/kernel/kernel/trace/trace_events_filter_test.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM test
 
diff --git a/kernel/kernel/trace/trace_export.c b/kernel/kernel/trace/trace_export.c
index 39aa7aa66..548e62eb5 100644
--- a/kernel/kernel/trace/trace_export.c
+++ b/kernel/kernel/trace/trace_export.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * trace_export.c - export basic ftrace utilities to user space
  *
diff --git a/kernel/kernel/trace/trace_functions.c b/kernel/kernel/trace/trace_functions.c
index a0910c0cd..27f7ad12c 100644
--- a/kernel/kernel/trace/trace_functions.c
+++ b/kernel/kernel/trace/trace_functions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ring buffer based function tracer
  *
diff --git a/kernel/kernel/trace/trace_functions_graph.c b/kernel/kernel/trace/trace_functions_graph.c
index b8f1f5473..23c0b0cb5 100644
--- a/kernel/kernel/trace/trace_functions_graph.c
+++ b/kernel/kernel/trace/trace_functions_graph.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * Function graph tracer.
diff --git a/kernel/kernel/trace/trace_kdb.c b/kernel/kernel/trace/trace_kdb.c
index 57149bce6..d953c163a 100644
--- a/kernel/kernel/trace/trace_kdb.c
+++ b/kernel/kernel/trace/trace_kdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * kdb helper for dumping the ftrace buffer
  *
diff --git a/kernel/kernel/trace/trace_mmiotrace.c b/kernel/kernel/trace/trace_mmiotrace.c
index dca78fc48..b0388016b 100644
--- a/kernel/kernel/trace/trace_mmiotrace.c
+++ b/kernel/kernel/trace/trace_mmiotrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Memory mapped I/O tracing
  *
diff --git a/kernel/kernel/trace/trace_nop.c b/kernel/kernel/trace/trace_nop.c
index 49f61fe96..50523f953 100644
--- a/kernel/kernel/trace/trace_nop.c
+++ b/kernel/kernel/trace/trace_nop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * nop tracer
  *
diff --git a/kernel/kernel/trace/trace_output.h b/kernel/kernel/trace/trace_output.h
index fabc49bcd..dbba03ed9 100644
--- a/kernel/kernel/trace/trace_output.h
+++ b/kernel/kernel/trace/trace_output.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACE_EVENTS_H
 #define __TRACE_EVENTS_H
 
diff --git a/kernel/kernel/trace/trace_sched_switch.c b/kernel/kernel/trace/trace_sched_switch.c
index b341c0273..e28816866 100644
--- a/kernel/kernel/trace/trace_sched_switch.c
+++ b/kernel/kernel/trace/trace_sched_switch.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * trace context switch
  *
diff --git a/kernel/kernel/trace/trace_sched_wakeup.c b/kernel/kernel/trace/trace_sched_wakeup.c
index 0c331978b..7d461dcd4 100644
--- a/kernel/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/kernel/trace/trace_sched_wakeup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * trace task wakeup timings
  *
diff --git a/kernel/kernel/trace/trace_selftest.c b/kernel/kernel/trace/trace_selftest.c
index b17ec6427..cd70eb5df 100644
--- a/kernel/kernel/trace/trace_selftest.c
+++ b/kernel/kernel/trace/trace_selftest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Include in trace.c */
 
 #include <uapi/linux/sched/types.h>
diff --git a/kernel/kernel/trace/trace_selftest_dynamic.c b/kernel/kernel/trace/trace_selftest_dynamic.c
index b4c475a0a..8cda06a10 100644
--- a/kernel/kernel/trace/trace_selftest_dynamic.c
+++ b/kernel/kernel/trace/trace_selftest_dynamic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "trace.h"
 
 int DYN_FTRACE_TEST_NAME(void)
diff --git a/kernel/kernel/trace/trace_stack.c b/kernel/kernel/trace/trace_stack.c
index 49cb41412..719a52a40 100644
--- a/kernel/kernel/trace/trace_stack.c
+++ b/kernel/kernel/trace/trace_stack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2008 Steven Rostedt <srostedt@redhat.com>
  *
diff --git a/kernel/kernel/trace/trace_stat.c b/kernel/kernel/trace/trace_stat.c
index 413ff108f..75bf1bcb4 100644
--- a/kernel/kernel/trace/trace_stat.c
+++ b/kernel/kernel/trace/trace_stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Infrastructure for statistic tracing (histogram output).
  *
diff --git a/kernel/kernel/trace/trace_stat.h b/kernel/kernel/trace/trace_stat.h
index 8f03914b9..76d30b4eb 100644
--- a/kernel/kernel/trace/trace_stat.h
+++ b/kernel/kernel/trace/trace_stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACE_STAT_H
 #define __TRACE_STAT_H
 
diff --git a/kernel/kernel/trace/trace_syscalls.c b/kernel/kernel/trace/trace_syscalls.c
index 696afe72d..a2a642f2c 100644
--- a/kernel/kernel/trace/trace_syscalls.c
+++ b/kernel/kernel/trace/trace_syscalls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <trace/syscall.h>
 #include <trace/events/syscalls.h>
 #include <linux/syscalls.h>
diff --git a/kernel/kernel/trace/tracing_map.h b/kernel/kernel/trace/tracing_map.h
index 618838f5f..ab0ca7733 100644
--- a/kernel/kernel/trace/tracing_map.h
+++ b/kernel/kernel/trace/tracing_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACING_MAP_H
 #define __TRACING_MAP_H
 
diff --git a/kernel/kernel/uid16.c b/kernel/kernel/uid16.c
index 5c2dc5b2b..ce74a4901 100644
--- a/kernel/kernel/uid16.c
+++ b/kernel/kernel/uid16.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Wrapper functions for 16bit uid back compatibility. All nicely tied
  *	together in the faint hope we can take the out in five years time.
diff --git a/kernel/kernel/watchdog.c b/kernel/kernel/watchdog.c
index 6bcb85490..c8e06703e 100644
--- a/kernel/kernel/watchdog.c
+++ b/kernel/kernel/watchdog.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Detect hard and soft lockups on a system
  *
diff --git a/kernel/kernel/watchdog_hld.c b/kernel/kernel/watchdog_hld.c
index 71a62ceac..e449a23e9 100644
--- a/kernel/kernel/watchdog_hld.c
+++ b/kernel/kernel/watchdog_hld.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Detect hard lockups on a system
  *
@@ -12,6 +13,7 @@
 #define pr_fmt(fmt) "NMI watchdog: " fmt
 
 #include <linux/nmi.h>
+#include <linux/atomic.h>
 #include <linux/module.h>
 #include <linux/sched/debug.h>
 
@@ -21,10 +23,11 @@
 static DEFINE_PER_CPU(bool, hard_watchdog_warn);
 static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
 static DEFINE_PER_CPU(struct perf_event *, watchdog_ev);
+static DEFINE_PER_CPU(struct perf_event *, dead_event);
 static struct cpumask dead_events_mask;
 
 static unsigned long hardlockup_allcpu_dumped;
-static unsigned int watchdog_cpus;
+static atomic_t watchdog_cpus = ATOMIC_INIT(0);
 
 void arch_touch_nmi_watchdog(void)
 {
@@ -188,7 +191,8 @@ void hardlockup_detector_perf_enable(void)
 	if (hardlockup_detector_event_create())
 		return;
 
-	if (!watchdog_cpus++)
+	/* use original value for check */
+	if (!atomic_fetch_inc(&watchdog_cpus))
 		pr_info("Enabled. Permanently consumes one hw-PMU counter.\n");
 
 	perf_event_enable(this_cpu_read(watchdog_ev));
@@ -203,8 +207,10 @@ void hardlockup_detector_perf_disable(void)
 
 	if (event) {
 		perf_event_disable(event);
+		this_cpu_write(watchdog_ev, NULL);
+		this_cpu_write(dead_event, event);
 		cpumask_set_cpu(smp_processor_id(), &dead_events_mask);
-		watchdog_cpus--;
+		atomic_dec(&watchdog_cpus);
 	}
 }
 
@@ -218,7 +224,7 @@ void hardlockup_detector_perf_cleanup(void)
 	int cpu;
 
 	for_each_cpu(cpu, &dead_events_mask) {
-		struct perf_event *event = per_cpu(watchdog_ev, cpu);
+		struct perf_event *event = per_cpu(dead_event, cpu);
 
 		/*
 		 * Required because for_each_cpu() reports  unconditionally
@@ -226,7 +232,7 @@ void hardlockup_detector_perf_cleanup(void)
 		 */
 		if (event)
 			perf_event_release_kernel(event);
-		per_cpu(watchdog_ev, cpu) = NULL;
+		per_cpu(dead_event, cpu) = NULL;
 	}
 	cpumask_clear(&dead_events_mask);
 }
diff --git a/kernel/kernel/workqueue_internal.h b/kernel/kernel/workqueue_internal.h
index 8635417c5..efdd72e15 100644
--- a/kernel/kernel/workqueue_internal.h
+++ b/kernel/kernel/workqueue_internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * kernel/workqueue_internal.h
  *
diff --git a/kernel/lib/842/842.h b/kernel/lib/842/842.h
index e0a122bc1..7b1f581a2 100644
--- a/kernel/lib/842/842.h
+++ b/kernel/lib/842/842.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __842_H__
 #define __842_H__
diff --git a/kernel/lib/842/842_debugfs.h b/kernel/lib/842/842_debugfs.h
index e7f3bffaf..277e403e8 100644
--- a/kernel/lib/842/842_debugfs.h
+++ b/kernel/lib/842/842_debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __842_DEBUGFS_H__
 #define __842_DEBUGFS_H__
diff --git a/kernel/lib/Makefile b/kernel/lib/Makefile
index dafa79613..b8f2c16fc 100644
--- a/kernel/lib/Makefile
+++ b/kernel/lib/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for some libs needed in the kernel.
 #
diff --git a/kernel/lib/argv_split.c b/kernel/lib/argv_split.c
index e927ed0e1..5c35752a9 100644
--- a/kernel/lib/argv_split.c
+++ b/kernel/lib/argv_split.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Helper function for splitting a string into an argv-like array.
  */
diff --git a/kernel/lib/asn1_decoder.c b/kernel/lib/asn1_decoder.c
index 0bd8a611e..fef5d2e11 100644
--- a/kernel/lib/asn1_decoder.c
+++ b/kernel/lib/asn1_decoder.c
@@ -284,6 +284,9 @@ next_op:
 				if (unlikely(len > datalen - dp))
 					goto data_overrun_error;
 			}
+		} else {
+			if (unlikely(len > datalen - dp))
+				goto data_overrun_error;
 		}
 
 		if (flags & FLAG_CONS) {
diff --git a/kernel/lib/audit.c b/kernel/lib/audit.c
index b8fb5ee81..5004bff92 100644
--- a/kernel/lib/audit.c
+++ b/kernel/lib/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/audit.h>
diff --git a/kernel/lib/bcd.c b/kernel/lib/bcd.c
index 40d304efe..7e4750b6e 100644
--- a/kernel/lib/bcd.c
+++ b/kernel/lib/bcd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bcd.h>
 #include <linux/export.h>
 
diff --git a/kernel/lib/bug.c b/kernel/lib/bug.c
index a6a1137d0..1e094408c 100644
--- a/kernel/lib/bug.c
+++ b/kernel/lib/bug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
   Generic support for BUG()
 
diff --git a/kernel/lib/bust_spinlocks.c b/kernel/lib/bust_spinlocks.c
index f8e0e5367..ab719495e 100644
--- a/kernel/lib/bust_spinlocks.c
+++ b/kernel/lib/bust_spinlocks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * lib/bust_spinlocks.c
  *
diff --git a/kernel/lib/check_signature.c b/kernel/lib/check_signature.c
index 6b4979798..43a7301da 100644
--- a/kernel/lib/check_signature.c
+++ b/kernel/lib/check_signature.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/io.h>
 #include <linux/export.h>
 
diff --git a/kernel/lib/clz_tab.c b/kernel/lib/clz_tab.c
index 7287b4a99..b6118d09f 100644
--- a/kernel/lib/clz_tab.c
+++ b/kernel/lib/clz_tab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 const unsigned char __clz_tab[] = {
 	0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
 	    5, 5, 5, 5, 5, 5, 5, 5,
diff --git a/kernel/lib/compat_audit.c b/kernel/lib/compat_audit.c
index 873f75b64..77eabad69 100644
--- a/kernel/lib/compat_audit.c
+++ b/kernel/lib/compat_audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
 #include <asm/unistd32.h>
diff --git a/kernel/lib/cpumask.c b/kernel/lib/cpumask.c
index 8b1a1bd77..35fe142eb 100644
--- a/kernel/lib/cpumask.c
+++ b/kernel/lib/cpumask.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
diff --git a/kernel/lib/crc32defs.h b/kernel/lib/crc32defs.h
index 64cba2c3c..cb275a28a 100644
--- a/kernel/lib/crc32defs.h
+++ b/kernel/lib/crc32defs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * There are multiple 16-bit CRC polynomials in common use, but this is
  * *the* standard CRC-32 polynomial, first popularized by Ethernet.
diff --git a/kernel/lib/ctype.c b/kernel/lib/ctype.c
index c646df91a..c819fe269 100644
--- a/kernel/lib/ctype.c
+++ b/kernel/lib/ctype.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/lib/ctype.c
  *
diff --git a/kernel/lib/debug_info.c b/kernel/lib/debug_info.c
index 2edbe2751..36daf7532 100644
--- a/kernel/lib/debug_info.c
+++ b/kernel/lib/debug_info.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file exists solely to ensure debug information for some core
  * data structures is included in the final image even for
diff --git a/kernel/lib/dec_and_lock.c b/kernel/lib/dec_and_lock.c
index e26278576..347fa7ac2 100644
--- a/kernel/lib/dec_and_lock.c
+++ b/kernel/lib/dec_and_lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/spinlock.h>
 #include <linux/atomic.h>
diff --git a/kernel/lib/decompress.c b/kernel/lib/decompress.c
index 62696dff5..857ab1af1 100644
--- a/kernel/lib/decompress.c
+++ b/kernel/lib/decompress.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * decompress.c
  *
diff --git a/kernel/lib/decompress_inflate.c b/kernel/lib/decompress_inflate.c
index 555c06bf2..63b4b7eee 100644
--- a/kernel/lib/decompress_inflate.c
+++ b/kernel/lib/decompress_inflate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifdef STATIC
 #define PREBOOT
 /* Pre-boot environment: included */
diff --git a/kernel/lib/devres.c b/kernel/lib/devres.c
index 78eca713b..5f2aedd58 100644
--- a/kernel/lib/devres.c
+++ b/kernel/lib/devres.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/pci.h>
 #include <linux/io.h>
diff --git a/kernel/lib/div64.c b/kernel/lib/div64.c
index 7f345259c..58e2a4040 100644
--- a/kernel/lib/div64.c
+++ b/kernel/lib/div64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2003 Bernardo Innocenti <bernie@develer.com>
  *
diff --git a/kernel/lib/dma-noop.c b/kernel/lib/dma-noop.c
index acc4190e2..a10185b0c 100644
--- a/kernel/lib/dma-noop.c
+++ b/kernel/lib/dma-noop.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	lib/dma-noop.c
  *
diff --git a/kernel/lib/dma-virt.c b/kernel/lib/dma-virt.c
index 5c4f11329..8e61a02ef 100644
--- a/kernel/lib/dma-virt.c
+++ b/kernel/lib/dma-virt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	lib/dma-virt.c
  *
diff --git a/kernel/lib/dump_stack.c b/kernel/lib/dump_stack.c
index 625375e7f..c5edbedd3 100644
--- a/kernel/lib/dump_stack.c
+++ b/kernel/lib/dump_stack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Provide a default dump_stack() function for architectures
  * which don't implement their own.
diff --git a/kernel/lib/dynamic_queue_limits.c b/kernel/lib/dynamic_queue_limits.c
index f346715e2..6a406fafb 100644
--- a/kernel/lib/dynamic_queue_limits.c
+++ b/kernel/lib/dynamic_queue_limits.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Dynamic byte queue limits.  See include/linux/dynamic_queue_limits.h
  *
diff --git a/kernel/lib/errseq.c b/kernel/lib/errseq.c
index 7b900c2a2..79cc66897 100644
--- a/kernel/lib/errseq.c
+++ b/kernel/lib/errseq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/bug.h>
 #include <linux/atomic.h>
diff --git a/kernel/lib/flex_proportions.c b/kernel/lib/flex_proportions.c
index 2cc1f94e0..7852bfff5 100644
--- a/kernel/lib/flex_proportions.c
+++ b/kernel/lib/flex_proportions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Floating proportions with flexible aging period
  *
diff --git a/kernel/lib/fonts/Makefile b/kernel/lib/fonts/Makefile
index e04d010cf..d56f02dea 100644
--- a/kernel/lib/fonts/Makefile
+++ b/kernel/lib/fonts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Font handling
 
 font-objs := fonts.o
diff --git a/kernel/lib/fonts/font_10x18.c b/kernel/lib/fonts/font_10x18.c
index 6be72bb21..532f0ff89 100644
--- a/kernel/lib/fonts/font_10x18.c
+++ b/kernel/lib/fonts/font_10x18.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /********************************
  * adapted from font_sun12x22.c *
  * by Jurriaan Kalkman 06-2005  *
diff --git a/kernel/lib/fonts/font_6x10.c b/kernel/lib/fonts/font_6x10.c
index b20620904..09b2cc034 100644
--- a/kernel/lib/fonts/font_6x10.c
+++ b/kernel/lib/fonts/font_6x10.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/font.h>
 
 static const unsigned char fontdata_6x10[] = {
diff --git a/kernel/lib/fonts/font_6x11.c b/kernel/lib/fonts/font_6x11.c
index 46e86e67a..d7136c33f 100644
--- a/kernel/lib/fonts/font_6x11.c
+++ b/kernel/lib/fonts/font_6x11.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**********************************************/
 /*                                            */
 /*       Font file generated by rthelen       */
diff --git a/kernel/lib/fonts/font_7x14.c b/kernel/lib/fonts/font_7x14.c
index 3b7dbf9c0..9ae5b62c8 100644
--- a/kernel/lib/fonts/font_7x14.c
+++ b/kernel/lib/fonts/font_7x14.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**************************************/
 /* this file adapted from font_8x16.c */
 /* by Jurriaan Kalkman 05-2005        */
diff --git a/kernel/lib/fonts/font_8x16.c b/kernel/lib/fonts/font_8x16.c
index 00a0c67a5..34292cdfa 100644
--- a/kernel/lib/fonts/font_8x16.c
+++ b/kernel/lib/fonts/font_8x16.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**********************************************/
 /*                                            */
 /*       Font file generated by cpi2fnt       */
diff --git a/kernel/lib/fonts/font_8x8.c b/kernel/lib/fonts/font_8x8.c
index 9f56efe2c..751becf3c 100644
--- a/kernel/lib/fonts/font_8x8.c
+++ b/kernel/lib/fonts/font_8x8.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**********************************************/
 /*                                            */
 /*       Font file generated by cpi2fnt       */
diff --git a/kernel/lib/fonts/font_acorn_8x8.c b/kernel/lib/fonts/font_acorn_8x8.c
index 639e31ae1..0ff0e85d4 100644
--- a/kernel/lib/fonts/font_acorn_8x8.c
+++ b/kernel/lib/fonts/font_acorn_8x8.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Acorn-like font definition, with PC graphics characters */
 
 #include <linux/font.h>
diff --git a/kernel/lib/fonts/font_pearl_8x8.c b/kernel/lib/fonts/font_pearl_8x8.c
index dc6ad539c..b0514c0a7 100644
--- a/kernel/lib/fonts/font_pearl_8x8.c
+++ b/kernel/lib/fonts/font_pearl_8x8.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**********************************************/
 /*                                            */
 /*       Font file generated by cpi2fnt       */
diff --git a/kernel/lib/fonts/font_sun12x22.c b/kernel/lib/fonts/font_sun12x22.c
index d3643853c..955d6eee3 100644
--- a/kernel/lib/fonts/font_sun12x22.c
+++ b/kernel/lib/fonts/font_sun12x22.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/font.h>
 
 #define FONTDATAMAX 11264
diff --git a/kernel/lib/fonts/font_sun8x16.c b/kernel/lib/fonts/font_sun8x16.c
index 268151325..03d71e539 100644
--- a/kernel/lib/fonts/font_sun8x16.c
+++ b/kernel/lib/fonts/font_sun8x16.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/font.h>
 
 #define FONTDATAMAX 4096
diff --git a/kernel/lib/gen_crc32table.c b/kernel/lib/gen_crc32table.c
index d83a372fa..8f26660ea 100644
--- a/kernel/lib/gen_crc32table.c
+++ b/kernel/lib/gen_crc32table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include "../include/generated/autoconf.h"
 #include "crc32defs.h"
diff --git a/kernel/lib/hweight.c b/kernel/lib/hweight.c
index 43273a7d8..7660d88fd 100644
--- a/kernel/lib/hweight.c
+++ b/kernel/lib/hweight.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/bitops.h>
 #include <asm/types.h>
diff --git a/kernel/lib/inflate.c b/kernel/lib/inflate.c
index 013a76193..fbaf03c17 100644
--- a/kernel/lib/inflate.c
+++ b/kernel/lib/inflate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define DEBG(x)
 #define DEBG1(x)
 /* inflate.c -- Not copyrighted 1992 by Mark Adler
diff --git a/kernel/lib/int_sqrt.c b/kernel/lib/int_sqrt.c
index 1ef4cc344..db0b5aa07 100644
--- a/kernel/lib/int_sqrt.c
+++ b/kernel/lib/int_sqrt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013 Davidlohr Bueso <davidlohr.bueso@hp.com>
  *
diff --git a/kernel/lib/iomap.c b/kernel/lib/iomap.c
index fc3dcb4b2..541d926da 100644
--- a/kernel/lib/iomap.c
+++ b/kernel/lib/iomap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implement the default iomap interfaces
  *
diff --git a/kernel/lib/iommu-common.c b/kernel/lib/iommu-common.c
index 858dc1aae..55b00de10 100644
--- a/kernel/lib/iommu-common.c
+++ b/kernel/lib/iommu-common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOMMU mmap management and range allocation functions.
  * Based almost entirely upon the powerpc iommu allocator.
diff --git a/kernel/lib/iommu-helper.c b/kernel/lib/iommu-helper.c
index a816f3a80..23633c0fd 100644
--- a/kernel/lib/iommu-helper.c
+++ b/kernel/lib/iommu-helper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IOMMU helper functions for the free area management
  */
diff --git a/kernel/lib/ioremap.c b/kernel/lib/ioremap.c
index 4bb30206b..b808a390e 100644
--- a/kernel/lib/ioremap.c
+++ b/kernel/lib/ioremap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Re-map IO memory to kernel address space so that we can access it.
  * This is needed for high PCI addresses that aren't mapped in the
@@ -161,6 +162,7 @@ int ioremap_page_range(unsigned long addr,
 	unsigned long next;
 	int err;
 
+	might_sleep();
 	BUG_ON(addr >= end);
 
 	start = addr;
diff --git a/kernel/lib/irq_poll.c b/kernel/lib/irq_poll.c
index 1d6565e81..86a709954 100644
--- a/kernel/lib/irq_poll.c
+++ b/kernel/lib/irq_poll.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to interrupt-poll handling in the block layer. This
  * is similar to NAPI for network devices.
diff --git a/kernel/lib/kasprintf.c b/kernel/lib/kasprintf.c
index 7f6c506a4..bacf7b83c 100644
--- a/kernel/lib/kasprintf.c
+++ b/kernel/lib/kasprintf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/lib/kasprintf.c
  *
diff --git a/kernel/lib/kstrtox.c b/kernel/lib/kstrtox.c
index 720144075..661a1e807 100644
--- a/kernel/lib/kstrtox.c
+++ b/kernel/lib/kstrtox.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Convert integer string representation to an integer.
  * If an integer doesn't fit into specified type, -E is returned.
diff --git a/kernel/lib/kstrtox.h b/kernel/lib/kstrtox.h
index f13eeeaf4..3b4637bcd 100644
--- a/kernel/lib/kstrtox.h
+++ b/kernel/lib/kstrtox.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIB_KSTRTOX_H
 #define _LIB_KSTRTOX_H
 
diff --git a/kernel/lib/list_sort.c b/kernel/lib/list_sort.c
index 9e9acc376..857599282 100644
--- a/kernel/lib/list_sort.c
+++ b/kernel/lib/list_sort.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/bug.h>
 #include <linux/compiler.h>
diff --git a/kernel/lib/locking-selftest-hardirq.h b/kernel/lib/locking-selftest-hardirq.h
index 10d4a150b..0d144a6d6 100644
--- a/kernel/lib/locking-selftest-hardirq.h
+++ b/kernel/lib/locking-selftest-hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef IRQ_DISABLE
 #undef IRQ_ENABLE
 #undef IRQ_ENTER
diff --git a/kernel/lib/locking-selftest-mutex.h b/kernel/lib/locking-selftest-mutex.h
index 68601b6f5..7526c7746 100644
--- a/kernel/lib/locking-selftest-mutex.h
+++ b/kernel/lib/locking-selftest-mutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		ML
 
diff --git a/kernel/lib/locking-selftest-rlock.h b/kernel/lib/locking-selftest-rlock.h
index 6789044f4..eccab18f5 100644
--- a/kernel/lib/locking-selftest-rlock.h
+++ b/kernel/lib/locking-selftest-rlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		RL
 
diff --git a/kernel/lib/locking-selftest-rsem.h b/kernel/lib/locking-selftest-rsem.h
index 62da88668..4544858f9 100644
--- a/kernel/lib/locking-selftest-rsem.h
+++ b/kernel/lib/locking-selftest-rsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		RSL
 
diff --git a/kernel/lib/locking-selftest-rtmutex.h b/kernel/lib/locking-selftest-rtmutex.h
index e3cb83989..fce8714c4 100644
--- a/kernel/lib/locking-selftest-rtmutex.h
+++ b/kernel/lib/locking-selftest-rtmutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		RTL
 
diff --git a/kernel/lib/locking-selftest-softirq.h b/kernel/lib/locking-selftest-softirq.h
index a83de2a04..6adde4867 100644
--- a/kernel/lib/locking-selftest-softirq.h
+++ b/kernel/lib/locking-selftest-softirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef IRQ_DISABLE
 #undef IRQ_ENABLE
 #undef IRQ_ENTER
diff --git a/kernel/lib/locking-selftest-spin.h b/kernel/lib/locking-selftest-spin.h
index ccd1b4b09..6b24d699e 100644
--- a/kernel/lib/locking-selftest-spin.h
+++ b/kernel/lib/locking-selftest-spin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		L
 
diff --git a/kernel/lib/locking-selftest-wlock.h b/kernel/lib/locking-selftest-wlock.h
index 0815322d9..0bc51c8cf 100644
--- a/kernel/lib/locking-selftest-wlock.h
+++ b/kernel/lib/locking-selftest-wlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		WL
 
diff --git a/kernel/lib/locking-selftest-wsem.h b/kernel/lib/locking-selftest-wsem.h
index b88c5f2dc..5ef18f931 100644
--- a/kernel/lib/locking-selftest-wsem.h
+++ b/kernel/lib/locking-selftest-wsem.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef LOCK
 #define LOCK		WSL
 
diff --git a/kernel/lib/locking-selftest.c b/kernel/lib/locking-selftest.c
index 2b827b8a1..b5c1293ce 100644
--- a/kernel/lib/locking-selftest.c
+++ b/kernel/lib/locking-selftest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * lib/locking-selftest.c
  *
diff --git a/kernel/lib/lockref.c b/kernel/lib/lockref.c
index c4bfcb883..47169ed7e 100644
--- a/kernel/lib/lockref.c
+++ b/kernel/lib/lockref.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/lockref.h>
 
diff --git a/kernel/lib/lzo/lzodefs.h b/kernel/lib/lzo/lzodefs.h
index 6710b83ce..4edefd2f5 100644
--- a/kernel/lib/lzo/lzodefs.h
+++ b/kernel/lib/lzo/lzodefs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  lzodefs.h -- architecture, OS and compiler specific defines
  *
diff --git a/kernel/lib/memweight.c b/kernel/lib/memweight.c
index e35fc8771..94dd72cca 100644
--- a/kernel/lib/memweight.c
+++ b/kernel/lib/memweight.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/bug.h>
 #include <linux/bitmap.h>
diff --git a/kernel/lib/mpi/Makefile b/kernel/lib/mpi/Makefile
index 019a68c90..d5874a7f5 100644
--- a/kernel/lib/mpi/Makefile
+++ b/kernel/lib/mpi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # MPI multiprecision maths library (from gpg)
 #
diff --git a/kernel/lib/net_utils.c b/kernel/lib/net_utils.c
index 148fc6e99..af5253533 100644
--- a/kernel/lib/net_utils.c
+++ b/kernel/lib/net_utils.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/string.h>
 #include <linux/if_ether.h>
 #include <linux/ctype.h>
diff --git a/kernel/lib/nlattr.c b/kernel/lib/nlattr.c
index 927c2f19f..3d8295c85 100644
--- a/kernel/lib/nlattr.c
+++ b/kernel/lib/nlattr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NETLINK      Netlink attributes
  *
diff --git a/kernel/lib/nmi_backtrace.c b/kernel/lib/nmi_backtrace.c
index 0bc0a3535..46e4c749e 100644
--- a/kernel/lib/nmi_backtrace.c
+++ b/kernel/lib/nmi_backtrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  NMI backtrace support
  *
diff --git a/kernel/lib/nodemask.c b/kernel/lib/nodemask.c
index e42a5bf44..3aa454c54 100644
--- a/kernel/lib/nodemask.c
+++ b/kernel/lib/nodemask.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/nodemask.h>
 #include <linux/module.h>
 #include <linux/random.h>
diff --git a/kernel/lib/notifier-error-inject.h b/kernel/lib/notifier-error-inject.h
index 99b3b6fc4..fafff5f2a 100644
--- a/kernel/lib/notifier-error-inject.h
+++ b/kernel/lib/notifier-error-inject.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/atomic.h>
 #include <linux/debugfs.h>
 #include <linux/notifier.h>
diff --git a/kernel/lib/once.c b/kernel/lib/once.c
index 05c860462..bfb7420d0 100644
--- a/kernel/lib/once.c
+++ b/kernel/lib/once.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/once.h>
diff --git a/kernel/lib/percpu_counter.c b/kernel/lib/percpu_counter.c
index 3bf4a9984..c72577e47 100644
--- a/kernel/lib/percpu_counter.c
+++ b/kernel/lib/percpu_counter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Fast batching percpu counters.
  */
diff --git a/kernel/lib/raid6/Makefile b/kernel/lib/raid6/Makefile
index a93adf6dc..4add700dd 100644
--- a/kernel/lib/raid6/Makefile
+++ b/kernel/lib/raid6/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RAID6_PQ)	+= raid6_pq.o
 
 raid6_pq-y	+= algos.o recov.o tables.o int1.o int2.o int4.o \
diff --git a/kernel/lib/raid6/recov_s390xc.c b/kernel/lib/raid6/recov_s390xc.c
index b042dac82..179eec900 100644
--- a/kernel/lib/raid6/recov_s390xc.c
+++ b/kernel/lib/raid6/recov_s390xc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * RAID-6 data recovery in dual failure mode based on the XC instruction.
  *
diff --git a/kernel/lib/raid6/s390vx.uc b/kernel/lib/raid6/s390vx.uc
index 7b45191a6..140fa8bb5 100644
--- a/kernel/lib/raid6/s390vx.uc
+++ b/kernel/lib/raid6/s390vx.uc
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * raid6_vx$#.c
  *
diff --git a/kernel/lib/raid6/test/Makefile b/kernel/lib/raid6/test/Makefile
index 2c7b60ede..be1010bdc 100644
--- a/kernel/lib/raid6/test/Makefile
+++ b/kernel/lib/raid6/test/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # This is a simple Makefile to test some of the RAID-6 code
 # from userspace.
diff --git a/kernel/lib/random32.c b/kernel/lib/random32.c
index fa594b114..0a90cb0e0 100644
--- a/kernel/lib/random32.c
+++ b/kernel/lib/random32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is a maximally equidistributed combined Tausworthe generator
  * based on code from GNU Scientific Library 1.5 (30 Jun 2004)
diff --git a/kernel/lib/rational.c b/kernel/lib/rational.c
index f0aa21c2a..ba7443677 100644
--- a/kernel/lib/rational.c
+++ b/kernel/lib/rational.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * rational fractions
  *
diff --git a/kernel/lib/reciprocal_div.c b/kernel/lib/reciprocal_div.c
index 464152410..fcb4ce682 100644
--- a/kernel/lib/reciprocal_div.c
+++ b/kernel/lib/reciprocal_div.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <asm/div64.h>
 #include <linux/reciprocal_div.h>
diff --git a/kernel/lib/refcount.c b/kernel/lib/refcount.c
index 5d0582a94..0eb48353a 100644
--- a/kernel/lib/refcount.c
+++ b/kernel/lib/refcount.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Variant of atomic_t specialized for reference counts.
  *
diff --git a/kernel/lib/seq_buf.c b/kernel/lib/seq_buf.c
index cb18469e1..11f2ae0f9 100644
--- a/kernel/lib/seq_buf.c
+++ b/kernel/lib/seq_buf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * seq_buf.c
  *
diff --git a/kernel/lib/sha1.c b/kernel/lib/sha1.c
index 5a56dfd7b..1d96d2c02 100644
--- a/kernel/lib/sha1.c
+++ b/kernel/lib/sha1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SHA1 routine optimized to do word accesses rather than byte accesses,
  * and to avoid unnecessary copies into the context array.
diff --git a/kernel/lib/smp_processor_id.c b/kernel/lib/smp_processor_id.c
index 2fb007be0..835cc6df2 100644
--- a/kernel/lib/smp_processor_id.c
+++ b/kernel/lib/smp_processor_id.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * lib/smp_processor_id.c
  *
diff --git a/kernel/lib/sort.c b/kernel/lib/sort.c
index 975c6ef6f..d6b7a202b 100644
--- a/kernel/lib/sort.c
+++ b/kernel/lib/sort.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * A fast, small, non-recursive O(nlog n) sort for the Linux kernel
  *
diff --git a/kernel/lib/string.c b/kernel/lib/string.c
index 9921dc202..5e8d410a9 100644
--- a/kernel/lib/string.c
+++ b/kernel/lib/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/lib/string.c
  *
diff --git a/kernel/lib/strncpy_from_user.c b/kernel/lib/strncpy_from_user.c
index 7e35fc450..b53e1b5d8 100644
--- a/kernel/lib/strncpy_from_user.c
+++ b/kernel/lib/strncpy_from_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/export.h>
 #include <linux/kasan-checks.h>
diff --git a/kernel/lib/strnlen_user.c b/kernel/lib/strnlen_user.c
index a5f567747..60d0bbda8 100644
--- a/kernel/lib/strnlen_user.c
+++ b/kernel/lib/strnlen_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <linux/uaccess.h>
diff --git a/kernel/lib/syscall.c b/kernel/lib/syscall.c
index 2c6cd1b5c..1a7077f20 100644
--- a/kernel/lib/syscall.c
+++ b/kernel/lib/syscall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ptrace.h>
 #include <linux/sched.h>
 #include <linux/sched/task_stack.h>
diff --git a/kernel/lib/ubsan.h b/kernel/lib/ubsan.h
index b2d18d4a5..88f23557e 100644
--- a/kernel/lib/ubsan.h
+++ b/kernel/lib/ubsan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIB_UBSAN_H
 #define _LIB_UBSAN_H
 
diff --git a/kernel/lib/ucs2_string.c b/kernel/lib/ucs2_string.c
index ae8d24911..d7e06b28d 100644
--- a/kernel/lib/ucs2_string.c
+++ b/kernel/lib/ucs2_string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ucs2_string.h>
 #include <linux/module.h>
 
diff --git a/kernel/lib/usercopy.c b/kernel/lib/usercopy.c
index f5d9f08ee..15e2e6fb0 100644
--- a/kernel/lib/usercopy.c
+++ b/kernel/lib/usercopy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/uaccess.h>
 
 /* out-of-line parts */
diff --git a/kernel/lib/win_minmax.c b/kernel/lib/win_minmax.c
index c8420d404..6bdc1cd15 100644
--- a/kernel/lib/win_minmax.c
+++ b/kernel/lib/win_minmax.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * lib/minmax.c: windowed min/max tracker
  *
diff --git a/kernel/mm/Makefile b/kernel/mm/Makefile
index e3ac3aeb5..4659b93cb 100644
--- a/kernel/mm/Makefile
+++ b/kernel/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux memory manager.
 #
diff --git a/kernel/mm/bootmem.c b/kernel/mm/bootmem.c
index 9fedb27c6..6aef64254 100644
--- a/kernel/mm/bootmem.c
+++ b/kernel/mm/bootmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  bootmem - A boot-time physical memory allocator and configurator
  *
diff --git a/kernel/mm/cma.h b/kernel/mm/cma.h
index 498612862..33c0b5177 100644
--- a/kernel/mm/cma.h
+++ b/kernel/mm/cma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MM_CMA_H__
 #define __MM_CMA_H__
 
diff --git a/kernel/mm/cma_debug.c b/kernel/mm/cma_debug.c
index c03ccbc40..275df8b5b 100644
--- a/kernel/mm/cma_debug.c
+++ b/kernel/mm/cma_debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CMA DebugFS Interface
  *
diff --git a/kernel/mm/compaction.c b/kernel/mm/compaction.c
index 03d31a875..85395dc6e 100644
--- a/kernel/mm/compaction.c
+++ b/kernel/mm/compaction.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/mm/compaction.c
  *
diff --git a/kernel/mm/debug.c b/kernel/mm/debug.c
index 5715448ab..6726bec73 100644
--- a/kernel/mm/debug.c
+++ b/kernel/mm/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mm/debug.c
  *
diff --git a/kernel/mm/debug_page_ref.c b/kernel/mm/debug_page_ref.c
index 1aef3d562..f3b2c9d3e 100644
--- a/kernel/mm/debug_page_ref.c
+++ b/kernel/mm/debug_page_ref.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm_types.h>
 #include <linux/tracepoint.h>
 
diff --git a/kernel/mm/early_ioremap.c b/kernel/mm/early_ioremap.c
index b1dd4a948..d04ac1ec0 100644
--- a/kernel/mm/early_ioremap.c
+++ b/kernel/mm/early_ioremap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Provide common bits of early_ioremap() support for architectures needing
  * temporary mappings during boot before ioremap() is available.
diff --git a/kernel/mm/fadvise.c b/kernel/mm/fadvise.c
index 702f239cd..ec70d6e4b 100644
--- a/kernel/mm/fadvise.c
+++ b/kernel/mm/fadvise.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mm/fadvise.c
  *
diff --git a/kernel/mm/failslab.c b/kernel/mm/failslab.c
index b0fac98cd..8087d976a 100644
--- a/kernel/mm/failslab.c
+++ b/kernel/mm/failslab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/fault-inject.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
diff --git a/kernel/mm/frame_vector.c b/kernel/mm/frame_vector.c
index 72ebec186..2f98df0d4 100644
--- a/kernel/mm/frame_vector.c
+++ b/kernel/mm/frame_vector.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/err.h>
diff --git a/kernel/mm/highmem.c b/kernel/mm/highmem.c
index 50b4ca678..59db3223a 100644
--- a/kernel/mm/highmem.c
+++ b/kernel/mm/highmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * High memory handling common code and variables.
  *
diff --git a/kernel/mm/huge_memory.c b/kernel/mm/huge_memory.c
index 269b5df58..1981ed697 100644
--- a/kernel/mm/huge_memory.c
+++ b/kernel/mm/huge_memory.c
@@ -941,6 +941,9 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 				pmd = pmd_swp_mksoft_dirty(pmd);
 			set_pmd_at(src_mm, addr, src_pmd, pmd);
 		}
+		add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR);
+		atomic_long_inc(&dst_mm->nr_ptes);
+		pgtable_trans_huge_deposit(dst_mm, dst_pmd, pgtable);
 		set_pmd_at(dst_mm, addr, dst_pmd, pmd);
 		ret = 0;
 		goto out_unlock;
diff --git a/kernel/mm/hugetlb.c b/kernel/mm/hugetlb.c
index 424b0ef08..2d2ff5e8b 100644
--- a/kernel/mm/hugetlb.c
+++ b/kernel/mm/hugetlb.c
@@ -3984,6 +3984,9 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
 			    unsigned long src_addr,
 			    struct page **pagep)
 {
+	struct address_space *mapping;
+	pgoff_t idx;
+	unsigned long size;
 	int vm_shared = dst_vma->vm_flags & VM_SHARED;
 	struct hstate *h = hstate_vma(dst_vma);
 	pte_t _dst_pte;
@@ -4021,13 +4024,24 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
 	__SetPageUptodate(page);
 	set_page_huge_active(page);
 
+	mapping = dst_vma->vm_file->f_mapping;
+	idx = vma_hugecache_offset(h, dst_vma, dst_addr);
+
 	/*
 	 * If shared, add to page cache
 	 */
 	if (vm_shared) {
-		struct address_space *mapping = dst_vma->vm_file->f_mapping;
-		pgoff_t idx = vma_hugecache_offset(h, dst_vma, dst_addr);
+		size = i_size_read(mapping->host) >> huge_page_shift(h);
+		ret = -EFAULT;
+		if (idx >= size)
+			goto out_release_nounlock;
 
+		/*
+		 * Serialization between remove_inode_hugepages() and
+		 * huge_add_to_page_cache() below happens through the
+		 * hugetlb_fault_mutex_table that here must be hold by
+		 * the caller.
+		 */
 		ret = huge_add_to_page_cache(page, mapping, idx);
 		if (ret)
 			goto out_release_nounlock;
@@ -4036,6 +4050,20 @@ int hugetlb_mcopy_atomic_pte(struct mm_struct *dst_mm,
 	ptl = huge_pte_lockptr(h, dst_mm, dst_pte);
 	spin_lock(ptl);
 
+	/*
+	 * Recheck the i_size after holding PT lock to make sure not
+	 * to leave any page mapped (as page_mapped()) beyond the end
+	 * of the i_size (remove_inode_hugepages() is strict about
+	 * enforcing that). If we bail out here, we'll also leave a
+	 * page in the radix tree in the vm_shared case beyond the end
+	 * of the i_size, but remove_inode_hugepages() will take care
+	 * of it as soon as we drop the hugetlb_fault_mutex_table.
+	 */
+	size = i_size_read(mapping->host) >> huge_page_shift(h);
+	ret = -EFAULT;
+	if (idx >= size)
+		goto out_release_unlock;
+
 	ret = -EEXIST;
 	if (!huge_pte_none(huge_ptep_get(dst_pte)))
 		goto out_release_unlock;
diff --git a/kernel/mm/init-mm.c b/kernel/mm/init-mm.c
index 975e49f00..f94d5d15e 100644
--- a/kernel/mm/init-mm.c
+++ b/kernel/mm/init-mm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm_types.h>
 #include <linux/rbtree.h>
 #include <linux/rwsem.h>
diff --git a/kernel/mm/kasan/Makefile b/kernel/mm/kasan/Makefile
index 2976a9ee1..3289db38b 100644
--- a/kernel/mm/kasan/Makefile
+++ b/kernel/mm/kasan/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 KASAN_SANITIZE := n
 UBSAN_SANITIZE_kasan.o := n
 KCOV_INSTRUMENT := n
diff --git a/kernel/mm/kasan/kasan.h b/kernel/mm/kasan/kasan.h
index 1229298cc..c70851a9a 100644
--- a/kernel/mm/kasan/kasan.h
+++ b/kernel/mm/kasan/kasan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MM_KASAN_KASAN_H
 #define __MM_KASAN_KASAN_H
 
diff --git a/kernel/mm/khugepaged.c b/kernel/mm/khugepaged.c
index c01f177a1..43cb30433 100644
--- a/kernel/mm/khugepaged.c
+++ b/kernel/mm/khugepaged.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/mm.h>
diff --git a/kernel/mm/kmemcheck.c b/kernel/mm/kmemcheck.c
index 2d5959c5f..800d64b85 100644
--- a/kernel/mm/kmemcheck.c
+++ b/kernel/mm/kmemcheck.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/gfp.h>
 #include <linux/mm_types.h>
 #include <linux/mm.h>
diff --git a/kernel/mm/madvise.c b/kernel/mm/madvise.c
index fd70d6aab..375cf3208 100644
--- a/kernel/mm/madvise.c
+++ b/kernel/mm/madvise.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/mm/madvise.c
  *
diff --git a/kernel/mm/mempool.c b/kernel/mm/mempool.c
index 1c0294858..c4a23cdae 100644
--- a/kernel/mm/mempool.c
+++ b/kernel/mm/mempool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/mm/mempool.c
  *
diff --git a/kernel/mm/memtest.c b/kernel/mm/memtest.c
index 8eaa4c3a5..f53ace709 100644
--- a/kernel/mm/memtest.c
+++ b/kernel/mm/memtest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
diff --git a/kernel/mm/migrate.c b/kernel/mm/migrate.c
index e00814ca3..1236449b4 100644
--- a/kernel/mm/migrate.c
+++ b/kernel/mm/migrate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Memory Migration functionality - linux/mm/migrate.c
  *
diff --git a/kernel/mm/mincore.c b/kernel/mm/mincore.c
index c5687c45c..fc37afe22 100644
--- a/kernel/mm/mincore.c
+++ b/kernel/mm/mincore.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/mm/mincore.c
  *
diff --git a/kernel/mm/mlock.c b/kernel/mm/mlock.c
index dfc6f1912..46af369c1 100644
--- a/kernel/mm/mlock.c
+++ b/kernel/mm/mlock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/mm/mlock.c
  *
diff --git a/kernel/mm/mmzone.c b/kernel/mm/mmzone.c
index a51c0a67e..4686fdc23 100644
--- a/kernel/mm/mmzone.c
+++ b/kernel/mm/mmzone.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/mm/mmzone.c
  *
diff --git a/kernel/mm/mprotect.c b/kernel/mm/mprotect.c
index 6d3e2f082..ec39f730a 100644
--- a/kernel/mm/mprotect.c
+++ b/kernel/mm/mprotect.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  mm/mprotect.c
  *
diff --git a/kernel/mm/mremap.c b/kernel/mm/mremap.c
index cfec004c4..049470aa1 100644
--- a/kernel/mm/mremap.c
+++ b/kernel/mm/mremap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	mm/mremap.c
  *
diff --git a/kernel/mm/msync.c b/kernel/mm/msync.c
index 24e612fef..ef30a4296 100644
--- a/kernel/mm/msync.c
+++ b/kernel/mm/msync.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	linux/mm/msync.c
  *
diff --git a/kernel/mm/nobootmem.c b/kernel/mm/nobootmem.c
index 3637809a1..9b02fda08 100644
--- a/kernel/mm/nobootmem.c
+++ b/kernel/mm/nobootmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  bootmem - A boot-time physical memory allocator and configurator
  *
diff --git a/kernel/mm/page_counter.c b/kernel/mm/page_counter.c
index 7c6a63d2c..2a8df3ad6 100644
--- a/kernel/mm/page_counter.c
+++ b/kernel/mm/page_counter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Lockless hierarchical page accounting & limiting
  *
diff --git a/kernel/mm/page_ext.c b/kernel/mm/page_ext.c
index 32f18911d..4f0367d47 100644
--- a/kernel/mm/page_ext.c
+++ b/kernel/mm/page_ext.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/bootmem.h>
diff --git a/kernel/mm/page_idle.c b/kernel/mm/page_idle.c
index 4bd03a8d8..0a49374e6 100644
--- a/kernel/mm/page_idle.c
+++ b/kernel/mm/page_idle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/fs.h>
diff --git a/kernel/mm/page_io.c b/kernel/mm/page_io.c
index 21502d341..5d882de3f 100644
--- a/kernel/mm/page_io.c
+++ b/kernel/mm/page_io.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/mm/page_io.c
  *
diff --git a/kernel/mm/page_isolation.c b/kernel/mm/page_isolation.c
index 757410d9f..44f213935 100644
--- a/kernel/mm/page_isolation.c
+++ b/kernel/mm/page_isolation.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/mm/page_isolation.c
  */
diff --git a/kernel/mm/page_owner.c b/kernel/mm/page_owner.c
index 57abca62d..4f44b95b9 100644
--- a/kernel/mm/page_owner.c
+++ b/kernel/mm/page_owner.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/debugfs.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
diff --git a/kernel/mm/page_poison.c b/kernel/mm/page_poison.c
index be19e989c..e83fd4486 100644
--- a/kernel/mm/page_poison.c
+++ b/kernel/mm/page_poison.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/mm.h>
diff --git a/kernel/mm/page_vma_mapped.c b/kernel/mm/page_vma_mapped.c
index 53afbb919..d22b84310 100644
--- a/kernel/mm/page_vma_mapped.c
+++ b/kernel/mm/page_vma_mapped.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/rmap.h>
 #include <linux/hugetlb.h>
diff --git a/kernel/mm/pagewalk.c b/kernel/mm/pagewalk.c
index 1a4197965..8bd4afa83 100644
--- a/kernel/mm/pagewalk.c
+++ b/kernel/mm/pagewalk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/mm.h>
 #include <linux/highmem.h>
 #include <linux/sched.h>
diff --git a/kernel/mm/percpu-internal.h b/kernel/mm/percpu-internal.h
index 7065faf74..b1739dc06 100644
--- a/kernel/mm/percpu-internal.h
+++ b/kernel/mm/percpu-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MM_PERCPU_INTERNAL_H
 #define _MM_PERCPU_INTERNAL_H
 
diff --git a/kernel/mm/pgtable-generic.c b/kernel/mm/pgtable-generic.c
index 1175f6a24..1e4ee763c 100644
--- a/kernel/mm/pgtable-generic.c
+++ b/kernel/mm/pgtable-generic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  mm/pgtable-generic.c
  *
diff --git a/kernel/mm/quicklist.c b/kernel/mm/quicklist.c
index daf6ff6e1..5e98ac78e 100644
--- a/kernel/mm/quicklist.c
+++ b/kernel/mm/quicklist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Quicklist support.
  *
diff --git a/kernel/mm/slab.c b/kernel/mm/slab.c
index 04dec48c3..b7095884f 100644
--- a/kernel/mm/slab.c
+++ b/kernel/mm/slab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/mm/slab.c
  * Written by Mark Hemment, 1996/97.
diff --git a/kernel/mm/slab.h b/kernel/mm/slab.h
index 073362816..028cdc7df 100644
--- a/kernel/mm/slab.h
+++ b/kernel/mm/slab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MM_SLAB_H
 #define MM_SLAB_H
 /*
diff --git a/kernel/mm/slab_common.c b/kernel/mm/slab_common.c
index 80164599c..0d7fe71ff 100644
--- a/kernel/mm/slab_common.c
+++ b/kernel/mm/slab_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Slab allocator functions that are independent of the allocator strategy
  *
diff --git a/kernel/mm/slob.c b/kernel/mm/slob.c
index a8bd6fa11..10249160b 100644
--- a/kernel/mm/slob.c
+++ b/kernel/mm/slob.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SLOB Allocator: Simple List Of Blocks
  *
diff --git a/kernel/mm/slub.c b/kernel/mm/slub.c
index 163352c53..1efbb8123 100644
--- a/kernel/mm/slub.c
+++ b/kernel/mm/slub.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SLUB: A slab allocator that limits cache line use instead of queuing
  * objects in per cpu and per node lists.
diff --git a/kernel/mm/sparse-vmemmap.c b/kernel/mm/sparse-vmemmap.c
index d1a39b805..478ce6d4a 100644
--- a/kernel/mm/sparse-vmemmap.c
+++ b/kernel/mm/sparse-vmemmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Virtual Memory Map support
  *
diff --git a/kernel/mm/sparse.c b/kernel/mm/sparse.c
index 83b3bf646..4900707ae 100644
--- a/kernel/mm/sparse.c
+++ b/kernel/mm/sparse.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sparse memory mappings.
  */
diff --git a/kernel/mm/swap_cgroup.c b/kernel/mm/swap_cgroup.c
index fcd2740f4..45affaef3 100644
--- a/kernel/mm/swap_cgroup.c
+++ b/kernel/mm/swap_cgroup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/swap_cgroup.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
diff --git a/kernel/mm/swap_slots.c b/kernel/mm/swap_slots.c
index 13a174006..d81cfc5a4 100644
--- a/kernel/mm/swap_slots.c
+++ b/kernel/mm/swap_slots.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Manage cache of swap slots to be used for and returned from
  * swap.
diff --git a/kernel/mm/swap_state.c b/kernel/mm/swap_state.c
index 05b6803f0..326439428 100644
--- a/kernel/mm/swap_state.c
+++ b/kernel/mm/swap_state.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/mm/swap_state.c
  *
diff --git a/kernel/mm/swapfile.c b/kernel/mm/swapfile.c
index bf91dc9e7..e47a21e64 100644
--- a/kernel/mm/swapfile.c
+++ b/kernel/mm/swapfile.c
@@ -2869,6 +2869,7 @@ static struct swap_info_struct *alloc_swap_info(void)
 	p->flags = SWP_USED;
 	spin_unlock(&swap_lock);
 	spin_lock_init(&p->lock);
+	spin_lock_init(&p->cont_lock);
 
 	return p;
 }
@@ -3545,6 +3546,7 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask)
 	head = vmalloc_to_page(si->swap_map + offset);
 	offset &= ~PAGE_MASK;
 
+	spin_lock(&si->cont_lock);
 	/*
 	 * Page allocation does not initialize the page's lru field,
 	 * but it does always reset its private field.
@@ -3564,7 +3566,7 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask)
 		 * a continuation page, free our allocation and use this one.
 		 */
 		if (!(count & COUNT_CONTINUED))
-			goto out;
+			goto out_unlock_cont;
 
 		map = kmap_atomic(list_page) + offset;
 		count = *map;
@@ -3575,11 +3577,13 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask)
 		 * free our allocation and use this one.
 		 */
 		if ((count & ~COUNT_CONTINUED) != SWAP_CONT_MAX)
-			goto out;
+			goto out_unlock_cont;
 	}
 
 	list_add_tail(&page->lru, &head->lru);
 	page = NULL;			/* now it's attached, don't free it */
+out_unlock_cont:
+	spin_unlock(&si->cont_lock);
 out:
 	unlock_cluster(ci);
 	spin_unlock(&si->lock);
@@ -3604,6 +3608,7 @@ static bool swap_count_continued(struct swap_info_struct *si,
 	struct page *head;
 	struct page *page;
 	unsigned char *map;
+	bool ret;
 
 	head = vmalloc_to_page(si->swap_map + offset);
 	if (page_private(head) != SWP_CONTINUED) {
@@ -3611,6 +3616,7 @@ static bool swap_count_continued(struct swap_info_struct *si,
 		return false;		/* need to add count continuation */
 	}
 
+	spin_lock(&si->cont_lock);
 	offset &= ~PAGE_MASK;
 	page = list_entry(head->lru.next, struct page, lru);
 	map = kmap_atomic(page) + offset;
@@ -3631,8 +3637,10 @@ static bool swap_count_continued(struct swap_info_struct *si,
 		if (*map == SWAP_CONT_MAX) {
 			kunmap_atomic(map);
 			page = list_entry(page->lru.next, struct page, lru);
-			if (page == head)
-				return false;	/* add count continuation */
+			if (page == head) {
+				ret = false;	/* add count continuation */
+				goto out;
+			}
 			map = kmap_atomic(page) + offset;
 init_map:		*map = 0;		/* we didn't zero the page */
 		}
@@ -3645,7 +3653,7 @@ init_map:		*map = 0;		/* we didn't zero the page */
 			kunmap_atomic(map);
 			page = list_entry(page->lru.prev, struct page, lru);
 		}
-		return true;			/* incremented */
+		ret = true;			/* incremented */
 
 	} else {				/* decrementing */
 		/*
@@ -3671,8 +3679,11 @@ init_map:		*map = 0;		/* we didn't zero the page */
 			kunmap_atomic(map);
 			page = list_entry(page->lru.prev, struct page, lru);
 		}
-		return count == COUNT_CONTINUED;
+		ret = count == COUNT_CONTINUED;
 	}
+out:
+	spin_unlock(&si->cont_lock);
+	return ret;
 }
 
 /*
diff --git a/kernel/mm/vmacache.c b/kernel/mm/vmacache.c
index 7ffa0ee34..db7596eb6 100644
--- a/kernel/mm/vmacache.c
+++ b/kernel/mm/vmacache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2014 Davidlohr Bueso.
  */
diff --git a/kernel/mm/vmscan.c b/kernel/mm/vmscan.c
index 13d711dd8..eb2f0315b 100644
--- a/kernel/mm/vmscan.c
+++ b/kernel/mm/vmscan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/mm/vmscan.c
  *
diff --git a/kernel/mm/workingset.c b/kernel/mm/workingset.c
index 7119cd745..b997c9de2 100644
--- a/kernel/mm/workingset.c
+++ b/kernel/mm/workingset.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Workingset detection
  *
diff --git a/kernel/net/6lowpan/6lowpan_i.h b/kernel/net/6lowpan/6lowpan_i.h
index a67caee11..53cf446ce 100644
--- a/kernel/net/6lowpan/6lowpan_i.h
+++ b/kernel/net/6lowpan/6lowpan_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __6LOWPAN_I_H
 #define __6LOWPAN_I_H
 
diff --git a/kernel/net/6lowpan/Makefile b/kernel/net/6lowpan/Makefile
index 12d131ab2..2247b96db 100644
--- a/kernel/net/6lowpan/Makefile
+++ b/kernel/net/6lowpan/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_6LOWPAN) += 6lowpan.o
 
 6lowpan-y := core.o iphc.o nhc.o ndisc.o
diff --git a/kernel/net/6lowpan/nhc.h b/kernel/net/6lowpan/nhc.h
index 803041400..67951c407 100644
--- a/kernel/net/6lowpan/nhc.h
+++ b/kernel/net/6lowpan/nhc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __6LOWPAN_NHC_H
 #define __6LOWPAN_NHC_H
 
diff --git a/kernel/net/802/Makefile b/kernel/net/802/Makefile
index 37e654d66..19406a87b 100644
--- a/kernel/net/802/Makefile
+++ b/kernel/net/802/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux 802.x protocol layers.
 #
diff --git a/kernel/net/8021q/Makefile b/kernel/net/8021q/Makefile
index 7bc8db08d..9b703454b 100644
--- a/kernel/net/8021q/Makefile
+++ b/kernel/net/8021q/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux VLAN layer.
 #
diff --git a/kernel/net/8021q/vlan.h b/kernel/net/8021q/vlan.h
index df8bd65dd..0e7afdf86 100644
--- a/kernel/net/8021q/vlan.h
+++ b/kernel/net/8021q/vlan.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BEN_VLAN_802_1Q_INC__
 #define __BEN_VLAN_802_1Q_INC__
 
diff --git a/kernel/net/8021q/vlan_core.c b/kernel/net/8021q/vlan_core.c
index 0bc31de90..64aa9f755 100644
--- a/kernel/net/8021q/vlan_core.c
+++ b/kernel/net/8021q/vlan_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/if_vlan.h>
diff --git a/kernel/net/8021q/vlanproc.h b/kernel/net/8021q/vlanproc.h
index 8838a2e92..48cd4b478 100644
--- a/kernel/net/8021q/vlanproc.h
+++ b/kernel/net/8021q/vlanproc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BEN_VLAN_PROC_INC__
 #define __BEN_VLAN_PROC_INC__
 
diff --git a/kernel/net/9p/Makefile b/kernel/net/9p/Makefile
index 697ea7caf..c0486cfc8 100644
--- a/kernel/net/9p/Makefile
+++ b/kernel/net/9p/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_NET_9P) := 9pnet.o
 obj-$(CONFIG_NET_9P_XEN) += 9pnet_xen.o
 obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o
diff --git a/kernel/net/Makefile b/kernel/net/Makefile
index ae2fe2283..14fede520 100644
--- a/kernel/net/Makefile
+++ b/kernel/net/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the linux networking.
 #
diff --git a/kernel/net/appletalk/dev.c b/kernel/net/appletalk/dev.c
index e4158b8b9..284c8e585 100644
--- a/kernel/net/appletalk/dev.c
+++ b/kernel/net/appletalk/dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Moved here from drivers/net/net_init.c, which is:
  *	Written 1993,1994,1995 by Donald Becker.
diff --git a/kernel/net/appletalk/sysctl_net_atalk.c b/kernel/net/appletalk/sysctl_net_atalk.c
index ebb864361..c744a853f 100644
--- a/kernel/net/appletalk/sysctl_net_atalk.c
+++ b/kernel/net/appletalk/sysctl_net_atalk.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sysctl_net_atalk.c: sysctl interface to net AppleTalk subsystem.
  *
diff --git a/kernel/net/atm/Makefile b/kernel/net/atm/Makefile
index cc50bd1ff..bfec0f2d8 100644
--- a/kernel/net/atm/Makefile
+++ b/kernel/net/atm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ATM Protocol Families.
 #
diff --git a/kernel/net/atm/addr.c b/kernel/net/atm/addr.c
index dcda35c66..0530b63f5 100644
--- a/kernel/net/atm/addr.c
+++ b/kernel/net/atm/addr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/addr.c - Local ATM address registry */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/addr.h b/kernel/net/atm/addr.h
index 6837e9e7e..da3f84841 100644
--- a/kernel/net/atm/addr.h
+++ b/kernel/net/atm/addr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* net/atm/addr.h - Local ATM address registry */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/atm_misc.c b/kernel/net/atm/atm_misc.c
index 876fbe83e..a30b83c1c 100644
--- a/kernel/net/atm/atm_misc.c
+++ b/kernel/net/atm/atm_misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/atm_misc.c - Various functions for use by ATM drivers */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL ICA */
diff --git a/kernel/net/atm/atm_sysfs.c b/kernel/net/atm/atm_sysfs.c
index 350bf62b2..5d2fed9f5 100644
--- a/kernel/net/atm/atm_sysfs.c
+++ b/kernel/net/atm/atm_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ATM driver model support. */
 
 #include <linux/kernel.h>
diff --git a/kernel/net/atm/common.h b/kernel/net/atm/common.h
index 959436b87..d9d583712 100644
--- a/kernel/net/atm/common.h
+++ b/kernel/net/atm/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* net/atm/common.h - ATM sockets (common part for PVC and SVC) */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/ioctl.c b/kernel/net/atm/ioctl.c
index bbd3b6399..2ff0e5e47 100644
--- a/kernel/net/atm/ioctl.c
+++ b/kernel/net/atm/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* ATM ioctl handling */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/lec.h b/kernel/net/atm/lec.h
index 4149db1b7..be0e2667b 100644
--- a/kernel/net/atm/lec.h
+++ b/kernel/net/atm/lec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Lan Emulation client header file
  *
diff --git a/kernel/net/atm/lec_arpc.h b/kernel/net/atm/lec_arpc.h
index d923f5381..1205d8792 100644
--- a/kernel/net/atm/lec_arpc.h
+++ b/kernel/net/atm/lec_arpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Lec arp cache
  *
diff --git a/kernel/net/atm/mpc.h b/kernel/net/atm/mpc.h
index cfc7b745a..454abd076 100644
--- a/kernel/net/atm/mpc.h
+++ b/kernel/net/atm/mpc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MPC_H_
 #define _MPC_H_
 
diff --git a/kernel/net/atm/mpoa_caches.c b/kernel/net/atm/mpoa_caches.c
index 4ccaa16b1..e01450bb3 100644
--- a/kernel/net/atm/mpoa_caches.c
+++ b/kernel/net/atm/mpoa_caches.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <linux/atmmpc.h>
 #include <linux/slab.h>
diff --git a/kernel/net/atm/mpoa_caches.h b/kernel/net/atm/mpoa_caches.h
index 30fe34841..6a266669e 100644
--- a/kernel/net/atm/mpoa_caches.h
+++ b/kernel/net/atm/mpoa_caches.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MPOA_CACHES_H
 #define MPOA_CACHES_H
 
diff --git a/kernel/net/atm/mpoa_proc.c b/kernel/net/atm/mpoa_proc.c
index 2df34eb5d..8a0c17e1c 100644
--- a/kernel/net/atm/mpoa_proc.c
+++ b/kernel/net/atm/mpoa_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
 
 #ifdef CONFIG_PROC_FS
diff --git a/kernel/net/atm/proc.c b/kernel/net/atm/proc.c
index 4caca2a90..642f9272a 100644
--- a/kernel/net/atm/proc.c
+++ b/kernel/net/atm/proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/proc.c - ATM /proc interface
  *
  * Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA
diff --git a/kernel/net/atm/protocols.h b/kernel/net/atm/protocols.h
index acdfc8562..18d4d008b 100644
--- a/kernel/net/atm/protocols.h
+++ b/kernel/net/atm/protocols.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* net/atm/protocols.h - ATM protocol handler entry points */
 
 /* Written 1995-1997 by Werner Almesberger, EPFL LRC */
diff --git a/kernel/net/atm/pvc.c b/kernel/net/atm/pvc.c
index 040207ec3..e1140b3bd 100644
--- a/kernel/net/atm/pvc.c
+++ b/kernel/net/atm/pvc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/pvc.c - ATM PVC sockets */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/raw.c b/kernel/net/atm/raw.c
index 821c07975..ee10e8d46 100644
--- a/kernel/net/atm/raw.c
+++ b/kernel/net/atm/raw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/raw.c - Raw AAL0 and AAL5 transports */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/resources.c b/kernel/net/atm/resources.c
index 918244757..bada395ec 100644
--- a/kernel/net/atm/resources.c
+++ b/kernel/net/atm/resources.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/resources.c - Statically allocated resources */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/resources.h b/kernel/net/atm/resources.h
index 521431e30..048232e4d 100644
--- a/kernel/net/atm/resources.h
+++ b/kernel/net/atm/resources.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* net/atm/resources.h - ATM-related resources */
 
 /* Written 1995-1998 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/signaling.c b/kernel/net/atm/signaling.c
index 0a20f6e95..6c11cdf4d 100644
--- a/kernel/net/atm/signaling.c
+++ b/kernel/net/atm/signaling.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/signaling.c - ATM signaling */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/signaling.h b/kernel/net/atm/signaling.h
index 08b2a69cc..2df8220f7 100644
--- a/kernel/net/atm/signaling.h
+++ b/kernel/net/atm/signaling.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* net/atm/signaling.h - ATM signaling */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/atm/svc.c b/kernel/net/atm/svc.c
index 5589de708..c458adcbc 100644
--- a/kernel/net/atm/svc.c
+++ b/kernel/net/atm/svc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* net/atm/svc.c - ATM SVC sockets */
 
 /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
diff --git a/kernel/net/ax25/Makefile b/kernel/net/ax25/Makefile
index 43c46d2ca..2e53affc8 100644
--- a/kernel/net/ax25/Makefile
+++ b/kernel/net/ax25/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux AX.25 layer.
 #
diff --git a/kernel/net/bluetooth/Makefile b/kernel/net/bluetooth/Makefile
index 5d0a113e2..fda41c0b4 100644
--- a/kernel/net/bluetooth/Makefile
+++ b/kernel/net/bluetooth/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Bluetooth subsystem.
 #
diff --git a/kernel/net/bluetooth/hci_sysfs.c b/kernel/net/bluetooth/hci_sysfs.c
index aa300f3a0..d5c7c89ec 100644
--- a/kernel/net/bluetooth/hci_sysfs.c
+++ b/kernel/net/bluetooth/hci_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Bluetooth HCI driver model support. */
 
 #include <linux/module.h>
diff --git a/kernel/net/bridge/Makefile b/kernel/net/bridge/Makefile
index 40b1ede52..f760e62a6 100644
--- a/kernel/net/bridge/Makefile
+++ b/kernel/net/bridge/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the IEEE 802.1d ethernet bridging layer.
 #
diff --git a/kernel/net/bridge/br_mdb.c b/kernel/net/bridge/br_mdb.c
index ca01def49..31ddff225 100644
--- a/kernel/net/bridge/br_mdb.c
+++ b/kernel/net/bridge/br_mdb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <linux/igmp.h>
 #include <linux/kernel.h>
diff --git a/kernel/net/bridge/br_switchdev.c b/kernel/net/bridge/br_switchdev.c
index f6b1c7de0..9700e0f33 100644
--- a/kernel/net/bridge/br_switchdev.c
+++ b/kernel/net/bridge/br_switchdev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
diff --git a/kernel/net/bridge/netfilter/Makefile b/kernel/net/bridge/netfilter/Makefile
index be4d0cea7..2f28e16de 100644
--- a/kernel/net/bridge/netfilter/Makefile
+++ b/kernel/net/bridge/netfilter/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the netfilter modules for Link Layer filtering on a bridge.
 #
diff --git a/kernel/net/caif/Makefile b/kernel/net/caif/Makefile
index cc2b51154..4f6c0517c 100644
--- a/kernel/net/caif/Makefile
+++ b/kernel/net/caif/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-$(CONFIG_CAIF_DEBUG)     :=      -DDEBUG
 
 caif-y := caif_dev.o \
diff --git a/kernel/net/can/Makefile b/kernel/net/can/Makefile
index 10936754e..1242bbbfe 100644
--- a/kernel/net/can/Makefile
+++ b/kernel/net/can/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 #  Makefile for the Linux Controller Area Network core.
 #
diff --git a/kernel/net/ceph/Makefile b/kernel/net/ceph/Makefile
index 6a5180903..b4bded4b5 100644
--- a/kernel/net/ceph/Makefile
+++ b/kernel/net/ceph/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for CEPH filesystem.
 #
diff --git a/kernel/net/ceph/armor.c b/kernel/net/ceph/armor.c
index 1fc1ee11d..0db806592 100644
--- a/kernel/net/ceph/armor.c
+++ b/kernel/net/ceph/armor.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/errno.h>
 
diff --git a/kernel/net/ceph/auth.c b/kernel/net/ceph/auth.c
index 48bb8d951..dbde2b3c3 100644
--- a/kernel/net/ceph/auth.c
+++ b/kernel/net/ceph/auth.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/module.h>
diff --git a/kernel/net/ceph/auth_none.c b/kernel/net/ceph/auth_none.c
index df45e467c..41d2a0c72 100644
--- a/kernel/net/ceph/auth_none.c
+++ b/kernel/net/ceph/auth_none.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/ceph/ceph_debug.h>
 
diff --git a/kernel/net/ceph/auth_none.h b/kernel/net/ceph/auth_none.h
index 62021535a..860ed9875 100644
--- a/kernel/net/ceph/auth_none.h
+++ b/kernel/net/ceph/auth_none.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_AUTH_NONE_H
 #define _FS_CEPH_AUTH_NONE_H
 
diff --git a/kernel/net/ceph/auth_x.c b/kernel/net/ceph/auth_x.c
index 8757fb87d..2f4a1baf5 100644
--- a/kernel/net/ceph/auth_x.c
+++ b/kernel/net/ceph/auth_x.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/ceph/ceph_debug.h>
 
diff --git a/kernel/net/ceph/auth_x.h b/kernel/net/ceph/auth_x.h
index 48e9ad41b..454cb5456 100644
--- a/kernel/net/ceph/auth_x.h
+++ b/kernel/net/ceph/auth_x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_AUTH_X_H
 #define _FS_CEPH_AUTH_X_H
 
diff --git a/kernel/net/ceph/auth_x_protocol.h b/kernel/net/ceph/auth_x_protocol.h
index 671d30576..32c13d763 100644
--- a/kernel/net/ceph/auth_x_protocol.h
+++ b/kernel/net/ceph/auth_x_protocol.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __FS_CEPH_AUTH_X_PROTOCOL
 #define __FS_CEPH_AUTH_X_PROTOCOL
 
diff --git a/kernel/net/ceph/buffer.c b/kernel/net/ceph/buffer.c
index add5f921a..5622763ad 100644
--- a/kernel/net/ceph/buffer.c
+++ b/kernel/net/ceph/buffer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/ceph/ceph_debug.h>
 
diff --git a/kernel/net/ceph/ceph_fs.c b/kernel/net/ceph/ceph_fs.c
index dcbe67ff3..756a2dc10 100644
--- a/kernel/net/ceph/ceph_fs.c
+++ b/kernel/net/ceph/ceph_fs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Some non-inline ceph helpers
  */
diff --git a/kernel/net/ceph/ceph_strings.c b/kernel/net/ceph/ceph_strings.c
index 19b7d8aa9..10e014949 100644
--- a/kernel/net/ceph/ceph_strings.c
+++ b/kernel/net/ceph/ceph_strings.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Ceph string constants
  */
diff --git a/kernel/net/ceph/cls_lock_client.c b/kernel/net/ceph/cls_lock_client.c
index 08ada893f..8d2032b2f 100644
--- a/kernel/net/ceph/cls_lock_client.c
+++ b/kernel/net/ceph/cls_lock_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/types.h>
diff --git a/kernel/net/ceph/crush/crush.c b/kernel/net/ceph/crush/crush.c
index 4b428f46a..3d70244bc 100644
--- a/kernel/net/ceph/crush/crush.c
+++ b/kernel/net/ceph/crush/crush.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifdef __KERNEL__
 # include <linux/slab.h>
 # include <linux/crush/crush.h>
diff --git a/kernel/net/ceph/crush/hash.c b/kernel/net/ceph/crush/hash.c
index ed123af49..e5cc603cd 100644
--- a/kernel/net/ceph/crush/hash.c
+++ b/kernel/net/ceph/crush/hash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifdef __KERNEL__
 # include <linux/crush/hash.h>
 #else
diff --git a/kernel/net/ceph/crypto.c b/kernel/net/ceph/crypto.c
index 46008d5ac..489610ac1 100644
--- a/kernel/net/ceph/crypto.c
+++ b/kernel/net/ceph/crypto.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/ceph/ceph_debug.h>
 
diff --git a/kernel/net/ceph/crypto.h b/kernel/net/ceph/crypto.h
index 58d83aa77..bb45c7d43 100644
--- a/kernel/net/ceph/crypto.h
+++ b/kernel/net/ceph/crypto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FS_CEPH_CRYPTO_H
 #define _FS_CEPH_CRYPTO_H
 
diff --git a/kernel/net/ceph/debugfs.c b/kernel/net/ceph/debugfs.c
index fa5233e0d..1eef6806a 100644
--- a/kernel/net/ceph/debugfs.c
+++ b/kernel/net/ceph/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/device.h>
diff --git a/kernel/net/ceph/messenger.c b/kernel/net/ceph/messenger.c
index a67298c7e..ad93342c9 100644
--- a/kernel/net/ceph/messenger.c
+++ b/kernel/net/ceph/messenger.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/crc32c.h>
diff --git a/kernel/net/ceph/mon_client.c b/kernel/net/ceph/mon_client.c
index 63edc6e5f..9ae1bab8c 100644
--- a/kernel/net/ceph/mon_client.c
+++ b/kernel/net/ceph/mon_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/module.h>
diff --git a/kernel/net/ceph/msgpool.c b/kernel/net/ceph/msgpool.c
index aaed59a47..725715358 100644
--- a/kernel/net/ceph/msgpool.c
+++ b/kernel/net/ceph/msgpool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/err.h>
diff --git a/kernel/net/ceph/osd_client.c b/kernel/net/ceph/osd_client.c
index e02f01f53..2814dba59 100644
--- a/kernel/net/ceph/osd_client.c
+++ b/kernel/net/ceph/osd_client.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/ceph/ceph_debug.h>
 
diff --git a/kernel/net/ceph/osdmap.c b/kernel/net/ceph/osdmap.c
index 79d14d70b..0da27c663 100644
--- a/kernel/net/ceph/osdmap.c
+++ b/kernel/net/ceph/osdmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <linux/ceph/ceph_debug.h>
 
diff --git a/kernel/net/ceph/pagelist.c b/kernel/net/ceph/pagelist.c
index ce09f73be..2ea056477 100644
--- a/kernel/net/ceph/pagelist.c
+++ b/kernel/net/ceph/pagelist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 #include <linux/gfp.h>
 #include <linux/slab.h>
diff --git a/kernel/net/ceph/pagevec.c b/kernel/net/ceph/pagevec.c
index 1a7c9a79a..ee43bc132 100644
--- a/kernel/net/ceph/pagevec.c
+++ b/kernel/net/ceph/pagevec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ceph/ceph_debug.h>
 
 #include <linux/module.h>
diff --git a/kernel/net/ceph/string_table.c b/kernel/net/ceph/string_table.c
index 22fb96efc..3191d9d16 100644
--- a/kernel/net/ceph/string_table.c
+++ b/kernel/net/ceph/string_table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/slab.h>
 #include <linux/gfp.h>
 #include <linux/string.h>
diff --git a/kernel/net/core/Makefile b/kernel/net/core/Makefile
index 56d771a88..1fd0a9c88 100644
--- a/kernel/net/core/Makefile
+++ b/kernel/net/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux networking core.
 #
diff --git a/kernel/net/core/datagram.c b/kernel/net/core/datagram.c
index f7fb7e3f2..3964c108b 100644
--- a/kernel/net/core/datagram.c
+++ b/kernel/net/core/datagram.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	SUCS NET3:
  *
diff --git a/kernel/net/core/dev_ioctl.c b/kernel/net/core/dev_ioctl.c
index f9c7a88cd..7e690d0cc 100644
--- a/kernel/net/core/dev_ioctl.c
+++ b/kernel/net/core/dev_ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kmod.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
diff --git a/kernel/net/core/gro_cells.c b/kernel/net/core/gro_cells.c
index 814e58a3c..4b54e5f10 100644
--- a/kernel/net/core/gro_cells.c
+++ b/kernel/net/core/gro_cells.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
diff --git a/kernel/net/core/net-procfs.c b/kernel/net/core/net-procfs.c
index 484796493..615ccab55 100644
--- a/kernel/net/core/net-procfs.c
+++ b/kernel/net/core/net-procfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
diff --git a/kernel/net/core/net-sysfs.h b/kernel/net/core/net-sysfs.h
index 2745a1b51..006876c7b 100644
--- a/kernel/net/core/net-sysfs.h
+++ b/kernel/net/core/net-sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_SYSFS_H__
 #define __NET_SYSFS_H__
 
diff --git a/kernel/net/core/net-traces.c b/kernel/net/core/net-traces.c
index 1132820c8..71f209542 100644
--- a/kernel/net/core/net-traces.c
+++ b/kernel/net/core/net-traces.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * consolidates trace point definitions
  *
diff --git a/kernel/net/core/sock_reuseport.c b/kernel/net/core/sock_reuseport.c
index b1e0dbea1..5eeb1d20c 100644
--- a/kernel/net/core/sock_reuseport.c
+++ b/kernel/net/core/sock_reuseport.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * To speed up listener socket lookup, create an array to store all sockets
  * listening on the same port.  This allows a decision to be made after finding
diff --git a/kernel/net/core/stream.c b/kernel/net/core/stream.c
index 20231dbb1..1cff9c627 100644
--- a/kernel/net/core/stream.c
+++ b/kernel/net/core/stream.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *     SUCS NET3:
  *
diff --git a/kernel/net/core/sysctl_net_core.c b/kernel/net/core/sysctl_net_core.c
index b7cd9aafe..cbc3dde4c 100644
--- a/kernel/net/core/sysctl_net_core.c
+++ b/kernel/net/core/sysctl_net_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* -*- linux-c -*-
  * sysctl_net_core.c: sysctl interface to net core subsystem.
  *
diff --git a/kernel/net/core/tso.c b/kernel/net/core/tso.c
index 5dca7ce8e..43f4eba61 100644
--- a/kernel/net/core/tso.c
+++ b/kernel/net/core/tso.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/if_vlan.h>
 #include <net/ip.h>
diff --git a/kernel/net/dccp/Makefile b/kernel/net/dccp/Makefile
index 5c8362b03..2e7b56097 100644
--- a/kernel/net/dccp/Makefile
+++ b/kernel/net/dccp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IP_DCCP) += dccp.o dccp_ipv4.o
 
 dccp-y := ccid.o feat.o input.o minisocks.o options.o output.o proto.o timer.o \
diff --git a/kernel/net/dccp/ccids/lib/tfrc.c b/kernel/net/dccp/ccids/lib/tfrc.c
index 62b5828ac..d7f265e1f 100644
--- a/kernel/net/dccp/ccids/lib/tfrc.c
+++ b/kernel/net/dccp/ccids/lib/tfrc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * TFRC library initialisation
  *
diff --git a/kernel/net/decnet/Makefile b/kernel/net/decnet/Makefile
index e44003af7..9e38122d9 100644
--- a/kernel/net/decnet/Makefile
+++ b/kernel/net/decnet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_DECNET) += decnet.o
 
diff --git a/kernel/net/decnet/dn_dev.c b/kernel/net/decnet/dn_dev.c
index 4d339de56..df042b6d8 100644
--- a/kernel/net/decnet/dn_dev.c
+++ b/kernel/net/decnet/dn_dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
diff --git a/kernel/net/decnet/dn_fib.c b/kernel/net/decnet/dn_fib.c
index 3d37464c8..b37a1b833 100644
--- a/kernel/net/decnet/dn_fib.c
+++ b/kernel/net/decnet/dn_fib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
diff --git a/kernel/net/decnet/dn_neigh.c b/kernel/net/decnet/dn_neigh.c
index 22bf0b95d..528119a56 100644
--- a/kernel/net/decnet/dn_neigh.c
+++ b/kernel/net/decnet/dn_neigh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
diff --git a/kernel/net/decnet/dn_rules.c b/kernel/net/decnet/dn_rules.c
index 295bbd6a5..c795c3f50 100644
--- a/kernel/net/decnet/dn_rules.c
+++ b/kernel/net/decnet/dn_rules.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
diff --git a/kernel/net/decnet/dn_table.c b/kernel/net/decnet/dn_table.c
index 232675480..08667f68e 100644
--- a/kernel/net/decnet/dn_table.c
+++ b/kernel/net/decnet/dn_table.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
diff --git a/kernel/net/decnet/dn_timer.c b/kernel/net/decnet/dn_timer.c
index 1d330fd43..f430daed2 100644
--- a/kernel/net/decnet/dn_timer.c
+++ b/kernel/net/decnet/dn_timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
diff --git a/kernel/net/decnet/sysctl_net_decnet.c b/kernel/net/decnet/sysctl_net_decnet.c
index 6c7da6c29..55bf64a22 100644
--- a/kernel/net/decnet/sysctl_net_decnet.c
+++ b/kernel/net/decnet/sysctl_net_decnet.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * DECnet       An implementation of the DECnet protocol suite for the LINUX
  *              operating system.  DECnet is implemented using the  BSD Socket
diff --git a/kernel/net/dsa/Makefile b/kernel/net/dsa/Makefile
index fcce25da9..3d3c74193 100644
--- a/kernel/net/dsa/Makefile
+++ b/kernel/net/dsa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # the core
 obj-$(CONFIG_NET_DSA) += dsa_core.o
 dsa_core-y += dsa.o dsa2.o legacy.o port.o slave.o switch.o
diff --git a/kernel/net/ieee802154/6lowpan/6lowpan_i.h b/kernel/net/ieee802154/6lowpan/6lowpan_i.h
index ac7c96b73..d8de3bcfb 100644
--- a/kernel/net/ieee802154/6lowpan/6lowpan_i.h
+++ b/kernel/net/ieee802154/6lowpan/6lowpan_i.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IEEE802154_6LOWPAN_I_H__
 #define __IEEE802154_6LOWPAN_I_H__
 
diff --git a/kernel/net/ieee802154/Makefile b/kernel/net/ieee802154/Makefile
index 9b92ade68..f05b7bdae 100644
--- a/kernel/net/ieee802154/Makefile
+++ b/kernel/net/ieee802154/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_IEEE802154) += ieee802154.o
 obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o
 obj-y += 6lowpan/
diff --git a/kernel/net/ieee802154/core.h b/kernel/net/ieee802154/core.h
index 81141f58d..1c19f575d 100644
--- a/kernel/net/ieee802154/core.h
+++ b/kernel/net/ieee802154/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IEEE802154_CORE_H
 #define __IEEE802154_CORE_H
 
diff --git a/kernel/net/ieee802154/nl802154.h b/kernel/net/ieee802154/nl802154.h
index 3846a89d0..8c4b6d089 100644
--- a/kernel/net/ieee802154/nl802154.h
+++ b/kernel/net/ieee802154/nl802154.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IEEE802154_NL802154_H
 #define __IEEE802154_NL802154_H
 
diff --git a/kernel/net/ieee802154/rdev-ops.h b/kernel/net/ieee802154/rdev-ops.h
index 4441c63b3..598f5af49 100644
--- a/kernel/net/ieee802154/rdev-ops.h
+++ b/kernel/net/ieee802154/rdev-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CFG802154_RDEV_OPS
 #define __CFG802154_RDEV_OPS
 
diff --git a/kernel/net/ieee802154/sysfs.h b/kernel/net/ieee802154/sysfs.h
index aa42e39ec..337545b63 100644
--- a/kernel/net/ieee802154/sysfs.h
+++ b/kernel/net/ieee802154/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IEEE802154_SYSFS_H
 #define __IEEE802154_SYSFS_H
 
diff --git a/kernel/net/ieee802154/trace.h b/kernel/net/ieee802154/trace.h
index 9a471e41e..19c2e5d60 100644
--- a/kernel/net/ieee802154/trace.h
+++ b/kernel/net/ieee802154/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Based on net/wireless/trace.h */
 
 #undef TRACE_SYSTEM
diff --git a/kernel/net/ife/ife.c b/kernel/net/ife/ife.c
index f360341c7..7d1ec76e7 100644
--- a/kernel/net/ife/ife.c
+++ b/kernel/net/ife/ife.c
@@ -137,6 +137,6 @@ int ife_tlv_meta_encode(void *skbdata, u16 attrtype, u16 dlen, const void *dval)
 EXPORT_SYMBOL_GPL(ife_tlv_meta_encode);
 
 MODULE_AUTHOR("Jamal Hadi Salim <jhs@mojatatu.com>");
-MODULE_AUTHOR("Yotam Gigi <yotamg@mellanox.com>");
+MODULE_AUTHOR("Yotam Gigi <yotam.gi@gmail.com>");
 MODULE_DESCRIPTION("Inter-FE LFB action");
 MODULE_LICENSE("GPL");
diff --git a/kernel/net/ipv4/Makefile b/kernel/net/ipv4/Makefile
index afcb435ad..c6c8ad1d4 100644
--- a/kernel/net/ipv4/Makefile
+++ b/kernel/net/ipv4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux TCP/IP (INET) layer.
 #
diff --git a/kernel/net/ipv4/fib_lookup.h b/kernel/net/ipv4/fib_lookup.h
index 5b2af19cf..e6ff282bb 100644
--- a/kernel/net/ipv4/fib_lookup.h
+++ b/kernel/net/ipv4/fib_lookup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _FIB_LOOKUP_H
 #define _FIB_LOOKUP_H
 
diff --git a/kernel/net/ipv4/fib_notifier.c b/kernel/net/ipv4/fib_notifier.c
index cfd420b05..b804ccbdb 100644
--- a/kernel/net/ipv4/fib_notifier.c
+++ b/kernel/net/ipv4/fib_notifier.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/rtnetlink.h>
 #include <linux/notifier.h>
 #include <linux/socket.h>
diff --git a/kernel/net/ipv4/fib_semantics.c b/kernel/net/ipv4/fib_semantics.c
index 57a5d48ac..01ed22139 100644
--- a/kernel/net/ipv4/fib_semantics.c
+++ b/kernel/net/ipv4/fib_semantics.c
@@ -1365,8 +1365,6 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,
 	    nla_put_in_addr(skb, RTA_PREFSRC, fi->fib_prefsrc))
 		goto nla_put_failure;
 	if (fi->fib_nhs == 1) {
-		struct in_device *in_dev;
-
 		if (fi->fib_nh->nh_gw &&
 		    nla_put_in_addr(skb, RTA_GATEWAY, fi->fib_nh->nh_gw))
 			goto nla_put_failure;
@@ -1374,10 +1372,14 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,
 		    nla_put_u32(skb, RTA_OIF, fi->fib_nh->nh_oif))
 			goto nla_put_failure;
 		if (fi->fib_nh->nh_flags & RTNH_F_LINKDOWN) {
-			in_dev = __in_dev_get_rtnl(fi->fib_nh->nh_dev);
+			struct in_device *in_dev;
+
+			rcu_read_lock();
+			in_dev = __in_dev_get_rcu(fi->fib_nh->nh_dev);
 			if (in_dev &&
 			    IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev))
 				rtm->rtm_flags |= RTNH_F_DEAD;
+			rcu_read_unlock();
 		}
 		if (fi->fib_nh->nh_flags & RTNH_F_OFFLOAD)
 			rtm->rtm_flags |= RTNH_F_OFFLOAD;
@@ -1400,18 +1402,20 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event,
 			goto nla_put_failure;
 
 		for_nexthops(fi) {
-			struct in_device *in_dev;
-
 			rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh));
 			if (!rtnh)
 				goto nla_put_failure;
 
 			rtnh->rtnh_flags = nh->nh_flags & 0xFF;
 			if (nh->nh_flags & RTNH_F_LINKDOWN) {
-				in_dev = __in_dev_get_rtnl(nh->nh_dev);
+				struct in_device *in_dev;
+
+				rcu_read_lock();
+				in_dev = __in_dev_get_rcu(nh->nh_dev);
 				if (in_dev &&
 				    IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev))
 					rtnh->rtnh_flags |= RTNH_F_DEAD;
+				rcu_read_unlock();
 			}
 			rtnh->rtnh_hops = nh->nh_weight - 1;
 			rtnh->rtnh_ifindex = nh->nh_oif;
diff --git a/kernel/net/ipv4/ip_forward.c b/kernel/net/ipv4/ip_forward.c
index 9f0a7b966..2dd21c328 100644
--- a/kernel/net/ipv4/ip_forward.c
+++ b/kernel/net/ipv4/ip_forward.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/net/ipv4/ip_fragment.c b/kernel/net/ipv4/ip_fragment.c
index 46408c220..df8fe0503 100644
--- a/kernel/net/ipv4/ip_fragment.c
+++ b/kernel/net/ipv4/ip_fragment.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/net/ipv4/ip_options.c b/kernel/net/ipv4/ip_options.c
index 525ae88d1..ed194d46c 100644
--- a/kernel/net/ipv4/ip_options.c
+++ b/kernel/net/ipv4/ip_options.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/net/ipv4/ip_sockglue.c b/kernel/net/ipv4/ip_sockglue.c
index a599aa83f..60fb1eb7d 100644
--- a/kernel/net/ipv4/ip_sockglue.c
+++ b/kernel/net/ipv4/ip_sockglue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/net/ipv4/ipconfig.c b/kernel/net/ipv4/ipconfig.c
index 4c5dfe6bd..abdebca84 100644
--- a/kernel/net/ipv4/ipconfig.c
+++ b/kernel/net/ipv4/ipconfig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Automatic Configuration of IP -- use DHCP, BOOTP, RARP, or
  *  user-supplied information to configure own IP address and routes.
diff --git a/kernel/net/ipv4/netfilter/Makefile b/kernel/net/ipv4/netfilter/Makefile
index f462fee66..adcdae358 100644
--- a/kernel/net/ipv4/netfilter/Makefile
+++ b/kernel/net/ipv4/netfilter/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the netfilter modules on top of IPv4.
 #
diff --git a/kernel/net/ipv4/netfilter/nf_reject_ipv4.c b/kernel/net/ipv4/netfilter/nf_reject_ipv4.c
index eeacbdaf7..5cd06ba35 100644
--- a/kernel/net/ipv4/netfilter/nf_reject_ipv4.c
+++ b/kernel/net/ipv4/netfilter/nf_reject_ipv4.c
@@ -132,6 +132,8 @@ void nf_send_reset(struct net *net, struct sk_buff *oldskb, int hook)
 	if (ip_route_me_harder(net, nskb, RTN_UNSPEC))
 		goto free_nskb;
 
+	niph = ip_hdr(nskb);
+
 	/* "Never happens" */
 	if (nskb->len > dst_mtu(skb_dst(nskb)))
 		goto free_nskb;
diff --git a/kernel/net/ipv4/sysctl_net_ipv4.c b/kernel/net/ipv4/sysctl_net_ipv4.c
index 0d3c038d7..0989e739d 100644
--- a/kernel/net/ipv4/sysctl_net_ipv4.c
+++ b/kernel/net/ipv4/sysctl_net_ipv4.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sysctl_net_ipv4.c: sysctl interface to net IPV4 subsystem.
  *
diff --git a/kernel/net/ipv4/tcp_fastopen.c b/kernel/net/ipv4/tcp_fastopen.c
index e3c33220c..fbbeda647 100644
--- a/kernel/net/ipv4/tcp_fastopen.c
+++ b/kernel/net/ipv4/tcp_fastopen.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/crypto.h>
 #include <linux/err.h>
 #include <linux/init.h>
diff --git a/kernel/net/ipv4/tcp_input.c b/kernel/net/ipv4/tcp_input.c
index 7eec33837..5a87a0064 100644
--- a/kernel/net/ipv4/tcp_input.c
+++ b/kernel/net/ipv4/tcp_input.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * INET		An implementation of the TCP/IP protocol suite for the LINUX
  *		operating system.  INET is implemented using the  BSD Socket
diff --git a/kernel/net/ipv4/tcp_metrics.c b/kernel/net/ipv4/tcp_metrics.c
index 102b2c90b..0f0d740f6 100644
--- a/kernel/net/ipv4/tcp_metrics.c
+++ b/kernel/net/ipv4/tcp_metrics.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/rcupdate.h>
 #include <linux/spinlock.h>
 #include <linux/jiffies.h>
diff --git a/kernel/net/ipv4/tcp_nv.c b/kernel/net/ipv4/tcp_nv.c
index 1ff73982e..125fc1450 100644
--- a/kernel/net/ipv4/tcp_nv.c
+++ b/kernel/net/ipv4/tcp_nv.c
@@ -252,7 +252,7 @@ static void tcpnv_acked(struct sock *sk, const struct ack_sample *sample)
 
 	/* rate in 100's bits per second */
 	rate64 = ((u64)sample->in_flight) * 8000000;
-	rate = (u32)div64_u64(rate64, (u64)(avg_rtt * 100));
+	rate = (u32)div64_u64(rate64, (u64)(avg_rtt ?: 1) * 100);
 
 	/* Remember the maximum rate seen during this RTT
 	 * Note: It may be more than one RTT. This function should be
diff --git a/kernel/net/ipv4/tcp_output.c b/kernel/net/ipv4/tcp_output.c
index ae60dd3fa..478909f46 100644
--- a/kernel/net/ipv4/tcp_output.c
+++ b/kernel/net/ipv4/tcp_output.c
@@ -2062,6 +2062,7 @@ static int tcp_mtu_probe(struct sock *sk)
 	nskb->ip_summed = skb->ip_summed;
 
 	tcp_insert_write_queue_before(nskb, skb, sk);
+	tcp_highest_sack_replace(sk, skb, nskb);
 
 	len = 0;
 	tcp_for_write_queue_from_safe(skb, next, sk) {
@@ -2665,7 +2666,7 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb)
 		else if (!skb_shift(skb, next_skb, next_skb_size))
 			return false;
 	}
-	tcp_highest_sack_combine(sk, next_skb, skb);
+	tcp_highest_sack_replace(sk, next_skb, skb);
 
 	tcp_unlink_write_queue(next_skb, sk);
 
@@ -3179,13 +3180,8 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,
 	th->source = htons(ireq->ir_num);
 	th->dest = ireq->ir_rmt_port;
 	skb->mark = ireq->ir_mark;
-	/* Setting of flags are superfluous here for callers (and ECE is
-	 * not even correctly set)
-	 */
-	tcp_init_nondata_skb(skb, tcp_rsk(req)->snt_isn,
-			     TCPHDR_SYN | TCPHDR_ACK);
-
-	th->seq = htonl(TCP_SKB_CB(skb)->seq);
+	skb->ip_summed = CHECKSUM_PARTIAL;
+	th->seq = htonl(tcp_rsk(req)->snt_isn);
 	/* XXX data is queued and acked as is. No buffer/window check */
 	th->ack_seq = htonl(tcp_rsk(req)->rcv_nxt);
 
diff --git a/kernel/net/ipv4/tcp_recovery.c b/kernel/net/ipv4/tcp_recovery.c
index 449cd914d..be8ef1e5d 100644
--- a/kernel/net/ipv4/tcp_recovery.c
+++ b/kernel/net/ipv4/tcp_recovery.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/tcp.h>
 #include <net/tcp.h>
 
diff --git a/kernel/net/ipv4/tcp_vegas.h b/kernel/net/ipv4/tcp_vegas.h
index 248cfc0ff..4f24d0e37 100644
--- a/kernel/net/ipv4/tcp_vegas.h
+++ b/kernel/net/ipv4/tcp_vegas.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * TCP Vegas congestion control interface
  */
diff --git a/kernel/net/ipv4/udp_impl.h b/kernel/net/ipv4/udp_impl.h
index a8cf8c6fb..e7d18b140 100644
--- a/kernel/net/ipv4/udp_impl.h
+++ b/kernel/net/ipv4/udp_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UDP4_IMPL_H
 #define _UDP4_IMPL_H
 #include <net/udp.h>
diff --git a/kernel/net/ipv4/xfrm4_input.c b/kernel/net/ipv4/xfrm4_input.c
index 1fc684111..e50b7fea5 100644
--- a/kernel/net/ipv4/xfrm4_input.c
+++ b/kernel/net/ipv4/xfrm4_input.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm4_input.c
  *
diff --git a/kernel/net/ipv4/xfrm4_policy.c b/kernel/net/ipv4/xfrm4_policy.c
index d7bf0b041..05017e2c8 100644
--- a/kernel/net/ipv4/xfrm4_policy.c
+++ b/kernel/net/ipv4/xfrm4_policy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm4_policy.c
  *
diff --git a/kernel/net/ipv4/xfrm4_state.c b/kernel/net/ipv4/xfrm4_state.c
index d6660a8c0..80c40b498 100644
--- a/kernel/net/ipv4/xfrm4_state.c
+++ b/kernel/net/ipv4/xfrm4_state.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm4_state.c
  *
diff --git a/kernel/net/ipv6/Makefile b/kernel/net/ipv6/Makefile
index 10e342363..e0026fa12 100644
--- a/kernel/net/ipv6/Makefile
+++ b/kernel/net/ipv6/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux TCP/IP (INET6) layer.
 #
diff --git a/kernel/net/ipv6/addrconf.c b/kernel/net/ipv6/addrconf.c
index 4a96ebbf8..8a1c846d3 100644
--- a/kernel/net/ipv6/addrconf.c
+++ b/kernel/net/ipv6/addrconf.c
@@ -3335,6 +3335,7 @@ static void addrconf_permanent_addr(struct net_device *dev)
 		if ((ifp->flags & IFA_F_PERMANENT) &&
 		    fixup_permanent_addr(idev, ifp) < 0) {
 			write_unlock_bh(&idev->lock);
+			in6_ifa_hold(ifp);
 			ipv6_del_addr(ifp);
 			write_lock_bh(&idev->lock);
 
diff --git a/kernel/net/ipv6/addrlabel.c b/kernel/net/ipv6/addrlabel.c
index b055bc79f..f664871fe 100644
--- a/kernel/net/ipv6/addrlabel.c
+++ b/kernel/net/ipv6/addrlabel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IPv6 Address Label subsystem
  * for the IPv6 "Default" Source Address Selection
diff --git a/kernel/net/ipv6/ila/ila_lwt.c b/kernel/net/ipv6/ila/ila_lwt.c
index 0c02a09bc..696281b4b 100644
--- a/kernel/net/ipv6/ila/ila_lwt.c
+++ b/kernel/net/ipv6/ila/ila_lwt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/errno.h>
 #include <linux/ip.h>
 #include <linux/kernel.h>
diff --git a/kernel/net/ipv6/ila/ila_xlat.c b/kernel/net/ipv6/ila/ila_xlat.c
index 5bd419c1a..3123b9de9 100644
--- a/kernel/net/ipv6/ila/ila_xlat.c
+++ b/kernel/net/ipv6/ila/ila_xlat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/jhash.h>
 #include <linux/netfilter.h>
 #include <linux/rcupdate.h>
diff --git a/kernel/net/ipv6/ip6_checksum.c b/kernel/net/ipv6/ip6_checksum.c
index c0cbcb259..ec43d18b5 100644
--- a/kernel/net/ipv6/ip6_checksum.c
+++ b/kernel/net/ipv6/ip6_checksum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <net/ip.h>
 #include <net/udp.h>
 #include <net/udplite.h>
diff --git a/kernel/net/ipv6/ip6_icmp.c b/kernel/net/ipv6/ip6_icmp.c
index 713676f14..02045494c 100644
--- a/kernel/net/ipv6/ip6_icmp.c
+++ b/kernel/net/ipv6/ip6_icmp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/export.h>
 #include <linux/icmpv6.h>
 #include <linux/mutex.h>
diff --git a/kernel/net/ipv6/netfilter/Makefile b/kernel/net/ipv6/netfilter/Makefile
index fe180c960..c6ee0cdd0 100644
--- a/kernel/net/ipv6/netfilter/Makefile
+++ b/kernel/net/ipv6/netfilter/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the netfilter modules on top of IPv6.
 #
diff --git a/kernel/net/ipv6/sysctl_net_ipv6.c b/kernel/net/ipv6/sysctl_net_ipv6.c
index 6fbf8ae5e..f7051ba5b 100644
--- a/kernel/net/ipv6/sysctl_net_ipv6.c
+++ b/kernel/net/ipv6/sysctl_net_ipv6.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sysctl_net_ipv6.c: sysctl interface to net IPV6 subsystem.
  *
diff --git a/kernel/net/ipv6/udp_impl.h b/kernel/net/ipv6/udp_impl.h
index f180b3d85..7903e21c1 100644
--- a/kernel/net/ipv6/udp_impl.h
+++ b/kernel/net/ipv6/udp_impl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UDP6_IMPL_H
 #define _UDP6_IMPL_H
 #include <net/udp.h>
diff --git a/kernel/net/ipv6/xfrm6_input.c b/kernel/net/ipv6/xfrm6_input.c
index f95943a13..fe04e23af 100644
--- a/kernel/net/ipv6/xfrm6_input.c
+++ b/kernel/net/ipv6/xfrm6_input.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm6_input.c: based on net/ipv4/xfrm4_input.c
  *
diff --git a/kernel/net/ipv6/xfrm6_policy.c b/kernel/net/ipv6/xfrm6_policy.c
index 11d1314ab..17e95a038 100644
--- a/kernel/net/ipv6/xfrm6_policy.c
+++ b/kernel/net/ipv6/xfrm6_policy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm6_policy.c: based on xfrm4_policy.c
  *
diff --git a/kernel/net/ipv6/xfrm6_state.c b/kernel/net/ipv6/xfrm6_state.c
index 8a1f9c0d2..b15075a5c 100644
--- a/kernel/net/ipv6/xfrm6_state.c
+++ b/kernel/net/ipv6/xfrm6_state.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm6_state.c: based on xfrm4_state.c
  *
diff --git a/kernel/net/ipx/ipx_proc.c b/kernel/net/ipx/ipx_proc.c
index 7d75e4c5c..38a3d51d9 100644
--- a/kernel/net/ipx/ipx_proc.c
+++ b/kernel/net/ipx/ipx_proc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	IPX proc routines
  *
diff --git a/kernel/net/ipx/ipx_route.c b/kernel/net/ipx/ipx_route.c
index b5d91447f..3cf93aa9f 100644
--- a/kernel/net/ipx/ipx_route.c
+++ b/kernel/net/ipx/ipx_route.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *	Implements the IPX routing routines.
  *	Code moved from af_ipx.c.
diff --git a/kernel/net/ipx/pe2.c b/kernel/net/ipx/pe2.c
index 32dcd601a..ba7d4214b 100644
--- a/kernel/net/ipx/pe2.c
+++ b/kernel/net/ipx/pe2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/in.h>
 #include <linux/mm.h>
 #include <linux/module.h>
diff --git a/kernel/net/ipx/sysctl_net_ipx.c b/kernel/net/ipx/sysctl_net_ipx.c
index 0dafcc561..c3eef457d 100644
--- a/kernel/net/ipx/sysctl_net_ipx.c
+++ b/kernel/net/ipx/sysctl_net_ipx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* -*- linux-c -*-
  * sysctl_net_ipx.c: sysctl interface to net IPX subsystem.
  *
diff --git a/kernel/net/kcm/kcmproc.c b/kernel/net/kcm/kcmproc.c
index c748e8a6a..bd5723315 100644
--- a/kernel/net/kcm/kcmproc.c
+++ b/kernel/net/kcm/kcmproc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/in.h>
 #include <linux/inet.h>
 #include <linux/list.h>
diff --git a/kernel/net/l2tp/Makefile b/kernel/net/l2tp/Makefile
index 2870f41ea..399a7e5db 100644
--- a/kernel/net/l2tp/Makefile
+++ b/kernel/net/l2tp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the L2TP.
 #
diff --git a/kernel/net/l2tp/l2tp_ppp.c b/kernel/net/l2tp/l2tp_ppp.c
index f50452b91..0c2738349 100644
--- a/kernel/net/l2tp/l2tp_ppp.c
+++ b/kernel/net/l2tp/l2tp_ppp.c
@@ -584,6 +584,7 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
 	u32 tunnel_id, peer_tunnel_id;
 	u32 session_id, peer_session_id;
 	bool drop_refcnt = false;
+	bool drop_tunnel = false;
 	int ver = 2;
 	int fd;
 
@@ -652,7 +653,9 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
 	if (tunnel_id == 0)
 		goto end;
 
-	tunnel = l2tp_tunnel_find(sock_net(sk), tunnel_id);
+	tunnel = l2tp_tunnel_get(sock_net(sk), tunnel_id);
+	if (tunnel)
+		drop_tunnel = true;
 
 	/* Special case: create tunnel context if session_id and
 	 * peer_session_id is 0. Otherwise look up tunnel using supplied
@@ -781,6 +784,8 @@ out_no_ppp:
 end:
 	if (drop_refcnt)
 		l2tp_session_dec_refcount(session);
+	if (drop_tunnel)
+		l2tp_tunnel_dec_refcount(tunnel);
 	release_sock(sk);
 
 	return error;
diff --git a/kernel/net/llc/sysctl_net_llc.c b/kernel/net/llc/sysctl_net_llc.c
index 799bafc2a..8443a6d84 100644
--- a/kernel/net/llc/sysctl_net_llc.c
+++ b/kernel/net/llc/sysctl_net_llc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sysctl_net_llc.c: sysctl interface to LLC net subsystem.
  *
diff --git a/kernel/net/mac80211/Makefile b/kernel/net/mac80211/Makefile
index 282912245..80bfe2909 100644
--- a/kernel/net/mac80211/Makefile
+++ b/kernel/net/mac80211/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_MAC80211) += mac80211.o
 
 # mac80211 objects
diff --git a/kernel/net/mac80211/debug.h b/kernel/net/mac80211/debug.h
index 1956b3115..d90a8f9cc 100644
--- a/kernel/net/mac80211/debug.h
+++ b/kernel/net/mac80211/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MAC80211_DEBUG_H
 #define __MAC80211_DEBUG_H
 #include <net/cfg80211.h>
diff --git a/kernel/net/mac80211/debugfs.h b/kernel/net/mac80211/debugfs.h
index 60c35afee..d2c424787 100644
--- a/kernel/net/mac80211/debugfs.h
+++ b/kernel/net/mac80211/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MAC80211_DEBUGFS_H
 #define __MAC80211_DEBUGFS_H
 
diff --git a/kernel/net/mac80211/debugfs_key.h b/kernel/net/mac80211/debugfs_key.h
index 32adc77e9..1cd7b8bff 100644
--- a/kernel/net/mac80211/debugfs_key.h
+++ b/kernel/net/mac80211/debugfs_key.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MAC80211_DEBUGFS_KEY_H
 #define __MAC80211_DEBUGFS_KEY_H
 
diff --git a/kernel/net/mac80211/debugfs_netdev.h b/kernel/net/mac80211/debugfs_netdev.h
index 9f5501a9a..a7e9d8d51 100644
--- a/kernel/net/mac80211/debugfs_netdev.h
+++ b/kernel/net/mac80211/debugfs_netdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* routines exported for debugfs handling */
 
 #ifndef __IEEE80211_DEBUGFS_NETDEV_H
diff --git a/kernel/net/mac80211/debugfs_sta.h b/kernel/net/mac80211/debugfs_sta.h
index 8b6089032..d2e7c27ad 100644
--- a/kernel/net/mac80211/debugfs_sta.h
+++ b/kernel/net/mac80211/debugfs_sta.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MAC80211_DEBUGFS_STA_H
 #define __MAC80211_DEBUGFS_STA_H
 
diff --git a/kernel/net/mac80211/driver-ops.h b/kernel/net/mac80211/driver-ops.h
index 09f77e4a8..c7f93fd9c 100644
--- a/kernel/net/mac80211/driver-ops.h
+++ b/kernel/net/mac80211/driver-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Portions of this file
 * Copyright(c) 2016 Intel Deutschland GmbH
diff --git a/kernel/net/mac80211/pm.c b/kernel/net/mac80211/pm.c
index a87d195c4..38c45e1da 100644
--- a/kernel/net/mac80211/pm.c
+++ b/kernel/net/mac80211/pm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <net/mac80211.h>
 #include <net/rtnetlink.h>
 
diff --git a/kernel/net/mac80211/trace.c b/kernel/net/mac80211/trace.c
index edfe0c170..837857261 100644
--- a/kernel/net/mac80211/trace.c
+++ b/kernel/net/mac80211/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* bug in tracepoint.h, it should include this */
 #include <linux/module.h>
 
diff --git a/kernel/net/mac80211/trace.h b/kernel/net/mac80211/trace.h
index 3d9ac17af..591ad02e1 100644
--- a/kernel/net/mac80211/trace.h
+++ b/kernel/net/mac80211/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Portions of this file
 * Copyright(c) 2016 Intel Deutschland GmbH
diff --git a/kernel/net/mac80211/trace_msg.h b/kernel/net/mac80211/trace_msg.h
index 768f7c22a..366b9e6f0 100644
--- a/kernel/net/mac80211/trace_msg.h
+++ b/kernel/net/mac80211/trace_msg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef CONFIG_MAC80211_MESSAGE_TRACING
 
 #if !defined(__MAC80211_MSG_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ)
diff --git a/kernel/net/mac802154/cfg.h b/kernel/net/mac802154/cfg.h
index e2718f981..3bb089685 100644
--- a/kernel/net/mac802154/cfg.h
+++ b/kernel/net/mac802154/cfg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* mac802154 configuration hooks for cfg802154
  */
 
diff --git a/kernel/net/mac802154/driver-ops.h b/kernel/net/mac802154/driver-ops.h
index fd9daf2ec..d23f0db98 100644
--- a/kernel/net/mac802154/driver-ops.h
+++ b/kernel/net/mac802154/driver-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __MAC802154_DRIVER_OPS
 #define __MAC802154_DRIVER_OPS
 
diff --git a/kernel/net/mac802154/trace.c b/kernel/net/mac802154/trace.c
index 863e5e6b9..c36e3d541 100644
--- a/kernel/net/mac802154/trace.c
+++ b/kernel/net/mac802154/trace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/module.h>
 
 #ifndef __CHECKER__
diff --git a/kernel/net/mac802154/trace.h b/kernel/net/mac802154/trace.h
index 6f30e0c93..2c8a43d36 100644
--- a/kernel/net/mac802154/trace.h
+++ b/kernel/net/mac802154/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Based on net/mac80211/trace.h */
 
 #undef TRACE_SYSTEM
diff --git a/kernel/net/mpls/internal.h b/kernel/net/mpls/internal.h
index cf65aec2e..768a30287 100644
--- a/kernel/net/mpls/internal.h
+++ b/kernel/net/mpls/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef MPLS_INTERNAL_H
 #define MPLS_INTERNAL_H
 #include <net/mpls.h>
diff --git a/kernel/net/netfilter/Makefile b/kernel/net/netfilter/Makefile
index d3891c93e..f78ed2470 100644
--- a/kernel/net/netfilter/Makefile
+++ b/kernel/net/netfilter/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 netfilter-objs := core.o nf_log.o nf_queue.o nf_sockopt.o
 
 nf_conntrack-y	:= nf_conntrack_core.o nf_conntrack_standalone.o nf_conntrack_expect.o nf_conntrack_helper.o nf_conntrack_proto.o nf_conntrack_l3proto_generic.o nf_conntrack_proto_generic.o nf_conntrack_proto_tcp.o nf_conntrack_proto_udp.o nf_conntrack_extend.o nf_conntrack_acct.o nf_conntrack_seqadj.o
diff --git a/kernel/net/netfilter/ipset/Makefile b/kernel/net/netfilter/ipset/Makefile
index 28ec148df..a445a6bf4 100644
--- a/kernel/net/netfilter/ipset/Makefile
+++ b/kernel/net/netfilter/ipset/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the ipset modules
 #
diff --git a/kernel/net/netfilter/ipvs/Makefile b/kernel/net/netfilter/ipvs/Makefile
index 67f3f4389..c552993fa 100644
--- a/kernel/net/netfilter/ipvs/Makefile
+++ b/kernel/net/netfilter/ipvs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the IPVS modules on top of IPv4.
 #
diff --git a/kernel/net/netfilter/ipvs/ip_vs_proto_sctp.c b/kernel/net/netfilter/ipvs/ip_vs_proto_sctp.c
index 57c8ee664..eff756982 100644
--- a/kernel/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/kernel/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/ip.h>
 #include <linux/sctp.h>
diff --git a/kernel/net/netfilter/ipvs/ip_vs_sync.c b/kernel/net/netfilter/ipvs/ip_vs_sync.c
index 0e5b64a75..13f740875 100644
--- a/kernel/net/netfilter/ipvs/ip_vs_sync.c
+++ b/kernel/net/netfilter/ipvs/ip_vs_sync.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * IPVS         An implementation of the IP virtual server support for the
  *              LINUX operating system.  IPVS is now implemented as a module
diff --git a/kernel/net/netfilter/nf_internals.h b/kernel/net/netfilter/nf_internals.h
index 49f87ec09..44284cd25 100644
--- a/kernel/net/netfilter/nf_internals.h
+++ b/kernel/net/netfilter/nf_internals.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _NF_INTERNALS_H
 #define _NF_INTERNALS_H
 
diff --git a/kernel/net/netfilter/nf_sockopt.c b/kernel/net/netfilter/nf_sockopt.c
index d2a9e6b5d..46cb3786e 100644
--- a/kernel/net/netfilter/nf_sockopt.c
+++ b/kernel/net/netfilter/nf_sockopt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
diff --git a/kernel/net/netfilter/nft_set_hash.c b/kernel/net/netfilter/nft_set_hash.c
index 0fa01d772..9c0d5a7ce 100644
--- a/kernel/net/netfilter/nft_set_hash.c
+++ b/kernel/net/netfilter/nft_set_hash.c
@@ -643,7 +643,6 @@ nft_hash_select_ops(const struct nft_ctx *ctx, const struct nft_set_desc *desc,
 {
 	if (desc->size) {
 		switch (desc->klen) {
-		case 2:
 		case 4:
 			return &nft_hash_fast_ops;
 		default:
diff --git a/kernel/net/netfilter/xt_repldata.h b/kernel/net/netfilter/xt_repldata.h
index 8fd324116..68ccbe50b 100644
--- a/kernel/net/netfilter/xt_repldata.h
+++ b/kernel/net/netfilter/xt_repldata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Today's hack: quantum tunneling in structs
  *
diff --git a/kernel/net/netlabel/Makefile b/kernel/net/netlabel/Makefile
index d341ede0d..5a46381a6 100644
--- a/kernel/net/netlabel/Makefile
+++ b/kernel/net/netlabel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the NetLabel subsystem.
 #
diff --git a/kernel/net/netlink/af_netlink.h b/kernel/net/netlink/af_netlink.h
index 3490f2430..028188597 100644
--- a/kernel/net/netlink/af_netlink.h
+++ b/kernel/net/netlink/af_netlink.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _AF_NETLINK_H
 #define _AF_NETLINK_H
 
diff --git a/kernel/net/netlink/genetlink.c b/kernel/net/netlink/genetlink.c
index 10f8b4cff..d444daf1a 100644
--- a/kernel/net/netlink/genetlink.c
+++ b/kernel/net/netlink/genetlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * NETLINK      Generic Netlink Family
  *
diff --git a/kernel/net/nfc/Makefile b/kernel/net/nfc/Makefile
index 2555ff8e7..2ffc69b47 100644
--- a/kernel/net/nfc/Makefile
+++ b/kernel/net/nfc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux NFC subsystem.
 #
diff --git a/kernel/net/nfc/nci/Makefile b/kernel/net/nfc/nci/Makefile
index 0ca31d9bf..c3362c499 100644
--- a/kernel/net/nfc/nci/Makefile
+++ b/kernel/net/nfc/nci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux NFC NCI layer.
 #
diff --git a/kernel/net/openvswitch/Makefile b/kernel/net/openvswitch/Makefile
index 60f809085..299f4476c 100644
--- a/kernel/net/openvswitch/Makefile
+++ b/kernel/net/openvswitch/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Open vSwitch.
 #
diff --git a/kernel/net/packet/internal.h b/kernel/net/packet/internal.h
index 94d1d405a..562fbc155 100644
--- a/kernel/net/packet/internal.h
+++ b/kernel/net/packet/internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PACKET_INTERNAL_H__
 #define __PACKET_INTERNAL_H__
 
diff --git a/kernel/net/phonet/Makefile b/kernel/net/phonet/Makefile
index e10b1b182..444f87593 100644
--- a/kernel/net/phonet/Makefile
+++ b/kernel/net/phonet/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_PHONET) += phonet.o pn_pep.o
 
 phonet-y := \
diff --git a/kernel/net/psample/psample.c b/kernel/net/psample/psample.c
index 3a6ad0f43..64f95624f 100644
--- a/kernel/net/psample/psample.c
+++ b/kernel/net/psample/psample.c
@@ -296,6 +296,6 @@ static void __exit psample_module_exit(void)
 module_init(psample_module_init);
 module_exit(psample_module_exit);
 
-MODULE_AUTHOR("Yotam Gigi <yotamg@mellanox.com>");
+MODULE_AUTHOR("Yotam Gigi <yotam.gi@gmail.com>");
 MODULE_DESCRIPTION("netlink channel for packet sampling");
 MODULE_LICENSE("GPL v2");
diff --git a/kernel/net/qrtr/qrtr.h b/kernel/net/qrtr/qrtr.h
index 2b848718f..b81e6953c 100644
--- a/kernel/net/qrtr/qrtr.h
+++ b/kernel/net/qrtr/qrtr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __QRTR_H_
 #define __QRTR_H_
 
diff --git a/kernel/net/rds/Makefile b/kernel/net/rds/Makefile
index 56c7d27ee..b5d568bd4 100644
--- a/kernel/net/rds/Makefile
+++ b/kernel/net/rds/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_RDS) += rds.o
 rds-y :=	af_rds.o bind.o cong.o connection.o info.o message.o   \
 			recv.o send.o stats.o sysctl.o threads.o transport.o \
diff --git a/kernel/net/rds/ib.h b/kernel/net/rds/ib.h
index bf4822407..86a8578d9 100644
--- a/kernel/net/rds/ib.h
+++ b/kernel/net/rds/ib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDS_IB_H
 #define _RDS_IB_H
 
diff --git a/kernel/net/rds/info.h b/kernel/net/rds/info.h
index b6c052ca7..a069b51c4 100644
--- a/kernel/net/rds/info.h
+++ b/kernel/net/rds/info.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDS_INFO_H
 #define _RDS_INFO_H
 
diff --git a/kernel/net/rds/loop.h b/kernel/net/rds/loop.h
index f32b0939a..469fa4b2d 100644
--- a/kernel/net/rds/loop.h
+++ b/kernel/net/rds/loop.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDS_LOOP_H
 #define _RDS_LOOP_H
 
diff --git a/kernel/net/rds/rdma_transport.h b/kernel/net/rds/rdma_transport.h
index ff2010e9d..d309c4430 100644
--- a/kernel/net/rds/rdma_transport.h
+++ b/kernel/net/rds/rdma_transport.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDMA_TRANSPORT_H
 #define _RDMA_TRANSPORT_H
 
diff --git a/kernel/net/rds/rds.h b/kernel/net/rds/rds.h
index 2e0315b15..c349c71ba 100644
--- a/kernel/net/rds/rds.h
+++ b/kernel/net/rds/rds.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDS_RDS_H
 #define _RDS_RDS_H
 
diff --git a/kernel/net/rds/rds_single_path.h b/kernel/net/rds/rds_single_path.h
index e1241af7c..9521f6e99 100644
--- a/kernel/net/rds/rds_single_path.h
+++ b/kernel/net/rds/rds_single_path.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDS_RDS_SINGLE_H
 #define _RDS_RDS_SINGLE_H
 
diff --git a/kernel/net/rds/tcp.h b/kernel/net/rds/tcp.h
index f8800b7ce..1aafbf7c3 100644
--- a/kernel/net/rds/tcp.h
+++ b/kernel/net/rds/tcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RDS_TCP_H
 #define _RDS_TCP_H
 
diff --git a/kernel/net/rxrpc/Makefile b/kernel/net/rxrpc/Makefile
index 9c68d2f8b..6ffb7e988 100644
--- a/kernel/net/rxrpc/Makefile
+++ b/kernel/net/rxrpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Linux kernel RxRPC
 #
diff --git a/kernel/net/sched/Makefile b/kernel/net/sched/Makefile
index 7b915d226..9e43a4721 100644
--- a/kernel/net/sched/Makefile
+++ b/kernel/net/sched/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux Traffic Control Unit.
 #
diff --git a/kernel/net/sched/act_api.c b/kernel/net/sched/act_api.c
index da6fa82c9..ca2ff0b31 100644
--- a/kernel/net/sched/act_api.c
+++ b/kernel/net/sched/act_api.c
@@ -78,6 +78,7 @@ static void tcf_idr_remove(struct tcf_idrinfo *idrinfo, struct tc_action *p)
 	spin_lock_bh(&idrinfo->lock);
 	idr_remove_ext(&idrinfo->action_idr, p->tcfa_index);
 	spin_unlock_bh(&idrinfo->lock);
+	put_net(idrinfo->net);
 	gen_kill_estimator(&p->tcfa_rate_est);
 	free_tcf(p);
 }
@@ -86,6 +87,8 @@ int __tcf_idr_release(struct tc_action *p, bool bind, bool strict)
 {
 	int ret = 0;
 
+	ASSERT_RTNL();
+
 	if (p) {
 		if (bind)
 			p->tcfa_bindcnt--;
@@ -334,6 +337,7 @@ err3:
 	p->idrinfo = idrinfo;
 	p->ops = ops;
 	INIT_LIST_HEAD(&p->list);
+	get_net(idrinfo->net);
 	*a = p;
 	return 0;
 }
diff --git a/kernel/net/sched/act_bpf.c b/kernel/net/sched/act_bpf.c
index c0c707eb2..9bce8cc84 100644
--- a/kernel/net/sched/act_bpf.c
+++ b/kernel/net/sched/act_bpf.c
@@ -398,7 +398,7 @@ static __net_init int bpf_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, bpf_net_id);
 
-	return tc_action_net_init(tn, &act_bpf_ops);
+	return tc_action_net_init(tn, &act_bpf_ops, net);
 }
 
 static void __net_exit bpf_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_connmark.c b/kernel/net/sched/act_connmark.c
index 10b7a8855..34e52d01a 100644
--- a/kernel/net/sched/act_connmark.c
+++ b/kernel/net/sched/act_connmark.c
@@ -206,7 +206,7 @@ static __net_init int connmark_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, connmark_net_id);
 
-	return tc_action_net_init(tn, &act_connmark_ops);
+	return tc_action_net_init(tn, &act_connmark_ops, net);
 }
 
 static void __net_exit connmark_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_csum.c b/kernel/net/sched/act_csum.c
index 1c40caadc..35171df2e 100644
--- a/kernel/net/sched/act_csum.c
+++ b/kernel/net/sched/act_csum.c
@@ -626,7 +626,7 @@ static __net_init int csum_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, csum_net_id);
 
-	return tc_action_net_init(tn, &act_csum_ops);
+	return tc_action_net_init(tn, &act_csum_ops, net);
 }
 
 static void __net_exit csum_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_gact.c b/kernel/net/sched/act_gact.c
index e29a48ef7..ef7f7f39d 100644
--- a/kernel/net/sched/act_gact.c
+++ b/kernel/net/sched/act_gact.c
@@ -232,7 +232,7 @@ static __net_init int gact_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, gact_net_id);
 
-	return tc_action_net_init(tn, &act_gact_ops);
+	return tc_action_net_init(tn, &act_gact_ops, net);
 }
 
 static void __net_exit gact_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_ife.c b/kernel/net/sched/act_ife.c
index 8ccd35825..f65e4b505 100644
--- a/kernel/net/sched/act_ife.c
+++ b/kernel/net/sched/act_ife.c
@@ -818,7 +818,7 @@ static __net_init int ife_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, ife_net_id);
 
-	return tc_action_net_init(tn, &act_ife_ops);
+	return tc_action_net_init(tn, &act_ife_ops, net);
 }
 
 static void __net_exit ife_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_ipt.c b/kernel/net/sched/act_ipt.c
index d9e399a7e..dbdf3b247 100644
--- a/kernel/net/sched/act_ipt.c
+++ b/kernel/net/sched/act_ipt.c
@@ -334,7 +334,7 @@ static __net_init int ipt_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, ipt_net_id);
 
-	return tc_action_net_init(tn, &act_ipt_ops);
+	return tc_action_net_init(tn, &act_ipt_ops, net);
 }
 
 static void __net_exit ipt_exit_net(struct net *net)
@@ -384,7 +384,7 @@ static __net_init int xt_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, xt_net_id);
 
-	return tc_action_net_init(tn, &act_xt_ops);
+	return tc_action_net_init(tn, &act_xt_ops, net);
 }
 
 static void __net_exit xt_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_mirred.c b/kernel/net/sched/act_mirred.c
index 416627c66..84759cfd5 100644
--- a/kernel/net/sched/act_mirred.c
+++ b/kernel/net/sched/act_mirred.c
@@ -343,7 +343,7 @@ static __net_init int mirred_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, mirred_net_id);
 
-	return tc_action_net_init(tn, &act_mirred_ops);
+	return tc_action_net_init(tn, &act_mirred_ops, net);
 }
 
 static void __net_exit mirred_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_nat.c b/kernel/net/sched/act_nat.c
index c365d01b9..7eeaaf921 100644
--- a/kernel/net/sched/act_nat.c
+++ b/kernel/net/sched/act_nat.c
@@ -307,7 +307,7 @@ static __net_init int nat_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, nat_net_id);
 
-	return tc_action_net_init(tn, &act_nat_ops);
+	return tc_action_net_init(tn, &act_nat_ops, net);
 }
 
 static void __net_exit nat_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_pedit.c b/kernel/net/sched/act_pedit.c
index 491fe5deb..b3d82c334 100644
--- a/kernel/net/sched/act_pedit.c
+++ b/kernel/net/sched/act_pedit.c
@@ -450,7 +450,7 @@ static __net_init int pedit_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, pedit_net_id);
 
-	return tc_action_net_init(tn, &act_pedit_ops);
+	return tc_action_net_init(tn, &act_pedit_ops, net);
 }
 
 static void __net_exit pedit_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_police.c b/kernel/net/sched/act_police.c
index 3bb2ebf9e..9ec42b26e 100644
--- a/kernel/net/sched/act_police.c
+++ b/kernel/net/sched/act_police.c
@@ -331,7 +331,7 @@ static __net_init int police_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, police_net_id);
 
-	return tc_action_net_init(tn, &act_police_ops);
+	return tc_action_net_init(tn, &act_police_ops, net);
 }
 
 static void __net_exit police_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_sample.c b/kernel/net/sched/act_sample.c
index a9f9a2ccc..e69a1e3a3 100644
--- a/kernel/net/sched/act_sample.c
+++ b/kernel/net/sched/act_sample.c
@@ -240,7 +240,7 @@ static __net_init int sample_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, sample_net_id);
 
-	return tc_action_net_init(tn, &act_sample_ops);
+	return tc_action_net_init(tn, &act_sample_ops, net);
 }
 
 static void __net_exit sample_exit_net(struct net *net)
@@ -271,6 +271,6 @@ static void __exit sample_cleanup_module(void)
 module_init(sample_init_module);
 module_exit(sample_cleanup_module);
 
-MODULE_AUTHOR("Yotam Gigi <yotamg@mellanox.com>");
+MODULE_AUTHOR("Yotam Gigi <yotam.gi@gmail.com>");
 MODULE_DESCRIPTION("Packet sampling action");
 MODULE_LICENSE("GPL v2");
diff --git a/kernel/net/sched/act_simple.c b/kernel/net/sched/act_simple.c
index e7b57e507..a8d0ea95f 100644
--- a/kernel/net/sched/act_simple.c
+++ b/kernel/net/sched/act_simple.c
@@ -201,7 +201,7 @@ static __net_init int simp_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, simp_net_id);
 
-	return tc_action_net_init(tn, &act_simp_ops);
+	return tc_action_net_init(tn, &act_simp_ops, net);
 }
 
 static void __net_exit simp_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_skbedit.c b/kernel/net/sched/act_skbedit.c
index 59949d61f..fbac62472 100644
--- a/kernel/net/sched/act_skbedit.c
+++ b/kernel/net/sched/act_skbedit.c
@@ -238,7 +238,7 @@ static __net_init int skbedit_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, skbedit_net_id);
 
-	return tc_action_net_init(tn, &act_skbedit_ops);
+	return tc_action_net_init(tn, &act_skbedit_ops, net);
 }
 
 static void __net_exit skbedit_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_skbmod.c b/kernel/net/sched/act_skbmod.c
index b642ad3d3..8e12d8897 100644
--- a/kernel/net/sched/act_skbmod.c
+++ b/kernel/net/sched/act_skbmod.c
@@ -263,7 +263,7 @@ static __net_init int skbmod_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, skbmod_net_id);
 
-	return tc_action_net_init(tn, &act_skbmod_ops);
+	return tc_action_net_init(tn, &act_skbmod_ops, net);
 }
 
 static void __net_exit skbmod_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_tunnel_key.c b/kernel/net/sched/act_tunnel_key.c
index 30c96274c..c33faa373 100644
--- a/kernel/net/sched/act_tunnel_key.c
+++ b/kernel/net/sched/act_tunnel_key.c
@@ -322,7 +322,7 @@ static __net_init int tunnel_key_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, tunnel_key_net_id);
 
-	return tc_action_net_init(tn, &act_tunnel_key_ops);
+	return tc_action_net_init(tn, &act_tunnel_key_ops, net);
 }
 
 static void __net_exit tunnel_key_exit_net(struct net *net)
diff --git a/kernel/net/sched/act_vlan.c b/kernel/net/sched/act_vlan.c
index 16eb067a8..115fc33cc 100644
--- a/kernel/net/sched/act_vlan.c
+++ b/kernel/net/sched/act_vlan.c
@@ -269,7 +269,7 @@ static __net_init int vlan_init_net(struct net *net)
 {
 	struct tc_action_net *tn = net_generic(net, vlan_net_id);
 
-	return tc_action_net_init(tn, &act_vlan_ops);
+	return tc_action_net_init(tn, &act_vlan_ops, net);
 }
 
 static void __net_exit vlan_exit_net(struct net *net)
diff --git a/kernel/net/sched/cls_api.c b/kernel/net/sched/cls_api.c
index 231181c60..b2d310745 100644
--- a/kernel/net/sched/cls_api.c
+++ b/kernel/net/sched/cls_api.c
@@ -280,8 +280,8 @@ static void tcf_block_put_final(struct work_struct *work)
 	struct tcf_block *block = container_of(work, struct tcf_block, work);
 	struct tcf_chain *chain, *tmp;
 
-	/* At this point, all the chains should have refcnt == 1. */
 	rtnl_lock();
+	/* Only chain 0 should be still here. */
 	list_for_each_entry_safe(chain, tmp, &block->chain_list, list)
 		tcf_chain_put(chain);
 	rtnl_unlock();
@@ -289,23 +289,17 @@ static void tcf_block_put_final(struct work_struct *work)
 }
 
 /* XXX: Standalone actions are not allowed to jump to any chain, and bound
- * actions should be all removed after flushing. However, filters are destroyed
- * in RCU callbacks, we have to hold the chains first, otherwise we would
- * always race with RCU callbacks on this list without proper locking.
+ * actions should be all removed after flushing. However, filters are now
+ * destroyed in tc filter workqueue with RTNL lock, they can not race here.
  */
-static void tcf_block_put_deferred(struct work_struct *work)
+void tcf_block_put(struct tcf_block *block)
 {
-	struct tcf_block *block = container_of(work, struct tcf_block, work);
-	struct tcf_chain *chain;
+	struct tcf_chain *chain, *tmp;
 
-	rtnl_lock();
-	/* Hold a refcnt for all chains, except 0, in case they are gone. */
-	list_for_each_entry(chain, &block->chain_list, list)
-		if (chain->index)
-			tcf_chain_hold(chain);
+	if (!block)
+		return;
 
-	/* No race on the list, because no chain could be destroyed. */
-	list_for_each_entry(chain, &block->chain_list, list)
+	list_for_each_entry_safe(chain, tmp, &block->chain_list, list)
 		tcf_chain_flush(chain);
 
 	INIT_WORK(&block->work, tcf_block_put_final);
@@ -314,21 +308,6 @@ static void tcf_block_put_deferred(struct work_struct *work)
 	 */
 	rcu_barrier();
 	tcf_queue_work(&block->work);
-	rtnl_unlock();
-}
-
-void tcf_block_put(struct tcf_block *block)
-{
-	if (!block)
-		return;
-
-	INIT_WORK(&block->work, tcf_block_put_deferred);
-	/* Wait for existing RCU callbacks to cool down, make sure their works
-	 * have been queued before this. We can not flush pending works here
-	 * because we are holding the RTNL lock.
-	 */
-	rcu_barrier();
-	tcf_queue_work(&block->work);
 }
 EXPORT_SYMBOL(tcf_block_put);
 
diff --git a/kernel/net/sctp/Makefile b/kernel/net/sctp/Makefile
index 70f1b570b..8c434af3e 100644
--- a/kernel/net/sctp/Makefile
+++ b/kernel/net/sctp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for SCTP support code.
 #
diff --git a/kernel/net/smc/smc.h b/kernel/net/smc/smc.h
index 0ccd6fa38..0bee9d16c 100644
--- a/kernel/net/smc/smc.h
+++ b/kernel/net/smc/smc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_cdc.c b/kernel/net/smc/smc_cdc.c
index a7294edbc..535e72cfc 100644
--- a/kernel/net/smc/smc_cdc.c
+++ b/kernel/net/smc/smc_cdc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_cdc.h b/kernel/net/smc/smc_cdc.h
index 8e1d76f26..bea61dada 100644
--- a/kernel/net/smc/smc_cdc.h
+++ b/kernel/net/smc/smc_cdc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_clc.c b/kernel/net/smc/smc_clc.c
index b7dd2743f..1800e16b2 100644
--- a/kernel/net/smc/smc_clc.c
+++ b/kernel/net/smc/smc_clc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_clc.h b/kernel/net/smc/smc_clc.h
index 1c5541404..12a9af153 100644
--- a/kernel/net/smc/smc_clc.h
+++ b/kernel/net/smc/smc_clc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_close.c b/kernel/net/smc/smc_close.c
index f0d16fb82..2427a1f3d 100644
--- a/kernel/net/smc/smc_close.c
+++ b/kernel/net/smc/smc_close.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_close.h b/kernel/net/smc/smc_close.h
index 4a3d99a8d..ed82506b1 100644
--- a/kernel/net/smc/smc_close.h
+++ b/kernel/net/smc/smc_close.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_core.c b/kernel/net/smc/smc_core.c
index 20b66e79c..413e3868f 100644
--- a/kernel/net/smc/smc_core.c
+++ b/kernel/net/smc/smc_core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_core.h b/kernel/net/smc/smc_core.h
index 19c44bf4e..fe691bf9a 100644
--- a/kernel/net/smc/smc_core.h
+++ b/kernel/net/smc/smc_core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_ib.c b/kernel/net/smc/smc_ib.c
index 0b5852299..9033b8a36 100644
--- a/kernel/net/smc/smc_ib.c
+++ b/kernel/net/smc/smc_ib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_ib.h b/kernel/net/smc/smc_ib.h
index 9b927a33d..e90630dad 100644
--- a/kernel/net/smc/smc_ib.h
+++ b/kernel/net/smc/smc_ib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_llc.c b/kernel/net/smc/smc_llc.c
index c2f9165d1..92fe4cc8c 100644
--- a/kernel/net/smc/smc_llc.c
+++ b/kernel/net/smc/smc_llc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_llc.h b/kernel/net/smc/smc_llc.h
index b472f8539..51b27ce90 100644
--- a/kernel/net/smc/smc_llc.h
+++ b/kernel/net/smc/smc_llc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_pnet.c b/kernel/net/smc/smc_pnet.c
index 31f8453c2..74568cdbc 100644
--- a/kernel/net/smc/smc_pnet.c
+++ b/kernel/net/smc/smc_pnet.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_pnet.h b/kernel/net/smc/smc_pnet.h
index c4f1bccd4..5a29519db 100644
--- a/kernel/net/smc/smc_pnet.h
+++ b/kernel/net/smc/smc_pnet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_rx.c b/kernel/net/smc/smc_rx.c
index 3e631ae4b..cbf58637e 100644
--- a/kernel/net/smc/smc_rx.c
+++ b/kernel/net/smc/smc_rx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_rx.h b/kernel/net/smc/smc_rx.h
index b5b80e1f8..3a32b59bf 100644
--- a/kernel/net/smc/smc_rx.h
+++ b/kernel/net/smc/smc_rx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_tx.c b/kernel/net/smc/smc_tx.c
index 386657328..710ab3fbf 100644
--- a/kernel/net/smc/smc_tx.c
+++ b/kernel/net/smc/smc_tx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_tx.h b/kernel/net/smc/smc_tx.h
index 1d6a0dcdc..78255964f 100644
--- a/kernel/net/smc/smc_tx.h
+++ b/kernel/net/smc/smc_tx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_wr.c b/kernel/net/smc/smc_wr.c
index 525d91e0d..de4537f66 100644
--- a/kernel/net/smc/smc_wr.c
+++ b/kernel/net/smc/smc_wr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/smc/smc_wr.h b/kernel/net/smc/smc_wr.h
index 45eb53833..2acf12b06 100644
--- a/kernel/net/smc/smc_wr.h
+++ b/kernel/net/smc/smc_wr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Shared Memory Communications over RDMA (SMC-R) and RoCE
  *
diff --git a/kernel/net/sunrpc/Makefile b/kernel/net/sunrpc/Makefile
index ea7ffa12e..090658c3d 100644
--- a/kernel/net/sunrpc/Makefile
+++ b/kernel/net/sunrpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Linux kernel SUN RPC
 #
diff --git a/kernel/net/sunrpc/auth_gss/Makefile b/kernel/net/sunrpc/auth_gss/Makefile
index 14e9e53e6..c374268b0 100644
--- a/kernel/net/sunrpc/auth_gss/Makefile
+++ b/kernel/net/sunrpc/auth_gss/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for Linux kernel rpcsec_gss implementation
 #
diff --git a/kernel/net/sunrpc/auth_null.c b/kernel/net/sunrpc/auth_null.c
index 5f3d527df..75d72e109 100644
--- a/kernel/net/sunrpc/auth_null.c
+++ b/kernel/net/sunrpc/auth_null.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/net/sunrpc/auth_null.c
  *
diff --git a/kernel/net/sunrpc/auth_unix.c b/kernel/net/sunrpc/auth_unix.c
index 82337e1ec..dafd6b870 100644
--- a/kernel/net/sunrpc/auth_unix.c
+++ b/kernel/net/sunrpc/auth_unix.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/net/sunrpc/auth_unix.c
  *
diff --git a/kernel/net/sunrpc/debugfs.c b/kernel/net/sunrpc/debugfs.c
index c8fd0b6c1..e980d2a49 100644
--- a/kernel/net/sunrpc/debugfs.c
+++ b/kernel/net/sunrpc/debugfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /**
  * debugfs interface for sunrpc
  *
diff --git a/kernel/net/sunrpc/netns.h b/kernel/net/sunrpc/netns.h
index 394ce5231..7ec10b92b 100644
--- a/kernel/net/sunrpc/netns.h
+++ b/kernel/net/sunrpc/netns.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUNRPC_NETNS_H__
 #define __SUNRPC_NETNS_H__
 
diff --git a/kernel/net/sunrpc/xprtmultipath.c b/kernel/net/sunrpc/xprtmultipath.c
index ae92a9e9b..e2d64c713 100644
--- a/kernel/net/sunrpc/xprtmultipath.c
+++ b/kernel/net/sunrpc/xprtmultipath.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Multipath support for RPC
  *
diff --git a/kernel/net/sunrpc/xprtrdma/Makefile b/kernel/net/sunrpc/xprtrdma/Makefile
index b8213ddce..8bf19e142 100644
--- a/kernel/net/sunrpc/xprtrdma/Makefile
+++ b/kernel/net/sunrpc/xprtrdma/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SUNRPC_XPRT_RDMA) += rpcrdma.o
 
 rpcrdma-y := transport.o rpc_rdma.o verbs.o \
diff --git a/kernel/net/sunrpc/xprtrdma/backchannel.c b/kernel/net/sunrpc/xprtrdma/backchannel.c
index d31d0ac5a..823a781ec 100644
--- a/kernel/net/sunrpc/xprtrdma/backchannel.c
+++ b/kernel/net/sunrpc/xprtrdma/backchannel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 Oracle.  All rights reserved.
  *
diff --git a/kernel/net/sunrpc/xprtrdma/fmr_ops.c b/kernel/net/sunrpc/xprtrdma/fmr_ops.c
index 6c7151341..fa759dd2b 100644
--- a/kernel/net/sunrpc/xprtrdma/fmr_ops.c
+++ b/kernel/net/sunrpc/xprtrdma/fmr_ops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 Oracle.  All rights reserved.
  * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
diff --git a/kernel/net/sunrpc/xprtrdma/frwr_ops.c b/kernel/net/sunrpc/xprtrdma/frwr_ops.c
index df062e086..35d7517ef 100644
--- a/kernel/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/kernel/net/sunrpc/xprtrdma/frwr_ops.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 Oracle.  All rights reserved.
  * Copyright (c) 2003-2007 Network Appliance, Inc. All rights reserved.
diff --git a/kernel/net/sunrpc/xprtrdma/svc_rdma_backchannel.c b/kernel/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
index ec37ad83b..992594b7c 100644
--- a/kernel/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
+++ b/kernel/net/sunrpc/xprtrdma/svc_rdma_backchannel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2015 Oracle.  All rights reserved.
  *
diff --git a/kernel/net/sunrpc/xprtrdma/svc_rdma_rw.c b/kernel/net/sunrpc/xprtrdma/svc_rdma_rw.c
index 7dcda4597..9bd04549a 100644
--- a/kernel/net/sunrpc/xprtrdma/svc_rdma_rw.c
+++ b/kernel/net/sunrpc/xprtrdma/svc_rdma_rw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 Oracle.  All rights reserved.
  *
diff --git a/kernel/net/sunrpc/xprtsock.c b/kernel/net/sunrpc/xprtsock.c
index c1841f234..4dad5da38 100644
--- a/kernel/net/sunrpc/xprtsock.c
+++ b/kernel/net/sunrpc/xprtsock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/net/sunrpc/xprtsock.c
  *
diff --git a/kernel/net/tipc/Makefile b/kernel/net/tipc/Makefile
index 31b9f9c52..2bfaa9d4b 100644
--- a/kernel/net/tipc/Makefile
+++ b/kernel/net/tipc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux TIPC layer
 #
diff --git a/kernel/net/unix/Makefile b/kernel/net/unix/Makefile
index b663c607b..ffd0a275c 100644
--- a/kernel/net/unix/Makefile
+++ b/kernel/net/unix/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux unix domain socket layer.
 #
diff --git a/kernel/net/vmw_vsock/Makefile b/kernel/net/vmw_vsock/Makefile
index e63d57423..30a263320 100644
--- a/kernel/net/vmw_vsock/Makefile
+++ b/kernel/net/vmw_vsock/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_VSOCKETS) += vsock.o
 obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o
 obj-$(CONFIG_VIRTIO_VSOCKETS) += vmw_vsock_virtio_transport.o
diff --git a/kernel/net/wimax/Makefile b/kernel/net/wimax/Makefile
index 8f1510d0c..eb2db0d3b 100644
--- a/kernel/net/wimax/Makefile
+++ b/kernel/net/wimax/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 obj-$(CONFIG_WIMAX)		+= wimax.o
 
diff --git a/kernel/net/wireless/Makefile b/kernel/net/wireless/Makefile
index d06e50157..b7c0300e0 100644
--- a/kernel/net/wireless/Makefile
+++ b/kernel/net/wireless/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_CFG80211) += cfg80211.o
 obj-$(CONFIG_LIB80211) += lib80211.o
 obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
diff --git a/kernel/net/wireless/ap.c b/kernel/net/wireless/ap.c
index 25666d300..63682176c 100644
--- a/kernel/net/wireless/ap.c
+++ b/kernel/net/wireless/ap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ieee80211.h>
 #include <linux/export.h>
 #include <net/cfg80211.h>
diff --git a/kernel/net/wireless/chan.c b/kernel/net/wireless/chan.c
index b8aa5a7d5..fad1b5baf 100644
--- a/kernel/net/wireless/chan.c
+++ b/kernel/net/wireless/chan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains helper code to handle channel
  * settings and keeping track of what is possible at
diff --git a/kernel/net/wireless/core.h b/kernel/net/wireless/core.h
index 6e809325a..705835047 100644
--- a/kernel/net/wireless/core.h
+++ b/kernel/net/wireless/core.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Wireless configuration interface internals.
  *
diff --git a/kernel/net/wireless/debugfs.h b/kernel/net/wireless/debugfs.h
index 74fdd3811..a8a135d94 100644
--- a/kernel/net/wireless/debugfs.h
+++ b/kernel/net/wireless/debugfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CFG80211_DEBUGFS_H
 #define __CFG80211_DEBUGFS_H
 
diff --git a/kernel/net/wireless/ethtool.c b/kernel/net/wireless/ethtool.c
index e9e91298c..a9c0f368d 100644
--- a/kernel/net/wireless/ethtool.c
+++ b/kernel/net/wireless/ethtool.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/utsname.h>
 #include <net/cfg80211.h>
 #include "core.h"
diff --git a/kernel/net/wireless/ibss.c b/kernel/net/wireless/ibss.c
index 10bf040a0..413d4f4e6 100644
--- a/kernel/net/wireless/ibss.c
+++ b/kernel/net/wireless/ibss.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Some IBSS support code for cfg80211.
  *
diff --git a/kernel/net/wireless/mesh.c b/kernel/net/wireless/mesh.c
index 421a6b80e..51aa55618 100644
--- a/kernel/net/wireless/mesh.c
+++ b/kernel/net/wireless/mesh.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/ieee80211.h>
 #include <linux/export.h>
 #include <net/cfg80211.h>
diff --git a/kernel/net/wireless/mlme.c b/kernel/net/wireless/mlme.c
index d8df7a518..e7c64a8dc 100644
--- a/kernel/net/wireless/mlme.c
+++ b/kernel/net/wireless/mlme.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cfg80211 MLME SAP interface
  *
diff --git a/kernel/net/wireless/nl80211.h b/kernel/net/wireless/nl80211.h
index b96933322..fc415c8f7 100644
--- a/kernel/net/wireless/nl80211.h
+++ b/kernel/net/wireless/nl80211.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NET_WIRELESS_NL80211_H
 #define __NET_WIRELESS_NL80211_H
 
diff --git a/kernel/net/wireless/rdev-ops.h b/kernel/net/wireless/rdev-ops.h
index ce23d7d49..0c06240d2 100644
--- a/kernel/net/wireless/rdev-ops.h
+++ b/kernel/net/wireless/rdev-ops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CFG80211_RDEV_OPS
 #define __CFG80211_RDEV_OPS
 
diff --git a/kernel/net/wireless/scan.c b/kernel/net/wireless/scan.c
index 9f0901f3e..f6c5fe482 100644
--- a/kernel/net/wireless/scan.c
+++ b/kernel/net/wireless/scan.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cfg80211 scan result handling
  *
diff --git a/kernel/net/wireless/sme.c b/kernel/net/wireless/sme.c
index 64d23db6c..ab32ef14f 100644
--- a/kernel/net/wireless/sme.c
+++ b/kernel/net/wireless/sme.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * SME code for cfg80211
  * both driver SME event handling and the SME implementation
diff --git a/kernel/net/wireless/sysfs.h b/kernel/net/wireless/sysfs.h
index b533ed71d..7b454c2de 100644
--- a/kernel/net/wireless/sysfs.h
+++ b/kernel/net/wireless/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __WIRELESS_SYSFS_H
 #define __WIRELESS_SYSFS_H
 
diff --git a/kernel/net/wireless/trace.h b/kernel/net/wireless/trace.h
index 0f8db41ea..f3353fe5b 100644
--- a/kernel/net/wireless/trace.h
+++ b/kernel/net/wireless/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM cfg80211
 
diff --git a/kernel/net/wireless/util.c b/kernel/net/wireless/util.c
index bcb1284c3..c1238d582 100644
--- a/kernel/net/wireless/util.c
+++ b/kernel/net/wireless/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Wireless utility functions
  *
diff --git a/kernel/net/wireless/wext-compat.c b/kernel/net/wireless/wext-compat.c
index 5d4a02c79..7ca04a7de 100644
--- a/kernel/net/wireless/wext-compat.c
+++ b/kernel/net/wireless/wext-compat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cfg80211 - wext compat code
  *
diff --git a/kernel/net/wireless/wext-sme.c b/kernel/net/wireless/wext-sme.c
index c434f193f..c67d7a82a 100644
--- a/kernel/net/wireless/wext-sme.c
+++ b/kernel/net/wireless/wext-sme.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cfg80211 wext compat for managed mode.
  *
diff --git a/kernel/net/x25/Makefile b/kernel/net/x25/Makefile
index a2c34ab6f..5dd544a23 100644
--- a/kernel/net/x25/Makefile
+++ b/kernel/net/x25/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the Linux X.25 Packet layer.
 #
diff --git a/kernel/net/x25/sysctl_net_x25.c b/kernel/net/x25/sysctl_net_x25.c
index ba078c85f..e9802afa4 100644
--- a/kernel/net/x25/sysctl_net_x25.c
+++ b/kernel/net/x25/sysctl_net_x25.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* -*- linux-c -*-
  * sysctl_net_x25.c: sysctl interface to net X.25 subsystem.
  *
diff --git a/kernel/net/xfrm/Makefile b/kernel/net/xfrm/Makefile
index 55b2ac300..0bd2465a8 100644
--- a/kernel/net/xfrm/Makefile
+++ b/kernel/net/xfrm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the XFRM subsystem.
 #
diff --git a/kernel/net/xfrm/xfrm_hash.c b/kernel/net/xfrm/xfrm_hash.c
index 1e98bc0fe..2ad33ce1e 100644
--- a/kernel/net/xfrm/xfrm_hash.c
+++ b/kernel/net/xfrm/xfrm_hash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* xfrm_hash.c: Common hash table code.
  *
  * Copyright (C) 2006 David S. Miller (davem@davemloft.net)
diff --git a/kernel/net/xfrm/xfrm_hash.h b/kernel/net/xfrm/xfrm_hash.h
index eaea9c4fb..61be81038 100644
--- a/kernel/net/xfrm/xfrm_hash.h
+++ b/kernel/net/xfrm/xfrm_hash.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _XFRM_HASH_H
 #define _XFRM_HASH_H
 
diff --git a/kernel/net/xfrm/xfrm_input.c b/kernel/net/xfrm/xfrm_input.c
index 8ac9d32fb..82d20ee34 100644
--- a/kernel/net/xfrm/xfrm_input.c
+++ b/kernel/net/xfrm/xfrm_input.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * xfrm_input.c
  *
diff --git a/kernel/net/xfrm/xfrm_output.c b/kernel/net/xfrm/xfrm_output.c
index 31a2e6d34..73ad8c8ef 100644
--- a/kernel/net/xfrm/xfrm_output.c
+++ b/kernel/net/xfrm/xfrm_output.c
@@ -105,6 +105,9 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 		if (xfrm_offload(skb)) {
 			x->type_offload->encap(x, skb);
 		} else {
+			/* Inner headers are invalid now. */
+			skb->encapsulation = 0;
+
 			err = x->type->output(x, skb);
 			if (err == -EINPROGRESS)
 				goto out;
@@ -208,7 +211,6 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
 	int err;
 
 	secpath_reset(skb);
-	skb->encapsulation = 0;
 
 	if (xfrm_dev_offload_ok(skb, x)) {
 		struct sec_path *sp;
diff --git a/kernel/net/xfrm/xfrm_policy.c b/kernel/net/xfrm/xfrm_policy.c
index 2746b62a8..8cafb3c0a 100644
--- a/kernel/net/xfrm/xfrm_policy.c
+++ b/kernel/net/xfrm/xfrm_policy.c
@@ -2076,7 +2076,6 @@ make_dummy_bundle:
 	xdst->num_xfrms = num_xfrms;
 	memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
 
-	dst_hold(&xdst->u.dst);
 	return xdst;
 
 inc_error:
diff --git a/kernel/net/xfrm/xfrm_state.c b/kernel/net/xfrm/xfrm_state.c
index 12213477c..1f5cee226 100644
--- a/kernel/net/xfrm/xfrm_state.c
+++ b/kernel/net/xfrm/xfrm_state.c
@@ -2069,6 +2069,7 @@ int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen
 	if (err >= 0) {
 		xfrm_sk_policy_insert(sk, err, pol);
 		xfrm_pol_put(pol);
+		__sk_dst_reset(sk);
 		err = 0;
 	}
 
diff --git a/kernel/net/xfrm/xfrm_sysctl.c b/kernel/net/xfrm/xfrm_sysctl.c
index 35a7e794a..0c6c5ef65 100644
--- a/kernel/net/xfrm/xfrm_sysctl.c
+++ b/kernel/net/xfrm/xfrm_sysctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/sysctl.h>
 #include <linux/slab.h>
 #include <net/net_namespace.h>
diff --git a/kernel/samples/auxdisplay/Makefile b/kernel/samples/auxdisplay/Makefile
index 05e471feb..0273bab27 100644
--- a/kernel/samples/auxdisplay/Makefile
+++ b/kernel/samples/auxdisplay/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC := $(CROSS_COMPILE)gcc
 CFLAGS := -I../../usr/include
 
diff --git a/kernel/samples/bpf/Makefile b/kernel/samples/bpf/Makefile
index cf17c7932..9b4a66e33 100644
--- a/kernel/samples/bpf/Makefile
+++ b/kernel/samples/bpf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # kbuild trick to avoid linker error. Can be omitted if a module is built.
 obj- := dummy.o
 
diff --git a/kernel/samples/bpf/bpf_load.c b/kernel/samples/bpf/bpf_load.c
index 6aa50098d..2325d7ad7 100644
--- a/kernel/samples/bpf/bpf_load.c
+++ b/kernel/samples/bpf/bpf_load.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/kernel/samples/bpf/bpf_load.h b/kernel/samples/bpf/bpf_load.h
index 453e3226b..7d57a4248 100644
--- a/kernel/samples/bpf/bpf_load.h
+++ b/kernel/samples/bpf/bpf_load.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BPF_LOAD_H
 #define __BPF_LOAD_H
 
diff --git a/kernel/samples/bpf/cgroup_helpers.c b/kernel/samples/bpf/cgroup_helpers.c
index 9d1be9426..09afaddfc 100644
--- a/kernel/samples/bpf/cgroup_helpers.c
+++ b/kernel/samples/bpf/cgroup_helpers.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <sched.h>
 #include <sys/mount.h>
diff --git a/kernel/samples/bpf/cgroup_helpers.h b/kernel/samples/bpf/cgroup_helpers.h
index 78c55207b..06485e000 100644
--- a/kernel/samples/bpf/cgroup_helpers.h
+++ b/kernel/samples/bpf/cgroup_helpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CGROUP_HELPERS_H
 #define __CGROUP_HELPERS_H
 #include <errno.h>
diff --git a/kernel/samples/bpf/libbpf.h b/kernel/samples/bpf/libbpf.h
index 8ab36a04c..18bfee5aa 100644
--- a/kernel/samples/bpf/libbpf.h
+++ b/kernel/samples/bpf/libbpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* eBPF mini library */
 #ifndef __LIBBPF_H
 #define __LIBBPF_H
diff --git a/kernel/samples/bpf/lwt_len_hist.sh b/kernel/samples/bpf/lwt_len_hist.sh
index 7d567744c..090b96eaf 100644
--- a/kernel/samples/bpf/lwt_len_hist.sh
+++ b/kernel/samples/bpf/lwt_len_hist.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 NS1=lwt_ns1
 VETH0=tst_lwt1a
diff --git a/kernel/samples/bpf/lwt_len_hist_user.c b/kernel/samples/bpf/lwt_len_hist_user.c
index ec8f3bbcb..7fcb94c09 100644
--- a/kernel/samples/bpf/lwt_len_hist_user.c
+++ b/kernel/samples/bpf/lwt_len_hist_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/unistd.h>
 #include <linux/bpf.h>
 
diff --git a/kernel/samples/bpf/run_cookie_uid_helper_example.sh b/kernel/samples/bpf/run_cookie_uid_helper_example.sh
index f898cfa2b..fc6bc0451 100755
--- a/kernel/samples/bpf/run_cookie_uid_helper_example.sh
+++ b/kernel/samples/bpf/run_cookie_uid_helper_example.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 local_dir="$(pwd)"
 root_dir=$local_dir/../..
 mnt_dir=$(mktemp -d --tmp)
diff --git a/kernel/samples/bpf/sock_example.h b/kernel/samples/bpf/sock_example.h
index d8014065d..772d5dad8 100644
--- a/kernel/samples/bpf/sock_example.h
+++ b/kernel/samples/bpf/sock_example.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <stdlib.h>
 #include <stdio.h>
 #include <linux/unistd.h>
diff --git a/kernel/samples/bpf/sockex1_user.c b/kernel/samples/bpf/sockex1_user.c
index 6cd2feb3e..2be935c26 100644
--- a/kernel/samples/bpf/sockex1_user.c
+++ b/kernel/samples/bpf/sockex1_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <assert.h>
 #include <linux/bpf.h>
diff --git a/kernel/samples/bpf/sockex2_user.c b/kernel/samples/bpf/sockex2_user.c
index 0e0207c90..44fe0805b 100644
--- a/kernel/samples/bpf/sockex2_user.c
+++ b/kernel/samples/bpf/sockex2_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <assert.h>
 #include <linux/bpf.h>
diff --git a/kernel/samples/bpf/sockex3_user.c b/kernel/samples/bpf/sockex3_user.c
index 877ecf8fc..495ee02e2 100644
--- a/kernel/samples/bpf/sockex3_user.c
+++ b/kernel/samples/bpf/sockex3_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <assert.h>
 #include <linux/bpf.h>
diff --git a/kernel/samples/bpf/spintest_user.c b/kernel/samples/bpf/spintest_user.c
index 80676c25f..3d736219a 100644
--- a/kernel/samples/bpf/spintest_user.c
+++ b/kernel/samples/bpf/spintest_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <unistd.h>
 #include <linux/bpf.h>
diff --git a/kernel/samples/bpf/syscall_nrs.c b/kernel/samples/bpf/syscall_nrs.c
index ce2a30b11..516e255cb 100644
--- a/kernel/samples/bpf/syscall_nrs.c
+++ b/kernel/samples/bpf/syscall_nrs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <uapi/linux/unistd.h>
 #include <linux/kbuild.h>
 
diff --git a/kernel/samples/bpf/tc_l2_redirect.sh b/kernel/samples/bpf/tc_l2_redirect.sh
index 80a05591a..37d95ef3c 100755
--- a/kernel/samples/bpf/tc_l2_redirect.sh
+++ b/kernel/samples/bpf/tc_l2_redirect.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 [[ -z $TC ]] && TC='tc'
 [[ -z $IP ]] && IP='ip'
diff --git a/kernel/samples/bpf/test_cgrp2_sock.sh b/kernel/samples/bpf/test_cgrp2_sock.sh
index a81f38eef..8ee0371a1 100755
--- a/kernel/samples/bpf/test_cgrp2_sock.sh
+++ b/kernel/samples/bpf/test_cgrp2_sock.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 # Test various socket options that can be set by attaching programs to cgroups.
 
diff --git a/kernel/samples/bpf/test_cgrp2_sock2.c b/kernel/samples/bpf/test_cgrp2_sock2.c
index db036077b..e53f1f6f0 100644
--- a/kernel/samples/bpf/test_cgrp2_sock2.c
+++ b/kernel/samples/bpf/test_cgrp2_sock2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* eBPF example program:
  *
  * - Loads eBPF program
diff --git a/kernel/samples/bpf/test_cgrp2_sock2.sh b/kernel/samples/bpf/test_cgrp2_sock2.sh
index 891f12a0e..fc4e64d00 100755
--- a/kernel/samples/bpf/test_cgrp2_sock2.sh
+++ b/kernel/samples/bpf/test_cgrp2_sock2.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 function config_device {
 	ip netns add at_ns0
diff --git a/kernel/samples/bpf/test_cgrp2_tc.sh b/kernel/samples/bpf/test_cgrp2_tc.sh
index 0b119eeaf..12faf5847 100755
--- a/kernel/samples/bpf/test_cgrp2_tc.sh
+++ b/kernel/samples/bpf/test_cgrp2_tc.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 MY_DIR=$(dirname $0)
 # Details on the bpf prog
diff --git a/kernel/samples/bpf/test_cls_bpf.sh b/kernel/samples/bpf/test_cls_bpf.sh
index 0365d5ee5..aaddd67b3 100755
--- a/kernel/samples/bpf/test_cls_bpf.sh
+++ b/kernel/samples/bpf/test_cls_bpf.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 function pktgen {
     ../pktgen/pktgen_bench_xmit_mode_netif_receive.sh -i $IFC -s 64 \
diff --git a/kernel/samples/bpf/test_ipip.sh b/kernel/samples/bpf/test_ipip.sh
index 196925403..9e507c305 100755
--- a/kernel/samples/bpf/test_ipip.sh
+++ b/kernel/samples/bpf/test_ipip.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 function config_device {
 	ip netns add at_ns0
diff --git a/kernel/samples/bpf/test_lwt_bpf.sh b/kernel/samples/bpf/test_lwt_bpf.sh
index a695ae268..65a976058 100644
--- a/kernel/samples/bpf/test_lwt_bpf.sh
+++ b/kernel/samples/bpf/test_lwt_bpf.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 # Uncomment to see generated bytecode
 #VERBOSE=verbose
diff --git a/kernel/samples/bpf/test_probe_write_user_user.c b/kernel/samples/bpf/test_probe_write_user_user.c
index b5bf178a6..bf8e3a9f3 100644
--- a/kernel/samples/bpf/test_probe_write_user_user.c
+++ b/kernel/samples/bpf/test_probe_write_user_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <assert.h>
 #include <linux/bpf.h>
diff --git a/kernel/samples/bpf/test_tunnel_bpf.sh b/kernel/samples/bpf/test_tunnel_bpf.sh
index 410052d9f..312e1722a 100755
--- a/kernel/samples/bpf/test_tunnel_bpf.sh
+++ b/kernel/samples/bpf/test_tunnel_bpf.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # In Namespace 0 (at_ns0) using native tunnel
 # Overlay IP: 10.1.1.100
 # local 192.16.1.100 remote 192.16.1.200
diff --git a/kernel/samples/bpf/tracex1_user.c b/kernel/samples/bpf/tracex1_user.c
index 31a48183b..3dcb475fb 100644
--- a/kernel/samples/bpf/tracex1_user.c
+++ b/kernel/samples/bpf/tracex1_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <linux/bpf.h>
 #include <unistd.h>
diff --git a/kernel/samples/bpf/tracex2_user.c b/kernel/samples/bpf/tracex2_user.c
index 7321a3f25..efb5e6191 100644
--- a/kernel/samples/bpf/tracex2_user.c
+++ b/kernel/samples/bpf/tracex2_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/kernel/samples/bpf/tracex5_user.c b/kernel/samples/bpf/tracex5_user.c
index 36b5925bb..4e2774b73 100644
--- a/kernel/samples/bpf/tracex5_user.c
+++ b/kernel/samples/bpf/tracex5_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <linux/bpf.h>
 #include <unistd.h>
diff --git a/kernel/samples/bpf/tracex6_user.c b/kernel/samples/bpf/tracex6_user.c
index a05a99a07..a8c22dcf8 100644
--- a/kernel/samples/bpf/tracex6_user.c
+++ b/kernel/samples/bpf/tracex6_user.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 
 #include <assert.h>
diff --git a/kernel/samples/connector/Makefile b/kernel/samples/connector/Makefile
index 91762d946..fe3c8542a 100644
--- a/kernel/samples/connector/Makefile
+++ b/kernel/samples/connector/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SAMPLE_CONNECTOR) += cn_test.o
 
 # List of programs to build
diff --git a/kernel/samples/hidraw/Makefile b/kernel/samples/hidraw/Makefile
index a9ab96188..f5c3012ff 100644
--- a/kernel/samples/hidraw/Makefile
+++ b/kernel/samples/hidraw/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # kbuild trick to avoid linker error. Can be omitted if a module is built.
 obj- := dummy.o
 
diff --git a/kernel/samples/hidraw/hid-example.c b/kernel/samples/hidraw/hid-example.c
index 92e6c1511..9bfd8ff6d 100644
--- a/kernel/samples/hidraw/hid-example.c
+++ b/kernel/samples/hidraw/hid-example.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Hidraw Userspace Example
  *
diff --git a/kernel/samples/mei/Makefile b/kernel/samples/mei/Makefile
index 7aac216dc..c7e52e9e9 100644
--- a/kernel/samples/mei/Makefile
+++ b/kernel/samples/mei/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC := $(CROSS_COMPILE)gcc
 CFLAGS := -I../../usr/include
 
diff --git a/kernel/samples/mic/mpssd/Makefile b/kernel/samples/mic/mpssd/Makefile
index 3e3ef91fe..a7a6e0c70 100644
--- a/kernel/samples/mic/mpssd/Makefile
+++ b/kernel/samples/mic/mpssd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef CROSS_COMPILE
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
diff --git a/kernel/samples/pktgen/parameters.sh b/kernel/samples/pktgen/parameters.sh
index 3a6244d5f..72fc56287 100644
--- a/kernel/samples/pktgen/parameters.sh
+++ b/kernel/samples/pktgen/parameters.sh
@@ -1,4 +1,5 @@
 #
+# SPDX-License-Identifier: GPL-2.0
 # Common parameter parsing for pktgen scripts
 #
 
diff --git a/kernel/samples/pktgen/pktgen.conf-1-1-ip6 b/kernel/samples/pktgen/pktgen.conf-1-1-ip6
index 0b9ffd47f..62426afee 100755
--- a/kernel/samples/pktgen/pktgen.conf-1-1-ip6
+++ b/kernel/samples/pktgen/pktgen.conf-1-1-ip6
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 #modprobe pktgen
 
diff --git a/kernel/samples/pktgen/pktgen.conf-1-1-ip6-rdos b/kernel/samples/pktgen/pktgen.conf-1-1-ip6-rdos
index ad98e5f40..3ac3eb1f3 100755
--- a/kernel/samples/pktgen/pktgen.conf-1-1-ip6-rdos
+++ b/kernel/samples/pktgen/pktgen.conf-1-1-ip6-rdos
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 #modprobe pktgen
 
diff --git a/kernel/samples/pktgen/pktgen.conf-1-2 b/kernel/samples/pktgen/pktgen.conf-1-2
index ba4eb26e1..a85552760 100755
--- a/kernel/samples/pktgen/pktgen.conf-1-2
+++ b/kernel/samples/pktgen/pktgen.conf-1-2
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 #modprobe pktgen
 
diff --git a/kernel/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh b/kernel/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
index e5bfe759a..2839f7d31 100755
--- a/kernel/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
+++ b/kernel/samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Benchmark script:
 #  - developed for benchmarking ingress qdisc path
diff --git a/kernel/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh b/kernel/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
index 1ad878e95..e1ee54465 100755
--- a/kernel/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
+++ b/kernel/samples/pktgen/pktgen_bench_xmit_mode_queue_xmit.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Benchmark script:
 #  - developed for benchmarking egress qdisc path, derived (more
diff --git a/kernel/samples/pktgen/pktgen_sample01_simple.sh b/kernel/samples/pktgen/pktgen_sample01_simple.sh
index 35b7fe34b..e9ab4edba 100755
--- a/kernel/samples/pktgen/pktgen_sample01_simple.sh
+++ b/kernel/samples/pktgen/pktgen_sample01_simple.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Simple example:
 #  * pktgen sending with single thread and single interface
diff --git a/kernel/samples/pktgen/pktgen_sample02_multiqueue.sh b/kernel/samples/pktgen/pktgen_sample02_multiqueue.sh
index cbdd3e2bc..99f740ae9 100755
--- a/kernel/samples/pktgen/pktgen_sample02_multiqueue.sh
+++ b/kernel/samples/pktgen/pktgen_sample02_multiqueue.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Multiqueue: Using pktgen threads for sending on multiple CPUs
 #  * adding devices to kernel threads
diff --git a/kernel/samples/pktgen/pktgen_sample03_burst_single_flow.sh b/kernel/samples/pktgen/pktgen_sample03_burst_single_flow.sh
index 8d26e0ca6..4c2e42176 100755
--- a/kernel/samples/pktgen/pktgen_sample03_burst_single_flow.sh
+++ b/kernel/samples/pktgen/pktgen_sample03_burst_single_flow.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Script for max single flow performance
 #  - If correctly tuned[1], single CPU 10G wirespeed small pkts is possible[2]
diff --git a/kernel/samples/pktgen/pktgen_sample04_many_flows.sh b/kernel/samples/pktgen/pktgen_sample04_many_flows.sh
index 497fb7520..4df92b717 100755
--- a/kernel/samples/pktgen/pktgen_sample04_many_flows.sh
+++ b/kernel/samples/pktgen/pktgen_sample04_many_flows.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Script example for many flows testing
 #
diff --git a/kernel/samples/pktgen/pktgen_sample05_flow_per_thread.sh b/kernel/samples/pktgen/pktgen_sample05_flow_per_thread.sh
index ac9cfd6b2..7f8b5e59f 100755
--- a/kernel/samples/pktgen/pktgen_sample05_flow_per_thread.sh
+++ b/kernel/samples/pktgen/pktgen_sample05_flow_per_thread.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Script will generate one flow per thread (-t N)
 #  - Same destination IP
diff --git a/kernel/samples/seccomp/Makefile b/kernel/samples/seccomp/Makefile
index bf7cc6b0d..19a870eed 100644
--- a/kernel/samples/seccomp/Makefile
+++ b/kernel/samples/seccomp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # kbuild trick to avoid linker error. Can be omitted if a module is built.
 obj- := dummy.o
 
diff --git a/kernel/samples/seccomp/bpf-direct.c b/kernel/samples/seccomp/bpf-direct.c
index 151ec3f52..c09e4a17a 100644
--- a/kernel/samples/seccomp/bpf-direct.c
+++ b/kernel/samples/seccomp/bpf-direct.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Seccomp filter example for x86 (32-bit and 64-bit) with BPF macros
  *
diff --git a/kernel/samples/seccomp/bpf-fancy.c b/kernel/samples/seccomp/bpf-fancy.c
index e8b24f443..1ccb43502 100644
--- a/kernel/samples/seccomp/bpf-fancy.c
+++ b/kernel/samples/seccomp/bpf-fancy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Seccomp BPF example using a macro-based generator.
  *
diff --git a/kernel/samples/seccomp/bpf-helper.c b/kernel/samples/seccomp/bpf-helper.c
index 1ef0f4d72..ae260d77a 100644
--- a/kernel/samples/seccomp/bpf-helper.c
+++ b/kernel/samples/seccomp/bpf-helper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Seccomp BPF helper functions
  *
diff --git a/kernel/samples/seccomp/bpf-helper.h b/kernel/samples/seccomp/bpf-helper.h
index 1d8de9edd..0cc9816fe 100644
--- a/kernel/samples/seccomp/bpf-helper.h
+++ b/kernel/samples/seccomp/bpf-helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Example wrapper around BPF macros.
  *
diff --git a/kernel/samples/seccomp/dropper.c b/kernel/samples/seccomp/dropper.c
index 68325ca5e..cc0648eb3 100644
--- a/kernel/samples/seccomp/dropper.c
+++ b/kernel/samples/seccomp/dropper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Naive system call dropper built on seccomp_filter.
  *
diff --git a/kernel/samples/timers/Makefile b/kernel/samples/timers/Makefile
index a5c3c4a35..f9fa07460 100644
--- a/kernel/samples/timers/Makefile
+++ b/kernel/samples/timers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef CROSS_COMPILE
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
diff --git a/kernel/samples/timers/hpet_example.c b/kernel/samples/timers/hpet_example.c
index 3ab4993d8..f1cb622f6 100644
--- a/kernel/samples/timers/hpet_example.c
+++ b/kernel/samples/timers/hpet_example.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/kernel/samples/trace_events/trace-events-sample.h b/kernel/samples/trace_events/trace-events-sample.h
index 76a75ab7a..5bcd91455 100644
--- a/kernel/samples/trace_events/trace-events-sample.h
+++ b/kernel/samples/trace_events/trace-events-sample.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * If TRACE_SYSTEM is defined, that will be the directory created
  * in the ftrace directory under /sys/kernel/tracing/events/<system>
diff --git a/kernel/samples/uhid/uhid-example.c b/kernel/samples/uhid/uhid-example.c
index 7d58a4b8d..b72d645ce 100644
--- a/kernel/samples/uhid/uhid-example.c
+++ b/kernel/samples/uhid/uhid-example.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * UHID Example
  *
diff --git a/kernel/samples/watchdog/Makefile b/kernel/samples/watchdog/Makefile
index 9b53d89b1..a9430fa60 100644
--- a/kernel/samples/watchdog/Makefile
+++ b/kernel/samples/watchdog/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC := $(CROSS_COMPILE)gcc
 PROGS := watchdog-simple
 
diff --git a/kernel/samples/watchdog/watchdog-simple.c b/kernel/samples/watchdog/watchdog-simple.c
index ba45803a2..9ce66d2ca 100644
--- a/kernel/samples/watchdog/watchdog-simple.c
+++ b/kernel/samples/watchdog/watchdog-simple.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/kernel/scripts/Lindent b/kernel/scripts/Lindent
index 57b564c24..1688c44c2 100755
--- a/kernel/scripts/Lindent
+++ b/kernel/scripts/Lindent
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 PARAM="-npro -kr -i8 -ts8 -sob -l80 -ss -ncs -cp1"
 
diff --git a/kernel/scripts/Makefile b/kernel/scripts/Makefile
index c06f4997d..25ab143cb 100644
--- a/kernel/scripts/Makefile
+++ b/kernel/scripts/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ###
 # scripts contains sources for various helper programs used throughout
 # the kernel for the build process.
diff --git a/kernel/scripts/Makefile.asm-generic b/kernel/scripts/Makefile.asm-generic
index a6c8c1780..524eeedc8 100644
--- a/kernel/scripts/Makefile.asm-generic
+++ b/kernel/scripts/Makefile.asm-generic
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # include/asm-generic contains a lot of files that are used
 # verbatim by several architectures.
 #
diff --git a/kernel/scripts/Makefile.build b/kernel/scripts/Makefile.build
index 061d0c3a4..bb831d49b 100644
--- a/kernel/scripts/Makefile.build
+++ b/kernel/scripts/Makefile.build
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Building
 # ==========================================================================
@@ -419,7 +420,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always)
 # Linker scripts preprocessor (.lds.S -> .lds)
 # ---------------------------------------------------------------------------
 quiet_cmd_cpp_lds_S = LDS     $@
-      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
+      cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -U$(ARCH) \
 	                     -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
 
 $(obj)/%.lds: $(src)/%.lds.S FORCE
diff --git a/kernel/scripts/Makefile.clean b/kernel/scripts/Makefile.clean
index 50616ea25..808d09f27 100644
--- a/kernel/scripts/Makefile.clean
+++ b/kernel/scripts/Makefile.clean
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Cleaning up
 # ==========================================================================
diff --git a/kernel/scripts/Makefile.dtbinst b/kernel/scripts/Makefile.dtbinst
index 993fb8598..c8ba6e7f9 100644
--- a/kernel/scripts/Makefile.dtbinst
+++ b/kernel/scripts/Makefile.dtbinst
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Installing dtb files
 #
diff --git a/kernel/scripts/Makefile.extrawarn b/kernel/scripts/Makefile.extrawarn
index ae8a1357d..c6ebf4239 100644
--- a/kernel/scripts/Makefile.extrawarn
+++ b/kernel/scripts/Makefile.extrawarn
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 #
 # make W=... settings
diff --git a/kernel/scripts/Makefile.gcc-plugins b/kernel/scripts/Makefile.gcc-plugins
index d1f7b0d6b..b2a95af7d 100644
--- a/kernel/scripts/Makefile.gcc-plugins
+++ b/kernel/scripts/Makefile.gcc-plugins
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifdef CONFIG_GCC_PLUGINS
   __PLUGINCC := $(call cc-ifversion, -ge, 0408, $(HOSTCXX), $(HOSTCC))
   PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(__PLUGINCC)" "$(HOSTCXX)" "$(CC)")
diff --git a/kernel/scripts/Makefile.headersinst b/kernel/scripts/Makefile.headersinst
index 343d586e5..99967948d 100644
--- a/kernel/scripts/Makefile.headersinst
+++ b/kernel/scripts/Makefile.headersinst
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Installing headers
 #
diff --git a/kernel/scripts/Makefile.host b/kernel/scripts/Makefile.host
index 9cfd5c84d..10e5c3cb8 100644
--- a/kernel/scripts/Makefile.host
+++ b/kernel/scripts/Makefile.host
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Building binaries on the host system
 # Binaries are used during the compilation of the kernel, for example
diff --git a/kernel/scripts/Makefile.kasan b/kernel/scripts/Makefile.kasan
index 9576775a8..1ce7115aa 100644
--- a/kernel/scripts/Makefile.kasan
+++ b/kernel/scripts/Makefile.kasan
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifdef CONFIG_KASAN
 ifdef CONFIG_KASAN_INLINE
 	call_threshold := 10000
diff --git a/kernel/scripts/Makefile.lib b/kernel/scripts/Makefile.lib
index 5e975fee0..04b5633df 100644
--- a/kernel/scripts/Makefile.lib
+++ b/kernel/scripts/Makefile.lib
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Backward compatibility
 asflags-y  += $(EXTRA_AFLAGS)
 ccflags-y  += $(EXTRA_CFLAGS)
diff --git a/kernel/scripts/Makefile.modbuiltin b/kernel/scripts/Makefile.modbuiltin
index 1adb974e6..a763b4775 100644
--- a/kernel/scripts/Makefile.modbuiltin
+++ b/kernel/scripts/Makefile.modbuiltin
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Generating modules.builtin
 # ==========================================================================
diff --git a/kernel/scripts/Makefile.modinst b/kernel/scripts/Makefile.modinst
index 07650eeaa..51ca0244f 100644
--- a/kernel/scripts/Makefile.modinst
+++ b/kernel/scripts/Makefile.modinst
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Installing modules
 # ==========================================================================
diff --git a/kernel/scripts/Makefile.modpost b/kernel/scripts/Makefile.modpost
index 756d14f0d..991db7d6e 100644
--- a/kernel/scripts/Makefile.modpost
+++ b/kernel/scripts/Makefile.modpost
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ===========================================================================
 # Module versions
 # ===========================================================================
diff --git a/kernel/scripts/Makefile.modsign b/kernel/scripts/Makefile.modsign
index b6ac7084d..171483bc0 100644
--- a/kernel/scripts/Makefile.modsign
+++ b/kernel/scripts/Makefile.modsign
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ==========================================================================
 # Signing modules
 # ==========================================================================
diff --git a/kernel/scripts/Makefile.ubsan b/kernel/scripts/Makefile.ubsan
index 3b1b13818..8fd4d44fb 100644
--- a/kernel/scripts/Makefile.ubsan
+++ b/kernel/scripts/Makefile.ubsan
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifdef CONFIG_UBSAN
       CFLAGS_UBSAN += $(call cc-option, -fsanitize=shift)
       CFLAGS_UBSAN += $(call cc-option, -fsanitize=integer-divide-by-zero)
diff --git a/kernel/scripts/check_00index.sh b/kernel/scripts/check_00index.sh
index 6ac9527ae..aa47f5926 100755
--- a/kernel/scripts/check_00index.sh
+++ b/kernel/scripts/check_00index.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 cd Documentation/
 
diff --git a/kernel/scripts/check_extable.sh b/kernel/scripts/check_extable.sh
index 0fb6b1c97..93af93c7b 100755
--- a/kernel/scripts/check_extable.sh
+++ b/kernel/scripts/check_extable.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # (c) 2015, Quentin Casasnovas <quentin.casasnovas@oracle.com>
 
 obj=$1
diff --git a/kernel/scripts/checkincludes.pl b/kernel/scripts/checkincludes.pl
index ce9edefd6..b514a956d 100755
--- a/kernel/scripts/checkincludes.pl
+++ b/kernel/scripts/checkincludes.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # checkincludes: find/remove files included more than once
 #
diff --git a/kernel/scripts/checkstack.pl b/kernel/scripts/checkstack.pl
index 7f4c41717..cb993801e 100755
--- a/kernel/scripts/checkstack.pl
+++ b/kernel/scripts/checkstack.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 
 #	Check the stack usage of functions
 #
diff --git a/kernel/scripts/checksyscalls.sh b/kernel/scripts/checksyscalls.sh
index 5a387a264..ee3dfb5be 100755
--- a/kernel/scripts/checksyscalls.sh
+++ b/kernel/scripts/checksyscalls.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # Check if current architecture are missing any function calls compared
 # to i386.
diff --git a/kernel/scripts/checkversion.pl b/kernel/scripts/checkversion.pl
index 8b4f20523..f67b125c5 100755
--- a/kernel/scripts/checkversion.pl
+++ b/kernel/scripts/checkversion.pl
@@ -1,4 +1,5 @@
 #! /usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION
 # without including <linux/version.h>, or cases of
diff --git a/kernel/scripts/cleanfile b/kernel/scripts/cleanfile
index 72e375532..c00c69b91 100755
--- a/kernel/scripts/cleanfile
+++ b/kernel/scripts/cleanfile
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # Clean a text file -- or directory of text files -- of stealth whitespace.
 # WARNING: this can be a highly destructive operation.  Use with caution.
diff --git a/kernel/scripts/cleanpatch b/kernel/scripts/cleanpatch
index 3e5a2303d..9f1755271 100755
--- a/kernel/scripts/cleanpatch
+++ b/kernel/scripts/cleanpatch
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # Clean a patch file -- or directory of patch files -- of stealth whitespace.
 # WARNING: this can be a highly destructive operation.  Use with caution.
diff --git a/kernel/scripts/coccicheck b/kernel/scripts/coccicheck
index ec487b8e7..28ad1feff 100755
--- a/kernel/scripts/coccicheck
+++ b/kernel/scripts/coccicheck
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # Linux kernel coccicheck
 #
 # Read Documentation/dev-tools/coccinelle.rst
diff --git a/kernel/scripts/coccinelle/api/d_find_alias.cocci b/kernel/scripts/coccinelle/api/d_find_alias.cocci
index 9594c9f7e..47e050166 100644
--- a/kernel/scripts/coccinelle/api/d_find_alias.cocci
+++ b/kernel/scripts/coccinelle/api/d_find_alias.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /// Make sure calls to d_find_alias() have a corresponding call to dput().
 //
 // Keywords: d_find_alias, dput
diff --git a/kernel/scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci b/kernel/scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci
index 85cf5408d..7c3123105 100644
--- a/kernel/scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci
+++ b/kernel/scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /// Use DEFINE_DEBUGFS_ATTRIBUTE rather than DEFINE_SIMPLE_ATTRIBUTE
 /// for debugfs files.
 ///
diff --git a/kernel/scripts/coccinelle/api/drm-get-put.cocci b/kernel/scripts/coccinelle/api/drm-get-put.cocci
index 0c7a9265c..bf1313274 100644
--- a/kernel/scripts/coccinelle/api/drm-get-put.cocci
+++ b/kernel/scripts/coccinelle/api/drm-get-put.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 ///
 /// Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() and
 /// drm_*_unreference() helpers.
diff --git a/kernel/scripts/coccinelle/api/simple_open.cocci b/kernel/scripts/coccinelle/api/simple_open.cocci
index bd1a2a4ee..c121876d5 100644
--- a/kernel/scripts/coccinelle/api/simple_open.cocci
+++ b/kernel/scripts/coccinelle/api/simple_open.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /// Remove an open coded simple_open() function
 /// and replace file operations references to the function
 /// with simple_open() instead.
diff --git a/kernel/scripts/coccinelle/api/vma_pages.cocci b/kernel/scripts/coccinelle/api/vma_pages.cocci
index 3e52e11ea..10511b9bf 100644
--- a/kernel/scripts/coccinelle/api/vma_pages.cocci
+++ b/kernel/scripts/coccinelle/api/vma_pages.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 ///
 /// Use vma_pages function on vma object instead of explicit computation.
 ///
diff --git a/kernel/scripts/coccinelle/misc/boolreturn.cocci b/kernel/scripts/coccinelle/misc/boolreturn.cocci
index a43c7b0c3..29d2bf41e 100644
--- a/kernel/scripts/coccinelle/misc/boolreturn.cocci
+++ b/kernel/scripts/coccinelle/misc/boolreturn.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /// Return statements in functions returning bool should use
 /// true/false instead of 1/0.
 //
diff --git a/kernel/scripts/coccinelle/misc/irqf_oneshot.cocci b/kernel/scripts/coccinelle/misc/irqf_oneshot.cocci
index f698d6d0f..7b48287b3 100644
--- a/kernel/scripts/coccinelle/misc/irqf_oneshot.cocci
+++ b/kernel/scripts/coccinelle/misc/irqf_oneshot.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /// Since commit 1c6c69525b40 ("genirq: Reject bogus threaded irq requests")
 /// threaded IRQs without a primary handler need to be requested with
 /// IRQF_ONESHOT, otherwise the request will fail.
diff --git a/kernel/scripts/coccinelle/misc/of_table.cocci b/kernel/scripts/coccinelle/misc/of_table.cocci
index 2294915a1..4693ea744 100644
--- a/kernel/scripts/coccinelle/misc/of_table.cocci
+++ b/kernel/scripts/coccinelle/misc/of_table.cocci
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /// Make sure (of/i2c/platform)_device_id tables are NULL terminated
 //
 // Keywords: of_table i2c_table platform_table
diff --git a/kernel/scripts/config b/kernel/scripts/config
index 026aeb4f3..e0e39826d 100755
--- a/kernel/scripts/config
+++ b/kernel/scripts/config
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # Manipulate options in a .config file from the command line
 
 myname=${0##*/}
diff --git a/kernel/scripts/decode_stacktrace.sh b/kernel/scripts/decode_stacktrace.sh
index 5206d99dd..64220e36c 100755
--- a/kernel/scripts/decode_stacktrace.sh
+++ b/kernel/scripts/decode_stacktrace.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # (c) 2014, Sasha Levin <sasha.levin@oracle.com>
 #set -x
 
diff --git a/kernel/scripts/decodecode b/kernel/scripts/decodecode
index d8824f37a..438120da1 100755
--- a/kernel/scripts/decodecode
+++ b/kernel/scripts/decodecode
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Disassemble the Code: line in Linux oopses
 # usage: decodecode < oops.file
 #
diff --git a/kernel/scripts/depmod.sh b/kernel/scripts/depmod.sh
index 122599b1c..9831cca31 100755
--- a/kernel/scripts/depmod.sh
+++ b/kernel/scripts/depmod.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # A depmod wrapper used by the toplevel Makefile
 
diff --git a/kernel/scripts/diffconfig b/kernel/scripts/diffconfig
index 0db267d0a..89abf777f 100755
--- a/kernel/scripts/diffconfig
+++ b/kernel/scripts/diffconfig
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# SPDX-License-Identifier: GPL-2.0
 #
 # diffconfig - a tool to compare .config files.
 #
diff --git a/kernel/scripts/dtc/Makefile b/kernel/scripts/dtc/Makefile
index 2a48022c4..0dc922bb7 100644
--- a/kernel/scripts/dtc/Makefile
+++ b/kernel/scripts/dtc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # scripts/dtc makefile
 
 hostprogs-y	:= dtc
diff --git a/kernel/scripts/dtc/fdtdump.c b/kernel/scripts/dtc/fdtdump.c
index 207a46d64..7d460a50b 100644
--- a/kernel/scripts/dtc/fdtdump.c
+++ b/kernel/scripts/dtc/fdtdump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fdtdump.c - Contributed by Pantelis Antoniou <pantelis.antoniou AT gmail.com>
  */
diff --git a/kernel/scripts/dtc/update-dtc-source.sh b/kernel/scripts/dtc/update-dtc-source.sh
index b8ebcc672..62f0d5325 100755
--- a/kernel/scripts/dtc/update-dtc-source.sh
+++ b/kernel/scripts/dtc/update-dtc-source.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Simple script to update the version of DTC carried by the Linux kernel
 #
 # This script assumes that the dtc and the linux git trees are in the
diff --git a/kernel/scripts/extract-module-sig.pl b/kernel/scripts/extract-module-sig.pl
index 0f161ea41..36a2f59c4 100755
--- a/kernel/scripts/extract-module-sig.pl
+++ b/kernel/scripts/extract-module-sig.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # extract-mod-sig <part> <module-file>
 #
diff --git a/kernel/scripts/extract-sys-certs.pl b/kernel/scripts/extract-sys-certs.pl
index 2aa873b94..fa8ab1511 100755
--- a/kernel/scripts/extract-sys-certs.pl
+++ b/kernel/scripts/extract-sys-certs.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 use warnings;
 use strict;
diff --git a/kernel/scripts/faddr2line b/kernel/scripts/faddr2line
index 2f6ce8023..1f5ce959f 100755
--- a/kernel/scripts/faddr2line
+++ b/kernel/scripts/faddr2line
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Translate stack dump function offsets.
 #
diff --git a/kernel/scripts/gcc-goto.sh b/kernel/scripts/gcc-goto.sh
index c9469d34e..083c52607 100755
--- a/kernel/scripts/gcc-goto.sh
+++ b/kernel/scripts/gcc-goto.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Test for gcc 'asm goto' support
 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
 
diff --git a/kernel/scripts/gcc-ld b/kernel/scripts/gcc-ld
index cadab9a13..997b818c3 100755
--- a/kernel/scripts/gcc-ld
+++ b/kernel/scripts/gcc-ld
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # run gcc with ld options
 # used as a wrapper to execute link time optimizations
 # yes virginia, this is not pretty
diff --git a/kernel/scripts/gcc-plugin.sh b/kernel/scripts/gcc-plugin.sh
index b65224bfb..d3caefe53 100755
--- a/kernel/scripts/gcc-plugin.sh
+++ b/kernel/scripts/gcc-plugin.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 srctree=$(dirname "$0")
 
 SHOW_ERROR=
diff --git a/kernel/scripts/gcc-plugins/Makefile b/kernel/scripts/gcc-plugins/Makefile
index 214eb2335..e2ff425f4 100644
--- a/kernel/scripts/gcc-plugins/Makefile
+++ b/kernel/scripts/gcc-plugins/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 GCC_PLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
 
 ifeq ($(PLUGINCC),$(HOSTCC))
diff --git a/kernel/scripts/gcc-plugins/gcc-common.h b/kernel/scripts/gcc-plugins/gcc-common.h
index 6948898b3..ffd1dfaa1 100644
--- a/kernel/scripts/gcc-plugins/gcc-common.h
+++ b/kernel/scripts/gcc-plugins/gcc-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GCC_COMMON_H_INCLUDED
 #define GCC_COMMON_H_INCLUDED
 
diff --git a/kernel/scripts/gcc-plugins/gcc-generate-gimple-pass.h b/kernel/scripts/gcc-plugins/gcc-generate-gimple-pass.h
index 526c3c79b..f20797e80 100644
--- a/kernel/scripts/gcc-plugins/gcc-generate-gimple-pass.h
+++ b/kernel/scripts/gcc-plugins/gcc-generate-gimple-pass.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generator for GIMPLE pass related boilerplate code/data
  *
diff --git a/kernel/scripts/gcc-plugins/gcc-generate-ipa-pass.h b/kernel/scripts/gcc-plugins/gcc-generate-ipa-pass.h
index 9bd926e07..92bb4f3a8 100644
--- a/kernel/scripts/gcc-plugins/gcc-generate-ipa-pass.h
+++ b/kernel/scripts/gcc-plugins/gcc-generate-ipa-pass.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generator for IPA pass related boilerplate code/data
  *
diff --git a/kernel/scripts/gcc-plugins/gcc-generate-rtl-pass.h b/kernel/scripts/gcc-plugins/gcc-generate-rtl-pass.h
index 1dc67a5ae..d69cd80b6 100644
--- a/kernel/scripts/gcc-plugins/gcc-generate-rtl-pass.h
+++ b/kernel/scripts/gcc-plugins/gcc-generate-rtl-pass.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generator for RTL pass related boilerplate code/data
  *
diff --git a/kernel/scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h b/kernel/scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h
index a27e2b36a..06800bc47 100644
--- a/kernel/scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h
+++ b/kernel/scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Generator for SIMPLE_IPA pass related boilerplate code/data
  *
diff --git a/kernel/scripts/gcc-plugins/gen-random-seed.sh b/kernel/scripts/gcc-plugins/gen-random-seed.sh
index 7514850f4..68af5cc20 100644
--- a/kernel/scripts/gcc-plugins/gen-random-seed.sh
+++ b/kernel/scripts/gcc-plugins/gen-random-seed.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 if [ ! -f "$1" ]; then
 	SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
diff --git a/kernel/scripts/gcc-version.sh b/kernel/scripts/gcc-version.sh
index 7f2126df9..11bb90984 100755
--- a/kernel/scripts/gcc-version.sh
+++ b/kernel/scripts/gcc-version.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # gcc-version [-p] gcc-command
 #
diff --git a/kernel/scripts/gcc-x86_32-has-stack-protector.sh b/kernel/scripts/gcc-x86_32-has-stack-protector.sh
index 12dbd0b11..6b2aeefb9 100755
--- a/kernel/scripts/gcc-x86_32-has-stack-protector.sh
+++ b/kernel/scripts/gcc-x86_32-has-stack-protector.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
diff --git a/kernel/scripts/gcc-x86_64-has-stack-protector.sh b/kernel/scripts/gcc-x86_64-has-stack-protector.sh
index 17867e723..4a48bdcd4 100755
--- a/kernel/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/kernel/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
 if [ "$?" -eq "0" ] ; then
diff --git a/kernel/scripts/gdb/linux/Makefile b/kernel/scripts/gdb/linux/Makefile
index ab3cfe727..aba23be98 100644
--- a/kernel/scripts/gdb/linux/Makefile
+++ b/kernel/scripts/gdb/linux/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 always := gdb-scripts
 
 SRCTREE := $(abspath $(srctree))
diff --git a/kernel/scripts/genksyms/Makefile b/kernel/scripts/genksyms/Makefile
index 3c23bab33..34d6ab181 100644
--- a/kernel/scripts/genksyms/Makefile
+++ b/kernel/scripts/genksyms/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 hostprogs-y	:= genksyms
 always		:= $(hostprogs-y)
diff --git a/kernel/scripts/headerdep.pl b/kernel/scripts/headerdep.pl
index 86ebb9ee7..ebfcbef43 100755
--- a/kernel/scripts/headerdep.pl
+++ b/kernel/scripts/headerdep.pl
@@ -1,4 +1,5 @@
 #! /usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # Detect cycles in the header file dependency graph
 # Vegard Nossum <vegardno@ifi.uio.no>
diff --git a/kernel/scripts/headers.sh b/kernel/scripts/headers.sh
index d4dc4de5c..e0f883eb3 100755
--- a/kernel/scripts/headers.sh
+++ b/kernel/scripts/headers.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Run headers_$1 command for all suitable architectures
 
 # Stop on error
diff --git a/kernel/scripts/headers_check.pl b/kernel/scripts/headers_check.pl
index 3091e4ee6..b6aec5e43 100755
--- a/kernel/scripts/headers_check.pl
+++ b/kernel/scripts/headers_check.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 #
 # headers_check.pl execute a number of trivial consistency checks
 #
diff --git a/kernel/scripts/headers_install.sh b/kernel/scripts/headers_install.sh
index fdebd66f8..4d1ea96e8 100755
--- a/kernel/scripts/headers_install.sh
+++ b/kernel/scripts/headers_install.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 if [ $# -lt 2 ]
 then
diff --git a/kernel/scripts/kconfig/Makefile b/kernel/scripts/kconfig/Makefile
index 8c12c20c5..297c1bf35 100644
--- a/kernel/scripts/kconfig/Makefile
+++ b/kernel/scripts/kconfig/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ===========================================================================
 # Kernel configuration targets
 # These targets are used from top-level makefile
diff --git a/kernel/scripts/kconfig/check.sh b/kernel/scripts/kconfig/check.sh
index 55b79ba1b..97f0fee7d 100755
--- a/kernel/scripts/kconfig/check.sh
+++ b/kernel/scripts/kconfig/check.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Needed for systems without gettext
 $* -x c -o /dev/null - > /dev/null 2>&1 << EOF
 #include <libintl.h>
diff --git a/kernel/scripts/kconfig/list.h b/kernel/scripts/kconfig/list.h
index 2cf23f002..45cb237ab 100644
--- a/kernel/scripts/kconfig/list.h
+++ b/kernel/scripts/kconfig/list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LIST_H
 #define LIST_H
 
diff --git a/kernel/scripts/kconfig/lkc_proto.h b/kernel/scripts/kconfig/lkc_proto.h
index d5398718e..5d86e2dfa 100644
--- a/kernel/scripts/kconfig/lkc_proto.h
+++ b/kernel/scripts/kconfig/lkc_proto.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <stdarg.h>
 
 /* confdata.c */
diff --git a/kernel/scripts/kconfig/lxdialog/check-lxdialog.sh b/kernel/scripts/kconfig/lxdialog/check-lxdialog.sh
index 5075ebf2d..a10bd9d6f 100755
--- a/kernel/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/kernel/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Check ncurses compatibility
 
 # What library to link
diff --git a/kernel/scripts/ld-version.sh b/kernel/scripts/ld-version.sh
index d135882e2..f2be0ff9a 100755
--- a/kernel/scripts/ld-version.sh
+++ b/kernel/scripts/ld-version.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 # extract linker version number from stdin and turn into single number
 	{
 	gsub(".*\\)", "");
diff --git a/kernel/scripts/link-vmlinux.sh b/kernel/scripts/link-vmlinux.sh
index e7b7eee31..e6818b8e7 100755
--- a/kernel/scripts/link-vmlinux.sh
+++ b/kernel/scripts/link-vmlinux.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # link vmlinux
 #
diff --git a/kernel/scripts/makelst b/kernel/scripts/makelst
index e6581496d..e432af073 100755
--- a/kernel/scripts/makelst
+++ b/kernel/scripts/makelst
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # A script to dump mixed source code & assembly
 # with correct relocations from System.map
 # Requires the following lines in makefile:
diff --git a/kernel/scripts/mkcompile_h b/kernel/scripts/mkcompile_h
index fd8fdb915..959199c31 100755
--- a/kernel/scripts/mkcompile_h
+++ b/kernel/scripts/mkcompile_h
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 TARGET=$1
 ARCH=$2
diff --git a/kernel/scripts/mkmakefile b/kernel/scripts/mkmakefile
index 84af27bf0..e19d6565f 100755
--- a/kernel/scripts/mkmakefile
+++ b/kernel/scripts/mkmakefile
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Generates a small Makefile used in the root of the output
 # directory, to allow make to be started from there.
 # The Makefile also allow for more convinient build of external modules
diff --git a/kernel/scripts/mkuboot.sh b/kernel/scripts/mkuboot.sh
index 446739c78..4b1fe09e9 100755
--- a/kernel/scripts/mkuboot.sh
+++ b/kernel/scripts/mkuboot.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 #
 # Build U-Boot image when `mkimage' tool is available.
diff --git a/kernel/scripts/mod/Makefile b/kernel/scripts/mod/Makefile
index b497d9764..42c5d50f2 100644
--- a/kernel/scripts/mod/Makefile
+++ b/kernel/scripts/mod/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OBJECT_FILES_NON_STANDARD := y
 
 hostprogs-y	:= modpost mk_elfconfig
diff --git a/kernel/scripts/mod/devicetable-offsets.c b/kernel/scripts/mod/devicetable-offsets.c
index e4d90e50f..6d0193a3c 100644
--- a/kernel/scripts/mod/devicetable-offsets.c
+++ b/kernel/scripts/mod/devicetable-offsets.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kbuild.h>
 #include <linux/mod_devicetable.h>
 
diff --git a/kernel/scripts/mod/mk_elfconfig.c b/kernel/scripts/mod/mk_elfconfig.c
index a4fd71d71..680eade89 100644
--- a/kernel/scripts/mod/mk_elfconfig.c
+++ b/kernel/scripts/mod/mk_elfconfig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/scripts/mod/modpost.h b/kernel/scripts/mod/modpost.h
index 6a5e15151..8453d6ac2 100644
--- a/kernel/scripts/mod/modpost.h
+++ b/kernel/scripts/mod/modpost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/kernel/scripts/package/buildtar b/kernel/scripts/package/buildtar
index 51f947118..e8cc72a51 100755
--- a/kernel/scripts/package/buildtar
+++ b/kernel/scripts/package/buildtar
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 #
 # buildtar 0.0.4
diff --git a/kernel/scripts/parse-maintainers.pl b/kernel/scripts/parse-maintainers.pl
index e40b53db7..5dbd2faa2 100644
--- a/kernel/scripts/parse-maintainers.pl
+++ b/kernel/scripts/parse-maintainers.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# SPDX-License-Identifier: GPL-2.0
 
 use strict;
 
diff --git a/kernel/scripts/patch-kernel b/kernel/scripts/patch-kernel
index 49b4241e8..033d59167 100755
--- a/kernel/scripts/patch-kernel
+++ b/kernel/scripts/patch-kernel
@@ -1,4 +1,5 @@
 #! /bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Script to apply kernel patches.
 #   usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ]
 #     The source directory defaults to /usr/src/linux, and the patch
diff --git a/kernel/scripts/profile2linkerlist.pl b/kernel/scripts/profile2linkerlist.pl
index f23d7be94..316e71918 100755
--- a/kernel/scripts/profile2linkerlist.pl
+++ b/kernel/scripts/profile2linkerlist.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 
 #
 # Takes a (sorted) output of readprofile and turns it into a list suitable for
diff --git a/kernel/scripts/prune-kernel b/kernel/scripts/prune-kernel
index ab5034e1d..e8aa940bc 100755
--- a/kernel/scripts/prune-kernel
+++ b/kernel/scripts/prune-kernel
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 # because I use CONFIG_LOCALVERSION_AUTO, not the same version again and
 # again, /boot and /lib/modules/ eventually fill up.
diff --git a/kernel/scripts/selinux/genheaders/Makefile b/kernel/scripts/selinux/genheaders/Makefile
index 6fc2b8789..e8c533140 100644
--- a/kernel/scripts/selinux/genheaders/Makefile
+++ b/kernel/scripts/selinux/genheaders/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 hostprogs-y	:= genheaders
 HOST_EXTRACFLAGS += \
 	-I$(srctree)/include/uapi -I$(srctree)/include \
diff --git a/kernel/scripts/selinux/genheaders/genheaders.c b/kernel/scripts/selinux/genheaders/genheaders.c
index 672b069dc..fa48fabcb 100644
--- a/kernel/scripts/selinux/genheaders/genheaders.c
+++ b/kernel/scripts/selinux/genheaders/genheaders.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 /* NOTE: we really do want to use the kernel headers here */
 #define __EXPORTED_HEADERS__
diff --git a/kernel/scripts/selinux/install_policy.sh b/kernel/scripts/selinux/install_policy.sh
index f6a0ce710..0b86c47ba 100755
--- a/kernel/scripts/selinux/install_policy.sh
+++ b/kernel/scripts/selinux/install_policy.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 if [ `id -u` -ne 0 ]; then
 	echo "$0: must be root to install the selinux policy"
 	exit 1
diff --git a/kernel/scripts/selinux/mdp/Makefile b/kernel/scripts/selinux/mdp/Makefile
index d6a83cafe..e9c92db7e 100644
--- a/kernel/scripts/selinux/mdp/Makefile
+++ b/kernel/scripts/selinux/mdp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 hostprogs-y	:= mdp
 HOST_EXTRACFLAGS += \
 	-I$(srctree)/include/uapi -I$(srctree)/include \
diff --git a/kernel/scripts/setlocalversion b/kernel/scripts/setlocalversion
index 966dd3924..71f394106 100755
--- a/kernel/scripts/setlocalversion
+++ b/kernel/scripts/setlocalversion
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # This scripts adds local version information from the version
 # control systems git, mercurial (hg) and subversion (svn).
diff --git a/kernel/scripts/stackdelta b/kernel/scripts/stackdelta
index 20a79f19a..44d2dfd62 100755
--- a/kernel/scripts/stackdelta
+++ b/kernel/scripts/stackdelta
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 
 # Read two files produced by the stackusage script, and show the
 # delta between them.
diff --git a/kernel/scripts/stackusage b/kernel/scripts/stackusage
index 8cf26640e..56ef1ab67 100755
--- a/kernel/scripts/stackusage
+++ b/kernel/scripts/stackusage
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 outfile=""
 now=`date +%s`
diff --git a/kernel/scripts/tracing/ftrace-bisect.sh b/kernel/scripts/tracing/ftrace-bisect.sh
index 9ff8ac5fc..926701162 100755
--- a/kernel/scripts/tracing/ftrace-bisect.sh
+++ b/kernel/scripts/tracing/ftrace-bisect.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Here's how to use this:
 #
diff --git a/kernel/scripts/ver_linux b/kernel/scripts/ver_linux
index b51de8a7e..545ec7388 100755
--- a/kernel/scripts/ver_linux
+++ b/kernel/scripts/ver_linux
@@ -1,4 +1,5 @@
 #!/usr/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 # Before running this script please ensure that your PATH is
 # typical as you use for compilation/installation. I use
 # /bin /sbin /usr/bin /usr/sbin /usr/local/bin, but it may
diff --git a/kernel/scripts/xen-hypercalls.sh b/kernel/scripts/xen-hypercalls.sh
index 676d92268..f18b00843 100644
--- a/kernel/scripts/xen-hypercalls.sh
+++ b/kernel/scripts/xen-hypercalls.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 out="$1"
 shift
 in="$@"
diff --git a/kernel/security/Makefile b/kernel/security/Makefile
index f2d71cdb8..4d2d3782d 100644
--- a/kernel/security/Makefile
+++ b/kernel/security/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the kernel security code
 #
diff --git a/kernel/security/apparmor/Makefile b/kernel/security/apparmor/Makefile
index 81a34426d..9a6b4033d 100644
--- a/kernel/security/apparmor/Makefile
+++ b/kernel/security/apparmor/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for AppArmor Linux Security Module
 #
 obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
diff --git a/kernel/security/device_cgroup.c b/kernel/security/device_cgroup.c
index 03c1652c9..5ef7e5240 100644
--- a/kernel/security/device_cgroup.c
+++ b/kernel/security/device_cgroup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * device_cgroup.c - device cgroup subsystem
  *
diff --git a/kernel/security/integrity/Makefile b/kernel/security/integrity/Makefile
index 8d1f4bf51..04d6e462b 100644
--- a/kernel/security/integrity/Makefile
+++ b/kernel/security/integrity/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for caching inode integrity data (iint)
 #
diff --git a/kernel/security/integrity/ima/Makefile b/kernel/security/integrity/ima/Makefile
index 29f198bde..d921dc4f9 100644
--- a/kernel/security/integrity/ima/Makefile
+++ b/kernel/security/integrity/ima/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for building Trusted Computing Group's(TCG) runtime Integrity
 # Measurement Architecture(IMA).
diff --git a/kernel/security/keys/Makefile b/kernel/security/keys/Makefile
index 57dff0c15..ef1581b33 100644
--- a/kernel/security/keys/Makefile
+++ b/kernel/security/keys/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for key management
 #
diff --git a/kernel/security/keys/encrypted-keys/Makefile b/kernel/security/keys/encrypted-keys/Makefile
index d6f843325..7a44dce6f 100644
--- a/kernel/security/keys/encrypted-keys/Makefile
+++ b/kernel/security/keys/encrypted-keys/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for encrypted keys
 #
diff --git a/kernel/security/keys/encrypted-keys/encrypted.h b/kernel/security/keys/encrypted-keys/encrypted.h
index 47802c0de..1809995db 100644
--- a/kernel/security/keys/encrypted-keys/encrypted.h
+++ b/kernel/security/keys/encrypted-keys/encrypted.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ENCRYPTED_KEY_H
 #define __ENCRYPTED_KEY_H
 
diff --git a/kernel/security/keys/keyring.c b/kernel/security/keys/keyring.c
index a7e51f793..36f842ec8 100644
--- a/kernel/security/keys/keyring.c
+++ b/kernel/security/keys/keyring.c
@@ -459,34 +459,33 @@ static long keyring_read(const struct key *keyring,
 			 char __user *buffer, size_t buflen)
 {
 	struct keyring_read_iterator_context ctx;
-	unsigned long nr_keys;
-	int ret;
+	long ret;
 
 	kenter("{%d},,%zu", key_serial(keyring), buflen);
 
 	if (buflen & (sizeof(key_serial_t) - 1))
 		return -EINVAL;
 
-	nr_keys = keyring->keys.nr_leaves_on_tree;
-	if (nr_keys == 0)
-		return 0;
-
-	/* Calculate how much data we could return */
-	if (!buffer || !buflen)
-		return nr_keys * sizeof(key_serial_t);
-
-	/* Copy the IDs of the subscribed keys into the buffer */
-	ctx.buffer = (key_serial_t __user *)buffer;
-	ctx.buflen = buflen;
-	ctx.count = 0;
-	ret = assoc_array_iterate(&keyring->keys, keyring_read_iterator, &ctx);
-	if (ret < 0) {
-		kleave(" = %d [iterate]", ret);
-		return ret;
+	/* Copy as many key IDs as fit into the buffer */
+	if (buffer && buflen) {
+		ctx.buffer = (key_serial_t __user *)buffer;
+		ctx.buflen = buflen;
+		ctx.count = 0;
+		ret = assoc_array_iterate(&keyring->keys,
+					  keyring_read_iterator, &ctx);
+		if (ret < 0) {
+			kleave(" = %ld [iterate]", ret);
+			return ret;
+		}
 	}
 
-	kleave(" = %zu [ok]", ctx.count);
-	return ctx.count;
+	/* Return the size of the buffer needed */
+	ret = keyring->keys.nr_leaves_on_tree * sizeof(key_serial_t);
+	if (ret <= buflen)
+		kleave("= %ld [ok]", ret);
+	else
+		kleave("= %ld [buffer too small]", ret);
+	return ret;
 }
 
 /*
diff --git a/kernel/security/keys/trusted.c b/kernel/security/keys/trusted.c
index bd85315cb..98aa89ff7 100644
--- a/kernel/security/keys/trusted.c
+++ b/kernel/security/keys/trusted.c
@@ -1147,20 +1147,21 @@ static long trusted_read(const struct key *key, char __user *buffer,
 	p = dereference_key_locked(key);
 	if (!p)
 		return -EINVAL;
-	if (!buffer || buflen <= 0)
-		return 2 * p->blob_len;
-	ascii_buf = kmalloc(2 * p->blob_len, GFP_KERNEL);
-	if (!ascii_buf)
-		return -ENOMEM;
 
-	bufp = ascii_buf;
-	for (i = 0; i < p->blob_len; i++)
-		bufp = hex_byte_pack(bufp, p->blob[i]);
-	if ((copy_to_user(buffer, ascii_buf, 2 * p->blob_len)) != 0) {
+	if (buffer && buflen >= 2 * p->blob_len) {
+		ascii_buf = kmalloc(2 * p->blob_len, GFP_KERNEL);
+		if (!ascii_buf)
+			return -ENOMEM;
+
+		bufp = ascii_buf;
+		for (i = 0; i < p->blob_len; i++)
+			bufp = hex_byte_pack(bufp, p->blob[i]);
+		if (copy_to_user(buffer, ascii_buf, 2 * p->blob_len) != 0) {
+			kzfree(ascii_buf);
+			return -EFAULT;
+		}
 		kzfree(ascii_buf);
-		return -EFAULT;
 	}
-	kzfree(ascii_buf);
 	return 2 * p->blob_len;
 }
 
diff --git a/kernel/security/keys/trusted.h b/kernel/security/keys/trusted.h
index ff001a5dc..8d5fe9eaf 100644
--- a/kernel/security/keys/trusted.h
+++ b/kernel/security/keys/trusted.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRUSTED_KEY_H
 #define __TRUSTED_KEY_H
 
diff --git a/kernel/security/min_addr.c b/kernel/security/min_addr.c
index f728728f1..94d2b0cf0 100644
--- a/kernel/security/min_addr.c
+++ b/kernel/security/min_addr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/security.h>
diff --git a/kernel/security/selinux/Makefile b/kernel/security/selinux/Makefile
index ff5895ede..c7161f879 100644
--- a/kernel/security/selinux/Makefile
+++ b/kernel/security/selinux/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for building the SELinux module as part of the kernel tree.
 #
diff --git a/kernel/security/selinux/include/avc.h b/kernel/security/selinux/include/avc.h
index a5004e9de..57d61cf36 100644
--- a/kernel/security/selinux/include/avc.h
+++ b/kernel/security/selinux/include/avc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Access vector cache interface for object managers.
  *
diff --git a/kernel/security/selinux/include/avc_ss.h b/kernel/security/selinux/include/avc_ss.h
index 37d57dadd..3bcc72769 100644
--- a/kernel/security/selinux/include/avc_ss.h
+++ b/kernel/security/selinux/include/avc_ss.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Access vector cache interface for the security server.
  *
diff --git a/kernel/security/selinux/include/classmap.h b/kernel/security/selinux/include/classmap.h
index 35ffb29a6..cc35695d9 100644
--- a/kernel/security/selinux/include/classmap.h
+++ b/kernel/security/selinux/include/classmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/capability.h>
 
 #define COMMON_FILE_SOCK_PERMS "ioctl", "read", "write", "create", \
diff --git a/kernel/security/selinux/include/initial_sid_to_string.h b/kernel/security/selinux/include/initial_sid_to_string.h
index a59b64e3f..4f93f697f 100644
--- a/kernel/security/selinux/include/initial_sid_to_string.h
+++ b/kernel/security/selinux/include/initial_sid_to_string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* This file is automatically generated.  Do not edit. */
 static const char *initial_sid_to_string[] =
 {
diff --git a/kernel/security/selinux/include/security.h b/kernel/security/selinux/include/security.h
index 28dfb2f93..02f0412d4 100644
--- a/kernel/security/selinux/include/security.h
+++ b/kernel/security/selinux/include/security.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Security server interface.
  *
diff --git a/kernel/security/selinux/include/xfrm.h b/kernel/security/selinux/include/xfrm.h
index 36a7ce9e1..1f173a7a4 100644
--- a/kernel/security/selinux/include/xfrm.h
+++ b/kernel/security/selinux/include/xfrm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * SELinux support for the XFRM LSM hooks
  *
diff --git a/kernel/security/selinux/ss/constraint.h b/kernel/security/selinux/ss/constraint.h
index 33ae2aec4..4e563be9e 100644
--- a/kernel/security/selinux/ss/constraint.h
+++ b/kernel/security/selinux/ss/constraint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A constraint is a condition that must be satisfied in
  * order for one or more permissions to be granted.
diff --git a/kernel/security/selinux/ss/context.h b/kernel/security/selinux/ss/context.h
index a2c0f37c4..2260c44a5 100644
--- a/kernel/security/selinux/ss/context.h
+++ b/kernel/security/selinux/ss/context.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A security context is a set of security attributes
  * associated with each subject and object controlled
diff --git a/kernel/security/selinux/ss/ebitmap.c b/kernel/security/selinux/ss/ebitmap.c
index fc28149a4..b6a78b092 100644
--- a/kernel/security/selinux/ss/ebitmap.c
+++ b/kernel/security/selinux/ss/ebitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of the extensible bitmap type.
  *
diff --git a/kernel/security/selinux/ss/ebitmap.h b/kernel/security/selinux/ss/ebitmap.h
index da1325dda..edf4fa39c 100644
--- a/kernel/security/selinux/ss/ebitmap.h
+++ b/kernel/security/selinux/ss/ebitmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * An extensible bitmap is a bitmap that supports an
  * arbitrary number of bits.  Extensible bitmaps are
diff --git a/kernel/security/selinux/ss/hashtab.c b/kernel/security/selinux/ss/hashtab.c
index 686c39170..6bd6dcd95 100644
--- a/kernel/security/selinux/ss/hashtab.c
+++ b/kernel/security/selinux/ss/hashtab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of the hash table type.
  *
diff --git a/kernel/security/selinux/ss/hashtab.h b/kernel/security/selinux/ss/hashtab.h
index 009fb5e06..3e3e42bfd 100644
--- a/kernel/security/selinux/ss/hashtab.h
+++ b/kernel/security/selinux/ss/hashtab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A hash table (hashtab) maintains associations between
  * key values and datum values.  The type of the key values
diff --git a/kernel/security/selinux/ss/mls.c b/kernel/security/selinux/ss/mls.c
index d9dc34f4f..ad982ce8b 100644
--- a/kernel/security/selinux/ss/mls.c
+++ b/kernel/security/selinux/ss/mls.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of the multi-level security (MLS) policy.
  *
diff --git a/kernel/security/selinux/ss/mls.h b/kernel/security/selinux/ss/mls.h
index 0f0a1d65b..131d76266 100644
--- a/kernel/security/selinux/ss/mls.h
+++ b/kernel/security/selinux/ss/mls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Multi-level security (MLS) policy operations.
  *
diff --git a/kernel/security/selinux/ss/mls_types.h b/kernel/security/selinux/ss/mls_types.h
index 47f3702cd..068e0d780 100644
--- a/kernel/security/selinux/ss/mls_types.h
+++ b/kernel/security/selinux/ss/mls_types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Type definitions for the multi-level security (MLS) policy.
  *
diff --git a/kernel/security/selinux/ss/services.h b/kernel/security/selinux/ss/services.h
index 3d9fa9556..356bdd36c 100644
--- a/kernel/security/selinux/ss/services.h
+++ b/kernel/security/selinux/ss/services.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Implementation of the security services.
  *
diff --git a/kernel/security/selinux/ss/sidtab.c b/kernel/security/selinux/ss/sidtab.c
index 6ae08efc5..5be31b7af 100644
--- a/kernel/security/selinux/ss/sidtab.c
+++ b/kernel/security/selinux/ss/sidtab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of the SID table type.
  *
diff --git a/kernel/security/selinux/ss/sidtab.h b/kernel/security/selinux/ss/sidtab.h
index de5d0ea58..a1a1d2617 100644
--- a/kernel/security/selinux/ss/sidtab.h
+++ b/kernel/security/selinux/ss/sidtab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A security identifier table (sidtab) is a hash table
  * of security context structures indexed by SID value.
diff --git a/kernel/security/selinux/ss/symtab.c b/kernel/security/selinux/ss/symtab.c
index d1a674584..dc2ce9416 100644
--- a/kernel/security/selinux/ss/symtab.c
+++ b/kernel/security/selinux/ss/symtab.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Implementation of the symbol table type.
  *
diff --git a/kernel/security/selinux/ss/symtab.h b/kernel/security/selinux/ss/symtab.h
index 0bc12d587..d75fcafe7 100644
--- a/kernel/security/selinux/ss/symtab.h
+++ b/kernel/security/selinux/ss/symtab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * A symbol table (symtab) maintains associations between symbol
  * strings and datum values.  The type of the datum values
diff --git a/kernel/security/tomoyo/Makefile b/kernel/security/tomoyo/Makefile
index 65dbcb2fd..b7c6a7ffc 100644
--- a/kernel/security/tomoyo/Makefile
+++ b/kernel/security/tomoyo/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-y = audit.o common.o condition.o domain.o environ.o file.o gc.o group.o load_policy.o memory.o mount.o network.o realpath.o securityfs_if.o tomoyo.o util.o
 
 targets += builtin-policy.h
diff --git a/kernel/security/tomoyo/audit.c b/kernel/security/tomoyo/audit.c
index 3ffa4f550..d330b060d 100644
--- a/kernel/security/tomoyo/audit.c
+++ b/kernel/security/tomoyo/audit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/audit.c
  *
diff --git a/kernel/security/tomoyo/common.c b/kernel/security/tomoyo/common.c
index e0fb75052..21691b99e 100644
--- a/kernel/security/tomoyo/common.c
+++ b/kernel/security/tomoyo/common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/common.c
  *
diff --git a/kernel/security/tomoyo/common.h b/kernel/security/tomoyo/common.h
index 361e7a284..e4097d799 100644
--- a/kernel/security/tomoyo/common.h
+++ b/kernel/security/tomoyo/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * security/tomoyo/common.h
  *
diff --git a/kernel/security/tomoyo/condition.c b/kernel/security/tomoyo/condition.c
index 6c4528d4b..8d0e1b9c9 100644
--- a/kernel/security/tomoyo/condition.c
+++ b/kernel/security/tomoyo/condition.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/condition.c
  *
diff --git a/kernel/security/tomoyo/domain.c b/kernel/security/tomoyo/domain.c
index 00d223e9f..f6758dad9 100644
--- a/kernel/security/tomoyo/domain.c
+++ b/kernel/security/tomoyo/domain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/domain.c
  *
diff --git a/kernel/security/tomoyo/environ.c b/kernel/security/tomoyo/environ.c
index ad4c6e18a..7f0a471f1 100644
--- a/kernel/security/tomoyo/environ.c
+++ b/kernel/security/tomoyo/environ.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/environ.c
  *
diff --git a/kernel/security/tomoyo/file.c b/kernel/security/tomoyo/file.c
index 223f21ffa..2a374b4da 100644
--- a/kernel/security/tomoyo/file.c
+++ b/kernel/security/tomoyo/file.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/file.c
  *
diff --git a/kernel/security/tomoyo/gc.c b/kernel/security/tomoyo/gc.c
index 540bc29e1..e22bea811 100644
--- a/kernel/security/tomoyo/gc.c
+++ b/kernel/security/tomoyo/gc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/gc.c
  *
diff --git a/kernel/security/tomoyo/group.c b/kernel/security/tomoyo/group.c
index 944ad77d8..21b0cc3a7 100644
--- a/kernel/security/tomoyo/group.c
+++ b/kernel/security/tomoyo/group.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/group.c
  *
diff --git a/kernel/security/tomoyo/load_policy.c b/kernel/security/tomoyo/load_policy.c
index 078fac0bb..81b951652 100644
--- a/kernel/security/tomoyo/load_policy.c
+++ b/kernel/security/tomoyo/load_policy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/load_policy.c
  *
diff --git a/kernel/security/tomoyo/memory.c b/kernel/security/tomoyo/memory.c
index 1598b559a..12477e0b0 100644
--- a/kernel/security/tomoyo/memory.c
+++ b/kernel/security/tomoyo/memory.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/memory.c
  *
diff --git a/kernel/security/tomoyo/mount.c b/kernel/security/tomoyo/mount.c
index 14b53fb2a..807fd91db 100644
--- a/kernel/security/tomoyo/mount.c
+++ b/kernel/security/tomoyo/mount.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/mount.c
  *
diff --git a/kernel/security/tomoyo/network.c b/kernel/security/tomoyo/network.c
index 6c02ac478..cd6932e52 100644
--- a/kernel/security/tomoyo/network.c
+++ b/kernel/security/tomoyo/network.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/network.c
  *
diff --git a/kernel/security/tomoyo/realpath.c b/kernel/security/tomoyo/realpath.c
index a97b275ca..6ff8c21e4 100644
--- a/kernel/security/tomoyo/realpath.c
+++ b/kernel/security/tomoyo/realpath.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/realpath.c
  *
diff --git a/kernel/security/tomoyo/securityfs_if.c b/kernel/security/tomoyo/securityfs_if.c
index 06ab41b1f..49393c2a3 100644
--- a/kernel/security/tomoyo/securityfs_if.c
+++ b/kernel/security/tomoyo/securityfs_if.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/securityfs_if.c
  *
diff --git a/kernel/security/tomoyo/tomoyo.c b/kernel/security/tomoyo/tomoyo.c
index d25b70536..213b8c593 100644
--- a/kernel/security/tomoyo/tomoyo.c
+++ b/kernel/security/tomoyo/tomoyo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/tomoyo.c
  *
diff --git a/kernel/security/tomoyo/util.c b/kernel/security/tomoyo/util.c
index 848317fea..580b31891 100644
--- a/kernel/security/tomoyo/util.c
+++ b/kernel/security/tomoyo/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * security/tomoyo/util.c
  *
diff --git a/kernel/sound/Makefile b/kernel/sound/Makefile
index 6de45d2c3..f2d1d093b 100644
--- a/kernel/sound/Makefile
+++ b/kernel/sound/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux sound card driver
 #
 
diff --git a/kernel/sound/aoa/codecs/Makefile b/kernel/sound/aoa/codecs/Makefile
index c3ee77fc4..95f4c3849 100644
--- a/kernel/sound/aoa/codecs/Makefile
+++ b/kernel/sound/aoa/codecs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-aoa-codec-onyx-objs := onyx.o
 snd-aoa-codec-tas-objs := tas.o
 snd-aoa-codec-toonie-objs := toonie.o
diff --git a/kernel/sound/aoa/codecs/tas-basstreble.h b/kernel/sound/aoa/codecs/tas-basstreble.h
index 69b61136f..770935af6 100644
--- a/kernel/sound/aoa/codecs/tas-basstreble.h
+++ b/kernel/sound/aoa/codecs/tas-basstreble.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This file is only included exactly once!
  *
diff --git a/kernel/sound/aoa/codecs/tas-gain-table.h b/kernel/sound/aoa/codecs/tas-gain-table.h
index 4cfa67577..77b8e7dc5 100644
--- a/kernel/sound/aoa/codecs/tas-gain-table.h
+++ b/kernel/sound/aoa/codecs/tas-gain-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  This is the program used to generate below table.
 
diff --git a/kernel/sound/aoa/core/Makefile b/kernel/sound/aoa/core/Makefile
index a1596e88c..056d69683 100644
--- a/kernel/sound/aoa/core/Makefile
+++ b/kernel/sound/aoa/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SND_AOA) += snd-aoa.o
 snd-aoa-objs := core.o \
 		alsa.o \
diff --git a/kernel/sound/aoa/soundbus/sysfs.c b/kernel/sound/aoa/soundbus/sysfs.c
index 5b2d51d99..81da020bd 100644
--- a/kernel/sound/aoa/soundbus/sysfs.c
+++ b/kernel/sound/aoa/soundbus/sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/stat.h>
 /* FIX UP */
diff --git a/kernel/sound/arm/Makefile b/kernel/sound/arm/Makefile
index 8c0c851d4..e10d5b169 100644
--- a/kernel/sound/arm/Makefile
+++ b/kernel/sound/arm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 #
diff --git a/kernel/sound/core/Makefile b/kernel/sound/core/Makefile
index e2066e2ef..ee4a4a6b9 100644
--- a/kernel/sound/core/Makefile
+++ b/kernel/sound/core/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 1999,2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/core/oss/Makefile b/kernel/sound/core/oss/Makefile
index 10a794532..ae25edcc3 100644
--- a/kernel/sound/core/oss/Makefile
+++ b/kernel/sound/core/oss/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/core/pcm_param_trace.h b/kernel/sound/core/pcm_param_trace.h
index 86c8d658a..08abba313 100644
--- a/kernel/sound/core/pcm_param_trace.h
+++ b/kernel/sound/core/pcm_param_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM snd_pcm
 
diff --git a/kernel/sound/core/pcm_trace.h b/kernel/sound/core/pcm_trace.h
index 3ddec1b8a..f18da2050 100644
--- a/kernel/sound/core/pcm_trace.h
+++ b/kernel/sound/core/pcm_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM snd_pcm
 #define TRACE_INCLUDE_FILE pcm_trace
diff --git a/kernel/sound/core/seq/Makefile b/kernel/sound/core/seq/Makefile
index 68fd367ac..3a2177a7e 100644
--- a/kernel/sound/core/seq/Makefile
+++ b/kernel/sound/core/seq/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/core/seq/seq_clientmgr.c b/kernel/sound/core/seq/seq_clientmgr.c
index 6c9cba216..d10c780df 100644
--- a/kernel/sound/core/seq/seq_clientmgr.c
+++ b/kernel/sound/core/seq/seq_clientmgr.c
@@ -663,7 +663,7 @@ static int deliver_to_subscribers(struct snd_seq_client *client,
 	if (atomic)
 		read_lock(&grp->list_lock);
 	else
-		down_read(&grp->list_mutex);
+		down_read_nested(&grp->list_mutex, hop);
 	list_for_each_entry(subs, &grp->list_head, src_list) {
 		/* both ports ready? */
 		if (atomic_read(&subs->ref_count) != 2)
diff --git a/kernel/sound/core/seq/seq_lock.h b/kernel/sound/core/seq/seq_lock.h
index ac38031c3..a973860eb 100644
--- a/kernel/sound/core/seq/seq_lock.h
+++ b/kernel/sound/core/seq/seq_lock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SND_SEQ_LOCK_H
 #define __SND_SEQ_LOCK_H
 
diff --git a/kernel/sound/core/timer_compat.c b/kernel/sound/core/timer_compat.c
index 6a437eb66..59127b6ef 100644
--- a/kernel/sound/core/timer_compat.c
+++ b/kernel/sound/core/timer_compat.c
@@ -133,7 +133,8 @@ enum {
 #endif /* CONFIG_X86_X32 */
 };
 
-static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
+static long __snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd,
+					  unsigned long arg)
 {
 	void __user *argp = compat_ptr(arg);
 
@@ -153,7 +154,7 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
 	case SNDRV_TIMER_IOCTL_PAUSE:
 	case SNDRV_TIMER_IOCTL_PAUSE_OLD:
 	case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
-		return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
+		return __snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
 	case SNDRV_TIMER_IOCTL_GPARAMS32:
 		return snd_timer_user_gparams_compat(file, argp);
 	case SNDRV_TIMER_IOCTL_INFO32:
@@ -167,3 +168,15 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
 	}
 	return -ENOIOCTLCMD;
 }
+
+static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd,
+					unsigned long arg)
+{
+	struct snd_timer_user *tu = file->private_data;
+	long ret;
+
+	mutex_lock(&tu->ioctl_lock);
+	ret = __snd_timer_user_ioctl_compat(file, cmd, arg);
+	mutex_unlock(&tu->ioctl_lock);
+	return ret;
+}
diff --git a/kernel/sound/drivers/Makefile b/kernel/sound/drivers/Makefile
index 1a8440c8b..615558a28 100644
--- a/kernel/sound/drivers/Makefile
+++ b/kernel/sound/drivers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/drivers/opl3/Makefile b/kernel/sound/drivers/opl3/Makefile
index d72b1e7b5..83bca9f1f 100644
--- a/kernel/sound/drivers/opl3/Makefile
+++ b/kernel/sound/drivers/opl3/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/drivers/opl4/Makefile b/kernel/sound/drivers/opl4/Makefile
index c8eaa433d..6e86a4092 100644
--- a/kernel/sound/drivers/opl4/Makefile
+++ b/kernel/sound/drivers/opl4/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/drivers/pcsp/pcsp.h b/kernel/sound/drivers/pcsp/pcsp.h
index fc7a2dc41..036ad3c99 100644
--- a/kernel/sound/drivers/pcsp/pcsp.h
+++ b/kernel/sound/drivers/pcsp/pcsp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PC-Speaker driver for Linux
  *
diff --git a/kernel/sound/drivers/pcsp/pcsp_input.h b/kernel/sound/drivers/pcsp/pcsp_input.h
index d692749b8..e80079b38 100644
--- a/kernel/sound/drivers/pcsp/pcsp_input.h
+++ b/kernel/sound/drivers/pcsp/pcsp_input.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * PC-Speaker driver for Linux
  *
diff --git a/kernel/sound/drivers/pcsp/pcsp_lib.c b/kernel/sound/drivers/pcsp/pcsp_lib.c
index 2f5a35f38..8f0f05bbc 100644
--- a/kernel/sound/drivers/pcsp/pcsp_lib.c
+++ b/kernel/sound/drivers/pcsp/pcsp_lib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PC-Speaker driver for Linux
  *
diff --git a/kernel/sound/drivers/pcsp/pcsp_mixer.c b/kernel/sound/drivers/pcsp/pcsp_mixer.c
index f1e1defc0..be2990451 100644
--- a/kernel/sound/drivers/pcsp/pcsp_mixer.c
+++ b/kernel/sound/drivers/pcsp/pcsp_mixer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * PC-Speaker driver for Linux
  *
diff --git a/kernel/sound/firewire/Makefile b/kernel/sound/firewire/Makefile
index 1b98fa3fa..44a7b510b 100644
--- a/kernel/sound/firewire/Makefile
+++ b/kernel/sound/firewire/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # To find a header included by define_trace.h.
 CFLAGS_amdtp-stream.o	:= -I$(src)
 
diff --git a/kernel/sound/firewire/amdtp-am824.h b/kernel/sound/firewire/amdtp-am824.h
index b56e61fc9..06d280783 100644
--- a/kernel/sound/firewire/amdtp-am824.h
+++ b/kernel/sound/firewire/amdtp-am824.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_AMDTP_AM824_H_INCLUDED
 #define SOUND_FIREWIRE_AMDTP_AM824_H_INCLUDED
 
diff --git a/kernel/sound/firewire/amdtp-stream.h b/kernel/sound/firewire/amdtp-stream.h
index ed6eafd10..a608dae83 100644
--- a/kernel/sound/firewire/amdtp-stream.h
+++ b/kernel/sound/firewire/amdtp-stream.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_AMDTP_H_INCLUDED
 #define SOUND_FIREWIRE_AMDTP_H_INCLUDED
 
diff --git a/kernel/sound/firewire/bebob/Makefile b/kernel/sound/firewire/bebob/Makefile
index dd4548672..14bc84c51 100644
--- a/kernel/sound/firewire/bebob/Makefile
+++ b/kernel/sound/firewire/bebob/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \
 		  bebob_pcm.o bebob_hwdep.o bebob_terratec.o \
 		  bebob_yamaha_terratec.o bebob_focusrite.o bebob_maudio.o \
diff --git a/kernel/sound/firewire/cmp.h b/kernel/sound/firewire/cmp.h
index ebcb48484..b60b415ca 100644
--- a/kernel/sound/firewire/cmp.h
+++ b/kernel/sound/firewire/cmp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_CMP_H_INCLUDED
 #define SOUND_FIREWIRE_CMP_H_INCLUDED
 
diff --git a/kernel/sound/firewire/dice/dice-interface.h b/kernel/sound/firewire/dice/dice-interface.h
index 47f2c0a6f..15a484b05 100644
--- a/kernel/sound/firewire/dice/dice-interface.h
+++ b/kernel/sound/firewire/dice/dice-interface.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_DICE_INTERFACE_H_INCLUDED
 #define SOUND_FIREWIRE_DICE_INTERFACE_H_INCLUDED
 
diff --git a/kernel/sound/firewire/fcp.h b/kernel/sound/firewire/fcp.h
index 63ae4f7ce..512f7c409 100644
--- a/kernel/sound/firewire/fcp.h
+++ b/kernel/sound/firewire/fcp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_FCP_H_INCLUDED
 #define SOUND_FIREWIRE_FCP_H_INCLUDED
 
diff --git a/kernel/sound/firewire/iso-resources.h b/kernel/sound/firewire/iso-resources.h
index 5a9af7c61..34f85e9e8 100644
--- a/kernel/sound/firewire/iso-resources.h
+++ b/kernel/sound/firewire/iso-resources.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_ISO_RESOURCES_H_INCLUDED
 #define SOUND_FIREWIRE_ISO_RESOURCES_H_INCLUDED
 
diff --git a/kernel/sound/firewire/lib.h b/kernel/sound/firewire/lib.h
index eef70922e..dc815dc39 100644
--- a/kernel/sound/firewire/lib.h
+++ b/kernel/sound/firewire/lib.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_LIB_H_INCLUDED
 #define SOUND_FIREWIRE_LIB_H_INCLUDED
 
diff --git a/kernel/sound/firewire/motu/Makefile b/kernel/sound/firewire/motu/Makefile
index 728f586e7..7c502d351 100644
--- a/kernel/sound/firewire/motu/Makefile
+++ b/kernel/sound/firewire/motu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS_amdtp-motu.o	:= -I$(src)
 
 snd-firewire-motu-objs := motu.o amdtp-motu.o motu-transaction.o motu-stream.o \
diff --git a/kernel/sound/firewire/packets-buffer.h b/kernel/sound/firewire/packets-buffer.h
index 6513c5cb6..99e963c27 100644
--- a/kernel/sound/firewire/packets-buffer.h
+++ b/kernel/sound/firewire/packets-buffer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_FIREWIRE_PACKETS_BUFFER_H_INCLUDED
 #define SOUND_FIREWIRE_PACKETS_BUFFER_H_INCLUDED
 
diff --git a/kernel/sound/hda/Makefile b/kernel/sound/hda/Makefile
index 3b9bedee2..e4e726f2c 100644
--- a/kernel/sound/hda/Makefile
+++ b/kernel/sound/hda/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-hda-core-objs := hda_bus_type.o hdac_bus.o hdac_device.o hdac_sysfs.o \
 	hdac_regmap.o hdac_controller.o hdac_stream.o array.o hdmi_chmap.o
 
diff --git a/kernel/sound/hda/hdac_sysfs.c b/kernel/sound/hda/hdac_sysfs.c
index 42d61bf41..3c2d45ee6 100644
--- a/kernel/sound/hda/hdac_sysfs.c
+++ b/kernel/sound/hda/hdac_sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * sysfs support for HD-audio core device
  */
diff --git a/kernel/sound/hda/local.h b/kernel/sound/hda/local.h
index 0d5bb159d..7258fa8ce 100644
--- a/kernel/sound/hda/local.h
+++ b/kernel/sound/hda/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Local helper macros and functions for HD-audio core drivers
  */
diff --git a/kernel/sound/hda/trace.h b/kernel/sound/hda/trace.h
index e27e2c0b7..70af6c815 100644
--- a/kernel/sound/hda/trace.h
+++ b/kernel/sound/hda/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM hda
 
diff --git a/kernel/sound/i2c/Makefile b/kernel/sound/i2c/Makefile
index 36879bf88..09978855e 100644
--- a/kernel/sound/i2c/Makefile
+++ b/kernel/sound/i2c/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/i2c/other/Makefile b/kernel/sound/i2c/other/Makefile
index 5526b03b9..1a4ce1236 100644
--- a/kernel/sound/i2c/other/Makefile
+++ b/kernel/sound/i2c/other/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2003 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/isa/Makefile b/kernel/sound/isa/Makefile
index 9a15f1497..5eaddbf4a 100644
--- a/kernel/sound/isa/Makefile
+++ b/kernel/sound/isa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/isa/gus/Makefile b/kernel/sound/isa/gus/Makefile
index 6cd4ee037..c6f32ffd3 100644
--- a/kernel/sound/isa/gus/Makefile
+++ b/kernel/sound/isa/gus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/isa/msnd/Makefile b/kernel/sound/isa/msnd/Makefile
index 2171c0aa2..ec231a7b1 100644
--- a/kernel/sound/isa/msnd/Makefile
+++ b/kernel/sound/isa/msnd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 snd-msnd-lib-objs := msnd.o msnd_midi.o msnd_pinnacle_mixer.o
 snd-msnd-pinnacle-objs := msnd_pinnacle.o
diff --git a/kernel/sound/isa/opti9xx/Makefile b/kernel/sound/isa/opti9xx/Makefile
index b4d894db2..a9dcdeb50 100644
--- a/kernel/sound/isa/opti9xx/Makefile
+++ b/kernel/sound/isa/opti9xx/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/isa/sb/Makefile b/kernel/sound/isa/sb/Makefile
index 08b9fb974..f174a5b3c 100644
--- a/kernel/sound/isa/sb/Makefile
+++ b/kernel/sound/isa/sb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/oss/Makefile b/kernel/sound/oss/Makefile
index 9bdbbde21..6564eace4 100644
--- a/kernel/sound/oss/Makefile
+++ b/kernel/sound/oss/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for the Linux sound card driver
 #
 # 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
diff --git a/kernel/sound/oss/ad1848.h b/kernel/sound/oss/ad1848.h
index b95ebe28d..390f03e13 100644
--- a/kernel/sound/oss/ad1848.h
+++ b/kernel/sound/oss/ad1848.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #include <linux/interrupt.h>
 
diff --git a/kernel/sound/oss/bin2hex.c b/kernel/sound/oss/bin2hex.c
index b59109eb0..26c04ce04 100644
--- a/kernel/sound/oss/bin2hex.c
+++ b/kernel/sound/oss/bin2hex.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/kernel/sound/oss/dmasound/dmasound.h b/kernel/sound/oss/dmasound/dmasound.h
index 01019f06f..c1c52b479 100644
--- a/kernel/sound/oss/dmasound/dmasound.h
+++ b/kernel/sound/oss/dmasound/dmasound.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _dmasound_h_
 /*
  *  linux/sound/oss/dmasound/dmasound.h
diff --git a/kernel/sound/oss/hex2hex.c b/kernel/sound/oss/hex2hex.c
index 041ef5c52..f76d729b0 100644
--- a/kernel/sound/oss/hex2hex.c
+++ b/kernel/sound/oss/hex2hex.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * hex2hex reads stdin in Intel HEX format and produces an
  * (unsigned char) array which contains the bytes and writes it
diff --git a/kernel/sound/oss/midi_ctrl.h b/kernel/sound/oss/midi_ctrl.h
index 3353e5a67..240d0c719 100644
--- a/kernel/sound/oss/midi_ctrl.h
+++ b/kernel/sound/oss/midi_ctrl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static unsigned char ctrl_def_values[128] =
 {
 	0x40,0x00,0x40,0x40,  0x40,0x40,0x40,0x7f,	/*   0 to   7 */
diff --git a/kernel/sound/oss/midi_synth.h b/kernel/sound/oss/midi_synth.h
index b64ddd6c4..1cf676c75 100644
--- a/kernel/sound/oss/midi_synth.h
+++ b/kernel/sound/oss/midi_synth.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 int midi_synth_ioctl (int dev,
 	    unsigned int cmd, void __user * arg);
 int midi_synth_kill_note (int dev, int channel, int note, int velocity);
diff --git a/kernel/sound/oss/mpu401.h b/kernel/sound/oss/mpu401.h
index 0ad1e9ee7..6beb8c2ae 100644
--- a/kernel/sound/oss/mpu401.h
+++ b/kernel/sound/oss/mpu401.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*	From uart401.c */
 int probe_uart401 (struct address_info *hw_config, struct module *owner);
diff --git a/kernel/sound/oss/os.h b/kernel/sound/oss/os.h
index 0bf89e1d6..16f3a069b 100644
--- a/kernel/sound/oss/os.h
+++ b/kernel/sound/oss/os.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define ALLOW_SELECT
 #undef NO_INLINE_ASM
 #define SHORT_BANNERS
diff --git a/kernel/sound/oss/pas2.h b/kernel/sound/oss/pas2.h
index d19f757db..57f476238 100644
--- a/kernel/sound/oss/pas2.h
+++ b/kernel/sound/oss/pas2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /*	From pas_card.c	*/
 int pas_set_intr(int mask);
diff --git a/kernel/sound/oss/sb.h b/kernel/sound/oss/sb.h
index 77e8891ce..bb1d18709 100644
--- a/kernel/sound/oss/sb.h
+++ b/kernel/sound/oss/sb.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define DSP_RESET	(devc->base + 0x6)
 #define DSP_READ	(devc->base + 0xA)
 #define DSP_WRITE	(devc->base + 0xC)
diff --git a/kernel/sound/oss/sb_ess.c b/kernel/sound/oss/sb_ess.c
index 57f7d25a2..17e3f1431 100644
--- a/kernel/sound/oss/sb_ess.c
+++ b/kernel/sound/oss/sb_ess.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef FKS_LOGGING
 #undef FKS_TEST
 
diff --git a/kernel/sound/oss/sb_ess.h b/kernel/sound/oss/sb_ess.h
index 38aa072e0..1c741212b 100644
--- a/kernel/sound/oss/sb_ess.h
+++ b/kernel/sound/oss/sb_ess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Created: 9-Jan-1999 Rolf Fokkens
  */
diff --git a/kernel/sound/oss/sleep.h b/kernel/sound/oss/sleep.h
index a20fc925a..fd17d44d1 100644
--- a/kernel/sound/oss/sleep.h
+++ b/kernel/sound/oss/sleep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/wait.h>
 
 /*
diff --git a/kernel/sound/oss/sound_calls.h b/kernel/sound/oss/sound_calls.h
index 87d8ad4a0..bcd3f7340 100644
--- a/kernel/sound/oss/sound_calls.h
+++ b/kernel/sound/oss/sound_calls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *	DMA buffer calls
  */
diff --git a/kernel/sound/oss/sound_firmware.h b/kernel/sound/oss/sound_firmware.h
index 2be465277..ebcbded0e 100644
--- a/kernel/sound/oss/sound_firmware.h
+++ b/kernel/sound/oss/sound_firmware.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/fs.h>
 
 /**
diff --git a/kernel/sound/oss/tuning.h b/kernel/sound/oss/tuning.h
index a73e3dd39..953539931 100644
--- a/kernel/sound/oss/tuning.h
+++ b/kernel/sound/oss/tuning.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static unsigned short semitone_tuning[24] =
 {
 /*   0 */ 10000, 10595, 11225, 11892, 12599, 13348, 14142, 14983, 
diff --git a/kernel/sound/oss/ulaw.h b/kernel/sound/oss/ulaw.h
index 0ff8c0a3b..ee898a0f7 100644
--- a/kernel/sound/oss/ulaw.h
+++ b/kernel/sound/oss/ulaw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 static unsigned char ulaw_dsp[] = {
      3,    7,   11,   15,   19,   23,   27,   31,
     35,   39,   43,   47,   51,   55,   59,   63,
diff --git a/kernel/sound/oss/v_midi.h b/kernel/sound/oss/v_midi.h
index 08e2185ee..f4fc2bed0 100644
--- a/kernel/sound/oss/v_midi.h
+++ b/kernel/sound/oss/v_midi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 typedef struct vmidi_devc {
 	   int dev;
 
diff --git a/kernel/sound/oss/waveartist.h b/kernel/sound/oss/waveartist.h
index dac4ca910..f18d74b26 100644
--- a/kernel/sound/oss/waveartist.h
+++ b/kernel/sound/oss/waveartist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * linux/sound/oss/waveartist.h
  *
diff --git a/kernel/sound/parisc/harmony.h b/kernel/sound/parisc/harmony.h
index 2e434523f..f4c29a2e3 100644
--- a/kernel/sound/parisc/harmony.h
+++ b/kernel/sound/parisc/harmony.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Hewlett-Packard Harmony audio driver
  * Copyright (C) 2004, Kyle McMartin <kyle@parisc-linux.org>
  */
diff --git a/kernel/sound/pci/Makefile b/kernel/sound/pci/Makefile
index 54fe325e3..04cac7469 100644
--- a/kernel/sound/pci/Makefile
+++ b/kernel/sound/pci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/pci/ad1889.h b/kernel/sound/pci/ad1889.h
index 5e6dad534..d6e8d6c19 100644
--- a/kernel/sound/pci/ad1889.h
+++ b/kernel/sound/pci/ad1889.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Analog Devices 1889 audio driver
  * Copyright (C) 2004, Kyle McMartin <kyle@parisc-linux.org>
  */
diff --git a/kernel/sound/pci/asihpi/hpi_version.h b/kernel/sound/pci/asihpi/hpi_version.h
index 6623ab110..016bc5545 100644
--- a/kernel/sound/pci/asihpi/hpi_version.h
+++ b/kernel/sound/pci/asihpi/hpi_version.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /** HPI Version Definitions
 Development releases have odd minor version.
 Production releases have even minor version.
diff --git a/kernel/sound/pci/asihpi/hpifunc.c b/kernel/sound/pci/asihpi/hpifunc.c
index f9b57647b..1de053831 100644
--- a/kernel/sound/pci/asihpi/hpifunc.c
+++ b/kernel/sound/pci/asihpi/hpifunc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include "hpi_internal.h"
 #include "hpimsginit.h"
diff --git a/kernel/sound/pci/au88x0/Makefile b/kernel/sound/pci/au88x0/Makefile
index d0a66bc5d..78ab11562 100644
--- a/kernel/sound/pci/au88x0/Makefile
+++ b/kernel/sound/pci/au88x0/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-au8810-objs := au8810.o
 snd-au8820-objs := au8820.o
 snd-au8830-objs := au8830.o
diff --git a/kernel/sound/pci/au88x0/au8810.c b/kernel/sound/pci/au88x0/au8810.c
index 1b2e34069..b2bfa50bf 100644
--- a/kernel/sound/pci/au88x0/au8810.c
+++ b/kernel/sound/pci/au88x0/au8810.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "au8810.h"
 #include "au88x0.h"
 static const struct pci_device_id snd_vortex_ids[] = {
diff --git a/kernel/sound/pci/au88x0/au8810.h b/kernel/sound/pci/au88x0/au8810.h
index 79fbee384..94f110320 100644
--- a/kernel/sound/pci/au88x0/au8810.h
+++ b/kernel/sound/pci/au88x0/au8810.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
     Aureal Advantage Soundcard driver.
  */
diff --git a/kernel/sound/pci/au88x0/au8820.c b/kernel/sound/pci/au88x0/au8820.c
index 74c53fa5f..dbc2263b4 100644
--- a/kernel/sound/pci/au88x0/au8820.c
+++ b/kernel/sound/pci/au88x0/au8820.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "au8820.h"
 #include "au88x0.h"
 static const struct pci_device_id snd_vortex_ids[] = {
diff --git a/kernel/sound/pci/au88x0/au8820.h b/kernel/sound/pci/au88x0/au8820.h
index cafdb9668..8a128e8fe 100644
--- a/kernel/sound/pci/au88x0/au8820.h
+++ b/kernel/sound/pci/au88x0/au8820.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
     Aureal Vortex Soundcard driver.
 
diff --git a/kernel/sound/pci/au88x0/au8830.c b/kernel/sound/pci/au88x0/au8830.c
index 56f675aad..e963c4e2f 100644
--- a/kernel/sound/pci/au88x0/au8830.c
+++ b/kernel/sound/pci/au88x0/au8830.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "au8830.h"
 #include "au88x0.h"
 static const struct pci_device_id snd_vortex_ids[] = {
diff --git a/kernel/sound/pci/au88x0/au8830.h b/kernel/sound/pci/au88x0/au8830.h
index 999b29ab3..40f671ffd 100644
--- a/kernel/sound/pci/au88x0/au8830.h
+++ b/kernel/sound/pci/au88x0/au8830.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
     Aureal Vortex Soundcard driver.
 
diff --git a/kernel/sound/pci/au88x0/au88x0_eq.h b/kernel/sound/pci/au88x0/au88x0_eq.h
index 474cd0046..797cdae1d 100644
--- a/kernel/sound/pci/au88x0/au88x0_eq.h
+++ b/kernel/sound/pci/au88x0/au88x0_eq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AU88X0_EQ_H
 #define AU88X0_EQ_H
 
diff --git a/kernel/sound/pci/au88x0/au88x0_eqdata.c b/kernel/sound/pci/au88x0/au88x0_eqdata.c
index ce8dca8ce..49a52d298 100644
--- a/kernel/sound/pci/au88x0/au88x0_eqdata.c
+++ b/kernel/sound/pci/au88x0/au88x0_eqdata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Data structs */
 
 static u16 asEqCoefsZeros[50] = {
diff --git a/kernel/sound/pci/au88x0/au88x0_mixer.c b/kernel/sound/pci/au88x0/au88x0_mixer.c
index a58298cfe..60dd8a091 100644
--- a/kernel/sound/pci/au88x0/au88x0_mixer.c
+++ b/kernel/sound/pci/au88x0/au88x0_mixer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Vortex Mixer support.
  *
diff --git a/kernel/sound/pci/au88x0/au88x0_wt.h b/kernel/sound/pci/au88x0/au88x0_wt.h
index 38d98f88a..7b2cffad8 100644
--- a/kernel/sound/pci/au88x0/au88x0_wt.h
+++ b/kernel/sound/pci/au88x0/au88x0_wt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /***************************************************************************
  *           WT register offsets.
  *
diff --git a/kernel/sound/pci/azt3328.h b/kernel/sound/pci/azt3328.h
index 6f46b9765..6f9022784 100644
--- a/kernel/sound/pci/azt3328.h
+++ b/kernel/sound/pci/azt3328.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_AZT3328_H
 #define __SOUND_AZT3328_H
 
diff --git a/kernel/sound/pci/cs5535audio/cs5535audio.h b/kernel/sound/pci/cs5535audio/cs5535audio.h
index 0579daa62..f4fcdf93f 100644
--- a/kernel/sound/pci/cs5535audio/cs5535audio.h
+++ b/kernel/sound/pci/cs5535audio/cs5535audio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_CS5535AUDIO_H
 #define __SOUND_CS5535AUDIO_H
 
diff --git a/kernel/sound/pci/ctxfi/cttimer.h b/kernel/sound/pci/ctxfi/cttimer.h
index 979348229..9c5cb403b 100644
--- a/kernel/sound/pci/ctxfi/cttimer.h
+++ b/kernel/sound/pci/ctxfi/cttimer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Timer handling
  */
diff --git a/kernel/sound/pci/echoaudio/Makefile b/kernel/sound/pci/echoaudio/Makefile
index 1361de77e..4865b8fe7 100644
--- a/kernel/sound/pci/echoaudio/Makefile
+++ b/kernel/sound/pci/echoaudio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA Echoaudio soundcard drivers
 # Copyright (c) 2003 by Giuliano Pochini <pochini@shiny.it>
diff --git a/kernel/sound/pci/emu10k1/Makefile b/kernel/sound/pci/emu10k1/Makefile
index 29b44ca27..17d5527be 100644
--- a/kernel/sound/pci/emu10k1/Makefile
+++ b/kernel/sound/pci/emu10k1/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/pci/hda/Makefile b/kernel/sound/pci/hda/Makefile
index 6d83c6e03..b57432f00 100644
--- a/kernel/sound/pci/hda/Makefile
+++ b/kernel/sound/pci/hda/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-hda-intel-objs := hda_intel.o
 snd-hda-tegra-objs := hda_tegra.o
 
diff --git a/kernel/sound/pci/hda/dell_wmi_helper.c b/kernel/sound/pci/hda/dell_wmi_helper.c
index 44b1e1568..1b48a8c19 100644
--- a/kernel/sound/pci/hda/dell_wmi_helper.c
+++ b/kernel/sound/pci/hda/dell_wmi_helper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Helper functions for Dell Mic Mute LED control;
  * to be included from codec driver
  */
diff --git a/kernel/sound/pci/hda/hda_controller_trace.h b/kernel/sound/pci/hda/hda_controller_trace.h
index 3e18d99bf..bf48304e2 100644
--- a/kernel/sound/pci/hda/hda_controller_trace.h
+++ b/kernel/sound/pci/hda/hda_controller_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM hda_controller
 #define TRACE_INCLUDE_FILE hda_controller_trace
diff --git a/kernel/sound/pci/hda/hda_intel_trace.h b/kernel/sound/pci/hda/hda_intel_trace.h
index 0922d8b1b..73a7adfa1 100644
--- a/kernel/sound/pci/hda/hda_intel_trace.h
+++ b/kernel/sound/pci/hda/hda_intel_trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM hda_intel
 #define TRACE_INCLUDE_FILE hda_intel_trace
diff --git a/kernel/sound/pci/hda/local.h b/kernel/sound/pci/hda/local.h
index 28cb7f989..3b8b7d78f 100644
--- a/kernel/sound/pci/hda/local.h
+++ b/kernel/sound/pci/hda/local.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  */
 
diff --git a/kernel/sound/pci/hda/thinkpad_helper.c b/kernel/sound/pci/hda/thinkpad_helper.c
index 4d9d320a7..65bb3ac6a 100644
--- a/kernel/sound/pci/hda/thinkpad_helper.c
+++ b/kernel/sound/pci/hda/thinkpad_helper.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Helper functions for Thinkpad LED control;
  * to be included from codec driver
  */
diff --git a/kernel/sound/pci/ice1712/Makefile b/kernel/sound/pci/ice1712/Makefile
index 7e50c1324..1196f22a9 100644
--- a/kernel/sound/pci/ice1712/Makefile
+++ b/kernel/sound/pci/ice1712/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/pci/ice1712/juli.h b/kernel/sound/pci/ice1712/juli.h
index d9f8534fd..9c22d4e73 100644
--- a/kernel/sound/pci/ice1712/juli.h
+++ b/kernel/sound/pci/ice1712/juli.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_JULI_H
 #define __SOUND_JULI_H
 
diff --git a/kernel/sound/pci/ice1712/maya44.h b/kernel/sound/pci/ice1712/maya44.h
index eafd03a8f..f5a97d987 100644
--- a/kernel/sound/pci/ice1712/maya44.h
+++ b/kernel/sound/pci/ice1712/maya44.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_MAYA44_H
 #define __SOUND_MAYA44_H
 
diff --git a/kernel/sound/pci/ice1712/prodigy192.h b/kernel/sound/pci/ice1712/prodigy192.h
index 16a53b459..7bfd769ba 100644
--- a/kernel/sound/pci/ice1712/prodigy192.h
+++ b/kernel/sound/pci/ice1712/prodigy192.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_PRODIGY192_H
 #define __SOUND_PRODIGY192_H
 
diff --git a/kernel/sound/pci/ice1712/psc724.h b/kernel/sound/pci/ice1712/psc724.h
index 858e5fd0e..e6ce335ae 100644
--- a/kernel/sound/pci/ice1712/psc724.h
+++ b/kernel/sound/pci/ice1712/psc724.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_PSC724_H
 #define __SOUND_PSC724_H
 
diff --git a/kernel/sound/pci/ice1712/quartet.h b/kernel/sound/pci/ice1712/quartet.h
index 80809b724..a1c2fe271 100644
--- a/kernel/sound/pci/ice1712/quartet.h
+++ b/kernel/sound/pci/ice1712/quartet.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_QTET_H
 #define __SOUND_QTET_H
 
diff --git a/kernel/sound/pci/ice1712/se.h b/kernel/sound/pci/ice1712/se.h
index 0b0a9dabd..61348ecef 100644
--- a/kernel/sound/pci/ice1712/se.h
+++ b/kernel/sound/pci/ice1712/se.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_SE_H
 #define __SOUND_SE_H
 
diff --git a/kernel/sound/pci/ice1712/stac946x.h b/kernel/sound/pci/ice1712/stac946x.h
index 5b390952d..58f9f17a2 100644
--- a/kernel/sound/pci/ice1712/stac946x.h
+++ b/kernel/sound/pci/ice1712/stac946x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_STAC946X_H
 #define __SOUND_STAC946X_H
 
diff --git a/kernel/sound/pci/ice1712/wtm.h b/kernel/sound/pci/ice1712/wtm.h
index 423c1a204..1cfcbde15 100644
--- a/kernel/sound/pci/ice1712/wtm.h
+++ b/kernel/sound/pci/ice1712/wtm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SOUND_WTM_H
 #define __SOUND_WTM_H
 
diff --git a/kernel/sound/pci/nm256/nm256_coef.c b/kernel/sound/pci/nm256/nm256_coef.c
index 747d5d6cc..c75725211 100644
--- a/kernel/sound/pci/nm256/nm256_coef.c
+++ b/kernel/sound/pci/nm256/nm256_coef.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define NM_TOTAL_COEFF_COUNT 0x3158
 
 static char coefficients[NM_TOTAL_COEFF_COUNT * 4] = { 
diff --git a/kernel/sound/pci/oxygen/Makefile b/kernel/sound/pci/oxygen/Makefile
index ab085d753..0dfc4f840 100644
--- a/kernel/sound/pci/oxygen/Makefile
+++ b/kernel/sound/pci/oxygen/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-oxygen-lib-objs := oxygen_io.o oxygen_lib.o oxygen_mixer.o oxygen_pcm.o
 snd-oxygen-objs := oxygen.o xonar_dg_mixer.o xonar_dg.o
 snd-se6x-objs := se6x.o
diff --git a/kernel/sound/pci/oxygen/ak4396.h b/kernel/sound/pci/oxygen/ak4396.h
index 551c1cf8e..a51223461 100644
--- a/kernel/sound/pci/oxygen/ak4396.h
+++ b/kernel/sound/pci/oxygen/ak4396.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef AK4396_H_INCLUDED
 #define AK4396_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/cm9780.h b/kernel/sound/pci/oxygen/cm9780.h
index 144596799..7efb119d1 100644
--- a/kernel/sound/pci/oxygen/cm9780.h
+++ b/kernel/sound/pci/oxygen/cm9780.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CM9780_H_INCLUDED
 #define CM9780_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/cs2000.h b/kernel/sound/pci/oxygen/cs2000.h
index c3501bdb5..aca04794c 100644
--- a/kernel/sound/pci/oxygen/cs2000.h
+++ b/kernel/sound/pci/oxygen/cs2000.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CS2000_H_INCLUDED
 #define CS2000_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/cs4245.h b/kernel/sound/pci/oxygen/cs4245.h
index 990986576..bb9f2c5b5 100644
--- a/kernel/sound/pci/oxygen/cs4245.h
+++ b/kernel/sound/pci/oxygen/cs4245.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define CS4245_CHIP_ID		0x01
 #define CS4245_POWER_CTRL	0x02
 #define CS4245_DAC_CTRL_1	0x03
diff --git a/kernel/sound/pci/oxygen/cs4362a.h b/kernel/sound/pci/oxygen/cs4362a.h
index 6a4fedf5e..1aef15e04 100644
--- a/kernel/sound/pci/oxygen/cs4362a.h
+++ b/kernel/sound/pci/oxygen/cs4362a.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* register 01h */
 #define CS4362A_PDN		0x01
 #define CS4362A_DAC1_DIS	0x02
diff --git a/kernel/sound/pci/oxygen/cs4398.h b/kernel/sound/pci/oxygen/cs4398.h
index 5faf5efc8..76cb9d7af 100644
--- a/kernel/sound/pci/oxygen/cs4398.h
+++ b/kernel/sound/pci/oxygen/cs4398.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* register 1 */
 #define CS4398_REV_MASK		0x07
 #define CS4398_PART_MASK	0xf8
diff --git a/kernel/sound/pci/oxygen/oxygen.h b/kernel/sound/pci/oxygen/oxygen.h
index 293d0b9a5..06bf7e574 100644
--- a/kernel/sound/pci/oxygen/oxygen.h
+++ b/kernel/sound/pci/oxygen/oxygen.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef OXYGEN_H_INCLUDED
 #define OXYGEN_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/oxygen_regs.h b/kernel/sound/pci/oxygen/oxygen_regs.h
index 8c191bada..eca9d943f 100644
--- a/kernel/sound/pci/oxygen/oxygen_regs.h
+++ b/kernel/sound/pci/oxygen/oxygen_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef OXYGEN_REGS_H_INCLUDED
 #define OXYGEN_REGS_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/pcm1796.h b/kernel/sound/pci/oxygen/pcm1796.h
index 698bf46c7..34d07dd2d 100644
--- a/kernel/sound/pci/oxygen/pcm1796.h
+++ b/kernel/sound/pci/oxygen/pcm1796.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PCM1796_H_INCLUDED
 #define PCM1796_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/wm8766.h b/kernel/sound/pci/oxygen/wm8766.h
index e0e849a7e..be83ad49d 100644
--- a/kernel/sound/pci/oxygen/wm8766.h
+++ b/kernel/sound/pci/oxygen/wm8766.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef WM8766_H_INCLUDED
 #define WM8766_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/wm8785.h b/kernel/sound/pci/oxygen/wm8785.h
index 8c23e315a..21b932566 100644
--- a/kernel/sound/pci/oxygen/wm8785.h
+++ b/kernel/sound/pci/oxygen/wm8785.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef WM8785_H_INCLUDED
 #define WM8785_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/xonar.h b/kernel/sound/pci/oxygen/xonar.h
index 0434c207e..3e373880c 100644
--- a/kernel/sound/pci/oxygen/xonar.h
+++ b/kernel/sound/pci/oxygen/xonar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef XONAR_H_INCLUDED
 #define XONAR_H_INCLUDED
 
diff --git a/kernel/sound/pci/oxygen/xonar_dg.h b/kernel/sound/pci/oxygen/xonar_dg.h
index d461df357..7a1e8f9c4 100644
--- a/kernel/sound/pci/oxygen/xonar_dg.h
+++ b/kernel/sound/pci/oxygen/xonar_dg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef XONAR_DG_H_INCLUDED
 #define XONAR_DG_H_INCLUDED
 
diff --git a/kernel/sound/pci/rme9652/Makefile b/kernel/sound/pci/rme9652/Makefile
index dcba56040..a3351447d 100644
--- a/kernel/sound/pci/rme9652/Makefile
+++ b/kernel/sound/pci/rme9652/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/ppc/tumbler_volume.h b/kernel/sound/ppc/tumbler_volume.h
index ef8d85d58..549ec6a31 100644
--- a/kernel/sound/ppc/tumbler_volume.h
+++ b/kernel/sound/ppc/tumbler_volume.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* volume tables, taken from TAS3001c data manual */
 /* volume gain values */
 /* 0 = -70 dB, 175 = 18.0 dB in 0.5 dB step */
diff --git a/kernel/sound/soc/Makefile b/kernel/sound/soc/Makefile
index 39c27a581..bf8c1e2ce 100644
--- a/kernel/sound/soc/Makefile
+++ b/kernel/sound/soc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
 snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o
 snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o
diff --git a/kernel/sound/soc/amd/acp.h b/kernel/sound/soc/amd/acp.h
index 330832ef4..9d338216c 100644
--- a/kernel/sound/soc/amd/acp.h
+++ b/kernel/sound/soc/amd/acp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ACP_HW_H
 #define __ACP_HW_H
 
diff --git a/kernel/sound/soc/atmel/Makefile b/kernel/sound/soc/atmel/Makefile
index 67e10cbd4..444064641 100644
--- a/kernel/sound/soc/atmel/Makefile
+++ b/kernel/sound/soc/atmel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # AT91 Platform Support
 snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o
 snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o
diff --git a/kernel/sound/soc/atmel/atmel-classd.h b/kernel/sound/soc/atmel/atmel-classd.h
index 73f8fdd1c..0f2e25aeb 100644
--- a/kernel/sound/soc/atmel/atmel-classd.h
+++ b/kernel/sound/soc/atmel/atmel-classd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATMEL_CLASSD_H_
 #define __ATMEL_CLASSD_H_
 
diff --git a/kernel/sound/soc/atmel/atmel-pdmic.h b/kernel/sound/soc/atmel/atmel-pdmic.h
index 4527ac741..1dd351871 100644
--- a/kernel/sound/soc/atmel/atmel-pdmic.h
+++ b/kernel/sound/soc/atmel/atmel-pdmic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ATMEL_PDMIC_H_
 #define __ATMEL_PDMIC_H_
 
diff --git a/kernel/sound/soc/au1x/Makefile b/kernel/sound/soc/au1x/Makefile
index 920710514..33183d7fe 100644
--- a/kernel/sound/soc/au1x/Makefile
+++ b/kernel/sound/soc/au1x/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Au1200/Au1550 PSC audio
 snd-soc-au1xpsc-dbdma-objs := dbdma2.o
 snd-soc-au1xpsc-i2s-objs := psc-i2s.o
diff --git a/kernel/sound/soc/blackfin/Makefile b/kernel/sound/soc/blackfin/Makefile
index f21e948b2..ebeb6a9ce 100644
--- a/kernel/sound/soc/blackfin/Makefile
+++ b/kernel/sound/soc/blackfin/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Blackfin Platform Support
 snd-bf5xx-ac97-objs := bf5xx-ac97-pcm.o
 snd-bf5xx-i2s-objs := bf5xx-i2s-pcm.o
diff --git a/kernel/sound/soc/cirrus/Makefile b/kernel/sound/soc/cirrus/Makefile
index 5514146cb..bfb8dc409 100644
--- a/kernel/sound/soc/cirrus/Makefile
+++ b/kernel/sound/soc/cirrus/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # EP93xx Platform Support
 snd-soc-ep93xx-objs				:= ep93xx-pcm.o
 snd-soc-ep93xx-i2s-objs	 			:= ep93xx-i2s.o
diff --git a/kernel/sound/soc/codecs/Makefile b/kernel/sound/soc/codecs/Makefile
index 77c18189c..05018b7ca 100644
--- a/kernel/sound/soc/codecs/Makefile
+++ b/kernel/sound/soc/codecs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-88pm860x-objs := 88pm860x-codec.o
 snd-soc-ab8500-codec-objs := ab8500-codec.o
 snd-soc-ac97-objs := ac97.o
diff --git a/kernel/sound/soc/codecs/adau-utils.h b/kernel/sound/soc/codecs/adau-utils.h
index 939b5f377..bf5947b35 100644
--- a/kernel/sound/soc/codecs/adau-utils.h
+++ b/kernel/sound/soc/codecs/adau-utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SOUND_SOC_CODECS_ADAU_PLL_H
 #define SOUND_SOC_CODECS_ADAU_PLL_H
 
diff --git a/kernel/sound/soc/codecs/adau1373.h b/kernel/sound/soc/codecs/adau1373.h
index c6ab55307..56320d5e3 100644
--- a/kernel/sound/soc/codecs/adau1373.h
+++ b/kernel/sound/soc/codecs/adau1373.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ADAU1373_H__
 #define __ADAU1373_H__
 
diff --git a/kernel/sound/soc/codecs/adau17x1.c b/kernel/sound/soc/codecs/adau17x1.c
index 2c1bd2763..6758f789b 100644
--- a/kernel/sound/soc/codecs/adau17x1.c
+++ b/kernel/sound/soc/codecs/adau17x1.c
@@ -90,6 +90,27 @@ static int adau17x1_pll_event(struct snd_soc_dapm_widget *w,
 	return 0;
 }
 
+static int adau17x1_adc_fixup(struct snd_soc_dapm_widget *w,
+	struct snd_kcontrol *kcontrol, int event)
+{
+	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+	struct adau *adau = snd_soc_codec_get_drvdata(codec);
+
+	/*
+	 * If we are capturing, toggle the ADOSR bit in Converter Control 0 to
+	 * avoid losing SNR (workaround from ADI). This must be done after
+	 * the ADC(s) have been enabled. According to the data sheet, it is
+	 * normally illegal to set this bit when the sampling rate is 96 kHz,
+	 * but according to ADI it is acceptable for this workaround.
+	 */
+	regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER0,
+		ADAU17X1_CONVERTER0_ADOSR, ADAU17X1_CONVERTER0_ADOSR);
+	regmap_update_bits(adau->regmap, ADAU17X1_CONVERTER0,
+		ADAU17X1_CONVERTER0_ADOSR, 0);
+
+	return 0;
+}
+
 static const char * const adau17x1_mono_stereo_text[] = {
 	"Stereo",
 	"Mono Left Channel (L+R)",
@@ -121,7 +142,8 @@ static const struct snd_soc_dapm_widget adau17x1_dapm_widgets[] = {
 	SND_SOC_DAPM_MUX("Right DAC Mode Mux", SND_SOC_NOPM, 0, 0,
 		&adau17x1_dac_mode_mux),
 
-	SND_SOC_DAPM_ADC("Left Decimator", NULL, ADAU17X1_ADC_CONTROL, 0, 0),
+	SND_SOC_DAPM_ADC_E("Left Decimator", NULL, ADAU17X1_ADC_CONTROL, 0, 0,
+			   adau17x1_adc_fixup, SND_SOC_DAPM_POST_PMU),
 	SND_SOC_DAPM_ADC("Right Decimator", NULL, ADAU17X1_ADC_CONTROL, 1, 0),
 	SND_SOC_DAPM_DAC("Left DAC", NULL, ADAU17X1_DAC_CONTROL0, 0, 0),
 	SND_SOC_DAPM_DAC("Right DAC", NULL, ADAU17X1_DAC_CONTROL0, 1, 0),
diff --git a/kernel/sound/soc/codecs/adau17x1.h b/kernel/sound/soc/codecs/adau17x1.h
index bf04b7efe..eaf8f933b 100644
--- a/kernel/sound/soc/codecs/adau17x1.h
+++ b/kernel/sound/soc/codecs/adau17x1.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ADAU17X1_H__
 #define __ADAU17X1_H__
 
@@ -129,5 +130,7 @@ bool adau17x1_has_dsp(struct adau *adau);
 
 #define ADAU17X1_CONVERTER0_CONVSR_MASK		0x7
 
+#define ADAU17X1_CONVERTER0_ADOSR		BIT(3)
+
 
 #endif
diff --git a/kernel/sound/soc/codecs/cs4271.h b/kernel/sound/soc/codecs/cs4271.h
index 9adad8eef..290283a91 100644
--- a/kernel/sound/soc/codecs/cs4271.h
+++ b/kernel/sound/soc/codecs/cs4271.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _CS4271_PRIV_H
 #define _CS4271_PRIV_H
 
diff --git a/kernel/sound/soc/codecs/es8328.h b/kernel/sound/soc/codecs/es8328.h
index 8930322d7..9109f6b5b 100644
--- a/kernel/sound/soc/codecs/es8328.h
+++ b/kernel/sound/soc/codecs/es8328.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * es8328.h  --  ES8328 ALSA SoC Audio driver
  */
diff --git a/kernel/sound/soc/codecs/hdac_hdmi.h b/kernel/sound/soc/codecs/hdac_hdmi.h
index dfc3a9cf7..b5b57a5cb 100644
--- a/kernel/sound/soc/codecs/hdac_hdmi.h
+++ b/kernel/sound/soc/codecs/hdac_hdmi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __HDAC_HDMI_H__
 #define __HDAC_HDMI_H__
 
diff --git a/kernel/sound/soc/codecs/inno_rk3036.h b/kernel/sound/soc/codecs/inno_rk3036.h
index da759c6c7..44bb24041 100644
--- a/kernel/sound/soc/codecs/inno_rk3036.h
+++ b/kernel/sound/soc/codecs/inno_rk3036.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Driver of Inno Codec for rk3036 by Rockchip Inc.
  *
diff --git a/kernel/sound/soc/codecs/rt5514-spi.c b/kernel/sound/soc/codecs/rt5514-spi.c
index ed6e53739..12f2ecf3a 100644
--- a/kernel/sound/soc/codecs/rt5514-spi.c
+++ b/kernel/sound/soc/codecs/rt5514-spi.c
@@ -145,9 +145,8 @@ done:
 	mutex_unlock(&rt5514_dsp->dma_lock);
 }
 
-static irqreturn_t rt5514_spi_irq(int irq, void *data)
+static void rt5514_schedule_copy(struct rt5514_dsp *rt5514_dsp)
 {
-	struct rt5514_dsp *rt5514_dsp = data;
 	u8 buf[8];
 
 	rt5514_dsp->get_size = 0;
@@ -180,6 +179,13 @@ static irqreturn_t rt5514_spi_irq(int irq, void *data)
 	if (rt5514_dsp->buf_base && rt5514_dsp->buf_limit &&
 		rt5514_dsp->buf_rp && rt5514_dsp->buf_size)
 		schedule_delayed_work(&rt5514_dsp->copy_work, 0);
+}
+
+static irqreturn_t rt5514_spi_irq(int irq, void *data)
+{
+	struct rt5514_dsp *rt5514_dsp = data;
+
+	rt5514_schedule_copy(rt5514_dsp);
 
 	return IRQ_HANDLED;
 }
@@ -199,12 +205,19 @@ static int rt5514_spi_hw_params(struct snd_pcm_substream *substream,
 	struct rt5514_dsp *rt5514_dsp =
 			snd_soc_platform_get_drvdata(rtd->platform);
 	int ret;
+	u8 buf[8];
 
 	mutex_lock(&rt5514_dsp->dma_lock);
 	ret = snd_pcm_lib_alloc_vmalloc_buffer(substream,
 			params_buffer_bytes(hw_params));
 	rt5514_dsp->substream = substream;
 	rt5514_dsp->dma_offset = 0;
+
+	/* Read IRQ status and schedule copy accordingly. */
+	rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf));
+	if (buf[0] & RT5514_IRQ_STATUS_BIT)
+		rt5514_schedule_copy(rt5514_dsp);
+
 	mutex_unlock(&rt5514_dsp->dma_lock);
 
 	return ret;
diff --git a/kernel/sound/soc/codecs/rt5514-spi.h b/kernel/sound/soc/codecs/rt5514-spi.h
index a6434ee6f..c1a36647c 100644
--- a/kernel/sound/soc/codecs/rt5514-spi.h
+++ b/kernel/sound/soc/codecs/rt5514-spi.h
@@ -20,6 +20,9 @@
 #define RT5514_BUFFER_VOICE_BASE	0x18000200
 #define RT5514_BUFFER_VOICE_LIMIT	0x18000204
 #define RT5514_BUFFER_VOICE_WP		0x1800020c
+#define RT5514_IRQ_CTRL			0x18002094
+
+#define RT5514_IRQ_STATUS_BIT		(0x1 << 5)
 
 /* SPI Command */
 enum {
diff --git a/kernel/sound/soc/codecs/rt5514.c b/kernel/sound/soc/codecs/rt5514.c
index 0945d212b..d7956abab 100644
--- a/kernel/sound/soc/codecs/rt5514.c
+++ b/kernel/sound/soc/codecs/rt5514.c
@@ -338,39 +338,6 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol,
 				fw = NULL;
 			}
 
-			if (rt5514->model_buf && rt5514->model_len) {
-#if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI)
-				int ret;
-
-				ret = rt5514_spi_burst_write(0x4ff80000,
-					rt5514->model_buf,
-					((rt5514->model_len / 8) + 1) * 8);
-				if (ret) {
-					dev_err(codec->dev,
-						"Model load failed %d\n", ret);
-					return ret;
-				}
-#else
-				dev_err(codec->dev,
-					"No SPI driver for loading firmware\n");
-#endif
-			} else {
-				request_firmware(&fw, RT5514_FIRMWARE3,
-						 codec->dev);
-				if (fw) {
-#if IS_ENABLED(CONFIG_SND_SOC_RT5514_SPI)
-					rt5514_spi_burst_write(0x4ff80000,
-						fw->data,
-						((fw->size/8)+1)*8);
-#else
-					dev_err(codec->dev,
-						"No SPI driver to load fw\n");
-#endif
-					release_firmware(fw);
-					fw = NULL;
-				}
-			}
-
 			/* DSP run */
 			regmap_write(rt5514->i2c_regmap, 0x18002f00,
 				0x00055148);
@@ -385,34 +352,6 @@ static int rt5514_dsp_voice_wake_up_put(struct snd_kcontrol *kcontrol,
 	return 0;
 }
 
-static int rt5514_hotword_model_put(struct snd_kcontrol *kcontrol,
-		const unsigned int __user *bytes, unsigned int size)
-{
-	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-	struct rt5514_priv *rt5514 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_codec *codec = rt5514->codec;
-	int ret = 0;
-
-	if (rt5514->model_buf || rt5514->model_len < size) {
-		if (rt5514->model_buf)
-			devm_kfree(codec->dev, rt5514->model_buf);
-		rt5514->model_buf = devm_kmalloc(codec->dev, size, GFP_KERNEL);
-		if (!rt5514->model_buf) {
-			ret = -ENOMEM;
-			goto done;
-		}
-	}
-
-	/* Skips the TLV header. */
-	bytes += 2;
-
-	if (copy_from_user(rt5514->model_buf, bytes, size))
-		ret = -EFAULT;
-done:
-	rt5514->model_len = (ret ? 0 : size);
-	return ret;
-}
-
 static const struct snd_kcontrol_new rt5514_snd_controls[] = {
 	SOC_DOUBLE_TLV("MIC Boost Volume", RT5514_ANA_CTRL_MICBST,
 		RT5514_SEL_BSTL_SFT, RT5514_SEL_BSTR_SFT, 8, 0, bst_tlv),
@@ -424,8 +363,6 @@ static const struct snd_kcontrol_new rt5514_snd_controls[] = {
 		adc_vol_tlv),
 	SOC_SINGLE_EXT("DSP Voice Wake Up", SND_SOC_NOPM, 0, 1, 0,
 		rt5514_dsp_voice_wake_up_get, rt5514_dsp_voice_wake_up_put),
-	SND_SOC_BYTES_TLV("Hotword Model", 0x8504,
-		NULL, rt5514_hotword_model_put),
 };
 
 /* ADC Mixer*/
diff --git a/kernel/sound/soc/codecs/rt5514.h b/kernel/sound/soc/codecs/rt5514.h
index 803311cb7..2dc40e6d8 100644
--- a/kernel/sound/soc/codecs/rt5514.h
+++ b/kernel/sound/soc/codecs/rt5514.h
@@ -255,7 +255,6 @@
 
 #define RT5514_FIRMWARE1	"rt5514_dsp_fw1.bin"
 #define RT5514_FIRMWARE2	"rt5514_dsp_fw2.bin"
-#define RT5514_FIRMWARE3	"rt5514_dsp_fw3.bin"
 
 /* System Clock Source */
 enum {
@@ -282,8 +281,6 @@ struct rt5514_priv {
 	int pll_in;
 	int pll_out;
 	int dsp_enabled;
-	u8 *model_buf;
-	unsigned int model_len;
 };
 
 #endif /* __RT5514_H__ */
diff --git a/kernel/sound/soc/codecs/rt5616.c b/kernel/sound/soc/codecs/rt5616.c
index c94e94fe8..0e5f54a9b 100644
--- a/kernel/sound/soc/codecs/rt5616.c
+++ b/kernel/sound/soc/codecs/rt5616.c
@@ -98,7 +98,7 @@ static const struct reg_default rt5616_reg[] = {
 	{ 0x8e, 0x0004 },
 	{ 0x8f, 0x1100 },
 	{ 0x90, 0x0000 },
-	{ 0x91, 0x0000 },
+	{ 0x91, 0x0c00 },
 	{ 0x92, 0x0000 },
 	{ 0x93, 0x2000 },
 	{ 0x94, 0x0200 },
diff --git a/kernel/sound/soc/codecs/rt5631.h b/kernel/sound/soc/codecs/rt5631.h
index 13401581b..8a6b99a48 100644
--- a/kernel/sound/soc/codecs/rt5631.h
+++ b/kernel/sound/soc/codecs/rt5631.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __RTCODEC5631_H__
 #define __RTCODEC5631_H__
 
diff --git a/kernel/sound/soc/codecs/rt5659.c b/kernel/sound/soc/codecs/rt5659.c
index 71216db15..fa66b11df 100644
--- a/kernel/sound/soc/codecs/rt5659.c
+++ b/kernel/sound/soc/codecs/rt5659.c
@@ -2744,7 +2744,8 @@ static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {
 		SND_SOC_DAPM_PRE_PMU),
 	SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0, rt5659_hp_event,
 		SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU),
-	SND_SOC_DAPM_PGA("LOUT Amp", SND_SOC_NOPM, 0, 0, NULL, 0),
+	SND_SOC_DAPM_PGA_S("LOUT Amp", 1,  RT5659_PWR_ANLG_1, RT5659_PWR_LM_BIT,
+		0,  NULL, 0),
 
 	SND_SOC_DAPM_SUPPLY("Charge Pump", SND_SOC_NOPM, 0, 0,
 		rt5659_charge_pump_event, SND_SOC_DAPM_PRE_PMU |
@@ -3208,6 +3209,7 @@ static const struct snd_soc_dapm_route rt5659_dapm_routes[] = {
 	{ "LOUT R MIX", "OUTVOL R Switch", "OUTVOL R" },
 	{ "LOUT Amp", NULL, "LOUT L MIX" },
 	{ "LOUT Amp", NULL, "LOUT R MIX" },
+	{ "LOUT Amp", NULL, "Charge Pump" },
 	{ "LOUT Amp", NULL, "SYS CLK DET" },
 	{ "LOUT L Playback", "Switch", "LOUT Amp" },
 	{ "LOUT R Playback", "Switch", "LOUT Amp" },
diff --git a/kernel/sound/soc/codecs/rt5663.c b/kernel/sound/soc/codecs/rt5663.c
index ab9e0ebff..e45b895d8 100644
--- a/kernel/sound/soc/codecs/rt5663.c
+++ b/kernel/sound/soc/codecs/rt5663.c
@@ -1639,7 +1639,8 @@ static irqreturn_t rt5663_irq(int irq, void *data)
 {
 	struct rt5663_priv *rt5663 = data;
 
-	dev_dbg(rt5663->codec->dev, "%s IRQ queue work\n", __func__);
+	dev_dbg(regmap_get_device(rt5663->regmap), "%s IRQ queue work\n",
+		__func__);
 
 	queue_delayed_work(system_wq, &rt5663->jack_detect_work,
 		msecs_to_jiffies(250));
diff --git a/kernel/sound/soc/codecs/tlv320aic26.h b/kernel/sound/soc/codecs/tlv320aic26.h
index 629b85e75..1f2879b7a 100644
--- a/kernel/sound/soc/codecs/tlv320aic26.h
+++ b/kernel/sound/soc/codecs/tlv320aic26.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Texas Instruments TLV320AIC26 low power audio CODEC
  * register definitions
diff --git a/kernel/sound/soc/codecs/uda134x.h b/kernel/sound/soc/codecs/uda134x.h
index e41ab38c6..664618c25 100644
--- a/kernel/sound/soc/codecs/uda134x.h
+++ b/kernel/sound/soc/codecs/uda134x.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UDA134X_CODEC_H
 #define _UDA134X_CODEC_H
 
diff --git a/kernel/sound/soc/codecs/wm8993.h b/kernel/sound/soc/codecs/wm8993.h
index 4478b40c8..91811aa15 100644
--- a/kernel/sound/soc/codecs/wm8993.h
+++ b/kernel/sound/soc/codecs/wm8993.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef WM8993_H
 #define WM8993_H
 
diff --git a/kernel/sound/soc/codecs/wm9713.h b/kernel/sound/soc/codecs/wm9713.h
index 7ecffc563..f0800dcca 100644
--- a/kernel/sound/soc/codecs/wm9713.h
+++ b/kernel/sound/soc/codecs/wm9713.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * wm9713.h  --  WM9713 Soc Audio driver
  */
diff --git a/kernel/sound/soc/davinci/Makefile b/kernel/sound/soc/davinci/Makefile
index f883933c1..23c6592eb 100644
--- a/kernel/sound/soc/davinci/Makefile
+++ b/kernel/sound/soc/davinci/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # DAVINCI Platform Support
 snd-soc-edma-objs := edma-pcm.o
 snd-soc-davinci-i2s-objs := davinci-i2s.o
diff --git a/kernel/sound/soc/fsl/Makefile b/kernel/sound/soc/fsl/Makefile
index d28dc25c9..c67bf1139 100644
--- a/kernel/sound/soc/fsl/Makefile
+++ b/kernel/sound/soc/fsl/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # MPC8610 HPCD Machine Support
 snd-soc-mpc8610-hpcd-objs := mpc8610_hpcd.o
 obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o
diff --git a/kernel/sound/soc/fsl/imx-audmux.h b/kernel/sound/soc/fsl/imx-audmux.h
index 38a4209af..f75b4d3ae 100644
--- a/kernel/sound/soc/fsl/imx-audmux.h
+++ b/kernel/sound/soc/fsl/imx-audmux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __IMX_AUDMUX_H
 #define __IMX_AUDMUX_H
 
diff --git a/kernel/sound/soc/fsl/mpc5200_dma.h b/kernel/sound/soc/fsl/mpc5200_dma.h
index dff253fde..d7ee33b5b 100644
--- a/kernel/sound/soc/fsl/mpc5200_dma.h
+++ b/kernel/sound/soc/fsl/mpc5200_dma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Freescale MPC5200 Audio DMA driver
  */
diff --git a/kernel/sound/soc/generic/Makefile b/kernel/sound/soc/generic/Makefile
index 9e000523a..9dec293a4 100644
--- a/kernel/sound/soc/generic/Makefile
+++ b/kernel/sound/soc/generic/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-simple-card-utils-objs	:= simple-card-utils.o
 snd-soc-simple-card-objs	:= simple-card.o
 snd-soc-simple-scu-card-objs	:= simple-scu-card.o
diff --git a/kernel/sound/soc/img/Makefile b/kernel/sound/soc/img/Makefile
index 0508c1ced..3e7b0fd4f 100644
--- a/kernel/sound/soc/img/Makefile
+++ b/kernel/sound/soc/img/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SND_SOC_IMG_I2S_IN) += img-i2s-in.o
 obj-$(CONFIG_SND_SOC_IMG_I2S_OUT) += img-i2s-out.o
 obj-$(CONFIG_SND_SOC_IMG_PARALLEL_OUT) += img-parallel-out.o
diff --git a/kernel/sound/soc/intel/Makefile b/kernel/sound/soc/intel/Makefile
index cdd495f7e..62f37ffff 100644
--- a/kernel/sound/soc/intel/Makefile
+++ b/kernel/sound/soc/intel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Core support
 obj-$(CONFIG_SND_SOC_INTEL_SST) += common/
 
diff --git a/kernel/sound/soc/intel/atom/Makefile b/kernel/sound/soc/intel/atom/Makefile
index aa6548c6f..1dc60471b 100644
--- a/kernel/sound/soc/intel/atom/Makefile
+++ b/kernel/sound/soc/intel/atom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-sst-atom-hifi2-platform-objs :=	sst-mfld-platform-pcm.o \
 					sst-mfld-platform-compress.o \
 					sst-atom-controls.o
diff --git a/kernel/sound/soc/intel/atom/sst/Makefile b/kernel/sound/soc/intel/atom/sst/Makefile
index fd2172636..795d1cf8f 100644
--- a/kernel/sound/soc/intel/atom/sst/Makefile
+++ b/kernel/sound/soc/intel/atom/sst/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-intel-sst-core-objs := sst.o sst_ipc.o sst_stream.o sst_drv_interface.o sst_loader.o sst_pvt.o
 snd-intel-sst-pci-objs += sst_pci.o
 snd-intel-sst-acpi-objs += sst_acpi.o
diff --git a/kernel/sound/soc/intel/boards/Makefile b/kernel/sound/soc/intel/boards/Makefile
index a5c5bc573..69d2dfaeb 100644
--- a/kernel/sound/soc/intel/boards/Makefile
+++ b/kernel/sound/soc/intel/boards/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-sst-haswell-objs := haswell.o
 snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o
 snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
diff --git a/kernel/sound/soc/intel/common/Makefile b/kernel/sound/soc/intel/common/Makefile
index 1a35149bc..0e029f354 100644
--- a/kernel/sound/soc/intel/common/Makefile
+++ b/kernel/sound/soc/intel/common/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-sst-dsp-objs := sst-dsp.o
 snd-soc-sst-acpi-objs := sst-acpi.o
 snd-soc-sst-match-objs := sst-match-acpi.o
diff --git a/kernel/sound/soc/intel/skylake/Makefile b/kernel/sound/soc/intel/skylake/Makefile
index 3380deb81..d1ccbecd1 100644
--- a/kernel/sound/soc/intel/skylake/Makefile
+++ b/kernel/sound/soc/intel/skylake/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-skl-objs := skl.o skl-pcm.o skl-nhlt.o skl-messages.o \
 skl-topology.o
 
diff --git a/kernel/sound/soc/mediatek/mt8173/Makefile b/kernel/sound/soc/mediatek/mt8173/Makefile
index 0357b27d2..c1eed0d26 100644
--- a/kernel/sound/soc/mediatek/mt8173/Makefile
+++ b/kernel/sound/soc/mediatek/mt8173/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # MTK Platform Support
 obj-$(CONFIG_SND_SOC_MT8173) += mt8173-afe-pcm.o
 # Machine support
diff --git a/kernel/sound/soc/mxs/Makefile b/kernel/sound/soc/mxs/Makefile
index 565b5b51e..ab0a9a553 100644
--- a/kernel/sound/soc/mxs/Makefile
+++ b/kernel/sound/soc/mxs/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # MXS Platform Support
 snd-soc-mxs-objs := mxs-saif.o
 snd-soc-mxs-pcm-objs := mxs-pcm.o
diff --git a/kernel/sound/soc/nuc900/Makefile b/kernel/sound/soc/nuc900/Makefile
index 7e46c7150..c7ba2b954 100644
--- a/kernel/sound/soc/nuc900/Makefile
+++ b/kernel/sound/soc/nuc900/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # NUC900 series audio
 snd-soc-nuc900-pcm-objs := nuc900-pcm.o
 snd-soc-nuc900-ac97-objs := nuc900-ac97.o
diff --git a/kernel/sound/soc/omap/Makefile b/kernel/sound/soc/omap/Makefile
index db36fbd5d..a6785dc4f 100644
--- a/kernel/sound/soc/omap/Makefile
+++ b/kernel/sound/soc/omap/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # OMAP Platform Support
 snd-soc-omap-objs := omap-pcm.o
 snd-soc-omap-dmic-objs := omap-dmic.o
diff --git a/kernel/sound/soc/pxa/Makefile b/kernel/sound/soc/pxa/Makefile
index 2cff67b61..5b265662f 100644
--- a/kernel/sound/soc/pxa/Makefile
+++ b/kernel/sound/soc/pxa/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # PXA Platform Support
 snd-soc-pxa2xx-objs := pxa2xx-pcm.o
 snd-soc-pxa2xx-ac97-objs := pxa2xx-ac97.o
diff --git a/kernel/sound/soc/qcom/Makefile b/kernel/sound/soc/qcom/Makefile
index 79e5c50a8..d5280355c 100644
--- a/kernel/sound/soc/qcom/Makefile
+++ b/kernel/sound/soc/qcom/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Platform
 snd-soc-lpass-cpu-objs := lpass-cpu.o
 snd-soc-lpass-platform-objs := lpass-platform.o
diff --git a/kernel/sound/soc/rockchip/Makefile b/kernel/sound/soc/rockchip/Makefile
index 105f0e14a..05b078e7b 100644
--- a/kernel/sound/soc/rockchip/Makefile
+++ b/kernel/sound/soc/rockchip/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # ROCKCHIP Platform Support
 snd-soc-rockchip-i2s-objs := rockchip_i2s.o
 snd-soc-rockchip-pdm-objs := rockchip_pdm.o
diff --git a/kernel/sound/soc/samsung/Makefile b/kernel/sound/soc/samsung/Makefile
index b6c2ee358..030949e1e 100644
--- a/kernel/sound/soc/samsung/Makefile
+++ b/kernel/sound/soc/samsung/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # S3c24XX Platform Support
 snd-soc-s3c-dma-objs := dmaengine.o
 snd-soc-idma-objs := idma.o
diff --git a/kernel/sound/soc/sh/Makefile b/kernel/sound/soc/sh/Makefile
index aaf3dcd1e..51bd7c816 100644
--- a/kernel/sound/soc/sh/Makefile
+++ b/kernel/sound/soc/sh/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ## DMA engines
 snd-soc-dma-sh7760-objs	:= dma-sh7760.o
 obj-$(CONFIG_SND_SOC_PCM_SH7760)	+= snd-soc-dma-sh7760.o
diff --git a/kernel/sound/soc/sirf/Makefile b/kernel/sound/soc/sirf/Makefile
index dd917f20f..16ed11965 100644
--- a/kernel/sound/soc/sirf/Makefile
+++ b/kernel/sound/soc/sirf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-soc-sirf-audio-objs := sirf-audio.o
 snd-soc-sirf-audio-port-objs := sirf-audio-port.o
 snd-soc-sirf-usp-objs := sirf-usp.o
diff --git a/kernel/sound/soc/soc-topology.c b/kernel/sound/soc/soc-topology.c
index dd471d2c0..01a50413c 100644
--- a/kernel/sound/soc/soc-topology.c
+++ b/kernel/sound/soc/soc-topology.c
@@ -1301,7 +1301,7 @@ static struct snd_kcontrol_new *soc_tplg_dapm_widget_denum_create(
 		/* validate kcontrol */
 		if (strnlen(ec->hdr.name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) ==
 			    SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
-			return NULL;
+			goto err;
 
 		se = kzalloc(sizeof(*se), GFP_KERNEL);
 		if (se == NULL)
@@ -1378,6 +1378,9 @@ err_se:
 	for (; i >= 0; i--) {
 		/* free values and texts */
 		se = (struct soc_enum *)kc[i].private_value;
+		if (!se)
+			continue;
+
 		kfree(se->dobj.control.dvalues);
 		for (j = 0; j < ec->items; j++)
 			kfree(se->dobj.control.dtexts[j]);
diff --git a/kernel/sound/soc/spear/Makefile b/kernel/sound/soc/spear/Makefile
index c4ea71610..31d9dae28 100644
--- a/kernel/sound/soc/spear/Makefile
+++ b/kernel/sound/soc/spear/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # SPEAR Platform Support
 snd-soc-spear-pcm-objs := spear_pcm.o
 snd-soc-spear-spdif-in-objs := spdif_in.o
diff --git a/kernel/sound/soc/stm/Makefile b/kernel/sound/soc/stm/Makefile
index 4ed22e648..5b7f0fab0 100644
--- a/kernel/sound/soc/stm/Makefile
+++ b/kernel/sound/soc/stm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # SAI
 snd-soc-stm32-sai-sub-objs := stm32_sai_sub.o
 obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai-sub.o
diff --git a/kernel/sound/soc/sunxi/Makefile b/kernel/sound/soc/sunxi/Makefile
index 1f1af6271..4a9ef6738 100644
--- a/kernel/sound/soc/sunxi/Makefile
+++ b/kernel/sound/soc/sunxi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-$(CONFIG_SND_SUN4I_CODEC) += sun4i-codec.o
 obj-$(CONFIG_SND_SUN4I_I2S) += sun4i-i2s.o
 obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o
diff --git a/kernel/sound/soc/tegra/Makefile b/kernel/sound/soc/tegra/Makefile
index f214a3fd0..2329b72c9 100644
--- a/kernel/sound/soc/tegra/Makefile
+++ b/kernel/sound/soc/tegra/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Tegra platform Support
 snd-soc-tegra-pcm-objs := tegra_pcm.o
 snd-soc-tegra-utils-objs += tegra_asoc_utils.o
diff --git a/kernel/sound/soc/txx9/Makefile b/kernel/sound/soc/txx9/Makefile
index 551f16c0c..37ad833eb 100644
--- a/kernel/sound/soc/txx9/Makefile
+++ b/kernel/sound/soc/txx9/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Platform
 snd-soc-txx9aclc-objs := txx9aclc.o
 snd-soc-txx9aclc-ac97-objs := txx9aclc-ac97.o
diff --git a/kernel/sound/soc/ux500/Makefile b/kernel/sound/soc/ux500/Makefile
index cce0c11a4..e7d6de51b 100644
--- a/kernel/sound/soc/ux500/Makefile
+++ b/kernel/sound/soc/ux500/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Ux500 Platform Support
 
 snd-soc-ux500-plat-msp-i2s-objs := ux500_msp_dai.o ux500_msp_i2s.o
diff --git a/kernel/sound/sparc/Makefile b/kernel/sound/sparc/Makefile
index 3cd89c67c..e1f596571 100644
--- a/kernel/sound/sparc/Makefile
+++ b/kernel/sound/sparc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2002 by David S. Miller <davem@redhat.com>
diff --git a/kernel/sound/spi/Makefile b/kernel/sound/spi/Makefile
index 026fb73f8..a3834919b 100644
--- a/kernel/sound/spi/Makefile
+++ b/kernel/sound/spi/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for SPI drivers
 
 snd-at73c213-objs		:= at73c213.o
diff --git a/kernel/sound/synth/Makefile b/kernel/sound/synth/Makefile
index 11eb06ac2..b9f71d5db 100644
--- a/kernel/sound/synth/Makefile
+++ b/kernel/sound/synth/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/synth/emux/Makefile b/kernel/sound/synth/emux/Makefile
index d1bac923e..ed28c81ac 100644
--- a/kernel/sound/synth/emux/Makefile
+++ b/kernel/sound/synth/emux/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
diff --git a/kernel/sound/usb/Makefile b/kernel/sound/usb/Makefile
index 42cb33b94..05440e2df 100644
--- a/kernel/sound/usb/Makefile
+++ b/kernel/sound/usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for ALSA
 #
diff --git a/kernel/sound/usb/caiaq/audio.h b/kernel/sound/usb/caiaq/audio.h
index bdf155300..869bf6264 100644
--- a/kernel/sound/usb/caiaq/audio.h
+++ b/kernel/sound/usb/caiaq/audio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CAIAQ_AUDIO_H
 #define CAIAQ_AUDIO_H
 
diff --git a/kernel/sound/usb/caiaq/control.h b/kernel/sound/usb/caiaq/control.h
index 501c4883a..cb204fd45 100644
--- a/kernel/sound/usb/caiaq/control.h
+++ b/kernel/sound/usb/caiaq/control.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CAIAQ_CONTROL_H
 #define CAIAQ_CONTROL_H
 
diff --git a/kernel/sound/usb/caiaq/device.h b/kernel/sound/usb/caiaq/device.h
index ab0f7520a..50fea0857 100644
--- a/kernel/sound/usb/caiaq/device.h
+++ b/kernel/sound/usb/caiaq/device.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CAIAQ_DEVICE_H
 #define CAIAQ_DEVICE_H
 
diff --git a/kernel/sound/usb/caiaq/input.h b/kernel/sound/usb/caiaq/input.h
index 6014e2713..c42891e7b 100644
--- a/kernel/sound/usb/caiaq/input.h
+++ b/kernel/sound/usb/caiaq/input.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CAIAQ_INPUT_H
 #define CAIAQ_INPUT_H
 
diff --git a/kernel/sound/usb/caiaq/midi.h b/kernel/sound/usb/caiaq/midi.h
index 60bf3442b..a6ae0c224 100644
--- a/kernel/sound/usb/caiaq/midi.h
+++ b/kernel/sound/usb/caiaq/midi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef CAIAQ_MIDI_H
 #define CAIAQ_MIDI_H
 
diff --git a/kernel/sound/usb/card.h b/kernel/sound/usb/card.h
index 111b0f009..ed87cc83e 100644
--- a/kernel/sound/usb/card.h
+++ b/kernel/sound/usb/card.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_CARD_H
 #define __USBAUDIO_CARD_H
 
diff --git a/kernel/sound/usb/clock.h b/kernel/sound/usb/clock.h
index d592e4a29..87557cae1 100644
--- a/kernel/sound/usb/clock.h
+++ b/kernel/sound/usb/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_CLOCK_H
 #define __USBAUDIO_CLOCK_H
 
diff --git a/kernel/sound/usb/debug.h b/kernel/sound/usb/debug.h
index 58030176f..7dd983c35 100644
--- a/kernel/sound/usb/debug.h
+++ b/kernel/sound/usb/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_DEBUG_H
 #define __USBAUDIO_DEBUG_H
 
diff --git a/kernel/sound/usb/endpoint.h b/kernel/sound/usb/endpoint.h
index 584f295d7..63a39d4fa 100644
--- a/kernel/sound/usb/endpoint.h
+++ b/kernel/sound/usb/endpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_ENDPOINT_H
 #define __USBAUDIO_ENDPOINT_H
 
diff --git a/kernel/sound/usb/format.h b/kernel/sound/usb/format.h
index 4b8a01129..8c3ff9ce0 100644
--- a/kernel/sound/usb/format.h
+++ b/kernel/sound/usb/format.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_FORMAT_H
 #define __USBAUDIO_FORMAT_H
 
diff --git a/kernel/sound/usb/helper.h b/kernel/sound/usb/helper.h
index 805c300dd..4463e6d6d 100644
--- a/kernel/sound/usb/helper.h
+++ b/kernel/sound/usb/helper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_HELPER_H
 #define __USBAUDIO_HELPER_H
 
diff --git a/kernel/sound/usb/line6/Makefile b/kernel/sound/usb/line6/Makefile
index b8b3b2a54..4ba98eb32 100644
--- a/kernel/sound/usb/line6/Makefile
+++ b/kernel/sound/usb/line6/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-usb-line6-y := 		\
 		capture.o	\
 		driver.o	\
diff --git a/kernel/sound/usb/midi.h b/kernel/sound/usb/midi.h
index 5e25a3fd6..8c38aec22 100644
--- a/kernel/sound/usb/midi.h
+++ b/kernel/sound/usb/midi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBMIDI_H
 #define __USBMIDI_H
 
diff --git a/kernel/sound/usb/mixer.h b/kernel/sound/usb/mixer.h
index 545d99b09..ba27f7ade 100644
--- a/kernel/sound/usb/mixer.h
+++ b/kernel/sound/usb/mixer.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBMIXER_H
 #define __USBMIXER_H
 
diff --git a/kernel/sound/usb/mixer_quirks.h b/kernel/sound/usb/mixer_quirks.h
index 177c329cd..b5abd328a 100644
--- a/kernel/sound/usb/mixer_quirks.h
+++ b/kernel/sound/usb/mixer_quirks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SND_USB_MIXER_QUIRKS_H
 #define SND_USB_MIXER_QUIRKS_H
 
diff --git a/kernel/sound/usb/mixer_scarlett.h b/kernel/sound/usb/mixer_scarlett.h
index 19c592ab0..bbf063b79 100644
--- a/kernel/sound/usb/mixer_scarlett.h
+++ b/kernel/sound/usb/mixer_scarlett.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USB_MIXER_SCARLETT_H
 #define __USB_MIXER_SCARLETT_H
 
diff --git a/kernel/sound/usb/mixer_us16x08.h b/kernel/sound/usb/mixer_us16x08.h
index a6312fb0f..56ff16c06 100644
--- a/kernel/sound/usb/mixer_us16x08.h
+++ b/kernel/sound/usb/mixer_us16x08.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USB_MIXER_US16X08_H
 #define __USB_MIXER_US16X08_H
 
diff --git a/kernel/sound/usb/pcm.h b/kernel/sound/usb/pcm.h
index df7a00368..35740d5ef 100644
--- a/kernel/sound/usb/pcm.h
+++ b/kernel/sound/usb/pcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_PCM_H
 #define __USBAUDIO_PCM_H
 
diff --git a/kernel/sound/usb/power.h b/kernel/sound/usb/power.h
index 48ee51dcb..b2e25f60c 100644
--- a/kernel/sound/usb/power.h
+++ b/kernel/sound/usb/power.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_POWER_H
 #define __USBAUDIO_POWER_H
 
diff --git a/kernel/sound/usb/proc.h b/kernel/sound/usb/proc.h
index a45b765e4..72b1b2d28 100644
--- a/kernel/sound/usb/proc.h
+++ b/kernel/sound/usb/proc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_PROC_H
 #define __USBAUDIO_PROC_H
 
diff --git a/kernel/sound/usb/quirks.h b/kernel/sound/usb/quirks.h
index 192ff5ce9..b90c8b7ca 100644
--- a/kernel/sound/usb/quirks.h
+++ b/kernel/sound/usb/quirks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_QUIRKS_H
 #define __USBAUDIO_QUIRKS_H
 
diff --git a/kernel/sound/usb/stream.h b/kernel/sound/usb/stream.h
index c97f679fc..d92e18d58 100644
--- a/kernel/sound/usb/stream.h
+++ b/kernel/sound/usb/stream.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USBAUDIO_STREAM_H
 #define __USBAUDIO_STREAM_H
 
diff --git a/kernel/sound/usb/usx2y/Makefile b/kernel/sound/usb/usx2y/Makefile
index 748933054..cc4c2f1ef 100644
--- a/kernel/sound/usb/usx2y/Makefile
+++ b/kernel/sound/usb/usx2y/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 snd-usb-usx2y-objs := usbusx2y.o usX2Yhwdep.o usx2yhwdeppcm.o
 snd-usb-us122l-objs := us122l.o
 
diff --git a/kernel/sound/usb/usx2y/us122l.h b/kernel/sound/usb/usx2y/us122l.h
index 3e2a2d004..34bea99d3 100644
--- a/kernel/sound/usb/usx2y/us122l.h
+++ b/kernel/sound/usb/usx2y/us122l.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef US122L_H
 #define US122L_H
 
diff --git a/kernel/sound/usb/usx2y/usX2Yhwdep.h b/kernel/sound/usb/usx2y/usX2Yhwdep.h
index c095d5bf1..457199b5e 100644
--- a/kernel/sound/usb/usx2y/usX2Yhwdep.h
+++ b/kernel/sound/usb/usx2y/usX2Yhwdep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef USX2YHWDEP_H
 #define USX2YHWDEP_H
 
diff --git a/kernel/sound/usb/usx2y/usb_stream.h b/kernel/sound/usb/usx2y/usb_stream.h
index 90369001e..851358a8d 100644
--- a/kernel/sound/usb/usx2y/usb_stream.h
+++ b/kernel/sound/usb/usx2y/usb_stream.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __USB_STREAM_H
 #define __USB_STREAM_H
 
diff --git a/kernel/sound/usb/usx2y/usbusx2y.h b/kernel/sound/usb/usx2y/usbusx2y.h
index 6ae6b0806..e0f77172c 100644
--- a/kernel/sound/usb/usx2y/usbusx2y.h
+++ b/kernel/sound/usb/usx2y/usbusx2y.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef USBUSX2Y_H
 #define USBUSX2Y_H
 #include "../usbaudio.h"
diff --git a/kernel/sound/usb/usx2y/usx2yhwdeppcm.h b/kernel/sound/usb/usx2y/usx2yhwdeppcm.h
index 9c4fb84b2..eb5a46466 100644
--- a/kernel/sound/usb/usx2y/usx2yhwdeppcm.h
+++ b/kernel/sound/usb/usx2y/usx2yhwdeppcm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define MAXPACK 50
 #define MAXBUFFERMS 100
 #define MAXSTRIDE 3
diff --git a/kernel/tools/Makefile b/kernel/tools/Makefile
index 9dfede37c..c4f41ef9a 100644
--- a/kernel/tools/Makefile
+++ b/kernel/tools/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Some of the tools (perf) use same make variables
 # as in kernel build.
 export srctree=
diff --git a/kernel/tools/accounting/Makefile b/kernel/tools/accounting/Makefile
index 647c94a21..03687f19c 100644
--- a/kernel/tools/accounting/Makefile
+++ b/kernel/tools/accounting/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC := $(CROSS_COMPILE)gcc
 CFLAGS := -I../../usr/include
 
diff --git a/kernel/tools/accounting/getdelays.c b/kernel/tools/accounting/getdelays.c
index b5ca536e5..9f420d98b 100644
--- a/kernel/tools/accounting/getdelays.c
+++ b/kernel/tools/accounting/getdelays.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* getdelays.c
  *
  * Utility to get per-pid and per-tgid delay accounting statistics
diff --git a/kernel/tools/arch/alpha/include/asm/barrier.h b/kernel/tools/arch/alpha/include/asm/barrier.h
index 95df19c95..da8d6457e 100644
--- a/kernel/tools/arch/alpha/include/asm/barrier.h
+++ b/kernel/tools/arch/alpha/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_ASM_ALPHA_BARRIER_H
 #define __TOOLS_LINUX_ASM_ALPHA_BARRIER_H
 
diff --git a/kernel/tools/arch/alpha/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/alpha/include/uapi/asm/bitsperlong.h
index ad57f7868..6c5bf7d03 100644
--- a/kernel/tools/arch/alpha/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/alpha/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_ALPHA_BITSPERLONG_H
 #define __ASM_ALPHA_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/alpha/include/uapi/asm/mman.h b/kernel/tools/arch/alpha/include/uapi/asm/mman.h
index e38b64c82..c317d3e68 100644
--- a/kernel/tools/arch/alpha/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/alpha/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_ALPHA_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_ALPHA_UAPI_ASM_MMAN_FIX_H
 #define MADV_DODUMP	17
diff --git a/kernel/tools/arch/arc/include/uapi/asm/mman.h b/kernel/tools/arch/arc/include/uapi/asm/mman.h
index aa3acd2aa..81f0f9bf0 100644
--- a/kernel/tools/arch/arc/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/arc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_ARC_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_ARC_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/arm/include/uapi/asm/kvm.h b/kernel/tools/arch/arm/include/uapi/asm/kvm.h
index 5db2d4c6a..1f57bbe82 100644
--- a/kernel/tools/arch/arm/include/uapi/asm/kvm.h
+++ b/kernel/tools/arch/arm/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 - Virtual Open Systems and Columbia University
  * Author: Christoffer Dall <c.dall@virtualopensystems.com>
diff --git a/kernel/tools/arch/arm/include/uapi/asm/mman.h b/kernel/tools/arch/arm/include/uapi/asm/mman.h
index 478f699f5..a6d46321e 100644
--- a/kernel/tools/arch/arm/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/arm/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_ARM_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_ARM_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/arm/include/uapi/asm/perf_regs.h b/kernel/tools/arch/arm/include/uapi/asm/perf_regs.h
index ce5944845..a3c046174 100644
--- a/kernel/tools/arch/arm/include/uapi/asm/perf_regs.h
+++ b/kernel/tools/arch/arm/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ARM_PERF_REGS_H
 #define _ASM_ARM_PERF_REGS_H
 
diff --git a/kernel/tools/arch/arm64/include/asm/barrier.h b/kernel/tools/arch/arm64/include/asm/barrier.h
index a0483c8e0..40bde6b23 100644
--- a/kernel/tools/arch/arm64/include/asm/barrier.h
+++ b/kernel/tools/arch/arm64/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_AARCH64_BARRIER_H
 #define _TOOLS_LINUX_ASM_AARCH64_BARRIER_H
 
diff --git a/kernel/tools/arch/arm64/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/arm64/include/uapi/asm/bitsperlong.h
index fce9c2924..485d60bee 100644
--- a/kernel/tools/arch/arm64/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/arm64/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012 ARM Ltd.
  *
diff --git a/kernel/tools/arch/arm64/include/uapi/asm/kvm.h b/kernel/tools/arch/arm64/include/uapi/asm/kvm.h
index 9f3ca24bb..51149ec75 100644
--- a/kernel/tools/arch/arm64/include/uapi/asm/kvm.h
+++ b/kernel/tools/arch/arm64/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (C) 2012,2013 - ARM Ltd
  * Author: Marc Zyngier <marc.zyngier@arm.com>
diff --git a/kernel/tools/arch/arm64/include/uapi/asm/mman.h b/kernel/tools/arch/arm64/include/uapi/asm/mman.h
index 70fd31137..2ee288e44 100644
--- a/kernel/tools/arch/arm64/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/arm64/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_ARM64_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_ARM64_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/arm64/include/uapi/asm/perf_regs.h b/kernel/tools/arch/arm64/include/uapi/asm/perf_regs.h
index 172b8317e..d54daafa8 100644
--- a/kernel/tools/arch/arm64/include/uapi/asm/perf_regs.h
+++ b/kernel/tools/arch/arm64/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_ARM64_PERF_REGS_H
 #define _ASM_ARM64_PERF_REGS_H
 
diff --git a/kernel/tools/arch/frv/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/frv/include/uapi/asm/bitsperlong.h
index 6dc0bb0c1..76da34b10 100644
--- a/kernel/tools/arch/frv/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/frv/include/uapi/asm/bitsperlong.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/bitsperlong.h>
diff --git a/kernel/tools/arch/frv/include/uapi/asm/mman.h b/kernel/tools/arch/frv/include/uapi/asm/mman.h
index 5be78ac12..5bc900b0b 100644
--- a/kernel/tools/arch/frv/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/frv/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_FRV_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_FRV_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/h8300/include/asm/bitsperlong.h b/kernel/tools/arch/h8300/include/asm/bitsperlong.h
index e140e4672..fa1508337 100644
--- a/kernel/tools/arch/h8300/include/asm/bitsperlong.h
+++ b/kernel/tools/arch/h8300/include/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_H8300_BITS_PER_LONG
 #define __ASM_H8300_BITS_PER_LONG
 
diff --git a/kernel/tools/arch/h8300/include/uapi/asm/mman.h b/kernel/tools/arch/h8300/include/uapi/asm/mman.h
index 9d9ac54d3..be7bbe052 100644
--- a/kernel/tools/arch/h8300/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/h8300/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_H8300_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_H8300_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/hexagon/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/hexagon/include/uapi/asm/bitsperlong.h
index 4a6581513..5adca0d26 100644
--- a/kernel/tools/arch/hexagon/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/hexagon/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
  *
diff --git a/kernel/tools/arch/hexagon/include/uapi/asm/mman.h b/kernel/tools/arch/hexagon/include/uapi/asm/mman.h
index 102f3fae6..cd59ba932 100644
--- a/kernel/tools/arch/hexagon/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/hexagon/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_HEXAGON_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_HEXAGON_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/ia64/include/asm/barrier.h b/kernel/tools/arch/ia64/include/asm/barrier.h
index e4422b4b6..d808ee0e7 100644
--- a/kernel/tools/arch/ia64/include/asm/barrier.h
+++ b/kernel/tools/arch/ia64/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copied from the kernel sources to tools/:
  *
diff --git a/kernel/tools/arch/ia64/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/ia64/include/uapi/asm/bitsperlong.h
index ec4db3c97..1146d5556 100644
--- a/kernel/tools/arch/ia64/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/ia64/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_IA64_BITSPERLONG_H
 #define __ASM_IA64_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/ia64/include/uapi/asm/mman.h b/kernel/tools/arch/ia64/include/uapi/asm/mman.h
index 1d6e5ac64..2a19bb1db 100644
--- a/kernel/tools/arch/ia64/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/ia64/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_IA64_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_IA64_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/m32r/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/m32r/include/uapi/asm/bitsperlong.h
index 6dc0bb0c1..76da34b10 100644
--- a/kernel/tools/arch/m32r/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/m32r/include/uapi/asm/bitsperlong.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/bitsperlong.h>
diff --git a/kernel/tools/arch/m32r/include/uapi/asm/mman.h b/kernel/tools/arch/m32r/include/uapi/asm/mman.h
index 1c29635bb..d19b82c9c 100644
--- a/kernel/tools/arch/m32r/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/m32r/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_M32R_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_M32R_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/microblaze/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/microblaze/include/uapi/asm/bitsperlong.h
index 6dc0bb0c1..76da34b10 100644
--- a/kernel/tools/arch/microblaze/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/microblaze/include/uapi/asm/bitsperlong.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #include <asm-generic/bitsperlong.h>
diff --git a/kernel/tools/arch/microblaze/include/uapi/asm/mman.h b/kernel/tools/arch/microblaze/include/uapi/asm/mman.h
index 005cd50b5..f3f2103fd 100644
--- a/kernel/tools/arch/microblaze/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/microblaze/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_MICROBLAZE_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_MICROBLAZE_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/mips/include/asm/barrier.h b/kernel/tools/arch/mips/include/asm/barrier.h
index 80f96f755..0d1191523 100644
--- a/kernel/tools/arch/mips/include/asm/barrier.h
+++ b/kernel/tools/arch/mips/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_MIPS_BARRIER_H
 #define _TOOLS_LINUX_ASM_MIPS_BARRIER_H
 /*
diff --git a/kernel/tools/arch/mips/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/mips/include/uapi/asm/bitsperlong.h
index 3e4c10a8e..7268380d8 100644
--- a/kernel/tools/arch/mips/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/mips/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_MIPS_BITSPERLONG_H
 #define __ASM_MIPS_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/mips/include/uapi/asm/kvm.h b/kernel/tools/arch/mips/include/uapi/asm/kvm.h
index 6985eb59b..d2714cc1c 100644
--- a/kernel/tools/arch/mips/include/uapi/asm/kvm.h
+++ b/kernel/tools/arch/mips/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
diff --git a/kernel/tools/arch/mips/include/uapi/asm/mman.h b/kernel/tools/arch/mips/include/uapi/asm/mman.h
index c02052965..de2206883 100644
--- a/kernel/tools/arch/mips/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/mips/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_MIPS_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_MIPS_UAPI_ASM_MMAN_FIX_H
 #define MADV_DODUMP	17
diff --git a/kernel/tools/arch/mn10300/include/uapi/asm/mman.h b/kernel/tools/arch/mn10300/include/uapi/asm/mman.h
index c1ea36d83..b93606399 100644
--- a/kernel/tools/arch/mn10300/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/mn10300/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_MN10300_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_MN10300_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/parisc/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/parisc/include/uapi/asm/bitsperlong.h
index e0a23c7bd..23ac75629 100644
--- a/kernel/tools/arch/parisc/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/parisc/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_PARISC_BITSPERLONG_H
 #define __ASM_PARISC_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/parisc/include/uapi/asm/mman.h b/kernel/tools/arch/parisc/include/uapi/asm/mman.h
index 286c0bd74..1bd78758b 100644
--- a/kernel/tools/arch/parisc/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/parisc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_PARISC_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_PARISC_UAPI_ASM_MMAN_FIX_H
 #define MADV_DODUMP	70
diff --git a/kernel/tools/arch/powerpc/include/asm/barrier.h b/kernel/tools/arch/powerpc/include/asm/barrier.h
index b23aee8e6..a634da05b 100644
--- a/kernel/tools/arch/powerpc/include/asm/barrier.h
+++ b/kernel/tools/arch/powerpc/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copied from the kernel sources:
  *
diff --git a/kernel/tools/arch/powerpc/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/powerpc/include/uapi/asm/bitsperlong.h
index 5f1659032..46ece3ecf 100644
--- a/kernel/tools/arch/powerpc/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/powerpc/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_POWERPC_BITSPERLONG_H
 #define __ASM_POWERPC_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/powerpc/include/uapi/asm/kvm.h b/kernel/tools/arch/powerpc/include/uapi/asm/kvm.h
index 8cf8f0c96..61d6049f4 100644
--- a/kernel/tools/arch/powerpc/include/uapi/asm/kvm.h
+++ b/kernel/tools/arch/powerpc/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2, as
diff --git a/kernel/tools/arch/powerpc/include/uapi/asm/mman.h b/kernel/tools/arch/powerpc/include/uapi/asm/mman.h
index 761db4317..f33105bc5 100644
--- a/kernel/tools/arch/powerpc/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/powerpc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_POWERPC_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_POWERPC_UAPI_ASM_MMAN_FIX_H
 #define MAP_DENYWRITE	0x0800
diff --git a/kernel/tools/arch/powerpc/include/uapi/asm/perf_regs.h b/kernel/tools/arch/powerpc/include/uapi/asm/perf_regs.h
index 6a9320974..9e52c86cc 100644
--- a/kernel/tools/arch/powerpc/include/uapi/asm/perf_regs.h
+++ b/kernel/tools/arch/powerpc/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_POWERPC_PERF_REGS_H
 #define _UAPI_ASM_POWERPC_PERF_REGS_H
 
diff --git a/kernel/tools/arch/s390/include/asm/barrier.h b/kernel/tools/arch/s390/include/asm/barrier.h
index f85141266..5030c99f4 100644
--- a/kernel/tools/arch/s390/include/asm/barrier.h
+++ b/kernel/tools/arch/s390/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copied from the kernel sources:
  *
diff --git a/kernel/tools/arch/s390/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/s390/include/uapi/asm/bitsperlong.h
index e351ea2ad..d2bb62011 100644
--- a/kernel/tools/arch/s390/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/s390/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_S390_BITSPERLONG_H
 #define __ASM_S390_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/s390/include/uapi/asm/kvm.h b/kernel/tools/arch/s390/include/uapi/asm/kvm.h
index cd7359e23..9ad172dcd 100644
--- a/kernel/tools/arch/s390/include/uapi/asm/kvm.h
+++ b/kernel/tools/arch/s390/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_KVM_S390_H
 #define __LINUX_KVM_S390_H
 /*
diff --git a/kernel/tools/arch/s390/include/uapi/asm/kvm_perf.h b/kernel/tools/arch/s390/include/uapi/asm/kvm_perf.h
index 397282727..c36c97ffd 100644
--- a/kernel/tools/arch/s390/include/uapi/asm/kvm_perf.h
+++ b/kernel/tools/arch/s390/include/uapi/asm/kvm_perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Definitions for perf-kvm on s390
  *
diff --git a/kernel/tools/arch/s390/include/uapi/asm/mman.h b/kernel/tools/arch/s390/include/uapi/asm/mman.h
index b03dea9e1..4ec32e425 100644
--- a/kernel/tools/arch/s390/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/s390/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_S390_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_S390_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/s390/include/uapi/asm/sie.h b/kernel/tools/arch/s390/include/uapi/asm/sie.h
index 3ac634368..6ca1e68d7 100644
--- a/kernel/tools/arch/s390/include/uapi/asm/sie.h
+++ b/kernel/tools/arch/s390/include/uapi/asm/sie.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_S390_SIE_H
 #define _UAPI_ASM_S390_SIE_H
 
diff --git a/kernel/tools/arch/score/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/score/include/uapi/asm/bitsperlong.h
index 86ff337aa..df48f2717 100644
--- a/kernel/tools/arch/score/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/score/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_SCORE_BITSPERLONG_H
 #define _ASM_SCORE_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/score/include/uapi/asm/mman.h b/kernel/tools/arch/score/include/uapi/asm/mman.h
index 2f8fb8994..b4bd195a8 100644
--- a/kernel/tools/arch/score/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/score/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_SCORE_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_SCORE_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/sh/include/asm/barrier.h b/kernel/tools/arch/sh/include/asm/barrier.h
index c18fd7599..bde5221af 100644
--- a/kernel/tools/arch/sh/include/asm/barrier.h
+++ b/kernel/tools/arch/sh/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copied from the kernel sources:
  *
diff --git a/kernel/tools/arch/sh/include/uapi/asm/mman.h b/kernel/tools/arch/sh/include/uapi/asm/mman.h
index 26504f6f0..88c0e2930 100644
--- a/kernel/tools/arch/sh/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/sh/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_SH_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_SH_UAPI_ASM_MMAN_FIX_H
 #include <uapi/asm-generic/mman.h>
diff --git a/kernel/tools/arch/sparc/include/asm/barrier.h b/kernel/tools/arch/sparc/include/asm/barrier.h
index 8c017b3b1..95d161846 100644
--- a/kernel/tools/arch/sparc/include/asm/barrier.h
+++ b/kernel/tools/arch/sparc/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ___TOOLS_LINUX_ASM_SPARC_BARRIER_H
 #define ___TOOLS_LINUX_ASM_SPARC_BARRIER_H
 #if defined(__sparc__) && defined(__arch64__)
diff --git a/kernel/tools/arch/sparc/include/asm/barrier_32.h b/kernel/tools/arch/sparc/include/asm/barrier_32.h
index c5eadd0a7..cc19ed1dd 100644
--- a/kernel/tools/arch/sparc/include/asm/barrier_32.h
+++ b/kernel/tools/arch/sparc/include/asm/barrier_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_PERF_SPARC_BARRIER_H
 #define __TOOLS_PERF_SPARC_BARRIER_H
 
diff --git a/kernel/tools/arch/sparc/include/asm/barrier_64.h b/kernel/tools/arch/sparc/include/asm/barrier_64.h
index 9a7d7322c..ba6134428 100644
--- a/kernel/tools/arch/sparc/include/asm/barrier_64.h
+++ b/kernel/tools/arch/sparc/include/asm/barrier_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_SPARC64_BARRIER_H
 #define __TOOLS_LINUX_SPARC64_BARRIER_H
 
diff --git a/kernel/tools/arch/sparc/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/sparc/include/uapi/asm/bitsperlong.h
index b62dd907d..3b4e61740 100644
--- a/kernel/tools/arch/sparc/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/sparc/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_ALPHA_BITSPERLONG_H
 #define __ASM_ALPHA_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/sparc/include/uapi/asm/mman.h b/kernel/tools/arch/sparc/include/uapi/asm/mman.h
index 8640525de..38920eed8 100644
--- a/kernel/tools/arch/sparc/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/sparc/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_SPARC_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_SPARC_UAPI_ASM_MMAN_FIX_H
 #define MAP_DENYWRITE	0x0800
diff --git a/kernel/tools/arch/tile/include/asm/barrier.h b/kernel/tools/arch/tile/include/asm/barrier.h
index 7d3692c3d..7ad02a591 100644
--- a/kernel/tools/arch/tile/include/asm/barrier.h
+++ b/kernel/tools/arch/tile/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_TILE_BARRIER_H
 #define _TOOLS_LINUX_ASM_TILE_BARRIER_H
 /*
diff --git a/kernel/tools/arch/tile/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/tile/include/uapi/asm/bitsperlong.h
index 58c771f2a..57cca78c0 100644
--- a/kernel/tools/arch/tile/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/tile/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright 2010 Tilera Corporation. All Rights Reserved.
  *
diff --git a/kernel/tools/arch/tile/include/uapi/asm/mman.h b/kernel/tools/arch/tile/include/uapi/asm/mman.h
index 7116c4b92..65ec92925 100644
--- a/kernel/tools/arch/tile/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/tile/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_TILE_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_TILE_UAPI_ASM_MMAN_FIX_H
 #define MAP_DENYWRITE	0x0800
diff --git a/kernel/tools/arch/x86/include/asm/atomic.h b/kernel/tools/arch/x86/include/asm/atomic.h
index 328eeceec..7d8c3261a 100644
--- a/kernel/tools/arch/x86/include/asm/atomic.h
+++ b/kernel/tools/arch/x86/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_X86_ATOMIC_H
 #define _TOOLS_LINUX_ASM_X86_ATOMIC_H
 
diff --git a/kernel/tools/arch/x86/include/asm/barrier.h b/kernel/tools/arch/x86/include/asm/barrier.h
index f366d8e55..8774dee27 100644
--- a/kernel/tools/arch/x86/include/asm/barrier.h
+++ b/kernel/tools/arch/x86/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_X86_BARRIER_H
 #define _TOOLS_LINUX_ASM_X86_BARRIER_H
 
diff --git a/kernel/tools/arch/x86/include/asm/cmpxchg.h b/kernel/tools/arch/x86/include/asm/cmpxchg.h
index f5253260f..0ed9ca276 100644
--- a/kernel/tools/arch/x86/include/asm/cmpxchg.h
+++ b/kernel/tools/arch/x86/include/asm/cmpxchg.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TOOLS_ASM_X86_CMPXCHG_H
 #define TOOLS_ASM_X86_CMPXCHG_H
 
diff --git a/kernel/tools/arch/x86/include/asm/cpufeatures.h b/kernel/tools/arch/x86/include/asm/cpufeatures.h
index 2519c6c80..793690fbd 100644
--- a/kernel/tools/arch/x86/include/asm/cpufeatures.h
+++ b/kernel/tools/arch/x86/include/asm/cpufeatures.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_X86_CPUFEATURES_H
 #define _ASM_X86_CPUFEATURES_H
 
diff --git a/kernel/tools/arch/x86/include/asm/rmwcc.h b/kernel/tools/arch/x86/include/asm/rmwcc.h
index a6669bc06..dc90c0c2f 100644
--- a/kernel/tools/arch/x86/include/asm/rmwcc.h
+++ b/kernel/tools/arch/x86/include/asm/rmwcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_X86_RMWcc
 #define _TOOLS_LINUX_ASM_X86_RMWcc
 
diff --git a/kernel/tools/arch/x86/include/asm/unistd_32.h b/kernel/tools/arch/x86/include/asm/unistd_32.h
index 0e4312ffc..60a89dba0 100644
--- a/kernel/tools/arch/x86/include/asm/unistd_32.h
+++ b/kernel/tools/arch/x86/include/asm/unistd_32.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NR_perf_event_open
 # define __NR_perf_event_open 336
 #endif
diff --git a/kernel/tools/arch/x86/include/asm/unistd_64.h b/kernel/tools/arch/x86/include/asm/unistd_64.h
index dd56bb361..cb52a3a8b 100644
--- a/kernel/tools/arch/x86/include/asm/unistd_64.h
+++ b/kernel/tools/arch/x86/include/asm/unistd_64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __NR_perf_event_open
 # define __NR_perf_event_open 298
 #endif
diff --git a/kernel/tools/arch/x86/include/uapi/asm/bitsperlong.h b/kernel/tools/arch/x86/include/uapi/asm/bitsperlong.h
index 6e23c543c..f8a92e000 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/bitsperlong.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_X86_BITSPERLONG_H
 #define __ASM_X86_BITSPERLONG_H
 
diff --git a/kernel/tools/arch/x86/include/uapi/asm/kvm.h b/kernel/tools/arch/x86/include/uapi/asm/kvm.h
index c2824d02b..f3a960488 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/kvm.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_KVM_H
 #define _ASM_X86_KVM_H
 
diff --git a/kernel/tools/arch/x86/include/uapi/asm/kvm_perf.h b/kernel/tools/arch/x86/include/uapi/asm/kvm_perf.h
index 3bb964f88..125cf5cdf 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/kvm_perf.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/kvm_perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_KVM_PERF_H
 #define _ASM_X86_KVM_PERF_H
 
diff --git a/kernel/tools/arch/x86/include/uapi/asm/mman.h b/kernel/tools/arch/x86/include/uapi/asm/mman.h
index b73c1af8b..8449778de 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_X86_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_X86_UAPI_ASM_MMAN_FIX_H
 #define MAP_32BIT	0x40
diff --git a/kernel/tools/arch/x86/include/uapi/asm/perf_regs.h b/kernel/tools/arch/x86/include/uapi/asm/perf_regs.h
index 3f2207bfd..f3329cabc 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/perf_regs.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _ASM_X86_PERF_REGS_H
 #define _ASM_X86_PERF_REGS_H
 
diff --git a/kernel/tools/arch/x86/include/uapi/asm/svm.h b/kernel/tools/arch/x86/include/uapi/asm/svm.h
index 3725e145a..a9731f8a4 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/svm.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/svm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__SVM_H
 #define _UAPI__SVM_H
 
diff --git a/kernel/tools/arch/x86/include/uapi/asm/unistd.h b/kernel/tools/arch/x86/include/uapi/asm/unistd.h
index a26df0d75..30d7d04d7 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/unistd.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/unistd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_ASM_X86_UNISTD_H
 #define _UAPI_ASM_X86_UNISTD_H
 
diff --git a/kernel/tools/arch/x86/include/uapi/asm/vmx.h b/kernel/tools/arch/x86/include/uapi/asm/vmx.h
index 690a2dcf4..f0b0c90dd 100644
--- a/kernel/tools/arch/x86/include/uapi/asm/vmx.h
+++ b/kernel/tools/arch/x86/include/uapi/asm/vmx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * vmx.h: VMX Architecture related definitions
  * Copyright (c) 2004, Intel Corporation.
diff --git a/kernel/tools/arch/x86/lib/memcpy_64.S b/kernel/tools/arch/x86/lib/memcpy_64.S
index 98dcc112b..9a53a06e5 100644
--- a/kernel/tools/arch/x86/lib/memcpy_64.S
+++ b/kernel/tools/arch/x86/lib/memcpy_64.S
@@ -4,6 +4,7 @@
 #include <asm/errno.h>
 #include <asm/cpufeatures.h>
 #include <asm/alternative-asm.h>
+#include <asm/export.h>
 
 /*
  * We build a jump to memcpy_orig by default which gets NOPped out on
@@ -40,6 +41,8 @@ ENTRY(memcpy)
 	ret
 ENDPROC(memcpy)
 ENDPROC(__memcpy)
+EXPORT_SYMBOL(memcpy)
+EXPORT_SYMBOL(__memcpy)
 
 /*
  * memcpy_erms() - enhanced fast string memcpy. This is faster and
@@ -274,6 +277,7 @@ ENTRY(memcpy_mcsafe_unrolled)
 	xorq %rax, %rax
 	ret
 ENDPROC(memcpy_mcsafe_unrolled)
+EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled)
 
 	.section .fixup, "ax"
 	/* Return -EFAULT for any failure */
diff --git a/kernel/tools/arch/x86/lib/memset_64.S b/kernel/tools/arch/x86/lib/memset_64.S
index e1229ecd2..f8f3dc0a6 100644
--- a/kernel/tools/arch/x86/lib/memset_64.S
+++ b/kernel/tools/arch/x86/lib/memset_64.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright 2002 Andi Kleen, SuSE Labs */
 
 #include <linux/linkage.h>
diff --git a/kernel/tools/arch/xtensa/include/uapi/asm/mman.h b/kernel/tools/arch/xtensa/include/uapi/asm/mman.h
index 4453195c4..34dde6f44 100644
--- a/kernel/tools/arch/xtensa/include/uapi/asm/mman.h
+++ b/kernel/tools/arch/xtensa/include/uapi/asm/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef TOOLS_ARCH_XTENSA_UAPI_ASM_MMAN_FIX_H
 #define TOOLS_ARCH_XTENSA_UAPI_ASM_MMAN_FIX_H
 #define MADV_DODUMP	17
diff --git a/kernel/tools/build/Makefile b/kernel/tools/build/Makefile
index 477f00eda..5eb4b5ad7 100644
--- a/kernel/tools/build/Makefile
+++ b/kernel/tools/build/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifeq ($(srctree),)
 srctree := $(patsubst %/,%,$(dir $(CURDIR)))
 srctree := $(patsubst %/,%,$(dir $(srctree)))
diff --git a/kernel/tools/build/Makefile.build b/kernel/tools/build/Makefile.build
index c46b20e4a..cd72016c3 100644
--- a/kernel/tools/build/Makefile.build
+++ b/kernel/tools/build/Makefile.build
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ###
 # Main build makefile.
 #
diff --git a/kernel/tools/build/feature/Makefile b/kernel/tools/build/feature/Makefile
index ee2546ddf..96982640f 100644
--- a/kernel/tools/build/feature/Makefile
+++ b/kernel/tools/build/feature/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 FILES=                                          \
          test-all.bin                           \
          test-backtrace.bin                     \
diff --git a/kernel/tools/build/feature/test-all.c b/kernel/tools/build/feature/test-all.c
index b5cfc6445..4112702e4 100644
--- a/kernel/tools/build/feature/test-all.c
+++ b/kernel/tools/build/feature/test-all.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * test-all.c: Try to build all the main testcases at once.
  *
diff --git a/kernel/tools/build/feature/test-backtrace.c b/kernel/tools/build/feature/test-backtrace.c
index 7124aa1dc..e9ddd27c6 100644
--- a/kernel/tools/build/feature/test-backtrace.c
+++ b/kernel/tools/build/feature/test-backtrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <execinfo.h>
 #include <stdio.h>
 
diff --git a/kernel/tools/build/feature/test-bionic.c b/kernel/tools/build/feature/test-bionic.c
index eac24e951..4bcc97765 100644
--- a/kernel/tools/build/feature/test-bionic.c
+++ b/kernel/tools/build/feature/test-bionic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <android/api-level.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-bpf.c b/kernel/tools/build/feature/test-bpf.c
index da2172ff9..82070eadf 100644
--- a/kernel/tools/build/feature/test-bpf.c
+++ b/kernel/tools/build/feature/test-bpf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/unistd.h>
 #include <linux/bpf.h>
 #include <unistd.h>
diff --git a/kernel/tools/build/feature/test-clang.cpp b/kernel/tools/build/feature/test-clang.cpp
index e23c1b1f1..a2b3f092d 100644
--- a/kernel/tools/build/feature/test-clang.cpp
+++ b/kernel/tools/build/feature/test-clang.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "clang/Basic/VirtualFileSystem.h"
 #include "clang/Driver/Driver.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
diff --git a/kernel/tools/build/feature/test-compile.c b/kernel/tools/build/feature/test-compile.c
index c54e6551a..9821b8271 100644
--- a/kernel/tools/build/feature/test-compile.c
+++ b/kernel/tools/build/feature/test-compile.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 int main(void)
 {
diff --git a/kernel/tools/build/feature/test-cplus-demangle.c b/kernel/tools/build/feature/test-cplus-demangle.c
index 610c686e0..2ba56474a 100644
--- a/kernel/tools/build/feature/test-cplus-demangle.c
+++ b/kernel/tools/build/feature/test-cplus-demangle.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 extern int printf(const char *format, ...);
 extern char *cplus_demangle(const char *, int);
 
diff --git a/kernel/tools/build/feature/test-cxx.cpp b/kernel/tools/build/feature/test-cxx.cpp
index b1dee9a31..396aaedd2 100644
--- a/kernel/tools/build/feature/test-cxx.cpp
+++ b/kernel/tools/build/feature/test-cxx.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <iostream>
 #include <memory>
 
diff --git a/kernel/tools/build/feature/test-dwarf.c b/kernel/tools/build/feature/test-dwarf.c
index 3fc1801ce..8d474bd73 100644
--- a/kernel/tools/build/feature/test-dwarf.c
+++ b/kernel/tools/build/feature/test-dwarf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dwarf.h>
 #include <elfutils/libdw.h>
 #include <elfutils/version.h>
diff --git a/kernel/tools/build/feature/test-dwarf_getlocations.c b/kernel/tools/build/feature/test-dwarf_getlocations.c
index 70162699d..78fb4a1fa 100644
--- a/kernel/tools/build/feature/test-dwarf_getlocations.c
+++ b/kernel/tools/build/feature/test-dwarf_getlocations.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <elfutils/libdw.h>
 
diff --git a/kernel/tools/build/feature/test-get_cpuid.c b/kernel/tools/build/feature/test-get_cpuid.c
index d7a2c4071..bb4f065f2 100644
--- a/kernel/tools/build/feature/test-get_cpuid.c
+++ b/kernel/tools/build/feature/test-get_cpuid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <cpuid.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-glibc.c b/kernel/tools/build/feature/test-glibc.c
index 9367f7586..9ab8e90e7 100644
--- a/kernel/tools/build/feature/test-glibc.c
+++ b/kernel/tools/build/feature/test-glibc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 
 #if !defined(__UCLIBC__)
diff --git a/kernel/tools/build/feature/test-gtk2-infobar.c b/kernel/tools/build/feature/test-gtk2-infobar.c
index 397b4646d..b1b716dd5 100644
--- a/kernel/tools/build/feature/test-gtk2-infobar.c
+++ b/kernel/tools/build/feature/test-gtk2-infobar.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #include <gtk/gtk.h>
 #pragma GCC diagnostic error "-Wstrict-prototypes"
diff --git a/kernel/tools/build/feature/test-gtk2.c b/kernel/tools/build/feature/test-gtk2.c
index 6bd80e509..2aaf4bfc2 100644
--- a/kernel/tools/build/feature/test-gtk2.c
+++ b/kernel/tools/build/feature/test-gtk2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #include <gtk/gtk.h>
 #pragma GCC diagnostic error "-Wstrict-prototypes"
diff --git a/kernel/tools/build/feature/test-jvmti.c b/kernel/tools/build/feature/test-jvmti.c
index 1c665f09b..5cf31192f 100644
--- a/kernel/tools/build/feature/test-jvmti.c
+++ b/kernel/tools/build/feature/test-jvmti.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <jvmti.h>
 #include <jvmticmlr.h>
 
diff --git a/kernel/tools/build/feature/test-libaudit.c b/kernel/tools/build/feature/test-libaudit.c
index afc019f08..f5b0863fa 100644
--- a/kernel/tools/build/feature/test-libaudit.c
+++ b/kernel/tools/build/feature/test-libaudit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libaudit.h>
 
 extern int printf(const char *format, ...);
diff --git a/kernel/tools/build/feature/test-libbabeltrace.c b/kernel/tools/build/feature/test-libbabeltrace.c
index 9cf802a04..10bb69d55 100644
--- a/kernel/tools/build/feature/test-libbabeltrace.c
+++ b/kernel/tools/build/feature/test-libbabeltrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <babeltrace/ctf-writer/writer.h>
 #include <babeltrace/ctf-ir/stream-class.h>
diff --git a/kernel/tools/build/feature/test-libbfd.c b/kernel/tools/build/feature/test-libbfd.c
index 24059907e..afa46b046 100644
--- a/kernel/tools/build/feature/test-libbfd.c
+++ b/kernel/tools/build/feature/test-libbfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <bfd.h>
 
 extern int printf(const char *format, ...);
diff --git a/kernel/tools/build/feature/test-libcrypto.c b/kernel/tools/build/feature/test-libcrypto.c
index bd79dc7f2..a98174e05 100644
--- a/kernel/tools/build/feature/test-libcrypto.c
+++ b/kernel/tools/build/feature/test-libcrypto.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <openssl/sha.h>
 #include <openssl/md5.h>
 
diff --git a/kernel/tools/build/feature/test-libdw-dwarf-unwind.c b/kernel/tools/build/feature/test-libdw-dwarf-unwind.c
index f676a3ff4..ed03d9505 100644
--- a/kernel/tools/build/feature/test-libdw-dwarf-unwind.c
+++ b/kernel/tools/build/feature/test-libdw-dwarf-unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <elfutils/libdwfl.h>
 
diff --git a/kernel/tools/build/feature/test-libelf-gelf_getnote.c b/kernel/tools/build/feature/test-libelf-gelf_getnote.c
index d78cf4d52..075d062fe 100644
--- a/kernel/tools/build/feature/test-libelf-gelf_getnote.c
+++ b/kernel/tools/build/feature/test-libelf-gelf_getnote.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <gelf.h>
 
diff --git a/kernel/tools/build/feature/test-libelf-getphdrnum.c b/kernel/tools/build/feature/test-libelf-getphdrnum.c
index d71045930..96a7f8d30 100644
--- a/kernel/tools/build/feature/test-libelf-getphdrnum.c
+++ b/kernel/tools/build/feature/test-libelf-getphdrnum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libelf.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-libelf-getshdrstrndx.c b/kernel/tools/build/feature/test-libelf-getshdrstrndx.c
index f0c3b47cc..ae9f2fff5 100644
--- a/kernel/tools/build/feature/test-libelf-getshdrstrndx.c
+++ b/kernel/tools/build/feature/test-libelf-getshdrstrndx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libelf.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-libelf-mmap.c b/kernel/tools/build/feature/test-libelf-mmap.c
index 564427d7e..2c3ef81af 100644
--- a/kernel/tools/build/feature/test-libelf-mmap.c
+++ b/kernel/tools/build/feature/test-libelf-mmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libelf.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-libelf.c b/kernel/tools/build/feature/test-libelf.c
index 08db322d8..905044127 100644
--- a/kernel/tools/build/feature/test-libelf.c
+++ b/kernel/tools/build/feature/test-libelf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libelf.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-libnuma.c b/kernel/tools/build/feature/test-libnuma.c
index 4763d9cd5..b3aa59f8b 100644
--- a/kernel/tools/build/feature/test-libnuma.c
+++ b/kernel/tools/build/feature/test-libnuma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <numa.h>
 #include <numaif.h>
 
diff --git a/kernel/tools/build/feature/test-libperl.c b/kernel/tools/build/feature/test-libperl.c
index 8871f6a0f..0415f437e 100644
--- a/kernel/tools/build/feature/test-libperl.c
+++ b/kernel/tools/build/feature/test-libperl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <EXTERN.h>
 #include <perl.h>
 
diff --git a/kernel/tools/build/feature/test-libpython-version.c b/kernel/tools/build/feature/test-libpython-version.c
index facea122d..47714b942 100644
--- a/kernel/tools/build/feature/test-libpython-version.c
+++ b/kernel/tools/build/feature/test-libpython-version.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <Python.h>
 
 #if PY_VERSION_HEX >= 0x03000000
diff --git a/kernel/tools/build/feature/test-libpython.c b/kernel/tools/build/feature/test-libpython.c
index b24b28ad6..0c1641b0d 100644
--- a/kernel/tools/build/feature/test-libpython.c
+++ b/kernel/tools/build/feature/test-libpython.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <Python.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-libslang.c b/kernel/tools/build/feature/test-libslang.c
index 22ff22ed9..9cbff8d1d 100644
--- a/kernel/tools/build/feature/test-libslang.c
+++ b/kernel/tools/build/feature/test-libslang.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <slang.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-libunwind-aarch64.c b/kernel/tools/build/feature/test-libunwind-aarch64.c
index fc03fb64e..323803f49 100644
--- a/kernel/tools/build/feature/test-libunwind-aarch64.c
+++ b/kernel/tools/build/feature/test-libunwind-aarch64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind-aarch64.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind-arm.c b/kernel/tools/build/feature/test-libunwind-arm.c
index 632d95ec6..cb378b7d6 100644
--- a/kernel/tools/build/feature/test-libunwind-arm.c
+++ b/kernel/tools/build/feature/test-libunwind-arm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind-arm.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind-debug-frame-aarch64.c b/kernel/tools/build/feature/test-libunwind-debug-frame-aarch64.c
index 22844673f..36d6646c1 100644
--- a/kernel/tools/build/feature/test-libunwind-debug-frame-aarch64.c
+++ b/kernel/tools/build/feature/test-libunwind-debug-frame-aarch64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind-aarch64.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind-debug-frame-arm.c b/kernel/tools/build/feature/test-libunwind-debug-frame-arm.c
index f98859684..8696e48e1 100644
--- a/kernel/tools/build/feature/test-libunwind-debug-frame-arm.c
+++ b/kernel/tools/build/feature/test-libunwind-debug-frame-arm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind-arm.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind-debug-frame.c b/kernel/tools/build/feature/test-libunwind-debug-frame.c
index 0ef8087a1..efb55cdd8 100644
--- a/kernel/tools/build/feature/test-libunwind-debug-frame.c
+++ b/kernel/tools/build/feature/test-libunwind-debug-frame.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind-x86.c b/kernel/tools/build/feature/test-libunwind-x86.c
index 3561edce3..e5e0f6c89 100644
--- a/kernel/tools/build/feature/test-libunwind-x86.c
+++ b/kernel/tools/build/feature/test-libunwind-x86.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind-x86.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind-x86_64.c b/kernel/tools/build/feature/test-libunwind-x86_64.c
index 5add2517b..62ae4db59 100644
--- a/kernel/tools/build/feature/test-libunwind-x86_64.c
+++ b/kernel/tools/build/feature/test-libunwind-x86_64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind-x86_64.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-libunwind.c b/kernel/tools/build/feature/test-libunwind.c
index 43b9369bc..53fd26614 100644
--- a/kernel/tools/build/feature/test-libunwind.c
+++ b/kernel/tools/build/feature/test-libunwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <libunwind.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/build/feature/test-llvm-version.cpp b/kernel/tools/build/feature/test-llvm-version.cpp
index 896d31724..8a0916254 100644
--- a/kernel/tools/build/feature/test-llvm-version.cpp
+++ b/kernel/tools/build/feature/test-llvm-version.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <cstdio>
 #include "llvm/Config/llvm-config.h"
 
diff --git a/kernel/tools/build/feature/test-llvm.cpp b/kernel/tools/build/feature/test-llvm.cpp
index 455a332dc..88a3d1bdd 100644
--- a/kernel/tools/build/feature/test-llvm.cpp
+++ b/kernel/tools/build/feature/test-llvm.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/raw_ostream.h"
 #define NUM_VERSION (((LLVM_VERSION_MAJOR) << 16) + (LLVM_VERSION_MINOR << 8) + LLVM_VERSION_PATCH)
diff --git a/kernel/tools/build/feature/test-lzma.c b/kernel/tools/build/feature/test-lzma.c
index 95adc8ced..78682bb01 100644
--- a/kernel/tools/build/feature/test-lzma.c
+++ b/kernel/tools/build/feature/test-lzma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <lzma.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-numa_num_possible_cpus.c b/kernel/tools/build/feature/test-numa_num_possible_cpus.c
index 2606e94b0..573d07b9c 100644
--- a/kernel/tools/build/feature/test-numa_num_possible_cpus.c
+++ b/kernel/tools/build/feature/test-numa_num_possible_cpus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <numa.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-pthread-attr-setaffinity-np.c b/kernel/tools/build/feature/test-pthread-attr-setaffinity-np.c
index fdada5e8d..38c71131c 100644
--- a/kernel/tools/build/feature/test-pthread-attr-setaffinity-np.c
+++ b/kernel/tools/build/feature/test-pthread-attr-setaffinity-np.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdint.h>
 #include <pthread.h>
 #include <sched.h>
diff --git a/kernel/tools/build/feature/test-sched_getcpu.c b/kernel/tools/build/feature/test-sched_getcpu.c
index 9c6b4cbff..e448deb41 100644
--- a/kernel/tools/build/feature/test-sched_getcpu.c
+++ b/kernel/tools/build/feature/test-sched_getcpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
diff --git a/kernel/tools/build/feature/test-sdt.c b/kernel/tools/build/feature/test-sdt.c
index e4531a6e8..22737b0da 100644
--- a/kernel/tools/build/feature/test-sdt.c
+++ b/kernel/tools/build/feature/test-sdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/sdt.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-stackprotector-all.c b/kernel/tools/build/feature/test-stackprotector-all.c
index c9f398d87..c8a57194f 100644
--- a/kernel/tools/build/feature/test-stackprotector-all.c
+++ b/kernel/tools/build/feature/test-stackprotector-all.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 
 int main(void)
diff --git a/kernel/tools/build/feature/test-sync-compare-and-swap.c b/kernel/tools/build/feature/test-sync-compare-and-swap.c
index c34d4ca4a..1e38d1930 100644
--- a/kernel/tools/build/feature/test-sync-compare-and-swap.c
+++ b/kernel/tools/build/feature/test-sync-compare-and-swap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdint.h>
 
 volatile uint64_t x;
diff --git a/kernel/tools/build/feature/test-timerfd.c b/kernel/tools/build/feature/test-timerfd.c
index 8c5c083b4..9c72c697a 100644
--- a/kernel/tools/build/feature/test-timerfd.c
+++ b/kernel/tools/build/feature/test-timerfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * test for timerfd functions used by perf-kvm-stat-live
  */
diff --git a/kernel/tools/build/feature/test-zlib.c b/kernel/tools/build/feature/test-zlib.c
index e111fff62..da6c35794 100644
--- a/kernel/tools/build/feature/test-zlib.c
+++ b/kernel/tools/build/feature/test-zlib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <zlib.h>
 
 int main(void)
diff --git a/kernel/tools/build/fixdep.c b/kernel/tools/build/fixdep.c
index 734d1547c..2501fea7a 100644
--- a/kernel/tools/build/fixdep.c
+++ b/kernel/tools/build/fixdep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * "Optimize" a list of dependencies as spit out by gcc -MD
  * for the build framework.
diff --git a/kernel/tools/build/tests/ex/Makefile b/kernel/tools/build/tests/ex/Makefile
index 027d6c8a5..fee032e06 100644
--- a/kernel/tools/build/tests/ex/Makefile
+++ b/kernel/tools/build/tests/ex/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 export srctree := $(abspath ../../../..)
 export CC      := gcc
 export LD      := ld
diff --git a/kernel/tools/build/tests/ex/a.c b/kernel/tools/build/tests/ex/a.c
index 851762798..66017a9f4 100644
--- a/kernel/tools/build/tests/ex/a.c
+++ b/kernel/tools/build/tests/ex/a.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int a(void)
 {
diff --git a/kernel/tools/build/tests/ex/arch/e.c b/kernel/tools/build/tests/ex/arch/e.c
index beaa4a1d7..f6ef585b5 100644
--- a/kernel/tools/build/tests/ex/arch/e.c
+++ b/kernel/tools/build/tests/ex/arch/e.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int e(void)
 {
diff --git a/kernel/tools/build/tests/ex/arch/f.c b/kernel/tools/build/tests/ex/arch/f.c
index 7c3e9e9da..bffd9c67e 100644
--- a/kernel/tools/build/tests/ex/arch/f.c
+++ b/kernel/tools/build/tests/ex/arch/f.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int f(void)
 {
diff --git a/kernel/tools/build/tests/ex/b.c b/kernel/tools/build/tests/ex/b.c
index c24ff9ca9..2b29fb4d3 100644
--- a/kernel/tools/build/tests/ex/b.c
+++ b/kernel/tools/build/tests/ex/b.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int b(void)
 {
diff --git a/kernel/tools/build/tests/ex/c.c b/kernel/tools/build/tests/ex/c.c
index e216d0217..a63b20ab8 100644
--- a/kernel/tools/build/tests/ex/c.c
+++ b/kernel/tools/build/tests/ex/c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int c(void)
 {
diff --git a/kernel/tools/build/tests/ex/d.c b/kernel/tools/build/tests/ex/d.c
index 80dc0f061..e114e8dca 100644
--- a/kernel/tools/build/tests/ex/d.c
+++ b/kernel/tools/build/tests/ex/d.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int d(void)
 {
diff --git a/kernel/tools/build/tests/ex/ex.c b/kernel/tools/build/tests/ex/ex.c
index 57de6074d..3c02756ef 100644
--- a/kernel/tools/build/tests/ex/ex.c
+++ b/kernel/tools/build/tests/ex/ex.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 int a(void);
 int b(void);
diff --git a/kernel/tools/build/tests/ex/inc.c b/kernel/tools/build/tests/ex/inc.c
index c20f1e903..3636ab5bf 100644
--- a/kernel/tools/build/tests/ex/inc.c
+++ b/kernel/tools/build/tests/ex/inc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifdef INCLUDE
 #include "krava.h"
 #endif
diff --git a/kernel/tools/build/tests/run.sh b/kernel/tools/build/tests/run.sh
index 44d2a0fad..2c54e4d43 100755
--- a/kernel/tools/build/tests/run.sh
+++ b/kernel/tools/build/tests/run.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 function test_ex {
 	make -C ex V=1 clean > ex.out 2>&1
diff --git a/kernel/tools/cgroup/Makefile b/kernel/tools/cgroup/Makefile
index b4286196b..860fa1516 100644
--- a/kernel/tools/cgroup/Makefile
+++ b/kernel/tools/cgroup/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for cgroup tools
 
 CC = $(CROSS_COMPILE)gcc
diff --git a/kernel/tools/cgroup/cgroup_event_listener.c b/kernel/tools/cgroup/cgroup_event_listener.c
index 4eb550720..3d70dc831 100644
--- a/kernel/tools/cgroup/cgroup_event_listener.c
+++ b/kernel/tools/cgroup/cgroup_event_listener.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * cgroup_event_listener.c - Simple listener of cgroup events
  *
diff --git a/kernel/tools/firewire/Makefile b/kernel/tools/firewire/Makefile
index 81767adaa..67b6e9fca 100644
--- a/kernel/tools/firewire/Makefile
+++ b/kernel/tools/firewire/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 prefix = /usr
 nosy-dump-version = 0.4
 
diff --git a/kernel/tools/firewire/decode-fcp.c b/kernel/tools/firewire/decode-fcp.c
index e41223b6a..b67ebc884 100644
--- a/kernel/tools/firewire/decode-fcp.c
+++ b/kernel/tools/firewire/decode-fcp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/firewire-constants.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/kernel/tools/firewire/list.h b/kernel/tools/firewire/list.h
index 41f4bdadf..6278d08e9 100644
--- a/kernel/tools/firewire/list.h
+++ b/kernel/tools/firewire/list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 struct list {
 	struct list *next, *prev;
 };
diff --git a/kernel/tools/firewire/nosy-dump.h b/kernel/tools/firewire/nosy-dump.h
index 3a4b5b33b..69e5e594f 100644
--- a/kernel/tools/firewire/nosy-dump.h
+++ b/kernel/tools/firewire/nosy-dump.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __nosy_dump_h__
 #define __nosy_dump_h__
 
diff --git a/kernel/tools/gpio/Makefile b/kernel/tools/gpio/Makefile
index b4401536c..805a2c0cf 100644
--- a/kernel/tools/gpio/Makefile
+++ b/kernel/tools/gpio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 include ../scripts/Makefile.include
 
 bindir ?= /usr/bin
diff --git a/kernel/tools/hv/Makefile b/kernel/tools/hv/Makefile
index 0d1e61b81..315038194 100644
--- a/kernel/tools/hv/Makefile
+++ b/kernel/tools/hv/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for Hyper-V tools
 
 CC = $(CROSS_COMPILE)gcc
diff --git a/kernel/tools/hv/hv_get_dhcp_info.sh b/kernel/tools/hv/hv_get_dhcp_info.sh
index ccd3e9532..c38686c44 100755
--- a/kernel/tools/hv/hv_get_dhcp_info.sh
+++ b/kernel/tools/hv/hv_get_dhcp_info.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 # This example script retrieves the DHCP state of a given interface.
 # In the interest of keeping the KVP daemon code free of distro specific
diff --git a/kernel/tools/hv/hv_set_ifconfig.sh b/kernel/tools/hv/hv_set_ifconfig.sh
index 735aafd64..7ed9f85ef 100755
--- a/kernel/tools/hv/hv_set_ifconfig.sh
+++ b/kernel/tools/hv/hv_set_ifconfig.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 # This example script activates an interface based on the specified
 # configuration.
diff --git a/kernel/tools/hv/lsvmbus b/kernel/tools/hv/lsvmbus
index e8fecd618..353e56768 100644
--- a/kernel/tools/hv/lsvmbus
+++ b/kernel/tools/hv/lsvmbus
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-2.0
 
 import os
 from optparse import OptionParser
diff --git a/kernel/tools/iio/Makefile b/kernel/tools/iio/Makefile
index d4d956020..a08e7a47d 100644
--- a/kernel/tools/iio/Makefile
+++ b/kernel/tools/iio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 include ../scripts/Makefile.include
 
 bindir ?= /usr/bin
diff --git a/kernel/tools/include/asm-generic/atomic-gcc.h b/kernel/tools/include/asm-generic/atomic-gcc.h
index 5e9738f97..40b231fb9 100644
--- a/kernel/tools/include/asm-generic/atomic-gcc.h
+++ b/kernel/tools/include/asm-generic/atomic-gcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_ASM_GENERIC_ATOMIC_H
 #define __TOOLS_ASM_GENERIC_ATOMIC_H
 
diff --git a/kernel/tools/include/asm-generic/bitops.h b/kernel/tools/include/asm-generic/bitops.h
index 030460012..9bce3b56b 100644
--- a/kernel/tools/include/asm-generic/bitops.h
+++ b/kernel/tools/include/asm-generic/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_ASM_GENERIC_BITOPS_H
 #define __TOOLS_ASM_GENERIC_BITOPS_H
 
diff --git a/kernel/tools/include/asm-generic/bitops/__ffs.h b/kernel/tools/include/asm-generic/bitops/__ffs.h
index b3accfdf2..9d1310519 100644
--- a/kernel/tools/include/asm-generic/bitops/__ffs.h
+++ b/kernel/tools/include/asm-generic/bitops/__ffs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_
 #define _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/__fls.h b/kernel/tools/include/asm-generic/bitops/__fls.h
index a60a7ccb6..03f721a8a 100644
--- a/kernel/tools/include/asm-generic/bitops/__fls.h
+++ b/kernel/tools/include/asm-generic/bitops/__fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS___FLS_H_
 #define _ASM_GENERIC_BITOPS___FLS_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/arch_hweight.h b/kernel/tools/include/asm-generic/bitops/arch_hweight.h
index 6a211f406..c2705e1d2 100644
--- a/kernel/tools/include/asm-generic/bitops/arch_hweight.h
+++ b/kernel/tools/include/asm-generic/bitops/arch_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/atomic.h b/kernel/tools/include/asm-generic/bitops/atomic.h
index 68b8c1516..21c41ccd1 100644
--- a/kernel/tools/include/asm-generic/bitops/atomic.h
+++ b/kernel/tools/include/asm-generic/bitops/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_
 #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/const_hweight.h b/kernel/tools/include/asm-generic/bitops/const_hweight.h
index 0a7e06623..149faeeee 100644
--- a/kernel/tools/include/asm-generic/bitops/const_hweight.h
+++ b/kernel/tools/include/asm-generic/bitops/const_hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
 #define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/find.h b/kernel/tools/include/asm-generic/bitops/find.h
index 5538ecdc9..9311fadaa 100644
--- a/kernel/tools/include/asm-generic/bitops/find.h
+++ b/kernel/tools/include/asm-generic/bitops/find.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_
 #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/fls.h b/kernel/tools/include/asm-generic/bitops/fls.h
index 0576d1f42..753aecaab 100644
--- a/kernel/tools/include/asm-generic/bitops/fls.h
+++ b/kernel/tools/include/asm-generic/bitops/fls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FLS_H_
 #define _ASM_GENERIC_BITOPS_FLS_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/fls64.h b/kernel/tools/include/asm-generic/bitops/fls64.h
index b097cf844..866f2b230 100644
--- a/kernel/tools/include/asm-generic/bitops/fls64.h
+++ b/kernel/tools/include/asm-generic/bitops/fls64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _ASM_GENERIC_BITOPS_FLS64_H_
 #define _ASM_GENERIC_BITOPS_FLS64_H_
 
diff --git a/kernel/tools/include/asm-generic/bitops/hweight.h b/kernel/tools/include/asm-generic/bitops/hweight.h
index 290120c01..3e681982b 100644
--- a/kernel/tools/include/asm-generic/bitops/hweight.h
+++ b/kernel/tools/include/asm-generic/bitops/hweight.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_
 #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_
 
diff --git a/kernel/tools/include/asm-generic/bitsperlong.h b/kernel/tools/include/asm-generic/bitsperlong.h
index 45eca517e..8f2283052 100644
--- a/kernel/tools/include/asm-generic/bitsperlong.h
+++ b/kernel/tools/include/asm-generic/bitsperlong.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ASM_GENERIC_BITS_PER_LONG
 #define __ASM_GENERIC_BITS_PER_LONG
 
diff --git a/kernel/tools/include/asm/alternative-asm.h b/kernel/tools/include/asm/alternative-asm.h
index 2a4d1bfa2..b54bd860d 100644
--- a/kernel/tools/include/asm/alternative-asm.h
+++ b/kernel/tools/include/asm/alternative-asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_ASM_ALTERNATIVE_ASM_H
 #define _TOOLS_ASM_ALTERNATIVE_ASM_H
 
diff --git a/kernel/tools/include/asm/atomic.h b/kernel/tools/include/asm/atomic.h
index 70794f538..8c9bfffd4 100644
--- a/kernel/tools/include/asm/atomic.h
+++ b/kernel/tools/include/asm/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_ASM_ATOMIC_H
 #define __TOOLS_LINUX_ASM_ATOMIC_H
 
diff --git a/kernel/tools/include/asm/barrier.h b/kernel/tools/include/asm/barrier.h
index ac66ac594..391d94253 100644
--- a/kernel/tools/include/asm/barrier.h
+++ b/kernel/tools/include/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if defined(__i386__) || defined(__x86_64__)
 #include "../../arch/x86/include/asm/barrier.h"
 #elif defined(__arm__)
diff --git a/kernel/tools/include/asm/bug.h b/kernel/tools/include/asm/bug.h
index 4790f047a..bbd75ac8b 100644
--- a/kernel/tools/include/asm/bug.h
+++ b/kernel/tools/include/asm/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_ASM_BUG_H
 #define _TOOLS_ASM_BUG_H
 
diff --git a/kernel/tools/include/asm/export.h b/kernel/tools/include/asm/export.h
new file mode 100644
index 000000000..2cb1a0d83
--- /dev/null
+++ b/kernel/tools/include/asm/export.h
@@ -0,0 +1,7 @@
+#ifndef _TOOLS_ASM_EXPORT_H
+#define _TOOLS_ASM_EXPORT_H
+
+#define EXPORT_SYMBOL(x)
+#define EXPORT_SYMBOL_GPL(x)
+
+#endif /* _TOOLS_ASM_EXPORT_H */
diff --git a/kernel/tools/include/linux/atomic.h b/kernel/tools/include/linux/atomic.h
index 9f21fc2b0..00a6c4ca5 100644
--- a/kernel/tools/include/linux/atomic.h
+++ b/kernel/tools/include/linux/atomic.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_ATOMIC_H
 #define __TOOLS_LINUX_ATOMIC_H
 
diff --git a/kernel/tools/include/linux/bitmap.h b/kernel/tools/include/linux/bitmap.h
index e8b9f518e..ca160270f 100644
--- a/kernel/tools/include/linux/bitmap.h
+++ b/kernel/tools/include/linux/bitmap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_BITOPS_H
 #define _PERF_BITOPS_H
 
diff --git a/kernel/tools/include/linux/bitops.h b/kernel/tools/include/linux/bitops.h
index 969db1981..acc704bd3 100644
--- a/kernel/tools/include/linux/bitops.h
+++ b/kernel/tools/include/linux/bitops.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_BITOPS_H_
 #define _TOOLS_LINUX_BITOPS_H_
 
diff --git a/kernel/tools/include/linux/bug.h b/kernel/tools/include/linux/bug.h
index 8e4a4f491..85f80258a 100644
--- a/kernel/tools/include/linux/bug.h
+++ b/kernel/tools/include/linux/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_PERF_LINUX_BUG_H
 #define _TOOLS_PERF_LINUX_BUG_H
 
diff --git a/kernel/tools/include/linux/compiler-gcc.h b/kernel/tools/include/linux/compiler-gcc.h
index 3723b9f8f..a3a442744 100644
--- a/kernel/tools/include/linux/compiler-gcc.h
+++ b/kernel/tools/include/linux/compiler-gcc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_COMPILER_H_
 #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
 #endif
diff --git a/kernel/tools/include/linux/compiler.h b/kernel/tools/include/linux/compiler.h
index d7a5604c3..07fd03c74 100644
--- a/kernel/tools/include/linux/compiler.h
+++ b/kernel/tools/include/linux/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_COMPILER_H_
 #define _TOOLS_LINUX_COMPILER_H_
 
diff --git a/kernel/tools/include/linux/debug_locks.h b/kernel/tools/include/linux/debug_locks.h
index 61cc7f501..72d595ce7 100644
--- a/kernel/tools/include/linux/debug_locks.h
+++ b/kernel/tools/include/linux/debug_locks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_DEBUG_LOCKS_H_
 #define _LIBLOCKDEP_DEBUG_LOCKS_H_
 
diff --git a/kernel/tools/include/linux/err.h b/kernel/tools/include/linux/err.h
index abf0478a8..7a8b61ad4 100644
--- a/kernel/tools/include/linux/err.h
+++ b/kernel/tools/include/linux/err.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_ERR_H
 #define __TOOLS_LINUX_ERR_H
 
diff --git a/kernel/tools/include/linux/filter.h b/kernel/tools/include/linux/filter.h
index 4ce25d43e..c5e512da8 100644
--- a/kernel/tools/include/linux/filter.h
+++ b/kernel/tools/include/linux/filter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Linux Socket Filter Data Structures
  */
diff --git a/kernel/tools/include/linux/hardirq.h b/kernel/tools/include/linux/hardirq.h
index c8f3f8f58..b25580b6a 100644
--- a/kernel/tools/include/linux/hardirq.h
+++ b/kernel/tools/include/linux/hardirq.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LINUX_HARDIRQ_H_
 #define _LIBLOCKDEP_LINUX_HARDIRQ_H_
 
diff --git a/kernel/tools/include/linux/hashtable.h b/kernel/tools/include/linux/hashtable.h
index 251eabf2a..434dd5ac6 100644
--- a/kernel/tools/include/linux/hashtable.h
+++ b/kernel/tools/include/linux/hashtable.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Statically sized hash table implementation
  * (C) 2012  Sasha Levin <levinsasha928@gmail.com>
diff --git a/kernel/tools/include/linux/irqflags.h b/kernel/tools/include/linux/irqflags.h
index df77669cf..e734da3e5 100644
--- a/kernel/tools/include/linux/irqflags.h
+++ b/kernel/tools/include/linux/irqflags.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_
 #define _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_
 
diff --git a/kernel/tools/include/linux/kallsyms.h b/kernel/tools/include/linux/kallsyms.h
index 582cc1e5f..89ca6fe25 100644
--- a/kernel/tools/include/linux/kallsyms.h
+++ b/kernel/tools/include/linux/kallsyms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LINUX_KALLSYMS_H_
 #define _LIBLOCKDEP_LINUX_KALLSYMS_H_
 
diff --git a/kernel/tools/include/linux/kern_levels.h b/kernel/tools/include/linux/kern_levels.h
index 3b9bade28..778ecb984 100644
--- a/kernel/tools/include/linux/kern_levels.h
+++ b/kernel/tools/include/linux/kern_levels.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KERN_LEVELS_H__
 #define __KERN_LEVELS_H__
 
diff --git a/kernel/tools/include/linux/kernel.h b/kernel/tools/include/linux/kernel.h
index 77d2e94ca..0ad884452 100644
--- a/kernel/tools/include/linux/kernel.h
+++ b/kernel/tools/include/linux/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_KERNEL_H
 #define __TOOLS_LINUX_KERNEL_H
 
diff --git a/kernel/tools/include/linux/kmemcheck.h b/kernel/tools/include/linux/kmemcheck.h
index 94d598bc6..2bccd2c7b 100644
--- a/kernel/tools/include/linux/kmemcheck.h
+++ b/kernel/tools/include/linux/kmemcheck.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LINUX_KMEMCHECK_H_
 #define _LIBLOCKDEP_LINUX_KMEMCHECK_H_
 
diff --git a/kernel/tools/include/linux/list.h b/kernel/tools/include/linux/list.h
index 1da423820..b2fc48d54 100644
--- a/kernel/tools/include/linux/list.h
+++ b/kernel/tools/include/linux/list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_LINUX_LIST_H
 #define __TOOLS_LINUX_LIST_H
 
diff --git a/kernel/tools/include/linux/lockdep.h b/kernel/tools/include/linux/lockdep.h
index 8da3e8eff..940c1b075 100644
--- a/kernel/tools/include/linux/lockdep.h
+++ b/kernel/tools/include/linux/lockdep.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LOCKDEP_H_
 #define _LIBLOCKDEP_LOCKDEP_H_
 
diff --git a/kernel/tools/include/linux/module.h b/kernel/tools/include/linux/module.h
index 07055db29..2c999abf6 100644
--- a/kernel/tools/include/linux/module.h
+++ b/kernel/tools/include/linux/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LINUX_MODULE_H_
 #define _LIBLOCKDEP_LINUX_MODULE_H_
 
diff --git a/kernel/tools/include/linux/poison.h b/kernel/tools/include/linux/poison.h
index 51334edec..4bf6777a8 100644
--- a/kernel/tools/include/linux/poison.h
+++ b/kernel/tools/include/linux/poison.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_POISON_H
 #define _LINUX_POISON_H
 
diff --git a/kernel/tools/include/linux/rcu.h b/kernel/tools/include/linux/rcu.h
index 5080649da..7d02527e5 100644
--- a/kernel/tools/include/linux/rcu.h
+++ b/kernel/tools/include/linux/rcu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_RCU_H_
 #define _LIBLOCKDEP_RCU_H_
 
diff --git a/kernel/tools/include/linux/refcount.h b/kernel/tools/include/linux/refcount.h
index a0177c1f5..36cb29bc5 100644
--- a/kernel/tools/include/linux/refcount.h
+++ b/kernel/tools/include/linux/refcount.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_REFCOUNT_H
 #define _TOOLS_LINUX_REFCOUNT_H
 
diff --git a/kernel/tools/include/linux/spinlock.h b/kernel/tools/include/linux/spinlock.h
index 417cda4f7..4ed569fcb 100644
--- a/kernel/tools/include/linux/spinlock.h
+++ b/kernel/tools/include/linux/spinlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_SPINLOCK_H_
 #define __LINUX_SPINLOCK_H_
 
diff --git a/kernel/tools/include/linux/stacktrace.h b/kernel/tools/include/linux/stacktrace.h
index 39aecc6b1..ae343ac35 100644
--- a/kernel/tools/include/linux/stacktrace.h
+++ b/kernel/tools/include/linux/stacktrace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_LINUX_STACKTRACE_H_
 #define _LIBLOCKDEP_LINUX_STACKTRACE_H_
 
diff --git a/kernel/tools/include/linux/string.h b/kernel/tools/include/linux/string.h
index a30fad536..6c3e2cc27 100644
--- a/kernel/tools/include/linux/string.h
+++ b/kernel/tools/include/linux/string.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_STRING_H_
 #define _TOOLS_LINUX_STRING_H_
 
diff --git a/kernel/tools/include/linux/stringify.h b/kernel/tools/include/linux/stringify.h
index 841cec8ed..60e2c187d 100644
--- a/kernel/tools/include/linux/stringify.h
+++ b/kernel/tools/include/linux/stringify.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_STRINGIFY_H
 #define __LINUX_STRINGIFY_H
 
diff --git a/kernel/tools/include/linux/time64.h b/kernel/tools/include/linux/time64.h
index df9265483..55fa644b9 100644
--- a/kernel/tools/include/linux/time64.h
+++ b/kernel/tools/include/linux/time64.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_TIME64_H
 #define _TOOLS_LINUX_TIME64_H
 
diff --git a/kernel/tools/include/linux/types.h b/kernel/tools/include/linux/types.h
index 77a28a26a..154eb4e3c 100644
--- a/kernel/tools/include/linux/types.h
+++ b/kernel/tools/include/linux/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LINUX_TYPES_H_
 #define _TOOLS_LINUX_TYPES_H_
 
diff --git a/kernel/tools/include/linux/unaligned/packed_struct.h b/kernel/tools/include/linux/unaligned/packed_struct.h
index c0d817de4..dbd93c7df 100644
--- a/kernel/tools/include/linux/unaligned/packed_struct.h
+++ b/kernel/tools/include/linux/unaligned/packed_struct.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_UNALIGNED_PACKED_STRUCT_H
 #define _LINUX_UNALIGNED_PACKED_STRUCT_H
 
diff --git a/kernel/tools/include/tools/be_byteshift.h b/kernel/tools/include/tools/be_byteshift.h
index 84c17d836..f7d1d1698 100644
--- a/kernel/tools/include/tools/be_byteshift.h
+++ b/kernel/tools/include/tools/be_byteshift.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_BE_BYTESHIFT_H
 #define _TOOLS_BE_BYTESHIFT_H
 
diff --git a/kernel/tools/include/tools/endian.h b/kernel/tools/include/tools/endian.h
index 800119400..c67888fd4 100644
--- a/kernel/tools/include/tools/endian.h
+++ b/kernel/tools/include/tools/endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_ENDIAN_H
 #define _TOOLS_ENDIAN_H
 
diff --git a/kernel/tools/include/tools/le_byteshift.h b/kernel/tools/include/tools/le_byteshift.h
index 8fe9f2488..dc8565f39 100644
--- a/kernel/tools/include/tools/le_byteshift.h
+++ b/kernel/tools/include/tools/le_byteshift.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TOOLS_LE_BYTESHIFT_H
 #define _TOOLS_LE_BYTESHIFT_H
 
diff --git a/kernel/tools/include/uapi/asm-generic/ioctls.h b/kernel/tools/include/uapi/asm-generic/ioctls.h
index 14baf9f23..040651735 100644
--- a/kernel/tools/include/uapi/asm-generic/ioctls.h
+++ b/kernel/tools/include/uapi/asm-generic/ioctls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_IOCTLS_H
 #define __ASM_GENERIC_IOCTLS_H
 
diff --git a/kernel/tools/include/uapi/asm-generic/mman-common.h b/kernel/tools/include/uapi/asm-generic/mman-common.h
index 203268f92..6d319c46f 100644
--- a/kernel/tools/include/uapi/asm-generic/mman-common.h
+++ b/kernel/tools/include/uapi/asm-generic/mman-common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MMAN_COMMON_H
 #define __ASM_GENERIC_MMAN_COMMON_H
 
diff --git a/kernel/tools/include/uapi/asm-generic/mman.h b/kernel/tools/include/uapi/asm-generic/mman.h
index 10fa78577..2dffcbf70 100644
--- a/kernel/tools/include/uapi/asm-generic/mman.h
+++ b/kernel/tools/include/uapi/asm-generic/mman.h
@@ -1,7 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __ASM_GENERIC_MMAN_H
 #define __ASM_GENERIC_MMAN_H
 
-#include <uapi/asm-generic/mman-common.h>
+#include <asm-generic/mman-common.h>
 
 #define MAP_GROWSDOWN	0x0100		/* stack-like segment */
 #define MAP_DENYWRITE	0x0800		/* ETXTBSY */
diff --git a/kernel/tools/include/uapi/linux/bpf.h b/kernel/tools/include/uapi/linux/bpf.h
index c174971af..30f2ce76b 100644
--- a/kernel/tools/include/uapi/linux/bpf.h
+++ b/kernel/tools/include/uapi/linux/bpf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
  *
  * This program is free software; you can redistribute it and/or
@@ -569,14 +570,13 @@ union bpf_attr {
  *     @flags: reserved for future use
  *     Return: 0 on success or negative error code
  *
- * int bpf_sk_redirect_map(skb, map, key, flags)
+ * int bpf_sk_redirect_map(map, key, flags)
  *     Redirect skb to a sock in map using key as a lookup key for the
  *     sock in map.
- *     @skb: pointer to skb
  *     @map: pointer to sockmap
  *     @key: key to lookup sock in map
  *     @flags: reserved for future use
- *     Return: SK_REDIRECT
+ *     Return: SK_PASS
  *
  * int bpf_sock_map_update(skops, map, key, flags)
  *	@skops: pointer to bpf_sock_ops
@@ -789,7 +789,6 @@ struct xdp_md {
 enum sk_action {
 	SK_DROP = 0,
 	SK_PASS,
-	SK_REDIRECT,
 };
 
 #define BPF_TAG_SIZE	8
diff --git a/kernel/tools/include/uapi/linux/bpf_common.h b/kernel/tools/include/uapi/linux/bpf_common.h
index a5c220e08..18be90725 100644
--- a/kernel/tools/include/uapi/linux/bpf_common.h
+++ b/kernel/tools/include/uapi/linux/bpf_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI__LINUX_BPF_COMMON_H__
 #define _UAPI__LINUX_BPF_COMMON_H__
 
diff --git a/kernel/tools/include/uapi/linux/fcntl.h b/kernel/tools/include/uapi/linux/fcntl.h
index ec69d55bc..6448cdd9a 100644
--- a/kernel/tools/include/uapi/linux/fcntl.h
+++ b/kernel/tools/include/uapi/linux/fcntl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_FCNTL_H
 #define _UAPI_LINUX_FCNTL_H
 
diff --git a/kernel/tools/include/uapi/linux/hw_breakpoint.h b/kernel/tools/include/uapi/linux/hw_breakpoint.h
index 2b65efd19..965e4d860 100644
--- a/kernel/tools/include/uapi/linux/hw_breakpoint.h
+++ b/kernel/tools/include/uapi/linux/hw_breakpoint.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_HW_BREAKPOINT_H
 #define _UAPI_LINUX_HW_BREAKPOINT_H
 
diff --git a/kernel/tools/include/uapi/linux/kvm.h b/kernel/tools/include/uapi/linux/kvm.h
index 838887587..7e99999d6 100644
--- a/kernel/tools/include/uapi/linux/kvm.h
+++ b/kernel/tools/include/uapi/linux/kvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef __LINUX_KVM_H
 #define __LINUX_KVM_H
 
diff --git a/kernel/tools/include/uapi/linux/mman.h b/kernel/tools/include/uapi/linux/mman.h
index a937480d7..bfd5938fe 100644
--- a/kernel/tools/include/uapi/linux/mman.h
+++ b/kernel/tools/include/uapi/linux/mman.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_MMAN_H
 #define _UAPI_LINUX_MMAN_H
 
diff --git a/kernel/tools/include/uapi/linux/perf_event.h b/kernel/tools/include/uapi/linux/perf_event.h
index 140ae638c..362493a2f 100644
--- a/kernel/tools/include/uapi/linux/perf_event.h
+++ b/kernel/tools/include/uapi/linux/perf_event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Performance events:
  *
diff --git a/kernel/tools/include/uapi/linux/sched.h b/kernel/tools/include/uapi/linux/sched.h
index e2a6c7b35..30a9e51bb 100644
--- a/kernel/tools/include/uapi/linux/sched.h
+++ b/kernel/tools/include/uapi/linux/sched.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_SCHED_H
 #define _UAPI_LINUX_SCHED_H
 
diff --git a/kernel/tools/include/uapi/linux/stat.h b/kernel/tools/include/uapi/linux/stat.h
index 17b10304c..7b35e98d3 100644
--- a/kernel/tools/include/uapi/linux/stat.h
+++ b/kernel/tools/include/uapi/linux/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_STAT_H
 #define _UAPI_LINUX_STAT_H
 
diff --git a/kernel/tools/include/uapi/linux/vhost.h b/kernel/tools/include/uapi/linux/vhost.h
index 60180c0b5..c51f8e5cc 100644
--- a/kernel/tools/include/uapi/linux/vhost.h
+++ b/kernel/tools/include/uapi/linux/vhost.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _LINUX_VHOST_H
 #define _LINUX_VHOST_H
 /* Userspace interface for in-kernel virtio accelerators. */
diff --git a/kernel/tools/include/uapi/sound/asound.h b/kernel/tools/include/uapi/sound/asound.h
index 87bf30b18..c227ccba6 100644
--- a/kernel/tools/include/uapi/sound/asound.h
+++ b/kernel/tools/include/uapi/sound/asound.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  *  Advanced Linux Sound Architecture - ALSA - Driver
  *  Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,
diff --git a/kernel/tools/kvm/kvm_stat/Makefile b/kernel/tools/kvm/kvm_stat/Makefile
index 5b1cba57e..c3e36c60d 100644
--- a/kernel/tools/kvm/kvm_stat/Makefile
+++ b/kernel/tools/kvm/kvm_stat/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 include ../../scripts/Makefile.include
 include ../../scripts/utilities.mak
 BINDIR=usr/bin
diff --git a/kernel/tools/laptop/dslm/Makefile b/kernel/tools/laptop/dslm/Makefile
index ff613b317..90f512c4e 100644
--- a/kernel/tools/laptop/dslm/Makefile
+++ b/kernel/tools/laptop/dslm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC := $(CROSS_COMPILE)gcc
 CFLAGS := -I../../usr/include
 
diff --git a/kernel/tools/laptop/freefall/Makefile b/kernel/tools/laptop/freefall/Makefile
index 48c6c9328..5f758c489 100644
--- a/kernel/tools/laptop/freefall/Makefile
+++ b/kernel/tools/laptop/freefall/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 PREFIX ?= /usr
 SBINDIR ?= sbin
 INSTALL ?= install
diff --git a/kernel/tools/leds/Makefile b/kernel/tools/leds/Makefile
index 078b666fd..c379af003 100644
--- a/kernel/tools/leds/Makefile
+++ b/kernel/tools/leds/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for LEDs tools
 
 CC = $(CROSS_COMPILE)gcc
diff --git a/kernel/tools/leds/led_hw_brightness_mon.c b/kernel/tools/leds/led_hw_brightness_mon.c
index 64642ccfe..eb65ae988 100644
--- a/kernel/tools/leds/led_hw_brightness_mon.c
+++ b/kernel/tools/leds/led_hw_brightness_mon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * led_hw_brightness_mon.c
  *
diff --git a/kernel/tools/leds/uledmon.c b/kernel/tools/leds/uledmon.c
index 25cbc7acf..c15a39c1f 100644
--- a/kernel/tools/leds/uledmon.c
+++ b/kernel/tools/leds/uledmon.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * uledmon.c
  *
diff --git a/kernel/tools/lib/api/Makefile b/kernel/tools/lib/api/Makefile
index 1e83e3c07..a13e9c7f1 100644
--- a/kernel/tools/lib/api/Makefile
+++ b/kernel/tools/lib/api/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 include ../../scripts/Makefile.include
 include ../../scripts/utilities.mak		# QUIET_CLEAN
 
diff --git a/kernel/tools/lib/api/cpu.c b/kernel/tools/lib/api/cpu.c
index 8c6489356..4af6d4b7a 100644
--- a/kernel/tools/lib/api/cpu.c
+++ b/kernel/tools/lib/api/cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 
 #include "cpu.h"
diff --git a/kernel/tools/lib/api/cpu.h b/kernel/tools/lib/api/cpu.h
index 81e9d3955..90a102fb2 100644
--- a/kernel/tools/lib/api/cpu.h
+++ b/kernel/tools/lib/api/cpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __API_CPU__
 #define __API_CPU__
 
diff --git a/kernel/tools/lib/api/debug-internal.h b/kernel/tools/lib/api/debug-internal.h
index 188f7880e..80c783497 100644
--- a/kernel/tools/lib/api/debug-internal.h
+++ b/kernel/tools/lib/api/debug-internal.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __API_DEBUG_INTERNAL_H__
 #define __API_DEBUG_INTERNAL_H__
 
diff --git a/kernel/tools/lib/api/debug.c b/kernel/tools/lib/api/debug.c
index 5fa5cf500..69b1ba3d1 100644
--- a/kernel/tools/lib/api/debug.c
+++ b/kernel/tools/lib/api/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdarg.h>
 #include "debug.h"
diff --git a/kernel/tools/lib/api/debug.h b/kernel/tools/lib/api/debug.h
index a0872f68f..3684dd6e0 100644
--- a/kernel/tools/lib/api/debug.h
+++ b/kernel/tools/lib/api/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __API_DEBUG_H__
 #define __API_DEBUG_H__
 
diff --git a/kernel/tools/lib/api/fd/array.h b/kernel/tools/lib/api/fd/array.h
index 71287dddc..b39557d1a 100644
--- a/kernel/tools/lib/api/fd/array.h
+++ b/kernel/tools/lib/api/fd/array.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __API_FD_ARRAY__
 #define __API_FD_ARRAY__
 
diff --git a/kernel/tools/lib/api/fs/fs.c b/kernel/tools/lib/api/fs/fs.c
index a7ecf8f46..b24afc0e6 100644
--- a/kernel/tools/lib/api/fs/fs.c
+++ b/kernel/tools/lib/api/fs/fs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/kernel/tools/lib/api/fs/fs.h b/kernel/tools/lib/api/fs/fs.h
index 456053484..dda49deef 100644
--- a/kernel/tools/lib/api/fs/fs.h
+++ b/kernel/tools/lib/api/fs/fs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __API_FS__
 #define __API_FS__
 
diff --git a/kernel/tools/lib/api/fs/tracing_path.c b/kernel/tools/lib/api/fs/tracing_path.c
index 3e606b9c4..7b7fd0b18 100644
--- a/kernel/tools/lib/api/fs/tracing_path.c
+++ b/kernel/tools/lib/api/fs/tracing_path.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
diff --git a/kernel/tools/lib/api/fs/tracing_path.h b/kernel/tools/lib/api/fs/tracing_path.h
index 3f233ac70..0066f06cc 100644
--- a/kernel/tools/lib/api/fs/tracing_path.h
+++ b/kernel/tools/lib/api/fs/tracing_path.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __API_FS_TRACING_PATH_H
 #define __API_FS_TRACING_PATH_H
 
diff --git a/kernel/tools/lib/bpf/Makefile b/kernel/tools/lib/bpf/Makefile
index d2441db34..4555304dc 100644
--- a/kernel/tools/lib/bpf/Makefile
+++ b/kernel/tools/lib/bpf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Most of this file is copied from tools/lib/traceevent/Makefile
 
 BPF_VERSION = 0
diff --git a/kernel/tools/lib/hweight.c b/kernel/tools/lib/hweight.c
index 0b859b884..a16ebf515 100644
--- a/kernel/tools/lib/hweight.c
+++ b/kernel/tools/lib/hweight.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bitops.h>
 #include <asm/types.h>
 
diff --git a/kernel/tools/lib/lockdep/Makefile b/kernel/tools/lib/lockdep/Makefile
index ed9ace59d..9b0ca3ad1 100644
--- a/kernel/tools/lib/lockdep/Makefile
+++ b/kernel/tools/lib/lockdep/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # file format version
 FILE_VERSION = 1
 
diff --git a/kernel/tools/lib/lockdep/common.c b/kernel/tools/lib/lockdep/common.c
index d1c89cc06..5c3b58cce 100644
--- a/kernel/tools/lib/lockdep/common.c
+++ b/kernel/tools/lib/lockdep/common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stddef.h>
 #include <stdbool.h>
 #include <linux/compiler.h>
diff --git a/kernel/tools/lib/lockdep/include/liblockdep/common.h b/kernel/tools/lib/lockdep/include/liblockdep/common.h
index 6e66277ec..8862da809 100644
--- a/kernel/tools/lib/lockdep/include/liblockdep/common.h
+++ b/kernel/tools/lib/lockdep/include/liblockdep/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_COMMON_H
 #define _LIBLOCKDEP_COMMON_H
 
diff --git a/kernel/tools/lib/lockdep/include/liblockdep/mutex.h b/kernel/tools/lib/lockdep/include/liblockdep/mutex.h
index ee53a4281..a80ac39f9 100644
--- a/kernel/tools/lib/lockdep/include/liblockdep/mutex.h
+++ b/kernel/tools/lib/lockdep/include/liblockdep/mutex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_MUTEX_H
 #define _LIBLOCKDEP_MUTEX_H
 
diff --git a/kernel/tools/lib/lockdep/include/liblockdep/rwlock.h b/kernel/tools/lib/lockdep/include/liblockdep/rwlock.h
index 4ec03f861..a96c3bf0f 100644
--- a/kernel/tools/lib/lockdep/include/liblockdep/rwlock.h
+++ b/kernel/tools/lib/lockdep/include/liblockdep/rwlock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_RWLOCK_H
 #define _LIBLOCKDEP_RWLOCK_H
 
diff --git a/kernel/tools/lib/lockdep/lockdep.c b/kernel/tools/lib/lockdep/lockdep.c
index ced6d7443..6002fcf2f 100644
--- a/kernel/tools/lib/lockdep/lockdep.c
+++ b/kernel/tools/lib/lockdep/lockdep.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/lockdep.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/lib/lockdep/preload.c b/kernel/tools/lib/lockdep/preload.c
index 6a2d3c5d4..76245d161 100644
--- a/kernel/tools/lib/lockdep/preload.c
+++ b/kernel/tools/lib/lockdep/preload.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <pthread.h>
 #include <stdio.h>
diff --git a/kernel/tools/lib/lockdep/run_tests.sh b/kernel/tools/lib/lockdep/run_tests.sh
index f9b94098f..2e570a188 100755
--- a/kernel/tools/lib/lockdep/run_tests.sh
+++ b/kernel/tools/lib/lockdep/run_tests.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 make &> /dev/null
 
diff --git a/kernel/tools/lib/lockdep/tests/AA.c b/kernel/tools/lib/lockdep/tests/AA.c
index 18211a5f3..63c7ce97b 100644
--- a/kernel/tools/lib/lockdep/tests/AA.c
+++ b/kernel/tools/lib/lockdep/tests/AA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 
 int main(void)
diff --git a/kernel/tools/lib/lockdep/tests/ABA.c b/kernel/tools/lib/lockdep/tests/ABA.c
index 0f782ff40..efa39b23f 100644
--- a/kernel/tools/lib/lockdep/tests/ABA.c
+++ b/kernel/tools/lib/lockdep/tests/ABA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 
 void main(void)
diff --git a/kernel/tools/lib/lockdep/tests/ABBA.c b/kernel/tools/lib/lockdep/tests/ABBA.c
index 07f0e29d5..1460afd33 100644
--- a/kernel/tools/lib/lockdep/tests/ABBA.c
+++ b/kernel/tools/lib/lockdep/tests/ABBA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 #include "common.h"
 
diff --git a/kernel/tools/lib/lockdep/tests/ABBA_2threads.c b/kernel/tools/lib/lockdep/tests/ABBA_2threads.c
index cd807d736..39325ef8a 100644
--- a/kernel/tools/lib/lockdep/tests/ABBA_2threads.c
+++ b/kernel/tools/lib/lockdep/tests/ABBA_2threads.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <pthread.h>
 
diff --git a/kernel/tools/lib/lockdep/tests/ABBCCA.c b/kernel/tools/lib/lockdep/tests/ABBCCA.c
index 843db09ac..a54c1b2af 100644
--- a/kernel/tools/lib/lockdep/tests/ABBCCA.c
+++ b/kernel/tools/lib/lockdep/tests/ABBCCA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 #include "common.h"
 
diff --git a/kernel/tools/lib/lockdep/tests/ABBCCDDA.c b/kernel/tools/lib/lockdep/tests/ABBCCDDA.c
index 33620e268..aa5d194e8 100644
--- a/kernel/tools/lib/lockdep/tests/ABBCCDDA.c
+++ b/kernel/tools/lib/lockdep/tests/ABBCCDDA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 #include "common.h"
 
diff --git a/kernel/tools/lib/lockdep/tests/ABCABC.c b/kernel/tools/lib/lockdep/tests/ABCABC.c
index 3fee51e3a..b54a08e60 100644
--- a/kernel/tools/lib/lockdep/tests/ABCABC.c
+++ b/kernel/tools/lib/lockdep/tests/ABCABC.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 #include "common.h"
 
diff --git a/kernel/tools/lib/lockdep/tests/ABCDBCDA.c b/kernel/tools/lib/lockdep/tests/ABCDBCDA.c
index 427ba562c..a56742250 100644
--- a/kernel/tools/lib/lockdep/tests/ABCDBCDA.c
+++ b/kernel/tools/lib/lockdep/tests/ABCDBCDA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 #include "common.h"
 
diff --git a/kernel/tools/lib/lockdep/tests/ABCDBDDA.c b/kernel/tools/lib/lockdep/tests/ABCDBDDA.c
index 680c6cf3e..238a3353f 100644
--- a/kernel/tools/lib/lockdep/tests/ABCDBDDA.c
+++ b/kernel/tools/lib/lockdep/tests/ABCDBDDA.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 #include "common.h"
 
diff --git a/kernel/tools/lib/lockdep/tests/WW.c b/kernel/tools/lib/lockdep/tests/WW.c
index d44f77d71..eee88df7f 100644
--- a/kernel/tools/lib/lockdep/tests/WW.c
+++ b/kernel/tools/lib/lockdep/tests/WW.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/rwlock.h>
 
 void main(void)
diff --git a/kernel/tools/lib/lockdep/tests/common.h b/kernel/tools/lib/lockdep/tests/common.h
index d89e94d47..3026c29cc 100644
--- a/kernel/tools/lib/lockdep/tests/common.h
+++ b/kernel/tools/lib/lockdep/tests/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIBLOCKDEP_TEST_COMMON_H
 #define _LIBLOCKDEP_TEST_COMMON_H
 
diff --git a/kernel/tools/lib/lockdep/tests/unlock_balance.c b/kernel/tools/lib/lockdep/tests/unlock_balance.c
index 0bc62de68..34cf32f68 100644
--- a/kernel/tools/lib/lockdep/tests/unlock_balance.c
+++ b/kernel/tools/lib/lockdep/tests/unlock_balance.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <liblockdep/mutex.h>
 
 void main(void)
diff --git a/kernel/tools/lib/str_error_r.c b/kernel/tools/lib/str_error_r.c
index 503ae0722..d6d65537b 100644
--- a/kernel/tools/lib/str_error_r.c
+++ b/kernel/tools/lib/str_error_r.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef _GNU_SOURCE
 #include <string.h>
 #include <stdio.h>
diff --git a/kernel/tools/lib/string.c b/kernel/tools/lib/string.c
index a4246f14d..93b3d4b6f 100644
--- a/kernel/tools/lib/string.c
+++ b/kernel/tools/lib/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  linux/tools/lib/string.c
  *
diff --git a/kernel/tools/lib/subcmd/Makefile b/kernel/tools/lib/subcmd/Makefile
index 7e9f03c97..95563b8e1 100644
--- a/kernel/tools/lib/subcmd/Makefile
+++ b/kernel/tools/lib/subcmd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 include ../../scripts/Makefile.include
 include ../../scripts/utilities.mak		# QUIET_CLEAN
 
diff --git a/kernel/tools/lib/subcmd/exec-cmd.c b/kernel/tools/lib/subcmd/exec-cmd.c
index 1ae833af1..33e94fb83 100644
--- a/kernel/tools/lib/subcmd/exec-cmd.c
+++ b/kernel/tools/lib/subcmd/exec-cmd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/string.h>
 #include <sys/types.h>
diff --git a/kernel/tools/lib/subcmd/exec-cmd.h b/kernel/tools/lib/subcmd/exec-cmd.h
index 5d08bda31..aba591b8d 100644
--- a/kernel/tools/lib/subcmd/exec-cmd.h
+++ b/kernel/tools/lib/subcmd/exec-cmd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_EXEC_CMD_H
 #define __SUBCMD_EXEC_CMD_H
 
diff --git a/kernel/tools/lib/subcmd/help.c b/kernel/tools/lib/subcmd/help.c
index 0310520f9..2859f107a 100644
--- a/kernel/tools/lib/subcmd/help.c
+++ b/kernel/tools/lib/subcmd/help.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/lib/subcmd/help.h b/kernel/tools/lib/subcmd/help.h
index 9bd4223dc..355c066c8 100644
--- a/kernel/tools/lib/subcmd/help.h
+++ b/kernel/tools/lib/subcmd/help.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_HELP_H
 #define __SUBCMD_HELP_H
 
diff --git a/kernel/tools/lib/subcmd/pager.c b/kernel/tools/lib/subcmd/pager.c
index 6518bea92..5ba754d17 100644
--- a/kernel/tools/lib/subcmd/pager.c
+++ b/kernel/tools/lib/subcmd/pager.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/select.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/kernel/tools/lib/subcmd/pager.h b/kernel/tools/lib/subcmd/pager.h
index 623f5542d..f1a53cf29 100644
--- a/kernel/tools/lib/subcmd/pager.h
+++ b/kernel/tools/lib/subcmd/pager.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_PAGER_H
 #define __SUBCMD_PAGER_H
 
diff --git a/kernel/tools/lib/subcmd/parse-options.c b/kernel/tools/lib/subcmd/parse-options.c
index 2bd6fd0c1..f6a1babcb 100644
--- a/kernel/tools/lib/subcmd/parse-options.c
+++ b/kernel/tools/lib/subcmd/parse-options.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/string.h>
 #include <linux/types.h>
diff --git a/kernel/tools/lib/subcmd/parse-options.h b/kernel/tools/lib/subcmd/parse-options.h
index f054ca1b8..92fdbe151 100644
--- a/kernel/tools/lib/subcmd/parse-options.h
+++ b/kernel/tools/lib/subcmd/parse-options.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_PARSE_OPTIONS_H
 #define __SUBCMD_PARSE_OPTIONS_H
 
diff --git a/kernel/tools/lib/subcmd/run-command.c b/kernel/tools/lib/subcmd/run-command.c
index 911f83942..5cdac2162 100644
--- a/kernel/tools/lib/subcmd/run-command.c
+++ b/kernel/tools/lib/subcmd/run-command.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/kernel/tools/lib/subcmd/run-command.h b/kernel/tools/lib/subcmd/run-command.h
index fe2befea1..17d969c6a 100644
--- a/kernel/tools/lib/subcmd/run-command.h
+++ b/kernel/tools/lib/subcmd/run-command.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_RUN_COMMAND_H
 #define __SUBCMD_RUN_COMMAND_H
 
diff --git a/kernel/tools/lib/subcmd/sigchain.c b/kernel/tools/lib/subcmd/sigchain.c
index 3537c348a..f0fe3dbef 100644
--- a/kernel/tools/lib/subcmd/sigchain.c
+++ b/kernel/tools/lib/subcmd/sigchain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <signal.h>
 #include "subcmd-util.h"
 #include "sigchain.h"
diff --git a/kernel/tools/lib/subcmd/sigchain.h b/kernel/tools/lib/subcmd/sigchain.h
index 0c919f287..1ec663af4 100644
--- a/kernel/tools/lib/subcmd/sigchain.h
+++ b/kernel/tools/lib/subcmd/sigchain.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_SIGCHAIN_H
 #define __SUBCMD_SIGCHAIN_H
 
diff --git a/kernel/tools/lib/subcmd/subcmd-config.c b/kernel/tools/lib/subcmd/subcmd-config.c
index d017c728b..84a7cf6c7 100644
--- a/kernel/tools/lib/subcmd/subcmd-config.c
+++ b/kernel/tools/lib/subcmd/subcmd-config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "subcmd-config.h"
 
 #define UNDEFINED "SUBCMD_HAS_NOT_BEEN_INITIALIZED"
diff --git a/kernel/tools/lib/subcmd/subcmd-config.h b/kernel/tools/lib/subcmd/subcmd-config.h
index cc8514030..9024dc17d 100644
--- a/kernel/tools/lib/subcmd/subcmd-config.h
+++ b/kernel/tools/lib/subcmd/subcmd-config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_SUBCMD_CONFIG_H
 #define __PERF_SUBCMD_CONFIG_H
 
diff --git a/kernel/tools/lib/subcmd/subcmd-util.h b/kernel/tools/lib/subcmd/subcmd-util.h
index 8fa5f036e..794a375da 100644
--- a/kernel/tools/lib/subcmd/subcmd-util.h
+++ b/kernel/tools/lib/subcmd/subcmd-util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __SUBCMD_UTIL_H
 #define __SUBCMD_UTIL_H
 
diff --git a/kernel/tools/lib/symbol/kallsyms.c b/kernel/tools/lib/symbol/kallsyms.c
index d270ac006..914cb8e3d 100644
--- a/kernel/tools/lib/symbol/kallsyms.c
+++ b/kernel/tools/lib/symbol/kallsyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <ctype.h>
 #include "symbol/kallsyms.h"
 #include <stdio.h>
diff --git a/kernel/tools/lib/symbol/kallsyms.h b/kernel/tools/lib/symbol/kallsyms.h
index 4071316a7..bc40101d7 100644
--- a/kernel/tools/lib/symbol/kallsyms.h
+++ b/kernel/tools/lib/symbol/kallsyms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TOOLS_KALLSYMS_H_
 #define __TOOLS_KALLSYMS_H_ 1
 
diff --git a/kernel/tools/lib/traceevent/Makefile b/kernel/tools/lib/traceevent/Makefile
index 9b8555ea3..46cd5f871 100644
--- a/kernel/tools/lib/traceevent/Makefile
+++ b/kernel/tools/lib/traceevent/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # trace-cmd version
 EP_VERSION = 1
 EP_PATCHLEVEL = 1
diff --git a/kernel/tools/lib/traceevent/plugin_cfg80211.c b/kernel/tools/lib/traceevent/plugin_cfg80211.c
index ec57d0c1f..8f8586912 100644
--- a/kernel/tools/lib/traceevent/plugin_cfg80211.c
+++ b/kernel/tools/lib/traceevent/plugin_cfg80211.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/kernel/tools/lib/traceevent/plugin_scsi.c b/kernel/tools/lib/traceevent/plugin_scsi.c
index 3727de48c..5e750af2b 100644
--- a/kernel/tools/lib/traceevent/plugin_scsi.c
+++ b/kernel/tools/lib/traceevent/plugin_scsi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/kernel/tools/lib/traceevent/plugin_xen.c b/kernel/tools/lib/traceevent/plugin_xen.c
index 3a413eaad..690173bfa 100644
--- a/kernel/tools/lib/traceevent/plugin_xen.c
+++ b/kernel/tools/lib/traceevent/plugin_xen.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/lib/vsprintf.c b/kernel/tools/lib/vsprintf.c
index 45f9a06da..e08ee147e 100644
--- a/kernel/tools/lib/vsprintf.c
+++ b/kernel/tools/lib/vsprintf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <linux/kernel.h>
 #include <stdio.h>
diff --git a/kernel/tools/net/Makefile b/kernel/tools/net/Makefile
index ddf888010..5830670fe 100644
--- a/kernel/tools/net/Makefile
+++ b/kernel/tools/net/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 prefix = /usr
 
 CC = gcc
diff --git a/kernel/tools/nfsd/inject_fault.sh b/kernel/tools/nfsd/inject_fault.sh
index 06a399ac8..10ceee64a 100755
--- a/kernel/tools/nfsd/inject_fault.sh
+++ b/kernel/tools/nfsd/inject_fault.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Copyright (c) 2011 Bryan Schumaker <bjschuma@netapp.com>
 #
diff --git a/kernel/tools/objtool/Makefile b/kernel/tools/objtool/Makefile
index 6976c73e6..424b1965d 100644
--- a/kernel/tools/objtool/Makefile
+++ b/kernel/tools/objtool/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 include ../scripts/Makefile.include
 include ../scripts/Makefile.arch
 
diff --git a/kernel/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk b/kernel/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
index a3d2c62fd..b02a36b2c 100644
--- a/kernel/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
+++ b/kernel/tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
@@ -1,4 +1,5 @@
 #!/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 # gen-insn-attr-x86.awk: Instruction attribute table generator
 # Written by Masami Hiramatsu <mhiramat@redhat.com>
 #
diff --git a/kernel/tools/pci/pcitest.sh b/kernel/tools/pci/pcitest.sh
index 5442bbea4..77e8c85ef 100644
--- a/kernel/tools/pci/pcitest.sh
+++ b/kernel/tools/pci/pcitest.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 echo "BAR tests"
 echo
diff --git a/kernel/tools/pcmcia/Makefile b/kernel/tools/pcmcia/Makefile
index 81a7498c5..eae24df1d 100644
--- a/kernel/tools/pcmcia/Makefile
+++ b/kernel/tools/pcmcia/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC := $(CROSS_COMPILE)gcc
 CFLAGS := -I../../usr/include
 
diff --git a/kernel/tools/perf/Makefile b/kernel/tools/perf/Makefile
index 32a64e619..225454416 100644
--- a/kernel/tools/perf/Makefile
+++ b/kernel/tools/perf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # This is a simple wrapper Makefile that calls the main Makefile.perf
 # with a -j option to do parallel builds
diff --git a/kernel/tools/perf/arch/arm/annotate/instructions.c b/kernel/tools/perf/arch/arm/annotate/instructions.c
index 1ce0872b1..b39b16395 100644
--- a/kernel/tools/perf/arch/arm/annotate/instructions.c
+++ b/kernel/tools/perf/arch/arm/annotate/instructions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <regex.h>
 
diff --git a/kernel/tools/perf/arch/arm/include/dwarf-regs-table.h b/kernel/tools/perf/arch/arm/include/dwarf-regs-table.h
index f298d034c..5a45046fa 100644
--- a/kernel/tools/perf/arch/arm/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/arm/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/arm/include/perf_regs.h b/kernel/tools/perf/arch/arm/include/perf_regs.h
index f619c9c5a..ed20e0253 100644
--- a/kernel/tools/perf/arch/arm/include/perf_regs.h
+++ b/kernel/tools/perf/arch/arm/include/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_REGS_H
 #define ARCH_PERF_REGS_H
 
diff --git a/kernel/tools/perf/arch/arm/tests/dwarf-unwind.c b/kernel/tools/perf/arch/arm/tests/dwarf-unwind.c
index 62eff847f..8cb347760 100644
--- a/kernel/tools/perf/arch/arm/tests/dwarf-unwind.c
+++ b/kernel/tools/perf/arch/arm/tests/dwarf-unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "perf_regs.h"
 #include "thread.h"
diff --git a/kernel/tools/perf/arch/arm/tests/regs_load.S b/kernel/tools/perf/arch/arm/tests/regs_load.S
index e09e98394..6e2495cc4 100644
--- a/kernel/tools/perf/arch/arm/tests/regs_load.S
+++ b/kernel/tools/perf/arch/arm/tests/regs_load.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 #define R0 0x00
diff --git a/kernel/tools/perf/arch/arm/util/unwind-libdw.c b/kernel/tools/perf/arch/arm/util/unwind-libdw.c
index bacfa00fc..36ba4c69c 100644
--- a/kernel/tools/perf/arch/arm/util/unwind-libdw.c
+++ b/kernel/tools/perf/arch/arm/util/unwind-libdw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <elfutils/libdwfl.h>
 #include "../../util/unwind-libdw.h"
 #include "../../util/perf_regs.h"
diff --git a/kernel/tools/perf/arch/arm/util/unwind-libunwind.c b/kernel/tools/perf/arch/arm/util/unwind-libunwind.c
index 62c397ed3..3a550225d 100644
--- a/kernel/tools/perf/arch/arm/util/unwind-libunwind.c
+++ b/kernel/tools/perf/arch/arm/util/unwind-libunwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <errno.h>
 #include <libunwind.h>
diff --git a/kernel/tools/perf/arch/arm64/Makefile b/kernel/tools/perf/arch/arm64/Makefile
index eebe1ec9d..91de4860f 100644
--- a/kernel/tools/perf/arch/arm64/Makefile
+++ b/kernel/tools/perf/arch/arm64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 endif
diff --git a/kernel/tools/perf/arch/arm64/annotate/instructions.c b/kernel/tools/perf/arch/arm64/annotate/instructions.c
index 8f1908756..9a3e0523e 100644
--- a/kernel/tools/perf/arch/arm64/annotate/instructions.c
+++ b/kernel/tools/perf/arch/arm64/annotate/instructions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <regex.h>
 
diff --git a/kernel/tools/perf/arch/arm64/include/dwarf-regs-table.h b/kernel/tools/perf/arch/arm64/include/dwarf-regs-table.h
index 36e375f5a..177b2855f 100644
--- a/kernel/tools/perf/arch/arm64/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/arm64/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/arm64/include/perf_regs.h b/kernel/tools/perf/arch/arm64/include/perf_regs.h
index 4e5af27e3..baaa5e64a 100644
--- a/kernel/tools/perf/arch/arm64/include/perf_regs.h
+++ b/kernel/tools/perf/arch/arm64/include/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_REGS_H
 #define ARCH_PERF_REGS_H
 
diff --git a/kernel/tools/perf/arch/arm64/tests/dwarf-unwind.c b/kernel/tools/perf/arch/arm64/tests/dwarf-unwind.c
index cf04a4c91..e907f0f4c 100644
--- a/kernel/tools/perf/arch/arm64/tests/dwarf-unwind.c
+++ b/kernel/tools/perf/arch/arm64/tests/dwarf-unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "perf_regs.h"
 #include "thread.h"
diff --git a/kernel/tools/perf/arch/arm64/tests/regs_load.S b/kernel/tools/perf/arch/arm64/tests/regs_load.S
index 025b46e57..07042511d 100644
--- a/kernel/tools/perf/arch/arm64/tests/regs_load.S
+++ b/kernel/tools/perf/arch/arm64/tests/regs_load.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 .text
diff --git a/kernel/tools/perf/arch/arm64/util/unwind-libunwind.c b/kernel/tools/perf/arch/arm64/util/unwind-libunwind.c
index b415dfdbc..002520d40 100644
--- a/kernel/tools/perf/arch/arm64/util/unwind-libunwind.c
+++ b/kernel/tools/perf/arch/arm64/util/unwind-libunwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 
 #ifndef REMOTE_UNWIND_LIBUNWIND
diff --git a/kernel/tools/perf/arch/common.c b/kernel/tools/perf/arch/common.c
index 6b40e9f01..8c0cfeb55 100644
--- a/kernel/tools/perf/arch/common.c
+++ b/kernel/tools/perf/arch/common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <sys/utsname.h>
 #include "common.h"
diff --git a/kernel/tools/perf/arch/common.h b/kernel/tools/perf/arch/common.h
index 6b01c736b..a1546509a 100644
--- a/kernel/tools/perf/arch/common.h
+++ b/kernel/tools/perf/arch/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_COMMON_H
 #define ARCH_PERF_COMMON_H
 
diff --git a/kernel/tools/perf/arch/powerpc/Makefile b/kernel/tools/perf/arch/powerpc/Makefile
index cc3930904..42dab7c8f 100644
--- a/kernel/tools/perf/arch/powerpc/Makefile
+++ b/kernel/tools/perf/arch/powerpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 endif
diff --git a/kernel/tools/perf/arch/powerpc/annotate/instructions.c b/kernel/tools/perf/arch/powerpc/annotate/instructions.c
index 3c4004db8..b7bc04980 100644
--- a/kernel/tools/perf/arch/powerpc/annotate/instructions.c
+++ b/kernel/tools/perf/arch/powerpc/annotate/instructions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, const char *name)
 {
 	int i;
diff --git a/kernel/tools/perf/arch/powerpc/include/arch-tests.h b/kernel/tools/perf/arch/powerpc/include/arch-tests.h
index 84d8dedef..1c7be75cb 100644
--- a/kernel/tools/perf/arch/powerpc/include/arch-tests.h
+++ b/kernel/tools/perf/arch/powerpc/include/arch-tests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_TESTS_H
 #define ARCH_TESTS_H
 
diff --git a/kernel/tools/perf/arch/powerpc/include/dwarf-regs-table.h b/kernel/tools/perf/arch/powerpc/include/dwarf-regs-table.h
index db4730f55..66dc015a7 100644
--- a/kernel/tools/perf/arch/powerpc/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/powerpc/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/powerpc/include/perf_regs.h b/kernel/tools/perf/arch/powerpc/include/perf_regs.h
index c12f4e804..00e37b106 100644
--- a/kernel/tools/perf/arch/powerpc/include/perf_regs.h
+++ b/kernel/tools/perf/arch/powerpc/include/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_REGS_H
 #define ARCH_PERF_REGS_H
 
diff --git a/kernel/tools/perf/arch/powerpc/tests/arch-tests.c b/kernel/tools/perf/arch/powerpc/tests/arch-tests.c
index e24f46241..8c3fbd4af 100644
--- a/kernel/tools/perf/arch/powerpc/tests/arch-tests.c
+++ b/kernel/tools/perf/arch/powerpc/tests/arch-tests.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "tests/tests.h"
 #include "arch-tests.h"
diff --git a/kernel/tools/perf/arch/powerpc/tests/dwarf-unwind.c b/kernel/tools/perf/arch/powerpc/tests/dwarf-unwind.c
index 0bac3137c..30cbbd6d5 100644
--- a/kernel/tools/perf/arch/powerpc/tests/dwarf-unwind.c
+++ b/kernel/tools/perf/arch/powerpc/tests/dwarf-unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "perf_regs.h"
 #include "thread.h"
diff --git a/kernel/tools/perf/arch/powerpc/tests/regs_load.S b/kernel/tools/perf/arch/powerpc/tests/regs_load.S
index d76c9a32f..36a20b003 100644
--- a/kernel/tools/perf/arch/powerpc/tests/regs_load.S
+++ b/kernel/tools/perf/arch/powerpc/tests/regs_load.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 /* Offset is based on macros from arch/powerpc/include/uapi/asm/ptrace.h. */
diff --git a/kernel/tools/perf/arch/powerpc/util/book3s_hcalls.h b/kernel/tools/perf/arch/powerpc/util/book3s_hcalls.h
index 0dd6b7f2d..54cfa0530 100644
--- a/kernel/tools/perf/arch/powerpc/util/book3s_hcalls.h
+++ b/kernel/tools/perf/arch/powerpc/util/book3s_hcalls.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_BOOK3S_HV_HCALLS_H
 #define ARCH_PERF_BOOK3S_HV_HCALLS_H
 
diff --git a/kernel/tools/perf/arch/powerpc/util/book3s_hv_exits.h b/kernel/tools/perf/arch/powerpc/util/book3s_hv_exits.h
index e68ba2da8..853b95d1e 100644
--- a/kernel/tools/perf/arch/powerpc/util/book3s_hv_exits.h
+++ b/kernel/tools/perf/arch/powerpc/util/book3s_hv_exits.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_BOOK3S_HV_EXITS_H
 #define ARCH_PERF_BOOK3S_HV_EXITS_H
 
diff --git a/kernel/tools/perf/arch/powerpc/util/header.c b/kernel/tools/perf/arch/powerpc/util/header.c
index 9aaa6f5a9..7a4cf80c2 100644
--- a/kernel/tools/perf/arch/powerpc/util/header.c
+++ b/kernel/tools/perf/arch/powerpc/util/header.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/arch/powerpc/util/kvm-stat.c b/kernel/tools/perf/arch/powerpc/util/kvm-stat.c
index 249723f0e..596ad6aed 100644
--- a/kernel/tools/perf/arch/powerpc/util/kvm-stat.c
+++ b/kernel/tools/perf/arch/powerpc/util/kvm-stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include "util/kvm-stat.h"
 #include "util/parse-events.h"
diff --git a/kernel/tools/perf/arch/powerpc/util/perf_regs.c b/kernel/tools/perf/arch/powerpc/util/perf_regs.c
index f860dc411..ec50939b0 100644
--- a/kernel/tools/perf/arch/powerpc/util/perf_regs.c
+++ b/kernel/tools/perf/arch/powerpc/util/perf_regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <string.h>
 #include <regex.h>
diff --git a/kernel/tools/perf/arch/powerpc/util/unwind-libdw.c b/kernel/tools/perf/arch/powerpc/util/unwind-libdw.c
index 3a24b3c43..7a1f05ef2 100644
--- a/kernel/tools/perf/arch/powerpc/util/unwind-libdw.c
+++ b/kernel/tools/perf/arch/powerpc/util/unwind-libdw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <elfutils/libdwfl.h>
 #include "../../util/unwind-libdw.h"
 #include "../../util/perf_regs.h"
diff --git a/kernel/tools/perf/arch/s390/annotate/instructions.c b/kernel/tools/perf/arch/s390/annotate/instructions.c
index 745b4b1b8..c9a81673e 100644
--- a/kernel/tools/perf/arch/s390/annotate/instructions.c
+++ b/kernel/tools/perf/arch/s390/annotate/instructions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)
 {
 	struct ins_ops *ops = NULL;
diff --git a/kernel/tools/perf/arch/s390/include/dwarf-regs-table.h b/kernel/tools/perf/arch/s390/include/dwarf-regs-table.h
index 9da74a933..792d4c277 100644
--- a/kernel/tools/perf/arch/s390/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/s390/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/s390/util/dwarf-regs.c b/kernel/tools/perf/arch/s390/util/dwarf-regs.c
index 0469df02e..0dff5b2ed 100644
--- a/kernel/tools/perf/arch/s390/util/dwarf-regs.c
+++ b/kernel/tools/perf/arch/s390/util/dwarf-regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Mapping of DWARF debug register numbers into register names.
  *
diff --git a/kernel/tools/perf/arch/s390/util/machine.c b/kernel/tools/perf/arch/s390/util/machine.c
index b9a95a1a8..0b2054007 100644
--- a/kernel/tools/perf/arch/s390/util/machine.c
+++ b/kernel/tools/perf/arch/s390/util/machine.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/kernel/tools/perf/arch/sh/include/dwarf-regs-table.h b/kernel/tools/perf/arch/sh/include/dwarf-regs-table.h
index 3a2deaf3d..900e69619 100644
--- a/kernel/tools/perf/arch/sh/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/sh/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/sparc/include/dwarf-regs-table.h b/kernel/tools/perf/arch/sparc/include/dwarf-regs-table.h
index 12c076190..35ede84a6 100644
--- a/kernel/tools/perf/arch/sparc/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/sparc/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/x86/Makefile b/kernel/tools/perf/arch/x86/Makefile
index 9a628a24c..d74eaa7aa 100644
--- a/kernel/tools/perf/arch/x86/Makefile
+++ b/kernel/tools/perf/arch/x86/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 endif
diff --git a/kernel/tools/perf/arch/x86/annotate/instructions.c b/kernel/tools/perf/arch/x86/annotate/instructions.c
index d84b72063..4adfb4ce2 100644
--- a/kernel/tools/perf/arch/x86/annotate/instructions.c
+++ b/kernel/tools/perf/arch/x86/annotate/instructions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static struct ins x86__instructions[] = {
 	{ .name = "add",	.ops = &mov_ops,  },
 	{ .name = "addl",	.ops = &mov_ops,  },
diff --git a/kernel/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh b/kernel/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh
index 49a18b9ad..029a72c20 100755
--- a/kernel/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh
+++ b/kernel/tools/perf/arch/x86/entry/syscalls/syscalltbl.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 in="$1"
 arch="$2"
diff --git a/kernel/tools/perf/arch/x86/include/arch-tests.h b/kernel/tools/perf/arch/x86/include/arch-tests.h
index 4e0b806a7..9834fdc7c 100644
--- a/kernel/tools/perf/arch/x86/include/arch-tests.h
+++ b/kernel/tools/perf/arch/x86/include/arch-tests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_TESTS_H
 #define ARCH_TESTS_H
 
diff --git a/kernel/tools/perf/arch/x86/include/dwarf-regs-table.h b/kernel/tools/perf/arch/x86/include/dwarf-regs-table.h
index 9b5e5cbb4..b9bd5dc9d 100644
--- a/kernel/tools/perf/arch/x86/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/x86/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/arch/x86/include/perf_regs.h b/kernel/tools/perf/arch/x86/include/perf_regs.h
index 7df517acf..7f6d538f8 100644
--- a/kernel/tools/perf/arch/x86/include/perf_regs.h
+++ b/kernel/tools/perf/arch/x86/include/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ARCH_PERF_REGS_H
 #define ARCH_PERF_REGS_H
 
diff --git a/kernel/tools/perf/arch/x86/tests/arch-tests.c b/kernel/tools/perf/arch/x86/tests/arch-tests.c
index 99d66191e..34a078136 100644
--- a/kernel/tools/perf/arch/x86/tests/arch-tests.c
+++ b/kernel/tools/perf/arch/x86/tests/arch-tests.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "tests/tests.h"
 #include "arch-tests.h"
diff --git a/kernel/tools/perf/arch/x86/tests/dwarf-unwind.c b/kernel/tools/perf/arch/x86/tests/dwarf-unwind.c
index 7f209ce82..95036c7a5 100644
--- a/kernel/tools/perf/arch/x86/tests/dwarf-unwind.c
+++ b/kernel/tools/perf/arch/x86/tests/dwarf-unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "perf_regs.h"
 #include "thread.h"
diff --git a/kernel/tools/perf/arch/x86/tests/insn-x86-dat-32.c b/kernel/tools/perf/arch/x86/tests/insn-x86-dat-32.c
index 3cbf6fad1..fab3c6de7 100644
--- a/kernel/tools/perf/arch/x86/tests/insn-x86-dat-32.c
+++ b/kernel/tools/perf/arch/x86/tests/insn-x86-dat-32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generated by gen-insn-x86-dat.sh and gen-insn-x86-dat.awk
  * from insn-x86-dat-src.c for inclusion by insn-x86.c
diff --git a/kernel/tools/perf/arch/x86/tests/insn-x86-dat-64.c b/kernel/tools/perf/arch/x86/tests/insn-x86-dat-64.c
index aa512fa94..c57f34603 100644
--- a/kernel/tools/perf/arch/x86/tests/insn-x86-dat-64.c
+++ b/kernel/tools/perf/arch/x86/tests/insn-x86-dat-64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Generated by gen-insn-x86-dat.sh and gen-insn-x86-dat.awk
  * from insn-x86-dat-src.c for inclusion by insn-x86.c
diff --git a/kernel/tools/perf/arch/x86/tests/insn-x86-dat-src.c b/kernel/tools/perf/arch/x86/tests/insn-x86-dat-src.c
index 6cdb65d25..891415b10 100644
--- a/kernel/tools/perf/arch/x86/tests/insn-x86-dat-src.c
+++ b/kernel/tools/perf/arch/x86/tests/insn-x86-dat-src.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file contains instructions for testing by the test titled:
  *
diff --git a/kernel/tools/perf/arch/x86/tests/insn-x86.c b/kernel/tools/perf/arch/x86/tests/insn-x86.c
index b3860586a..a5d24ae58 100644
--- a/kernel/tools/perf/arch/x86/tests/insn-x86.c
+++ b/kernel/tools/perf/arch/x86/tests/insn-x86.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 
 #include "debug.h"
diff --git a/kernel/tools/perf/arch/x86/tests/intel-cqm.c b/kernel/tools/perf/arch/x86/tests/intel-cqm.c
index 57f86b6e7..90a4a8c58 100644
--- a/kernel/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/kernel/tools/perf/arch/x86/tests/intel-cqm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tests/tests.h"
 #include "perf.h"
 #include "cloexec.h"
diff --git a/kernel/tools/perf/arch/x86/tests/perf-time-to-tsc.c b/kernel/tools/perf/arch/x86/tests/perf-time-to-tsc.c
index 5dd7efb19..b59678e8c 100644
--- a/kernel/tools/perf/arch/x86/tests/perf-time-to-tsc.c
+++ b/kernel/tools/perf/arch/x86/tests/perf-time-to-tsc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/arch/x86/tests/rdpmc.c b/kernel/tools/perf/arch/x86/tests/rdpmc.c
index 17fec30a0..7a11f02d6 100644
--- a/kernel/tools/perf/arch/x86/tests/rdpmc.c
+++ b/kernel/tools/perf/arch/x86/tests/rdpmc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/kernel/tools/perf/arch/x86/tests/regs_load.S b/kernel/tools/perf/arch/x86/tests/regs_load.S
index 60875d5c5..bbe5a0d16 100644
--- a/kernel/tools/perf/arch/x86/tests/regs_load.S
+++ b/kernel/tools/perf/arch/x86/tests/regs_load.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/linkage.h>
 
 #define AX	 0
diff --git a/kernel/tools/perf/arch/x86/util/group.c b/kernel/tools/perf/arch/x86/util/group.c
index 37f92aa39..e2f8034b8 100644
--- a/kernel/tools/perf/arch/x86/util/group.c
+++ b/kernel/tools/perf/arch/x86/util/group.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include "api/fs/fs.h"
 #include "util/group.h"
diff --git a/kernel/tools/perf/arch/x86/util/header.c b/kernel/tools/perf/arch/x86/util/header.c
index a74a48db2..33027c5e6 100644
--- a/kernel/tools/perf/arch/x86/util/header.c
+++ b/kernel/tools/perf/arch/x86/util/header.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/arch/x86/util/kvm-stat.c b/kernel/tools/perf/arch/x86/util/kvm-stat.c
index bf817beca..b32409a0e 100644
--- a/kernel/tools/perf/arch/x86/util/kvm-stat.c
+++ b/kernel/tools/perf/arch/x86/util/kvm-stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include "../../util/kvm-stat.h"
 #include <asm/svm.h>
diff --git a/kernel/tools/perf/arch/x86/util/perf_regs.c b/kernel/tools/perf/arch/x86/util/perf_regs.c
index f95edebfb..4b2caf6d4 100644
--- a/kernel/tools/perf/arch/x86/util/perf_regs.c
+++ b/kernel/tools/perf/arch/x86/util/perf_regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <string.h>
 #include <regex.h>
diff --git a/kernel/tools/perf/arch/x86/util/pmu.c b/kernel/tools/perf/arch/x86/util/pmu.c
index 79fe07158..63a74c32d 100644
--- a/kernel/tools/perf/arch/x86/util/pmu.c
+++ b/kernel/tools/perf/arch/x86/util/pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 
 #include <linux/perf_event.h>
diff --git a/kernel/tools/perf/arch/x86/util/tsc.c b/kernel/tools/perf/arch/x86/util/tsc.c
index 2e5567c94..06bae7023 100644
--- a/kernel/tools/perf/arch/x86/util/tsc.c
+++ b/kernel/tools/perf/arch/x86/util/tsc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdbool.h>
 #include <errno.h>
 
diff --git a/kernel/tools/perf/arch/x86/util/unwind-libdw.c b/kernel/tools/perf/arch/x86/util/unwind-libdw.c
index 38dc9bb2a..fda8f4206 100644
--- a/kernel/tools/perf/arch/x86/util/unwind-libdw.c
+++ b/kernel/tools/perf/arch/x86/util/unwind-libdw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <elfutils/libdwfl.h>
 #include "../../util/unwind-libdw.h"
 #include "../../util/perf_regs.h"
diff --git a/kernel/tools/perf/arch/x86/util/unwind-libunwind.c b/kernel/tools/perf/arch/x86/util/unwind-libunwind.c
index 4f16661cb..9c917f80c 100644
--- a/kernel/tools/perf/arch/x86/util/unwind-libunwind.c
+++ b/kernel/tools/perf/arch/x86/util/unwind-libunwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #ifndef REMOTE_UNWIND_LIBUNWIND
 #include <errno.h>
diff --git a/kernel/tools/perf/arch/xtensa/include/dwarf-regs-table.h b/kernel/tools/perf/arch/xtensa/include/dwarf-regs-table.h
index aa0444a33..d7c9f1fb4 100644
--- a/kernel/tools/perf/arch/xtensa/include/dwarf-regs-table.h
+++ b/kernel/tools/perf/arch/xtensa/include/dwarf-regs-table.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef DEFINE_DWARF_REGSTR_TABLE
 /* This is included in perf/util/dwarf-regs.c */
 
diff --git a/kernel/tools/perf/bench/bench.h b/kernel/tools/perf/bench/bench.h
index 842ab2781..6c9fcd757 100644
--- a/kernel/tools/perf/bench/bench.h
+++ b/kernel/tools/perf/bench/bench.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BENCH_H
 #define BENCH_H
 
diff --git a/kernel/tools/perf/bench/futex-hash.c b/kernel/tools/perf/bench/futex-hash.c
index fe16b3100..58ae6ed8f 100644
--- a/kernel/tools/perf/bench/futex-hash.c
+++ b/kernel/tools/perf/bench/futex-hash.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013  Davidlohr Bueso <davidlohr@hp.com>
  *
diff --git a/kernel/tools/perf/bench/futex-lock-pi.c b/kernel/tools/perf/bench/futex-lock-pi.c
index 73a1c44ea..08653ae8a 100644
--- a/kernel/tools/perf/bench/futex-lock-pi.c
+++ b/kernel/tools/perf/bench/futex-lock-pi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015 Davidlohr Bueso.
  */
diff --git a/kernel/tools/perf/bench/futex-requeue.c b/kernel/tools/perf/bench/futex-requeue.c
index 41786cbea..1058c1946 100644
--- a/kernel/tools/perf/bench/futex-requeue.c
+++ b/kernel/tools/perf/bench/futex-requeue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013  Davidlohr Bueso <davidlohr@hp.com>
  *
diff --git a/kernel/tools/perf/bench/futex-wake-parallel.c b/kernel/tools/perf/bench/futex-wake-parallel.c
index 4ab12c8e0..b4732dad9 100644
--- a/kernel/tools/perf/bench/futex-wake-parallel.c
+++ b/kernel/tools/perf/bench/futex-wake-parallel.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015 Davidlohr Bueso.
  *
diff --git a/kernel/tools/perf/bench/futex-wake.c b/kernel/tools/perf/bench/futex-wake.c
index 2fa49222e..8c5c0b6b5 100644
--- a/kernel/tools/perf/bench/futex-wake.c
+++ b/kernel/tools/perf/bench/futex-wake.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2013  Davidlohr Bueso <davidlohr@hp.com>
  *
diff --git a/kernel/tools/perf/bench/futex.h b/kernel/tools/perf/bench/futex.h
index e44fd3239..db4853f20 100644
--- a/kernel/tools/perf/bench/futex.h
+++ b/kernel/tools/perf/bench/futex.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Glibc independent futex library for testing kernel functionality.
  * Shamelessly stolen from Darren Hart <dvhltc@us.ibm.com>
diff --git a/kernel/tools/perf/bench/mem-functions.c b/kernel/tools/perf/bench/mem-functions.c
index fbd732b54..0251dd348 100644
--- a/kernel/tools/perf/bench/mem-functions.c
+++ b/kernel/tools/perf/bench/mem-functions.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mem-memcpy.c
  *
diff --git a/kernel/tools/perf/bench/mem-memcpy-arch.h b/kernel/tools/perf/bench/mem-memcpy-arch.h
index 5aad2a940..5bcaec560 100644
--- a/kernel/tools/perf/bench/mem-memcpy-arch.h
+++ b/kernel/tools/perf/bench/mem-memcpy-arch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
 
diff --git a/kernel/tools/perf/bench/mem-memcpy-x86-64-asm-def.h b/kernel/tools/perf/bench/mem-memcpy-x86-64-asm-def.h
index 8c0c1a277..50ae8bd58 100644
--- a/kernel/tools/perf/bench/mem-memcpy-x86-64-asm-def.h
+++ b/kernel/tools/perf/bench/mem-memcpy-x86-64-asm-def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 MEMCPY_FN(memcpy_orig,
 	"x86-64-unrolled",
diff --git a/kernel/tools/perf/bench/mem-memcpy-x86-64-asm.S b/kernel/tools/perf/bench/mem-memcpy-x86-64-asm.S
index f700369bb..b43f8d2a3 100644
--- a/kernel/tools/perf/bench/mem-memcpy-x86-64-asm.S
+++ b/kernel/tools/perf/bench/mem-memcpy-x86-64-asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 /* Various wrappers to make the kernel .S file build in user-space: */
 
diff --git a/kernel/tools/perf/bench/mem-memset-arch.h b/kernel/tools/perf/bench/mem-memset-arch.h
index 0d15786d9..53f454826 100644
--- a/kernel/tools/perf/bench/mem-memset-arch.h
+++ b/kernel/tools/perf/bench/mem-memset-arch.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifdef HAVE_ARCH_X86_64_SUPPORT
 
diff --git a/kernel/tools/perf/bench/mem-memset-x86-64-asm-def.h b/kernel/tools/perf/bench/mem-memset-x86-64-asm-def.h
index f02d02877..dac6d2b7c 100644
--- a/kernel/tools/perf/bench/mem-memset-x86-64-asm-def.h
+++ b/kernel/tools/perf/bench/mem-memset-x86-64-asm-def.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 MEMSET_FN(memset_orig,
 	"x86-64-unrolled",
diff --git a/kernel/tools/perf/bench/mem-memset-x86-64-asm.S b/kernel/tools/perf/bench/mem-memset-x86-64-asm.S
index 58407aa24..d550bd526 100644
--- a/kernel/tools/perf/bench/mem-memset-x86-64-asm.S
+++ b/kernel/tools/perf/bench/mem-memset-x86-64-asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define memset MEMSET /* don't hide glibc's memset() */
 #define altinstr_replacement text
 #define globl p2align 4; .globl
diff --git a/kernel/tools/perf/bench/numa.c b/kernel/tools/perf/bench/numa.c
index 469d65b21..d95fdcc26 100644
--- a/kernel/tools/perf/bench/numa.c
+++ b/kernel/tools/perf/bench/numa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * numa.c
  *
diff --git a/kernel/tools/perf/bench/sched-messaging.c b/kernel/tools/perf/bench/sched-messaging.c
index 4f961e745..f9d7641ae 100644
--- a/kernel/tools/perf/bench/sched-messaging.c
+++ b/kernel/tools/perf/bench/sched-messaging.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * sched-messaging.c
diff --git a/kernel/tools/perf/bench/sched-pipe.c b/kernel/tools/perf/bench/sched-pipe.c
index a15273737..0591be008 100644
--- a/kernel/tools/perf/bench/sched-pipe.c
+++ b/kernel/tools/perf/bench/sched-pipe.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * sched-pipe.c
diff --git a/kernel/tools/perf/builtin-annotate.c b/kernel/tools/perf/builtin-annotate.c
index c38373195..3d32aa450 100644
--- a/kernel/tools/perf/builtin-annotate.c
+++ b/kernel/tools/perf/builtin-annotate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-annotate.c
  *
diff --git a/kernel/tools/perf/builtin-bench.c b/kernel/tools/perf/builtin-bench.c
index 445e62881..17a6bcd01 100644
--- a/kernel/tools/perf/builtin-bench.c
+++ b/kernel/tools/perf/builtin-bench.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-bench.c
  *
diff --git a/kernel/tools/perf/builtin-buildid-cache.c b/kernel/tools/perf/builtin-buildid-cache.c
index e3eb6240c..5f53a7ad5 100644
--- a/kernel/tools/perf/builtin-buildid-cache.c
+++ b/kernel/tools/perf/builtin-buildid-cache.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-buildid-cache.c
  *
diff --git a/kernel/tools/perf/builtin-buildid-list.c b/kernel/tools/perf/builtin-buildid-list.c
index fdaca16e0..ec2f327cd 100644
--- a/kernel/tools/perf/builtin-buildid-list.c
+++ b/kernel/tools/perf/builtin-buildid-list.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-buildid-list.c
  *
diff --git a/kernel/tools/perf/builtin-c2c.c b/kernel/tools/perf/builtin-c2c.c
index 475999e48..fd32ad08c 100644
--- a/kernel/tools/perf/builtin-c2c.c
+++ b/kernel/tools/perf/builtin-c2c.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This is rewrite of original c2c tool introduced in here:
  *   http://lwn.net/Articles/588866/
diff --git a/kernel/tools/perf/builtin-config.c b/kernel/tools/perf/builtin-config.c
index a1d82e332..abfa49eaf 100644
--- a/kernel/tools/perf/builtin-config.c
+++ b/kernel/tools/perf/builtin-config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-config.c
  *
diff --git a/kernel/tools/perf/builtin-data.c b/kernel/tools/perf/builtin-data.c
index 46cd8490b..dde25d4ca 100644
--- a/kernel/tools/perf/builtin-data.c
+++ b/kernel/tools/perf/builtin-data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include "builtin.h"
 #include "perf.h"
diff --git a/kernel/tools/perf/builtin-diff.c b/kernel/tools/perf/builtin-diff.c
index 0cd4cf6a3..56223bdfa 100644
--- a/kernel/tools/perf/builtin-diff.c
+++ b/kernel/tools/perf/builtin-diff.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-diff.c
  *
diff --git a/kernel/tools/perf/builtin-evlist.c b/kernel/tools/perf/builtin-evlist.c
index 6d210e40d..cdd145613 100644
--- a/kernel/tools/perf/builtin-evlist.c
+++ b/kernel/tools/perf/builtin-evlist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Builtin evlist command: Show the list of event selectors present
  * in a perf.data file.
diff --git a/kernel/tools/perf/builtin-help.c b/kernel/tools/perf/builtin-help.c
index dbe4e4153..bd1fedef3 100644
--- a/kernel/tools/perf/builtin-help.c
+++ b/kernel/tools/perf/builtin-help.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-help.c
  *
diff --git a/kernel/tools/perf/builtin-inject.c b/kernel/tools/perf/builtin-inject.c
index 2b8032908..3e0e73b0d 100644
--- a/kernel/tools/perf/builtin-inject.c
+++ b/kernel/tools/perf/builtin-inject.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-inject.c
  *
diff --git a/kernel/tools/perf/builtin-kmem.c b/kernel/tools/perf/builtin-kmem.c
index 24ee68ecd..35d4b9c9a 100644
--- a/kernel/tools/perf/builtin-kmem.c
+++ b/kernel/tools/perf/builtin-kmem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "builtin.h"
 #include "perf.h"
 
diff --git a/kernel/tools/perf/builtin-kvm.c b/kernel/tools/perf/builtin-kvm.c
index f309c3773..5fb40368d 100644
--- a/kernel/tools/perf/builtin-kvm.c
+++ b/kernel/tools/perf/builtin-kvm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "builtin.h"
 #include "perf.h"
 
diff --git a/kernel/tools/perf/builtin-list.c b/kernel/tools/perf/builtin-list.c
index 4bf2cb4d2..eeedbe433 100644
--- a/kernel/tools/perf/builtin-list.c
+++ b/kernel/tools/perf/builtin-list.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-list.c
  *
diff --git a/kernel/tools/perf/builtin-lock.c b/kernel/tools/perf/builtin-lock.c
index ff9865248..fe69cd6b8 100644
--- a/kernel/tools/perf/builtin-lock.c
+++ b/kernel/tools/perf/builtin-lock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include "builtin.h"
diff --git a/kernel/tools/perf/builtin-mem.c b/kernel/tools/perf/builtin-mem.c
index 0f15634ef..4db960085 100644
--- a/kernel/tools/perf/builtin-mem.c
+++ b/kernel/tools/perf/builtin-mem.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/kernel/tools/perf/builtin-record.c b/kernel/tools/perf/builtin-record.c
index 56f8142ff..0c95ffefb 100644
--- a/kernel/tools/perf/builtin-record.c
+++ b/kernel/tools/perf/builtin-record.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-record.c
  *
diff --git a/kernel/tools/perf/builtin-report.c b/kernel/tools/perf/builtin-report.c
index f9dff652d..fae4b0340 100644
--- a/kernel/tools/perf/builtin-report.c
+++ b/kernel/tools/perf/builtin-report.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-report.c
  *
diff --git a/kernel/tools/perf/builtin-sched.c b/kernel/tools/perf/builtin-sched.c
index 322b4def8..f380d91ee 100644
--- a/kernel/tools/perf/builtin-sched.c
+++ b/kernel/tools/perf/builtin-sched.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "builtin.h"
 #include "perf.h"
 
diff --git a/kernel/tools/perf/builtin-script.c b/kernel/tools/perf/builtin-script.c
index 0c977b6e0..0fe02758d 100644
--- a/kernel/tools/perf/builtin-script.c
+++ b/kernel/tools/perf/builtin-script.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "builtin.h"
 
 #include "perf.h"
diff --git a/kernel/tools/perf/builtin-version.c b/kernel/tools/perf/builtin-version.c
index d25149456..37019c5d6 100644
--- a/kernel/tools/perf/builtin-version.c
+++ b/kernel/tools/perf/builtin-version.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "builtin.h"
 #include "perf.h"
 #include <linux/compiler.h>
diff --git a/kernel/tools/perf/builtin.h b/kernel/tools/perf/builtin.h
index d4d19fe3d..05745f3ce 100644
--- a/kernel/tools/perf/builtin.h
+++ b/kernel/tools/perf/builtin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BUILTIN_H
 #define BUILTIN_H
 
diff --git a/kernel/tools/perf/check-headers.sh b/kernel/tools/perf/check-headers.sh
index 932fda54b..50cd6228f 100755
--- a/kernel/tools/perf/check-headers.sh
+++ b/kernel/tools/perf/check-headers.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 HEADERS='
 include/uapi/drm/drm.h
diff --git a/kernel/tools/perf/jvmti/jvmti_agent.h b/kernel/tools/perf/jvmti/jvmti_agent.h
index c53a41f48..fe32d8344 100644
--- a/kernel/tools/perf/jvmti/jvmti_agent.h
+++ b/kernel/tools/perf/jvmti/jvmti_agent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __JVMTI_AGENT_H__
 #define __JVMTI_AGENT_H__
 
diff --git a/kernel/tools/perf/jvmti/libjvmti.c b/kernel/tools/perf/jvmti/libjvmti.c
index 6d710904c..c62c9fc9a 100644
--- a/kernel/tools/perf/jvmti/libjvmti.c
+++ b/kernel/tools/perf/jvmti/libjvmti.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/perf-archive.sh b/kernel/tools/perf/perf-archive.sh
index e91930620..0cfb3e2ce 100644
--- a/kernel/tools/perf/perf-archive.sh
+++ b/kernel/tools/perf/perf-archive.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # perf archive
 # Arnaldo Carvalho de Melo <acme@redhat.com>
 
diff --git a/kernel/tools/perf/perf-completion.sh b/kernel/tools/perf/perf-completion.sh
index 3ba80b235..345f5d6e9 100644
--- a/kernel/tools/perf/perf-completion.sh
+++ b/kernel/tools/perf/perf-completion.sh
@@ -1,4 +1,5 @@
 # perf bash and zsh completion
+# SPDX-License-Identifier: GPL-2.0
 
 # Taken from git.git's completion script.
 __my_reassemble_comp_words_by_ref()
diff --git a/kernel/tools/perf/perf-read-vdso.c b/kernel/tools/perf/perf-read-vdso.c
index 764e2547c..8c0ca0cc4 100644
--- a/kernel/tools/perf/perf-read-vdso.c
+++ b/kernel/tools/perf/perf-read-vdso.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <string.h>
 
diff --git a/kernel/tools/perf/perf-sys.h b/kernel/tools/perf/perf-sys.h
index c11f0c76e..36673f98d 100644
--- a/kernel/tools/perf/perf-sys.h
+++ b/kernel/tools/perf/perf-sys.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_SYS_H
 #define _PERF_SYS_H
 
diff --git a/kernel/tools/perf/perf.c b/kernel/tools/perf/perf.c
index 2f19e03c5..62b13518b 100644
--- a/kernel/tools/perf/perf.c
+++ b/kernel/tools/perf/perf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * perf.c
  *
diff --git a/kernel/tools/perf/perf.h b/kernel/tools/perf/perf.h
index dc442ba21..f75f3dec7 100644
--- a/kernel/tools/perf/perf.h
+++ b/kernel/tools/perf/perf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_PERF_H
 #define _PERF_PERF_H
 
diff --git a/kernel/tools/perf/pmu-events/jevents.h b/kernel/tools/perf/pmu-events/jevents.h
index 611fac019..d87efd268 100644
--- a/kernel/tools/perf/pmu-events/jevents.h
+++ b/kernel/tools/perf/pmu-events/jevents.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef JEVENTS_H
 #define JEVENTS_H 1
 
diff --git a/kernel/tools/perf/pmu-events/jsmn.h b/kernel/tools/perf/pmu-events/jsmn.h
index d666b10cf..c7b0f6ea2 100644
--- a/kernel/tools/perf/pmu-events/jsmn.h
+++ b/kernel/tools/perf/pmu-events/jsmn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __JSMN_H_
 #define __JSMN_H_
 
diff --git a/kernel/tools/perf/pmu-events/json.h b/kernel/tools/perf/pmu-events/json.h
index 278ebd32c..fbcd5a059 100644
--- a/kernel/tools/perf/pmu-events/json.h
+++ b/kernel/tools/perf/pmu-events/json.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef JSON_H
 #define JSON_H 1
 
diff --git a/kernel/tools/perf/pmu-events/pmu-events.h b/kernel/tools/perf/pmu-events/pmu-events.h
index 569eab368..e08789ddf 100644
--- a/kernel/tools/perf/pmu-events/pmu-events.h
+++ b/kernel/tools/perf/pmu-events/pmu-events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PMU_EVENTS_H
 #define PMU_EVENTS_H
 
diff --git a/kernel/tools/perf/python/tracepoint.py b/kernel/tools/perf/python/tracepoint.py
index eb4dbed57..eb76f6516 100755
--- a/kernel/tools/perf/python/tracepoint.py
+++ b/kernel/tools/perf/python/tracepoint.py
@@ -1,4 +1,5 @@
 #! /usr/bin/python
+# SPDX-License-Identifier: GPL-2.0
 # -*- python -*-
 # -*- coding: utf-8 -*-
 
diff --git a/kernel/tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL b/kernel/tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL
index decdeb0f6..e8994332d 100644
--- a/kernel/tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL
+++ b/kernel/tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 use 5.010000;
 use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
diff --git a/kernel/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py b/kernel/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
index 9e0985794..81a56cd2b 100755
--- a/kernel/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
+++ b/kernel/tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
@@ -1,4 +1,5 @@
 # EventClass.py
+# SPDX-License-Identifier: GPL-2.0
 #
 # This is a library defining some events types classes, which could
 # be used by other scripts to analyzing the perf samples.
diff --git a/kernel/tools/perf/scripts/python/event_analyzing_sample.py b/kernel/tools/perf/scripts/python/event_analyzing_sample.py
index 163c39fa1..4e843b986 100644
--- a/kernel/tools/perf/scripts/python/event_analyzing_sample.py
+++ b/kernel/tools/perf/scripts/python/event_analyzing_sample.py
@@ -1,4 +1,5 @@
 # event_analyzing_sample.py: general event handler in python
+# SPDX-License-Identifier: GPL-2.0
 #
 # Current perf report is already very powerful with the annotation integrated,
 # and this script is not trying to be as powerful as perf report, but
diff --git a/kernel/tools/perf/scripts/python/net_dropmonitor.py b/kernel/tools/perf/scripts/python/net_dropmonitor.py
index 0b6ce8c25..a150164b4 100755
--- a/kernel/tools/perf/scripts/python/net_dropmonitor.py
+++ b/kernel/tools/perf/scripts/python/net_dropmonitor.py
@@ -1,4 +1,5 @@
 # Monitor the system for dropped packets and proudce a report of drop locations and counts
+# SPDX-License-Identifier: GPL-2.0
 
 import os
 import sys
diff --git a/kernel/tools/perf/scripts/python/netdev-times.py b/kernel/tools/perf/scripts/python/netdev-times.py
index 4c6f09ac7..9b2050f77 100644
--- a/kernel/tools/perf/scripts/python/netdev-times.py
+++ b/kernel/tools/perf/scripts/python/netdev-times.py
@@ -1,4 +1,5 @@
 # Display a process of packets and processed time.
+# SPDX-License-Identifier: GPL-2.0
 # It helps us to investigate networking or network device.
 #
 # options
diff --git a/kernel/tools/perf/scripts/python/stackcollapse.py b/kernel/tools/perf/scripts/python/stackcollapse.py
index 5a605f70e..1697b5e18 100755
--- a/kernel/tools/perf/scripts/python/stackcollapse.py
+++ b/kernel/tools/perf/scripts/python/stackcollapse.py
@@ -1,4 +1,5 @@
 # stackcollapse.py - format perf samples with one line per distinct call stack
+# SPDX-License-Identifier: GPL-2.0
 #
 # This script's output has two space-separated fields.  The first is a semicolon
 # separated stack including the program name (from the "comm" field) and the
diff --git a/kernel/tools/perf/scripts/python/stat-cpi.py b/kernel/tools/perf/scripts/python/stat-cpi.py
index 8b60f343d..8410672ef 100644
--- a/kernel/tools/perf/scripts/python/stat-cpi.py
+++ b/kernel/tools/perf/scripts/python/stat-cpi.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-2.0
 
 data    = {}
 times   = []
diff --git a/kernel/tools/perf/tests/attr.c b/kernel/tools/perf/tests/attr.c
index c9aafed7d..c180bbcdb 100644
--- a/kernel/tools/perf/tests/attr.c
+++ b/kernel/tools/perf/tests/attr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * The struct perf_event_attr test support.
  *
diff --git a/kernel/tools/perf/tests/attr.py b/kernel/tools/perf/tests/attr.py
index 6bb50e82a..907b1b2f5 100644
--- a/kernel/tools/perf/tests/attr.py
+++ b/kernel/tools/perf/tests/attr.py
@@ -1,4 +1,5 @@
 #! /usr/bin/python
+# SPDX-License-Identifier: GPL-2.0
 
 import os
 import sys
diff --git a/kernel/tools/perf/tests/backward-ring-buffer.c b/kernel/tools/perf/tests/backward-ring-buffer.c
index d233ad336..71b9a0b61 100644
--- a/kernel/tools/perf/tests/backward-ring-buffer.c
+++ b/kernel/tools/perf/tests/backward-ring-buffer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Test backward bit in event attribute, read ring buffer from end to
  * beginning
diff --git a/kernel/tools/perf/tests/bitmap.c b/kernel/tools/perf/tests/bitmap.c
index 0d7c06584..47bedf25b 100644
--- a/kernel/tools/perf/tests/bitmap.c
+++ b/kernel/tools/perf/tests/bitmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/bitmap.h>
 #include "tests.h"
diff --git a/kernel/tools/perf/tests/bp_signal.c b/kernel/tools/perf/tests/bp_signal.c
index 97937e1bc..335b695f4 100644
--- a/kernel/tools/perf/tests/bp_signal.c
+++ b/kernel/tools/perf/tests/bp_signal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Inspired by breakpoint overflow test done by
  * Vince Weaver <vincent.weaver@maine.edu> for perf_event_tests
diff --git a/kernel/tools/perf/tests/bp_signal_overflow.c b/kernel/tools/perf/tests/bp_signal_overflow.c
index 61ecd8021..ca962559e 100644
--- a/kernel/tools/perf/tests/bp_signal_overflow.c
+++ b/kernel/tools/perf/tests/bp_signal_overflow.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Originally done by Vince Weaver <vincent.weaver@maine.edu> for
  * perf_event_tests (git://github.com/deater/perf_event_tests)
diff --git a/kernel/tools/perf/tests/builtin-test.c b/kernel/tools/perf/tests/builtin-test.c
index 377bea009..53d06f374 100644
--- a/kernel/tools/perf/tests/builtin-test.c
+++ b/kernel/tools/perf/tests/builtin-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-test.c
  *
diff --git a/kernel/tools/perf/tests/clang.c b/kernel/tools/perf/tests/clang.c
index c60ec916f..f45fe11dc 100644
--- a/kernel/tools/perf/tests/clang.c
+++ b/kernel/tools/perf/tests/clang.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tests.h"
 #include "debug.h"
 #include "util.h"
diff --git a/kernel/tools/perf/tests/code-reading.c b/kernel/tools/perf/tests/code-reading.c
index 466a462b2..fcc8984bc 100644
--- a/kernel/tools/perf/tests/code-reading.c
+++ b/kernel/tools/perf/tests/code-reading.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/kernel/tools/perf/tests/cpumap.c b/kernel/tools/perf/tests/cpumap.c
index 199702252..e78b89767 100644
--- a/kernel/tools/perf/tests/cpumap.c
+++ b/kernel/tools/perf/tests/cpumap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tests.h"
 #include <stdio.h>
 #include "cpumap.h"
diff --git a/kernel/tools/perf/tests/dso-data.c b/kernel/tools/perf/tests/dso-data.c
index 30aead42d..7f6c52021 100644
--- a/kernel/tools/perf/tests/dso-data.c
+++ b/kernel/tools/perf/tests/dso-data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dirent.h>
 #include <stdlib.h>
 #include <linux/kernel.h>
diff --git a/kernel/tools/perf/tests/dwarf-unwind.c b/kernel/tools/perf/tests/dwarf-unwind.c
index 9ba1d216a..ac40e05bc 100644
--- a/kernel/tools/perf/tests/dwarf-unwind.c
+++ b/kernel/tools/perf/tests/dwarf-unwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/tests/event-times.c b/kernel/tools/perf/tests/event-times.c
index b82b981c3..1a2686f1f 100644
--- a/kernel/tools/perf/tests/event-times.c
+++ b/kernel/tools/perf/tests/event-times.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/tests/event_update.c b/kernel/tools/perf/tests/event_update.c
index 9484da2ec..f14dcd613 100644
--- a/kernel/tools/perf/tests/event_update.c
+++ b/kernel/tools/perf/tests/event_update.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include "evlist.h"
 #include "evsel.h"
diff --git a/kernel/tools/perf/tests/evsel-roundtrip-name.c b/kernel/tools/perf/tests/evsel-roundtrip-name.c
index d32759b6e..a104728eb 100644
--- a/kernel/tools/perf/tests/evsel-roundtrip-name.c
+++ b/kernel/tools/perf/tests/evsel-roundtrip-name.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "evlist.h"
 #include "evsel.h"
 #include "parse-events.h"
diff --git a/kernel/tools/perf/tests/evsel-tp-sched.c b/kernel/tools/perf/tests/evsel-tp-sched.c
index 5fc906d26..699561fa5 100644
--- a/kernel/tools/perf/tests/evsel-tp-sched.c
+++ b/kernel/tools/perf/tests/evsel-tp-sched.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include <traceevent/event-parse.h>
 #include "evsel.h"
diff --git a/kernel/tools/perf/tests/expr.c b/kernel/tools/perf/tests/expr.c
index cb251bf52..01f070699 100644
--- a/kernel/tools/perf/tests/expr.c
+++ b/kernel/tools/perf/tests/expr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util/debug.h"
 #include "util/expr.h"
 #include "tests.h"
diff --git a/kernel/tools/perf/tests/fdarray.c b/kernel/tools/perf/tests/fdarray.c
index 7d3a9e2ff..c7c81c4a5 100644
--- a/kernel/tools/perf/tests/fdarray.c
+++ b/kernel/tools/perf/tests/fdarray.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <api/fd/array.h>
 #include <poll.h>
 #include "util/debug.h"
diff --git a/kernel/tools/perf/tests/hists_common.c b/kernel/tools/perf/tests/hists_common.c
index 00b8dc50f..f7c5b613d 100644
--- a/kernel/tools/perf/tests/hists_common.c
+++ b/kernel/tools/perf/tests/hists_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include "perf.h"
 #include "util/debug.h"
diff --git a/kernel/tools/perf/tests/hists_common.h b/kernel/tools/perf/tests/hists_common.h
index 888254e86..a2de0ff0c 100644
--- a/kernel/tools/perf/tests/hists_common.h
+++ b/kernel/tools/perf/tests/hists_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_TESTS__HISTS_COMMON_H__
 #define __PERF_TESTS__HISTS_COMMON_H__
 
diff --git a/kernel/tools/perf/tests/hists_cumulate.c b/kernel/tools/perf/tests/hists_cumulate.c
index 8d19c0200..65fe02beb 100644
--- a/kernel/tools/perf/tests/hists_cumulate.c
+++ b/kernel/tools/perf/tests/hists_cumulate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "perf.h"
 #include "util/debug.h"
 #include "util/event.h"
diff --git a/kernel/tools/perf/tests/hists_filter.c b/kernel/tools/perf/tests/hists_filter.c
index 755ca551b..1c5bedab3 100644
--- a/kernel/tools/perf/tests/hists_filter.c
+++ b/kernel/tools/perf/tests/hists_filter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "perf.h"
 #include "util/debug.h"
 #include "util/symbol.h"
diff --git a/kernel/tools/perf/tests/hists_link.c b/kernel/tools/perf/tests/hists_link.c
index 073c9c285..9a9d06cb0 100644
--- a/kernel/tools/perf/tests/hists_link.c
+++ b/kernel/tools/perf/tests/hists_link.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "perf.h"
 #include "tests.h"
 #include "debug.h"
diff --git a/kernel/tools/perf/tests/hists_output.c b/kernel/tools/perf/tests/hists_output.c
index 282d62eae..faacb4f41 100644
--- a/kernel/tools/perf/tests/hists_output.c
+++ b/kernel/tools/perf/tests/hists_output.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "perf.h"
 #include "util/debug.h"
 #include "util/event.h"
diff --git a/kernel/tools/perf/tests/is_printable_array.c b/kernel/tools/perf/tests/is_printable_array.c
index 38f765767..9c7b3baca 100644
--- a/kernel/tools/perf/tests/is_printable_array.c
+++ b/kernel/tools/perf/tests/is_printable_array.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include "tests.h"
diff --git a/kernel/tools/perf/tests/keep-tracking.c b/kernel/tools/perf/tests/keep-tracking.c
index 739428603..842d33637 100644
--- a/kernel/tools/perf/tests/keep-tracking.c
+++ b/kernel/tools/perf/tests/keep-tracking.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/types.h>
 #include <unistd.h>
 #include <sys/prctl.h>
diff --git a/kernel/tools/perf/tests/kmod-path.c b/kernel/tools/perf/tests/kmod-path.c
index 8b9d4ba06..8e57d4610 100644
--- a/kernel/tools/perf/tests/kmod-path.c
+++ b/kernel/tools/perf/tests/kmod-path.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdbool.h>
 #include <stdlib.h>
 #include "tests.h"
diff --git a/kernel/tools/perf/tests/llvm.c b/kernel/tools/perf/tests/llvm.c
index 5187b50db..a039f9319 100644
--- a/kernel/tools/perf/tests/llvm.c
+++ b/kernel/tools/perf/tests/llvm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <bpf/libbpf.h>
 #include <util/llvm-utils.h>
diff --git a/kernel/tools/perf/tests/llvm.h b/kernel/tools/perf/tests/llvm.h
index b83571758..f68b0d9b8 100644
--- a/kernel/tools/perf/tests/llvm.h
+++ b/kernel/tools/perf/tests/llvm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_TEST_LLVM_H
 #define PERF_TEST_LLVM_H
 
diff --git a/kernel/tools/perf/tests/mmap-basic.c b/kernel/tools/perf/tests/mmap-basic.c
index bc8a70ee4..5a8bf318f 100644
--- a/kernel/tools/perf/tests/mmap-basic.c
+++ b/kernel/tools/perf/tests/mmap-basic.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 /* For the CLR_() macros */
diff --git a/kernel/tools/perf/tests/mmap-thread-lookup.c b/kernel/tools/perf/tests/mmap-thread-lookup.c
index f94a4196e..3c3f3e029 100644
--- a/kernel/tools/perf/tests/mmap-thread-lookup.c
+++ b/kernel/tools/perf/tests/mmap-thread-lookup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <unistd.h>
 #include <sys/syscall.h>
diff --git a/kernel/tools/perf/tests/openat-syscall-all-cpus.c b/kernel/tools/perf/tests/openat-syscall-all-cpus.c
index 9cf1c35f2..c531e6deb 100644
--- a/kernel/tools/perf/tests/openat-syscall-all-cpus.c
+++ b/kernel/tools/perf/tests/openat-syscall-all-cpus.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 /* For the CPU_* macros */
diff --git a/kernel/tools/perf/tests/openat-syscall-tp-fields.c b/kernel/tools/perf/tests/openat-syscall-tp-fields.c
index b6ee1c41f..d9619d265 100644
--- a/kernel/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/kernel/tools/perf/tests/openat-syscall-tp-fields.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/err.h>
 #include "perf.h"
 #include "evlist.h"
diff --git a/kernel/tools/perf/tests/openat-syscall.c b/kernel/tools/perf/tests/openat-syscall.c
index 9dc5c5d37..00cd63f90 100644
--- a/kernel/tools/perf/tests/openat-syscall.c
+++ b/kernel/tools/perf/tests/openat-syscall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <api/fs/tracing_path.h>
diff --git a/kernel/tools/perf/tests/parse-events.c b/kernel/tools/perf/tests/parse-events.c
index 0f0b025fa..f0679613b 100644
--- a/kernel/tools/perf/tests/parse-events.c
+++ b/kernel/tools/perf/tests/parse-events.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "parse-events.h"
 #include "evsel.h"
 #include "evlist.h"
diff --git a/kernel/tools/perf/tests/parse-no-sample-id-all.c b/kernel/tools/perf/tests/parse-no-sample-id-all.c
index 91867dcc3..2196d1497 100644
--- a/kernel/tools/perf/tests/parse-no-sample-id-all.c
+++ b/kernel/tools/perf/tests/parse-no-sample-id-all.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <stddef.h>
diff --git a/kernel/tools/perf/tests/perf-hooks.c b/kernel/tools/perf/tests/perf-hooks.c
index bf2517d6d..a693bcf01 100644
--- a/kernel/tools/perf/tests/perf-hooks.c
+++ b/kernel/tools/perf/tests/perf-hooks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <signal.h>
 #include <stdlib.h>
 
diff --git a/kernel/tools/perf/tests/perf-record.c b/kernel/tools/perf/tests/perf-record.c
index 19b650064..c34904d37 100644
--- a/kernel/tools/perf/tests/perf-record.c
+++ b/kernel/tools/perf/tests/perf-record.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 /* For the CLR_() macros */
diff --git a/kernel/tools/perf/tests/perf-targz-src-pkg b/kernel/tools/perf/tests/perf-targz-src-pkg
index f2d9c5fe5..fae26b1cf 100755
--- a/kernel/tools/perf/tests/perf-targz-src-pkg
+++ b/kernel/tools/perf/tests/perf-targz-src-pkg
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Test one of the main kernel Makefile targets to generate a perf sources tarball
 # suitable for build outside the full kernel sources.
 #
diff --git a/kernel/tools/perf/tests/pmu.c b/kernel/tools/perf/tests/pmu.c
index 9f7f589f9..9abca267a 100644
--- a/kernel/tools/perf/tests/pmu.c
+++ b/kernel/tools/perf/tests/pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "parse-events.h"
 #include "pmu.h"
 #include "util.h"
diff --git a/kernel/tools/perf/tests/python-use.c b/kernel/tools/perf/tests/python-use.c
index 598a7e058..5d2df65ad 100644
--- a/kernel/tools/perf/tests/python-use.c
+++ b/kernel/tools/perf/tests/python-use.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Just test if we can load the python binding.
  */
diff --git a/kernel/tools/perf/tests/sample-parsing.c b/kernel/tools/perf/tests/sample-parsing.c
index c38584871..3ec6302b6 100644
--- a/kernel/tools/perf/tests/sample-parsing.c
+++ b/kernel/tools/perf/tests/sample-parsing.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdbool.h>
 #include <inttypes.h>
 #include <linux/kernel.h>
diff --git a/kernel/tools/perf/tests/sdt.c b/kernel/tools/perf/tests/sdt.c
index a9903d9b8..5059452d2 100644
--- a/kernel/tools/perf/tests/sdt.c
+++ b/kernel/tools/perf/tests/sdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <stdio.h>
 #include <sys/epoll.h>
diff --git a/kernel/tools/perf/tests/stat.c b/kernel/tools/perf/tests/stat.c
index 7f988a939..942500246 100644
--- a/kernel/tools/perf/tests/stat.c
+++ b/kernel/tools/perf/tests/stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include "event.h"
 #include "tests.h"
diff --git a/kernel/tools/perf/tests/sw-clock.c b/kernel/tools/perf/tests/sw-clock.c
index d88511f60..725a19699 100644
--- a/kernel/tools/perf/tests/sw-clock.c
+++ b/kernel/tools/perf/tests/sw-clock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <unistd.h>
diff --git a/kernel/tools/perf/tests/switch-tracking.c b/kernel/tools/perf/tests/switch-tracking.c
index 2acd78555..7d3f4bf95 100644
--- a/kernel/tools/perf/tests/switch-tracking.c
+++ b/kernel/tools/perf/tests/switch-tracking.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/time.h>
 #include <sys/prctl.h>
 #include <errno.h>
diff --git a/kernel/tools/perf/tests/task-exit.c b/kernel/tools/perf/tests/task-exit.c
index f0881d0dd..bc4a7344e 100644
--- a/kernel/tools/perf/tests/task-exit.c
+++ b/kernel/tools/perf/tests/task-exit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "evlist.h"
 #include "evsel.h"
 #include "thread_map.h"
diff --git a/kernel/tools/perf/tests/tests.h b/kernel/tools/perf/tests/tests.h
index 921412a6a..2862b80bc 100644
--- a/kernel/tools/perf/tests/tests.h
+++ b/kernel/tools/perf/tests/tests.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef TESTS_H
 #define TESTS_H
 
diff --git a/kernel/tools/perf/tests/thread-map.c b/kernel/tools/perf/tests/thread-map.c
index b3423c744..dbcb6a19b 100644
--- a/kernel/tools/perf/tests/thread-map.c
+++ b/kernel/tools/perf/tests/thread-map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/kernel/tools/perf/tests/thread-mg-share.c b/kernel/tools/perf/tests/thread-mg-share.c
index b9c7f58db..b1d1bbafe 100644
--- a/kernel/tools/perf/tests/thread-mg-share.c
+++ b/kernel/tools/perf/tests/thread-mg-share.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tests.h"
 #include "machine.h"
 #include "thread.h"
diff --git a/kernel/tools/perf/tests/topology.c b/kernel/tools/perf/tests/topology.c
index 19b0561fd..a59db7c45 100644
--- a/kernel/tools/perf/tests/topology.c
+++ b/kernel/tools/perf/tests/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/tests/unit_number__scnprintf.c b/kernel/tools/perf/tests/unit_number__scnprintf.c
index 15cd1cf8c..2bb8cb003 100644
--- a/kernel/tools/perf/tests/unit_number__scnprintf.c
+++ b/kernel/tools/perf/tests/unit_number__scnprintf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
diff --git a/kernel/tools/perf/tests/vmlinux-kallsyms.c b/kernel/tools/perf/tests/vmlinux-kallsyms.c
index 86cb8868f..f6789fb02 100644
--- a/kernel/tools/perf/tests/vmlinux-kallsyms.c
+++ b/kernel/tools/perf/tests/vmlinux-kallsyms.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/rbtree.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/trace/beauty/beauty.h b/kernel/tools/perf/trace/beauty/beauty.h
index 4b58581a6..d80655cd1 100644
--- a/kernel/tools/perf/trace/beauty/beauty.h
+++ b/kernel/tools/perf/trace/beauty/beauty.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_TRACE_BEAUTY_H
 #define _PERF_TRACE_BEAUTY_H
 
diff --git a/kernel/tools/perf/trace/beauty/eventfd.c b/kernel/tools/perf/trace/beauty/eventfd.c
index b08f21eb6..5d6a477a6 100644
--- a/kernel/tools/perf/trace/beauty/eventfd.c
+++ b/kernel/tools/perf/trace/beauty/eventfd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef EFD_SEMAPHORE
 #define EFD_SEMAPHORE		1
 #endif
diff --git a/kernel/tools/perf/trace/beauty/flock.c b/kernel/tools/perf/trace/beauty/flock.c
index 74613703a..f9707f575 100644
--- a/kernel/tools/perf/trace/beauty/flock.c
+++ b/kernel/tools/perf/trace/beauty/flock.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <fcntl.h>
 
 #ifndef LOCK_MAND
diff --git a/kernel/tools/perf/trace/beauty/futex_op.c b/kernel/tools/perf/trace/beauty/futex_op.c
index bfd3359b0..61850fbc8 100644
--- a/kernel/tools/perf/trace/beauty/futex_op.c
+++ b/kernel/tools/perf/trace/beauty/futex_op.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/futex.h>
 
 #ifndef FUTEX_WAIT_BITSET
diff --git a/kernel/tools/perf/trace/beauty/mmap.c b/kernel/tools/perf/trace/beauty/mmap.c
index 754558f90..51f1cea40 100644
--- a/kernel/tools/perf/trace/beauty/mmap.c
+++ b/kernel/tools/perf/trace/beauty/mmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <uapi/linux/mman.h>
 
 static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size,
diff --git a/kernel/tools/perf/trace/beauty/mode_t.c b/kernel/tools/perf/trace/beauty/mode_t.c
index 930d8fef2..d929ad7dd 100644
--- a/kernel/tools/perf/trace/beauty/mode_t.c
+++ b/kernel/tools/perf/trace/beauty/mode_t.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/kernel/tools/perf/trace/beauty/msg_flags.c b/kernel/tools/perf/trace/beauty/msg_flags.c
index 1106c8960..c064d6aae 100644
--- a/kernel/tools/perf/trace/beauty/msg_flags.c
+++ b/kernel/tools/perf/trace/beauty/msg_flags.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/kernel/tools/perf/trace/beauty/open_flags.c b/kernel/tools/perf/trace/beauty/open_flags.c
index e359e041d..6aec6178a 100644
--- a/kernel/tools/perf/trace/beauty/open_flags.c
+++ b/kernel/tools/perf/trace/beauty/open_flags.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/kernel/tools/perf/trace/beauty/perf_event_open.c b/kernel/tools/perf/trace/beauty/perf_event_open.c
index 311f09dd7..2bafd7c99 100644
--- a/kernel/tools/perf/trace/beauty/perf_event_open.c
+++ b/kernel/tools/perf/trace/beauty/perf_event_open.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PERF_FLAG_FD_NO_GROUP
 # define PERF_FLAG_FD_NO_GROUP		(1UL << 0)
 #endif
diff --git a/kernel/tools/perf/trace/beauty/pid.c b/kernel/tools/perf/trace/beauty/pid.c
index b6d419e16..0313df342 100644
--- a/kernel/tools/perf/trace/beauty/pid.c
+++ b/kernel/tools/perf/trace/beauty/pid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 size_t syscall_arg__scnprintf_pid(char *bf, size_t size, struct syscall_arg *arg)
 {
 	int pid = arg->val;
diff --git a/kernel/tools/perf/trace/beauty/sched_policy.c b/kernel/tools/perf/trace/beauty/sched_policy.c
index 34775295b..ba5096ae7 100644
--- a/kernel/tools/perf/trace/beauty/sched_policy.c
+++ b/kernel/tools/perf/trace/beauty/sched_policy.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sched.h>
 
 /*
diff --git a/kernel/tools/perf/trace/beauty/seccomp.c b/kernel/tools/perf/trace/beauty/seccomp.c
index 356441bce..b7097fd5f 100644
--- a/kernel/tools/perf/trace/beauty/seccomp.c
+++ b/kernel/tools/perf/trace/beauty/seccomp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef SECCOMP_SET_MODE_STRICT
 #define SECCOMP_SET_MODE_STRICT 0
 #endif
diff --git a/kernel/tools/perf/trace/beauty/signum.c b/kernel/tools/perf/trace/beauty/signum.c
index fde8f2fc6..bde18a53f 100644
--- a/kernel/tools/perf/trace/beauty/signum.c
+++ b/kernel/tools/perf/trace/beauty/signum.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <signal.h>
 
 static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall_arg *arg)
diff --git a/kernel/tools/perf/trace/beauty/socket_type.c b/kernel/tools/perf/trace/beauty/socket_type.c
index 0a5ce8181..bca26aef4 100644
--- a/kernel/tools/perf/trace/beauty/socket_type.c
+++ b/kernel/tools/perf/trace/beauty/socket_type.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <sys/socket.h>
 
diff --git a/kernel/tools/perf/trace/beauty/waitid_options.c b/kernel/tools/perf/trace/beauty/waitid_options.c
index 7942724ad..8465281a0 100644
--- a/kernel/tools/perf/trace/beauty/waitid_options.c
+++ b/kernel/tools/perf/trace/beauty/waitid_options.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/kernel/tools/perf/ui/browser.c b/kernel/tools/perf/ui/browser.c
index d0c2007c3..63399af30 100644
--- a/kernel/tools/perf/ui/browser.c
+++ b/kernel/tools/perf/ui/browser.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../util.h"
 #include "../string2.h"
 #include "../config.h"
diff --git a/kernel/tools/perf/ui/browser.h b/kernel/tools/perf/ui/browser.h
index a12eff756..03e173441 100644
--- a/kernel/tools/perf/ui/browser.h
+++ b/kernel/tools/perf/ui/browser.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_BROWSER_H_
 #define _PERF_UI_BROWSER_H_ 1
 
diff --git a/kernel/tools/perf/ui/browsers/annotate.c b/kernel/tools/perf/ui/browsers/annotate.c
index 786fecaf5..8f7f59d1a 100644
--- a/kernel/tools/perf/ui/browsers/annotate.c
+++ b/kernel/tools/perf/ui/browsers/annotate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../../util/util.h"
 #include "../browser.h"
 #include "../helpline.h"
diff --git a/kernel/tools/perf/ui/browsers/header.c b/kernel/tools/perf/ui/browsers/header.c
index e2c9390ff..d75492189 100644
--- a/kernel/tools/perf/ui/browsers/header.c
+++ b/kernel/tools/perf/ui/browsers/header.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util/cache.h"
 #include "util/debug.h"
 #include "ui/browser.h"
diff --git a/kernel/tools/perf/ui/browsers/hists.c b/kernel/tools/perf/ui/browsers/hists.c
index 13dfb0a0b..628ad5f7e 100644
--- a/kernel/tools/perf/ui/browsers/hists.c
+++ b/kernel/tools/perf/ui/browsers/hists.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dirent.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/ui/browsers/hists.h b/kernel/tools/perf/ui/browsers/hists.h
index 23d6acb84..ba431777f 100644
--- a/kernel/tools/perf/ui/browsers/hists.h
+++ b/kernel/tools/perf/ui/browsers/hists.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_BROWSER_HISTS_H_
 #define _PERF_UI_BROWSER_HISTS_H_ 1
 
diff --git a/kernel/tools/perf/ui/browsers/map.c b/kernel/tools/perf/ui/browsers/map.c
index ffa5addf6..e03fa75f1 100644
--- a/kernel/tools/perf/ui/browsers/map.c
+++ b/kernel/tools/perf/ui/browsers/map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <elf.h>
 #include <inttypes.h>
 #include <sys/ttydefaults.h>
diff --git a/kernel/tools/perf/ui/browsers/map.h b/kernel/tools/perf/ui/browsers/map.h
index 2d58e4b3e..0ed7dbb3a 100644
--- a/kernel/tools/perf/ui/browsers/map.h
+++ b/kernel/tools/perf/ui/browsers/map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_MAP_BROWSER_H_
 #define _PERF_UI_MAP_BROWSER_H_ 1
 struct map;
diff --git a/kernel/tools/perf/ui/browsers/scripts.c b/kernel/tools/perf/ui/browsers/scripts.c
index ad6b6ee37..90a32ac69 100644
--- a/kernel/tools/perf/ui/browsers/scripts.c
+++ b/kernel/tools/perf/ui/browsers/scripts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <elf.h>
 #include <inttypes.h>
 #include <sys/ttydefaults.h>
diff --git a/kernel/tools/perf/ui/gtk/annotate.c b/kernel/tools/perf/ui/gtk/annotate.c
index 02176193f..fc7a2e105 100644
--- a/kernel/tools/perf/ui/gtk/annotate.c
+++ b/kernel/tools/perf/ui/gtk/annotate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "gtk.h"
 #include "util/debug.h"
 #include "util/annotate.h"
diff --git a/kernel/tools/perf/ui/gtk/browser.c b/kernel/tools/perf/ui/gtk/browser.c
index c24d91221..4820e25ac 100644
--- a/kernel/tools/perf/ui/gtk/browser.c
+++ b/kernel/tools/perf/ui/gtk/browser.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../evlist.h"
 #include "../cache.h"
 #include "../evsel.h"
diff --git a/kernel/tools/perf/ui/gtk/gtk.h b/kernel/tools/perf/ui/gtk/gtk.h
index 0a9173ff9..9846ea5c8 100644
--- a/kernel/tools/perf/ui/gtk/gtk.h
+++ b/kernel/tools/perf/ui/gtk/gtk.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_GTK_H_
 #define _PERF_GTK_H_ 1
 
diff --git a/kernel/tools/perf/ui/gtk/helpline.c b/kernel/tools/perf/ui/gtk/helpline.c
index 3388cbd12..fbf1ea9ce 100644
--- a/kernel/tools/perf/ui/gtk/helpline.c
+++ b/kernel/tools/perf/ui/gtk/helpline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <string.h>
 
diff --git a/kernel/tools/perf/ui/gtk/hists.c b/kernel/tools/perf/ui/gtk/hists.c
index e24f83957..24e1ec201 100644
--- a/kernel/tools/perf/ui/gtk/hists.c
+++ b/kernel/tools/perf/ui/gtk/hists.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../evlist.h"
 #include "../cache.h"
 #include "../evsel.h"
diff --git a/kernel/tools/perf/ui/gtk/progress.c b/kernel/tools/perf/ui/gtk/progress.c
index b656655fb..b6ad8857d 100644
--- a/kernel/tools/perf/ui/gtk/progress.c
+++ b/kernel/tools/perf/ui/gtk/progress.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 
 #include "gtk.h"
diff --git a/kernel/tools/perf/ui/gtk/setup.c b/kernel/tools/perf/ui/gtk/setup.c
index 1d57676f8..506e73b38 100644
--- a/kernel/tools/perf/ui/gtk/setup.c
+++ b/kernel/tools/perf/ui/gtk/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "gtk.h"
 #include "../../util/cache.h"
 #include "../../util/debug.h"
diff --git a/kernel/tools/perf/ui/gtk/util.c b/kernel/tools/perf/ui/gtk/util.c
index 00b91921e..7250d8101 100644
--- a/kernel/tools/perf/ui/gtk/util.c
+++ b/kernel/tools/perf/ui/gtk/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../util.h"
 #include "../../util/util.h"
 #include "../../util/debug.h"
diff --git a/kernel/tools/perf/ui/helpline.c b/kernel/tools/perf/ui/helpline.c
index 379039ab0..b3c421429 100644
--- a/kernel/tools/perf/ui/helpline.c
+++ b/kernel/tools/perf/ui/helpline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/perf/ui/helpline.h b/kernel/tools/perf/ui/helpline.h
index d52d0a1a8..8f775a053 100644
--- a/kernel/tools/perf/ui/helpline.h
+++ b/kernel/tools/perf/ui/helpline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_HELPLINE_H_
 #define _PERF_UI_HELPLINE_H_ 1
 
diff --git a/kernel/tools/perf/ui/hist.c b/kernel/tools/perf/ui/hist.c
index db79017a6..706f6f1e9 100644
--- a/kernel/tools/perf/ui/hist.c
+++ b/kernel/tools/perf/ui/hist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <math.h>
 #include <linux/compiler.h>
diff --git a/kernel/tools/perf/ui/keysyms.h b/kernel/tools/perf/ui/keysyms.h
index 65092d576..fbfac2907 100644
--- a/kernel/tools/perf/ui/keysyms.h
+++ b/kernel/tools/perf/ui/keysyms.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_KEYSYMS_H_
 #define _PERF_KEYSYMS_H_ 1
 
diff --git a/kernel/tools/perf/ui/libslang.h b/kernel/tools/perf/ui/libslang.h
index db816695a..c0686cda3 100644
--- a/kernel/tools/perf/ui/libslang.h
+++ b/kernel/tools/perf/ui/libslang.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_SLANG_H_
 #define _PERF_UI_SLANG_H_ 1
 /*
diff --git a/kernel/tools/perf/ui/progress.c b/kernel/tools/perf/ui/progress.c
index ae91c8148..b5a5df14d 100644
--- a/kernel/tools/perf/ui/progress.c
+++ b/kernel/tools/perf/ui/progress.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include "../cache.h"
 #include "progress.h"
diff --git a/kernel/tools/perf/ui/progress.h b/kernel/tools/perf/ui/progress.h
index 717d39d30..594bbe693 100644
--- a/kernel/tools/perf/ui/progress.h
+++ b/kernel/tools/perf/ui/progress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_PROGRESS_H_
 #define _PERF_UI_PROGRESS_H_ 1
 
diff --git a/kernel/tools/perf/ui/setup.c b/kernel/tools/perf/ui/setup.c
index caf1ce6f5..44fe824e9 100644
--- a/kernel/tools/perf/ui/setup.c
+++ b/kernel/tools/perf/ui/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <pthread.h>
 #include <dlfcn.h>
 
diff --git a/kernel/tools/perf/ui/stdio/hist.c b/kernel/tools/perf/ui/stdio/hist.c
index 8bdb7a500..de2810ae1 100644
--- a/kernel/tools/perf/ui/stdio/hist.c
+++ b/kernel/tools/perf/ui/stdio/hist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <linux/string.h>
 
diff --git a/kernel/tools/perf/ui/tui/helpline.c b/kernel/tools/perf/ui/tui/helpline.c
index 88f5143a5..4ca799aad 100644
--- a/kernel/tools/perf/ui/tui/helpline.c
+++ b/kernel/tools/perf/ui/tui/helpline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/perf/ui/tui/progress.c b/kernel/tools/perf/ui/tui/progress.c
index c4b99008e..236bcb620 100644
--- a/kernel/tools/perf/ui/tui/progress.c
+++ b/kernel/tools/perf/ui/tui/progress.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../cache.h"
 #include "../progress.h"
 #include "../libslang.h"
diff --git a/kernel/tools/perf/ui/tui/setup.c b/kernel/tools/perf/ui/tui/setup.c
index d9350a1da..d4ac41679 100644
--- a/kernel/tools/perf/ui/tui/setup.c
+++ b/kernel/tools/perf/ui/tui/setup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <signal.h>
 #include <stdbool.h>
diff --git a/kernel/tools/perf/ui/tui/tui.h b/kernel/tools/perf/ui/tui/tui.h
index 18961c7b6..8de06f634 100644
--- a/kernel/tools/perf/ui/tui/tui.h
+++ b/kernel/tools/perf/ui/tui/tui.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_TUI_H_
 #define _PERF_TUI_H_ 1
 
diff --git a/kernel/tools/perf/ui/tui/util.c b/kernel/tools/perf/ui/tui/util.c
index d96ad7c83..b9794d618 100644
--- a/kernel/tools/perf/ui/tui/util.c
+++ b/kernel/tools/perf/ui/tui/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../../util/util.h"
 #include <signal.h>
 #include <stdbool.h>
diff --git a/kernel/tools/perf/ui/ui.h b/kernel/tools/perf/ui/ui.h
index 4b6fb6c7a..9b6fdf06e 100644
--- a/kernel/tools/perf/ui/ui.h
+++ b/kernel/tools/perf/ui/ui.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_H_
 #define _PERF_UI_H_ 1
 
diff --git a/kernel/tools/perf/ui/util.c b/kernel/tools/perf/ui/util.c
index e3e0a963d..63bf06e80 100644
--- a/kernel/tools/perf/ui/util.c
+++ b/kernel/tools/perf/ui/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util.h"
 #include "../debug.h"
 
diff --git a/kernel/tools/perf/ui/util.h b/kernel/tools/perf/ui/util.h
index 361f08c52..5e44223b5 100644
--- a/kernel/tools/perf/ui/util.h
+++ b/kernel/tools/perf/ui/util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UI_UTIL_H_
 #define _PERF_UI_UTIL_H_ 1
 
diff --git a/kernel/tools/perf/util/PERF-VERSION-GEN b/kernel/tools/perf/util/PERF-VERSION-GEN
index 39f175075..3802cee5e 100755
--- a/kernel/tools/perf/util/PERF-VERSION-GEN
+++ b/kernel/tools/perf/util/PERF-VERSION-GEN
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 if [ $# -eq 1 ]  ; then
 	OUTPUT=$1
diff --git a/kernel/tools/perf/util/annotate.c b/kernel/tools/perf/util/annotate.c
index 4397a8b6e..aa66791b1 100644
--- a/kernel/tools/perf/util/annotate.c
+++ b/kernel/tools/perf/util/annotate.c
@@ -606,9 +606,19 @@ static struct arch *arch__find(const char *name)
 int symbol__alloc_hist(struct symbol *sym)
 {
 	struct annotation *notes = symbol__annotation(sym);
-	const size_t size = symbol__size(sym);
+	size_t size = symbol__size(sym);
 	size_t sizeof_sym_hist;
 
+	/*
+	 * Add buffer of one element for zero length symbol.
+	 * When sample is taken from first instruction of
+	 * zero length symbol, perf still resolves it and
+	 * shows symbol name in perf report and allows to
+	 * annotate it.
+	 */
+	if (size == 0)
+		size = 1;
+
 	/* Check for overflow when calculating sizeof_sym_hist */
 	if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(struct sym_hist_entry))
 		return -1;
diff --git a/kernel/tools/perf/util/annotate.h b/kernel/tools/perf/util/annotate.h
index 9ce575c25..f6ba3560d 100644
--- a/kernel/tools/perf/util/annotate.h
+++ b/kernel/tools/perf/util/annotate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_ANNOTATE_H
 #define __PERF_ANNOTATE_H
 
diff --git a/kernel/tools/perf/util/block-range.c b/kernel/tools/perf/util/block-range.c
index 7b3e1d75d..f1451c987 100644
--- a/kernel/tools/perf/util/block-range.c
+++ b/kernel/tools/perf/util/block-range.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "block-range.h"
 #include "annotate.h"
 
diff --git a/kernel/tools/perf/util/block-range.h b/kernel/tools/perf/util/block-range.h
index a8c841381..a5ba719d6 100644
--- a/kernel/tools/perf/util/block-range.h
+++ b/kernel/tools/perf/util/block-range.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_BLOCK_RANGE_H
 #define __PERF_BLOCK_RANGE_H
 
diff --git a/kernel/tools/perf/util/bpf-loader.c b/kernel/tools/perf/util/bpf-loader.c
index 4a1264c66..72c107fcb 100644
--- a/kernel/tools/perf/util/bpf-loader.c
+++ b/kernel/tools/perf/util/bpf-loader.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bpf-loader.c
  *
diff --git a/kernel/tools/perf/util/bpf-loader.h b/kernel/tools/perf/util/bpf-loader.h
index 488638678..5d3aefd6f 100644
--- a/kernel/tools/perf/util/bpf-loader.h
+++ b/kernel/tools/perf/util/bpf-loader.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2015, Wang Nan <wangnan0@huawei.com>
  * Copyright (C) 2015, Huawei Inc.
diff --git a/kernel/tools/perf/util/bpf-prologue.c b/kernel/tools/perf/util/bpf-prologue.c
index 827f9140f..29347756b 100644
--- a/kernel/tools/perf/util/bpf-prologue.c
+++ b/kernel/tools/perf/util/bpf-prologue.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * bpf-prologue.c
  *
diff --git a/kernel/tools/perf/util/bpf-prologue.h b/kernel/tools/perf/util/bpf-prologue.h
index ba5648383..c50c73580 100644
--- a/kernel/tools/perf/util/bpf-prologue.h
+++ b/kernel/tools/perf/util/bpf-prologue.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2015, He Kuang <hekuang@huawei.com>
  * Copyright (C) 2015, Huawei Inc.
diff --git a/kernel/tools/perf/util/build-id.c b/kernel/tools/perf/util/build-id.c
index c1a06fcd7..7f8553630 100644
--- a/kernel/tools/perf/util/build-id.c
+++ b/kernel/tools/perf/util/build-id.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * build-id.c
  *
diff --git a/kernel/tools/perf/util/build-id.h b/kernel/tools/perf/util/build-id.h
index c94b0dcbf..f0c565164 100644
--- a/kernel/tools/perf/util/build-id.h
+++ b/kernel/tools/perf/util/build-id.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_BUILD_ID_H_
 #define PERF_BUILD_ID_H_ 1
 
diff --git a/kernel/tools/perf/util/c++/clang-c.h b/kernel/tools/perf/util/c++/clang-c.h
index ccafcf72b..e513366f2 100644
--- a/kernel/tools/perf/util/c++/clang-c.h
+++ b/kernel/tools/perf/util/c++/clang-c.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_UTIL_CLANG_C_H
 #define PERF_UTIL_CLANG_C_H
 
diff --git a/kernel/tools/perf/util/c++/clang-test.cpp b/kernel/tools/perf/util/c++/clang-test.cpp
index 9b11e8c82..a4014d786 100644
--- a/kernel/tools/perf/util/c++/clang-test.cpp
+++ b/kernel/tools/perf/util/c++/clang-test.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "clang.h"
 #include "clang-c.h"
 #include "llvm/IR/Function.h"
diff --git a/kernel/tools/perf/util/c++/clang.cpp b/kernel/tools/perf/util/c++/clang.cpp
index 1e974152c..1bfc946e3 100644
--- a/kernel/tools/perf/util/c++/clang.cpp
+++ b/kernel/tools/perf/util/c++/clang.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * llvm C frontend for perf. Support dynamically compile C file
  *
diff --git a/kernel/tools/perf/util/c++/clang.h b/kernel/tools/perf/util/c++/clang.h
index dd8b04275..6ce33e22f 100644
--- a/kernel/tools/perf/util/c++/clang.h
+++ b/kernel/tools/perf/util/c++/clang.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_UTIL_CLANG_H
 #define PERF_UTIL_CLANG_H
 
diff --git a/kernel/tools/perf/util/cache.h b/kernel/tools/perf/util/cache.h
index 0175765c0..9f2e36ef5 100644
--- a/kernel/tools/perf/util/cache.h
+++ b/kernel/tools/perf/util/cache.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_CACHE_H
 #define __PERF_CACHE_H
 
diff --git a/kernel/tools/perf/util/callchain.c b/kernel/tools/perf/util/callchain.c
index a971caf37..6031933d8 100644
--- a/kernel/tools/perf/util/callchain.c
+++ b/kernel/tools/perf/util/callchain.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2009-2011, Frederic Weisbecker <fweisbec@gmail.com>
  *
diff --git a/kernel/tools/perf/util/callchain.h b/kernel/tools/perf/util/callchain.h
index 1ed6fc61d..f967aa47d 100644
--- a/kernel/tools/perf/util/callchain.h
+++ b/kernel/tools/perf/util/callchain.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_CALLCHAIN_H
 #define __PERF_CALLCHAIN_H
 
diff --git a/kernel/tools/perf/util/cgroup.c b/kernel/tools/perf/util/cgroup.c
index 0e77bc9e5..d9ffc1e6e 100644
--- a/kernel/tools/perf/util/cgroup.c
+++ b/kernel/tools/perf/util/cgroup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util.h"
 #include "../perf.h"
 #include <subcmd/parse-options.h>
diff --git a/kernel/tools/perf/util/cgroup.h b/kernel/tools/perf/util/cgroup.h
index d91966b97..afafc87e9 100644
--- a/kernel/tools/perf/util/cgroup.h
+++ b/kernel/tools/perf/util/cgroup.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CGROUP_H__
 #define __CGROUP_H__
 
diff --git a/kernel/tools/perf/util/cloexec.c b/kernel/tools/perf/util/cloexec.c
index 4b4f00df5..ca0fff627 100644
--- a/kernel/tools/perf/util/cloexec.c
+++ b/kernel/tools/perf/util/cloexec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <sched.h>
 #include "util.h"
diff --git a/kernel/tools/perf/util/cloexec.h b/kernel/tools/perf/util/cloexec.h
index 94a5a7d82..78216b101 100644
--- a/kernel/tools/perf/util/cloexec.h
+++ b/kernel/tools/perf/util/cloexec.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_CLOEXEC_H
 #define __PERF_CLOEXEC_H
 
diff --git a/kernel/tools/perf/util/color.c b/kernel/tools/perf/util/color.c
index dbbf89b05..39e628b89 100644
--- a/kernel/tools/perf/util/color.c
+++ b/kernel/tools/perf/util/color.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include "cache.h"
 #include "config.h"
diff --git a/kernel/tools/perf/util/color.h b/kernel/tools/perf/util/color.h
index 52122bcc3..22777b181 100644
--- a/kernel/tools/perf/util/color.h
+++ b/kernel/tools/perf/util/color.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_COLOR_H
 #define __PERF_COLOR_H
 
diff --git a/kernel/tools/perf/util/comm.c b/kernel/tools/perf/util/comm.c
index 7bc981b6b..8808570f8 100644
--- a/kernel/tools/perf/util/comm.c
+++ b/kernel/tools/perf/util/comm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "comm.h"
 #include "util.h"
 #include <errno.h>
diff --git a/kernel/tools/perf/util/comm.h b/kernel/tools/perf/util/comm.h
index 71c9c3934..3e5c438fe 100644
--- a/kernel/tools/perf/util/comm.h
+++ b/kernel/tools/perf/util/comm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_COMM_H
 #define __PERF_COMM_H
 
diff --git a/kernel/tools/perf/util/compress.h b/kernel/tools/perf/util/compress.h
index 67fd1bb7c..ecca688a2 100644
--- a/kernel/tools/perf/util/compress.h
+++ b/kernel/tools/perf/util/compress.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_COMPRESS_H
 #define PERF_COMPRESS_H
 
diff --git a/kernel/tools/perf/util/config.c b/kernel/tools/perf/util/config.c
index bc75596f9..4b893c622 100644
--- a/kernel/tools/perf/util/config.c
+++ b/kernel/tools/perf/util/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * config.c
  *
diff --git a/kernel/tools/perf/util/config.h b/kernel/tools/perf/util/config.h
index b6bb11f3f..baf82bf22 100644
--- a/kernel/tools/perf/util/config.h
+++ b/kernel/tools/perf/util/config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_CONFIG_H
 #define __PERF_CONFIG_H
 
diff --git a/kernel/tools/perf/util/counts.c b/kernel/tools/perf/util/counts.c
index c4af82ab7..03032b410 100644
--- a/kernel/tools/perf/util/counts.c
+++ b/kernel/tools/perf/util/counts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <stdlib.h>
 #include "evsel.h"
diff --git a/kernel/tools/perf/util/counts.h b/kernel/tools/perf/util/counts.h
index cb45a6aec..0d1050ccc 100644
--- a/kernel/tools/perf/util/counts.h
+++ b/kernel/tools/perf/util/counts.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_COUNTS_H
 #define __PERF_COUNTS_H
 
diff --git a/kernel/tools/perf/util/cpumap.c b/kernel/tools/perf/util/cpumap.c
index 37b3bb79e..1ccbd3342 100644
--- a/kernel/tools/perf/util/cpumap.c
+++ b/kernel/tools/perf/util/cpumap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util.h"
 #include <api/fs/fs.h>
 #include "../perf.h"
diff --git a/kernel/tools/perf/util/cpumap.h b/kernel/tools/perf/util/cpumap.h
index 6b8bff874..ed8999d1a 100644
--- a/kernel/tools/perf/util/cpumap.h
+++ b/kernel/tools/perf/util/cpumap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_CPUMAP_H
 #define __PERF_CPUMAP_H
 
diff --git a/kernel/tools/perf/util/ctype.c b/kernel/tools/perf/util/ctype.c
index 4b261c2ec..ee4c1e8ed 100644
--- a/kernel/tools/perf/util/ctype.c
+++ b/kernel/tools/perf/util/ctype.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Sane locale-independent, ASCII ctype.
  *
diff --git a/kernel/tools/perf/util/data-convert-bt.h b/kernel/tools/perf/util/data-convert-bt.h
index 9a3b587f7..821674d63 100644
--- a/kernel/tools/perf/util/data-convert-bt.h
+++ b/kernel/tools/perf/util/data-convert-bt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DATA_CONVERT_BT_H
 #define __DATA_CONVERT_BT_H
 #include "data-convert.h"
diff --git a/kernel/tools/perf/util/data-convert.h b/kernel/tools/perf/util/data-convert.h
index 5314962fe..af90b6076 100644
--- a/kernel/tools/perf/util/data-convert.h
+++ b/kernel/tools/perf/util/data-convert.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __DATA_CONVERT_H
 #define __DATA_CONVERT_H
 
diff --git a/kernel/tools/perf/util/data.c b/kernel/tools/perf/util/data.c
index 263f5a906..79192758b 100644
--- a/kernel/tools/perf/util/data.c
+++ b/kernel/tools/perf/util/data.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/kernel.h>
 #include <sys/types.h>
diff --git a/kernel/tools/perf/util/data.h b/kernel/tools/perf/util/data.h
index ae510ce16..80241ba78 100644
--- a/kernel/tools/perf/util/data.h
+++ b/kernel/tools/perf/util/data.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_DATA_H
 #define __PERF_DATA_H
 
diff --git a/kernel/tools/perf/util/debug.c b/kernel/tools/perf/util/debug.c
index a5b3777ff..dc8b53b69 100644
--- a/kernel/tools/perf/util/debug.c
+++ b/kernel/tools/perf/util/debug.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* For general debugging purposes */
 
 #include "../perf.h"
diff --git a/kernel/tools/perf/util/debug.h b/kernel/tools/perf/util/debug.h
index c818bdb1c..77445dfc5 100644
--- a/kernel/tools/perf/util/debug.h
+++ b/kernel/tools/perf/util/debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* For debugging general purposes */
 #ifndef __PERF_DEBUG_H
 #define __PERF_DEBUG_H
diff --git a/kernel/tools/perf/util/demangle-java.c b/kernel/tools/perf/util/demangle-java.c
index cb66d334f..e4c486756 100644
--- a/kernel/tools/perf/util/demangle-java.c
+++ b/kernel/tools/perf/util/demangle-java.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/kernel/tools/perf/util/demangle-java.h b/kernel/tools/perf/util/demangle-java.h
index a981c1f96..f936c8eab 100644
--- a/kernel/tools/perf/util/demangle-java.h
+++ b/kernel/tools/perf/util/demangle-java.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_DEMANGLE_JAVA
 #define __PERF_DEMANGLE_JAVA 1
 /*
diff --git a/kernel/tools/perf/util/demangle-rust.c b/kernel/tools/perf/util/demangle-rust.c
index f9dafa888..423afbbd3 100644
--- a/kernel/tools/perf/util/demangle-rust.c
+++ b/kernel/tools/perf/util/demangle-rust.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include "util.h"
 #include "debug.h"
diff --git a/kernel/tools/perf/util/demangle-rust.h b/kernel/tools/perf/util/demangle-rust.h
index 7b41ead7e..2fca618b1 100644
--- a/kernel/tools/perf/util/demangle-rust.h
+++ b/kernel/tools/perf/util/demangle-rust.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_DEMANGLE_RUST
 #define __PERF_DEMANGLE_RUST 1
 
diff --git a/kernel/tools/perf/util/dso.c b/kernel/tools/perf/util/dso.c
index b9e087fb8..00c98c968 100644
--- a/kernel/tools/perf/util/dso.c
+++ b/kernel/tools/perf/util/dso.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <asm/bug.h>
 #include <linux/kernel.h>
 #include <sys/time.h>
diff --git a/kernel/tools/perf/util/dso.h b/kernel/tools/perf/util/dso.h
index f88614167..926ff2e7f 100644
--- a/kernel/tools/perf/util/dso.h
+++ b/kernel/tools/perf/util/dso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_DSO
 #define __PERF_DSO
 
diff --git a/kernel/tools/perf/util/dump-insn.c b/kernel/tools/perf/util/dump-insn.c
index ffbdb19f0..10988d3de 100644
--- a/kernel/tools/perf/util/dump-insn.c
+++ b/kernel/tools/perf/util/dump-insn.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include "dump-insn.h"
 
diff --git a/kernel/tools/perf/util/dump-insn.h b/kernel/tools/perf/util/dump-insn.h
index 90fb11598..0e06280a8 100644
--- a/kernel/tools/perf/util/dump-insn.h
+++ b/kernel/tools/perf/util/dump-insn.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_DUMP_INSN_H
 #define __PERF_DUMP_INSN_H 1
 
diff --git a/kernel/tools/perf/util/dwarf-regs.c b/kernel/tools/perf/util/dwarf-regs.c
index c708395b3..db55eddce 100644
--- a/kernel/tools/perf/util/dwarf-regs.c
+++ b/kernel/tools/perf/util/dwarf-regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * dwarf-regs.c : Mapping of DWARF debug register numbers into register names.
  *
diff --git a/kernel/tools/perf/util/env.c b/kernel/tools/perf/util/env.c
index 9e21538c4..6276b340f 100644
--- a/kernel/tools/perf/util/env.c
+++ b/kernel/tools/perf/util/env.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "cpumap.h"
 #include "env.h"
 #include "util.h"
diff --git a/kernel/tools/perf/util/env.h b/kernel/tools/perf/util/env.h
index b164dfd2d..1eb35b190 100644
--- a/kernel/tools/perf/util/env.h
+++ b/kernel/tools/perf/util/env.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_ENV_H
 #define __PERF_ENV_H
 
diff --git a/kernel/tools/perf/util/event.c b/kernel/tools/perf/util/event.c
index 1c905ba36..fc690fecb 100644
--- a/kernel/tools/perf/util/event.c
+++ b/kernel/tools/perf/util/event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dirent.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/util/event.h b/kernel/tools/perf/util/event.h
index ee7bcc898..5524ee692 100644
--- a/kernel/tools/perf/util/event.h
+++ b/kernel/tools/perf/util/event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_RECORD_H
 #define __PERF_RECORD_H
 
diff --git a/kernel/tools/perf/util/evlist.h b/kernel/tools/perf/util/evlist.h
index bf2c4936e..c1750a400 100644
--- a/kernel/tools/perf/util/evlist.h
+++ b/kernel/tools/perf/util/evlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_EVLIST_H
 #define __PERF_EVLIST_H 1
 
diff --git a/kernel/tools/perf/util/evsel.h b/kernel/tools/perf/util/evsel.h
index dd2c4b511..b4df79d72 100644
--- a/kernel/tools/perf/util/evsel.h
+++ b/kernel/tools/perf/util/evsel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_EVSEL_H
 #define __PERF_EVSEL_H 1
 
diff --git a/kernel/tools/perf/util/evsel_fprintf.c b/kernel/tools/perf/util/evsel_fprintf.c
index 583f3a602..1fd7c2e46 100644
--- a/kernel/tools/perf/util/evsel_fprintf.c
+++ b/kernel/tools/perf/util/evsel_fprintf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/kernel/tools/perf/util/expr.h b/kernel/tools/perf/util/expr.h
index 400ef9eab..046160831 100644
--- a/kernel/tools/perf/util/expr.h
+++ b/kernel/tools/perf/util/expr.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PARSE_CTX_H
 #define PARSE_CTX_H 1
 
diff --git a/kernel/tools/perf/util/find-vdso-map.c b/kernel/tools/perf/util/find-vdso-map.c
index 95ef1cffc..d7823e350 100644
--- a/kernel/tools/perf/util/find-vdso-map.c
+++ b/kernel/tools/perf/util/find-vdso-map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 static int find_vdso_map(void **start, void **end)
 {
 	FILE *maps;
diff --git a/kernel/tools/perf/util/genelf.h b/kernel/tools/perf/util/genelf.h
index 2424bd986..de322d51c 100644
--- a/kernel/tools/perf/util/genelf.h
+++ b/kernel/tools/perf/util/genelf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __GENELF_H__
 #define __GENELF_H__
 
diff --git a/kernel/tools/perf/util/generate-cmdlist.sh b/kernel/tools/perf/util/generate-cmdlist.sh
index 0ac2037c9..9bbcec4e3 100755
--- a/kernel/tools/perf/util/generate-cmdlist.sh
+++ b/kernel/tools/perf/util/generate-cmdlist.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 echo "/* Automatically generated by $0 */
 struct cmdname_help
diff --git a/kernel/tools/perf/util/group.h b/kernel/tools/perf/util/group.h
index 116debe7a..f36c7e317 100644
--- a/kernel/tools/perf/util/group.h
+++ b/kernel/tools/perf/util/group.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GROUP_H
 #define GROUP_H 1
 
diff --git a/kernel/tools/perf/util/header.c b/kernel/tools/perf/util/header.c
index 605bbd540..ba0cea8fe 100644
--- a/kernel/tools/perf/util/header.c
+++ b/kernel/tools/perf/util/header.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include "util.h"
diff --git a/kernel/tools/perf/util/header.h b/kernel/tools/perf/util/header.h
index f7a16ee52..29ccbfdf8 100644
--- a/kernel/tools/perf/util/header.h
+++ b/kernel/tools/perf/util/header.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_HEADER_H
 #define __PERF_HEADER_H
 
diff --git a/kernel/tools/perf/util/help-unknown-cmd.c b/kernel/tools/perf/util/help-unknown-cmd.c
index 15b95300d..4f07a5ba5 100644
--- a/kernel/tools/perf/util/help-unknown-cmd.c
+++ b/kernel/tools/perf/util/help-unknown-cmd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "cache.h"
 #include "config.h"
 #include <poll.h>
diff --git a/kernel/tools/perf/util/hist.c b/kernel/tools/perf/util/hist.c
index e60d8d8ea..097473600 100644
--- a/kernel/tools/perf/util/hist.c
+++ b/kernel/tools/perf/util/hist.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util.h"
 #include "build-id.h"
 #include "hist.h"
diff --git a/kernel/tools/perf/util/hist.h b/kernel/tools/perf/util/hist.h
index e60dda26a..f6630cb95 100644
--- a/kernel/tools/perf/util/hist.h
+++ b/kernel/tools/perf/util/hist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_HIST_H
 #define __PERF_HIST_H
 
diff --git a/kernel/tools/perf/util/include/asm/asm-offsets.h b/kernel/tools/perf/util/include/asm/asm-offsets.h
index ed5389425..3aff4cf44 100644
--- a/kernel/tools/perf/util/include/asm/asm-offsets.h
+++ b/kernel/tools/perf/util/include/asm/asm-offsets.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* stub */
diff --git a/kernel/tools/perf/util/include/asm/cpufeature.h b/kernel/tools/perf/util/include/asm/cpufeature.h
index acffd5e4d..2270481c7 100644
--- a/kernel/tools/perf/util/include/asm/cpufeature.h
+++ b/kernel/tools/perf/util/include/asm/cpufeature.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef PERF_CPUFEATURE_H
 #define PERF_CPUFEATURE_H
diff --git a/kernel/tools/perf/util/include/asm/dwarf2.h b/kernel/tools/perf/util/include/asm/dwarf2.h
index afe38199e..e9876be63 100644
--- a/kernel/tools/perf/util/include/asm/dwarf2.h
+++ b/kernel/tools/perf/util/include/asm/dwarf2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef PERF_DWARF2_H
 #define PERF_DWARF2_H
diff --git a/kernel/tools/perf/util/include/asm/uaccess.h b/kernel/tools/perf/util/include/asm/uaccess.h
index d0f72b8fc..6a6f4b990 100644
--- a/kernel/tools/perf/util/include/asm/uaccess.h
+++ b/kernel/tools/perf/util/include/asm/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_ASM_UACCESS_H_
 #define _PERF_ASM_UACCESS_H_
 
diff --git a/kernel/tools/perf/util/include/dwarf-regs.h b/kernel/tools/perf/util/include/dwarf-regs.h
index 43bfd8da7..7d99a084e 100644
--- a/kernel/tools/perf/util/include/dwarf-regs.h
+++ b/kernel/tools/perf/util/include/dwarf-regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_DWARF_REGS_H_
 #define _PERF_DWARF_REGS_H_
 
diff --git a/kernel/tools/perf/util/include/linux/linkage.h b/kernel/tools/perf/util/include/linux/linkage.h
index 06387cffe..f01d48a8d 100644
--- a/kernel/tools/perf/util/include/linux/linkage.h
+++ b/kernel/tools/perf/util/include/linux/linkage.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef PERF_LINUX_LINKAGE_H_
 #define PERF_LINUX_LINKAGE_H_
diff --git a/kernel/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk b/kernel/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
index 54e961659..ddd5c4c21 100644
--- a/kernel/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
+++ b/kernel/tools/perf/util/intel-pt-decoder/gen-insn-attr-x86.awk
@@ -1,4 +1,5 @@
 #!/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 # gen-insn-attr-x86.awk: Instruction attribute table generator
 # Written by Masami Hiramatsu <mhiramat@redhat.com>
 #
diff --git a/kernel/tools/perf/util/intlist.h b/kernel/tools/perf/util/intlist.h
index 020b9ca1b..85bab8735 100644
--- a/kernel/tools/perf/util/intlist.h
+++ b/kernel/tools/perf/util/intlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_INTLIST_H
 #define __PERF_INTLIST_H
 
diff --git a/kernel/tools/perf/util/jit.h b/kernel/tools/perf/util/jit.h
index 3f42ee4d2..c2582fa9f 100644
--- a/kernel/tools/perf/util/jit.h
+++ b/kernel/tools/perf/util/jit.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __JIT_H__
 #define __JIT_H__
 
diff --git a/kernel/tools/perf/util/jitdump.c b/kernel/tools/perf/util/jitdump.c
index 9084930e1..36483db03 100644
--- a/kernel/tools/perf/util/jitdump.c
+++ b/kernel/tools/perf/util/jitdump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/kernel/tools/perf/util/kvm-stat.h b/kernel/tools/perf/util/kvm-stat.h
index d01e73592..7b1f06567 100644
--- a/kernel/tools/perf/util/kvm-stat.h
+++ b/kernel/tools/perf/util/kvm-stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_KVM_STAT_H
 #define __PERF_KVM_STAT_H
 
diff --git a/kernel/tools/perf/util/levenshtein.c b/kernel/tools/perf/util/levenshtein.c
index f616e4f65..a217ecf03 100644
--- a/kernel/tools/perf/util/levenshtein.c
+++ b/kernel/tools/perf/util/levenshtein.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "levenshtein.h"
 #include <errno.h>
 #include <stdlib.h>
diff --git a/kernel/tools/perf/util/levenshtein.h b/kernel/tools/perf/util/levenshtein.h
index b0fcb6d8a..34ca173c5 100644
--- a/kernel/tools/perf/util/levenshtein.h
+++ b/kernel/tools/perf/util/levenshtein.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_LEVENSHTEIN_H
 #define __PERF_LEVENSHTEIN_H
 
diff --git a/kernel/tools/perf/util/libunwind/arm64.c b/kernel/tools/perf/util/libunwind/arm64.c
index 6559bc586..66756e6be 100644
--- a/kernel/tools/perf/util/libunwind/arm64.c
+++ b/kernel/tools/perf/util/libunwind/arm64.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file setups defines to compile arch specific binary from the
  * generic one.
diff --git a/kernel/tools/perf/util/libunwind/x86_32.c b/kernel/tools/perf/util/libunwind/x86_32.c
index 957ffff72..c5e568188 100644
--- a/kernel/tools/perf/util/libunwind/x86_32.c
+++ b/kernel/tools/perf/util/libunwind/x86_32.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * This file setups defines to compile arch specific binary from the
  * generic one.
diff --git a/kernel/tools/perf/util/llvm-utils.c b/kernel/tools/perf/util/llvm-utils.c
index 209b0c82e..4952b429c 100644
--- a/kernel/tools/perf/util/llvm-utils.c
+++ b/kernel/tools/perf/util/llvm-utils.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015, Wang Nan <wangnan0@huawei.com>
  * Copyright (C) 2015, Huawei Inc.
diff --git a/kernel/tools/perf/util/llvm-utils.h b/kernel/tools/perf/util/llvm-utils.h
index c87a2a92a..d3ad8deb5 100644
--- a/kernel/tools/perf/util/llvm-utils.h
+++ b/kernel/tools/perf/util/llvm-utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2015, Wang Nan <wangnan0@huawei.com>
  * Copyright (C) 2015, Huawei Inc.
diff --git a/kernel/tools/perf/util/lzma.c b/kernel/tools/perf/util/lzma.c
index 4ca7c5c6c..07498eadd 100644
--- a/kernel/tools/perf/util/lzma.c
+++ b/kernel/tools/perf/util/lzma.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <lzma.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/util/machine.c b/kernel/tools/perf/util/machine.c
index df709363e..bd5d5b5e2 100644
--- a/kernel/tools/perf/util/machine.c
+++ b/kernel/tools/perf/util/machine.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dirent.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/util/machine.h b/kernel/tools/perf/util/machine.h
index 3cdb1340f..d551aa80a 100644
--- a/kernel/tools/perf/util/machine.h
+++ b/kernel/tools/perf/util/machine.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_MACHINE_H
 #define __PERF_MACHINE_H
 
diff --git a/kernel/tools/perf/util/map.c b/kernel/tools/perf/util/map.c
index bdaa0a4ed..4e7bd2750 100644
--- a/kernel/tools/perf/util/map.c
+++ b/kernel/tools/perf/util/map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "symbol.h"
 #include <errno.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/util/map.h b/kernel/tools/perf/util/map.h
index 73aacf7a7..1fb9b8589 100644
--- a/kernel/tools/perf/util/map.h
+++ b/kernel/tools/perf/util/map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_MAP_H
 #define __PERF_MAP_H
 
diff --git a/kernel/tools/perf/util/mem-events.c b/kernel/tools/perf/util/mem-events.c
index 28afe5fa8..93f74d8d3 100644
--- a/kernel/tools/perf/util/mem-events.c
+++ b/kernel/tools/perf/util/mem-events.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/perf/util/mem-events.h b/kernel/tools/perf/util/mem-events.h
index 40f72ee4f..a889ec2fa 100644
--- a/kernel/tools/perf/util/mem-events.h
+++ b/kernel/tools/perf/util/mem-events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_MEM_EVENTS_H
 #define __PERF_MEM_EVENTS_H
 
diff --git a/kernel/tools/perf/util/memswap.c b/kernel/tools/perf/util/memswap.c
index 55f7faa8d..c1317e498 100644
--- a/kernel/tools/perf/util/memswap.c
+++ b/kernel/tools/perf/util/memswap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <byteswap.h>
 #include "memswap.h"
 #include <linux/types.h>
diff --git a/kernel/tools/perf/util/memswap.h b/kernel/tools/perf/util/memswap.h
index 7d1b1c34b..1e29ff903 100644
--- a/kernel/tools/perf/util/memswap.h
+++ b/kernel/tools/perf/util/memswap.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_MEMSWAP_H_
 #define PERF_MEMSWAP_H_
 
diff --git a/kernel/tools/perf/util/ordered-events.c b/kernel/tools/perf/util/ordered-events.c
index 4de398cfb..8e09fd2d8 100644
--- a/kernel/tools/perf/util/ordered-events.c
+++ b/kernel/tools/perf/util/ordered-events.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <linux/list.h>
diff --git a/kernel/tools/perf/util/ordered-events.h b/kernel/tools/perf/util/ordered-events.h
index e11468a9a..96e5292d8 100644
--- a/kernel/tools/perf/util/ordered-events.h
+++ b/kernel/tools/perf/util/ordered-events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __ORDERED_EVENTS_H
 #define __ORDERED_EVENTS_H
 
diff --git a/kernel/tools/perf/util/parse-branch-options.c b/kernel/tools/perf/util/parse-branch-options.c
index e71fb5f31..bd779d9f4 100644
--- a/kernel/tools/perf/util/parse-branch-options.c
+++ b/kernel/tools/perf/util/parse-branch-options.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "perf.h"
 #include "util/util.h"
 #include "util/debug.h"
diff --git a/kernel/tools/perf/util/parse-branch-options.h b/kernel/tools/perf/util/parse-branch-options.h
index 6086fd90e..11d172273 100644
--- a/kernel/tools/perf/util/parse-branch-options.h
+++ b/kernel/tools/perf/util/parse-branch-options.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_PARSE_BRANCH_OPTIONS_H
 #define _PERF_PARSE_BRANCH_OPTIONS_H 1
 #include <stdint.h>
diff --git a/kernel/tools/perf/util/parse-events.c b/kernel/tools/perf/util/parse-events.c
index 39b15968e..56694e340 100644
--- a/kernel/tools/perf/util/parse-events.c
+++ b/kernel/tools/perf/util/parse-events.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/hw_breakpoint.h>
 #include <linux/err.h>
 #include <dirent.h>
diff --git a/kernel/tools/perf/util/parse-events.h b/kernel/tools/perf/util/parse-events.h
index 635135125..eed50b54b 100644
--- a/kernel/tools/perf/util/parse-events.h
+++ b/kernel/tools/perf/util/parse-events.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_PARSE_EVENTS_H
 #define __PERF_PARSE_EVENTS_H
 /*
diff --git a/kernel/tools/perf/util/parse-events.l b/kernel/tools/perf/util/parse-events.l
index dcfdafdc2..6680e4fb7 100644
--- a/kernel/tools/perf/util/parse-events.l
+++ b/kernel/tools/perf/util/parse-events.l
@@ -154,6 +154,10 @@ do {							\
 	yycolumn += yyleng;				\
 } while (0);
 
+#define USER_REJECT		\
+	yycolumn -= yyleng;	\
+	REJECT
+
 %}
 
 %x mem
@@ -335,8 +339,8 @@ r{num_raw_hex}		{ return raw(yyscanner); }
 {num_hex}		{ return value(yyscanner, 16); }
 
 {modifier_event}	{ return str(yyscanner, PE_MODIFIER_EVENT); }
-{bpf_object}		{ if (!isbpf(yyscanner)) REJECT; return str(yyscanner, PE_BPF_OBJECT); }
-{bpf_source}		{ if (!isbpf(yyscanner)) REJECT; return str(yyscanner, PE_BPF_SOURCE); }
+{bpf_object}		{ if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_OBJECT); }
+{bpf_source}		{ if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_SOURCE); }
 {name}			{ return pmu_str_check(yyscanner); }
 "/"			{ BEGIN(config); return '/'; }
 -			{ return '-'; }
diff --git a/kernel/tools/perf/util/parse-regs-options.c b/kernel/tools/perf/util/parse-regs-options.c
index 646ecf736..e6599e290 100644
--- a/kernel/tools/perf/util/parse-regs-options.c
+++ b/kernel/tools/perf/util/parse-regs-options.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "perf.h"
 #include "util/util.h"
 #include "util/debug.h"
diff --git a/kernel/tools/perf/util/parse-regs-options.h b/kernel/tools/perf/util/parse-regs-options.h
index 7d762b188..cdefb1acf 100644
--- a/kernel/tools/perf/util/parse-regs-options.h
+++ b/kernel/tools/perf/util/parse-regs-options.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_PARSE_REGS_OPTIONS_H
 #define _PERF_PARSE_REGS_OPTIONS_H 1
 struct option;
diff --git a/kernel/tools/perf/util/path.c b/kernel/tools/perf/util/path.c
index 50ec3bc87..933f5c6bf 100644
--- a/kernel/tools/perf/util/path.c
+++ b/kernel/tools/perf/util/path.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * I'm tired of doing "vsnprintf()" etc just to open a
  * file, so here's a "return static buffer with printf"
diff --git a/kernel/tools/perf/util/path.h b/kernel/tools/perf/util/path.h
index 9a276a58e..14a254ada 100644
--- a/kernel/tools/perf/util/path.h
+++ b/kernel/tools/perf/util/path.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_PATH_H
 #define _PERF_PATH_H
 
diff --git a/kernel/tools/perf/util/perf-hooks.c b/kernel/tools/perf/util/perf-hooks.c
index d55092964..4f3aa8d99 100644
--- a/kernel/tools/perf/util/perf-hooks.c
+++ b/kernel/tools/perf/util/perf-hooks.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * perf_hooks.c
  *
diff --git a/kernel/tools/perf/util/perf-hooks.h b/kernel/tools/perf/util/perf-hooks.h
index 838d5797b..27fbec62d 100644
--- a/kernel/tools/perf/util/perf-hooks.h
+++ b/kernel/tools/perf/util/perf-hooks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_UTIL_PERF_HOOKS_H
 #define PERF_UTIL_PERF_HOOKS_H
 
diff --git a/kernel/tools/perf/util/perf_regs.c b/kernel/tools/perf/util/perf_regs.c
index b2ae039ef..2acfcc527 100644
--- a/kernel/tools/perf/util/perf_regs.c
+++ b/kernel/tools/perf/util/perf_regs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include "perf_regs.h"
 #include "event.h"
diff --git a/kernel/tools/perf/util/perf_regs.h b/kernel/tools/perf/util/perf_regs.h
index 32b37d19d..c9319f8d1 100644
--- a/kernel/tools/perf/util/perf_regs.h
+++ b/kernel/tools/perf/util/perf_regs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_REGS_H
 #define __PERF_REGS_H
 
diff --git a/kernel/tools/perf/util/pmu.c b/kernel/tools/perf/util/pmu.c
index 1c4d7b4e4..b10b35a63 100644
--- a/kernel/tools/perf/util/pmu.c
+++ b/kernel/tools/perf/util/pmu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/list.h>
 #include <linux/compiler.h>
 #include <sys/types.h>
diff --git a/kernel/tools/perf/util/pmu.h b/kernel/tools/perf/util/pmu.h
index fe0de0502..eca99435f 100644
--- a/kernel/tools/perf/util/pmu.h
+++ b/kernel/tools/perf/util/pmu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PMU_H
 #define __PMU_H
 
diff --git a/kernel/tools/perf/util/print_binary.c b/kernel/tools/perf/util/print_binary.c
index e908177b9..779e35c9e 100644
--- a/kernel/tools/perf/util/print_binary.c
+++ b/kernel/tools/perf/util/print_binary.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "print_binary.h"
 #include <linux/log2.h>
 #include "sane_ctype.h"
diff --git a/kernel/tools/perf/util/print_binary.h b/kernel/tools/perf/util/print_binary.h
index da0427263..2be3075e2 100644
--- a/kernel/tools/perf/util/print_binary.h
+++ b/kernel/tools/perf/util/print_binary.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_PRINT_BINARY_H
 #define PERF_PRINT_BINARY_H
 
diff --git a/kernel/tools/perf/util/probe-event.h b/kernel/tools/perf/util/probe-event.h
index 078681d12..45b14f020 100644
--- a/kernel/tools/perf/util/probe-event.h
+++ b/kernel/tools/perf/util/probe-event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PROBE_EVENT_H
 #define _PROBE_EVENT_H
 
diff --git a/kernel/tools/perf/util/probe-file.h b/kernel/tools/perf/util/probe-file.h
index 2ca4163ab..63f29b1d2 100644
--- a/kernel/tools/perf/util/probe-file.h
+++ b/kernel/tools/perf/util/probe-file.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PROBE_FILE_H
 #define __PROBE_FILE_H
 
diff --git a/kernel/tools/perf/util/probe-finder.h b/kernel/tools/perf/util/probe-finder.h
index 27f061551..16252980f 100644
--- a/kernel/tools/perf/util/probe-finder.h
+++ b/kernel/tools/perf/util/probe-finder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PROBE_FINDER_H
 #define _PROBE_FINDER_H
 
diff --git a/kernel/tools/perf/util/pstack.c b/kernel/tools/perf/util/pstack.c
index b234a6e3d..797fe1ae2 100644
--- a/kernel/tools/perf/util/pstack.c
+++ b/kernel/tools/perf/util/pstack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Simple pointer stack
  *
diff --git a/kernel/tools/perf/util/pstack.h b/kernel/tools/perf/util/pstack.h
index ded7f2e36..8729b8be0 100644
--- a/kernel/tools/perf/util/pstack.h
+++ b/kernel/tools/perf/util/pstack.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_PSTACK_
 #define _PERF_PSTACK_
 
diff --git a/kernel/tools/perf/util/python.c b/kernel/tools/perf/util/python.c
index c129e9911..8e49d9caf 100644
--- a/kernel/tools/perf/util/python.c
+++ b/kernel/tools/perf/util/python.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <Python.h>
 #include <structmember.h>
 #include <inttypes.h>
diff --git a/kernel/tools/perf/util/quote.c b/kernel/tools/perf/util/quote.c
index 1ba892015..22eaa201a 100644
--- a/kernel/tools/perf/util/quote.c
+++ b/kernel/tools/perf/util/quote.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <stdlib.h>
 #include "strbuf.h"
diff --git a/kernel/tools/perf/util/quote.h b/kernel/tools/perf/util/quote.h
index 055ca45be..274bf26d3 100644
--- a/kernel/tools/perf/util/quote.h
+++ b/kernel/tools/perf/util/quote.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_QUOTE_H
 #define __PERF_QUOTE_H
 
diff --git a/kernel/tools/perf/util/rb_resort.h b/kernel/tools/perf/util/rb_resort.h
index 808cc4561..7d8972b33 100644
--- a/kernel/tools/perf/util/rb_resort.h
+++ b/kernel/tools/perf/util/rb_resort.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_RESORT_RB_H_
 #define _PERF_RESORT_RB_H_
 /*
diff --git a/kernel/tools/perf/util/rblist.h b/kernel/tools/perf/util/rblist.h
index ff9913b99..4c8638a22 100644
--- a/kernel/tools/perf/util/rblist.h
+++ b/kernel/tools/perf/util/rblist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_RBLIST_H
 #define __PERF_RBLIST_H
 
diff --git a/kernel/tools/perf/util/record.c b/kernel/tools/perf/util/record.c
index d91bdf5a1..1e97937b0 100644
--- a/kernel/tools/perf/util/record.c
+++ b/kernel/tools/perf/util/record.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "evlist.h"
 #include "evsel.h"
 #include "cpumap.h"
diff --git a/kernel/tools/perf/util/sane_ctype.h b/kernel/tools/perf/util/sane_ctype.h
index 4308c22c2..c2b42ff9f 100644
--- a/kernel/tools/perf/util/sane_ctype.h
+++ b/kernel/tools/perf/util/sane_ctype.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_SANE_CTYPE_H
 #define _PERF_SANE_CTYPE_H
 
diff --git a/kernel/tools/perf/util/session.c b/kernel/tools/perf/util/session.c
index 76ab0709a..da55081ae 100644
--- a/kernel/tools/perf/util/session.c
+++ b/kernel/tools/perf/util/session.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <linux/kernel.h>
diff --git a/kernel/tools/perf/util/session.h b/kernel/tools/perf/util/session.h
index 47b5e7dbc..41caa098e 100644
--- a/kernel/tools/perf/util/session.h
+++ b/kernel/tools/perf/util/session.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_SESSION_H
 #define __PERF_SESSION_H
 
diff --git a/kernel/tools/perf/util/sort.c b/kernel/tools/perf/util/sort.c
index eb3ab902a..84a33f1e9 100644
--- a/kernel/tools/perf/util/sort.c
+++ b/kernel/tools/perf/util/sort.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <regex.h>
diff --git a/kernel/tools/perf/util/sort.h b/kernel/tools/perf/util/sort.h
index f36dc4980..b2b55e514 100644
--- a/kernel/tools/perf/util/sort.h
+++ b/kernel/tools/perf/util/sort.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_SORT_H
 #define __PERF_SORT_H
 #include "../builtin.h"
diff --git a/kernel/tools/perf/util/srcline.c b/kernel/tools/perf/util/srcline.c
index ed8e8d2de..4105682af 100644
--- a/kernel/tools/perf/util/srcline.c
+++ b/kernel/tools/perf/util/srcline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/kernel/tools/perf/util/srcline.h b/kernel/tools/perf/util/srcline.h
index 7b52ba886..8e73f607d 100644
--- a/kernel/tools/perf/util/srcline.h
+++ b/kernel/tools/perf/util/srcline.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_SRCLINE_H
 #define PERF_SRCLINE_H
 
diff --git a/kernel/tools/perf/util/stat-shadow.c b/kernel/tools/perf/util/stat-shadow.c
index a04cf56d3..37363869c 100644
--- a/kernel/tools/perf/util/stat-shadow.c
+++ b/kernel/tools/perf/util/stat-shadow.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include "evsel.h"
 #include "stat.h"
diff --git a/kernel/tools/perf/util/stat.c b/kernel/tools/perf/util/stat.c
index 35e984873..c9bae5fb8 100644
--- a/kernel/tools/perf/util/stat.c
+++ b/kernel/tools/perf/util/stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <inttypes.h>
 #include <math.h>
diff --git a/kernel/tools/perf/util/stat.h b/kernel/tools/perf/util/stat.h
index eacaf958e..96326b1f9 100644
--- a/kernel/tools/perf/util/stat.h
+++ b/kernel/tools/perf/util/stat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_STATS_H
 #define __PERF_STATS_H
 
diff --git a/kernel/tools/perf/util/strbuf.c b/kernel/tools/perf/util/strbuf.c
index aafe908b8..3d1cf5bf7 100644
--- a/kernel/tools/perf/util/strbuf.c
+++ b/kernel/tools/perf/util/strbuf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "debug.h"
 #include "util.h"
 #include <linux/kernel.h>
diff --git a/kernel/tools/perf/util/strbuf.h b/kernel/tools/perf/util/strbuf.h
index 802d74337..ea94d8628 100644
--- a/kernel/tools/perf/util/strbuf.h
+++ b/kernel/tools/perf/util/strbuf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_STRBUF_H
 #define __PERF_STRBUF_H
 
diff --git a/kernel/tools/perf/util/strfilter.c b/kernel/tools/perf/util/strfilter.c
index 4dc0af669..7f3253d44 100644
--- a/kernel/tools/perf/util/strfilter.c
+++ b/kernel/tools/perf/util/strfilter.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "util.h"
 #include "string2.h"
 #include "strfilter.h"
diff --git a/kernel/tools/perf/util/strfilter.h b/kernel/tools/perf/util/strfilter.h
index cff5eda88..e0c25a40f 100644
--- a/kernel/tools/perf/util/strfilter.h
+++ b/kernel/tools/perf/util/strfilter.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_STRFILTER_H
 #define __PERF_STRFILTER_H
 /* General purpose glob matching filter */
diff --git a/kernel/tools/perf/util/string.c b/kernel/tools/perf/util/string.c
index cca53b693..aaa08ee8c 100644
--- a/kernel/tools/perf/util/string.c
+++ b/kernel/tools/perf/util/string.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "string2.h"
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/kernel/tools/perf/util/string2.h b/kernel/tools/perf/util/string2.h
index 2f619681b..ee14ca545 100644
--- a/kernel/tools/perf/util/string2.h
+++ b/kernel/tools/perf/util/string2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_STRING_H
 #define PERF_STRING_H
 
diff --git a/kernel/tools/perf/util/strlist.h b/kernel/tools/perf/util/strlist.h
index 19207e50f..d58f1e08b 100644
--- a/kernel/tools/perf/util/strlist.h
+++ b/kernel/tools/perf/util/strlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_STRLIST_H
 #define __PERF_STRLIST_H
 
diff --git a/kernel/tools/perf/util/svghelper.h b/kernel/tools/perf/util/svghelper.h
index 946fdf2db..e55338d5c 100644
--- a/kernel/tools/perf/util/svghelper.h
+++ b/kernel/tools/perf/util/svghelper.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_SVGHELPER_H
 #define __PERF_SVGHELPER_H
 
diff --git a/kernel/tools/perf/util/symbol-elf.c b/kernel/tools/perf/util/symbol-elf.c
index 9cf781f0d..2de770511 100644
--- a/kernel/tools/perf/util/symbol-elf.c
+++ b/kernel/tools/perf/util/symbol-elf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/kernel/tools/perf/util/symbol-minimal.c b/kernel/tools/perf/util/symbol-minimal.c
index 1a5aa35b0..ff48d0d49 100644
--- a/kernel/tools/perf/util/symbol-minimal.c
+++ b/kernel/tools/perf/util/symbol-minimal.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "symbol.h"
 #include "util.h"
 
diff --git a/kernel/tools/perf/util/symbol.c b/kernel/tools/perf/util/symbol.c
index 5909ee4c7..6492ef38b 100644
--- a/kernel/tools/perf/util/symbol.c
+++ b/kernel/tools/perf/util/symbol.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/kernel/tools/perf/util/symbol.h b/kernel/tools/perf/util/symbol.h
index aad99e7e1..635202259 100644
--- a/kernel/tools/perf/util/symbol.h
+++ b/kernel/tools/perf/util/symbol.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_SYMBOL
 #define __PERF_SYMBOL 1
 
diff --git a/kernel/tools/perf/util/symbol_fprintf.c b/kernel/tools/perf/util/symbol_fprintf.c
index 63694e174..6dd2cb88c 100644
--- a/kernel/tools/perf/util/symbol_fprintf.c
+++ b/kernel/tools/perf/util/symbol_fprintf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <elf.h>
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/util/syscalltbl.h b/kernel/tools/perf/util/syscalltbl.h
index e9fb8786d..c8e7e9ce0 100644
--- a/kernel/tools/perf/util/syscalltbl.h
+++ b/kernel/tools/perf/util/syscalltbl.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_SYSCALLTBL_H
 #define __PERF_SYSCALLTBL_H
 
diff --git a/kernel/tools/perf/util/target.h b/kernel/tools/perf/util/target.h
index 7381b1ca4..446aa7a56 100644
--- a/kernel/tools/perf/util/target.h
+++ b/kernel/tools/perf/util/target.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_TARGET_H
 #define _PERF_TARGET_H
 
diff --git a/kernel/tools/perf/util/term.c b/kernel/tools/perf/util/term.c
index 8f254a74d..e7aa82c06 100644
--- a/kernel/tools/perf/util/term.c
+++ b/kernel/tools/perf/util/term.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "term.h"
 #include <stdlib.h>
 #include <termios.h>
diff --git a/kernel/tools/perf/util/term.h b/kernel/tools/perf/util/term.h
index 2c06a6184..607b170a9 100644
--- a/kernel/tools/perf/util/term.h
+++ b/kernel/tools/perf/util/term.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_TERM_H
 #define __PERF_TERM_H
 
diff --git a/kernel/tools/perf/util/thread.c b/kernel/tools/perf/util/thread.c
index aee9a4210..1dbcd3c8d 100644
--- a/kernel/tools/perf/util/thread.c
+++ b/kernel/tools/perf/util/thread.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../perf.h"
 #include <errno.h>
 #include <stdlib.h>
diff --git a/kernel/tools/perf/util/thread.h b/kernel/tools/perf/util/thread.h
index cb1a5dd5c..fdcea7c0c 100644
--- a/kernel/tools/perf/util/thread.h
+++ b/kernel/tools/perf/util/thread.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_THREAD_H
 #define __PERF_THREAD_H
 
diff --git a/kernel/tools/perf/util/thread_map.c b/kernel/tools/perf/util/thread_map.c
index 63ead7b06..be0d5a736 100644
--- a/kernel/tools/perf/util/thread_map.c
+++ b/kernel/tools/perf/util/thread_map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <dirent.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/kernel/tools/perf/util/thread_map.h b/kernel/tools/perf/util/thread_map.h
index bd34d7a0b..f15803985 100644
--- a/kernel/tools/perf/util/thread_map.h
+++ b/kernel/tools/perf/util/thread_map.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_THREAD_MAP_H
 #define __PERF_THREAD_MAP_H
 
diff --git a/kernel/tools/perf/util/time-utils.c b/kernel/tools/perf/util/time-utils.c
index 5b5d0214d..81927d027 100644
--- a/kernel/tools/perf/util/time-utils.c
+++ b/kernel/tools/perf/util/time-utils.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/kernel/tools/perf/util/time-utils.h b/kernel/tools/perf/util/time-utils.h
index 8656be085..15b475c50 100644
--- a/kernel/tools/perf/util/time-utils.h
+++ b/kernel/tools/perf/util/time-utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TIME_UTILS_H_
 #define _TIME_UTILS_H_
 
diff --git a/kernel/tools/perf/util/tool.h b/kernel/tools/perf/util/tool.h
index d549e50db..2532b5580 100644
--- a/kernel/tools/perf/util/tool.h
+++ b/kernel/tools/perf/util/tool.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_TOOL_H
 #define __PERF_TOOL_H
 
diff --git a/kernel/tools/perf/util/top.h b/kernel/tools/perf/util/top.h
index 9bdfb78a9..506150a75 100644
--- a/kernel/tools/perf/util/top.h
+++ b/kernel/tools/perf/util/top.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_TOP_H
 #define __PERF_TOP_H 1
 
diff --git a/kernel/tools/perf/util/trace-event.c b/kernel/tools/perf/util/trace-event.c
index c33078067..16a776371 100644
--- a/kernel/tools/perf/util/trace-event.c
+++ b/kernel/tools/perf/util/trace-event.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/kernel/tools/perf/util/trace-event.h b/kernel/tools/perf/util/trace-event.h
index 1fbc044f9..dcbdb53dc 100644
--- a/kernel/tools/perf/util/trace-event.h
+++ b/kernel/tools/perf/util/trace-event.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_UTIL_TRACE_EVENT_H
 #define _PERF_UTIL_TRACE_EVENT_H
 
diff --git a/kernel/tools/perf/util/trigger.h b/kernel/tools/perf/util/trigger.h
index e97d7016d..370138e7e 100644
--- a/kernel/tools/perf/util/trigger.h
+++ b/kernel/tools/perf/util/trigger.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRIGGER_H_
 #define __TRIGGER_H_ 1
 
diff --git a/kernel/tools/perf/util/tsc.c b/kernel/tools/perf/util/tsc.c
index 1b741646e..bfa782421 100644
--- a/kernel/tools/perf/util/tsc.c
+++ b/kernel/tools/perf/util/tsc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <linux/types.h>
 
diff --git a/kernel/tools/perf/util/tsc.h b/kernel/tools/perf/util/tsc.h
index d5b11e2b8..e0c3af34a 100644
--- a/kernel/tools/perf/util/tsc.h
+++ b/kernel/tools/perf/util/tsc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_TSC_H
 #define __PERF_TSC_H
 
diff --git a/kernel/tools/perf/util/units.c b/kernel/tools/perf/util/units.c
index 4767ec2c5..a46762aec 100644
--- a/kernel/tools/perf/util/units.c
+++ b/kernel/tools/perf/util/units.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "units.h"
 #include <inttypes.h>
 #include <limits.h>
diff --git a/kernel/tools/perf/util/units.h b/kernel/tools/perf/util/units.h
index f02c87317..99263b6a2 100644
--- a/kernel/tools/perf/util/units.h
+++ b/kernel/tools/perf/util/units.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERF_UNIT_H
 #define PERF_UNIT_H
 
diff --git a/kernel/tools/perf/util/unwind-libdw.c b/kernel/tools/perf/util/unwind-libdw.c
index 7755a5e0f..1e9c974fa 100644
--- a/kernel/tools/perf/util/unwind-libdw.c
+++ b/kernel/tools/perf/util/unwind-libdw.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/compiler.h>
 #include <elfutils/libdw.h>
 #include <elfutils/libdwfl.h>
diff --git a/kernel/tools/perf/util/unwind-libdw.h b/kernel/tools/perf/util/unwind-libdw.h
index 4a2b269a7..0cbd2650e 100644
--- a/kernel/tools/perf/util/unwind-libdw.h
+++ b/kernel/tools/perf/util/unwind-libdw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_UNWIND_LIBDW_H
 #define __PERF_UNWIND_LIBDW_H
 
diff --git a/kernel/tools/perf/util/unwind-libunwind-local.c b/kernel/tools/perf/util/unwind-libunwind-local.c
index 672c2ada9..7a42f703e 100644
--- a/kernel/tools/perf/util/unwind-libunwind-local.c
+++ b/kernel/tools/perf/util/unwind-libunwind-local.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Post mortem Dwarf CFI based unwinding on top of regs and stack dumps.
  *
diff --git a/kernel/tools/perf/util/unwind-libunwind.c b/kernel/tools/perf/util/unwind-libunwind.c
index 8aef572d0..647a1e6b4 100644
--- a/kernel/tools/perf/util/unwind-libunwind.c
+++ b/kernel/tools/perf/util/unwind-libunwind.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "unwind.h"
 #include "thread.h"
 #include "session.h"
diff --git a/kernel/tools/perf/util/unwind.h b/kernel/tools/perf/util/unwind.h
index bfbdcc619..8a44a1569 100644
--- a/kernel/tools/perf/util/unwind.h
+++ b/kernel/tools/perf/util/unwind.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __UNWIND_H
 #define __UNWIND_H
 
diff --git a/kernel/tools/perf/util/usage.c b/kernel/tools/perf/util/usage.c
index 6cc9d9888..070d25cee 100644
--- a/kernel/tools/perf/util/usage.c
+++ b/kernel/tools/perf/util/usage.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * usage.c
  *
diff --git a/kernel/tools/perf/util/util-cxx.h b/kernel/tools/perf/util/util-cxx.h
index 0e0e019c9..80a99e458 100644
--- a/kernel/tools/perf/util/util-cxx.h
+++ b/kernel/tools/perf/util/util-cxx.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Support C++ source use utilities defined in util.h
  */
diff --git a/kernel/tools/perf/util/util.c b/kernel/tools/perf/util/util.c
index 4c360daa4..3687b7203 100644
--- a/kernel/tools/perf/util/util.c
+++ b/kernel/tools/perf/util/util.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "../perf.h"
 #include "util.h"
 #include "debug.h"
diff --git a/kernel/tools/perf/util/util.h b/kernel/tools/perf/util/util.h
index b136c2711..b52765e6d 100644
--- a/kernel/tools/perf/util/util.h
+++ b/kernel/tools/perf/util/util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef GIT_COMPAT_UTIL_H
 #define GIT_COMPAT_UTIL_H
 
diff --git a/kernel/tools/perf/util/values.c b/kernel/tools/perf/util/values.c
index 8a32bb009..4b7a303e4 100644
--- a/kernel/tools/perf/util/values.c
+++ b/kernel/tools/perf/util/values.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/kernel/tools/perf/util/values.h b/kernel/tools/perf/util/values.h
index 808ff9c73..8c41f22f4 100644
--- a/kernel/tools/perf/util/values.h
+++ b/kernel/tools/perf/util/values.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_VALUES_H
 #define __PERF_VALUES_H
 
diff --git a/kernel/tools/perf/util/vdso.c b/kernel/tools/perf/util/vdso.c
index d3c39eec8..cffcda448 100644
--- a/kernel/tools/perf/util/vdso.c
+++ b/kernel/tools/perf/util/vdso.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/kernel/tools/perf/util/vdso.h b/kernel/tools/perf/util/vdso.h
index cdc4fabfc..bc74ace60 100644
--- a/kernel/tools/perf/util/vdso.h
+++ b/kernel/tools/perf/util/vdso.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __PERF_VDSO__
 #define __PERF_VDSO__
 
diff --git a/kernel/tools/perf/util/xyarray.c b/kernel/tools/perf/util/xyarray.c
index c8f415d98..dc95154f5 100644
--- a/kernel/tools/perf/util/xyarray.c
+++ b/kernel/tools/perf/util/xyarray.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "xyarray.h"
 #include "util.h"
 #include <stdlib.h>
diff --git a/kernel/tools/perf/util/xyarray.h b/kernel/tools/perf/util/xyarray.h
index 54af60462..7ffe562e7 100644
--- a/kernel/tools/perf/util/xyarray.h
+++ b/kernel/tools/perf/util/xyarray.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PERF_XYARRAY_H_
 #define _PERF_XYARRAY_H_ 1
 
diff --git a/kernel/tools/perf/util/zlib.c b/kernel/tools/perf/util/zlib.c
index 1329d843e..008fe68d7 100644
--- a/kernel/tools/perf/util/zlib.c
+++ b/kernel/tools/perf/util/zlib.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/kernel/tools/power/cpupower/bench/Makefile b/kernel/tools/power/cpupower/bench/Makefile
index 3e59f1aa3..d79ab161c 100644
--- a/kernel/tools/power/cpupower/bench/Makefile
+++ b/kernel/tools/power/cpupower/bench/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OUTPUT := ./
 ifeq ("$(origin O)", "command line")
 ifneq ($(O),)
diff --git a/kernel/tools/power/cpupower/debug/i386/Makefile b/kernel/tools/power/cpupower/debug/i386/Makefile
index c05cc0ac8..b3f771039 100644
--- a/kernel/tools/power/cpupower/debug/i386/Makefile
+++ b/kernel/tools/power/cpupower/debug/i386/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OUTPUT=./
 ifeq ("$(origin O)", "command line")
 	OUTPUT := $(O)/
diff --git a/kernel/tools/power/cpupower/debug/kernel/Makefile b/kernel/tools/power/cpupower/debug/kernel/Makefile
index a8a6f8eec..c23e5a6ce 100644
--- a/kernel/tools/power/cpupower/debug/kernel/Makefile
+++ b/kernel/tools/power/cpupower/debug/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 obj-m	:=
 
 KDIR	:= /lib/modules/$(shell uname -r)/build
diff --git a/kernel/tools/power/cpupower/debug/x86_64/Makefile b/kernel/tools/power/cpupower/debug/x86_64/Makefile
index 1c5214526..59af84b8e 100644
--- a/kernel/tools/power/cpupower/debug/x86_64/Makefile
+++ b/kernel/tools/power/cpupower/debug/x86_64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 OUTPUT=./
 ifeq ("$(origin O)", "command line")
 	OUTPUT := $(O)/
diff --git a/kernel/tools/power/cpupower/lib/cpuidle.h b/kernel/tools/power/cpupower/lib/cpuidle.h
index 04eb3cfa6..2e10fead2 100644
--- a/kernel/tools/power/cpupower/lib/cpuidle.h
+++ b/kernel/tools/power/cpupower/lib/cpuidle.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPUPOWER_CPUIDLE_H__
 #define __CPUPOWER_CPUIDLE_H__
 
diff --git a/kernel/tools/power/cpupower/lib/cpupower.h b/kernel/tools/power/cpupower/lib/cpupower.h
index fa031fcc7..e4e4292ea 100644
--- a/kernel/tools/power/cpupower/lib/cpupower.h
+++ b/kernel/tools/power/cpupower/lib/cpupower.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPUPOWER_CPUPOWER_H__
 #define __CPUPOWER_CPUPOWER_H__
 
diff --git a/kernel/tools/power/cpupower/lib/cpupower_intern.h b/kernel/tools/power/cpupower/lib/cpupower_intern.h
index f8ec40096..92affdfbe 100644
--- a/kernel/tools/power/cpupower/lib/cpupower_intern.h
+++ b/kernel/tools/power/cpupower/lib/cpupower_intern.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define PATH_TO_CPU "/sys/devices/system/cpu/"
 #define MAX_LINE_LEN 4096
 #define SYSFS_PATH_MAX 255
diff --git a/kernel/tools/power/cpupower/utils/builtin.h b/kernel/tools/power/cpupower/utils/builtin.h
index 2284c8ea4..f7065ae60 100644
--- a/kernel/tools/power/cpupower/utils/builtin.h
+++ b/kernel/tools/power/cpupower/utils/builtin.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BUILTIN_H
 #define BUILTIN_H
 
diff --git a/kernel/tools/power/cpupower/utils/cpuidle-set.c b/kernel/tools/power/cpupower/utils/cpuidle-set.c
index 691c24d50..569f268f4 100644
--- a/kernel/tools/power/cpupower/utils/cpuidle-set.c
+++ b/kernel/tools/power/cpupower/utils/cpuidle-set.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/kernel/tools/power/cpupower/utils/helpers/amd.c b/kernel/tools/power/cpupower/utils/helpers/amd.c
index 5fd5c5b8c..bb41cdd0d 100644
--- a/kernel/tools/power/cpupower/utils/helpers/amd.c
+++ b/kernel/tools/power/cpupower/utils/helpers/amd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #if defined(__i386__) || defined(__x86_64__)
 #include <unistd.h>
 #include <errno.h>
diff --git a/kernel/tools/power/cpupower/utils/helpers/bitmask.c b/kernel/tools/power/cpupower/utils/helpers/bitmask.c
index 5c074c60f..6c7932f5b 100644
--- a/kernel/tools/power/cpupower/utils/helpers/bitmask.c
+++ b/kernel/tools/power/cpupower/utils/helpers/bitmask.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/power/cpupower/utils/helpers/bitmask.h b/kernel/tools/power/cpupower/utils/helpers/bitmask.h
index eb289df41..b98d93a44 100644
--- a/kernel/tools/power/cpupower/utils/helpers/bitmask.h
+++ b/kernel/tools/power/cpupower/utils/helpers/bitmask.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPUPOWER_BITMASK__
 #define __CPUPOWER_BITMASK__
 
diff --git a/kernel/tools/power/cpupower/utils/helpers/cpuid.c b/kernel/tools/power/cpupower/utils/helpers/cpuid.c
index 32d37c9be..732b0b41b 100644
--- a/kernel/tools/power/cpupower/utils/helpers/cpuid.c
+++ b/kernel/tools/power/cpupower/utils/helpers/cpuid.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
diff --git a/kernel/tools/power/cpupower/utils/helpers/misc.c b/kernel/tools/power/cpupower/utils/helpers/misc.c
index a5e7ddf19..80fdf55f4 100644
--- a/kernel/tools/power/cpupower/utils/helpers/misc.c
+++ b/kernel/tools/power/cpupower/utils/helpers/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #if defined(__i386__) || defined(__x86_64__)
 
 #include "helpers/helpers.h"
diff --git a/kernel/tools/power/cpupower/utils/helpers/msr.c b/kernel/tools/power/cpupower/utils/helpers/msr.c
index 31a4b24a8..ab9950748 100644
--- a/kernel/tools/power/cpupower/utils/helpers/msr.c
+++ b/kernel/tools/power/cpupower/utils/helpers/msr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #if defined(__i386__) || defined(__x86_64__)
 
 #include <fcntl.h>
diff --git a/kernel/tools/power/cpupower/utils/helpers/pci.c b/kernel/tools/power/cpupower/utils/helpers/pci.c
index 8b278983c..113f3da2a 100644
--- a/kernel/tools/power/cpupower/utils/helpers/pci.c
+++ b/kernel/tools/power/cpupower/utils/helpers/pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #if defined(__i386__) || defined(__x86_64__)
 
 #include <helpers/helpers.h>
diff --git a/kernel/tools/power/cpupower/utils/helpers/sysfs.h b/kernel/tools/power/cpupower/utils/helpers/sysfs.h
index d28f11fed..0f0b9ad97 100644
--- a/kernel/tools/power/cpupower/utils/helpers/sysfs.h
+++ b/kernel/tools/power/cpupower/utils/helpers/sysfs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __CPUPOWER_HELPERS_SYSFS_H__
 #define __CPUPOWER_HELPERS_SYSFS_H__
 
diff --git a/kernel/tools/power/cpupower/utils/version-gen.sh b/kernel/tools/power/cpupower/utils/version-gen.sh
index 5ec41c556..c70de2eab 100755
--- a/kernel/tools/power/cpupower/utils/version-gen.sh
+++ b/kernel/tools/power/cpupower/utils/version-gen.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # Script which prints out the version to use for building cpupowerutils.
 # Must be called from tools/power/cpupower/
diff --git a/kernel/tools/power/pm-graph/Makefile b/kernel/tools/power/pm-graph/Makefile
index 32f40eacd..4e1e999e7 100644
--- a/kernel/tools/power/pm-graph/Makefile
+++ b/kernel/tools/power/pm-graph/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 PREFIX		?= /usr
 DESTDIR		?=
 
diff --git a/kernel/tools/power/x86/turbostat/Makefile b/kernel/tools/power/x86/turbostat/Makefile
index 8792ad8db..a9bc914a8 100644
--- a/kernel/tools/power/x86/turbostat/Makefile
+++ b/kernel/tools/power/x86/turbostat/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC		= $(CROSS_COMPILE)gcc
 BUILD_OUTPUT	:= $(CURDIR)
 PREFIX		?= /usr
diff --git a/kernel/tools/power/x86/x86_energy_perf_policy/Makefile b/kernel/tools/power/x86/x86_energy_perf_policy/Makefile
index a711eec0c..2447b1bba 100644
--- a/kernel/tools/power/x86/x86_energy_perf_policy/Makefile
+++ b/kernel/tools/power/x86/x86_energy_perf_policy/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC		= $(CROSS_COMPILE)gcc
 BUILD_OUTPUT    := $(CURDIR)
 PREFIX		:= /usr
diff --git a/kernel/tools/scripts/Makefile.arch b/kernel/tools/scripts/Makefile.arch
index ad85b921a..78d90a249 100644
--- a/kernel/tools/scripts/Makefile.arch
+++ b/kernel/tools/scripts/Makefile.arch
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 HOSTARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
                                   -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
                                   -e /arm64/!s/arm.*/arm/ -e s/sa110/arm/ \
diff --git a/kernel/tools/scripts/Makefile.include b/kernel/tools/scripts/Makefile.include
index 1e8b6116b..654efd976 100644
--- a/kernel/tools/scripts/Makefile.include
+++ b/kernel/tools/scripts/Makefile.include
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifneq ($(O),)
 ifeq ($(origin O), command line)
 	dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
diff --git a/kernel/tools/spi/spidev_fdx.c b/kernel/tools/spi/spidev_fdx.c
index 0ea3e5129..7d2a867cd 100644
--- a/kernel/tools/spi/spidev_fdx.c
+++ b/kernel/tools/spi/spidev_fdx.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/kernel/tools/testing/fault-injection/failcmd.sh b/kernel/tools/testing/fault-injection/failcmd.sh
index 78a9ed7fe..29a6c63c5 100644
--- a/kernel/tools/testing/fault-injection/failcmd.sh
+++ b/kernel/tools/testing/fault-injection/failcmd.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # NAME
 #	failcmd.sh - run a command with injecting slab/page allocation failures
diff --git a/kernel/tools/testing/ktest/compare-ktest-sample.pl b/kernel/tools/testing/ktest/compare-ktest-sample.pl
index a373a5bff..4118eb4a8 100755
--- a/kernel/tools/testing/ktest/compare-ktest-sample.pl
+++ b/kernel/tools/testing/ktest/compare-ktest-sample.pl
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0
 
 open (IN,"ktest.pl");
 while (<IN>) {
diff --git a/kernel/tools/testing/nvdimm/Kbuild b/kernel/tools/testing/nvdimm/Kbuild
index d870520da..65368d902 100644
--- a/kernel/tools/testing/nvdimm/Kbuild
+++ b/kernel/tools/testing/nvdimm/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ldflags-y += --wrap=ioremap_wc
 ldflags-y += --wrap=memremap
 ldflags-y += --wrap=devm_ioremap_nocache
diff --git a/kernel/tools/testing/nvdimm/Makefile b/kernel/tools/testing/nvdimm/Makefile
index 3dfe024b4..c37a6a0bd 100644
--- a/kernel/tools/testing/nvdimm/Makefile
+++ b/kernel/tools/testing/nvdimm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 KDIR ?= ../../../
 
 default:
diff --git a/kernel/tools/testing/nvdimm/config_check.c b/kernel/tools/testing/nvdimm/config_check.c
index 7dc5a0af9..cac891028 100644
--- a/kernel/tools/testing/nvdimm/config_check.c
+++ b/kernel/tools/testing/nvdimm/config_check.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/bug.h>
 
 void check(void)
diff --git a/kernel/tools/testing/nvdimm/test/Kbuild b/kernel/tools/testing/nvdimm/test/Kbuild
index d32f25bba..fb3c3d7cd 100644
--- a/kernel/tools/testing/nvdimm/test/Kbuild
+++ b/kernel/tools/testing/nvdimm/test/Kbuild
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ccflags-y := -I$(src)/../../../../drivers/nvdimm/
 ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/
 
diff --git a/kernel/tools/testing/radix-tree/Makefile b/kernel/tools/testing/radix-tree/Makefile
index 6a9480c03..fa7ee369b 100644
--- a/kernel/tools/testing/radix-tree/Makefile
+++ b/kernel/tools/testing/radix-tree/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 CFLAGS += -I. -I../../include -g -O2 -Wall -D_LGPL_SOURCE -fsanitize=address
 LDFLAGS += -fsanitize=address
diff --git a/kernel/tools/testing/radix-tree/linux.c b/kernel/tools/testing/radix-tree/linux.c
index cf48c8473..6903ccf35 100644
--- a/kernel/tools/testing/radix-tree/linux.c
+++ b/kernel/tools/testing/radix-tree/linux.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/kernel/tools/testing/radix-tree/linux/gfp.h b/kernel/tools/testing/radix-tree/linux/gfp.h
index 39a0dcb94..e9fff59df 100644
--- a/kernel/tools/testing/radix-tree/linux/gfp.h
+++ b/kernel/tools/testing/radix-tree/linux/gfp.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _GFP_H
 #define _GFP_H
 
diff --git a/kernel/tools/testing/radix-tree/linux/kernel.h b/kernel/tools/testing/radix-tree/linux/kernel.h
index b21a77fdd..c3bc3f364 100644
--- a/kernel/tools/testing/radix-tree/linux/kernel.h
+++ b/kernel/tools/testing/radix-tree/linux/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _KERNEL_H
 #define _KERNEL_H
 
diff --git a/kernel/tools/testing/radix-tree/linux/percpu.h b/kernel/tools/testing/radix-tree/linux/percpu.h
index 3ea01a1a8..b2403aa74 100644
--- a/kernel/tools/testing/radix-tree/linux/percpu.h
+++ b/kernel/tools/testing/radix-tree/linux/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define DECLARE_PER_CPU(type, val) extern type val
 #define DEFINE_PER_CPU(type, val) type val
 
diff --git a/kernel/tools/testing/radix-tree/linux/preempt.h b/kernel/tools/testing/radix-tree/linux/preempt.h
index 35c5ac815..edb10302b 100644
--- a/kernel/tools/testing/radix-tree/linux/preempt.h
+++ b/kernel/tools/testing/radix-tree/linux/preempt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_PREEMPT_H
 #define __LINUX_PREEMPT_H
 
diff --git a/kernel/tools/testing/radix-tree/linux/radix-tree.h b/kernel/tools/testing/radix-tree/linux/radix-tree.h
index bf1bb231f..24f13d27a 100644
--- a/kernel/tools/testing/radix-tree/linux/radix-tree.h
+++ b/kernel/tools/testing/radix-tree/linux/radix-tree.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _TEST_RADIX_TREE_H
 #define _TEST_RADIX_TREE_H
 
diff --git a/kernel/tools/testing/radix-tree/linux/rcupdate.h b/kernel/tools/testing/radix-tree/linux/rcupdate.h
index f7129ea2a..73ed33658 100644
--- a/kernel/tools/testing/radix-tree/linux/rcupdate.h
+++ b/kernel/tools/testing/radix-tree/linux/rcupdate.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _RCUPDATE_H
 #define _RCUPDATE_H
 
diff --git a/kernel/tools/testing/radix-tree/linux/slab.h b/kernel/tools/testing/radix-tree/linux/slab.h
index e40337f41..979baeec7 100644
--- a/kernel/tools/testing/radix-tree/linux/slab.h
+++ b/kernel/tools/testing/radix-tree/linux/slab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SLAB_H
 #define SLAB_H
 
diff --git a/kernel/tools/testing/radix-tree/main.c b/kernel/tools/testing/radix-tree/main.c
index bc9a78449..257f3f8aa 100644
--- a/kernel/tools/testing/radix-tree/main.c
+++ b/kernel/tools/testing/radix-tree/main.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/kernel/tools/testing/radix-tree/regression.h b/kernel/tools/testing/radix-tree/regression.h
index e018c4816..3c8a1584e 100644
--- a/kernel/tools/testing/radix-tree/regression.h
+++ b/kernel/tools/testing/radix-tree/regression.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __REGRESSION_H__
 #define __REGRESSION_H__
 
diff --git a/kernel/tools/testing/radix-tree/regression1.c b/kernel/tools/testing/radix-tree/regression1.c
index bf97742fc..0aece092f 100644
--- a/kernel/tools/testing/radix-tree/regression1.c
+++ b/kernel/tools/testing/radix-tree/regression1.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Regression1
  * Description:
diff --git a/kernel/tools/testing/radix-tree/regression2.c b/kernel/tools/testing/radix-tree/regression2.c
index 42dd2a33e..424b91c77 100644
--- a/kernel/tools/testing/radix-tree/regression2.c
+++ b/kernel/tools/testing/radix-tree/regression2.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Regression2
  * Description:
diff --git a/kernel/tools/testing/radix-tree/regression3.c b/kernel/tools/testing/radix-tree/regression3.c
index 670c3d2ae..ace2543c3 100644
--- a/kernel/tools/testing/radix-tree/regression3.c
+++ b/kernel/tools/testing/radix-tree/regression3.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Regression3
  * Description:
diff --git a/kernel/tools/testing/radix-tree/tag_check.c b/kernel/tools/testing/radix-tree/tag_check.c
index 36dcf7d69..543181e48 100644
--- a/kernel/tools/testing/radix-tree/tag_check.c
+++ b/kernel/tools/testing/radix-tree/tag_check.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
diff --git a/kernel/tools/testing/radix-tree/test.c b/kernel/tools/testing/radix-tree/test.c
index 1a257d738..5978ab1f4 100644
--- a/kernel/tools/testing/radix-tree/test.c
+++ b/kernel/tools/testing/radix-tree/test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <assert.h>
 #include <stdio.h>
diff --git a/kernel/tools/testing/radix-tree/test.h b/kernel/tools/testing/radix-tree/test.h
index 0f8220cc6..d9c031dbe 100644
--- a/kernel/tools/testing/radix-tree/test.h
+++ b/kernel/tools/testing/radix-tree/test.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/gfp.h>
 #include <linux/types.h>
 #include <linux/radix-tree.h>
diff --git a/kernel/tools/testing/selftests/Makefile b/kernel/tools/testing/selftests/Makefile
index ff805643b..3c9c0bbe7 100644
--- a/kernel/tools/testing/selftests/Makefile
+++ b/kernel/tools/testing/selftests/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TARGETS =  bpf
 TARGETS += breakpoints
 TARGETS += capabilities
diff --git a/kernel/tools/testing/selftests/bpf/Makefile b/kernel/tools/testing/selftests/bpf/Makefile
index f4b23d697..eab7644a0 100644
--- a/kernel/tools/testing/selftests/bpf/Makefile
+++ b/kernel/tools/testing/selftests/bpf/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 LIBDIR := ../../../lib
 BPFDIR := $(LIBDIR)/bpf
 APIDIR := ../../../include/uapi
diff --git a/kernel/tools/testing/selftests/bpf/bpf_endian.h b/kernel/tools/testing/selftests/bpf/bpf_endian.h
index 74af266aa..b25595ea4 100644
--- a/kernel/tools/testing/selftests/bpf/bpf_endian.h
+++ b/kernel/tools/testing/selftests/bpf/bpf_endian.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BPF_ENDIAN__
 #define __BPF_ENDIAN__
 
diff --git a/kernel/tools/testing/selftests/bpf/bpf_helpers.h b/kernel/tools/testing/selftests/bpf/bpf_helpers.h
index b2e02bdcd..50353c105 100644
--- a/kernel/tools/testing/selftests/bpf/bpf_helpers.h
+++ b/kernel/tools/testing/selftests/bpf/bpf_helpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BPF_HELPERS_H
 #define __BPF_HELPERS_H
 
diff --git a/kernel/tools/testing/selftests/bpf/bpf_util.h b/kernel/tools/testing/selftests/bpf/bpf_util.h
index 6c53a8906..d0811b3d6 100644
--- a/kernel/tools/testing/selftests/bpf/bpf_util.h
+++ b/kernel/tools/testing/selftests/bpf/bpf_util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __BPF_UTIL__
 #define __BPF_UTIL__
 
diff --git a/kernel/tools/testing/selftests/bpf/include/uapi/linux/types.h b/kernel/tools/testing/selftests/bpf/include/uapi/linux/types.h
index 51841848f..91fa51a9c 100644
--- a/kernel/tools/testing/selftests/bpf/include/uapi/linux/types.h
+++ b/kernel/tools/testing/selftests/bpf/include/uapi/linux/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _UAPI_LINUX_TYPES_H
 #define _UAPI_LINUX_TYPES_H
 
diff --git a/kernel/tools/testing/selftests/bpf/test_kmod.sh b/kernel/tools/testing/selftests/bpf/test_kmod.sh
index 6d58cca8e..ed4774d8d 100755
--- a/kernel/tools/testing/selftests/bpf/test_kmod.sh
+++ b/kernel/tools/testing/selftests/bpf/test_kmod.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 SRC_TREE=../../../../
 
diff --git a/kernel/tools/testing/selftests/bpf/test_lpm_map.c b/kernel/tools/testing/selftests/bpf/test_lpm_map.c
index e97565243..f93a333cb 100644
--- a/kernel/tools/testing/selftests/bpf/test_lpm_map.c
+++ b/kernel/tools/testing/selftests/bpf/test_lpm_map.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Randomized tests for eBPF longest-prefix-match maps
  *
diff --git a/kernel/tools/testing/selftests/bpf/test_tag.c b/kernel/tools/testing/selftests/bpf/test_tag.c
index de409fc50..8b201895c 100644
--- a/kernel/tools/testing/selftests/bpf/test_tag.c
+++ b/kernel/tools/testing/selftests/bpf/test_tag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/kernel/tools/testing/selftests/breakpoints/Makefile b/kernel/tools/testing/selftests/breakpoints/Makefile
index 247b0a189..9ec2c78de 100644
--- a/kernel/tools/testing/selftests/breakpoints/Makefile
+++ b/kernel/tools/testing/selftests/breakpoints/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Taken from perf makefile
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
diff --git a/kernel/tools/testing/selftests/capabilities/Makefile b/kernel/tools/testing/selftests/capabilities/Makefile
index 29b8adfda..6e9d98d45 100644
--- a/kernel/tools/testing/selftests/capabilities/Makefile
+++ b/kernel/tools/testing/selftests/capabilities/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_GEN_FILES := validate_cap
 TEST_GEN_PROGS := test_execve
 
diff --git a/kernel/tools/testing/selftests/capabilities/test_execve.c b/kernel/tools/testing/selftests/capabilities/test_execve.c
index cf6778441..3ab39a61b 100644
--- a/kernel/tools/testing/selftests/capabilities/test_execve.c
+++ b/kernel/tools/testing/selftests/capabilities/test_execve.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 
 #include <cap-ng.h>
diff --git a/kernel/tools/testing/selftests/capabilities/validate_cap.c b/kernel/tools/testing/selftests/capabilities/validate_cap.c
index 694cd73d4..cdfc94268 100644
--- a/kernel/tools/testing/selftests/capabilities/validate_cap.c
+++ b/kernel/tools/testing/selftests/capabilities/validate_cap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <cap-ng.h>
 #include <linux/capability.h>
 #include <stdbool.h>
diff --git a/kernel/tools/testing/selftests/cpu-hotplug/Makefile b/kernel/tools/testing/selftests/cpu-hotplug/Makefile
index fe1f99101..d8be047ee 100644
--- a/kernel/tools/testing/selftests/cpu-hotplug/Makefile
+++ b/kernel/tools/testing/selftests/cpu-hotplug/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 TEST_PROGS := cpu-on-off-test.sh
diff --git a/kernel/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh b/kernel/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
index b18b253d7..f3a8933c1 100755
--- a/kernel/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
+++ b/kernel/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 SYSFS=
 
diff --git a/kernel/tools/testing/selftests/cpufreq/Makefile b/kernel/tools/testing/selftests/cpufreq/Makefile
index 3955cd96f..c86ca8342 100644
--- a/kernel/tools/testing/selftests/cpufreq/Makefile
+++ b/kernel/tools/testing/selftests/cpufreq/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 TEST_PROGS := main.sh
diff --git a/kernel/tools/testing/selftests/cpufreq/cpu.sh b/kernel/tools/testing/selftests/cpufreq/cpu.sh
index 8e08a83d6..39fdcdfb8 100755
--- a/kernel/tools/testing/selftests/cpufreq/cpu.sh
+++ b/kernel/tools/testing/selftests/cpufreq/cpu.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # CPU helpers
 
diff --git a/kernel/tools/testing/selftests/cpufreq/cpufreq.sh b/kernel/tools/testing/selftests/cpufreq/cpufreq.sh
index 1ed383203..b583a2fb4 100755
--- a/kernel/tools/testing/selftests/cpufreq/cpufreq.sh
+++ b/kernel/tools/testing/selftests/cpufreq/cpufreq.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 # protect against multiple inclusion
 if [ $FILE_CPUFREQ ]; then
diff --git a/kernel/tools/testing/selftests/cpufreq/governor.sh b/kernel/tools/testing/selftests/cpufreq/governor.sh
index def645103..fe37df79c 100755
--- a/kernel/tools/testing/selftests/cpufreq/governor.sh
+++ b/kernel/tools/testing/selftests/cpufreq/governor.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Test governors
 
diff --git a/kernel/tools/testing/selftests/cpufreq/main.sh b/kernel/tools/testing/selftests/cpufreq/main.sh
index 01bac76ac..d83922de9 100755
--- a/kernel/tools/testing/selftests/cpufreq/main.sh
+++ b/kernel/tools/testing/selftests/cpufreq/main.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 source cpu.sh
 source cpufreq.sh
diff --git a/kernel/tools/testing/selftests/cpufreq/module.sh b/kernel/tools/testing/selftests/cpufreq/module.sh
index 8ff2244a3..22563cd12 100755
--- a/kernel/tools/testing/selftests/cpufreq/module.sh
+++ b/kernel/tools/testing/selftests/cpufreq/module.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Modules specific tests cases
 
diff --git a/kernel/tools/testing/selftests/cpufreq/special-tests.sh b/kernel/tools/testing/selftests/cpufreq/special-tests.sh
index 58b730f23..8d40505dc 100755
--- a/kernel/tools/testing/selftests/cpufreq/special-tests.sh
+++ b/kernel/tools/testing/selftests/cpufreq/special-tests.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # Special test cases reported by people
 
diff --git a/kernel/tools/testing/selftests/drivers/gpu/drm_mm.sh b/kernel/tools/testing/selftests/drivers/gpu/drm_mm.sh
index 96dd55c92..b789dc825 100755
--- a/kernel/tools/testing/selftests/drivers/gpu/drm_mm.sh
+++ b/kernel/tools/testing/selftests/drivers/gpu/drm_mm.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs API tests for struct drm_mm (DRM range manager)
 
 if ! /sbin/modprobe -n -q test-drm_mm; then
diff --git a/kernel/tools/testing/selftests/drivers/gpu/i915.sh b/kernel/tools/testing/selftests/drivers/gpu/i915.sh
index c06d6e8a8..d3895bc71 100755
--- a/kernel/tools/testing/selftests/drivers/gpu/i915.sh
+++ b/kernel/tools/testing/selftests/drivers/gpu/i915.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs hardware independent tests for i915 (drivers/gpu/drm/i915)
 
 if ! /sbin/modprobe -q -r i915; then
diff --git a/kernel/tools/testing/selftests/efivarfs/create-read.c b/kernel/tools/testing/selftests/efivarfs/create-read.c
index 7feef1880..9674a1939 100644
--- a/kernel/tools/testing/selftests/efivarfs/create-read.c
+++ b/kernel/tools/testing/selftests/efivarfs/create-read.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/kernel/tools/testing/selftests/efivarfs/efivarfs.sh b/kernel/tools/testing/selftests/efivarfs/efivarfs.sh
index 057278448..c6d579057 100755
--- a/kernel/tools/testing/selftests/efivarfs/efivarfs.sh
+++ b/kernel/tools/testing/selftests/efivarfs/efivarfs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 efivarfs_mount=/sys/firmware/efi/efivars
 test_guid=210be57c-9849-4fc7-a635-e6382d1aec27
diff --git a/kernel/tools/testing/selftests/efivarfs/open-unlink.c b/kernel/tools/testing/selftests/efivarfs/open-unlink.c
index 4af74f733..562742d44 100644
--- a/kernel/tools/testing/selftests/efivarfs/open-unlink.c
+++ b/kernel/tools/testing/selftests/efivarfs/open-unlink.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <errno.h>
 #include <stdio.h>
 #include <stdint.h>
diff --git a/kernel/tools/testing/selftests/exec/Makefile b/kernel/tools/testing/selftests/exec/Makefile
index 2e13035df..427c41ba5 100644
--- a/kernel/tools/testing/selftests/exec/Makefile
+++ b/kernel/tools/testing/selftests/exec/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS = -Wall
 
 TEST_GEN_PROGS := execveat
diff --git a/kernel/tools/testing/selftests/filesystems/Makefile b/kernel/tools/testing/selftests/filesystems/Makefile
index 0ab11307b..13a73bf72 100644
--- a/kernel/tools/testing/selftests/filesystems/Makefile
+++ b/kernel/tools/testing/selftests/filesystems/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := dnotify_test
 all: $(TEST_PROGS)
 
diff --git a/kernel/tools/testing/selftests/filesystems/dnotify_test.c b/kernel/tools/testing/selftests/filesystems/dnotify_test.c
index 8b37b4a1e..c0a9b2d33 100644
--- a/kernel/tools/testing/selftests/filesystems/dnotify_test.c
+++ b/kernel/tools/testing/selftests/filesystems/dnotify_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE	/* needed to get the defines */
 #include <fcntl.h>	/* in glibc 2.2 this has the needed
 				   values defined */
diff --git a/kernel/tools/testing/selftests/firmware/fw_fallback.sh b/kernel/tools/testing/selftests/firmware/fw_fallback.sh
index 8f511035f..a52a3bab5 100755
--- a/kernel/tools/testing/selftests/firmware/fw_fallback.sh
+++ b/kernel/tools/testing/selftests/firmware/fw_fallback.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # This validates that the kernel will fall back to using the fallback mechanism
 # to load firmware it can't find on disk itself. We must request a firmware
 # that the kernel won't find, and any installed helper (e.g. udev) also
diff --git a/kernel/tools/testing/selftests/firmware/fw_filesystem.sh b/kernel/tools/testing/selftests/firmware/fw_filesystem.sh
index 7d8fd2e36..62f2d6f54 100755
--- a/kernel/tools/testing/selftests/firmware/fw_filesystem.sh
+++ b/kernel/tools/testing/selftests/firmware/fw_filesystem.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # This validates that the kernel will load firmware out of its list of
 # firmware locations on disk. Since the user helper does similar work,
 # we reset the custom load directory to a location the user helper doesn't
diff --git a/kernel/tools/testing/selftests/ftrace/Makefile b/kernel/tools/testing/selftests/ftrace/Makefile
index a8a5e2185..cd1f5b3a7 100644
--- a/kernel/tools/testing/selftests/ftrace/Makefile
+++ b/kernel/tools/testing/selftests/ftrace/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 TEST_PROGS := ftracetest
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic2.tc b/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic2.tc
index ebfce83f3..531e47236 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic2.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic2.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Basic test for tracers
 # flags: instance
 test -f available_tracers
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic3.tc b/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic3.tc
index 9e33f8418..58a2506f7 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic3.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/00basic/basic3.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Basic trace clock test
 # flags: instance
 test -f trace_clock
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/kernel/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
index 283b45ecb..6ff851a75 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/event/event-enable.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event tracing - enable/disable with event level files
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/kernel/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
index 96c1a95be..cc14feec6 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/event/event-pid.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event tracing - restricts events based on pid
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/kernel/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
index b8fe2e5b9..85094904a 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event tracing - enable/disable with subsystem level files
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/kernel/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
index 15e2d3fe1..cc1cf4d30 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event tracing - enable/disable with top level files
 
 do_reset() {
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc
index 15c2dba06..45df74788 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - function graph filters with stack tracer
 
 # Make sure that function graph filtering works, and is not
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc
index 0ab218961..0387e22e7 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - function graph filters
 
 # Make sure that function graph filtering works
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
index 8095e122d..589d52b21 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - function glob filters
 
 # Make sure that function glob matching filter works.
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
index bab5ff7c6..78524fcc2 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - function pid filters
 
 # Make sure that function pid matching filter works.
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
index 77dfb6b48..9d4afcca1 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - test for function event triggers
 # flags: instance
 #
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc
index 7808336d6..fe0dc5a7e 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - function profiler with function tracing
 
 # There was a bug after a rewrite of the ftrace infrastructure that
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc
index 113b4d9bc..5ad723724 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - test reading of set_ftrace_filter
 #
 # The set_ftrace_filter file of ftrace is used to list functions as well as
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc
index 7a9ab4ff8..cdc92a371 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: ftrace - test for function traceon/off triggers
 # flags: instance
 #
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc b/kernel/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc
index 8a353314d..d7f48b55d 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/instances/instance-event.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Test creation and deletion of trace instances while setting an event
 
 if [ ! -d instances ] ; then
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/instances/instance.tc b/kernel/tools/testing/selftests/ftrace/test.d/instances/instance.tc
index 1e1abe0ad..ddda62203 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/instances/instance.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/instances/instance.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Test creation and deletion of trace instances
 
 if [ ! -d instances ] ; then
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc
index c3843ed49..4604d2103 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobe dynamic event - adding and removing
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
index 74507db8b..0e6f415c6 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobe dynamic event - busy event check
 
 [ -f kprobe_events ] || exit_unsupported
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc
index 64949d4ed..679bbd23b 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobe dynamic event with arguments
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
index c75faefb4..17d33ba19 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobes event arguments with types
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc
index b9302cc82..2724a1068 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_eventname.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobe event auto/manual naming
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
index d6f2f4965..cc4cac0e6 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobe dynamic event with function tracer
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc
index 6d634e4b7..1e9f75f7a 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kprobe dynamic event - probing module
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc
index 0d0954625..f1825bdbe 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kretprobe dynamic event with arguments
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc
index 7ec6f2639..7c0290684 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Kretprobe dynamic event with maxactive
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc
index a4fd4c851..bb16cf91f 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: Register/unregister many kprobe events
 
 [ -f kprobe_events ] || exit_unsupported # this is configurable
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc
index c5435adfd..839ac4320 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test event enable/disable trigger
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc
index 48849a8d5..66873c4b1 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test trigger filter
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
index b7f86d10b..4237b3276 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test histogram modifiers
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
index fb66f7d93..d24e2b8bd 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test histogram trigger
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
index f9153087d..4c0774fff 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test multiple histogram triggers
 # flags: instance
 
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc
index ed94f0c4e..3fc6321e0 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test snapshot-trigger
 
 do_reset() {
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc
index 9fa23b085..3652824f8 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test stacktrace-trigger
 
 do_reset() {
diff --git a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc
index 87648e5f9..6d9051cdf 100644
--- a/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc
+++ b/kernel/tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # description: event trigger - test traceon/off trigger
 
 do_reset() {
diff --git a/kernel/tools/testing/selftests/futex/Makefile b/kernel/tools/testing/selftests/futex/Makefile
index f0c0369cc..cea4adcd4 100644
--- a/kernel/tools/testing/selftests/futex/Makefile
+++ b/kernel/tools/testing/selftests/futex/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 SUBDIRS := functional
 
 TEST_PROGS := run.sh
diff --git a/kernel/tools/testing/selftests/futex/functional/Makefile b/kernel/tools/testing/selftests/futex/functional/Makefile
index a648e7a6c..ff8feca49 100644
--- a/kernel/tools/testing/selftests/futex/functional/Makefile
+++ b/kernel/tools/testing/selftests/futex/functional/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 INCLUDES := -I../include -I../../
 CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES)
 LDFLAGS := $(LDFLAGS) -pthread -lrt
diff --git a/kernel/tools/testing/selftests/gpio/Makefile b/kernel/tools/testing/selftests/gpio/Makefile
index 298929df9..1bbb47565 100644
--- a/kernel/tools/testing/selftests/gpio/Makefile
+++ b/kernel/tools/testing/selftests/gpio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 
 TEST_PROGS := gpio-mockup.sh
 TEST_FILES := gpio-mockup-sysfs.sh $(BINARIES)
diff --git a/kernel/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh b/kernel/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh
index 085d7a398..dd269d877 100755
--- a/kernel/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh
+++ b/kernel/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh
@@ -1,4 +1,5 @@
 
+# SPDX-License-Identifier: GPL-2.0
 is_consistent()
 {
 	val=
diff --git a/kernel/tools/testing/selftests/gpio/gpio-mockup.sh b/kernel/tools/testing/selftests/gpio/gpio-mockup.sh
index b183439e0..183fb932e 100755
--- a/kernel/tools/testing/selftests/gpio/gpio-mockup.sh
+++ b/kernel/tools/testing/selftests/gpio/gpio-mockup.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 #exit status
 #1: run as non-root user
diff --git a/kernel/tools/testing/selftests/ia64/Makefile b/kernel/tools/testing/selftests/ia64/Makefile
index 2b3de2d3e..4bce1a84b 100644
--- a/kernel/tools/testing/selftests/ia64/Makefile
+++ b/kernel/tools/testing/selftests/ia64/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := aliasing-test
 
 all: $(TEST_PROGS)
diff --git a/kernel/tools/testing/selftests/intel_pstate/Makefile b/kernel/tools/testing/selftests/intel_pstate/Makefile
index a97e24edd..5a3f7d37e 100644
--- a/kernel/tools/testing/selftests/intel_pstate/Makefile
+++ b/kernel/tools/testing/selftests/intel_pstate/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE
 LDLIBS := $(LDLIBS) -lm
 
diff --git a/kernel/tools/testing/selftests/intel_pstate/aperf.c b/kernel/tools/testing/selftests/intel_pstate/aperf.c
index cd72f3dc8..d21edea9c 100644
--- a/kernel/tools/testing/selftests/intel_pstate/aperf.c
+++ b/kernel/tools/testing/selftests/intel_pstate/aperf.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <math.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/kernel/tools/testing/selftests/intel_pstate/msr.c b/kernel/tools/testing/selftests/intel_pstate/msr.c
index abbbfc84d..88fdd2a4b 100644
--- a/kernel/tools/testing/selftests/intel_pstate/msr.c
+++ b/kernel/tools/testing/selftests/intel_pstate/msr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <math.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/kernel/tools/testing/selftests/intel_pstate/run.sh b/kernel/tools/testing/selftests/intel_pstate/run.sh
index d3ab48f91..c670359be 100755
--- a/kernel/tools/testing/selftests/intel_pstate/run.sh
+++ b/kernel/tools/testing/selftests/intel_pstate/run.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #
 # This test runs on Intel x86 based hardware which support the intel_pstate
 # driver.  The test checks the frequency settings from the maximum turbo
diff --git a/kernel/tools/testing/selftests/ipc/Makefile b/kernel/tools/testing/selftests/ipc/Makefile
index 30ef4c7f5..1c4448a84 100644
--- a/kernel/tools/testing/selftests/ipc/Makefile
+++ b/kernel/tools/testing/selftests/ipc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
 ifeq ($(ARCH),i386)
diff --git a/kernel/tools/testing/selftests/ipc/msgque.c b/kernel/tools/testing/selftests/ipc/msgque.c
index 1b2ce334b..ee9382bdf 100644
--- a/kernel/tools/testing/selftests/ipc/msgque.c
+++ b/kernel/tools/testing/selftests/ipc/msgque.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/kernel/tools/testing/selftests/kcmp/kcmp_test.c b/kernel/tools/testing/selftests/kcmp/kcmp_test.c
index 73684c4a1..6ea7b9f37 100644
--- a/kernel/tools/testing/selftests/kcmp/kcmp_test.c
+++ b/kernel/tools/testing/selftests/kcmp/kcmp_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 
 #include <stdio.h>
diff --git a/kernel/tools/testing/selftests/lib.mk b/kernel/tools/testing/selftests/lib.mk
index f65886af7..5bef05d6b 100644
--- a/kernel/tools/testing/selftests/lib.mk
+++ b/kernel/tools/testing/selftests/lib.mk
@@ -31,7 +31,11 @@ define RUN_TESTS
 			echo "selftests: Warning: file $$BASENAME_TEST is not executable, correct this.";\
 			echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \
 		else					\
-			cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests:  $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\
+		if [ "X$(summary)" != "X" ]; then		\
+				cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests:  $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\
+			else				\
+				cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests:  $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\
+			fi;				\
 		fi;					\
 	done;
 endef
diff --git a/kernel/tools/testing/selftests/lib/bitmap.sh b/kernel/tools/testing/selftests/lib/bitmap.sh
index b073c22a3..4dee4d2a8 100755
--- a/kernel/tools/testing/selftests/lib/bitmap.sh
+++ b/kernel/tools/testing/selftests/lib/bitmap.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs bitmap infrastructure tests using test_bitmap kernel module
 if ! /sbin/modprobe -q -n test_bitmap; then
 	echo "bitmap: [SKIP]"
diff --git a/kernel/tools/testing/selftests/lib/prime_numbers.sh b/kernel/tools/testing/selftests/lib/prime_numbers.sh
index da4cbcd76..b363994e5 100755
--- a/kernel/tools/testing/selftests/lib/prime_numbers.sh
+++ b/kernel/tools/testing/selftests/lib/prime_numbers.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Checks fast/slow prime_number generation for inconsistencies
 
 if ! /sbin/modprobe -q -r prime_numbers; then
diff --git a/kernel/tools/testing/selftests/lib/printf.sh b/kernel/tools/testing/selftests/lib/printf.sh
index cbf3b124b..0c37377fd 100755
--- a/kernel/tools/testing/selftests/lib/printf.sh
+++ b/kernel/tools/testing/selftests/lib/printf.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs printf infrastructure using test_printf kernel module
 if ! /sbin/modprobe -q -n test_printf; then
 	echo "printf: [SKIP]"
diff --git a/kernel/tools/testing/selftests/locking/ww_mutex.sh b/kernel/tools/testing/selftests/locking/ww_mutex.sh
index 6905da965..2c3d6b187 100644
--- a/kernel/tools/testing/selftests/locking/ww_mutex.sh
+++ b/kernel/tools/testing/selftests/locking/ww_mutex.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs API tests for struct ww_mutex (Wait/Wound mutexes)
 
 if /sbin/modprobe -q test-ww_mutex; then
diff --git a/kernel/tools/testing/selftests/media_tests/Makefile b/kernel/tools/testing/selftests/media_tests/Makefile
index 6b34a0199..be5bd4ffb 100644
--- a/kernel/tools/testing/selftests/media_tests/Makefile
+++ b/kernel/tools/testing/selftests/media_tests/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := media_device_test media_device_open video_device_test
 all: $(TEST_PROGS)
 
diff --git a/kernel/tools/testing/selftests/media_tests/bind_unbind_sample.sh b/kernel/tools/testing/selftests/media_tests/bind_unbind_sample.sh
index 9f362f106..0101c1ec4 100755
--- a/kernel/tools/testing/selftests/media_tests/bind_unbind_sample.sh
+++ b/kernel/tools/testing/selftests/media_tests/bind_unbind_sample.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 # Find device number in /sys/bus/usb/drivers/drivername
 # Edit this file to update the driver numer and name
 # Example test for uvcvideo driver
diff --git a/kernel/tools/testing/selftests/media_tests/open_loop_test.sh b/kernel/tools/testing/selftests/media_tests/open_loop_test.sh
index dcd3c17ef..d4c0179bb 100755
--- a/kernel/tools/testing/selftests/media_tests/open_loop_test.sh
+++ b/kernel/tools/testing/selftests/media_tests/open_loop_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
  i=0
 file=/dev/media$1
  while :; do
diff --git a/kernel/tools/testing/selftests/membarrier/membarrier_test.c b/kernel/tools/testing/selftests/membarrier/membarrier_test.c
index 21399fcf1..9e674d951 100644
--- a/kernel/tools/testing/selftests/membarrier/membarrier_test.c
+++ b/kernel/tools/testing/selftests/membarrier/membarrier_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <linux/membarrier.h>
 #include <syscall.h>
diff --git a/kernel/tools/testing/selftests/memfd/Makefile b/kernel/tools/testing/selftests/memfd/Makefile
index bc9d02d61..3926a0409 100644
--- a/kernel/tools/testing/selftests/memfd/Makefile
+++ b/kernel/tools/testing/selftests/memfd/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS += -D_FILE_OFFSET_BITS=64
 CFLAGS += -I../../../../include/uapi/
 CFLAGS += -I../../../../include/
diff --git a/kernel/tools/testing/selftests/memfd/fuse_mnt.c b/kernel/tools/testing/selftests/memfd/fuse_mnt.c
index feacf1280..6936f2a00 100644
--- a/kernel/tools/testing/selftests/memfd/fuse_mnt.c
+++ b/kernel/tools/testing/selftests/memfd/fuse_mnt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * memfd test file-system
  * This file uses FUSE to create a dummy file-system with only one file /memfd.
diff --git a/kernel/tools/testing/selftests/memfd/fuse_test.c b/kernel/tools/testing/selftests/memfd/fuse_test.c
index 7f3617274..1ccb7a3eb 100644
--- a/kernel/tools/testing/selftests/memfd/fuse_test.c
+++ b/kernel/tools/testing/selftests/memfd/fuse_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * memfd GUP test-case
  * This tests memfd interactions with get_user_pages(). We require the
diff --git a/kernel/tools/testing/selftests/memfd/memfd_test.c b/kernel/tools/testing/selftests/memfd/memfd_test.c
index f94c6d1fb..845e5f67b 100644
--- a/kernel/tools/testing/selftests/memfd/memfd_test.c
+++ b/kernel/tools/testing/selftests/memfd/memfd_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #define __EXPORTED_HEADERS__
 
diff --git a/kernel/tools/testing/selftests/memfd/run_fuse_test.sh b/kernel/tools/testing/selftests/memfd/run_fuse_test.sh
index 69b930e1e..407df68df 100755
--- a/kernel/tools/testing/selftests/memfd/run_fuse_test.sh
+++ b/kernel/tools/testing/selftests/memfd/run_fuse_test.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 if test -d "./mnt" ; then
 	fusermount -u ./mnt
diff --git a/kernel/tools/testing/selftests/memory-hotplug/Makefile b/kernel/tools/testing/selftests/memory-hotplug/Makefile
index afb2624c7..23db11c94 100644
--- a/kernel/tools/testing/selftests/memory-hotplug/Makefile
+++ b/kernel/tools/testing/selftests/memory-hotplug/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 include ../lib.mk
diff --git a/kernel/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh b/kernel/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
index 35025ce9c..ae2c790d0 100755
--- a/kernel/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
+++ b/kernel/tools/testing/selftests/memory-hotplug/mem-on-off-test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 
 SYSFS=
 
diff --git a/kernel/tools/testing/selftests/mount/Makefile b/kernel/tools/testing/selftests/mount/Makefile
index 9093d7ffe..e094f71c6 100644
--- a/kernel/tools/testing/selftests/mount/Makefile
+++ b/kernel/tools/testing/selftests/mount/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for mount selftests.
 CFLAGS = -Wall \
          -O2
diff --git a/kernel/tools/testing/selftests/mount/unprivileged-remount-test.c b/kernel/tools/testing/selftests/mount/unprivileged-remount-test.c
index 517785052..584dc6bc3 100644
--- a/kernel/tools/testing/selftests/mount/unprivileged-remount-test.c
+++ b/kernel/tools/testing/selftests/mount/unprivileged-remount-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <sched.h>
 #include <stdio.h>
diff --git a/kernel/tools/testing/selftests/mqueue/Makefile b/kernel/tools/testing/selftests/mqueue/Makefile
index 152823b6c..743d3f9e5 100644
--- a/kernel/tools/testing/selftests/mqueue/Makefile
+++ b/kernel/tools/testing/selftests/mqueue/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS += -O2
 LDLIBS = -lrt -lpthread -lpopt
 TEST_GEN_PROGS := mq_open_tests mq_perf_tests
diff --git a/kernel/tools/testing/selftests/net/Makefile b/kernel/tools/testing/selftests/net/Makefile
index d86bca991..500c74db7 100644
--- a/kernel/tools/testing/selftests/net/Makefile
+++ b/kernel/tools/testing/selftests/net/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for net selftests
 
 CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g
diff --git a/kernel/tools/testing/selftests/net/netdevice.sh b/kernel/tools/testing/selftests/net/netdevice.sh
index 90cb903c3..903679e0f 100755
--- a/kernel/tools/testing/selftests/net/netdevice.sh
+++ b/kernel/tools/testing/selftests/net/netdevice.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # This test is for checking network interface
 # For the moment it tests only ethernet interface (but wifi could be easily added)
diff --git a/kernel/tools/testing/selftests/net/reuseport_bpf_cpu.c b/kernel/tools/testing/selftests/net/reuseport_bpf_cpu.c
index b23d6f54d..2d6461747 100644
--- a/kernel/tools/testing/selftests/net/reuseport_bpf_cpu.c
+++ b/kernel/tools/testing/selftests/net/reuseport_bpf_cpu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Test functionality of BPF filters with SO_REUSEPORT.  This program creates
  * an SO_REUSEPORT receiver group containing one socket per CPU core. It then
diff --git a/kernel/tools/testing/selftests/net/reuseport_bpf_numa.c b/kernel/tools/testing/selftests/net/reuseport_bpf_numa.c
index 6f20bc9ff..365c32e84 100644
--- a/kernel/tools/testing/selftests/net/reuseport_bpf_numa.c
+++ b/kernel/tools/testing/selftests/net/reuseport_bpf_numa.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Test functionality of BPF filters with SO_REUSEPORT. Same test as
  * in reuseport_bpf_cpu, only as one socket per NUMA node.
diff --git a/kernel/tools/testing/selftests/net/reuseport_dualstack.c b/kernel/tools/testing/selftests/net/reuseport_dualstack.c
index 90958aaaa..fe3230c55 100644
--- a/kernel/tools/testing/selftests/net/reuseport_dualstack.c
+++ b/kernel/tools/testing/selftests/net/reuseport_dualstack.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * It is possible to use SO_REUSEPORT to open multiple sockets bound to
  * equivalent local addresses using AF_INET and AF_INET6 at the same time.  If
diff --git a/kernel/tools/testing/selftests/net/run_afpackettests b/kernel/tools/testing/selftests/net/run_afpackettests
index 5246e782d..21fe149e3 100755
--- a/kernel/tools/testing/selftests/net/run_afpackettests
+++ b/kernel/tools/testing/selftests/net/run_afpackettests
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 if [ $(id -u) != 0 ]; then
 	echo $msg must be run as root >&2
diff --git a/kernel/tools/testing/selftests/net/run_netsocktests b/kernel/tools/testing/selftests/net/run_netsocktests
index 16058bbea..b093f39c2 100755
--- a/kernel/tools/testing/selftests/net/run_netsocktests
+++ b/kernel/tools/testing/selftests/net/run_netsocktests
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 echo "--------------------"
 echo "running socket test"
diff --git a/kernel/tools/testing/selftests/net/socket.c b/kernel/tools/testing/selftests/net/socket.c
index 0f227f2f9..afca1ead6 100644
--- a/kernel/tools/testing/selftests/net/socket.c
+++ b/kernel/tools/testing/selftests/net/socket.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/kernel/tools/testing/selftests/net/test_bpf.sh b/kernel/tools/testing/selftests/net/test_bpf.sh
index 8b29796d4..65677909c 100755
--- a/kernel/tools/testing/selftests/net/test_bpf.sh
+++ b/kernel/tools/testing/selftests/net/test_bpf.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs bpf test using test_bpf kernel module
 
 if /sbin/modprobe -q test_bpf ; then
diff --git a/kernel/tools/testing/selftests/networking/timestamping/Makefile b/kernel/tools/testing/selftests/networking/timestamping/Makefile
index 92fb8ee91..a728040ed 100644
--- a/kernel/tools/testing/selftests/networking/timestamping/Makefile
+++ b/kernel/tools/testing/selftests/networking/timestamping/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS += -I../../../../../usr/include
 
 TEST_PROGS := hwtstamp_config rxtimestamp timestamping txtimestamp
diff --git a/kernel/tools/testing/selftests/networking/timestamping/hwtstamp_config.c b/kernel/tools/testing/selftests/networking/timestamping/hwtstamp_config.c
index e8b685a7f..e1fdee841 100644
--- a/kernel/tools/testing/selftests/networking/timestamping/hwtstamp_config.c
+++ b/kernel/tools/testing/selftests/networking/timestamping/hwtstamp_config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Test program for SIOC{G,S}HWTSTAMP
  * Copyright 2013 Solarflare Communications
  * Author: Ben Hutchings
diff --git a/kernel/tools/testing/selftests/nsfs/owner.c b/kernel/tools/testing/selftests/nsfs/owner.c
index 437205f8b..96a976c74 100644
--- a/kernel/tools/testing/selftests/nsfs/owner.c
+++ b/kernel/tools/testing/selftests/nsfs/owner.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <sched.h>
 #include <unistd.h>
diff --git a/kernel/tools/testing/selftests/nsfs/pidns.c b/kernel/tools/testing/selftests/nsfs/pidns.c
index ae3a0d68e..1182d4e43 100644
--- a/kernel/tools/testing/selftests/nsfs/pidns.c
+++ b/kernel/tools/testing/selftests/nsfs/pidns.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <sched.h>
 #include <unistd.h>
diff --git a/kernel/tools/testing/selftests/powerpc/Makefile b/kernel/tools/testing/selftests/powerpc/Makefile
index 72c3ac232..f6b133873 100644
--- a/kernel/tools/testing/selftests/powerpc/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for powerpc selftests
 
 # ARCH can be overridden by the user for cross compiling
diff --git a/kernel/tools/testing/selftests/powerpc/benchmarks/Makefile b/kernel/tools/testing/selftests/powerpc/benchmarks/Makefile
index fb96a89bd..a35058e37 100644
--- a/kernel/tools/testing/selftests/powerpc/benchmarks/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/benchmarks/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_GEN_PROGS := gettimeofday context_switch mmap_bench futex_bench null_syscall
 
 CFLAGS += -O2
diff --git a/kernel/tools/testing/selftests/powerpc/cache_shape/Makefile b/kernel/tools/testing/selftests/powerpc/cache_shape/Makefile
index b24485ab3..1be547434 100644
--- a/kernel/tools/testing/selftests/powerpc/cache_shape/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/cache_shape/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := cache_shape
 
 all: $(TEST_PROGS)
diff --git a/kernel/tools/testing/selftests/powerpc/copyloops/Makefile b/kernel/tools/testing/selftests/powerpc/copyloops/Makefile
index 681ab19d0..ac4a52e19 100644
--- a/kernel/tools/testing/selftests/powerpc/copyloops/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/copyloops/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # The loops are all 64-bit code
 CFLAGS += -m64
 CFLAGS += -I$(CURDIR)
diff --git a/kernel/tools/testing/selftests/powerpc/copyloops/asm/export.h b/kernel/tools/testing/selftests/powerpc/copyloops/asm/export.h
index 2d14a9b42..0bab35f67 100644
--- a/kernel/tools/testing/selftests/powerpc/copyloops/asm/export.h
+++ b/kernel/tools/testing/selftests/powerpc/copyloops/asm/export.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define EXPORT_SYMBOL(x)
diff --git a/kernel/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h b/kernel/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
index 80d34a9ff..5ffe04d80 100644
--- a/kernel/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
+++ b/kernel/tools/testing/selftests/powerpc/copyloops/asm/ppc_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <ppc-asm.h>
 
 #define CONFIG_ALTIVEC
diff --git a/kernel/tools/testing/selftests/powerpc/copyloops/validate.c b/kernel/tools/testing/selftests/powerpc/copyloops/validate.c
index 7fb436f82..0f6873618 100644
--- a/kernel/tools/testing/selftests/powerpc/copyloops/validate.c
+++ b/kernel/tools/testing/selftests/powerpc/copyloops/validate.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/kernel/tools/testing/selftests/powerpc/dscr/Makefile b/kernel/tools/testing/selftests/powerpc/dscr/Makefile
index c5639deb8..55d7db7a6 100644
--- a/kernel/tools/testing/selftests/powerpc/dscr/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/dscr/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_GEN_PROGS := dscr_default_test dscr_explicit_test dscr_user_test	\
 	      dscr_inherit_test dscr_inherit_exec_test dscr_sysfs_test	\
 	      dscr_sysfs_thread_test
diff --git a/kernel/tools/testing/selftests/powerpc/include/basic_asm.h b/kernel/tools/testing/selftests/powerpc/include/basic_asm.h
index 12eaddf72..886dc026f 100644
--- a/kernel/tools/testing/selftests/powerpc/include/basic_asm.h
+++ b/kernel/tools/testing/selftests/powerpc/include/basic_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SELFTESTS_POWERPC_BASIC_ASM_H
 #define _SELFTESTS_POWERPC_BASIC_ASM_H
 
diff --git a/kernel/tools/testing/selftests/powerpc/include/instructions.h b/kernel/tools/testing/selftests/powerpc/include/instructions.h
index 0fb0bd3b2..f36061eb6 100644
--- a/kernel/tools/testing/selftests/powerpc/include/instructions.h
+++ b/kernel/tools/testing/selftests/powerpc/include/instructions.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _SELFTESTS_POWERPC_INSTRUCTIONS_H
 #define _SELFTESTS_POWERPC_INSTRUCTIONS_H
 
diff --git a/kernel/tools/testing/selftests/powerpc/math/Makefile b/kernel/tools/testing/selftests/powerpc/math/Makefile
index fa8bae920..0dd3a01fd 100644
--- a/kernel/tools/testing/selftests/powerpc/math/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/math/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_GEN_PROGS := fpu_syscall fpu_preempt fpu_signal vmx_syscall vmx_preempt vmx_signal vsx_preempt
 
 include ../../lib.mk
diff --git a/kernel/tools/testing/selftests/powerpc/mm/Makefile b/kernel/tools/testing/selftests/powerpc/mm/Makefile
index 1cffe54dc..bf315bcbe 100644
--- a/kernel/tools/testing/selftests/powerpc/mm/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/mm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 noarg:
 	$(MAKE) -C ../
 
diff --git a/kernel/tools/testing/selftests/powerpc/mm/hugetlb_vs_thp_test.c b/kernel/tools/testing/selftests/powerpc/mm/hugetlb_vs_thp_test.c
index 49003674d..9932359ce 100644
--- a/kernel/tools/testing/selftests/powerpc/mm/hugetlb_vs_thp_test.c
+++ b/kernel/tools/testing/selftests/powerpc/mm/hugetlb_vs_thp_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <sys/mman.h>
 #include <unistd.h>
diff --git a/kernel/tools/testing/selftests/powerpc/pmu/Makefile b/kernel/tools/testing/selftests/powerpc/pmu/Makefile
index e4e55d1d3..6e1629bf5 100644
--- a/kernel/tools/testing/selftests/powerpc/pmu/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/pmu/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 noarg:
 	$(MAKE) -C ../
 
diff --git a/kernel/tools/testing/selftests/powerpc/pmu/ebb/Makefile b/kernel/tools/testing/selftests/powerpc/pmu/ebb/Makefile
index 6001fb0a3..c4e64bc2e 100644
--- a/kernel/tools/testing/selftests/powerpc/pmu/ebb/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/pmu/ebb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 noarg:
 	$(MAKE) -C ../../
 
diff --git a/kernel/tools/testing/selftests/powerpc/ptrace/Makefile b/kernel/tools/testing/selftests/powerpc/ptrace/Makefile
index 8932263e5..480305266 100644
--- a/kernel/tools/testing/selftests/powerpc/ptrace/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/ptrace/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \
               ptrace-tar ptrace-tm-tar ptrace-tm-spd-tar ptrace-vsx ptrace-tm-vsx \
               ptrace-tm-spd-vsx ptrace-tm-spr
diff --git a/kernel/tools/testing/selftests/powerpc/signal/Makefile b/kernel/tools/testing/selftests/powerpc/signal/Makefile
index f0eef2745..a7cbd5082 100644
--- a/kernel/tools/testing/selftests/powerpc/signal/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/signal/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := signal signal_tm
 
 all: $(TEST_PROGS)
diff --git a/kernel/tools/testing/selftests/powerpc/stringloops/Makefile b/kernel/tools/testing/selftests/powerpc/stringloops/Makefile
index 557b9379f..1125e4890 100644
--- a/kernel/tools/testing/selftests/powerpc/stringloops/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/stringloops/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # The loops are all 64-bit code
 CFLAGS += -m64
 CFLAGS += -I$(CURDIR)
diff --git a/kernel/tools/testing/selftests/powerpc/stringloops/asm/ppc_asm.h b/kernel/tools/testing/selftests/powerpc/stringloops/asm/ppc_asm.h
index 11bece87e..136242ec4 100644
--- a/kernel/tools/testing/selftests/powerpc/stringloops/asm/ppc_asm.h
+++ b/kernel/tools/testing/selftests/powerpc/stringloops/asm/ppc_asm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <ppc-asm.h>
 
 #ifndef r1
diff --git a/kernel/tools/testing/selftests/powerpc/stringloops/memcmp.c b/kernel/tools/testing/selftests/powerpc/stringloops/memcmp.c
index 30b122238..8250db25b 100644
--- a/kernel/tools/testing/selftests/powerpc/stringloops/memcmp.c
+++ b/kernel/tools/testing/selftests/powerpc/stringloops/memcmp.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/kernel/tools/testing/selftests/powerpc/switch_endian/Makefile b/kernel/tools/testing/selftests/powerpc/switch_endian/Makefile
index b92c2a132..30b8ff8fb 100644
--- a/kernel/tools/testing/selftests/powerpc/switch_endian/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/switch_endian/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_GEN_PROGS := switch_endian_test
 
 ASFLAGS += -O2 -Wall -g -nostdlib -m64
diff --git a/kernel/tools/testing/selftests/powerpc/switch_endian/check.S b/kernel/tools/testing/selftests/powerpc/switch_endian/check.S
index e2484d2c2..927a5c675 100644
--- a/kernel/tools/testing/selftests/powerpc/switch_endian/check.S
+++ b/kernel/tools/testing/selftests/powerpc/switch_endian/check.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "common.h"
 
 /*
diff --git a/kernel/tools/testing/selftests/powerpc/switch_endian/common.h b/kernel/tools/testing/selftests/powerpc/switch_endian/common.h
index 69e399698..1434cbc2a 100644
--- a/kernel/tools/testing/selftests/powerpc/switch_endian/common.h
+++ b/kernel/tools/testing/selftests/powerpc/switch_endian/common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <ppc-asm.h>
 #include <asm/unistd.h>
 
diff --git a/kernel/tools/testing/selftests/powerpc/switch_endian/switch_endian_test.S b/kernel/tools/testing/selftests/powerpc/switch_endian/switch_endian_test.S
index bceb53f57..cc4930467 100644
--- a/kernel/tools/testing/selftests/powerpc/switch_endian/switch_endian_test.S
+++ b/kernel/tools/testing/selftests/powerpc/switch_endian/switch_endian_test.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include "common.h"
 
 	.data
diff --git a/kernel/tools/testing/selftests/powerpc/syscalls/ipc.h b/kernel/tools/testing/selftests/powerpc/syscalls/ipc.h
index fbebc022e..26a20682c 100644
--- a/kernel/tools/testing/selftests/powerpc/syscalls/ipc.h
+++ b/kernel/tools/testing/selftests/powerpc/syscalls/ipc.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifdef __NR_semop
 DO_TEST(semop, __NR_semop)
 #endif
diff --git a/kernel/tools/testing/selftests/powerpc/tm/Makefile b/kernel/tools/testing/selftests/powerpc/tm/Makefile
index 7bfcd454f..fca7c7f5e 100644
--- a/kernel/tools/testing/selftests/powerpc/tm/Makefile
+++ b/kernel/tools/testing/selftests/powerpc/tm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 SIGNAL_CONTEXT_CHK_TESTS := tm-signal-context-chk-gpr tm-signal-context-chk-fpu \
 	tm-signal-context-chk-vmx tm-signal-context-chk-vsx
 
diff --git a/kernel/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c b/kernel/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
index a7ac2e4c6..4cdb83964 100644
--- a/kernel/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
+++ b/kernel/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Test context switching to see if the DSCR SPR is correctly preserved
  * when within a transaction.
  *
diff --git a/kernel/tools/testing/selftests/powerpc/tm/tm-syscall-asm.S b/kernel/tools/testing/selftests/powerpc/tm/tm-syscall-asm.S
index 431f61ae2..bd1ca25fe 100644
--- a/kernel/tools/testing/selftests/powerpc/tm/tm-syscall-asm.S
+++ b/kernel/tools/testing/selftests/powerpc/tm/tm-syscall-asm.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <ppc-asm.h>
 #include <asm/unistd.h>
 
diff --git a/kernel/tools/testing/selftests/powerpc/vphn/test-vphn.c b/kernel/tools/testing/selftests/powerpc/vphn/test-vphn.c
index 5742f6876..81d3069ff 100644
--- a/kernel/tools/testing/selftests/powerpc/vphn/test-vphn.c
+++ b/kernel/tools/testing/selftests/powerpc/vphn/test-vphn.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <byteswap.h>
 #include "utils.h"
diff --git a/kernel/tools/testing/selftests/prctl/Makefile b/kernel/tools/testing/selftests/prctl/Makefile
index 35aa1c8f2..c7923b205 100644
--- a/kernel/tools/testing/selftests/prctl/Makefile
+++ b/kernel/tools/testing/selftests/prctl/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef CROSS_COMPILE
 uname_M := $(shell uname -m 2>/dev/null || echo not)
 ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/)
diff --git a/kernel/tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c b/kernel/tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c
index f7499d1c0..62a93cc61 100644
--- a/kernel/tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c
+++ b/kernel/tools/testing/selftests/prctl/disable-tsc-ctxt-sw-stress-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tests for prctl(PR_GET_TSC, ...) / prctl(PR_SET_TSC, ...)
  *
diff --git a/kernel/tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c b/kernel/tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c
index a06f027e9..79950f9a2 100644
--- a/kernel/tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c
+++ b/kernel/tools/testing/selftests/prctl/disable-tsc-on-off-stress-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tests for prctl(PR_GET_TSC, ...) / prctl(PR_SET_TSC, ...)
  *
diff --git a/kernel/tools/testing/selftests/prctl/disable-tsc-test.c b/kernel/tools/testing/selftests/prctl/disable-tsc-test.c
index 8d494f7be..f84d4ee11 100644
--- a/kernel/tools/testing/selftests/prctl/disable-tsc-test.c
+++ b/kernel/tools/testing/selftests/prctl/disable-tsc-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tests for prctl(PR_GET_TSC, ...) / prctl(PR_SET_TSC, ...)
  *
diff --git a/kernel/tools/testing/selftests/pstore/Makefile b/kernel/tools/testing/selftests/pstore/Makefile
index c5f2440ba..5ef57855a 100644
--- a/kernel/tools/testing/selftests/pstore/Makefile
+++ b/kernel/tools/testing/selftests/pstore/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for pstore selftests.
 # Expects pstore backend is registered.
 
diff --git a/kernel/tools/testing/selftests/ptp/Makefile b/kernel/tools/testing/selftests/ptp/Makefile
index d4064c742..ef06de089 100644
--- a/kernel/tools/testing/selftests/ptp/Makefile
+++ b/kernel/tools/testing/selftests/ptp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS += -I../../../../usr/include/
 TEST_PROGS := testptp
 LDLIBS += -lrt
diff --git a/kernel/tools/testing/selftests/ptrace/peeksiginfo.c b/kernel/tools/testing/selftests/ptrace/peeksiginfo.c
index c34cd8ac8..54900657e 100644
--- a/kernel/tools/testing/selftests/ptrace/peeksiginfo.c
+++ b/kernel/tools/testing/selftests/ptrace/peeksiginfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <signal.h>
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile
index 16b01559f..4bed0b678 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all: srcu.c store_buffering
 
 LINUX_SOURCE = ../../../../../..
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h
index 4a3d538fe..891ad13e9 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * This header has been modifies to remove definitions of types that
  * are defined in standard userspace headers or are problematic for some
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
index c9e8bc508..e05182d3e 100755
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
@@ -1,4 +1,5 @@
 #!/usr/bin/awk -f
+# SPDX-License-Identifier: GPL-2.0
 
 # Modify SRCU for formal verification. The first argument should be srcu.h and
 # the second should be srcu.c. Outputs modified srcu.h and srcu.c into the
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h
index a64955447..570a49d9d 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ASSUME_H
 #define ASSUME_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
index 6687acc08..be3fdd351 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BARRIERS_H
 #define BARRIERS_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h
index 2a80e91f7..5e7912c6a 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BUG_ON_H
 #define BUG_ON_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c
index 29eb5d269..e67ee5b3d 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <config.h>
 
 /* Include all source files. */
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h
index a60038aee..283d71033 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /* "Cheater" definitions based on restricted Kconfig choices. */
 
 #undef CONFIG_TINY_RCU
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c
index 5ec582a53..e5202d4cf 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <config.h>
 
 #include <assert.h>
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h
index 3aad63917..0dd27aa51 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef INT_TYPEDEFS_H
 #define INT_TYPEDEFS_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h
index 356004665..cf6938d67 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LOCKS_H
 #define LOCKS_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c
index ca892e3b2..9440cc39e 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <config.h>
 
 #include "misc.h"
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h
index 3de5a49de..27e67a3f2 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PERCPU_H
 #define PERCPU_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c
index 4f1b068e9..b4083ae34 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <config.h>
 
 #include "preempt.h"
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h
index 2f95ee0e4..f8b762cd2 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef PREEMPT_H
 #define PREEMPT_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c
index ac9cbc62b..97f592048 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <config.h>
 
 #include <assert.h>
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h
index e58c8dfd3..28b960300 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef WORKQUEUES_H
 #define WORKQUEUES_H
 
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile
index 3a3aee149..ad21b925f 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CBMC_FLAGS = -I../.. -I../../src -I../../include -I../../empty_includes -32 -pointer-check -mm pso
 
 all:
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c
index 470b1105a..2ce2016f7 100644
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <src/combined_source.c>
 
 int x;
diff --git a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh
index d1545972a..2fe1f0339 100755
--- a/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh
+++ b/kernel/tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 # This script expects a mode (either --should-pass or --should-fail) followed by
 # an input file. The script uses the following environment variables. The test C
diff --git a/kernel/tools/testing/selftests/seccomp/Makefile b/kernel/tools/testing/selftests/seccomp/Makefile
index 553d870b4..fce7f4ce0 100644
--- a/kernel/tools/testing/selftests/seccomp/Makefile
+++ b/kernel/tools/testing/selftests/seccomp/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 include ../lib.mk
diff --git a/kernel/tools/testing/selftests/sigaltstack/sas.c b/kernel/tools/testing/selftests/sigaltstack/sas.c
index 97bb15083..228c2ae47 100644
--- a/kernel/tools/testing/selftests/sigaltstack/sas.c
+++ b/kernel/tools/testing/selftests/sigaltstack/sas.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Stas Sergeev <stsp@users.sourceforge.net>
  *
diff --git a/kernel/tools/testing/selftests/splice/Makefile b/kernel/tools/testing/selftests/splice/Makefile
index 7e1187e00..e519b159b 100644
--- a/kernel/tools/testing/selftests/splice/Makefile
+++ b/kernel/tools/testing/selftests/splice/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := default_file_splice_read.sh
 TEST_GEN_PROGS_EXTENDED := default_file_splice_read
 
diff --git a/kernel/tools/testing/selftests/splice/default_file_splice_read.c b/kernel/tools/testing/selftests/splice/default_file_splice_read.c
index 01dd60915..a3c6e5672 100644
--- a/kernel/tools/testing/selftests/splice/default_file_splice_read.c
+++ b/kernel/tools/testing/selftests/splice/default_file_splice_read.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <fcntl.h>
 
diff --git a/kernel/tools/testing/selftests/splice/default_file_splice_read.sh b/kernel/tools/testing/selftests/splice/default_file_splice_read.sh
index 1ea2adeab..490db5a2e 100755
--- a/kernel/tools/testing/selftests/splice/default_file_splice_read.sh
+++ b/kernel/tools/testing/selftests/splice/default_file_splice_read.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 n=`./default_file_splice_read </dev/null | wc -c`
 
 test "$n" = 0 && exit 0
diff --git a/kernel/tools/testing/selftests/static_keys/test_static_keys.sh b/kernel/tools/testing/selftests/static_keys/test_static_keys.sh
index 1261e3fa1..24cff498b 100755
--- a/kernel/tools/testing/selftests/static_keys/test_static_keys.sh
+++ b/kernel/tools/testing/selftests/static_keys/test_static_keys.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs static keys kernel module tests
 
 if /sbin/modprobe -q test_static_key_base; then
diff --git a/kernel/tools/testing/selftests/sync/Makefile b/kernel/tools/testing/selftests/sync/Makefile
index 8e04d0afc..b3c8ba3cb 100644
--- a/kernel/tools/testing/selftests/sync/Makefile
+++ b/kernel/tools/testing/selftests/sync/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS += -O2 -g -std=gnu89 -pthread -Wall -Wextra
 CFLAGS += -I../../../../usr/include/
 LDFLAGS += -pthread
diff --git a/kernel/tools/testing/selftests/tc-testing/tdc.py b/kernel/tools/testing/selftests/tc-testing/tdc.py
index 5f11f5d74..b8462e1b7 100755
--- a/kernel/tools/testing/selftests/tc-testing/tdc.py
+++ b/kernel/tools/testing/selftests/tc-testing/tdc.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0
 
 """
 tdc.py - Linux tc (Traffic Control) unit test driver
@@ -152,11 +153,11 @@ def ns_create():
         exec_cmd(cmd, False)
         cmd = 'ip link set $DEV0 up'
         exec_cmd(cmd, False)
-        cmd = 'ip -s $NS link set $DEV1 up'
+        cmd = 'ip -n $NS link set $DEV1 up'
         exec_cmd(cmd, False)
         cmd = 'ip link set $DEV2 netns $NS'
         exec_cmd(cmd, False)
-        cmd = 'ip -s $NS link set $DEV2 up'
+        cmd = 'ip -n $NS link set $DEV2 up'
         exec_cmd(cmd, False)
 
 
diff --git a/kernel/tools/testing/selftests/tc-testing/tdc_config.py b/kernel/tools/testing/selftests/tc-testing/tdc_config.py
index b6352515c..eb188c729 100644
--- a/kernel/tools/testing/selftests/tc-testing/tdc_config.py
+++ b/kernel/tools/testing/selftests/tc-testing/tdc_config.py
@@ -1,4 +1,5 @@
 """
+# SPDX-License-Identifier: GPL-2.0
 tdc_config.py - tdc user-specified values
 
 Copyright (C) 2017 Lucas Bates <lucasb@mojatatu.com>
diff --git a/kernel/tools/testing/selftests/tc-testing/tdc_helper.py b/kernel/tools/testing/selftests/tc-testing/tdc_helper.py
index c3254f861..ccf2d2458 100644
--- a/kernel/tools/testing/selftests/tc-testing/tdc_helper.py
+++ b/kernel/tools/testing/selftests/tc-testing/tdc_helper.py
@@ -1,4 +1,5 @@
 """
+# SPDX-License-Identifier: GPL-2.0
 tdc_helper.py - tdc helper functions
 
 Copyright (C) 2017 Lucas Bates <lucasb@mojatatu.com>
diff --git a/kernel/tools/testing/selftests/timers/Makefile b/kernel/tools/testing/selftests/timers/Makefile
index ae4593115..349668098 100644
--- a/kernel/tools/testing/selftests/timers/Makefile
+++ b/kernel/tools/testing/selftests/timers/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CFLAGS += -O3 -Wl,-no-as-needed -Wall
 LDFLAGS += -lrt -lpthread -lm
 
diff --git a/kernel/tools/testing/selftests/user/test_user_copy.sh b/kernel/tools/testing/selftests/user/test_user_copy.sh
index 350107f40..d60506fc7 100755
--- a/kernel/tools/testing/selftests/user/test_user_copy.sh
+++ b/kernel/tools/testing/selftests/user/test_user_copy.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 # Runs copy_to/from_user infrastructure using test_user_copy kernel module
 
 if /sbin/modprobe -q test_user_copy; then
diff --git a/kernel/tools/testing/selftests/vDSO/Makefile b/kernel/tools/testing/selftests/vDSO/Makefile
index 706b68b1c..3d5a62ff7 100644
--- a/kernel/tools/testing/selftests/vDSO/Makefile
+++ b/kernel/tools/testing/selftests/vDSO/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 ifndef CROSS_COMPILE
 CFLAGS := -std=gnu99
 CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector
diff --git a/kernel/tools/testing/selftests/vm/Makefile b/kernel/tools/testing/selftests/vm/Makefile
index cbb29e41e..e49eca191 100644
--- a/kernel/tools/testing/selftests/vm/Makefile
+++ b/kernel/tools/testing/selftests/vm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for vm selftests
 
 ifndef OUTPUT
diff --git a/kernel/tools/testing/selftests/vm/compaction_test.c b/kernel/tools/testing/selftests/vm/compaction_test.c
index 6d1437f89..a65b016d4 100644
--- a/kernel/tools/testing/selftests/vm/compaction_test.c
+++ b/kernel/tools/testing/selftests/vm/compaction_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *
  * A test for the patch "Allow compaction of unevictable pages".
diff --git a/kernel/tools/testing/selftests/vm/hugepage-mmap.c b/kernel/tools/testing/selftests/vm/hugepage-mmap.c
index a10f310d2..93f9e7b81 100644
--- a/kernel/tools/testing/selftests/vm/hugepage-mmap.c
+++ b/kernel/tools/testing/selftests/vm/hugepage-mmap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * hugepage-mmap:
  *
diff --git a/kernel/tools/testing/selftests/vm/hugepage-shm.c b/kernel/tools/testing/selftests/vm/hugepage-shm.c
index 0d0ef4fc0..e2527f320 100644
--- a/kernel/tools/testing/selftests/vm/hugepage-shm.c
+++ b/kernel/tools/testing/selftests/vm/hugepage-shm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * hugepage-shm:
  *
diff --git a/kernel/tools/testing/selftests/vm/map_hugetlb.c b/kernel/tools/testing/selftests/vm/map_hugetlb.c
index 77687ab59..9b777fa95 100644
--- a/kernel/tools/testing/selftests/vm/map_hugetlb.c
+++ b/kernel/tools/testing/selftests/vm/map_hugetlb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Example of using hugepage memory in a user application using the mmap
  * system call with MAP_HUGETLB flag.  Before running this program make
diff --git a/kernel/tools/testing/selftests/vm/mlock-random-test.c b/kernel/tools/testing/selftests/vm/mlock-random-test.c
index 83de4f58d..ff4d72eb7 100644
--- a/kernel/tools/testing/selftests/vm/mlock-random-test.c
+++ b/kernel/tools/testing/selftests/vm/mlock-random-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * It tests the mlock/mlock2() when they are invoked
  * on randomly memory region.
diff --git a/kernel/tools/testing/selftests/vm/mlock2-tests.c b/kernel/tools/testing/selftests/vm/mlock2-tests.c
index e5dbc87b4..4997b9222 100644
--- a/kernel/tools/testing/selftests/vm/mlock2-tests.c
+++ b/kernel/tools/testing/selftests/vm/mlock2-tests.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <sys/mman.h>
 #include <stdint.h>
diff --git a/kernel/tools/testing/selftests/vm/mlock2.h b/kernel/tools/testing/selftests/vm/mlock2.h
index 7ee062929..2a6e76c22 100644
--- a/kernel/tools/testing/selftests/vm/mlock2.h
+++ b/kernel/tools/testing/selftests/vm/mlock2.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <syscall.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/kernel/tools/testing/selftests/vm/on-fault-limit.c b/kernel/tools/testing/selftests/vm/on-fault-limit.c
index 7f96a5c2e..634d87dfb 100644
--- a/kernel/tools/testing/selftests/vm/on-fault-limit.c
+++ b/kernel/tools/testing/selftests/vm/on-fault-limit.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/mman.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/kernel/tools/testing/selftests/vm/run_vmtests b/kernel/tools/testing/selftests/vm/run_vmtests
index 07548a1fa..cc826326d 100755
--- a/kernel/tools/testing/selftests/vm/run_vmtests
+++ b/kernel/tools/testing/selftests/vm/run_vmtests
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 #please run as root
 
 #we need 256M, below is the size in kB
diff --git a/kernel/tools/testing/selftests/vm/thuge-gen.c b/kernel/tools/testing/selftests/vm/thuge-gen.c
index 88a2ab535..361ef7192 100644
--- a/kernel/tools/testing/selftests/vm/thuge-gen.c
+++ b/kernel/tools/testing/selftests/vm/thuge-gen.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Test selecting other page sizes for mmap/shmget.
 
    Before running this huge pages for each huge page size must have been
diff --git a/kernel/tools/testing/selftests/watchdog/Makefile b/kernel/tools/testing/selftests/watchdog/Makefile
index ee068511f..6b5598b55 100644
--- a/kernel/tools/testing/selftests/watchdog/Makefile
+++ b/kernel/tools/testing/selftests/watchdog/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 TEST_GEN_PROGS := watchdog-test
 
 include ../lib.mk
diff --git a/kernel/tools/testing/selftests/watchdog/watchdog-test.c b/kernel/tools/testing/selftests/watchdog/watchdog-test.c
index a1391be2d..6e290874b 100644
--- a/kernel/tools/testing/selftests/watchdog/watchdog-test.c
+++ b/kernel/tools/testing/selftests/watchdog/watchdog-test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Watchdog Driver Test Program
  */
diff --git a/kernel/tools/testing/selftests/x86/Makefile b/kernel/tools/testing/selftests/x86/Makefile
index 0a74a20ca..7b1adeee4 100644
--- a/kernel/tools/testing/selftests/x86/Makefile
+++ b/kernel/tools/testing/selftests/x86/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 include ../lib.mk
diff --git a/kernel/tools/testing/selftests/x86/ioperm.c b/kernel/tools/testing/selftests/x86/ioperm.c
index b77313ba2..01de41c1b 100644
--- a/kernel/tools/testing/selftests/x86/ioperm.c
+++ b/kernel/tools/testing/selftests/x86/ioperm.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ioperm.c - Test case for ioperm(2)
  * Copyright (c) 2015 Andrew Lutomirski
diff --git a/kernel/tools/testing/selftests/x86/iopl.c b/kernel/tools/testing/selftests/x86/iopl.c
index c496ca97b..6aa27f346 100644
--- a/kernel/tools/testing/selftests/x86/iopl.c
+++ b/kernel/tools/testing/selftests/x86/iopl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * iopl.c - Test case for a Linux on Xen 64-bit bug
  * Copyright (c) 2015 Andrew Lutomirski
diff --git a/kernel/tools/testing/selftests/x86/ldt_gdt.c b/kernel/tools/testing/selftests/x86/ldt_gdt.c
index b9a22f185..961e3ee26 100644
--- a/kernel/tools/testing/selftests/x86/ldt_gdt.c
+++ b/kernel/tools/testing/selftests/x86/ldt_gdt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ldt_gdt.c - Test cases for LDT and GDT access
  * Copyright (c) 2015 Andrew Lutomirski
diff --git a/kernel/tools/testing/selftests/x86/mpx-debug.h b/kernel/tools/testing/selftests/x86/mpx-debug.h
index 9230981f2..7546eba7f 100644
--- a/kernel/tools/testing/selftests/x86/mpx-debug.h
+++ b/kernel/tools/testing/selftests/x86/mpx-debug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MPX_DEBUG_H
 #define _MPX_DEBUG_H
 
diff --git a/kernel/tools/testing/selftests/x86/mpx-dig.c b/kernel/tools/testing/selftests/x86/mpx-dig.c
index ce85356d7..c13607ef5 100644
--- a/kernel/tools/testing/selftests/x86/mpx-dig.c
+++ b/kernel/tools/testing/selftests/x86/mpx-dig.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Written by Dave Hansen <dave.hansen@intel.com>
  */
diff --git a/kernel/tools/testing/selftests/x86/mpx-hw.h b/kernel/tools/testing/selftests/x86/mpx-hw.h
index 093c19017..3f0093911 100644
--- a/kernel/tools/testing/selftests/x86/mpx-hw.h
+++ b/kernel/tools/testing/selftests/x86/mpx-hw.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MPX_HW_H
 #define _MPX_HW_H
 
diff --git a/kernel/tools/testing/selftests/x86/mpx-mm.h b/kernel/tools/testing/selftests/x86/mpx-mm.h
index af706a539..6dbdd66b8 100644
--- a/kernel/tools/testing/selftests/x86/mpx-mm.h
+++ b/kernel/tools/testing/selftests/x86/mpx-mm.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _MPX_MM_H
 #define _MPX_MM_H
 
diff --git a/kernel/tools/testing/selftests/x86/pkey-helpers.h b/kernel/tools/testing/selftests/x86/pkey-helpers.h
index b20293956..3818f2539 100644
--- a/kernel/tools/testing/selftests/x86/pkey-helpers.h
+++ b/kernel/tools/testing/selftests/x86/pkey-helpers.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _PKEYS_HELPER_H
 #define _PKEYS_HELPER_H
 #define _GNU_SOURCE
diff --git a/kernel/tools/testing/selftests/x86/protection_keys.c b/kernel/tools/testing/selftests/x86/protection_keys.c
index 239278455..555e43ca8 100644
--- a/kernel/tools/testing/selftests/x86/protection_keys.c
+++ b/kernel/tools/testing/selftests/x86/protection_keys.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tests x86 Memory Protection Keys (see Documentation/x86/protection-keys.txt)
  *
diff --git a/kernel/tools/testing/selftests/x86/ptrace_syscall.c b/kernel/tools/testing/selftests/x86/ptrace_syscall.c
index eaea92439..1ae1c5a73 100644
--- a/kernel/tools/testing/selftests/x86/ptrace_syscall.c
+++ b/kernel/tools/testing/selftests/x86/ptrace_syscall.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 
 #include <sys/ptrace.h>
diff --git a/kernel/tools/testing/selftests/x86/raw_syscall_helper_32.S b/kernel/tools/testing/selftests/x86/raw_syscall_helper_32.S
index 534e71e35..94410fa2b 100644
--- a/kernel/tools/testing/selftests/x86/raw_syscall_helper_32.S
+++ b/kernel/tools/testing/selftests/x86/raw_syscall_helper_32.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 .global sys32_helper
 sys32_helper:
 	/* Args: syscall_args_32*, function pointer */
diff --git a/kernel/tools/testing/selftests/x86/test_FCMOV.c b/kernel/tools/testing/selftests/x86/test_FCMOV.c
index 4adcca0c8..6b5036fbb 100644
--- a/kernel/tools/testing/selftests/x86/test_FCMOV.c
+++ b/kernel/tools/testing/selftests/x86/test_FCMOV.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #undef __USE_GNU
diff --git a/kernel/tools/testing/selftests/x86/test_FCOMI.c b/kernel/tools/testing/selftests/x86/test_FCOMI.c
index db4933e31..aec6692c6 100644
--- a/kernel/tools/testing/selftests/x86/test_FCOMI.c
+++ b/kernel/tools/testing/selftests/x86/test_FCOMI.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #undef __USE_GNU
diff --git a/kernel/tools/testing/selftests/x86/test_FISTTP.c b/kernel/tools/testing/selftests/x86/test_FISTTP.c
index b8e61a047..09789c0ce 100644
--- a/kernel/tools/testing/selftests/x86/test_FISTTP.c
+++ b/kernel/tools/testing/selftests/x86/test_FISTTP.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #undef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #undef __USE_GNU
diff --git a/kernel/tools/testing/selftests/x86/test_vdso.c b/kernel/tools/testing/selftests/x86/test_vdso.c
index 65d7a2bf7..29973cde0 100644
--- a/kernel/tools/testing/selftests/x86/test_vdso.c
+++ b/kernel/tools/testing/selftests/x86/test_vdso.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * ldt_gdt.c - Test cases for LDT and GDT access
  * Copyright (c) 2011-2015 Andrew Lutomirski
diff --git a/kernel/tools/testing/selftests/zram/Makefile b/kernel/tools/testing/selftests/zram/Makefile
index c3a87e5f9..7f78eb1b5 100644
--- a/kernel/tools/testing/selftests/zram/Makefile
+++ b/kernel/tools/testing/selftests/zram/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 TEST_PROGS := zram.sh
diff --git a/kernel/tools/testing/selftests/zram/zram.sh b/kernel/tools/testing/selftests/zram/zram.sh
index 683a292e3..754de7da4 100755
--- a/kernel/tools/testing/selftests/zram/zram.sh
+++ b/kernel/tools/testing/selftests/zram/zram.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
 TCID="zram.sh"
 
 . ./zram_lib.sh
diff --git a/kernel/tools/thermal/tmon/Makefile b/kernel/tools/thermal/tmon/Makefile
index 3a961e998..21169322b 100644
--- a/kernel/tools/thermal/tmon/Makefile
+++ b/kernel/tools/thermal/tmon/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 VERSION = 1.0
 
 BINDIR=usr/bin
diff --git a/kernel/tools/thermal/tmon/tmon.8 b/kernel/tools/thermal/tmon/tmon.8
index 02d517980..2f122de58 100644
--- a/kernel/tools/thermal/tmon/tmon.8
+++ b/kernel/tools/thermal/tmon/tmon.8
@@ -1,4 +1,5 @@
 .TH TMON 8
+# SPDX-License-Identifier: GPL-2.0
 .SH NAME
 \fBtmon\fP - A monitoring and testing tool for Linux kernel thermal subsystem
 
diff --git a/kernel/tools/usb/Makefile b/kernel/tools/usb/Makefile
index acf2165c0..4e6506078 100644
--- a/kernel/tools/usb/Makefile
+++ b/kernel/tools/usb/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for USB tools
 
 CC = $(CROSS_COMPILE)gcc
diff --git a/kernel/tools/usb/ffs-aio-example/multibuff/host_app/Makefile b/kernel/tools/usb/ffs-aio-example/multibuff/host_app/Makefile
index 8c4a6f0aa..df36e4c28 100644
--- a/kernel/tools/usb/ffs-aio-example/multibuff/host_app/Makefile
+++ b/kernel/tools/usb/ffs-aio-example/multibuff/host_app/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC = gcc
 LIBUSB_CFLAGS = $(shell pkg-config --cflags libusb-1.0)
 LIBUSB_LIBS = $(shell pkg-config --libs libusb-1.0)
diff --git a/kernel/tools/usb/hcd-tests.sh b/kernel/tools/usb/hcd-tests.sh
index b30b3dc4c..e8cad6a4f 100644
--- a/kernel/tools/usb/hcd-tests.sh
+++ b/kernel/tools/usb/hcd-tests.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 #
 # test types can be passed on the command line:
 #
diff --git a/kernel/tools/usb/usbip/Makefile.am b/kernel/tools/usb/usbip/Makefile.am
index 66f8bf038..da3a43084 100644
--- a/kernel/tools/usb/usbip/Makefile.am
+++ b/kernel/tools/usb/usbip/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 SUBDIRS := libsrc src
 includedir = @includedir@/usbip
 include_HEADERS := $(addprefix libsrc/, \
diff --git a/kernel/tools/usb/usbip/cleanup.sh b/kernel/tools/usb/usbip/cleanup.sh
index 955c3ccb7..8028c3a5c 100755
--- a/kernel/tools/usb/usbip/cleanup.sh
+++ b/kernel/tools/usb/usbip/cleanup.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 if [ -r Makefile ]; then
 	make distclean
diff --git a/kernel/tools/usb/usbip/libsrc/Makefile.am b/kernel/tools/usb/usbip/libsrc/Makefile.am
index 90daf95c0..dabd2c91d 100644
--- a/kernel/tools/usb/usbip/libsrc/Makefile.am
+++ b/kernel/tools/usb/usbip/libsrc/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 libusbip_la_CPPFLAGS = -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
 libusbip_la_CFLAGS   = @EXTRA_CFLAGS@
 libusbip_la_LDFLAGS  = -version-info @LIBUSBIP_VERSION@
diff --git a/kernel/tools/usb/usbip/libsrc/list.h b/kernel/tools/usb/usbip/libsrc/list.h
index 5eaaa78e2..a941671e4 100644
--- a/kernel/tools/usb/usbip/libsrc/list.h
+++ b/kernel/tools/usb/usbip/libsrc/list.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LIST_H
 #define _LIST_H
 
diff --git a/kernel/tools/usb/usbip/libsrc/sysfs_utils.c b/kernel/tools/usb/usbip/libsrc/sysfs_utils.c
index 36ac88ece..14d5e67d3 100644
--- a/kernel/tools/usb/usbip/libsrc/sysfs_utils.c
+++ b/kernel/tools/usb/usbip/libsrc/sysfs_utils.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/kernel/tools/usb/usbip/libsrc/sysfs_utils.h b/kernel/tools/usb/usbip/libsrc/sysfs_utils.h
index 32ac1d105..0cd5f17e7 100644
--- a/kernel/tools/usb/usbip/libsrc/sysfs_utils.h
+++ b/kernel/tools/usb/usbip/libsrc/sysfs_utils.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 
 #ifndef __SYSFS_UTILS_H
 #define __SYSFS_UTILS_H
diff --git a/kernel/tools/usb/usbip/libsrc/usbip_common.c b/kernel/tools/usb/usbip/libsrc/usbip_common.c
index 1517a232a..001bb8e8f 100644
--- a/kernel/tools/usb/usbip/libsrc/usbip_common.c
+++ b/kernel/tools/usb/usbip/libsrc/usbip_common.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/kernel/tools/usb/usbip/libsrc/usbip_common.h b/kernel/tools/usb/usbip/libsrc/usbip_common.h
index 51ef5fe48..e45ec9d2f 100644
--- a/kernel/tools/usb/usbip/libsrc/usbip_common.h
+++ b/kernel/tools/usb/usbip/libsrc/usbip_common.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/kernel/tools/usb/usbip/libsrc/vhci_driver.c b/kernel/tools/usb/usbip/libsrc/vhci_driver.c
index 9bd2cd716..5727dfb15 100644
--- a/kernel/tools/usb/usbip/libsrc/vhci_driver.c
+++ b/kernel/tools/usb/usbip/libsrc/vhci_driver.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/kernel/tools/usb/usbip/libsrc/vhci_driver.h b/kernel/tools/usb/usbip/libsrc/vhci_driver.h
index 4898d3baf..418b404d5 100644
--- a/kernel/tools/usb/usbip/libsrc/vhci_driver.h
+++ b/kernel/tools/usb/usbip/libsrc/vhci_driver.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/kernel/tools/usb/usbip/src/Makefile.am b/kernel/tools/usb/usbip/src/Makefile.am
index e81a4ebad..e26f39e05 100644
--- a/kernel/tools/usb/usbip/src/Makefile.am
+++ b/kernel/tools/usb/usbip/src/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 AM_CPPFLAGS = -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
 AM_CFLAGS   = @EXTRA_CFLAGS@
 LDADD       = $(top_builddir)/libsrc/libusbip.la
diff --git a/kernel/tools/usb/usbip/src/usbip_network.h b/kernel/tools/usb/usbip/src/usbip_network.h
index c1e875cf1..703268762 100644
--- a/kernel/tools/usb/usbip/src/usbip_network.h
+++ b/kernel/tools/usb/usbip/src/usbip_network.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/kernel/tools/virtio/Makefile b/kernel/tools/virtio/Makefile
index 39c89a5ea..8e2a90811 100644
--- a/kernel/tools/virtio/Makefile
+++ b/kernel/tools/virtio/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all: test mod
 test: virtio_test vringh_test
 virtio_test: virtio_ring.o virtio_test.o
diff --git a/kernel/tools/virtio/asm/barrier.h b/kernel/tools/virtio/asm/barrier.h
index ba34f9e96..0ac3caf90 100644
--- a/kernel/tools/virtio/asm/barrier.h
+++ b/kernel/tools/virtio/asm/barrier.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if defined(__i386__) || defined(__x86_64__)
 #define barrier() asm volatile("" ::: "memory")
 #define virt_mb() __sync_synchronize()
diff --git a/kernel/tools/virtio/linux/bug.h b/kernel/tools/virtio/linux/bug.h
index fb94f0787..b14c2c3b6 100644
--- a/kernel/tools/virtio/linux/bug.h
+++ b/kernel/tools/virtio/linux/bug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef BUG_H
 #define BUG_H
 
diff --git a/kernel/tools/virtio/linux/compiler.h b/kernel/tools/virtio/linux/compiler.h
index c9ccfd42e..903dc9c4b 100644
--- a/kernel/tools/virtio/linux/compiler.h
+++ b/kernel/tools/virtio/linux/compiler.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_COMPILER_H
 #define LINUX_COMPILER_H
 
diff --git a/kernel/tools/virtio/linux/dma-mapping.h b/kernel/tools/virtio/linux/dma-mapping.h
index 18601f668..1571e24e9 100644
--- a/kernel/tools/virtio/linux/dma-mapping.h
+++ b/kernel/tools/virtio/linux/dma-mapping.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_DMA_MAPPING_H
 #define _LINUX_DMA_MAPPING_H
 
diff --git a/kernel/tools/virtio/linux/err.h b/kernel/tools/virtio/linux/err.h
index e32eff8b2..0943c644a 100644
--- a/kernel/tools/virtio/linux/err.h
+++ b/kernel/tools/virtio/linux/err.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef ERR_H
 #define ERR_H
 #define MAX_ERRNO	4095
diff --git a/kernel/tools/virtio/linux/kernel.h b/kernel/tools/virtio/linux/kernel.h
index d9554fc3f..395521a7a 100644
--- a/kernel/tools/virtio/linux/kernel.h
+++ b/kernel/tools/virtio/linux/kernel.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef KERNEL_H
 #define KERNEL_H
 #include <stdbool.h>
diff --git a/kernel/tools/virtio/linux/module.h b/kernel/tools/virtio/linux/module.h
index 28ce95a05..9dfa96fea 100644
--- a/kernel/tools/virtio/linux/module.h
+++ b/kernel/tools/virtio/linux/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/export.h>
 
 #define MODULE_LICENSE(__MODULE_LICENSE_value) \
diff --git a/kernel/tools/virtio/linux/scatterlist.h b/kernel/tools/virtio/linux/scatterlist.h
index 68c9e2adc..9a45f90e2 100644
--- a/kernel/tools/virtio/linux/scatterlist.h
+++ b/kernel/tools/virtio/linux/scatterlist.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef SCATTERLIST_H
 #define SCATTERLIST_H
 #include <linux/kernel.h>
diff --git a/kernel/tools/virtio/linux/slab.h b/kernel/tools/virtio/linux/slab.h
index 7e1c1197d..319dcaa07 100644
--- a/kernel/tools/virtio/linux/slab.h
+++ b/kernel/tools/virtio/linux/slab.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_SLAB_H
 #define GFP_KERNEL 0
 #define GFP_ATOMIC 0
diff --git a/kernel/tools/virtio/linux/uaccess.h b/kernel/tools/virtio/linux/uaccess.h
index fa05d01b2..991dfb263 100644
--- a/kernel/tools/virtio/linux/uaccess.h
+++ b/kernel/tools/virtio/linux/uaccess.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef UACCESS_H
 #define UACCESS_H
 
diff --git a/kernel/tools/virtio/linux/virtio.h b/kernel/tools/virtio/linux/virtio.h
index d8f534025..b751350d4 100644
--- a/kernel/tools/virtio/linux/virtio.h
+++ b/kernel/tools/virtio/linux/virtio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef LINUX_VIRTIO_H
 #define LINUX_VIRTIO_H
 #include <linux/scatterlist.h>
diff --git a/kernel/tools/virtio/linux/virtio_byteorder.h b/kernel/tools/virtio/linux/virtio_byteorder.h
index 9de9e6ac1..5b50f7eeb 100644
--- a/kernel/tools/virtio/linux/virtio_byteorder.h
+++ b/kernel/tools/virtio/linux/virtio_byteorder.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _LINUX_VIRTIO_BYTEORDER_STUB_H
 #define _LINUX_VIRTIO_BYTEORDER_STUB_H
 
diff --git a/kernel/tools/virtio/linux/virtio_config.h b/kernel/tools/virtio/linux/virtio_config.h
index 9ba11815e..dbf14c1e2 100644
--- a/kernel/tools/virtio/linux/virtio_config.h
+++ b/kernel/tools/virtio/linux/virtio_config.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #include <linux/virtio_byteorder.h>
 #include <linux/virtio.h>
 #include <uapi/linux/virtio_config.h>
diff --git a/kernel/tools/virtio/ringtest/Makefile b/kernel/tools/virtio/ringtest/Makefile
index c012edbdb..85c98c281 100644
--- a/kernel/tools/virtio/ringtest/Makefile
+++ b/kernel/tools/virtio/ringtest/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 all:
 
 all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring noring
diff --git a/kernel/tools/virtio/ringtest/noring.c b/kernel/tools/virtio/ringtest/noring.c
index b8d1c1daa..ce2440d5c 100644
--- a/kernel/tools/virtio/ringtest/noring.c
+++ b/kernel/tools/virtio/ringtest/noring.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include "main.h"
 #include <assert.h>
diff --git a/kernel/tools/virtio/ringtest/ptr_ring.c b/kernel/tools/virtio/ringtest/ptr_ring.c
index 7b22f1b20..38bb171ac 100644
--- a/kernel/tools/virtio/ringtest/ptr_ring.c
+++ b/kernel/tools/virtio/ringtest/ptr_ring.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include "main.h"
 #include <stdlib.h>
diff --git a/kernel/tools/virtio/ringtest/run-on-all.sh b/kernel/tools/virtio/ringtest/run-on-all.sh
index 29b0d3920..dcc3ea758 100755
--- a/kernel/tools/virtio/ringtest/run-on-all.sh
+++ b/kernel/tools/virtio/ringtest/run-on-all.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
 
 CPUS_ONLINE=$(lscpu --online -p=cpu|grep -v -e '#')
 #use last CPU for host. Why not the first?
diff --git a/kernel/tools/virtio/uapi/linux/virtio_ring.h b/kernel/tools/virtio/uapi/linux/virtio_ring.h
index 4d99c7823..cf50b2e5f 100644
--- a/kernel/tools/virtio/uapi/linux/virtio_ring.h
+++ b/kernel/tools/virtio/uapi/linux/virtio_ring.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef VIRTIO_RING_H
 #define VIRTIO_RING_H
 #include "../../../../include/uapi/linux/virtio_ring.h"
diff --git a/kernel/tools/virtio/virtio-trace/Makefile b/kernel/tools/virtio/virtio-trace/Makefile
index 0d2381633..7843ebcda 100644
--- a/kernel/tools/virtio/virtio-trace/Makefile
+++ b/kernel/tools/virtio/virtio-trace/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 CC = gcc
 CFLAGS = -O2 -Wall -pthread
 
diff --git a/kernel/tools/virtio/virtio-trace/trace-agent.h b/kernel/tools/virtio/virtio-trace/trace-agent.h
index 8de79bfea..e67885969 100644
--- a/kernel/tools/virtio/virtio-trace/trace-agent.h
+++ b/kernel/tools/virtio/virtio-trace/trace-agent.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __TRACE_AGENT_H__
 #define __TRACE_AGENT_H__
 #include <pthread.h>
diff --git a/kernel/tools/virtio/virtio_test.c b/kernel/tools/virtio/virtio_test.c
index 0fecaec90..b427def67 100644
--- a/kernel/tools/virtio/virtio_test.c
+++ b/kernel/tools/virtio/virtio_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE
 #include <getopt.h>
 #include <string.h>
diff --git a/kernel/tools/virtio/vringh_test.c b/kernel/tools/virtio/vringh_test.c
index 9476c616d..293653463 100644
--- a/kernel/tools/virtio/vringh_test.c
+++ b/kernel/tools/virtio/vringh_test.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /* Simple test of virtio code, entirely in userpsace. */
 #define _GNU_SOURCE
 #include <sched.h>
diff --git a/kernel/tools/vm/Makefile b/kernel/tools/vm/Makefile
index 006029456..be320b905 100644
--- a/kernel/tools/vm/Makefile
+++ b/kernel/tools/vm/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # Makefile for vm tools
 #
 TARGETS=page-types slabinfo page_owner_sort
diff --git a/kernel/tools/vm/page_owner_sort.c b/kernel/tools/vm/page_owner_sort.c
index f1c055f3c..18fc112b6 100644
--- a/kernel/tools/vm/page_owner_sort.c
+++ b/kernel/tools/vm/page_owner_sort.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * User-space helper to sort the output of /sys/kernel/debug/page_owner
  *
diff --git a/kernel/tools/vm/slabinfo.c b/kernel/tools/vm/slabinfo.c
index b9d34b37c..b0b7ef6d0 100644
--- a/kernel/tools/vm/slabinfo.c
+++ b/kernel/tools/vm/slabinfo.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Slabinfo: Tool to get reports about slabs
  *
diff --git a/kernel/usr/Kconfig b/kernel/usr/Kconfig
index d53112fdb..43658b8a9 100644
--- a/kernel/usr/Kconfig
+++ b/kernel/usr/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Configuration for initramfs
 #
diff --git a/kernel/usr/Makefile b/kernel/usr/Makefile
index 0b87e71c0..237a02869 100644
--- a/kernel/usr/Makefile
+++ b/kernel/usr/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # kbuild file for usr/ - including initramfs image
 #
@@ -7,6 +8,7 @@ PHONY += klibcdirs
 
 suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION))
 datafile_y = initramfs_data.cpio$(suffix_y)
+datafile_d_y = .$(datafile_y).d
 AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/$(datafile_y)"
 
 
@@ -29,12 +31,12 @@ ramfs-args  := \
         $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
         $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))
 
-# .initramfs_data.cpio.d is used to identify all files included
+# $(datafile_d_y) is used to identify all files included
 # in initramfs and to detect if any files are added/removed.
 # Removed files are identified by directory timestamp being updated
 # The dependency list is generated by gen_initramfs.sh -l
-ifneq ($(wildcard $(obj)/.initramfs_data.cpio.d),)
-	include $(obj)/.initramfs_data.cpio.d
+ifneq ($(wildcard $(obj)/$(datafile_d_y)),)
+	include $(obj)/$(datafile_d_y)
 endif
 
 quiet_cmd_initfs = GEN     $@
@@ -52,5 +54,5 @@ $(deps_initramfs): klibcdirs
 # 3) If gen_init_cpio are newer than initramfs_data.cpio
 # 4) arguments to gen_initramfs.sh changes
 $(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
-	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
+	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/$(datafile_d_y)
 	$(call if_changed,initfs)
diff --git a/kernel/usr/gen_init_cpio.c b/kernel/usr/gen_init_cpio.c
index 225ad244c..03b21189d 100644
--- a/kernel/usr/gen_init_cpio.c
+++ b/kernel/usr/gen_init_cpio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/kernel/usr/initramfs_data.S b/kernel/usr/initramfs_data.S
index c14322d1c..10d325e24 100644
--- a/kernel/usr/initramfs_data.S
+++ b/kernel/usr/initramfs_data.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
   initramfs_data includes the compressed binary that is the
   filesystem used for early user space.
diff --git a/kernel/virt/kvm/Kconfig b/kernel/virt/kvm/Kconfig
index b0cc1a34d..70691c08e 100644
--- a/kernel/virt/kvm/Kconfig
+++ b/kernel/virt/kvm/Kconfig
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 # KVM common configuration items and defaults
 
 config HAVE_KVM
diff --git a/kernel/virt/kvm/arm/arm.c b/kernel/virt/kvm/arm/arm.c
index b9f68e4ad..95cba0799 100644
--- a/kernel/virt/kvm/arm/arm.c
+++ b/kernel/virt/kvm/arm/arm.c
@@ -1326,21 +1326,12 @@ static void teardown_hyp_mode(void)
 {
 	int cpu;
 
-	if (is_kernel_in_hyp_mode())
-		return;
-
 	free_hyp_pgds();
 	for_each_possible_cpu(cpu)
 		free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
 	hyp_cpu_pm_exit();
 }
 
-static int init_vhe_mode(void)
-{
-	kvm_info("VHE mode initialized successfully\n");
-	return 0;
-}
-
 /**
  * Inits Hyp-mode on all online CPUs
  */
@@ -1421,8 +1412,6 @@ static int init_hyp_mode(void)
 		}
 	}
 
-	kvm_info("Hyp mode initialized successfully\n");
-
 	return 0;
 
 out_err:
@@ -1456,6 +1445,7 @@ int kvm_arch_init(void *opaque)
 {
 	int err;
 	int ret, cpu;
+	bool in_hyp_mode;
 
 	if (!is_hyp_mode_available()) {
 		kvm_err("HYP mode not available\n");
@@ -1474,21 +1464,28 @@ int kvm_arch_init(void *opaque)
 	if (err)
 		return err;
 
-	if (is_kernel_in_hyp_mode())
-		err = init_vhe_mode();
-	else
+	in_hyp_mode = is_kernel_in_hyp_mode();
+
+	if (!in_hyp_mode) {
 		err = init_hyp_mode();
-	if (err)
-		goto out_err;
+		if (err)
+			goto out_err;
+	}
 
 	err = init_subsystems();
 	if (err)
 		goto out_hyp;
 
+	if (in_hyp_mode)
+		kvm_info("VHE mode initialized successfully\n");
+	else
+		kvm_info("Hyp mode initialized successfully\n");
+
 	return 0;
 
 out_hyp:
-	teardown_hyp_mode();
+	if (!in_hyp_mode)
+		teardown_hyp_mode();
 out_err:
 	teardown_common_resources();
 	return err;
diff --git a/kernel/virt/kvm/arm/trace.h b/kernel/virt/kvm/arm/trace.h
index f7dc5ddd6..e53b596f4 100644
--- a/kernel/virt/kvm/arm/trace.h
+++ b/kernel/virt/kvm/arm/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_KVM_H
 
diff --git a/kernel/virt/kvm/arm/vgic/trace.h b/kernel/virt/kvm/arm/vgic/trace.h
index ed3229282..55fed77a9 100644
--- a/kernel/virt/kvm/arm/vgic/trace.h
+++ b/kernel/virt/kvm/arm/vgic/trace.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #if !defined(_TRACE_VGIC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_VGIC_H
 
diff --git a/kernel/virt/kvm/arm/vgic/vgic-its.c b/kernel/virt/kvm/arm/vgic/vgic-its.c
index f51c1e1b3..547f12dc4 100644
--- a/kernel/virt/kvm/arm/vgic/vgic-its.c
+++ b/kernel/virt/kvm/arm/vgic/vgic-its.c
@@ -1466,6 +1466,16 @@ static void vgic_mmio_write_its_ctlr(struct kvm *kvm, struct vgic_its *its,
 {
 	mutex_lock(&its->cmd_lock);
 
+	/*
+	 * It is UNPREDICTABLE to enable the ITS if any of the CBASER or
+	 * device/collection BASER are invalid
+	 */
+	if (!its->enabled && (val & GITS_CTLR_ENABLE) &&
+		(!(its->baser_device_table & GITS_BASER_VALID) ||
+		 !(its->baser_coll_table & GITS_BASER_VALID) ||
+		 !(its->cbaser & GITS_CBASER_VALID)))
+		goto out;
+
 	its->enabled = !!(val & GITS_CTLR_ENABLE);
 
 	/*
@@ -1474,6 +1484,7 @@ static void vgic_mmio_write_its_ctlr(struct kvm *kvm, struct vgic_its *its,
 	 */
 	vgic_its_process_commands(kvm, its);
 
+out:
 	mutex_unlock(&its->cmd_lock);
 }
 
@@ -1801,37 +1812,33 @@ typedef int (*entry_fn_t)(struct vgic_its *its, u32 id, void *entry,
 static int scan_its_table(struct vgic_its *its, gpa_t base, int size, int esz,
 			  int start_id, entry_fn_t fn, void *opaque)
 {
-	void *entry = kzalloc(esz, GFP_KERNEL);
 	struct kvm *kvm = its->dev->kvm;
 	unsigned long len = size;
 	int id = start_id;
 	gpa_t gpa = base;
+	char entry[esz];
 	int ret;
 
+	memset(entry, 0, esz);
+
 	while (len > 0) {
 		int next_offset;
 		size_t byte_offset;
 
 		ret = kvm_read_guest(kvm, gpa, entry, esz);
 		if (ret)
-			goto out;
+			return ret;
 
 		next_offset = fn(its, id, entry, opaque);
-		if (next_offset <= 0) {
-			ret = next_offset;
-			goto out;
-		}
+		if (next_offset <= 0)
+			return next_offset;
 
 		byte_offset = next_offset * esz;
 		id += next_offset;
 		gpa += byte_offset;
 		len -= byte_offset;
 	}
-	ret =  1;
-
-out:
-	kfree(entry);
-	return ret;
+	return 1;
 }
 
 /**
@@ -1940,6 +1947,14 @@ static int vgic_its_save_itt(struct vgic_its *its, struct its_device *device)
 	return 0;
 }
 
+/**
+ * vgic_its_restore_itt - restore the ITT of a device
+ *
+ * @its: its handle
+ * @dev: device handle
+ *
+ * Return 0 on success, < 0 on error
+ */
 static int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev)
 {
 	const struct vgic_its_abi *abi = vgic_its_get_abi(its);
@@ -1951,6 +1966,10 @@ static int vgic_its_restore_itt(struct vgic_its *its, struct its_device *dev)
 	ret = scan_its_table(its, base, max_size, ite_esz, 0,
 			     vgic_its_restore_ite, dev);
 
+	/* scan_its_table returns +1 if all ITEs are invalid */
+	if (ret > 0)
+		ret = 0;
+
 	return ret;
 }
 
@@ -2048,11 +2067,12 @@ static int vgic_its_device_cmp(void *priv, struct list_head *a,
 static int vgic_its_save_device_tables(struct vgic_its *its)
 {
 	const struct vgic_its_abi *abi = vgic_its_get_abi(its);
+	u64 baser = its->baser_device_table;
 	struct its_device *dev;
 	int dte_esz = abi->dte_esz;
-	u64 baser;
 
-	baser = its->baser_device_table;
+	if (!(baser & GITS_BASER_VALID))
+		return 0;
 
 	list_sort(NULL, &its->device_list, vgic_its_device_cmp);
 
@@ -2107,10 +2127,7 @@ static int handle_l1_dte(struct vgic_its *its, u32 id, void *addr,
 	ret = scan_its_table(its, gpa, SZ_64K, dte_esz,
 			     l2_start_id, vgic_its_restore_dte, NULL);
 
-	if (ret <= 0)
-		return ret;
-
-	return 1;
+	return ret;
 }
 
 /**
@@ -2140,8 +2157,9 @@ static int vgic_its_restore_device_tables(struct vgic_its *its)
 				     vgic_its_restore_dte, NULL);
 	}
 
+	/* scan_its_table returns +1 if all entries are invalid */
 	if (ret > 0)
-		ret = -EINVAL;
+		ret = 0;
 
 	return ret;
 }
@@ -2198,17 +2216,17 @@ static int vgic_its_restore_cte(struct vgic_its *its, gpa_t gpa, int esz)
 static int vgic_its_save_collection_table(struct vgic_its *its)
 {
 	const struct vgic_its_abi *abi = vgic_its_get_abi(its);
+	u64 baser = its->baser_coll_table;
+	gpa_t gpa = BASER_ADDRESS(baser);
 	struct its_collection *collection;
 	u64 val;
-	gpa_t gpa;
 	size_t max_size, filled = 0;
 	int ret, cte_esz = abi->cte_esz;
 
-	gpa = BASER_ADDRESS(its->baser_coll_table);
-	if (!gpa)
+	if (!(baser & GITS_BASER_VALID))
 		return 0;
 
-	max_size = GITS_BASER_NR_PAGES(its->baser_coll_table) * SZ_64K;
+	max_size = GITS_BASER_NR_PAGES(baser) * SZ_64K;
 
 	list_for_each_entry(collection, &its->collection_list, coll_list) {
 		ret = vgic_its_save_cte(its, collection, gpa, cte_esz);
@@ -2239,17 +2257,18 @@ static int vgic_its_save_collection_table(struct vgic_its *its)
 static int vgic_its_restore_collection_table(struct vgic_its *its)
 {
 	const struct vgic_its_abi *abi = vgic_its_get_abi(its);
+	u64 baser = its->baser_coll_table;
 	int cte_esz = abi->cte_esz;
 	size_t max_size, read = 0;
 	gpa_t gpa;
 	int ret;
 
-	if (!(its->baser_coll_table & GITS_BASER_VALID))
+	if (!(baser & GITS_BASER_VALID))
 		return 0;
 
-	gpa = BASER_ADDRESS(its->baser_coll_table);
+	gpa = BASER_ADDRESS(baser);
 
-	max_size = GITS_BASER_NR_PAGES(its->baser_coll_table) * SZ_64K;
+	max_size = GITS_BASER_NR_PAGES(baser) * SZ_64K;
 
 	while (read < max_size) {
 		ret = vgic_its_restore_cte(its, gpa, cte_esz);
@@ -2258,6 +2277,10 @@ static int vgic_its_restore_collection_table(struct vgic_its *its)
 		gpa += cte_esz;
 		read += cte_esz;
 	}
+
+	if (ret > 0)
+		return 0;
+
 	return ret;
 }
 
diff --git a/kernel/virt/kvm/coalesced_mmio.c b/kernel/virt/kvm/coalesced_mmio.c
index 571c1ce37..9e65feb6f 100644
--- a/kernel/virt/kvm/coalesced_mmio.c
+++ b/kernel/virt/kvm/coalesced_mmio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * KVM coalesced MMIO
  *
diff --git a/kernel/virt/kvm/coalesced_mmio.h b/kernel/virt/kvm/coalesced_mmio.h
index 6bca74ca5..36f84264e 100644
--- a/kernel/virt/kvm/coalesced_mmio.h
+++ b/kernel/virt/kvm/coalesced_mmio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KVM_COALESCED_MMIO_H__
 #define __KVM_COALESCED_MMIO_H__
 
diff --git a/kernel/virt/kvm/vfio.h b/kernel/virt/kvm/vfio.h
index ab88c7dc0..e130a4a03 100644
--- a/kernel/virt/kvm/vfio.h
+++ b/kernel/virt/kvm/vfio.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __KVM_VFIO_H
 #define __KVM_VFIO_H