Remove trailing blank lines. They serve no purpose and are just editor leftovers. These can cause git to complain about whitespace errors during merges.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org> --- Makefile | 1 - app/test/meson.build | 1 - app/test/test_rib6.c | 1 - doc/guides/cryptodevs/mvsam.rst | 1 - drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map | 1 - drivers/net/atlantic/rte_pmd_atlantic_version.map | 1 - drivers/net/iavf/iavf_rxtx.c | 1 - drivers/raw/ifpga/base/opae_at24_eeprom.c | 1 - lib/librte_fib/dir24_8.h | 1 - lib/librte_fib/rte_fib6.c | 1 - lib/librte_fib/trie.c | 1 - lib/librte_fib/trie.h | 1 - license/exceptions.txt | 1 - 13 files changed, 13 deletions(-) diff --git a/Makefile b/Makefile index 6cd70a0990c0..571277aa5a94 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 ff59c3131b34..fb49d804ba41 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 a86e465fb4de..c77df11298e4 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/doc/guides/cryptodevs/mvsam.rst b/doc/guides/cryptodevs/mvsam.rst index 81aa27dd01a7..399fe37a67f3 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/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map index 41c65c8c9c08..0a539ae48922 100644 --- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map +++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map @@ -1,4 +1,3 @@ DPDK_19.08 { local: *; }; - diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map index b16faa999f43..a1ce35f22c14 100644 --- a/drivers/net/atlantic/rte_pmd_atlantic_version.map +++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map @@ -13,4 +13,3 @@ EXPERIMENTAL { rte_pmd_atl_macsec_select_txsa; rte_pmd_atl_macsec_select_rxsa; }; - diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 3ee92e839b07..88f79ba3796e 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 d70f7affb724..6f834ac04c06 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/lib/librte_fib/dir24_8.h b/lib/librte_fib/dir24_8.h index 34ddb91352e1..1ec437c0cbd0 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 354227d8ff7f..a1f0db844a35 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 198e815c2b12..124aa8b98b2e 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 7762fb9731d3..bb750c5aeef3 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 f1cfa462ff96..ee25bb9a1548 100644 --- a/license/exceptions.txt +++ b/license/exceptions.txt @@ -15,4 +15,3 @@ SPDX Identifier TB Approval Date GB Approval Date File name 1. ----------------------------------------------------------------- - -- 2.20.1