diff --git a/PORTING.md b/PORTING.md
index c20923e38..06b25a527 100644
--- a/PORTING.md
+++ b/PORTING.md
@@ -19,4 +19,3 @@ integrated into the SPDK build by updating the following line
 in CONFIG:
 
     CONFIG_NVME_IMPL=nvme_impl.h
-
diff --git a/autorun.sh b/autorun.sh
index f06a333e8..aacae88b2 100755
--- a/autorun.sh
+++ b/autorun.sh
@@ -8,4 +8,3 @@ rootdir=$(readlink -f $(dirname $0))
 $rootdir/autobuild.sh
 sudo $rootdir/autotest.sh
 $rootdir/autopackage.sh
-
diff --git a/doc/stylesheet.css b/doc/stylesheet.css
index c25d8af8e..9fca86a38 100644
--- a/doc/stylesheet.css
+++ b/doc/stylesheet.css
@@ -1354,4 +1354,3 @@ tr.heading h2 {
     display:inline;
   }
 }
-
diff --git a/etc/spdk/iscsi.conf.in b/etc/spdk/iscsi.conf.in
index 593dc253c..5e8263906 100644
--- a/etc/spdk/iscsi.conf.in
+++ b/etc/spdk/iscsi.conf.in
@@ -165,4 +165,3 @@
   UseDigest Auto
   LUN0 Nvme0
   QueueDepth 32
-
diff --git a/lib/bdev/aio/blockdev_aio.h b/lib/bdev/aio/blockdev_aio.h
index 38ea44bb7..911584703 100644
--- a/lib/bdev/aio/blockdev_aio.h
+++ b/lib/bdev/aio/blockdev_aio.h
@@ -72,4 +72,3 @@ struct file_disk {
 struct file_disk *create_aio_disk(char *fname);
 
 #endif // SPDK_BLOCKDEV_AIO_H
-
diff --git a/lib/cunit/spdk_cunit.c b/lib/cunit/spdk_cunit.c
index a4b5e5f3c..29e1d4b21 100644
--- a/lib/cunit/spdk_cunit.c
+++ b/lib/cunit/spdk_cunit.c
@@ -110,4 +110,3 @@ spdk_cunit_print_results(const char *filename)
 	fclose(out);
 	return 0;
 }
-
diff --git a/lib/env/env.mk b/lib/env/env.mk
index 1748e3b43..7b1c1a2b6 100644
--- a/lib/env/env.mk
+++ b/lib/env/env.mk
@@ -70,4 +70,3 @@ ENV_CFLAGS = $(DPDK_INC)
 ENV_CXXFLAGS = $(ENV_CFLAGS)
 ENV_LIBS = $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a $(DPDK_LIB)
 ENV_LINKER_ARGS = -Wl,--start-group -Wl,--whole-archive $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive
-
diff --git a/lib/iscsi/conn.h b/lib/iscsi/conn.h
index 3cad49ab5..e4e9ae66e 100644
--- a/lib/iscsi/conn.h
+++ b/lib/iscsi/conn.h
@@ -177,4 +177,3 @@ int spdk_iscsi_conn_read_data(struct spdk_iscsi_conn *conn, int len,
 			      void *buf);
 
 #endif /* SPDK_ISCSI_CONN_H */
-
diff --git a/lib/iscsi/task.c b/lib/iscsi/task.c
index b9a435858..5a4b280bf 100644
--- a/lib/iscsi/task.c
+++ b/lib/iscsi/task.c
@@ -64,4 +64,3 @@ spdk_iscsi_task_get(uint32_t *owner_task_ctr, struct spdk_iscsi_task *parent)
 
 	return task;
 }
-
diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c
index 01b40024f..cd7135e74 100644
--- a/lib/nvme/nvme_qpair.c
+++ b/lib/nvme/nvme_qpair.c
@@ -1090,4 +1090,3 @@ nvme_qpair_fail(struct spdk_nvme_qpair *qpair)
 						   SPDK_NVME_SC_ABORTED_BY_REQUEST, 1 /* do not retry */, true);
 	}
 }
-
diff --git a/lib/util/io_channel.c b/lib/util/io_channel.c
index 451538bbd..32ceb98d5 100644
--- a/lib/util/io_channel.c
+++ b/lib/util/io_channel.c
@@ -215,4 +215,3 @@ spdk_io_channel_get_ctx(struct spdk_io_channel *ch)
 {
 	return (uint8_t *)ch + sizeof(*ch);
 }
-
diff --git a/scripts/eofnl b/scripts/eofnl
index a193b5da4..004a0c029 100755
--- a/scripts/eofnl
+++ b/scripts/eofnl
@@ -8,10 +8,19 @@ if [ -z "$f" ]; then
 	exit 1
 fi
 
-if [[ -f "$f" && $(tail -c1 "$f") ]]; then
+if [ ! -f "$f" ]; then
+	exit 0
+fi
+
+if [[ $(tail -c1 "$f") ]]; then
 	echo "$f: No newline at end of file"
 	echo '' >> "$f"
 	exit 1
-else
-	exit 0
 fi
+
+if [[ ! $(tail -c2 "$f") ]]; then
+	echo "$f: Extra trailing newline"
+	exit 1
+fi
+
+exit 0
diff --git a/test/iscsi_tgt/calsoft/its.conf b/test/iscsi_tgt/calsoft/its.conf
index 9d52d5a19..15325da1e 100644
--- a/test/iscsi_tgt/calsoft/its.conf
+++ b/test/iscsi_tgt/calsoft/its.conf
@@ -6,4 +6,3 @@ IP=127.0.0.1
 AuthMethod=CHAP,None
 UserName=root
 PassWord=tester
-
diff --git a/test/lib/log/log_ut.c b/test/lib/log/log_ut.c
index dd34b685b..a60c0df07 100644
--- a/test/lib/log/log_ut.c
+++ b/test/lib/log/log_ut.c
@@ -106,4 +106,3 @@ int main(int argc, char **argv)
 	CU_cleanup_registry();
 	return num_failures;
 }
-
diff --git a/test/lib/nvme/unit/nvme_c/Makefile b/test/lib/nvme/unit/nvme_c/Makefile
index 21aab7063..34e14ef02 100644
--- a/test/lib/nvme/unit/nvme_c/Makefile
+++ b/test/lib/nvme/unit/nvme_c/Makefile
@@ -36,4 +36,3 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 TEST_FILE = nvme_ut.c
 
 include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk
-
diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile b/test/lib/nvme/unit/nvme_ctrlr_c/Makefile
index e57121dd7..5c08063d1 100644
--- a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile
+++ b/test/lib/nvme/unit/nvme_ctrlr_c/Makefile
@@ -37,4 +37,3 @@ TEST_FILE = nvme_ctrlr_ut.c
 OTHER_FILES = nvme_intel.c
 
 include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk
-
diff --git a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile b/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile
index 6b5f44ee3..b219358ed 100644
--- a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile
+++ b/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile
@@ -36,4 +36,3 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 TEST_FILE = nvme_ctrlr_cmd_ut.c
 
 include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk
-
diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile b/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile
index b8e920995..ab9c82650 100644
--- a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile
+++ b/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile
@@ -37,4 +37,3 @@ TEST_FILE = nvme_ns_cmd_ut.c
 OTHER_FILES = nvme.c
 
 include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk
-
diff --git a/test/lib/nvme/unit/nvme_qpair_c/Makefile b/test/lib/nvme/unit/nvme_qpair_c/Makefile
index dc011094c..225b94048 100644
--- a/test/lib/nvme/unit/nvme_qpair_c/Makefile
+++ b/test/lib/nvme/unit/nvme_qpair_c/Makefile
@@ -36,4 +36,3 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 TEST_FILE = nvme_qpair_ut.c
 
 include $(SPDK_ROOT_DIR)/mk/nvme.unittest.mk
-
diff --git a/test/lib/nvmf/nvmf/nvmf_ut.c b/test/lib/nvmf/nvmf/nvmf_ut.c
index 568c3d271..66af34751 100644
--- a/test/lib/nvmf/nvmf/nvmf_ut.c
+++ b/test/lib/nvmf/nvmf/nvmf_ut.c
@@ -1022,4 +1022,3 @@ int main(int argc, char **argv)
 	CU_cleanup_registry();
 	return num_failures;
 }
-