diff --git a/Makefile b/Makefile
index 6cd70a099..571277aa5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,3 @@
 # Copyright(c) 2010-2014 Intel Corporation
 
 .error Error please compile using GNU Make (gmake)
-
diff --git a/app/test/meson.build b/app/test/meson.build
index ff59c3131..fb49d804b 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -459,4 +459,3 @@ foreach arg : dump_test_names
 		is_parallel : false,
 		suite : 'debug-tests')
 endforeach
-
diff --git a/app/test/test_rib6.c b/app/test/test_rib6.c
index a86e465fb..c77df1129 100644
--- a/app/test/test_rib6.c
+++ b/app/test/test_rib6.c
@@ -370,4 +370,3 @@ test_slow_rib6(void)
 
 REGISTER_TEST_COMMAND(rib6_autotest, test_rib6);
 REGISTER_TEST_COMMAND(rib6_slow_autotest, test_slow_rib6);
-
diff --git a/config/defconfig_arm64-emag-linuxapp-gcc b/config/defconfig_arm64-emag-linuxapp-gcc
index 496c39dc6..1db654c89 100644
--- a/config/defconfig_arm64-emag-linuxapp-gcc
+++ b/config/defconfig_arm64-emag-linuxapp-gcc
@@ -9,4 +9,3 @@ CONFIG_RTE_MACHINE="emag"
 CONFIG_RTE_CACHE_LINE_SIZE=64
 CONFIG_RTE_MAX_NUMA_NODES=1
 CONFIG_RTE_MAX_LCORE=32
-
diff --git a/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst
index 81aa27dd0..399fe37a6 100644
--- a/doc/guides/cryptodevs/mvsam.rst
+++ b/doc/guides/cryptodevs/mvsam.rst
@@ -110,4 +110,3 @@ operation:
      --cipher_key 00:01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e:0f  \
      --auth_op GENERATE --auth_algo sha1-hmac \
      --auth_key 10:11:12:13:14:15:16:17:18:19:1a:1b:1c:1d:1e:1f
-
diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst
index 593564d13..90d3040cf 100644
--- a/doc/guides/nics/kni.rst
+++ b/doc/guides/nics/kni.rst
@@ -168,4 +168,3 @@ It is possible to test PMD quickly using KNI kernel module loopback feature:
         RX-packets: 71275820       RX-dropped: 0             RX-total: 71275820
         TX-packets: 71275884       TX-dropped: 0             TX-total: 71275884
         ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst
index 4b6d77d37..85c7b895a 100644
--- a/doc/guides/nics/tap.rst
+++ b/doc/guides/nics/tap.rst
@@ -298,4 +298,3 @@ Systems supporting flow API
 | Azure Ubuntu 16.04,| No limitation         |
 | kernel 4.13        |                       |
 +--------------------+-----------------------+
-
diff --git a/doc/guides/prog_guide/generic_segmentation_offload_lib.rst b/doc/guides/prog_guide/generic_segmentation_offload_lib.rst
index 73e768740..205cb8a86 100644
--- a/doc/guides/prog_guide/generic_segmentation_offload_lib.rst
+++ b/doc/guides/prog_guide/generic_segmentation_offload_lib.rst
@@ -237,4 +237,3 @@ To segment an outgoing packet, an application must:
    For tunneled packets, the outer IPv4 headers' checksums should also be
    updated. Alternatively, the application may offload checksum calculation
    to HW.
-
diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst
index 848b00253..77856086d 100644
--- a/doc/guides/prog_guide/kernel_nic_interface.rst
+++ b/doc/guides/prog_guide/kernel_nic_interface.rst
@@ -321,4 +321,3 @@ Ethtool is a Linux-specific tool with corresponding support in the kernel.
 The current version of kni provides minimal ethtool functionality
 including querying version and link state. It does not support link
 control, statistics, or dumping device registers.
-
diff --git a/doc/guides/rel_notes/release_16_07.rst b/doc/guides/rel_notes/release_16_07.rst
index 2904aacfc..af89cf60a 100644
--- a/doc/guides/rel_notes/release_16_07.rst
+++ b/doc/guides/rel_notes/release_16_07.rst
@@ -550,4 +550,3 @@ Tested OSes
 - Ubuntu 15.10
 - Ubuntu 16.04 LTS
 - Wind River Linux 8
-
diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst
index de3e4ab0b..5e5a6cd8a 100644
--- a/doc/guides/sample_app_ug/flow_filtering.rst
+++ b/doc/guides/sample_app_ug/flow_filtering.rst
@@ -513,4 +513,3 @@ The last part of the function is to validate the rule and create it.
    int res = rte_flow_validate(port_id, &attr, pattern, action, &error);
    if (!res)
         flow = rte_flow_create(port_id, &attr, pattern, action, &error);
-
diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 0ffff835e..8de7cbe85 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -761,4 +761,3 @@ will send the policy to the host:
 
 Once the policy is sent to the host, the host application takes over the power monitoring
 of the specified cores in the policy.
-
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 3ee92e839..88f79ba37 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -1924,4 +1924,3 @@ iavf_dev_tx_desc_status(void *tx_queue, uint16_t offset)
 
 	return RTE_ETH_TX_DESC_FULL;
 }
-
diff --git a/drivers/raw/ifpga/base/opae_at24_eeprom.c b/drivers/raw/ifpga/base/opae_at24_eeprom.c
index d70f7affb..6f834ac04 100644
--- a/drivers/raw/ifpga/base/opae_at24_eeprom.c
+++ b/drivers/raw/ifpga/base/opae_at24_eeprom.c
@@ -85,4 +85,3 @@ int at24_eeprom_write(struct altera_i2c_dev *dev, unsigned int slave_addr,
 
 	return write_count;
 }
-
diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c
index 8c5701313..3182a488b 100644
--- a/examples/vhost_blk/vhost_blk.c
+++ b/examples/vhost_blk/vhost_blk.c
@@ -1092,4 +1092,3 @@ int main(int argc, char *argv[])
 
 	return 0;
 }
-
diff --git a/lib/librte_fib/dir24_8.h b/lib/librte_fib/dir24_8.h
index 34ddb9135..1ec437c0c 100644
--- a/lib/librte_fib/dir24_8.h
+++ b/lib/librte_fib/dir24_8.h
@@ -33,4 +33,3 @@ dir24_8_modify(struct rte_fib *fib, uint32_t ip, uint8_t depth,
 #endif
 
 #endif /* _DIR24_8_H_ */
-
diff --git a/lib/librte_fib/rte_fib6.c b/lib/librte_fib/rte_fib6.c
index 354227d8f..a1f0db844 100644
--- a/lib/librte_fib/rte_fib6.c
+++ b/lib/librte_fib/rte_fib6.c
@@ -319,4 +319,3 @@ rte_fib6_get_rib(struct rte_fib6 *fib)
 {
 	return (fib == NULL) ? NULL : fib->rib;
 }
-
diff --git a/lib/librte_fib/trie.c b/lib/librte_fib/trie.c
index 198e815c2..124aa8b98 100644
--- a/lib/librte_fib/trie.c
+++ b/lib/librte_fib/trie.c
@@ -757,4 +757,3 @@ trie_free(void *p)
 	rte_free(dp->tbl8);
 	rte_free(dp);
 }
-
diff --git a/lib/librte_fib/trie.h b/lib/librte_fib/trie.h
index 7762fb973..bb750c5ae 100644
--- a/lib/librte_fib/trie.h
+++ b/lib/librte_fib/trie.h
@@ -34,4 +34,3 @@ trie_modify(struct rte_fib6 *fib, const uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE],
 #endif
 
 #endif /* _TRIE_H_ */
-
diff --git a/license/exceptions.txt b/license/exceptions.txt
index f1cfa462f..ee25bb9a1 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -15,4 +15,3 @@ SPDX Identifier     TB Approval Date  GB Approval Date  File name
 1.
 
 -----------------------------------------------------------------
-