diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 617a2b3f758219b3dc7d9b6a592a68eea8edb060..b97b479e4f64f6800cf1ca8d0937019fea0f1489 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Common Block IO controller cgroup interface
  *
diff --git a/block/blk-core.c b/block/blk-core.c
index a55389ba877964e5ad69f173ed0a3fa001bb9936..b044829135c926b8d4b32a82b563fd9b0f790058 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 1991, 1992 Linus Torvalds
  * Copyright (C) 1994,      Karl Keyte: Added support for disk statistics
diff --git a/block/blk-exec.c b/block/blk-exec.c
index a34b7d9187426cbfe93bb5d8115da2b62fadd1fb..1db44ca0f4a6d07845d0a4af2ac1385e1ab1c067 100644
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to setting various queue properties from drivers
  */
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 507212d75ee2c473c1ca8fd38f9eeedc1d6894ee..d22e61bced86dbe3cf4cfb4df047c234c1ae9c0d 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Block rq-qos base io controller
  *
diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c
index 03a53482027150819aaf69769a5c07d0cd5b8a64..48bebf00a5f31b981305c3f1a9514d2b8c11783a 100644
--- a/block/blk-mq-cpumap.c
+++ b/block/blk-mq-cpumap.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * CPU <-> hardware queue mapping helpers
  *
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index aa6bc5c0264388a549956c3f8acb57c1d144fb5f..f6e3b10b52eb1096bb9d26bcda9d2859ebaf0c93 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * blk-mq scheduling framework
  *
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 3f9c3f4ac44ca4632e0f2c25dce8164a08b5b916..61efc2a29e5880bdc9319620999f2e74e29bc2b4 100644
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/backing-dev.h>
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index a4931fc7be8abf687646312244995a818056e9e3..7513c8eaabee99bfd34e8dfe82c3c0f344d88fd3 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Tag allocation using scalable bitmaps. Uses active queue tracking to support
  * fairer distribution of tags between multiple submitters when a shared tag map
diff --git a/block/blk-mq.c b/block/blk-mq.c
index fc60ed7e940ead5ae7d7332ee9f64b9ffe922aca..4f15adfbab2975cd8933fa0b77187a4bc3754913 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Block multiqueue core code
  *
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index d169d7188fa6401df41857cde779f34ad453ad9e..3f55b56f24bcbe90f7b5324150e3dd51c6ee0a49 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
 #include "blk-rq-qos.h"
 
 /*
diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h
index 56485188955091b9c2b4c232e349637e103f872a..2300e038b9fafa2353394ab71ee76b40269e6672 100644
--- a/block/blk-rq-qos.h
+++ b/block/blk-rq-qos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef RQ_QOS_H
 #define RQ_QOS_H
 
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 6375afaedcec1a5e1046a23441e5e410f080cec8..ec150f88db09b4a9682e1e905ac368ee18dc155e 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to setting various queue properties from drivers
  */
diff --git a/block/blk-stat.c b/block/blk-stat.c
index 696a04176e4da44d3b5e04b57170d8c47c739d67..940f15d600f8a7dc32a3bd77f650e6e53d9f66fc 100644
--- a/block/blk-stat.c
+++ b/block/blk-stat.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Block stat tracking code
  *
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 124c26128bf6d8f626164d1553c4338d18efa245..8aa68fae96ad8d87b41890cc8a77654a60feecbc 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Functions related to generic timeout handling of requests.
  */
diff --git a/block/blk-wbt.c b/block/blk-wbt.c
index fd166fbb0f6587c494e6095b8bf6e58de0c67360..313f45a37e9d5f1c2771e680a4abcdb62e207301 100644
--- a/block/blk-wbt.c
+++ b/block/blk-wbt.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * buffered writeback throttling. loosely based on CoDel. We can't drop
  * packets for IO scheduling, so the logic is something like this:
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 2d98803faec24092066d466fee18e33df45131d4..ae7e91bd06187c6b410f81370b00a8ac9c21cd68 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Zoned block device handling
  *
diff --git a/block/elevator.c b/block/elevator.c
index 2e5399d9f40f9739c232e6aece48d7224a54b6c6..ec55d5fc0b3e75cf369182d61c6009cd7791c35e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  Block device elevator/IO-scheduler.
  *
diff --git a/block/genhd.c b/block/genhd.c
index 83f5c33d1e802b74af7678398099a0624aec0dbb..ad6826628e79816c671d173d6cd47f9fe793313f 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  gendisk handling
  */
diff --git a/block/ioctl.c b/block/ioctl.c
index 4825c78a6baacba04ba84ad823e43acf15878c4f..15a0eb80ada902a6c7a0cf8816943b385929edbe 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/capability.h>
 #include <linux/blkdev.h>
 #include <linux/export.h>
diff --git a/block/ioprio.c b/block/ioprio.c
index f9821080c92ccbc242ef9d2f819d06588c3d7fe9..2e0559f157c89c0c872dc4ad32d9df0c53f9cc14 100644
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fs/ioprio.c
  *
diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 14288f864e94c45a1d634a0b449be268b8fbe196..1876f5712bfdbd30e85234f5dce3773e823577f9 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  *  MQ Deadline i/o scheduler - adaptation of the legacy deadline scheduler,
  *  for the blk-mq scheduling framework
diff --git a/block/partitions/aix.h b/block/partitions/aix.h
index e0c66a987523169a5f76764150d735cd1a66fb48..b4449f0b9f2b59a20b52ed131e95b60f83d4e7d6 100644
--- a/block/partitions/aix.h
+++ b/block/partitions/aix.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern int aix_partition(struct parsed_partitions *state);
diff --git a/block/partitions/amiga.h b/block/partitions/amiga.h
index d094585cadaa7836582c5b3bb7860ab36ddbd60f..7e63f4d9d969b9aff9b1095504fe5cb67685ff6d 100644
--- a/block/partitions/amiga.h
+++ b/block/partitions/amiga.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/amiga.h
  */
diff --git a/block/partitions/ibm.h b/block/partitions/ibm.h
index 08fb0804a812cde18897cf357a41d76d2f525aa1..8bf13febb2b6ce60ac5e2a6edfdf0f33c2d97e9a 100644
--- a/block/partitions/ibm.h
+++ b/block/partitions/ibm.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 int ibm_partition(struct parsed_partitions *);
diff --git a/block/partitions/karma.h b/block/partitions/karma.h
index c764b2e9df21eb7818edc3414fcb7ef491b298d0..48e074d417fb6c1d24d48f356a082ff0349bbff7 100644
--- a/block/partitions/karma.h
+++ b/block/partitions/karma.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/karma.h
  */
diff --git a/block/partitions/msdos.h b/block/partitions/msdos.h
index 38c781c490b34599771dd4e078df93ac08f89ba4..fcacfc48609213f69f23cf1bcda86e85a76f99ef 100644
--- a/block/partitions/msdos.h
+++ b/block/partitions/msdos.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/msdos.h
  */
diff --git a/block/partitions/osf.h b/block/partitions/osf.h
index 20ed2315ec16add78b00478ff59523697960e0de..4d8088e7ea8cc7dcf64932a2978de2e1c689671a 100644
--- a/block/partitions/osf.h
+++ b/block/partitions/osf.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/osf.h
  */
diff --git a/block/partitions/sgi.h b/block/partitions/sgi.h
index b9553ebdd5a93dfed99f73e444e42bec0c86240d..a5b77c3987cf2c4947c092e0f31dd1bbcd96b7c4 100644
--- a/block/partitions/sgi.h
+++ b/block/partitions/sgi.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/sgi.h
  */
diff --git a/block/partitions/sun.h b/block/partitions/sun.h
index 2424baa8319f11e81a296e78a46ef85a25c75825..ae1b9eed3fd73c7e4f181a4ad4f5383cbe7562fc 100644
--- a/block/partitions/sun.h
+++ b/block/partitions/sun.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/sun.h
  */
diff --git a/block/partitions/sysv68.h b/block/partitions/sysv68.h
index bf2f5ffa97ac85c6edc5fd1054595bd8e9590dea..4fb6b8ec78aeda5e4ac7d7b056b6fda656014f02 100644
--- a/block/partitions/sysv68.h
+++ b/block/partitions/sysv68.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 extern int sysv68_partition(struct parsed_partitions *state);
diff --git a/block/partitions/ultrix.h b/block/partitions/ultrix.h
index a3cc00b2bdedbdf1cce74edcb920128c400e5d50..9f676cead222af78e3d651f5b678fb884c495d25 100644
--- a/block/partitions/ultrix.h
+++ b/block/partitions/ultrix.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  fs/partitions/ultrix.h
  */