Merge ~paelzer/ubuntu/+source/dpdk:lp-1940913-MRE-19.11.10-FOCAL into ubuntu/+source/dpdk:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4666/+packages

[Christian Ehrhardt  (paelzer)]

FYI this follows Debians model of importing the upstream not as a single commit, but as

To ease comparison I recommend from <email address hidden>:debian/dpdk.git the branch upstream-19.11-stable

With that you can easily see that it matches the upstream release and other than that doesn't change too much.

[Bryce Harrington (bryce)]

* Changelog:
  - [√] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [√] dropped changes are ok to be dropped
  - [√] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [-] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [-] sanity checks test fine

LGTM, +1

I didn't do the local installation/testing but the ppa builds look fine and the tests will get exercised through SRU process. The SRU bug report looks good, the patches match what's forwarded at the upstream links, and code changes themselves are super modest as mentioned.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thank you, uploaded

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dpdk_19.11.10-0ubuntu0.20.04.1.dsc: done.
  Uploading dpdk_19.11.10.orig.tar.xz: done.
  Uploading dpdk_19.11.10-0ubuntu0.20.04.1.debian.tar.xz: done.
  Uploading dpdk_19.11.10-0ubuntu0.20.04.1_source.buildinfo: done.
  Uploading dpdk_19.11.10-0ubuntu0.20.04.1_source.changes: done.
Successfully uploaded packages.

diff --git a/MAINTAINERS b/MAINTAINERS
index 952ded7..75431e3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -131,8 +131,6 @@ F: config/rte_config.h
 F: buildtools/call-sphinx-build.py
 F: buildtools/gen-pmdinfo-cfile.sh
 F: buildtools/map_to_def.py
-F: buildtools/list-dir-globs.py
-F: buildtools/pkg-config/
 F: buildtools/symlink-drivers-solibs.sh
 
 Public CI
diff --git a/VERSION b/VERSION
index 8bda737..67d8753 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-19.11.7
+19.11.10
diff --git a/app/meson.build b/app/meson.build
index c7f689e..4bdfaf4 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -18,8 +18,6 @@ apps = [
 	'test-pmd',
 	'test-sad']
 
-# for BSD only
-lib_execinfo = cc.find_library('execinfo', required: false)
 
 default_cflags = machine_args
 default_ldflags = []
@@ -51,7 +49,6 @@ foreach app:apps
 			dep_objs += get_variable(get_option('default_library')
 				 + '_rte_' + d)
 		endforeach
-		dep_objs += lib_execinfo
 
 		link_libs = []
 		if get_option('default_library') == 'static'
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index d8db58e..d6da21c 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -327,14 +327,14 @@ check_dev_cap(const struct rte_bbdev_info *dev_info)
 			if (nb_harq_inputs > cap->num_buffers_hard_out) {
 				printf(
 					"Too many HARQ inputs defined: %u, max: %u\n",
-					nb_hard_outputs,
+					nb_harq_inputs,
 					cap->num_buffers_hard_out);
 				return TEST_FAILED;
 			}
 			if (nb_harq_outputs > cap->num_buffers_hard_out) {
 				printf(
 					"Too many HARQ outputs defined: %u, max: %u\n",
-					nb_hard_outputs,
+					nb_harq_outputs,
 					cap->num_buffers_hard_out);
 				return TEST_FAILED;
 			}
diff --git a/app/test-compress-perf/comp_perf_options_parse.c b/app/test-compress-perf/comp_perf_options_parse.c
index 12d0a6c..898dd31 100644
--- a/app/test-compress-perf/comp_perf_options_parse.c
+++ b/app/test-compress-perf/comp_perf_options_parse.c
@@ -598,7 +598,7 @@ comp_perf_options_parse(struct comp_test_data *test_data, int argc, char **argv)
 		switch (opt) {
 		case 'h':
 			usage(argv[0]);
-			rte_exit(EXIT_SUCCESS, "Displayed help\n");
+			exit(EXIT_SUCCESS);
 			break;
 		/* long options */
 		case 0:
diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c
index 49b4697..e16e8ec 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -495,6 +495,12 @@ parse_test_name(struct cperf_options *opts,
 {
 	char *test_name = (char *) rte_zmalloc(NULL,
 		sizeof(char) * (strlen(arg) + 3), 0);
+	if (test_name == NULL) {
+		RTE_LOG(ERR, USER1, "Failed to rte zmalloc with size: %zu\n",
+			strlen(arg) + 3);
+		return -1;
+	}
+
 	snprintf(test_name, strlen(arg) + 3, "[%s]", arg);
 	opts->test_name = test_name;
 
@@ -953,7 +959,7 @@ cperf_options_parse(struct cperf_options *options, int argc, char **argv)
 		switch (opt) {
 		case 'h':
 			usage(argv[0]);
-			rte_exit(EXIT_SUCCESS, "Displayed help\n");
+			exit(EXIT_SUCCESS);
 			break;
 		/* long options */
 		case 0:
diff --git a/app/test-crypto-perf/cperf_test_common.c b/app/test-crypto-perf/cperf_test_common.c
index 85603ee..b7347ad 100644
--- a/app/test-crypto-perf/cperf_test_common.c
+++ b/app/test-crypto-perf/cperf_test_common.c
@@ -194,7 +194,7 @@ cperf_alloc_common_memory(const struct cperf_options *options,
 				(mbuf_size * segments_nb);
 		params.dst_buf_offset = *dst_buf_offset;
 		/* Destination buffer will be one segment only */
-		obj_size += max_size;
+		obj_size += max_size + sizeof(struct rte_mbuf);
 	}
 
 	*pool = rte_mempool_create_empty(pool_name,
diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c
index 4f4800d..3c80c1a 100644
--- a/app/test-eventdev/evt_options.c
+++ b/app/test-eventdev/evt_options.c
@@ -218,7 +218,7 @@ evt_parse_plcores(struct evt_options *opt, const char *corelist)
 {
 	int ret;
 
-	ret = parse_lcores_list(opt->plcores, corelist);
+	ret = parse_lcores_list(opt->plcores, RTE_MAX_LCORE, corelist);
 	if (ret == -E2BIG)
 		evt_err("duplicate lcores in plcores");
 
@@ -230,7 +230,7 @@ evt_parse_work_lcores(struct evt_options *opt, const char *corelist)
 {
 	int ret;
 
-	ret = parse_lcores_list(opt->wlcores, corelist);
+	ret = parse_lcores_list(opt->wlcores, RTE_MAX_LCORE, corelist);
 	if (ret == -E2BIG)
 		evt_err("duplicate lcores in wlcores");
 
diff --git a/app/test-eventdev/parser.c b/app/test-eventdev/parser.c
index 24f1855..8818c37 100644
--- a/app/test-eventdev/parser.c
+++ b/app/test-eventdev/parser.c
@@ -310,7 +310,7 @@ parse_hex_string(char *src, uint8_t *dst, uint32_t *size)
 }
 
 int
-parse_lcores_list(bool lcores[], const char *corelist)
+parse_lcores_list(bool lcores[], int lcores_num, const char *corelist)
 {
 	int i, idx = 0;
 	int min, max;
@@ -332,6 +332,8 @@ parse_lcores_list(bool lcores[], const char *corelist)
 		if (*corelist == '\0')
 			return -1;
 		idx = strtoul(corelist, &end, 10);
+		if (idx < 0 || idx > lcores_num)
+			return -1;
 
 		if (end == NULL)
 			return -1;
diff --git a/app/test-eventdev/parser.h b/app/test-eventdev/parser.h
index 673ff22..696b40a 100644
--- a/app/test-eventdev/parser.h
+++ b/app/test-eventdev/parser.h
@@ -46,5 +46,5 @@ int parse_hex_string(char *src, uint8_t *dst, uint32_t *size);
 
 int parse_tokenize_string(char *string, char *tokens[], uint32_t *n_tokens);
 
-int parse_lcores_list(bool lcores[], const char *corelist);
+int parse_lcores_list(bool lcores[], int lcores_num, const char *corelist);
 #endif
diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c
index d2deadd..3899d9f 100644
--- a/app/test-pmd/bpf_cmd.c
+++ b/app/test-pmd/bpf_cmd.c
@@ -20,7 +20,7 @@ static const struct rte_bpf_xsym bpf_xsym[] = {
 		.name = RTE_STR(stdout),
 		.type = RTE_BPF_XTYPE_VAR,
 		.var = {
-			.val = &stdout,
+			.val = (void *)(uintptr_t)&stdout,
 			.desc = {
 				.type = RTE_BPF_ARG_PTR,
 				.size = sizeof(stdout),
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 9a9da74..e6c053a 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1324,7 +1324,7 @@ cmdline_parse_token_string_t cmd_operate_port_all_all =
 cmdline_parse_inst_t cmd_operate_port = {
 	.f = cmd_operate_port_parsed,
 	.data = NULL,
-	.help_str = "port start|stop|close all: Start/Stop/Close/Reset all ports",
+	.help_str = "port start|stop|close|reset all: Start/Stop/Close/Reset all ports",
 	.tokens = {
 		(void *)&cmd_operate_port_all_cmd,
 		(void *)&cmd_operate_port_all_port,
@@ -1371,7 +1371,7 @@ cmdline_parse_token_num_t cmd_operate_specific_port_id =
 cmdline_parse_inst_t cmd_operate_specific_port = {
 	.f = cmd_operate_specific_port_parsed,
 	.data = NULL,
-	.help_str = "port start|stop|close <port_id>: Start/Stop/Close/Reset port_id",
+	.help_str = "port start|stop|close|reset <port_id>: Start/Stop/Close/Reset port_id",
 	.tokens = {
 		(void *)&cmd_operate_specific_port_cmd,
 		(void *)&cmd_operate_specific_port_port,
@@ -1618,6 +1618,9 @@ parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed)
 		}
 	}
 
+	if (*speed != ETH_LINK_SPEED_AUTONEG)
+		*speed |= ETH_LINK_SPEED_FIXED;
+
 	return 0;
 }
 
@@ -1701,13 +1704,13 @@ cmd_config_speed_specific_parsed(void *parsed_result,
 	struct cmd_config_speed_specific *res = parsed_result;
 	uint32_t link_speed;
 
-	if (!all_ports_stopped()) {
-		printf("Please stop all ports first\n");
+	if (port_id_is_invalid(res->id, ENABLED_WARN))
 		return;
-	}
 
-	if (port_id_is_invalid(res->id, ENABLED_WARN))
+	if (!port_is_stopped(res->id)) {
+		printf("Please stop port %d first\n", res->id);
 		return;
+	}
 
 	if (parse_and_check_speed_duplex(res->value1, res->value2,
 			&link_speed) < 0)
@@ -2846,6 +2849,10 @@ cmd_setup_rxtx_queue_parsed(
 		if (!numa_support || socket_id == NUMA_NO_CONFIG)
 			socket_id = port->socket_id;
 
+		if (port->nb_tx_desc[res->qid] < tx_pkt_nb_segs) {
+			printf("Failed to setup TX queue: not enough descriptors\n");
+			return;
+		}
 		ret = rte_eth_tx_queue_setup(res->portid,
 					     res->qid,
 					     port->nb_tx_desc[res->qid],
@@ -4461,7 +4468,7 @@ cmd_config_queue_tx_offloads(struct rte_port *port)
 	int k;
 
 	/* Apply queue tx offloads configuration */
-	for (k = 0; k < port->dev_info.max_rx_queues; k++)
+	for (k = 0; k < port->dev_info.max_tx_queues; k++)
 		port->tx_conf[k].offloads =
 			port->dev_conf.txmode.offloads;
 }
@@ -9100,7 +9107,7 @@ cmdline_parse_inst_t cmd_tunnel_filter = {
 
 /* *** CONFIGURE TUNNEL UDP PORT *** */
 struct cmd_tunnel_udp_config {
-	cmdline_fixed_string_t cmd;
+	cmdline_fixed_string_t rx_vxlan_port;
 	cmdline_fixed_string_t what;
 	uint16_t udp_port;
 	portid_t port_id;
@@ -9116,9 +9123,7 @@ cmd_tunnel_udp_config_parsed(void *parsed_result,
 	int ret;
 
 	tunnel_udp.udp_port = res->udp_port;
-
-	if (!strcmp(res->cmd, "rx_vxlan_port"))
-		tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
+	tunnel_udp.prot_type = RTE_TUNNEL_TYPE_VXLAN;
 
 	if (!strcmp(res->what, "add"))
 		ret = rte_eth_dev_udp_tunnel_port_add(res->port_id,
@@ -9131,9 +9136,9 @@ cmd_tunnel_udp_config_parsed(void *parsed_result,
 		printf("udp tunneling add error: (%s)\n", strerror(-ret));
 }
 
-cmdline_parse_token_string_t cmd_tunnel_udp_config_cmd =
+cmdline_parse_token_string_t cmd_tunnel_udp_config_rx_vxlan_port =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
-				cmd, "rx_vxlan_port");
+				rx_vxlan_port, "rx_vxlan_port");
 cmdline_parse_token_string_t cmd_tunnel_udp_config_what =
 	TOKEN_STRING_INITIALIZER(struct cmd_tunnel_udp_config,
 				what, "add#rm");
@@ -9150,7 +9155,7 @@ cmdline_parse_inst_t cmd_tunnel_udp_config = {
 	.help_str = "rx_vxlan_port add|rm <udp_port> <port_id>: "
 		"Add/Remove a tunneling UDP port filter",
 	.tokens = {
-		(void *)&cmd_tunnel_udp_config_cmd,
+		(void *)&cmd_tunnel_udp_config_rx_vxlan_port,
 		(void *)&cmd_tunnel_udp_config_what,
 		(void *)&cmd_tunnel_udp_config_udp_port,
 		(void *)&cmd_tunnel_udp_config_port_id,
@@ -19038,7 +19043,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,
 		rc = rte_eth_rx_descriptor_status(res->cmd_pid, res->cmd_qid,
 					     res->cmd_did);
 		if (rc < 0) {
-			printf("Invalid queueid = %d\n", res->cmd_qid);
+			printf("Invalid input: queue id = %d, desc id = %d\n",
+			       res->cmd_qid, res->cmd_did);
 			return;
 		}
 		if (rc == RTE_ETH_RX_DESC_AVAIL)
@@ -19051,7 +19057,8 @@ cmd_show_rx_tx_desc_status_parsed(void *parsed_result,
 		rc = rte_eth_tx_descriptor_status(res->cmd_pid, res->cmd_qid,
 					     res->cmd_did);
 		if (rc < 0) {
-			printf("Invalid queueid = %d\n", res->cmd_qid);
+			printf("Invalid input: queue id = %d, desc id = %d\n",
+			       res->cmd_qid, res->cmd_did);
 			return;
 		}
 		if (rc == RTE_ETH_TX_DESC_FULL)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index da3533c..0b76f7e 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -4250,7 +4250,11 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,
 		       .src_addr = nvgre_encap_conf.ipv4_src,
 		       .dst_addr = nvgre_encap_conf.ipv4_dst,
 		},
-		.item_nvgre.flow_id = 0,
+		.item_nvgre = {
+			.c_k_s_rsvd0_ver = RTE_BE16(0x2000),
+			.protocol = RTE_BE16(RTE_ETHER_TYPE_TEB),
+			.flow_id = 0,
+		},
 	};
 	memcpy(action_nvgre_encap_data->item_eth.dst.addr_bytes,
 	       nvgre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN);
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e14ff42..bee9fa6 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2138,7 +2138,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key)
 
 void
 port_rss_hash_key_update(portid_t port_id, char rss_type[], uint8_t *hash_key,
-			 uint hash_key_len)
+			 uint8_t hash_key_len)
 {
 	struct rte_eth_rss_conf rss_conf;
 	int diag;
@@ -2328,6 +2328,21 @@ rss_fwd_config_setup(void)
 	}
 }
 
+static uint16_t
+get_fwd_port_total_tc_num(void)
+{
+	struct rte_eth_dcb_info dcb_info;
+	uint16_t total_tc_num = 0;
+	unsigned int i;
+
+	for (i = 0; i < nb_fwd_ports; i++) {
+		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info);
+		total_tc_num += dcb_info.nb_tcs;
+	}
+
+	return total_tc_num;
+}
+
 /**
  * For the DCB forwarding test, each core is assigned on each traffic class.
  *
@@ -2347,12 +2362,42 @@ dcb_fwd_config_setup(void)
 	lcoreid_t  lc_id;
 	uint16_t nb_rx_queue, nb_tx_queue;
 	uint16_t i, j, k, sm_id = 0;
+	uint16_t total_tc_num;
+	struct rte_port *port;
 	uint8_t tc = 0;
+	portid_t pid;
+	int ret;
+
+	/*
+	 * The fwd_config_setup() is called when the port is RTE_PORT_STARTED
+	 * or RTE_PORT_STOPPED.
+	 *
+	 * Re-configure ports to get updated mapping between tc and queue in
+	 * case the queue number of the port is changed. Skip for started ports
+	 * since modifying queue number and calling dev_configure need to stop
+	 * ports first.
+	 */
+	for (pid = 0; pid < nb_fwd_ports; pid++) {
+		if (port_is_started(pid) == 1)
+			continue;
+
+		port = &ports[pid];
+		ret = rte_eth_dev_configure(pid, nb_rxq, nb_txq,
+					    &port->dev_conf);
+		if (ret < 0) {
+			printf("Failed to re-configure port %d, ret = %d.\n",
+				pid, ret);
+			return;
+		}
+	}
 
 	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
+	total_tc_num = get_fwd_port_total_tc_num();
+	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
+		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
 	/* reinitialize forwarding streams */
 	init_fwd_streams();
@@ -2843,13 +2888,15 @@ nb_segs_is_invalid(unsigned int nb_segs)
 	RTE_ETH_FOREACH_DEV(port_id) {
 		for (queue_id = 0; queue_id < nb_txq; queue_id++) {
 			ret = get_tx_ring_size(port_id, queue_id, &ring_size);
-
-			if (ret)
-				return true;
-
+			if (ret) {
+				/* Port may not be initialized yet, can't say
+				 * the port is invalid in this stage.
+				 */
+				continue;
+			}
 			if (ring_size < nb_segs) {
-				printf("nb segments per TX packets=%u >= "
-				       "TX queue(%u) ring_size=%u - ignored\n",
+				printf("nb segments per TX packets=%u >= TX "
+				       "queue(%u) ring_size=%u - txpkts ignored\n",
 				       nb_segs, queue_id, ring_size);
 				return true;
 			}
@@ -2865,12 +2912,26 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
 	uint16_t tx_pkt_len;
 	unsigned i;
 
-	if (nb_segs_is_invalid(nb_segs))
+	/*
+	 * For single segment settings failed check is ignored.
+	 * It is a very basic capability to send the single segment
+	 * packets, suppose it is always supported.
+	 */
+	if (nb_segs > 1 && nb_segs_is_invalid(nb_segs)) {
+		printf("Tx segment size(%u) is not supported - txpkts ignored\n",
+			nb_segs);
 		return;
+	}
+
+	if (nb_segs > RTE_MAX_SEGS_PER_PKT) {
+		printf("Tx segment size(%u) is bigger than max number of segment(%u)\n",
+			nb_segs, RTE_MAX_SEGS_PER_PKT);
+		return;
+	}
 
 	/*
 	 * Check that each segment length is greater or equal than
-	 * the mbuf data sise.
+	 * the mbuf data size.
 	 * Check also that the total packet length is greater or equal than the
 	 * size of an empty UDP/IP packet (sizeof(struct rte_ether_hdr) +
 	 * 20 + 8).
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 7b92ab1..29044c4 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -451,17 +451,18 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
 
 	if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV4)) {
 		ipv4_hdr = l3_hdr;
-		ipv4_hdr->hdr_checksum = 0;
 
 		ol_flags |= PKT_TX_IPV4;
 		if (info->l4_proto == IPPROTO_TCP && tso_segsz) {
 			ol_flags |= PKT_TX_IP_CKSUM;
 		} else {
-			if (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)
+			if (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) {
 				ol_flags |= PKT_TX_IP_CKSUM;
-			else
+			} else {
+				ipv4_hdr->hdr_checksum = 0;
 				ipv4_hdr->hdr_checksum =
 					rte_ipv4_cksum(ipv4_hdr);
+			}
 		}
 	} else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV6))
 		ol_flags |= PKT_TX_IPV6;
@@ -472,10 +473,10 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
 		udp_hdr = (struct rte_udp_hdr *)((char *)l3_hdr + info->l3_len);
 		/* do not recalculate udp cksum if it was 0 */
 		if (udp_hdr->dgram_cksum != 0) {
-			udp_hdr->dgram_cksum = 0;
-			if (tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM)
+			if (tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM) {
 				ol_flags |= PKT_TX_UDP_CKSUM;
-			else {
+			} else {
+				udp_hdr->dgram_cksum = 0;
 				udp_hdr->dgram_cksum =
 					get_udptcp_checksum(l3_hdr, udp_hdr,
 						info->ethertype);
@@ -485,12 +486,12 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
 			ol_flags |= PKT_TX_UDP_SEG;
 	} else if (info->l4_proto == IPPROTO_TCP) {
 		tcp_hdr = (struct rte_tcp_hdr *)((char *)l3_hdr + info->l3_len);
-		tcp_hdr->cksum = 0;
 		if (tso_segsz)
 			ol_flags |= PKT_TX_TCP_SEG;
-		else if (tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM)
+		else if (tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM) {
 			ol_flags |= PKT_TX_TCP_CKSUM;
-		else {
+		} else {
+			tcp_hdr->cksum = 0;
 			tcp_hdr->cksum =
 				get_udptcp_checksum(l3_hdr, tcp_hdr,
 					info->ethertype);
@@ -500,13 +501,13 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
 	} else if (info->l4_proto == IPPROTO_SCTP) {
 		sctp_hdr = (struct rte_sctp_hdr *)
 			((char *)l3_hdr + info->l3_len);
-		sctp_hdr->cksum = 0;
 		/* sctp payload must be a multiple of 4 to be
 		 * offloaded */
 		if ((tx_offloads & DEV_TX_OFFLOAD_SCTP_CKSUM) &&
 			((ipv4_hdr->total_length & 0x3) == 0)) {
 			ol_flags |= PKT_TX_SCTP_CKSUM;
 		} else {
+			sctp_hdr->cksum = 0;
 			/* XXX implement CRC32c, example available in
 			 * RFC3309 */
 		}
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index a1c08a4..9ce3b4f 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -694,7 +694,7 @@ launch_args_parse(int argc, char** argv)
 		case 0: /*long options */
 			if (!strcmp(lgopts[opt_idx].name, "help")) {
 				usage(argv[0]);
-				rte_exit(EXIT_SUCCESS, "Displayed help\n");
+				exit(EXIT_SUCCESS);
 			}
 #ifdef RTE_LIBRTE_CMDLINE
 			if (!strcmp(lgopts[opt_idx].name, "interactive")) {
@@ -1356,7 +1356,7 @@ launch_args_parse(int argc, char** argv)
 			break;
 		case 'h':
 			usage(argv[0]);
-			rte_exit(EXIT_SUCCESS, "Displayed help\n");
+			exit(EXIT_SUCCESS);
 			break;
 		default:
 			usage(argv[0]);
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 0c3361e..dca10e7 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -228,9 +228,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
 /* current configuration is in DCB or not,0 means it is not in DCB mode */
 uint8_t dcb_config = 0;
 
-/* Whether the dcb is in testing status */
-uint8_t dcb_test = 0;
-
 /*
  * Configurable number of RX/TX queues.
  */
@@ -1293,22 +1290,68 @@ check_nb_hairpinq(queueid_t hairpinq)
 }
 
 static void
+init_config_port_offloads(portid_t pid, uint32_t socket_id)
+{
+	struct rte_port *port = &ports[pid];
+	uint16_t data_size;
+	int ret;
+	int i;
+
+	port->dev_conf.txmode = tx_mode;
+	port->dev_conf.rxmode = rx_mode;
+
+	ret = eth_dev_info_get_print_err(pid, &port->dev_info);
+	if (ret != 0)
+		rte_exit(EXIT_FAILURE, "rte_eth_dev_info_get() failed\n");
+
+	ret = update_jumbo_frame_offload(pid);
+	if (ret != 0)
+		printf("Updating jumbo frame offload failed for port %u\n",
+			pid);
+
+	if (!(port->dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE))
+		port->dev_conf.txmode.offloads &=
+			~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
+
+	/* Apply Rx offloads configuration */
+	for (i = 0; i < port->dev_info.max_rx_queues; i++)
+		port->rx_conf[i].offloads = port->dev_conf.rxmode.offloads;
+	/* Apply Tx offloads configuration */
+	for (i = 0; i < port->dev_info.max_tx_queues; i++)
+		port->tx_conf[i].offloads = port->dev_conf.txmode.offloads;
+
+	/* set flag to initialize port/queue */
+	port->need_reconfig = 1;
+	port->need_reconfig_queues = 1;
+	port->socket_id = socket_id;
+	port->tx_metadata = 0;
+
+	/*
+	 * Check for maximum number of segments per MTU.
+	 * Accordingly update the mbuf data size.
+	 */
+	if (port->dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX &&
+	    port->dev_info.rx_desc_lim.nb_mtu_seg_max != 0) {
+		data_size = rx_mode.max_rx_pkt_len /
+			port->dev_info.rx_desc_lim.nb_mtu_seg_max;
+
+		if ((data_size + RTE_PKTMBUF_HEADROOM) > mbuf_data_size) {
+			mbuf_data_size = data_size + RTE_PKTMBUF_HEADROOM;
+			TESTPMD_LOG(WARNING, "Configured mbuf size %hu\n",
+				    mbuf_data_size);
+		}
+	}
+}
+
+static void
 init_config(void)
 {
 	portid_t pid;
-	struct rte_port *port;
 	struct rte_mempool *mbp;
 	unsigned int nb_mbuf_per_pool;
 	lcoreid_t  lc_id;
-	uint8_t port_per_socket[RTE_MAX_NUMA_NODES];
 	struct rte_gro_param gro_param;
 	uint32_t gso_types;
-	uint16_t data_size;
-	bool warning = 0;
-	int k;
-	int ret;
-
-	memset(port_per_socket,0,RTE_MAX_NUMA_NODES);
 
 	/* Configuration of logical cores. */
 	fwd_lcores = rte_zmalloc("testpmd: fwd_lcores",
@@ -1330,30 +1373,12 @@ init_config(void)
 	}
 
 	RTE_ETH_FOREACH_DEV(pid) {
-		port = &ports[pid];
-		/* Apply default TxRx configuration for all ports */
-		port->dev_conf.txmode = tx_mode;
-		port->dev_conf.rxmode = rx_mode;
-
-		ret = eth_dev_info_get_print_err(pid, &port->dev_info);
-		if (ret != 0)
-			rte_exit(EXIT_FAILURE,
-				 "rte_eth_dev_info_get() failed\n");
-
-		ret = update_jumbo_frame_offload(pid);
-		if (ret != 0)
-			printf("Updating jumbo frame offload failed for port %u\n",
-				pid);
+		uint32_t socket_id;
 
-		if (!(port->dev_info.tx_offload_capa &
-		      DEV_TX_OFFLOAD_MBUF_FAST_FREE))
-			port->dev_conf.txmode.offloads &=
-				~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 		if (numa_support) {
-			if (port_numa[pid] != NUMA_NO_CONFIG)
-				port_per_socket[port_numa[pid]]++;
-			else {
-				uint32_t socket_id = rte_eth_dev_socket_id(pid);
+			socket_id = port_numa[pid];
+			if (port_numa[pid] == NUMA_NO_CONFIG) {
+				socket_id = rte_eth_dev_socket_id(pid);
 
 				/*
 				 * if socket_id is invalid,
@@ -1361,45 +1386,15 @@ init_config(void)
 				 */
 				if (check_socket_id(socket_id) < 0)
 					socket_id = socket_ids[0];
-				port_per_socket[socket_id]++;
-			}
-		}
-
-		/* Apply Rx offloads configuration */
-		for (k = 0; k < port->dev_info.max_rx_queues; k++)
-			port->rx_conf[k].offloads =
-				port->dev_conf.rxmode.offloads;
-		/* Apply Tx offloads configuration */
-		for (k = 0; k < port->dev_info.max_tx_queues; k++)
-			port->tx_conf[k].offloads =
-				port->dev_conf.txmode.offloads;
-
-		/* set flag to initialize port/queue */
-		port->need_reconfig = 1;
-		port->need_reconfig_queues = 1;
-		port->tx_metadata = 0;
-
-		/* Check for maximum number of segments per MTU. Accordingly
-		 * update the mbuf data size.
-		 */
-		if (port->dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX &&
-				port->dev_info.rx_desc_lim.nb_mtu_seg_max != 0) {
-			data_size = rx_mode.max_rx_pkt_len /
-				port->dev_info.rx_desc_lim.nb_mtu_seg_max;
-
-			if ((data_size + RTE_PKTMBUF_HEADROOM) >
-							mbuf_data_size) {
-				mbuf_data_size = data_size +
-						 RTE_PKTMBUF_HEADROOM;
-				warning = 1;
 			}
+		} else {
+			socket_id = (socket_num == UMA_NO_CONFIG) ?
+				    0 : socket_num;
 		}
+		/* Apply default TxRx configuration for all ports */
+		init_config_port_offloads(pid, socket_id);
 	}
 
-	if (warning)
-		TESTPMD_LOG(WARNING, "Configured mbuf size %hu\n",
-			    mbuf_data_size);
-
 	/*
 	 * Create pools of mbuf.
 	 * If NUMA support is disabled, create a single pool of mbuf in
@@ -1482,7 +1477,7 @@ init_config(void)
 #if defined RTE_LIBRTE_PMD_SOFTNIC
 	if (strcmp(cur_fwd_eng->fwd_mode_name, "softnic") == 0) {
 		RTE_ETH_FOREACH_DEV(pid) {
-			port = &ports[pid];
+			struct rte_port *port = &ports[pid];
 			const char *driver = port->dev_info.driver_name;
 
 			if (strcmp(driver, "net_softnic") == 0)
@@ -1497,21 +1492,8 @@ init_config(void)
 void
 reconfig(portid_t new_port_id, unsigned socket_id)
 {
-	struct rte_port *port;
-	int ret;
-
 	/* Reconfiguration of Ethernet ports. */
-	port = &ports[new_port_id];
-
-	ret = eth_dev_info_get_print_err(new_port_id, &port->dev_info);
-	if (ret != 0)
-		return;
-
-	/* set flag to initialize port/queue */
-	port->need_reconfig = 1;
-	port->need_reconfig_queues = 1;
-	port->socket_id = socket_id;
-
+	init_config_port_offloads(new_port_id, socket_id);
 	init_port_config();
 }
 
@@ -2105,8 +2087,7 @@ start_packet_forwarding(int with_tx_first)
 		return;
 	}
 
-
-	if(dcb_test) {
+	if (dcb_config) {
 		for (i = 0; i < nb_fwd_ports; i++) {
 			pt_id = fwd_ports_ids[i];
 			port = &ports[pt_id];
@@ -2321,14 +2302,11 @@ start_port(portid_t pid)
 	portid_t pi;
 	queueid_t qi;
 	struct rte_port *port;
-	struct rte_ether_addr mac_addr;
 	struct rte_eth_hairpin_cap cap;
 
 	if (port_id_is_invalid(pid, ENABLED_WARN))
 		return 0;
 
-	if(dcb_config)
-		dcb_test = 1;
 	RTE_ETH_FOREACH_DEV(pi) {
 		if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
 			continue;
@@ -2487,11 +2465,14 @@ start_port(portid_t pid)
 			RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)
 			printf("Port %d can not be set into started\n", pi);
 
-		if (eth_macaddr_get_print_err(pi, &mac_addr) == 0)
+		if (eth_macaddr_get_print_err(pi, &port->eth_addr) == 0)
 			printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
-				mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
-				mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
-				mac_addr.addr_bytes[4], mac_addr.addr_bytes[5]);
+				port->eth_addr.addr_bytes[0],
+				port->eth_addr.addr_bytes[1],
+				port->eth_addr.addr_bytes[2],
+				port->eth_addr.addr_bytes[3],
+				port->eth_addr.addr_bytes[4],
+				port->eth_addr.addr_bytes[5]);
 
 		/* at least one port started, need checking link status */
 		need_check_link_status = 1;
@@ -2513,11 +2494,6 @@ stop_port(portid_t pid)
 	struct rte_port *port;
 	int need_check_link_status = 0;
 
-	if (dcb_test) {
-		dcb_test = 0;
-		dcb_config = 0;
-	}
-
 	if (port_id_is_invalid(pid, ENABLED_WARN))
 		return;
 
@@ -3499,8 +3475,6 @@ init_port_dcb_config(portid_t pid,
 	rte_port = &ports[pid];
 
 	memset(&port_conf, 0, sizeof(struct rte_eth_conf));
-	/* Enter DCB configuration status */
-	dcb_config = 1;
 
 	port_conf.rxmode = rte_port->dev_conf.rxmode;
 	port_conf.txmode = rte_port->dev_conf.txmode;
@@ -3570,6 +3544,9 @@ init_port_dcb_config(portid_t pid,
 
 	rte_port->dcb_flag = 1;
 
+	/* Enter DCB configuration status */
+	dcb_config = 1;
+
 	return 0;
 }
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 4dbcee3..bbe18a7 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -404,7 +404,6 @@ extern uint64_t noisy_lkup_num_reads;
 extern uint64_t noisy_lkup_num_reads_writes;
 
 extern uint8_t dcb_config;
-extern uint8_t dcb_test;
 
 extern uint16_t mbuf_data_size; /**< Mbuf data space size. */
 extern uint32_t param_total_num_mbufs;
@@ -820,7 +819,7 @@ int set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate,
 
 void port_rss_hash_conf_show(portid_t port_id, int show_rss_key);
 void port_rss_hash_key_update(portid_t port_id, char rss_type[],
-			      uint8_t *hash_key, uint hash_key_len);
+			      uint8_t *hash_key, uint8_t hash_key_len);
 int rx_queue_id_is_invalid(queueid_t rxq_id);
 int tx_queue_id_is_invalid(queueid_t txq_id);
 void setup_gro(const char *onoff, portid_t port_id);
diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py
index 26688b7..016d99c 100644
--- a/app/test/autotest_test_funcs.py
+++ b/app/test/autotest_test_funcs.py
@@ -12,13 +12,16 @@ import pexpect
 def default_autotest(child, test_name):
     child.sendline(test_name)
     result = child.expect(["Test OK", "Test Failed",
-                           "Command not found", pexpect.TIMEOUT], timeout=900)
+                           "Command not found", pexpect.TIMEOUT,
+                           "Test Skipped"], timeout=900)
     if result == 1:
         return -1, "Fail"
     elif result == 2:
         return -1, "Fail [Not found]"
     elif result == 3:
         return -1, "Fail [Timeout]"
+    elif result == 4:
+        return 0, "Skipped [Not Run]"
     return 0, "Success"
 
 # autotest used to run dump commands
diff --git a/app/test/meson.build b/app/test/meson.build
index 24fb59f..2e35e93 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -387,11 +387,10 @@ foreach d:test_deps
 	def_lib = get_option('default_library')
 	test_dep_objs += get_variable(def_lib + '_rte_' + d)
 endforeach
-test_dep_objs += cc.find_library('execinfo', required: false)
 
 link_libs = []
 if get_option('default_library') == 'static'
-	link_libs = dpdk_static_libraries + dpdk_drivers
+	link_libs = dpdk_drivers
 endif
 
 dpdk_test = executable('dpdk-test',
diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c
index f203f9d..0fd7290 100644
--- a/app/test/packet_burst_generator.c
+++ b/app/test/packet_burst_generator.c
@@ -117,6 +117,7 @@ initialize_tcp_header(struct rte_tcp_hdr *tcp_hdr, uint16_t src_port,
 	memset(tcp_hdr, 0, sizeof(struct rte_tcp_hdr));
 	tcp_hdr->src_port = rte_cpu_to_be_16(src_port);
 	tcp_hdr->dst_port = rte_cpu_to_be_16(dst_port);
+	tcp_hdr->data_off = (sizeof(struct rte_tcp_hdr) << 2) & 0xF0;
 
 	return pkt_len;
 }
@@ -141,8 +142,8 @@ uint16_t
 initialize_ipv6_header(struct rte_ipv6_hdr *ip_hdr, uint8_t *src_addr,
 		uint8_t *dst_addr, uint16_t pkt_data_len)
 {
-	ip_hdr->vtc_flow = 0;
-	ip_hdr->payload_len = pkt_data_len;
+	ip_hdr->vtc_flow = rte_cpu_to_be_32(0x60000000); /* Set version to 6. */
+	ip_hdr->payload_len = rte_cpu_to_be_16(pkt_data_len);
 	ip_hdr->proto = IPPROTO_UDP;
 	ip_hdr->hop_limits = IP_DEFTTL;
 
diff --git a/app/test/process.h b/app/test/process.h
index c3b3780..20e8eed 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -48,6 +48,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 #ifdef RTE_LIBRTE_PDUMP
 #ifdef RTE_LIBRTE_RING_PMD
 	pthread_t thread;
+	int rc;
 #endif
 #endif
 
@@ -126,8 +127,13 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
 	/* parent process does a wait */
 #ifdef RTE_LIBRTE_PDUMP
 #ifdef RTE_LIBRTE_RING_PMD
-	if ((strcmp(env_value, "run_pdump_server_tests") == 0))
-		pthread_create(&thread, NULL, &send_pkts, NULL);
+	if ((strcmp(env_value, "run_pdump_server_tests") == 0)) {
+		rc = pthread_create(&thread, NULL, &send_pkts, NULL);
+		if (rc != 0) {
+			rte_panic("Cannot start send pkts thread: %s\n",
+				  strerror(rc));
+		}
+	}
 #endif
 #endif
 
diff --git a/app/test/test.c b/app/test/test.c
index 4736a17..3e063af 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -134,8 +134,13 @@ main(int argc, char **argv)
 		goto out;
 	}
 
+	argv += ret;
+
+	prgname = argv[0];
+
 #ifdef RTE_LIBRTE_TIMER
-	if (rte_timer_subsystem_init() < 0) {
+	ret = rte_timer_subsystem_init();
+	if (ret < 0 && ret != -EALREADY) {
 		ret = -1;
 		goto out;
 	}
@@ -146,10 +151,6 @@ main(int argc, char **argv)
 		goto out;
 	}
 
-	argv += ret;
-
-	prgname = argv[0];
-
 	recursive_call = getenv(RECURSIVE_ENV_VAR);
 	if (recursive_call != NULL) {
 		ret = do_recursive_call();
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 4a61a7d..88048b4 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -2744,7 +2744,7 @@ run_test(const struct bpf_test *tst)
 			printf("%s@%d: check_result(%s) failed, "
 				"error: %d(%s);\n",
 				__func__, __LINE__, tst->name,
-				rv, strerror(ret));
+				rv, strerror(rv));
 		}
 	}
 
diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c
index 088cd5a..312ed79 100644
--- a/app/test/test_cmdline_ipaddr.c
+++ b/app/test/test_cmdline_ipaddr.c
@@ -255,7 +255,7 @@ const char * ipaddr_invalid_strs[] = {
 		/** misc **/
 
 		/* too long */
-		"1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234"
+		"1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234",
 		"random invalid text",
 		"",
 		"\0",
diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index 4c97caf..481fc38 100644
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -200,8 +200,8 @@ const char * num_invalid_strs[] = {
 		"-0x1234580A",
 		"-0b0111010101",
 		/* too long (128+ chars) */
-		"0b1111000011110000111100001111000011110000111100001111000011110000"
-		  "1111000011110000111100001111000011110000111100001111000011110000",
+		("0b1111000011110000111100001111000011110000111100001111000011110000"
+		  "1111000011110000111100001111000011110000111100001111000011110000"),
 		"1E3",
 		"0A",
 		"-B",
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a852040..42c5736 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -112,10 +112,11 @@ setup_test_string(struct rte_mempool *mpool,
 	struct rte_mbuf *m = rte_pktmbuf_alloc(mpool);
 	size_t t_len = len - (blocksize ? (len % blocksize) : 0);
 
-	memset(m->buf_addr, 0, m->buf_len);
 	if (m) {
-		char *dst = rte_pktmbuf_append(m, t_len);
+		char *dst;
 
+		memset(m->buf_addr, 0, m->buf_len);
+		dst = rte_pktmbuf_append(m, t_len);
 		if (!dst) {
 			rte_pktmbuf_free(m);
 			return NULL;
@@ -4761,16 +4762,20 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
 
 	/* Validate obuf */
 	if (verify) {
-		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
 			plaintext,
 			tdata->plaintext.data,
-			tdata->plaintext.len >> 3,
+			(tdata->plaintext.len - tdata->cipher.offset_bits -
+			 (tdata->digest.len << 3)),
+			tdata->cipher.offset_bits,
 			"SNOW 3G Plaintext data not as expected");
 	} else {
-		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
 			ciphertext,
 			tdata->ciphertext.data,
-			tdata->validDataLenInBits.len,
+			(tdata->validDataLenInBits.len -
+			 tdata->cipher.offset_bits),
+			tdata->cipher.offset_bits,
 			"SNOW 3G Ciphertext data not as expected");
 
 		TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -4945,16 +4950,20 @@ test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
 
 	/* Validate obuf */
 	if (verify) {
-		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
 			plaintext,
 			tdata->plaintext.data,
-			tdata->plaintext.len >> 3,
+			(tdata->plaintext.len - tdata->cipher.offset_bits -
+			 (tdata->digest.len << 3)),
+			tdata->cipher.offset_bits,
 			"SNOW 3G Plaintext data not as expected");
 	} else {
-		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+		TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
 			ciphertext,
 			tdata->ciphertext.data,
-			tdata->validDataLenInBits.len,
+			(tdata->validDataLenInBits.len -
+			 tdata->cipher.offset_bits),
+			tdata->cipher.offset_bits,
 			"SNOW 3G Ciphertext data not as expected");
 
 		TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -9653,8 +9662,8 @@ test_multi_session(void)
 	rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
 	sessions = rte_malloc(NULL,
-			(sizeof(struct rte_cryptodev_sym_session *) *
-			MAX_NB_SESSIONS) + 1, 0);
+			sizeof(struct rte_cryptodev_sym_session *) *
+			(MAX_NB_SESSIONS + 1), 0);
 
 	/* Create multiple crypto sessions*/
 	for (i = 0; i < MAX_NB_SESSIONS; i++) {
@@ -9699,6 +9708,7 @@ test_multi_session(void)
 		}
 	}
 
+	sessions[i] = NULL;
 	/* Next session create should fail */
 	rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
 			sessions[i], &ut_params->auth_xform,
@@ -11202,7 +11212,7 @@ test_authenticated_decryption_fail_when_corruption(
 }
 
 static int
-test_authenticated_encryt_with_esn(
+test_authenticated_encrypt_with_esn(
 		struct crypto_testsuite_params *ts_params,
 		struct crypto_unittest_params *ut_params,
 		const struct test_crypto_vector *reference)
@@ -11867,7 +11877,7 @@ auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt(void)
 static int
 auth_encrypt_AES128CBC_HMAC_SHA1_esn_check(void)
 {
-	return test_authenticated_encryt_with_esn(
+	return test_authenticated_encrypt_with_esn(
 			&testsuite_params,
 			&unittest_params,
 			&aes128cbc_hmac_sha1_aad_test_vector);
diff --git a/app/test/test_cryptodev_aes_test_vectors.h b/app/test/test_cryptodev_aes_test_vectors.h
index 66994b6..2b5d417 100644
--- a/app/test/test_cryptodev_aes_test_vectors.h
+++ b/app/test/test_cryptodev_aes_test_vectors.h
@@ -2212,7 +2212,7 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
 			BLOCKCIPHER_TEST_TARGET_PMD_OCTEONTX2
 	},
 	{
-		.test_descr = "AES-192-CBC Encryption Scater gather",
+		.test_descr = "AES-192-CBC Encryption Scatter gather",
 		.test_data = &aes_test_data_10,
 		.op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
 		.feature_mask = BLOCKCIPHER_TEST_FEATURE_SG |
diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c
index f153bcf..1f5db4c 100644
--- a/app/test/test_distributor_perf.c
+++ b/app/test/test_distributor_perf.c
@@ -188,13 +188,15 @@ quit_workers(struct rte_distributor *d, struct rte_mempool *p)
 	rte_mempool_get_bulk(p, (void *)bufs, num_workers);
 
 	quit = 1;
-	for (i = 0; i < num_workers; i++)
+	for (i = 0; i < num_workers; i++) {
 		bufs[i]->hash.usr = i << 1;
-	rte_distributor_process(d, bufs, num_workers);
+		rte_distributor_process(d, &bufs[i], 1);
+	}
 
 	rte_mempool_put_bulk(p, (void *)bufs, num_workers);
 
 	rte_distributor_process(d, NULL, 0);
+	rte_distributor_flush(d);
 	rte_eal_mp_wait_lcore();
 	quit = 0;
 	worker_idx = 0;
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 5b2c0f5..654bebf 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -125,6 +125,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)
 			case HUGEPAGE_CHECK_EXISTS:
 				{
 					/* file exists, return */
+					closedir(hugepage_dir);
 					result = 1;
 					goto end;
 				}
diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c
index 1c0a0fa..b30e0f8 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -224,8 +224,7 @@ test_op_forward_mode(uint8_t session_less)
 		op->sess_type = RTE_CRYPTO_OP_SESSIONLESS;
 		first_xform = &cipher_xform;
 		sym_op->xform = first_xform;
-		uint32_t len = IV_OFFSET + MAXIMUM_IV_LENGTH +
-				(sizeof(struct rte_crypto_sym_xform) * 2);
+		uint32_t len = IV_OFFSET + MAXIMUM_IV_LENGTH;
 		op->private_data_offset = len;
 		/* Fill in private data information */
 		rte_memcpy(&m_data.response_info, &response_info,
@@ -419,8 +418,7 @@ test_op_new_mode(uint8_t session_less)
 		op->sess_type = RTE_CRYPTO_OP_SESSIONLESS;
 		first_xform = &cipher_xform;
 		sym_op->xform = first_xform;
-		uint32_t len = IV_OFFSET + MAXIMUM_IV_LENGTH +
-				(sizeof(struct rte_crypto_sym_xform) * 2);
+		uint32_t len = IV_OFFSET + MAXIMUM_IV_LENGTH;
 		op->private_data_offset = len;
 		/* Fill in private data information */
 		rte_memcpy(&m_data.response_info, &response_info,
@@ -516,7 +514,8 @@ configure_cryptodev(void)
 			NUM_MBUFS, MBUF_CACHE_SIZE,
 			DEFAULT_NUM_XFORMS *
 			sizeof(struct rte_crypto_sym_xform) +
-			MAXIMUM_IV_LENGTH,
+			MAXIMUM_IV_LENGTH +
+			sizeof(union rte_event_crypto_metadata),
 			rte_socket_id());
 	if (params.op_mpool == NULL) {
 		RTE_LOG(ERR, USER1, "Can't create CRYPTO_OP_POOL\n");
diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c
index ad3f4dc..b536dde 100644
--- a/app/test/test_event_timer_adapter.c
+++ b/app/test/test_event_timer_adapter.c
@@ -3,6 +3,8 @@
  * Copyright(c) 2017-2018 Intel Corporation.
  */
 
+#include <math.h>
+
 #include <rte_atomic.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
@@ -46,7 +48,7 @@ static uint64_t global_info_bkt_tck_ns;
 static volatile uint8_t arm_done;
 
 #define CALC_TICKS(tks)					\
-	((tks * global_bkt_tck_ns) / global_info_bkt_tck_ns)
+	ceil((double)(tks * global_bkt_tck_ns) / global_info_bkt_tck_ns)
 
 
 static bool using_services;
diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c
index ef0b6fd..951606f 100644
--- a/app/test/test_flow_classify.c
+++ b/app/test/test_flow_classify.c
@@ -828,6 +828,12 @@ test_flow_classify(void)
 	cls_params.name = "flow_classifier";
 	cls_params.socket_id = 0;
 	cls->cls = rte_flow_classifier_create(&cls_params);
+	if (cls->cls == NULL) {
+		printf("Line %i: flow classifier create has failed!\n",
+		       __LINE__);
+		rte_free(cls);
+		return TEST_FAILED;
+	}
 
 	/* initialise ACL table params */
 	table_acl_params.n_rule_fields = RTE_DIM(ipv4_defs);
diff --git a/app/test/test_kni.c b/app/test/test_kni.c
index e47ab36..b338c91 100644
--- a/app/test/test_kni.c
+++ b/app/test/test_kni.c
@@ -562,8 +562,12 @@ test_kni(void)
 	}
 	closedir(dir);
 
-	/* Initialize KNI subsytem */
-	rte_kni_init(KNI_TEST_MAX_PORTS);
+	/* Initialize KNI subsystem */
+	ret = rte_kni_init(KNI_TEST_MAX_PORTS);
+	if (ret < 0) {
+		printf("fail to initialize KNI subsystem\n");
+		return -1;
+	}
 
 	if (test_kni_allocate_lcores() < 0) {
 		printf("No enough lcores for kni processing\n");
diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index a5bd169..3224272 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -2344,7 +2344,7 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)
 	if (rte_mbuf_refcnt_read(m) != 1)
 		GOTO_FAIL("%s: Invalid refcnt in mbuf\n", __func__);
 
-	buf_iova = rte_mempool_virt2iova(ext_buf_addr);
+	buf_iova = rte_mem_virt2iova(ext_buf_addr);
 	rte_pktmbuf_attach_extbuf(m, ext_buf_addr, buf_iova, buf_len,
 		ret_shinfo);
 	if (m->ol_flags != EXT_ATTACHED_MBUF)
diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index c32a5d3..06a0f7a 100644
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -552,7 +552,7 @@ test_mempool(void)
 		GOTO_ERR(ret, err);
 
 	/* test to initialize mempool objects and memory */
-	nb_objs = rte_mempool_obj_iter(mp_stack_mempool_iter, rte_pktmbuf_init,
+	nb_objs = rte_mempool_obj_iter(mp_stack_mempool_iter, my_obj_init,
 			NULL);
 	if (nb_objs == 0)
 		GOTO_ERR(ret, err);
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index d203810..d0c7e60 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -8,6 +8,7 @@
 #include <limits.h>
 #include <string.h>
 #include <inttypes.h>
+#include <rte_cycles.h>
 
 #include "test.h"
 
@@ -34,37 +35,79 @@ test_power_caps(void)
 #define TEST_POWER_LCORE_INVALID ((unsigned)RTE_MAX_LCORE)
 #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS)
 
-#define TEST_POWER_SYSFILE_CUR_FREQ \
+/* macros used for rounding frequency to nearest 100000 */
+#define TEST_FREQ_ROUNDING_DELTA 50000
+#define TEST_ROUND_FREQ_TO_N_100000 100000
+
+#define TEST_POWER_SYSFILE_CPUINFO_FREQ \
 	"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"
+#define TEST_POWER_SYSFILE_SCALING_FREQ \
+	"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq"
 
 static uint32_t total_freq_num;
 static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
 
 static int
-check_cur_freq(unsigned lcore_id, uint32_t idx)
+check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
 {
 #define TEST_POWER_CONVERT_TO_DECIMAL 10
+#define MAX_LOOP 100
 	FILE *f;
 	char fullpath[PATH_MAX];
 	char buf[BUFSIZ];
 	uint32_t cur_freq;
 	int ret = -1;
+	int i;
 
 	if (snprintf(fullpath, sizeof(fullpath),
-		TEST_POWER_SYSFILE_CUR_FREQ, lcore_id) < 0) {
+		TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
 		return 0;
 	}
 	f = fopen(fullpath, "r");
 	if (f == NULL) {
-		return 0;
-	}
-	if (fgets(buf, sizeof(buf), f) == NULL) {
-		goto fail_get_cur_freq;
+		if (snprintf(fullpath, sizeof(fullpath),
+			TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
+			return 0;
+		}
+		f = fopen(fullpath, "r");
+		if (f == NULL) {
+			return 0;
+		}
+	}
+	for (i = 0; i < MAX_LOOP; i++) {
+		fflush(f);
+		if (fgets(buf, sizeof(buf), f) == NULL)
+			goto fail_all;
+
+		cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
+
+		/* convert the frequency to nearest 100000 value
+		 * Ex: if cur_freq=1396789 then freq_conv=1400000
+		 * Ex: if cur_freq=800030 then freq_conv=800000
+		 */
+		unsigned int freq_conv = 0;
+		freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
+					/ TEST_ROUND_FREQ_TO_N_100000;
+		freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000;
+
+		if (turbo)
+			ret = (freqs[idx] <= freq_conv ? 0 : -1);
+		else
+			ret = (freqs[idx] == freq_conv ? 0 : -1);
+
+		if (ret == 0)
+			break;
+
+		if (fseek(f, 0, SEEK_SET) < 0) {
+			printf("Fail to set file position indicator to 0\n");
+			goto fail_all;
+		}
+
+		/* wait for the value to be updated */
+		rte_delay_ms(10);
 	}
-	cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
-	ret = (freqs[idx] == cur_freq ? 0 : -1);
 
-fail_get_cur_freq:
+fail_all:
 	fclose(f);
 
 	return ret;
@@ -143,7 +186,7 @@ check_power_get_freq(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, count);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, count, false);
 	if (ret < 0)
 		return -1;
 
@@ -193,7 +236,7 @@ check_power_set_freq(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, false);
 	if (ret < 0)
 		return -1;
 
@@ -206,6 +249,8 @@ check_power_freq_down(void)
 {
 	int ret;
 
+	rte_power_freq_enable_turbo(TEST_POWER_LCORE_ID);
+
 	/* test with an invalid lcore id */
 	ret = rte_power_freq_down(TEST_POWER_LCORE_INVALID);
 	if (ret >= 0) {
@@ -229,7 +274,7 @@ check_power_freq_down(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, false);
 	if (ret < 0)
 		return -1;
 
@@ -248,7 +293,7 @@ check_power_freq_down(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, 1);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, false);
 	if (ret < 0)
 		return -1;
 
@@ -284,7 +329,7 @@ check_power_freq_up(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 2);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 2, false);
 	if (ret < 0)
 		return -1;
 
@@ -303,7 +348,7 @@ check_power_freq_up(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, true);
 	if (ret < 0)
 		return -1;
 
@@ -331,7 +376,7 @@ check_power_freq_max(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, true);
 	if (ret < 0)
 		return -1;
 
@@ -359,7 +404,7 @@ check_power_freq_min(void)
 	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, false);
 	if (ret < 0)
 		return -1;
 
@@ -391,9 +436,15 @@ check_power_turbo(void)
 				TEST_POWER_LCORE_ID);
 		return -1;
 	}
+	ret = rte_power_freq_max(TEST_POWER_LCORE_ID);
+	if (ret < 0) {
+		printf("Fail to scale up the freq to max on lcore %u\n",
+						TEST_POWER_LCORE_ID);
+		return -1;
+	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, true);
 	if (ret < 0)
 		return -1;
 
@@ -410,9 +461,15 @@ check_power_turbo(void)
 				TEST_POWER_LCORE_ID);
 		return -1;
 	}
+	ret = rte_power_freq_max(TEST_POWER_LCORE_ID);
+	if (ret < 0) {
+		printf("Fail to scale up the freq to max on lcore %u\n",
+						TEST_POWER_LCORE_ID);
+		return -1;
+	}
 
 	/* Check the current frequency */
-	ret = check_cur_freq(TEST_POWER_LCORE_ID, 1);
+	ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, false);
 	if (ret < 0)
 		return -1;
 
diff --git a/app/test/test_prefetch.c b/app/test/test_prefetch.c
index 41f219a..086c686 100644
--- a/app/test/test_prefetch.c
+++ b/app/test/test_prefetch.c
@@ -20,7 +20,7 @@
 static int
 test_prefetch(void)
 {
-	int a;
+	int a = 0;
 
 	rte_prefetch0(&a);
 	rte_prefetch1(&a);
diff --git a/app/test/test_reciprocal_division_perf.c b/app/test/test_reciprocal_division_perf.c
index a7be8aa..4f62587 100644
--- a/app/test/test_reciprocal_division_perf.c
+++ b/app/test/test_reciprocal_division_perf.c
@@ -71,10 +71,12 @@ test_reciprocal_division_perf(void)
 			tot_cyc_n);
 	printf("Total number of cycles reciprocal division : %"PRIu64"\n",
 			tot_cyc_r);
-	printf("Cycles per division(normal) : %3.2f\n",
-			((double)tot_cyc_n)/i);
-	printf("Cycles per division(reciprocal) : %3.2f\n\n",
-			((double)tot_cyc_r)/i);
+	if (i != 0) {
+		printf("Cycles per division(normal) : %3.2f\n",
+				((double)tot_cyc_n)/i);
+		printf("Cycles per division(reciprocal) : %3.2f\n\n",
+				((double)tot_cyc_r)/i);
+	}
 
 	tot_cyc_n = 0;
 	tot_cyc_r = 0;
@@ -111,11 +113,12 @@ test_reciprocal_division_perf(void)
 			tot_cyc_n);
 	printf("Total number of cycles reciprocal division : %"PRIu64"\n",
 			tot_cyc_r);
-	printf("Cycles per division(normal) : %3.2f\n",
-			((double)tot_cyc_n)/i);
-	printf("Cycles per division(reciprocal) : %3.2f\n\n",
-			((double)tot_cyc_r)/i);
-
+	if (i != 0) {
+		printf("Cycles per division(normal) : %3.2f\n",
+				((double)tot_cyc_n)/i);
+		printf("Cycles per division(reciprocal) : %3.2f\n\n",
+				((double)tot_cyc_r)/i);
+	}
 	tot_cyc_n = 0;
 	tot_cyc_r = 0;
 
@@ -152,10 +155,12 @@ test_reciprocal_division_perf(void)
 			tot_cyc_n);
 	printf("Total number of cycles reciprocal division : %"PRIu64"\n",
 			tot_cyc_r);
-	printf("Cycles per division(normal) : %3.2f\n",
-			((double)tot_cyc_n)/i);
-	printf("Cycles per division(reciprocal) : %3.2f\n\n",
-			((double)tot_cyc_r)/i);
+	if (i != 0) {
+		printf("Cycles per division(normal) : %3.2f\n",
+				((double)tot_cyc_n)/i);
+		printf("Cycles per division(reciprocal) : %3.2f\n\n",
+				((double)tot_cyc_r)/i);
+	}
 
 	tot_cyc_n = 0;
 	tot_cyc_r = 0;
@@ -190,10 +195,12 @@ test_reciprocal_division_perf(void)
 			tot_cyc_n);
 	printf("Total number of cycles reciprocal division : %"PRIu64"\n",
 			tot_cyc_r);
-	printf("Cycles per division(normal) : %3.2f\n",
-			((double)tot_cyc_n)/i);
-	printf("Cycles per division(reciprocal) : %3.2f\n",
-			((double)tot_cyc_r)/i);
+	if (i != 0) {
+		printf("Cycles per division(normal) : %3.2f\n",
+				((double)tot_cyc_n)/i);
+		printf("Cycles per division(reciprocal) : %3.2f\n",
+				((double)tot_cyc_r)/i);
+	}
 
 	return result;
 }
diff --git a/app/test/test_stack.c b/app/test/test_stack.c
index c8dac1f..fe6f1aa 100644
--- a/app/test/test_stack.c
+++ b/app/test/test_stack.c
@@ -419,7 +419,11 @@ test_stack(void)
 static int
 test_lf_stack(void)
 {
+#if defined(RTE_STACK_LF_SUPPORTED)
 	return __test_stack(RTE_STACK_F_LF);
+#else
+	return TEST_SKIPPED;
+#endif
 }
 
 REGISTER_TEST_COMMAND(stack_autotest, test_stack);
diff --git a/app/test/test_stack_perf.c b/app/test/test_stack_perf.c
index 3ab7267..a0c7d4d 100644
--- a/app/test/test_stack_perf.c
+++ b/app/test/test_stack_perf.c
@@ -349,7 +349,11 @@ test_stack_perf(void)
 static int
 test_lf_stack_perf(void)
 {
+#if defined(RTE_STACK_LF_SUPPORTED)
 	return __test_stack_perf(RTE_STACK_F_LF);
+#else
+	return TEST_SKIPPED;
+#endif
 }
 
 REGISTER_TEST_COMMAND(stack_perf_autotest, test_stack_perf);
diff --git a/app/test/test_table_tables.c b/app/test/test_table_tables.c
index 1aa269f..4ff6ab1 100644
--- a/app/test/test_table_tables.c
+++ b/app/test/test_table_tables.c
@@ -28,7 +28,8 @@ table_test table_tests[] = {
 			APP_METADATA_OFFSET(0));			\
 	key = RTE_MBUF_METADATA_UINT8_PTR(mbuf,			\
 			APP_METADATA_OFFSET(32));			\
-	memset(key, 0, 32);						\
+	if (mbuf->priv_size + mbuf->buf_len >= 64)			\
+		memset(key, 0, 32);					\
 	k32 = (uint32_t *) key;						\
 	k32[0] = (value);						\
 	*signature = pipeline_test_hash(key, NULL, 0, 0);			\
diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c
index 790f180..a4033b6 100644
--- a/app/test/test_timer_secondary.c
+++ b/app/test/test_timer_secondary.c
@@ -126,9 +126,9 @@ test_timer_secondary(void)
 
 		mz = rte_memzone_reserve(TEST_INFO_MZ_NAME, sizeof(*test_info),
 					 SOCKET_ID_ANY, 0);
-		test_info = mz->addr;
-		TEST_ASSERT_NOT_NULL(test_info, "Couldn't allocate memory for "
+		TEST_ASSERT_NOT_NULL(mz, "Couldn't allocate memory for "
 				     "test data");
+		test_info = mz->addr;
 
 		test_info->tim_mempool = rte_mempool_create("test_timer_mp",
 				NUM_TIMERS, sizeof(struct rte_timer), 0, 0,
@@ -172,9 +172,9 @@ test_timer_secondary(void)
 		int i;
 
 		mz = rte_memzone_lookup(TEST_INFO_MZ_NAME);
-		test_info = mz->addr;
-		TEST_ASSERT_NOT_NULL(test_info, "Couldn't lookup memzone for "
+		TEST_ASSERT_NOT_NULL(mz, "Couldn't lookup memzone for "
 				     "test info");
+		test_info = mz->addr;
 
 		for (i = 0; i < NUM_TIMERS; i++) {
 			rte_mempool_get(test_info->tim_mempool, (void **)&tim);
diff --git a/buildtools/check-experimental-syms.sh b/buildtools/check-experimental-syms.sh
index f3603e5..fe07dd3 100755
--- a/buildtools/check-experimental-syms.sh
+++ b/buildtools/check-experimental-syms.sh
@@ -18,7 +18,7 @@ then
 	exit 0
 fi
 
-DUMPFILE=$(mktemp -t dpdk.${0##*/}.XXX.objdump)
+DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XXXXXX)
 trap 'rm -f "$DUMPFILE"' EXIT
 objdump -t $OBJFILE >$DUMPFILE
 
diff --git a/buildtools/map-list-symbol.sh b/buildtools/map-list-symbol.sh
index 5509b4a..3bf9bd6 100755
--- a/buildtools/map-list-symbol.sh
+++ b/buildtools/map-list-symbol.sh
@@ -44,7 +44,7 @@ for file in $@; do
 			ret = 1;
 		}
 	}
-	/^.*{/ {
+	/^.*\{/ {
 		if ("'$section'" == "all" || $1 == "'$section'") {
 			current_section = $1;
 		}
diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
deleted file mode 100644
index 39a8fd1..0000000
--- a/buildtools/pkg-config/meson.build
+++ /dev/null
@@ -1,59 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2020 Intel Corporation
-
-pkg = import('pkgconfig')
-pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
-if is_freebsd
-	pkg_extra_cflags += ['-D__BSD_VISIBLE']
-endif
-
-# When calling pkg-config --static --libs, pkg-config will always output the
-# regular libs first, and then the extra libs from Libs.private field,
-# since the assumption is that those are additional dependencies for building
-# statically that the .a files depend upon. The output order of .pc fields is:
-#   Libs   Libs.private   Requires   Requires.private
-# The fields Requires* are for package names.
-# The flags of the DPDK libraries must be defined in Libs* fields.
-# However, the DPDK drivers are linked only in static builds (Libs.private),
-# and those need to come *before* the regular libraries (Libs field).
-# This requirement is satisfied by moving the regular libs in a separate file
-# included in the field Requires (after Libs.private).
-# Another requirement is to allow linking dependencies as shared libraries,
-# while linking static DPDK libraries and drivers. It is satisfied by
-# listing the static files in Libs.private with the explicit syntax -l:libfoo.a.
-# As a consequence, the regular DPDK libraries are already listed as static
-# in the field Libs.private. The second occurences of DPDK libraries,
-# included from Requires and used for shared library linkage case,
-# are skipped in the case of static linkage thanks to the flag --as-needed.
-
-
-pkg.generate(name: 'dpdk-libs',
-	filebase: 'libdpdk-libs',
-	description: '''Internal-only DPDK pkgconfig file. Not for direct use.
-Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
-	version: meson.project_version(),
-	subdirs: [get_option('include_subdir_arch'), '.'],
-	extra_cflags: pkg_extra_cflags,
-	libraries: ['-Wl,--as-needed'] + dpdk_libraries,
-	libraries_private: dpdk_extra_ldflags)
-
-platform_flags = []
-if not is_windows
-	platform_flags += ['-Wl,--export-dynamic'] # ELF only
-endif
-pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
-	filebase: 'libdpdk',
-	version: meson.project_version(),
-	description: '''The Data Plane Development Kit (DPDK).
-Note that CFLAGS might contain an -march flag higher than typical baseline.
-This is required for a number of static inline functions in the public headers.''',
-	requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
-	                  # if libbsd is not enabled, then this is blank
-	libraries_private: ['-Wl,--whole-archive'] +
-			dpdk_drivers + dpdk_static_libraries +
-			['-Wl,--no-whole-archive'] + platform_flags
-)
-
-# For static linking with dependencies as shared libraries,
-# the internal static libraries must be flagged explicitly.
-run_command(py3, 'set-static-linker-flags.py', check: true)
diff --git a/buildtools/pkg-config/set-static-linker-flags.py b/buildtools/pkg-config/set-static-linker-flags.py
deleted file mode 100644
index 2745db3..0000000
--- a/buildtools/pkg-config/set-static-linker-flags.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2020 Intel Corporation
-
-# Script to fix flags for static linking in pkgconfig files from meson
-# Should be called from meson build itself
-import os
-import sys
-
-
-def fix_ldflag(f):
-    if not f.startswith('-lrte_'):
-        return f
-    return '-l:lib' + f[2:] + '.a'
-
-
-def fix_libs_private(line):
-    if not line.startswith('Libs.private'):
-        return line
-    ldflags = [fix_ldflag(flag) for flag in line.split()]
-    return ' '.join(ldflags) + '\n'
-
-
-def process_pc_file(filepath):
-    print('Processing', filepath)
-    with open(filepath) as src:
-        lines = src.readlines()
-    with open(filepath, 'w') as dst:
-        dst.writelines([fix_libs_private(line) for line in lines])
-
-
-if 'MESON_BUILD_ROOT' not in os.environ:
-    print('This script must be called from a meson build environment')
-    sys.exit(1)
-for root, dirs, files in os.walk(os.environ['MESON_BUILD_ROOT']):
-    pc_files = [f for f in files if f.endswith('.pc')]
-    for f in pc_files:
-        process_pc_file(os.path.join(root, f))
diff --git a/config/meson.build b/config/meson.build
index b1f728e..4007b8f 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -121,11 +121,8 @@ if cc.find_library('m', required : false).found()
 	dpdk_extra_ldflags += '-lm'
 endif
 
-# for linux link against dl, for bsd execinfo
 if is_linux
 	link_lib = 'dl'
-elif is_freebsd
-	link_lib = 'execinfo'
 else
 	link_lib = ''
 endif
@@ -155,6 +152,12 @@ if fdt_dep.found() and cc.has_header('fdt.h')
 	dpdk_extra_ldflags += '-lfdt'
 endif
 
+libexecinfo = cc.find_library('libexecinfo', required: false)
+if libexecinfo.found() and cc.has_header('execinfo.h')
+	add_project_link_arguments('-lexecinfo', language: 'c')
+	dpdk_extra_ldflags += '-lexecinfo'
+endif
+
 # check for libbsd
 libbsd = dependency('libbsd', required: false, method: 'pkg-config')
 if libbsd.found()
diff --git a/config/ppc_64/meson.build b/config/ppc_64/meson.build
index aa7d73d..54a94d6 100644
--- a/config/ppc_64/meson.build
+++ b/config/ppc_64/meson.build
@@ -17,9 +17,20 @@ if not power9_supported
 	dpdk_conf.set('RTE_MACHINE','power8')
 endif
 
-# overrides specific to ppc64
-dpdk_conf.set('RTE_MAX_LCORE', 1536)
-dpdk_conf.set('RTE_MAX_NUMA_NODES', 32)
+# Certain POWER9 systems can scale as high as 1536 LCORES, but setting such a
+# high value can waste memory, cause timeouts in time limited autotests, and is
+# unlikely to be used in many production situations.  Similarly, keeping the
+# default 64 LCORES seems too small as most POWER9 dual socket systems will have
+# at least 128 LCORES available.  Set RTE_MAX_LCORE to 128 for POWER systems as
+# a compromise.
+dpdk_conf.set('RTE_MAX_LCORE', 128)
+
+# POWER systems do not allocate NUMA nodes sequentially.  A dual socket system
+# will have CPUs associated with NUMA nodes 0 & 8, so ensure that the second
+# NUMA node will be supported by setting RTE_MAX_NUMA_NODES to 16. High end
+# systems can scale even higher with as many as 32 NUMA nodes.
+dpdk_conf.set('RTE_MAX_NUMA_NODES', 16)
+
 dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
 dpdk_conf.set('RTE_MACHINE_CPUFLAG_ALTIVEC', 1)
 dpdk_conf.set('RTE_MACHINE_CPUFLAG_VSX', 1)
diff --git a/debian/changelog b/debian/changelog
index 9426c2e..b4bc5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dpdk (19.11.10-0ubuntu0.20.04.1) focal; urgency=medium
+
+  * Merge the latest upstream stable minor release 19.11.10 (LP: #1940913)
+    Release notes available at:
+    https://doc.dpdk.org/guides-19.11/rel_notes/release_19_11.html
+    - Revert "fix linking back to pre be like 19.11.6 behavior (LP 1920141)"
+      [now part of upstream]
+  * d/p/u/lp-1940957-net-i40e-support-25G-AOC-ACC-cables.patch: fix issues
+    with 25G AOC cables (LP: #1940957)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 24 Aug 2021 11:51:47 +0200
+
 dpdk (19.11.7-0ubuntu0.20.04.1) focal; urgency=medium
 
   * Merge the latest upstream stable minor release 19.11.7-rc1
diff --git a/debian/patches/lp-1920141-01-Revert-Revert-Revert-build-pkg-config-prevent-overli.patch b/debian/patches/lp-1920141-01-Revert-Revert-Revert-build-pkg-config-prevent-overli.patch
deleted file mode 100644
index cd5adec..0000000
--- a/debian/patches/lp-1920141-01-Revert-Revert-Revert-build-pkg-config-prevent-overli.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9a776641702dcfdccc53feff143b4d3fea3d84f8 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 10:51:03 +0100
-Subject: [PATCH 1/7] Revert "Revert "Revert "build/pkg-config: prevent
- overlinking"""
-
-This reverts commit f49248a990b5c34938c5246e013bc82f1296959f.
-This series changes linking behavior in 19.11.x and thereby should stay
-out. It breaks - for example - a rebuild of OVS 2.13 or builds
-of later OVS 2.13.x stable releases.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- buildtools/pkg-config/meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
-index 39a8fd1c8e..63a76b56d3 100644
---- a/buildtools/pkg-config/meson.build
-+++ b/buildtools/pkg-config/meson.build
-@@ -21,11 +21,6 @@ endif
- # Another requirement is to allow linking dependencies as shared libraries,
- # while linking static DPDK libraries and drivers. It is satisfied by
- # listing the static files in Libs.private with the explicit syntax -l:libfoo.a.
--# As a consequence, the regular DPDK libraries are already listed as static
--# in the field Libs.private. The second occurences of DPDK libraries,
--# included from Requires and used for shared library linkage case,
--# are skipped in the case of static linkage thanks to the flag --as-needed.
--
- 
- pkg.generate(name: 'dpdk-libs',
- 	filebase: 'libdpdk-libs',
-@@ -34,7 +29,7 @@ Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
- 	version: meson.project_version(),
- 	subdirs: [get_option('include_subdir_arch'), '.'],
- 	extra_cflags: pkg_extra_cflags,
--	libraries: ['-Wl,--as-needed'] + dpdk_libraries,
-+	libraries: dpdk_libraries,
- 	libraries_private: dpdk_extra_ldflags)
- 
- platform_flags = []
--- 
-2.30.0
-
diff --git a/debian/patches/lp-1920141-02-Revert-Revert-Revert-build-pkg-config-improve-static.patch b/debian/patches/lp-1920141-02-Revert-Revert-Revert-build-pkg-config-improve-static.patch
deleted file mode 100644
index 67fe965..0000000
--- a/debian/patches/lp-1920141-02-Revert-Revert-Revert-build-pkg-config-improve-static.patch
+++ /dev/null
@@ -1,708 +0,0 @@
-From 44763bcba2cd7853065458db6dd214b47ac91a1c Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 10:56:06 +0100
-Subject: [PATCH 2/7] Revert "Revert "Revert "build/pkg-config: improve static
- linking flags"""
-
-This reverts commit 39586a4cf0e320a15392342411532e398e0c5c8d.
-This series changes linking behavior in 19.11.x and thereby should stay
-out. It breaks - for example - a rebuild of OVS 2.13 or builds
-of later OVS 2.13.x stable releases.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- buildtools/pkg-config/meson.build             | 16 +++-----
- .../pkg-config/set-static-linker-flags.py     | 38 -------------------
- doc/build-sdk-meson.txt                       |  2 +-
- examples/bbdev_app/Makefile                   |  2 +-
- examples/bond/Makefile                        |  2 +-
- examples/cmdline/Makefile                     |  2 +-
- examples/distributor/Makefile                 |  2 +-
- examples/eventdev_pipeline/Makefile           |  2 +-
- examples/fips_validation/Makefile             |  2 +-
- examples/flow_classify/Makefile               |  2 +-
- examples/flow_filtering/Makefile              |  2 +-
- examples/helloworld/Makefile                  |  2 +-
- examples/ioat/Makefile                        |  2 +-
- examples/ip_fragmentation/Makefile            |  2 +-
- examples/ip_pipeline/Makefile                 |  2 +-
- examples/ip_reassembly/Makefile               |  2 +-
- examples/ipsec-secgw/Makefile                 |  2 +-
- examples/ipv4_multicast/Makefile              |  2 +-
- examples/kni/Makefile                         |  2 +-
- examples/l2fwd-cat/Makefile                   |  2 +-
- examples/l2fwd-crypto/Makefile                |  2 +-
- examples/l2fwd-event/Makefile                 |  2 +-
- examples/l2fwd-jobstats/Makefile              |  2 +-
- examples/l2fwd-keepalive/Makefile             |  2 +-
- examples/l2fwd/Makefile                       |  2 +-
- examples/l3fwd-acl/Makefile                   |  2 +-
- examples/l3fwd-power/Makefile                 |  2 +-
- examples/l3fwd/Makefile                       |  2 +-
- examples/link_status_interrupt/Makefile       |  2 +-
- examples/ntb/Makefile                         |  2 +-
- examples/packet_ordering/Makefile             |  2 +-
- examples/ptpclient/Makefile                   |  2 +-
- examples/qos_meter/Makefile                   |  2 +-
- examples/qos_sched/Makefile                   |  2 +-
- examples/rxtx_callbacks/Makefile              |  2 +-
- examples/service_cores/Makefile               |  2 +-
- examples/skeleton/Makefile                    |  2 +-
- examples/tep_termination/Makefile             |  2 +-
- examples/timer/Makefile                       |  2 +-
- examples/vdpa/Makefile                        |  2 +-
- examples/vhost/Makefile                       |  2 +-
- examples/vhost_blk/Makefile                   |  2 +-
- examples/vhost_crypto/Makefile                |  2 +-
- examples/vmdq/Makefile                        |  2 +-
- examples/vmdq_dcb/Makefile                    |  2 +-
- 45 files changed, 49 insertions(+), 91 deletions(-)
- delete mode 100644 buildtools/pkg-config/set-static-linker-flags.py
-
-diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
-index 63a76b56d3..ccb34dcab3 100644
---- a/buildtools/pkg-config/meson.build
-+++ b/buildtools/pkg-config/meson.build
-@@ -1,6 +1,10 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2020 Intel Corporation
- 
-+# for static builds, include the drivers as libs and we need to "whole-archive"
-+# them.
-+dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
-+
- pkg = import('pkgconfig')
- pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
- if is_freebsd
-@@ -18,9 +22,6 @@ endif
- # and those need to come *before* the regular libraries (Libs field).
- # This requirement is satisfied by moving the regular libs in a separate file
- # included in the field Requires (after Libs.private).
--# Another requirement is to allow linking dependencies as shared libraries,
--# while linking static DPDK libraries and drivers. It is satisfied by
--# listing the static files in Libs.private with the explicit syntax -l:libfoo.a.
- 
- pkg.generate(name: 'dpdk-libs',
- 	filebase: 'libdpdk-libs',
-@@ -44,11 +45,6 @@ Note that CFLAGS might contain an -march flag higher than typical baseline.
- This is required for a number of static inline functions in the public headers.''',
- 	requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
- 	                  # if libbsd is not enabled, then this is blank
--	libraries_private: ['-Wl,--whole-archive'] +
--			dpdk_drivers + dpdk_static_libraries +
--			['-Wl,--no-whole-archive'] + platform_flags
-+	libraries_private: dpdk_drivers + dpdk_static_libraries +
-+			['-Wl,-Bdynamic'] + platform_flags
- )
--
--# For static linking with dependencies as shared libraries,
--# the internal static libraries must be flagged explicitly.
--run_command(py3, 'set-static-linker-flags.py', check: true)
-diff --git a/buildtools/pkg-config/set-static-linker-flags.py b/buildtools/pkg-config/set-static-linker-flags.py
-deleted file mode 100644
-index 2745db34c2..0000000000
---- a/buildtools/pkg-config/set-static-linker-flags.py
-+++ /dev/null
-@@ -1,38 +0,0 @@
--#!/usr/bin/env python3
--# SPDX-License-Identifier: BSD-3-Clause
--# Copyright(c) 2020 Intel Corporation
--
--# Script to fix flags for static linking in pkgconfig files from meson
--# Should be called from meson build itself
--import os
--import sys
--
--
--def fix_ldflag(f):
--    if not f.startswith('-lrte_'):
--        return f
--    return '-l:lib' + f[2:] + '.a'
--
--
--def fix_libs_private(line):
--    if not line.startswith('Libs.private'):
--        return line
--    ldflags = [fix_ldflag(flag) for flag in line.split()]
--    return ' '.join(ldflags) + '\n'
--
--
--def process_pc_file(filepath):
--    print('Processing', filepath)
--    with open(filepath) as src:
--        lines = src.readlines()
--    with open(filepath, 'w') as dst:
--        dst.writelines([fix_libs_private(line) for line in lines])
--
--
--if 'MESON_BUILD_ROOT' not in os.environ:
--    print('This script must be called from a meson build environment')
--    sys.exit(1)
--for root, dirs, files in os.walk(os.environ['MESON_BUILD_ROOT']):
--    pc_files = [f for f in files if f.endswith('.pc')]
--    for f in pc_files:
--        process_pc_file(os.path.join(root, f))
-diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
-index 8fb60a7c11..61c8e3515c 100644
---- a/doc/build-sdk-meson.txt
-+++ b/doc/build-sdk-meson.txt
-@@ -190,7 +190,7 @@ From examples/helloworld/Makefile::
- 	PC_FILE := $(shell pkg-config --path libdpdk)
- 	CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)
- 	LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)
--	LDFLAGS_STATIC = $(shell pkg-config --static --libs libdpdk)
-+	LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)
- 
- 	build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 		$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile
-index 3c8eb75a4e..ead3f016b8 100644
---- a/examples/bbdev_app/Makefile
-+++ b/examples/bbdev_app/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/bond/Makefile b/examples/bond/Makefile
-index 4e4289e151..2030ca410a 100644
---- a/examples/bond/Makefile
-+++ b/examples/bond/Makefile
-@@ -24,7 +24,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile
-index 9418b50b87..0b6b54540a 100644
---- a/examples/cmdline/Makefile
-+++ b/examples/cmdline/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile
-index 5253780793a..4192d8a4ae 100644
---- a/examples/distributor/Makefile
-+++ b/examples/distributor/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile
-index 95a8d0884a..96cd244378 100644
---- a/examples/eventdev_pipeline/Makefile
-+++ b/examples/eventdev_pipeline/Makefile
-@@ -24,7 +24,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile
-index 5bcf1872c4..e5ae22b521 100644
---- a/examples/fips_validation/Makefile
-+++ b/examples/fips_validation/Makefile
-@@ -31,7 +31,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile
-index 161d576b60..6864941b3e 100644
---- a/examples/flow_classify/Makefile
-+++ b/examples/flow_classify/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile
-index 0ce20d3485..6c51c0b7a0 100644
---- a/examples/flow_filtering/Makefile
-+++ b/examples/flow_filtering/Makefile
-@@ -20,7 +20,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile
-index 9a07f89efc..16d82b02f0 100644
---- a/examples/helloworld/Makefile
-+++ b/examples/helloworld/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile
-index dd4930136e..ef63f5d689 100644
---- a/examples/ioat/Makefile
-+++ b/examples/ioat/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile
-index d200cc627d..ede0c4f02b 100644
---- a/examples/ip_fragmentation/Makefile
-+++ b/examples/ip_fragmentation/Makefile
-@@ -23,7 +23,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile
-index b8e086267b..1e404ff5d0 100644
---- a/examples/ip_pipeline/Makefile
-+++ b/examples/ip_pipeline/Makefile
-@@ -35,7 +35,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -I. -DALLOW_EXPERIMENTAL_API -D_GNU_SOURCE
- 
-diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile
-index c7424da2b7..3f2888b338 100644
---- a/examples/ip_reassembly/Makefile
-+++ b/examples/ip_reassembly/Makefile
-@@ -23,7 +23,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile
-index 38c456daa2..a4977f61f8 100644
---- a/examples/ipsec-secgw/Makefile
-+++ b/examples/ipsec-secgw/Makefile
-@@ -33,7 +33,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile
-index 5e34bbba00..92d3db0f4d 100644
---- a/examples/ipv4_multicast/Makefile
-+++ b/examples/ipv4_multicast/Makefile
-@@ -23,7 +23,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/kni/Makefile b/examples/kni/Makefile
-index 10b42891da..f687765510 100644
---- a/examples/kni/Makefile
-+++ b/examples/kni/Makefile
-@@ -23,7 +23,7 @@ PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- LDFLAGS += -pthread
- 
-diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
-index e8fdc46d74..b0e53c37e8 100644
---- a/examples/l2fwd-cat/Makefile
-+++ b/examples/l2fwd-cat/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- LDFLAGS += -lpqos
- 
-diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile
-index cafe778fc6..7c170cfb53 100644
---- a/examples/l2fwd-crypto/Makefile
-+++ b/examples/l2fwd-crypto/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- CONFIG_DEFINES = $(shell $(CC) $(CFLAGS) -dM -E - < /dev/null)
-diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile
-index bf0ee890d5..4cdae36f17 100644
---- a/examples/l2fwd-event/Makefile
-+++ b/examples/l2fwd-event/Makefile
-@@ -28,7 +28,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile
-index c26803909f..73c91faa8d 100644
---- a/examples/l2fwd-jobstats/Makefile
-+++ b/examples/l2fwd-jobstats/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile
-index ea3a9cbbf3..94d1e58bb5 100644
---- a/examples/l2fwd-keepalive/Makefile
-+++ b/examples/l2fwd-keepalive/Makefile
-@@ -24,7 +24,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile
-index 15105ac57e..8b7b26cb90 100644
---- a/examples/l2fwd/Makefile
-+++ b/examples/l2fwd/Makefile
-@@ -24,7 +24,7 @@ CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- # Add flag to allow experimental API as l2fwd uses rte_ethdev_set_ptype API
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile
-index 156dc19606..d9909584b1 100644
---- a/examples/l3fwd-acl/Makefile
-+++ b/examples/l3fwd-acl/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile
-index 74441f98cf..729d49639b 100644
---- a/examples/l3fwd-power/Makefile
-+++ b/examples/l3fwd-power/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
-index 38a370c2cf..b2dbf26075 100644
---- a/examples/l3fwd/Makefile
-+++ b/examples/l3fwd/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile
-index 879ee7384d..4f02a89013 100644
---- a/examples/link_status_interrupt/Makefile
-+++ b/examples/link_status_interrupt/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile
-index f41ccfac27..bdc0d6e80f 100644
---- a/examples/ntb/Makefile
-+++ b/examples/ntb/Makefile
-@@ -26,7 +26,7 @@ LDFLAGS += -pthread
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile
-index 1e50389421..261b7f06a8 100644
---- a/examples/packet_ordering/Makefile
-+++ b/examples/packet_ordering/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile
-index 9e47a60117..82d72b3e31 100644
---- a/examples/ptpclient/Makefile
-+++ b/examples/ptpclient/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile
-index f733facaeb..7c2bf88a90 100644
---- a/examples/qos_meter/Makefile
-+++ b/examples/qos_meter/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile
-index 736ac00a36..525061ca07 100644
---- a/examples/qos_sched/Makefile
-+++ b/examples/qos_sched/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile
-index eecdcada3e..418f47c4d7 100644
---- a/examples/rxtx_callbacks/Makefile
-+++ b/examples/rxtx_callbacks/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile
-index b8669fdf7e..c47055813e 100644
---- a/examples/service_cores/Makefile
-+++ b/examples/service_cores/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile
-index 5059f3123f..2c29004d79 100644
---- a/examples/skeleton/Makefile
-+++ b/examples/skeleton/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile
-index 548ca3cee3..645112498d 100644
---- a/examples/tep_termination/Makefile
-+++ b/examples/tep_termination/Makefile
-@@ -24,7 +24,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -Wno-deprecated-declarations
- 
-diff --git a/examples/timer/Makefile b/examples/timer/Makefile
-index b34c8baa6b..bf86339ab7 100644
---- a/examples/timer/Makefile
-+++ b/examples/timer/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile
-index bc0b6793e6..6a25497cd8 100644
---- a/examples/vdpa/Makefile
-+++ b/examples/vdpa/Makefile
-@@ -23,7 +23,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
-index ef6f3550f3..f2b1615418 100644
---- a/examples/vhost/Makefile
-+++ b/examples/vhost/Makefile
-@@ -24,7 +24,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/vhost_blk/Makefile b/examples/vhost_blk/Makefile
-index 3952791784..39244320d8 100644
---- a/examples/vhost_blk/Makefile
-+++ b/examples/vhost_blk/Makefile
-@@ -25,7 +25,7 @@ LDFLAGS += -pthread
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
-diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile
-index 28e3e4de74..ae8cb81f87 100644
---- a/examples/vhost_crypto/Makefile
-+++ b/examples/vhost_crypto/Makefile
-@@ -23,7 +23,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile
-index 7e59e4d658..0767c715a1 100644
---- a/examples/vmdq/Makefile
-+++ b/examples/vmdq/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile
-index 2302577d00..2a9b04143f 100644
---- a/examples/vmdq_dcb/Makefile
-+++ b/examples/vmdq_dcb/Makefile
-@@ -22,7 +22,7 @@ PKGCONF ?= pkg-config
- PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null)
- CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
- LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
--LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
-+LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
- 
- build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
- 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
--- 
-2.30.0
-
diff --git a/debian/patches/lp-1920141-03-Revert-Revert-Revert-build-pkg-config-output-drivers.patch b/debian/patches/lp-1920141-03-Revert-Revert-Revert-build-pkg-config-output-drivers.patch
deleted file mode 100644
index 93b582d..0000000
--- a/debian/patches/lp-1920141-03-Revert-Revert-Revert-build-pkg-config-output-drivers.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From d4b956825f34022474bf98cbfde999e87ba940b5 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 11:19:54 +0100
-Subject: [PATCH 3/7] Revert "Revert "Revert "build/pkg-config: output drivers
- first for static build"""
-
-This reverts commit 906e935a1fd1f6cf01ff12d70c2f040aa91984c6.
-This series changes linking behavior in 19.11.x and thereby should stay
-out. It breaks - for example - a rebuild of OVS 2.13 or builds
-of later OVS 2.13.x stable releases.
-
-Reverting this drops the two following 19.11.7 changes which need to be
-re-created in the new (old) place of meson.build
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- buildtools/pkg-config/meson.build | 36 ++++---------------------------
- 1 file changed, 4 insertions(+), 32 deletions(-)
-
-diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
-index ccb34dcab3..c93711b5e8 100644
---- a/buildtools/pkg-config/meson.build
-+++ b/buildtools/pkg-config/meson.build
-@@ -10,41 +10,13 @@ pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
- if is_freebsd
- 	pkg_extra_cflags += ['-D__BSD_VISIBLE']
- endif
--
--# When calling pkg-config --static --libs, pkg-config will always output the
--# regular libs first, and then the extra libs from Libs.private field,
--# since the assumption is that those are additional dependencies for building
--# statically that the .a files depend upon. The output order of .pc fields is:
--#   Libs   Libs.private   Requires   Requires.private
--# The fields Requires* are for package names.
--# The flags of the DPDK libraries must be defined in Libs* fields.
--# However, the DPDK drivers are linked only in static builds (Libs.private),
--# and those need to come *before* the regular libraries (Libs field).
--# This requirement is satisfied by moving the regular libs in a separate file
--# included in the field Requires (after Libs.private).
--
--pkg.generate(name: 'dpdk-libs',
--	filebase: 'libdpdk-libs',
--	description: '''Internal-only DPDK pkgconfig file. Not for direct use.
--Use libdpdk.pc instead of this file to query DPDK compile/link arguments''',
-+pkg.generate(name: meson.project_name(),
-+	filebase: 'lib' + meson.project_name().to_lower(),
- 	version: meson.project_version(),
--	subdirs: [get_option('include_subdir_arch'), '.'],
--	extra_cflags: pkg_extra_cflags,
- 	libraries: dpdk_libraries,
--	libraries_private: dpdk_extra_ldflags)
--
--platform_flags = []
--if not is_windows
--	platform_flags += ['-Wl,--export-dynamic'] # ELF only
--endif
--pkg.generate(name: 'DPDK', # main DPDK pkgconfig file
--	filebase: 'libdpdk',
--	version: meson.project_version(),
- 	description: '''The Data Plane Development Kit (DPDK).
- Note that CFLAGS might contain an -march flag higher than typical baseline.
- This is required for a number of static inline functions in the public headers.''',
--	requires: ['libdpdk-libs', libbsd], # may need libbsd for string funcs
--	                  # if libbsd is not enabled, then this is blank
--	libraries_private: dpdk_drivers + dpdk_static_libraries +
--			['-Wl,-Bdynamic'] + platform_flags
-+	subdirs: [get_option('include_subdir_arch'), '.'],
-+	extra_cflags: pkg_extra_cflag
- )
--- 
-2.30.0
-
diff --git a/debian/patches/lp-1920141-04-Revert-Revert-Revert-build-pkg-config-move-pkg-confi.patch b/debian/patches/lp-1920141-04-Revert-Revert-Revert-build-pkg-config-move-pkg-confi.patch
deleted file mode 100644
index d79fc04..0000000
--- a/debian/patches/lp-1920141-04-Revert-Revert-Revert-build-pkg-config-move-pkg-confi.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 9171fe0b7f859c082ca648d2a84af7490dc4f93a Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 11:22:04 +0100
-Subject: [PATCH 4/7] Revert "Revert "Revert "build/pkg-config: move pkg-config
- file creation"""
-
-This reverts commit deebf952394cef1d14912f3dc2fc5121431c16a5.
-This series changes linking behavior in 19.11.x and thereby should stay
-out. It breaks - for example - a rebuild of OVS 2.13 or builds
-of later OVS 2.13.x stable releases.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- MAINTAINERS                       |  2 --
- buildtools/pkg-config/meson.build | 22 ----------------------
- meson.build                       | 25 +++++++++++++++++++++++--
- 3 files changed, 23 insertions(+), 26 deletions(-)
- delete mode 100644 buildtools/pkg-config/meson.build
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 952ded7b00..75431e333b 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -131,8 +131,6 @@ F: config/rte_config.h
- F: buildtools/call-sphinx-build.py
- F: buildtools/gen-pmdinfo-cfile.sh
- F: buildtools/map_to_def.py
--F: buildtools/list-dir-globs.py
--F: buildtools/pkg-config/
- F: buildtools/symlink-drivers-solibs.sh
- 
- Public CI
-diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build
-deleted file mode 100644
-index c93711b5e8..0000000000
---- a/buildtools/pkg-config/meson.build
-+++ /dev/null
-@@ -1,22 +0,0 @@
--# SPDX-License-Identifier: BSD-3-Clause
--# Copyright(c) 2020 Intel Corporation
--
--# for static builds, include the drivers as libs and we need to "whole-archive"
--# them.
--dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
--
--pkg = import('pkgconfig')
--pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
--if is_freebsd
--	pkg_extra_cflags += ['-D__BSD_VISIBLE']
--endif
--pkg.generate(name: meson.project_name(),
--	filebase: 'lib' + meson.project_name().to_lower(),
--	version: meson.project_version(),
--	libraries: dpdk_libraries,
--	description: '''The Data Plane Development Kit (DPDK).
--Note that CFLAGS might contain an -march flag higher than typical baseline.
--This is required for a number of static inline functions in the public headers.''',
--	subdirs: [get_option('include_subdir_arch'), '.'],
--	extra_cflags: pkg_extra_cflag
--)
-diff --git a/meson.build b/meson.build
-index 00949de995..58995252bd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -64,8 +64,29 @@ configure_file(output: build_cfg,
- 		install_dir: join_paths(get_option('includedir'),
- 				get_option('include_subdir_arch')))
- 
--# build pkg-config files for dpdk
--subdir('buildtools/pkg-config')
-+# for static builds, include the drivers as libs and we need to "whole-archive"
-+# them.
-+dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
-+
-+pkg = import('pkgconfig')
-+pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
-+if is_freebsd
-+	pkg_extra_cflags += ['-D__BSD_VISIBLE']
-+endif
-+pkg.generate(name: meson.project_name(),
-+	filebase: 'lib' + meson.project_name().to_lower(),
-+	version: meson.project_version(),
-+	libraries: dpdk_libraries,
-+	libraries_private: dpdk_drivers + dpdk_static_libraries +
-+			['-Wl,-Bdynamic'] + dpdk_extra_ldflags,
-+	requires: libbsd, # apps using rte_string_fns.h may need this if enabled
-+	                  # if libbsd is not enabled, then this is blank
-+	description: '''The Data Plane Development Kit (DPDK).
-+Note that CFLAGS might contain an -march flag higher than typical baseline.
-+This is required for a number of static inline functions in the public headers.''',
-+	subdirs: [get_option('include_subdir_arch'), '.'],
-+	extra_cflags: pkg_extra_cflags
-+)
- 
- # final output, list all the libs and drivers to be built
- # this does not affect any part of the build, for information only.
--- 
-2.30.0
-
diff --git a/debian/patches/lp-1920141-05-Revert-Revert-Revert-build-always-link-whole-DPDK-st.patch b/debian/patches/lp-1920141-05-Revert-Revert-Revert-build-always-link-whole-DPDK-st.patch
deleted file mode 100644
index d250888..0000000
--- a/debian/patches/lp-1920141-05-Revert-Revert-Revert-build-always-link-whole-DPDK-st.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 4fad50ad66b511904ae3729a115e14db4bf2d94e Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 11:25:54 +0100
-Subject: [PATCH 5/7] Revert "Revert "Revert "build: always link whole DPDK
- static libraries"""
-
-This reverts commit a3bd9a34bf9988de641b6e78b825fafb69d2d13f.
-This series changes linking behavior in 19.11.x and thereby should stay
-out. It breaks - for example - a rebuild of OVS 2.13 or builds
-of later OVS 2.13.x stable releases.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- app/test/meson.build | 2 +-
- drivers/meson.build  | 2 +-
- examples/meson.build | 6 +++---
- lib/meson.build      | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/app/test/meson.build b/app/test/meson.build
-index 24fb59f74f..860728bb07 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -391,7 +391,7 @@ test_dep_objs += cc.find_library('execinfo', required: false)
- 
- link_libs = []
- if get_option('default_library') == 'static'
--	link_libs = dpdk_static_libraries + dpdk_drivers
-+	link_libs = dpdk_drivers
- endif
- 
- dpdk_test = executable('dpdk-test',
-diff --git a/drivers/meson.build b/drivers/meson.build
-index 696079680b..0400d84675 100644
---- a/drivers/meson.build
-+++ b/drivers/meson.build
-@@ -198,7 +198,7 @@ foreach class:dpdk_driver_classes
- 			shared_dep = declare_dependency(link_with: shared_lib,
- 					include_directories: includes,
- 					dependencies: shared_deps)
--			static_dep = declare_dependency(
-+			static_dep = declare_dependency(link_with: static_lib,
- 					include_directories: includes,
- 					dependencies: static_deps)
- 
-diff --git a/examples/meson.build b/examples/meson.build
-index 9e081f3fb7..4dc292fbd1 100644
---- a/examples/meson.build
-+++ b/examples/meson.build
-@@ -1,9 +1,9 @@
- # SPDX-License-Identifier: BSD-3-Clause
- # Copyright(c) 2017-2019 Intel Corporation
- 
--link_whole_libs = []
-+driver_libs = []
- if get_option('default_library') == 'static'
--	link_whole_libs = dpdk_static_libraries + dpdk_drivers
-+	driver_libs = dpdk_drivers
- endif
- 
- execinfo = cc.find_library('execinfo', required: false)
-@@ -97,7 +97,7 @@ foreach example: examples
- 		endif
- 		executable('dpdk-' + name, sources,
- 			include_directories: includes,
--			link_whole: link_whole_libs,
-+			link_whole: driver_libs,
- 			link_args: ldflags,
- 			c_args: cflags,
- 			dependencies: dep_objs)
-diff --git a/lib/meson.build b/lib/meson.build
-index b60396428c..f8da4f3168 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -127,7 +127,7 @@ foreach l:libraries
- 					dependencies: static_deps,
- 					include_directories: includes,
- 					install: true)
--			static_dep = declare_dependency(
-+			static_dep = declare_dependency(link_with: static_lib,
- 					include_directories: includes,
- 					dependencies: static_deps)
- 
--- 
-2.30.0
-
diff --git a/debian/patches/lp-1920141-06-Revert-Revert-Revert-devtools-test-static-linkage-wi.patch b/debian/patches/lp-1920141-06-Revert-Revert-Revert-devtools-test-static-linkage-wi.patch
deleted file mode 100644
index a040740..0000000
--- a/debian/patches/lp-1920141-06-Revert-Revert-Revert-devtools-test-static-linkage-wi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b6473c5a0b7f8fa314d4fd47d6c0931da8c8d083 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 11:26:09 +0100
-Subject: [PATCH 6/7] Revert "Revert "Revert "devtools: test static linkage
- with pkg-config"""
-
-This reverts commit d4bc12443836ccb8a5032b34f1d412b33a1d2384.
-This series changes linking behavior in 19.11.x and thereby should stay
-out. It breaks - for example - a rebuild of OVS 2.13 or builds
-of later OVS 2.13.x stable releases.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- devtools/test-meson-builds.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
-index 8678a3d824..47fdb9dfb5 100755
---- a/devtools/test-meson-builds.sh
-+++ b/devtools/test-meson-builds.sh
-@@ -146,6 +146,6 @@ if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then
- 	export PKGCONF="pkg-config --define-prefix"
- 	for example in cmdline helloworld l2fwd l3fwd skeleton timer; do
- 		echo "## Building $example"
--		$MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean shared static
-+		$MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all
- 	done
- fi
--- 
-2.30.0
-
diff --git a/debian/patches/lp-1920141-07-Regenerate-meson.build-changes-required-due-to-rever.patch b/debian/patches/lp-1920141-07-Regenerate-meson.build-changes-required-due-to-rever.patch
deleted file mode 100644
index e4649f7..0000000
--- a/debian/patches/lp-1920141-07-Regenerate-meson.build-changes-required-due-to-rever.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2604819f25ff15066d5c67bc4ae340183cd4eef1 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <[e-mail]>
-Date: Mon, 22 Mar 2021 11:29:01 +0100
-Subject: [PATCH 7/7] Regenerate meson.build changes required due to reverts
-
-Due to a series of re-re-reverts by this case:
-http://mails.dpdk.org/archives/stable/2021-March/029418.html
-http://mails.dpdk.org/archives/stable/2020-September/024796.html
-The two changes of:
-  3f33f5056 build: fix plugin load on static build
-  4a2baf099 build: fix linker flags on Windows
-would have been lost.
-Re-apply them here to have the reverts only remove what was added by them.
-
-Fixes: 16ade738fd0d ("app/testpmd: build with meson")
-Fixes: 89f0711f9ddf ("examples: build some samples with meson")
-Fixes: b031e13d7f0d ("build: fix plugin load on static build")
-
-Signed-off-by: Christian Ehrhardt <[e-mail]>
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1920141
-Forwarded: http://mails.dpdk.org/archives/stable/2021-March/029484.html
-Last-Update: 2021-03-22
----
- meson.build | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 58995252bd..01bbb556ec 100644
---- a/meson.build
-+++ b/meson.build
-@@ -64,9 +64,14 @@ configure_file(output: build_cfg,
- 		install_dir: join_paths(get_option('includedir'),
- 				get_option('include_subdir_arch')))
- 
-+platform_flags = []
-+if not is_windows
-+       platform_flags += ['-Wl,--export-dynamic'] # ELF only
-+endif
-+
- # for static builds, include the drivers as libs and we need to "whole-archive"
- # them.
--dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
-+dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] + platform_flags
- 
- pkg = import('pkgconfig')
- pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
--- 
-2.30.0
-
diff --git a/debian/patches/series b/debian/patches/series
index eac907e..24934be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
 revert-net-ipn3ke-fix-meson-build.patch
-lp-1920141-01-Revert-Revert-Revert-build-pkg-config-prevent-overli.patch
-lp-1920141-02-Revert-Revert-Revert-build-pkg-config-improve-static.patch
-lp-1920141-03-Revert-Revert-Revert-build-pkg-config-output-drivers.patch
-lp-1920141-04-Revert-Revert-Revert-build-pkg-config-move-pkg-confi.patch
-lp-1920141-05-Revert-Revert-Revert-build-always-link-whole-DPDK-st.patch
-lp-1920141-06-Revert-Revert-Revert-devtools-test-static-linkage-wi.patch
-lp-1920141-07-Regenerate-meson.build-changes-required-due-to-rever.patch
+ubuntu/lp-1940957-net-i40e-support-25G-AOC-ACC-cables.patch
diff --git a/debian/patches/ubuntu/lp-1940957-net-i40e-support-25G-AOC-ACC-cables.patch b/debian/patches/ubuntu/lp-1940957-net-i40e-support-25G-AOC-ACC-cables.patch
new file mode 100644
index 0000000..8606792
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1940957-net-i40e-support-25G-AOC-ACC-cables.patch
@@ -0,0 +1,42 @@
+From f81d60e607bb8c13fcb13450e85d74721f1d9c8f Mon Sep 17 00:00:00 2001
+From: Yury Kylulin <[e-mail]>
+Date: Tue, 13 Apr 2021 18:29:50 +0300
+Subject: [PATCH] net/i40e: support 25G AOC/ACC cables
+
+[ upstream commit b1daa3461429e7674206a714c17adca65e9b44b4 ]
+
+Enable additional PHY types (25G-AOC and 25G-ACC) for set PHY config
+command.
+
+Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/dpdk/+bug/1940957
+Cc: [e-mail]
+
+Signed-off-by: Yury Kylulin <[e-mail]>
+Tested-by: Ashish Paul <[e-mail]>
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+
+Origin: upstream, https://github.com/cpaelzer/dpdk-stable-queue/commit/f81d60e607bb8c13fcb13450e85d74721f1d9c8f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1940957
+Last-Update: 2021-09-06
+
+---
+ drivers/net/i40e/i40e_ethdev.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
+index 508f90595f..0c896ea915 100644
+--- a/drivers/net/i40e/i40e_ethdev.c
++++ b/drivers/net/i40e/i40e_ethdev.c
+@@ -2264,7 +2264,8 @@ i40e_phy_conf_link(struct i40e_hw *hw,
+ 	phy_conf.phy_type = is_up ? cpu_to_le32(phy_type_mask) : 0;
+ 	phy_conf.phy_type_ext = is_up ? (I40E_AQ_PHY_TYPE_EXT_25G_KR |
+ 		I40E_AQ_PHY_TYPE_EXT_25G_CR | I40E_AQ_PHY_TYPE_EXT_25G_SR |
+-		I40E_AQ_PHY_TYPE_EXT_25G_LR) : 0;
++		I40E_AQ_PHY_TYPE_EXT_25G_LR | I40E_AQ_PHY_TYPE_EXT_25G_AOC |
++		I40E_AQ_PHY_TYPE_EXT_25G_ACC) : 0;
+ 	phy_conf.fec_config = phy_ab.fec_cfg_curr_mod_ext_info;
+ 	phy_conf.eee_capability = phy_ab.eee_capability;
+ 	phy_conf.eeer = phy_ab.eeer_val;
+-- 
+2.32.0
+
diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh
index 85a300f..49d38fb 100755
--- a/devtools/check-maintainers.sh
+++ b/devtools/check-maintainers.sh
@@ -15,10 +15,10 @@ files () # <path> [<path> ...]
 	if [ -z "$1" ] ; then
 		return
 	fi
-	if [ -d .git ] ; then
+	if [ -r .git ] ; then
 		git ls-files "$1"
 	else
-		find "$1" -type f |
+		find $1 -type f |
 		sed 's,^\./,,'
 	fi |
 	# if not ended by /
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 8678a3d..47fdb9d 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -146,6 +146,6 @@ if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then
 	export PKGCONF="pkg-config --define-prefix"
 	for example in cmdline helloworld l2fwd l3fwd skeleton timer; do
 		echo "## Building $example"
-		$MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean shared static
+		$MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean all
 	done
 fi
diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt
index 8fb60a7..61c8e35 100644
--- a/doc/build-sdk-meson.txt
+++ b/doc/build-sdk-meson.txt
@@ -190,7 +190,7 @@ From examples/helloworld/Makefile::
 	PC_FILE := $(shell pkg-config --path libdpdk)
 	CFLAGS += -O3 $(shell pkg-config --cflags libdpdk)
 	LDFLAGS_SHARED = $(shell pkg-config --libs libdpdk)
-	LDFLAGS_STATIC = $(shell pkg-config --static --libs libdpdk)
+	LDFLAGS_STATIC = -Wl,-Bstatic $(shell pkg-config --static --libs libdpdk)
 
 	build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
 		$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
diff --git a/doc/guides/bbdevs/fpga_lte_fec.rst b/doc/guides/bbdevs/fpga_lte_fec.rst
index 206b6f4..8509de9 100644
--- a/doc/guides/bbdevs/fpga_lte_fec.rst
+++ b/doc/guides/bbdevs/fpga_lte_fec.rst
@@ -50,7 +50,7 @@ FPGA LTE FEC does not support the following:
 Installation
 --------------
 
-Section 3 of the DPDK manual provides instuctions on installing and compiling DPDK. The
+Section 3 of the DPDK manual provides instructions on installing and compiling DPDK. The
 default set of bbdev compile flags may be found in config/common_base, where for example
 the flag to build the FPGA LTE FEC device, ``CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC``, is already
 set. It is assumed DPDK has been compiled using for instance:
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index c1a82be..279b830 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -25,7 +25,6 @@ try:
     import sphinx_rtd_theme
 
     html_theme = "sphinx_rtd_theme"
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 except:
     print('Install the sphinx ReadTheDocs theme for improved html documentation '
           'layout: pip install sphinx_rtd_theme')
@@ -34,7 +33,10 @@ except:
 project = 'Data Plane Development Kit'
 html_logo = '../logo/DPDK_logo_vertical_rev_small.png'
 latex_logo = '../logo/DPDK_logo_horizontal_tag.png'
-html_add_permalinks = ""
+if LooseVersion(sphinx_version) >= LooseVersion('3.5'):
+    html_permalinks = False
+else:
+    html_add_permalinks = ""
 html_show_copyright = False
 highlight_language = 'none'
 
diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst
index 021c762..40f4280 100644
--- a/doc/guides/contributing/stable.rst
+++ b/doc/guides/contributing/stable.rst
@@ -95,7 +95,7 @@ Features should not be backported to stable releases. It may be acceptable, in
 limited cases, to back port features for the LTS release where:
 
 * There is a justifiable use case (for example a new PMD).
-* The change is non-invasive.
+* The change is noninvasive.
 * The work of preparing the backport is done by the proposer.
 * There is support within the community.
 
diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst
index 6d9daf7..4ee0100 100644
--- a/doc/guides/cryptodevs/caam_jr.rst
+++ b/doc/guides/cryptodevs/caam_jr.rst
@@ -24,7 +24,7 @@ accelerators. This provides significant improvement to system level performance.
 
 SEC HW accelerator above 4.x+ version are also known as CAAM.
 
-caam_jr PMD is one of DPAA drivers which uses uio interface to interact with
+caam_jr PMD is one of DPAA drivers which uses UIO interface to interact with
 Linux kernel for configure and destroy the device instance (ring).
 
 
diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst
index 7004ca4..dd3de7f 100644
--- a/doc/guides/cryptodevs/scheduler.rst
+++ b/doc/guides/cryptodevs/scheduler.rst
@@ -126,7 +126,7 @@ operation:
    than the designated threshold, otherwise it will be handled by the secondary
    slave.
 
-   A typical usecase in this mode is with the QAT cryptodev as the primary and
+   A typical use case in this mode is with the QAT cryptodev as the primary and
    a software cryptodev as the secondary slave. This may help applications to
    process additional crypto workload than what the QAT cryptodev can handle on
    its own, by making use of the available CPU cycles to deal with smaller
diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst
index 1496ec9..18bea62 100644
--- a/doc/guides/cryptodevs/virtio.rst
+++ b/doc/guides/cryptodevs/virtio.rst
@@ -63,7 +63,7 @@ QEMU can then be started using the following parameters:
         -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0
     [...]
 
-Secondly bind the uio_generic driver for the virtio-crypto device.
+Secondly bind the uio_pci_generic driver for the virtio-crypto device.
 For example, 0000:00:04.0 is the domain, bus, device and function
 number of the virtio-crypto device:
 
diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst
index 64b1f4d..971cb25 100644
--- a/doc/guides/howto/pvp_reference_benchmark.rst
+++ b/doc/guides/howto/pvp_reference_benchmark.rst
@@ -26,7 +26,7 @@ Setup overview
 
    PVP setup using 2 NICs
 
-In this diagram, each red arrow represents one logical core. This use-case
+In this diagram, each red arrow represents one logical core. This use case
 requires 6 dedicated logical cores. A forwarding configuration with a single
 NIC is also possible, requiring 3 logical cores.
 
diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst
index 96817e7..d8e5ad7 100644
--- a/doc/guides/linux_gsg/linux_drivers.rst
+++ b/doc/guides/linux_gsg/linux_drivers.rst
@@ -72,6 +72,16 @@ Note that in order to use VFIO, your kernel must support it.
 VFIO kernel modules have been included in the Linux kernel since version 3.6.0 and are usually present by default,
 however please consult your distributions documentation to make sure that is the case.
 
+For DMA mapping of either external memory or hugepages, VFIO interface is used.
+VFIO does not support partial unmap of once mapped memory. Hence DPDK's memory is
+mapped in hugepage granularity or system page granularity. Number of DMA
+mappings is limited by kernel with user locked memory limit of a process (rlimit)
+for system/hugepage memory. Another per-container overall limit applicable both
+for external memory and system memory was added in kernel 5.1 defined by
+VFIO module parameter ``dma_entry_limit`` with a default value of 64K.
+When application is out of DMA entries, these limits need to be adjusted to
+increase the allowed limit.
+
 Also, to use VFIO, both kernel and BIOS must support and be configured to use IO virtualization (such as Intel® VT-d).
 
 .. note::
diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst
index 434ba9d..60ad312 100644
--- a/doc/guides/nics/bnxt.rst
+++ b/doc/guides/nics/bnxt.rst
@@ -54,14 +54,14 @@ automatically when the port is started if allowed by the current configuration.
 RX Requirements for Vector Mode
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Vector mode receive will be enabled if the following constrainsts are met:
+Vector mode receive will be enabled if the following constraints are met:
    * Packets must fit within a single mbuf (no scatter RX).
    * LRO offload must be disabled.
 
 TX Requirements for Vector Mode
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Vector mode transmit will be enabled if the following constrainsts are met:
+Vector mode transmit will be enabled if the following constraints are met:
    * Packets must be contained within a single mbuf (no gather TX).
    * All transmit offloads other than VLAN insertion must be disabled.
 
@@ -123,7 +123,7 @@ Chipsets and adapters supported by the bnxt PMD include:
     <https://www.broadcom.com/products/ethernet-connectivity/smartnic/>`_
     of the `Broadcom website <http://www.broadcom.com/>`_.
 
-  * **Broadcom StrataGX® BCM5871X Series of Communucations Processors**
+  * **Broadcom StrataGX® BCM5871X Series of Communications Processors**
 
     These ARM based processors target a broad range of networking applications
     including virtual CPE (vCPE) and NFV appliances, 10G service routers and
diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst
index bbf27f2..d39201c 100644
--- a/doc/guides/nics/ena.rst
+++ b/doc/guides/nics/ena.rst
@@ -198,7 +198,7 @@ Example output:
 
    [...]
    EAL: PCI device 0000:00:06.0 on NUMA socket -1
-   EAL:   Invalid NUMA socket, default to 0
+   EAL: Device 0000:00:06.0 is not NUMA-aware, defaulting socket to 0
    EAL:   probe driver: 1d0f:ec20 net_ena
 
    Interactive-mode selected
diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
index 567c65d..7eb6d72 100644
--- a/doc/guides/nics/hns3.rst
+++ b/doc/guides/nics/hns3.rst
@@ -1,12 +1,12 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2018-2019 Hisilicon Limited.
+    Copyright(c) 2018-2019 HiSilicon Limited.
 
 HNS3 Poll Mode Driver
 ===============================
 
 The hns3 PMD (librte_pmd_hns3) provides poll mode driver support
-for the inbuilt Hisilicon Network Subsystem(HNS) network engine
-found in the Hisilicon Kunpeng 920 SoC.
+for the inbuilt HiSilicon Network Subsystem(HNS) network engine
+found in the HiSilicon Kunpeng 920 SoC.
 
 Features
 --------
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index bbad7d0..e81875d 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -498,6 +498,13 @@ Run-time configuration
   it is not recommended and may prevent NIC from sending packets over
   some configurations.
 
+  For ConnectX-4 and ConnectX-4 Lx NICs, automatically configured value
+  is insufficient for some traffic, because they require at least all L2 headers
+  to be inlined. For example, Q-in-Q adds 4 bytes to default 18 bytes
+  of Ethernet and VLAN, thus ``txq_inline_min`` must be set to 22.
+  MPLS would add 4 bytes per label. Final value must account for all possible
+  L2 encapsulation headers used in particular environment.
+
   Please, note, this minimal data inlining disengages eMPW feature (Enhanced
   Multi-Packet Write), because last one does not support partial packet inlining.
   This is not very critical due to minimal data inlining is mostly required
@@ -1088,7 +1095,7 @@ the DPDK application.
 
         echo -n "<device pci address" > /sys/bus/pci/drivers/mlx5_core/unbind
 
-5. Enbale switchdev mode::
+5. Enable switchdev mode::
 
         echo switchdev > /sys/class/net/<net device>/compat/devlink/mode
 
diff --git a/doc/guides/nics/netvsc.rst b/doc/guides/nics/netvsc.rst
index 6dbb9a5..09cb6db 100644
--- a/doc/guides/nics/netvsc.rst
+++ b/doc/guides/nics/netvsc.rst
@@ -62,7 +62,7 @@ store it in a shell variable:
 
 .. _`UUID`: https://en.wikipedia.org/wiki/Universally_unique_identifier
 
-There are several possible ways to assign the uio device driver for a device.
+There are several possible ways to assign the UIO device driver for a device.
 The easiest way (but only on 4.18 or later)
 is to use the `driverctl Device Driver control utility`_ to override
 the normal kernel device.
diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst
index 020e37d..7d8ed38 100644
--- a/doc/guides/nics/nfp.rst
+++ b/doc/guides/nics/nfp.rst
@@ -121,15 +121,15 @@ although once they are created, DPDK apps should be able to use them as normal
 PCI ports.
 
 NFP ports belonging to same PF can be seen inside PMD initialization with a
-suffix added to the PCI ID: wwww:xx:yy.z_port_n. For example, a PF with PCI ID
+suffix added to the PCI ID: wwww:xx:yy.z_portn. For example, a PF with PCI ID
 0000:03:00.0 and four ports is seen by the PMD code as:
 
    .. code-block:: console
 
-      0000:03:00.0_port_0
-      0000:03:00.0_port_1
-      0000:03:00.0_port_2
-      0000:03:00.0_port_3
+      0000:03:00.0_port0
+      0000:03:00.0_port1
+      0000:03:00.0_port2
+      0000:03:00.0_port3
 
    .. Note::
 
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index db62a45..cad4a75 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -162,7 +162,7 @@ Runtime Config Options
 
       -w 0002:02:00.0,max_sqb_count=64
 
-   With the above configuration, each send queue's decscriptor buffer count is
+   With the above configuration, each send queue's descriptor buffer count is
    limited to a maximum of 64 buffers.
 
 - ``switch header enable`` (default ``none``)
diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst
index d1f5fb8..2b1a3a6 100644
--- a/doc/guides/nics/virtio.rst
+++ b/doc/guides/nics/virtio.rst
@@ -71,7 +71,7 @@ In this release, the virtio PMD driver provides the basic functionality of packe
 
 *   Virtio supports software vlan stripping and inserting.
 
-*   Virtio supports using port IO to get PCI resource when uio/igb_uio module is not available.
+*   Virtio supports using port IO to get PCI resource when UIO module is not available.
 
 Prerequisites
 -------------
@@ -103,7 +103,8 @@ Host2VM communication example
 
         insmod rte_kni.ko
 
-    Other basic DPDK preparations like hugepage enabling, uio port binding are not listed here.
+    Other basic DPDK preparations like hugepage enabling,
+    UIO port binding are not listed here.
     Please refer to the *DPDK Getting Started Guide* for detailed instructions.
 
 #.  Launch the kni user application:
@@ -473,7 +474,7 @@ are shown in below table:
    Split virtqueue in-order non-mergeable path  virtio_recv_pkts_inorder          virtio_xmit_pkts_inorder
    Split virtqueue vectorized Rx path           virtio_recv_pkts_vec              virtio_xmit_pkts
    Packed virtqueue mergeable path              virtio_recv_mergeable_pkts_packed virtio_xmit_pkts_packed
-   Packed virtqueue non-meregable path          virtio_recv_pkts_packed           virtio_xmit_pkts_packed
+   Packed virtqueue non-mergeable path          virtio_recv_pkts_packed           virtio_xmit_pkts_packed
    Packed virtqueue in-order mergeable path     virtio_recv_mergeable_pkts_packed virtio_xmit_pkts_packed
    Packed virtqueue in-order non-mergeable path virtio_recv_pkts_packed           virtio_xmit_pkts_packed
    ============================================ ================================= ========================
diff --git a/doc/guides/nics/vmxnet3.rst b/doc/guides/nics/vmxnet3.rst
index ae146f0..190cf91 100644
--- a/doc/guides/nics/vmxnet3.rst
+++ b/doc/guides/nics/vmxnet3.rst
@@ -119,7 +119,8 @@ This section describes an example setup for Phy-vSwitch-VM-Phy communication.
 
 .. note::
 
-    Other instructions on preparing to use DPDK such as, hugepage enabling, uio port binding are not listed here.
+    Other instructions on preparing to use DPDK such as,
+    hugepage enabling, UIO port binding are not listed here.
     Please refer to *DPDK Getting Started Guide and DPDK Sample Application's User Guide* for detailed instructions.
 
 The packet reception and transmission flow path is::
diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index d39167a..27e6848 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -639,7 +639,7 @@ optionally the ``soft_output`` mbuf data pointers.
    "soft output","soft LLR output buffer (optional)"
    "op_flags","bitmask of all active operation capabilities"
    "rv_index","redundancy version index [0..3]"
-   "iter_max","maximum number of iterations to perofrm in decode all CBs"
+   "iter_max","maximum number of iterations to perform in decode all CBs"
    "iter_min","minimum number of iterations to perform in decoding all CBs"
    "iter_count","number of iterations to performed in decoding all CBs"
    "ext_scale","scale factor on extrinsic info (5 bits)"
diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst
index 74dba4d..5e36e38 100644
--- a/doc/guides/prog_guide/dev_kit_build_system.rst
+++ b/doc/guides/prog_guide/dev_kit_build_system.rst
@@ -9,7 +9,7 @@ Development Kit Build System
 The DPDK requires a build system for compilation activities and so on.
 This section describes the constraints and the mechanisms used in the DPDK framework.
 
-There are two use-cases for the framework:
+There are two use cases for the framework:
 
 *   Compilation of the DPDK libraries and sample applications;
     the framework generates specific binary libraries,
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst
index 48a2fec..6c84566 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -465,7 +465,7 @@ devices would fail anyway.
     - By default, the mempool, first asks for IOVA-contiguous memory using
       ``RTE_MEMZONE_IOVA_CONTIG``. This is slow in RTE_IOVA_PA mode and it may
       affect the application boot time.
-    - It is easy to enable large amount of IOVA-contiguous memory use-cases
+    - It is easy to enable large amount of IOVA-contiguous memory use cases
       with IOVA in VA mode.
 
     It is expected that all PCI drivers work in both RTE_IOVA_PA and
diff --git a/doc/guides/prog_guide/eventdev.rst b/doc/guides/prog_guide/eventdev.rst
index 7bcd760..b415d63 100644
--- a/doc/guides/prog_guide/eventdev.rst
+++ b/doc/guides/prog_guide/eventdev.rst
@@ -120,7 +120,7 @@ Ports
 ~~~~~
 
 Ports are the points of contact between worker cores and the eventdev. The
-general use-case will see one CPU core using one port to enqueue and dequeue
+general use case will see one CPU core using one port to enqueue and dequeue
 events from an eventdev. Ports are linked to queues in order to retrieve events
 from those queues (more details in `Linking Queues and Ports`_ below).
 
diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 1a4a9e2..f2e1664 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -325,7 +325,7 @@ supported. However, since sending messages (not requests) does not involve an
 IPC thread, sending messages while processing another message or request is
 supported.
 
-Since the memory sybsystem uses IPC internally, memory allocations and IPC must
+Since the memory subsystem uses IPC internally, memory allocations and IPC must
 not be mixed: it is not safe to use IPC inside a memory-related callback, nor is
 it safe to allocate/free memory inside IPC callbacks. Attempting to do so may
 lead to a deadlock.
diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst
index a159709..f39b099 100644
--- a/doc/guides/prog_guide/qos_framework.rst
+++ b/doc/guides/prog_guide/qos_framework.rst
@@ -737,7 +737,7 @@ Strict priority scheduling of traffic classes within the same pipe is implemente
 which selects the queues in ascending order.
 Therefore, queue 0 (associated with TC 0, highest priority TC) is handled before
 queue 1 (TC 1, lower priority than TC 0),
-which is handled before queue 2 (TC 2, lower priority than TC 1) and it conitnues until queues of all TCs except the
+which is handled before queue 2 (TC 2, lower priority than TC 1) and it continues until queues of all TCs except the
 lowest priority TC are handled. At last, queues 12..15 (best effort TC, lowest priority TC) are handled.
 
 Upper Limit Enforcement
diff --git a/doc/guides/prog_guide/writing_efficient_code.rst b/doc/guides/prog_guide/writing_efficient_code.rst
index 849f63e..88e6bde 100644
--- a/doc/guides/prog_guide/writing_efficient_code.rst
+++ b/doc/guides/prog_guide/writing_efficient_code.rst
@@ -143,20 +143,21 @@ In order to achieve higher throughput,
 the DPDK attempts to aggregate the cost of processing each packet individually by processing packets in bursts.
 
 Using the testpmd application as an example,
-the burst size can be set on the command line to a value of 16 (also the default value).
-This allows the application to request 16 packets at a time from the PMD.
+the burst size can be set on the command line to a value of 32 (also the default value).
+This allows the application to request 32 packets at a time from the PMD.
 The testpmd application then immediately attempts to transmit all the packets that were received,
-in this case, all 16 packets.
+in this case, all 32 packets.
 
 The packets are not transmitted until the tail pointer is updated on the corresponding TX queue of the network port.
 This behavior is desirable when tuning for high throughput because
-the cost of tail pointer updates to both the RX and TX queues can be spread across 16 packets,
+the cost of tail pointer updates to both the RX and TX queues can be spread
+across 32 packets,
 effectively hiding the relatively slow MMIO cost of writing to the PCIe* device.
 However, this is not very desirable when tuning for low latency because
-the first packet that was received must also wait for another 15 packets to be received.
-It cannot be transmitted until the other 15 packets have also been processed because
+the first packet that was received must also wait for another 31 packets to be received.
+It cannot be transmitted until the other 31 packets have also been processed because
 the NIC will not know to transmit the packets until the TX tail pointer has been updated,
-which is not done until all 16 packets have been processed for transmission.
+which is not done until all 32 packets have been processed for transmission.
 
 To consistently achieve low latency, even under heavy system load,
 the application developer should avoid processing packets in bunches.
diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index aa7d809..439bc51 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -18,7 +18,7 @@ BIOS setting on Intel Skylake
 -----------------------------
 
 Intel Non-transparent Bridge needs special BIOS setting. Since the PMD only
-supports Intel Skylake platform, introduce BIOS setting here. The referencce
+supports Intel Skylake platform, introduce BIOS setting here. The reference
 is https://www.intel.com/content/dam/support/us/en/documents/server-products/Intel_Xeon_Processor_Scalable_Family_BIOS_User_Guide.pdf
 
 - Set the needed PCIe port as NTB to NTB mode on both hosts.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 5810959..7ac8360 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -59,6 +59,12 @@ Deprecation Notices
   - ``rte_eth_dev_stop``
   - ``rte_eth_dev_close``
 
+* ethdev: Will add ``RTE_ETH_`` prefix to all ethdev macros/enums in v21.11.
+  Macros will be added for backward compatibility.
+  Backward compatibility macros will be removed on v22.11.
+  A few old backward compatibility macros from 2013 that does not have
+  proper prefix will be removed on v21.11.
+
 * ethdev: New offload flags ``DEV_RX_OFFLOAD_FLOW_MARK`` will be added in 19.11.
   This will allow application to enable or disable PMDs from updating
   ``rte_mbuf::hash::fdir``.
diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst
index 68c3d22..21a4764 100644
--- a/doc/guides/rel_notes/known_issues.rst
+++ b/doc/guides/rel_notes/known_issues.rst
@@ -419,7 +419,7 @@ Binding PCI devices to igb_uio fails on Linux kernel 3.9 when more than one devi
 ------------------------------------------------------------------------------------------
 
 **Description**:
-   A known bug in the uio driver included in Linux kernel version 3.9 prevents more than one PCI device to be
+   A known bug in the UIO driver included in Linux kernel version 3.9 prevents more than one PCI device to be
    bound to the igb_uio driver.
 
 **Implication**:
@@ -614,7 +614,7 @@ I40e VF may not receive packets in the promiscuous mode
    Poll Mode Driver (PMD).
 
 
-uio pci generic module bind failed in X710/XL710/XXV710
+uio_pci_generic module bind failed in X710/XL710/XXV710
 -------------------------------------------------------
 
 **Description**:
@@ -671,7 +671,7 @@ virtio tx_burst() function cannot do TSO on shared packets
    Poll Mode Driver (PMD).
 
 
-igb uio legacy mode can not be used in X710/XL710/XXV710
+igb_uio legacy mode can not be used in X710/XL710/XXV710
 --------------------------------------------------------
 
 **Description**:
@@ -752,7 +752,7 @@ Netvsc driver and application restart
    handshake sequence with the host.
 
 **Resolution/Workaround**:
-   Either reboot the guest or remove and reinsert the hv_uio_generic module.
+   Either reboot the guest or remove and reinsert the uio_hv_generic module.
 
 **Affected Environment/Platform**:
    Linux Hyper-V.
@@ -816,7 +816,7 @@ Kernel crash when hot-unplug igb_uio device while DPDK application is running
 
 **Reason**:
    When device is hot-unplugged, igb_uio driver will be removed which will destroy UIO resources.
-   Later trying to access any uio resource will cause kernel crash.
+   Later trying to access any UIO resource will cause kernel crash.
 
 **Resolution/Workaround**:
    If using DPDK for PCI HW hot-unplug, prefer to bind device with VFIO instead of IGB_UIO.
diff --git a/doc/guides/rel_notes/release_16_11.rst b/doc/guides/rel_notes/release_16_11.rst
index 92e0ec6..3cec914 100644
--- a/doc/guides/rel_notes/release_16_11.rst
+++ b/doc/guides/rel_notes/release_16_11.rst
@@ -77,7 +77,7 @@ New Features
   the current version, even 64 bytes packets take two slots with Virtio PMD on guest
   side.
 
-  The main impact is better performance for 0% packet loss use-cases, as it
+  The main impact is better performance for 0% packet loss use cases, as it
   behaves as if the virtqueue size was enlarged, so more packets can be buffered
   in the case of system perturbations. On the downside, small performance degradations
   were measured when running micro-benchmarks.
diff --git a/doc/guides/rel_notes/release_19_08.rst b/doc/guides/rel_notes/release_19_08.rst
index cbb27e8..d2baa82 100644
--- a/doc/guides/rel_notes/release_19_08.rst
+++ b/doc/guides/rel_notes/release_19_08.rst
@@ -151,7 +151,7 @@ New Features
   * Added multi-queue support to allow one af_xdp vdev with multiple netdev
     queues.
   * Enabled "need_wakeup" feature which can provide efficient support for the
-    usecase where the application and driver executing on the same core.
+    use case where the application and driver executing on the same core.
 
 * **Enabled infinite Rx in the PCAP PMD.**
 
diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index 511d7f8..63108dd 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -3095,13 +3095,12 @@ Tested Platforms
 * rib: fix insertion in some cases
 * rib: fix missing header include
 * rib: fix missing header includes
-* (tag: 19.11.7-20.11-21.02-rc2) app/testpmd: fix setting maximum packet length
-* (tag: 19.11.7-20.11-21.02-rc2-backports) net/mlx5: fix port attach in secondary process
-* (tag: 19.11.7-21.02rc2-21.02-rc3-backports) net/mlx5: fix VXLAN decap on non-VXLAN flow
-* (tag: 19.11.7-21.02rc2-21.02-rc3) mempool: fix panic on dump or audit
-* (tag: 19.11.7-21.02rc3-21.02-backports) mem: fix build
-* (tag: 19.11.7-21.02rc3-21.02) usertools: fix binding built-in kernel driver
-* (tag: v19.11.7-rc1) version: 19.11.7-rc1
+* app/testpmd: fix setting maximum packet length
+* net/mlx5: fix port attach in secondary process
+* net/mlx5: fix VXLAN decap on non-VXLAN flow
+* mempool: fix panic on dump or audit
+* mem: fix build
+* usertools: fix binding built-in kernel driver
 * test/distributor: fix return buffer queue overload
 * test/event_crypto: set cipher operation in transform
 * test: fix buffer overflow in Tx burst
@@ -3227,3 +3226,735 @@ Tested Platforms
 * The UDP fragmentation offload feature of Virtio-net device can not be turned on in the VM. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=207075
 
 * mlx5 VLAN packets will not do RSS. Bug: https://bugs.dpdk.org/show_bug.cgi?id=661
+
+19.11.8 Release Notes
+---------------------
+
+19.11.8 Fixes
+~~~~~~~~~~~~~
+
+* Regenerate meson.build changes required due to reverts
+* Revert "Revert "Revert "build: always link whole DPDK static libraries"""
+* Revert "Revert "Revert "build/pkg-config: improve static linking flags"""
+* Revert "Revert "Revert "build/pkg-config: move pkg-config file creation"""
+* Revert "Revert "Revert "build/pkg-config: output drivers first for static build"""
+* Revert "Revert "Revert "build/pkg-config: prevent overlinking"""
+* Revert "Revert "Revert "devtools: test static linkage with pkg-config"""
+
+19.11.8 Validation
+~~~~~~~~~~~~~~~~~~
+
+* Intel(R) Testing
+
+   * Builds
+
+   * Basic Intel NIC (ixgbe, i40e) testing
+
+      * PF (i40e)
+      * PF (ixgbe)
+      * VF (i40e)
+      * VF (ixgbe)
+      * Compile Testing
+      * Intel NIC single core/NIC performance
+
+   * Basic cryptodev and virtio testing
+
+      * vhost/virtio basic loopback, PVP and performance test
+      * cryptodev Function/Performance
+
+* Intel(R) Testing with Open vSwitch
+
+   * OVS build and link testing with OVS 2.13 (make based)
+   * OVS build and link testing with OVS 2.14 (make based)
+
+* Canonical(R) Testing
+
+   * Build tests of DPDK & OVS 2.13.3 on Ubuntu 20.04 (meson based)
+   * Build tests of DPDK & OVS 2.13.3 on Ubuntu 20.10 (meson based)
+   * OVS-DPDK tests on x86_64
+
+19.11.9 Release Notes
+---------------------
+
+19.11.9 Fixes
+~~~~~~~~~~~~~
+
+* app/bbdev: fix HARQ error messages
+* app/crypto-perf: check memory allocation
+* app/eventdev: fix lcore parsing skipping last core
+* app/eventdev: fix overflow in lcore list parsing
+* app: fix exit messages
+* app/testpmd: fix bitmap of link speeds when force speed
+* app/testpmd: fix build with musl
+* app/testpmd: fix DCB forwarding configuration
+* app/testpmd: fix DCB re-configuration
+* app/testpmd: fix forward lcores number for DCB
+* app/testpmd: fix max queue number for Tx offloads
+* app/testpmd: fix NVGRE encap configuration
+* app/testpmd: fix segment number check
+* app/testpmd: fix Tx/Rx descriptor query error log
+* app/testpmd: remove unnecessary UDP tunnel check
+* bpf: fix JSLT validation
+* build: detect execinfo library on Linux
+* build: exclude meson files from examples installation
+* buildtools: fix build with busybox
+* bus/dpaa: fix 64-bit arch detection
+* bus/dpaa: fix build with musl
+* bus/dpaa: fix statistics reading
+* bus/fslmc: fix random portal hangs with qbman 5.0
+* bus/fslmc: remove unused debug macro
+* common/dpaax/caamflib: fix build with musl
+* common/dpaax: fix possible null pointer access
+* common/iavf: use pad byte to specify MAC type
+* common/qat: increase IM buffer size for GEN3
+* common/sfc_efx/base: limit reported MCDI response length
+* compress/qat: enable compression on GEN3
+* config/ppc: reduce number of cores and NUMA nodes
+* crypto/dpaa2_sec: fix close and uninit functions
+* crypto/dpaa_sec: affine the thread portal affinity
+* crypto/qat: fix null authentication request
+* crypto/qat: fix offset for out-of-place scatter-gather
+* doc: fix build with Sphinx 4
+* doc: fix HiSilicon copyright syntax
+* doc: fix multiport syntax in nfp guide
+* doc: fix names of UIO drivers
+* doc: fix sphinx rtd theme import in GHA
+* drivers/crypto: fix build with -fno-common
+* drivers/net: check process type in close operation
+* eal: add C++ include guard for reciprocal header
+* eal/arm64: fix platform register bit
+* eal: fix comment of OS-specific header files
+* eal: fix hang in control thread creation
+* eal: fix race in control thread creation
+* eal: fix service core list parsing
+* eal/windows: add cleanup function stub
+* eal/windows: fix default thread priority
+* ethdev: add missing buses in device iterator
+* ethdev: fix redundant flow after RSS expansion
+* ethdev: update flow item GTP QFI definition
+* ethdev: validate input in EEPROM info
+* ethdev: validate input in module EEPROM dump
+* ethdev: validate input in register info
+* eventdev: fix case to initiate crypto adapter service
+* eventdev: fix memory leakage on thread creation failure
+* eventdev: remove redundant thread name setting
+* event/dpaa2: remove unused macros
+* event/octeontx2: fix device reconfigure for single slot
+* examples: add eal cleanup to examples
+* examples/bbdev: fix header include for musl
+* examples/ethtool: remove unused parsing
+* examples/flow_classify: fix NUMA check of port and core
+* examples/l2fwd-cat: fix NUMA check of port and core
+* examples/l2fwd-crypto: fix packet length while decryption
+* examples/l2fwd-crypto: skip masked devices
+* examples/l3fwd: fix LPM IPv6 subnets
+* examples/l3fwd-power: fix empty poll thresholds
+* examples/packet_ordering: fix port configuration
+* examples/ptpclient: remove wrong comment
+* examples/rxtx_callbacks: fix port ID format specifier
+* examples/skeleton: fix NUMA check of port and core
+* examples/timer: fix time interval
+* examples/vhost: check memory table query
+* examples/vhost_crypto: remove unused short option
+* fbarray: fix log message on truncation error
+* net/mlx5: fix flow split combined with counter
+* ipc: check malloc sync reply result
+* ipc: use monotonic clock
+* kni: fix compilation on SLES15-SP3
+* license: fix typos
+* log/linux: make default output stderr
+* mbuf: check shared memory before dumping dynamic space
+* mem: fix freeing segments in --huge-unlink mode
+* net/af_xdp: fix error handling during Rx queue setup
+* net/ark: refactor Rx buffer recovery
+* net/ark: update packet director initial state
+* net/bnx2x: fix build with GCC 11
+* net/bnx2x: fix build with GCC 11
+* net/bnxt: check PCI config read
+* net/bnxt: drop unused attribute
+* net/bnxt: fix build failures after merging patches
+* net/bnxt: fix configuring LRO
+* net/bnxt: fix device readiness check
+* net/bnxt: fix double free in port start failure
+* net/bnxt: fix dynamic VNIC count
+* net/bnxt: fix firmware fatal error handling
+* net/bnxt: fix FW readiness check during recovery
+* net/bnxt: fix handling of null flow mask
+* net/bnxt: fix health check alarm cancellation
+* net/bnxt: fix HWRM and FW incompatibility handling
+* net/bnxt: fix link state operations
+* net/bnxt: fix memory allocation for command response
+* net/bnxt: fix mismatched type comparison in MAC restore
+* net/bnxt: fix PCI write check
+* net/bnxt: fix PTP support for Thor
+* net/bnxt: fix queues per VNIC
+* net/bnxt: fix ring count calculation for Thor
+* net/bnxt: fix RSS context cleanup
+* net/bnxt: fix Rx and Tx timestamps
+* net/bnxt: fix Rx buffer posting
+* net/bnxt: fix Rx descriptor status
+* net/bnxt: fix Rx queue count
+* net/bnxt: fix Rx timestamp when FIFO pending bit is set
+* net/bnxt: fix single PF per port check
+* net/bnxt: fix timesync when PTP is not supported
+* net/bnxt: fix Tx length hint threshold
+* net/bnxt: fix Tx timestamp init
+* net/bnxt: fix VF info allocation
+* net/bnxt: fix VNIC configuration
+* net/bnxt: fix xstats get
+* net/bnxt: prevent device access in error state
+* net/bnxt: refactor multi-queue Rx configuration
+* net/bnxt: remove unnecessary forward declarations
+* net/bnxt: remove unused function parameters
+* net/bnxt: remove unused macro
+* net/bnxt: reset filter indices on free
+* net/bnxt: use prefix on global function
+* net/bonding: fix adding itself as its slave
+* net/bonding: fix LACP system address check
+* net/bonding: fix leak on remove
+* net/bonding: fix socket ID check
+* net/cxgbe: remove use of uint type
+* net/dpaa2: fix getting link status
+* net/e1000/base: fix timeout for shadow RAM write
+* net/e1000: fix flow error message object
+* net/e1000: fix max Rx packet size
+* net/e1000: fix Rx error counter for bad length
+* net/e1000: remove MTU setting limitation
+* net/ena/base: fix type conversions by explicit casting
+* net/ena: fix releasing Tx ring mbufs
+* net/ena: remove endian swap functions
+* net/ena: switch memcpy to optimized version
+* net/failsafe: fix RSS hash offload reporting
+* net/failsafe: report minimum and maximum MTU
+* net: fix comment in IPv6 header
+* net/hinic: fix crash in secondary process
+* net/hns3: clear hash map on flow director clear
+* net/hns3: delete redundant blank line
+* net/hns3: fix DCB mode check
+* net/hns3: fix DCB reconfiguration
+* net/hns3: fix flow control exception
+* net/hns3: fix flow control mode
+* net/hns3: fix flow counter value
+* net/hns3: fix FLR miss detection
+* net/hns3: fix handling link update
+* net/hns3: fix HW buffer size on MTU update
+* net/hns3: fix mailbox error message
+* net/hns3: fix MTU config complexity
+* net/hns3: fix ordering in secondary process initialization
+* net/hns3: fix processing Tx offload flags
+* net/hns3: fix querying flow director counter for out param
+* net/hns3: fix requested FC mode rollback
+* net/hns3: fix rollback after setting PVID failure
+* net/hns3: fix secondary process request start/stop Rx/Tx
+* net/hns3: fix typos on comments
+* net/hns3: fix VF mailbox head field
+* net/hns3: fix VMDq mode check
+* net/hns3: log time delta in decimal format
+* net/hns3: remove meaningless packet buffer rollback
+* net/hns3: remove unused macro
+* net/hns3: remove unused macros
+* net/hns3: remove unused macros
+* net/hns3: remove unused mailbox macro and struct
+* net/hns3: remove unused VMDq code
+* net/hns3: return error on PCI config write failure
+* net/hns3: support get device version when dump register
+* net/hns3: update HiSilicon copyright syntax
+* net/i40e: announce request queue capability in PF
+* net/i40e: fix input set field mask
+* net/i40e: fix IPv4 fragment offload
+* net/i40e: fix lack of MAC type when set MAC address
+* net/i40e: fix negative VEB index
+* net/i40e: fix parsing packet type for NEON
+* net/i40e: fix primary MAC type when starting port
+* net/i40e: fix VF RSS configuration
+* net/i40e: remove redundant VSI check in Tx queue setup
+* net/i40evf: fix packet loss for X722
+* net/iavf: fix lack of MAC type when set MAC address
+* net/iavf: fix primary MAC type when starting port
+* net/iavf: fix TSO max segment size
+* net/iavf: fix Tx context descriptor
+* net/iavf: fix VF to PF command failure handling
+* net/ice/base: cleanup filter list on error
+* net/ice/base: fix build with GCC 11
+* net/ice/base: fix memory allocation for MAC addresses
+* net/ice/base: fix memory allocation wrapper
+* net/ice/base: fix payload indicator on ptype
+* net/ice: check some functions return
+* net/ice: fix disabling promiscuous mode
+* net/ice: fix fast mbuf freeing
+* net/ice: fix illegal access when removing MAC filter
+* net/ice: fix VLAN filter with PF
+* net/ice: fix VSI array out of bounds access
+* net/ixgbe: fix RSS RETA being reset after port start
+* net/ixgbe: fix Rx errors statistics for UDP checksum
+* net/kni: check init result
+* net/memif: fix Tx bps statistics for zero-copy
+* net/mlx4: fix buffer leakage on device close
+* net/mlx4: fix leak when configured repeatedly
+* net/mlx4: fix RSS action with null hash key
+* net/mlx4: fix secondary process initialization ordering
+* net/mlx5: fix drop action for Direct Rules/Verbs
+* net/mlx5: fix leak when configured repeatedly
+* net/mlx5: fix metadata item validation for ingress flows
+* net/mlx5: fix probing device in legacy bonding mode
+* net/mlx5: fix Rx metadata leftovers
+* net/mlx5: fix Rx segmented packets on mbuf starvation
+* net/mlx5: fix secondary process initialization ordering
+* net/mlx5: remove drop queue function prototypes
+* net/mlx5: support RSS expansion for IPv6 GRE
+* net/nfp: fix reporting of RSS capabilities
+* net/octeontx2: fix VLAN filter
+* net/pcap: fix format string
+* net/qede: accept bigger RSS table
+* net/qede: reduce log verbosity
+* net/tap: check ioctl on restore
+* net/tap: fix build with GCC 11
+* net/tap: fix interrupt vector array size
+* net/virtio: fix interrupt unregistering for listening socket
+* net/virtio: fix vectorized Rx queue rearm
+* power: do not skip saving original P-state governor
+* power: fix sanity checks for guest channel read
+* power: remove duplicated symbols from map file
+* power: save original ACPI governor always
+* raw/ntb: check memory allocations
+* raw/ntb: check SPAD user index
+* raw/skeleton: add missing check after setting attribute
+* Revert "kni: fix compilation on SLES15-SP3"
+* service: clean references to removed symbol
+* stack: allow lock-free only on relevant architectures
+* test/bpf: fix error message
+* test: check flow classifier creation
+* test: check thread creation
+* test/cmdline: fix inputs array
+* test/cmdline: silence clang 12 warning
+* test/crypto: fix auth-cipher compare length in OOP
+* test/crypto: fix build with GCC 11
+* test/distributor: fix burst flush on worker quit
+* test/distributor: fix worker notification in burst mode
+* test/event: fix timeout accuracy
+* test: fix autotest handling of skipped tests
+* test: fix build with GCC 11
+* test: fix division by zero
+* test: fix TCP header initialization
+* test/kni: check init result
+* test/kni: fix a comment
+* test/mempool: fix object initializer
+* test/power: add delay before checking CPU frequency
+* test/power: add turbo mode to frequency check
+* test/power: fix CPU frequency check
+* test/power: fix low frequency test when turbo enabled
+* test/power: fix turbo test
+* test/power: round CPU frequency to check
+* test: proceed if timer subsystem already initialized
+* test/table: fix build with GCC 11
+* test/timer: check memzone allocation
+* vdpa/ifc: check PCI config read
+* vfio: do not merge contiguous areas
+* vfio: fix API description
+* vfio: fix DMA mapping granularity for IOVA as VA
+* vfio: fix duplicated user mem map
+* vfio: fix stdbool usage without include
+* vhost: fix batch dequeue potential buffer overflow
+* vhost: fix initialization of temporary header
+* vhost: fix packed ring potential buffer overflow
+* vhost: fix queue initialization
+* vhost: fix split ring potential buffer overflow
+
+19.11.9 Validation
+~~~~~~~~~~~~~~~~~~
+
+* [Intel(R) Testing](http://mails.dpdk.org/archives/stable/2021-July/032349.html)
+
+   * Builds
+
+   * Basic Intel NIC (ixgbe, i40e) testing
+
+      * PF (i40e)
+      * PF (ixgbe)
+      * VF (i40e)
+      * VF (ixgbe)
+      * Compile Testing
+      * Intel NIC single core/NIC performance
+
+   * Basic cryptodev and virtio testing
+
+      * vhost/virtio basic loopback, PVP and performance test
+      * cryptodev Function/Performance
+
+* [Intel(R) Testing with Open vSwitch](http://mails.dpdk.org/archives/stable/2021-June/031702.html)
+
+   * OVS build and link testing with OVS 2.13 (make based)
+   * OVS build and link testing with OVS 2.14 (make based)
+   * VSPERF tests
+
+     * phy2phy_tput
+     * pvp_tput
+     * pvp_cont
+     * pvvp_tput
+     * pvpv_cont
+     * ovsdpdk_jumbo_p2p
+     * ovsdpdk_jumbo_pvp
+     * ovsdpdk_jumbo_p2p_upper_bound
+     * ovsdpdk_mq_pvp_rxqs_testpmd
+     * ovsdpdk_mq_pvp_rxqs_linux_bridge
+
+* [Canonical(R) Testing](http://mails.dpdk.org/archives/stable/2021-July/031997.html)
+
+   * Build tests of DPDK & OVS 2.13.3 on Ubuntu 20.04 (meson based)
+   * Build tests of DPDK & OVS 2.13.3 on Ubuntu 20.10 (meson based)
+   * Functional and performance tests based on OVS-DPDK on x86_64
+   * Autopkgtests for DPDK and OpenvSwitch
+
+* [Red Hat(R) Testing](http://mails.dpdk.org/archives/stable/2021-June/031619.html)
+
+   * Platform
+
+      * RHEL 8
+      * Kernel 4.18
+      * Qemu 6.0
+      * X540-AT2 NIC(ixgbe, 10G)
+      * Tested on 19.11.9-RC3
+
+   * Tests
+
+      * Guest with device assignment(PF) throughput testing(1G hugepage size): PASS
+      * Guest with device assignment(PF) throughput testing(2M hugepage size) : PASS
+      * Guest with device assignment(VF) throughput testing: PASS
+      * PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS
+      * PVP vhost-user 2Q throughput testing: PASS
+      * PVP vhost-user 1Q - cross numa node throughput testing: PASS
+      * Guest with vhost-user 2 queues throughput testing: PASS
+      * vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect: PASS
+      * vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect: PASS
+      * PVP 1Q live migration testing: PASS
+      * PVP 1Q cross numa node live migration testing: PASS
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing: PASS
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS
+      * Guest with ovs+dpdk+vhost-user 2Q live migration testing: PASS
+      * Host PF + DPDK testing: PASS
+      * Host VF + DPDK testing: PASS
+
+* [Nvidia (R) Testing](http://mails.dpdk.org/archives/stable/2021-July/032381.html)
+
+   * functional tests on Mellanox hardware
+
+      * NIC: ConnectX-4 Lx / OS: Ubuntu 20.04 LTS / Driver: MLNX_OFED_LINUX-5.3-1.0.0.1 / Firmware: 14.30.1004
+      * NIC: ConnectX-5 / OS: Ubuntu 20.04 LTS / Driver: MLNX_OFED_LINUX-5.3-1.0.0.1 / Firmware: 16.30.1004
+
+   * Basic functionality:
+
+      * Send and receive multiple types of traffic.
+      * testpmd xstats counter test.
+      * testpmd timestamp test.
+      * Changing/checking link status through testpmd.
+      * RTE flow tests: Items: eth / vlan / ipv4 / ipv6 / tcp / udp / icmp / gre / nvgre / vxlan ip in ip / mplsoudp / mplsogre
+      * Actions: drop / queue / rss / mark / flag / jump / count / raw_encap / raw_decap / vxlan_encap / vxlan_decap / NAT / dec_ttl
+      * Some RSS tests.
+      * VLAN filtering, stripping and insertion tests.
+      * Checksum and TSO tests.
+      * ptype tests.
+      * link_status_interrupt example application tests.
+      * l3fwd-power example application tests.
+      * Multi-process example applications tests.
+
+   * Compilation tests with multiple configurations in the following OS/driver combinations are also passing:
+
+      * Ubuntu 20.04.2 with MLNX_OFED_LINUX-5.3-1.0.0.1.
+      * Ubuntu 20.04.2 with rdma-core master (a66e2a5).
+      * Ubuntu 20.04.2 with rdma-core v28.0.
+      * Ubuntu 18.04.5 with rdma-core v17.1.
+      * Ubuntu 18.04.5 with rdma-core master (a66e2a5) (i386).
+      * Ubuntu 16.04.7 with rdma-core v22.7.
+      * Fedora 34 with rdma-core v35.0.
+      * Fedora 35 (Rawhide) with rdma-core v35.0 (only with gcc).
+      * CentOS 7 7.9.2009 with rdma-core master (a66e2a5).
+      * CentOS 7 7.9.2009 with MLNX_OFED_LINUX-5.3-1.0.0.1.
+      * CentOS 8 8.3.2011 with rdma-core master (7f2d460).
+      * OpenSUSE Leap 15.3 with rdma-core v31.0.
+
+19.11.9 Known Issues
+~~~~~~~~~~~~~~~~~~~~
+
+This time there are a few issues which were identified in the tests. But none
+of them is an in-place regression. So far they are all issues with newer
+compilers, toolchains and kernels that happen to be incompatible with the
+19.11.x code.
+
+* Due to a kernel patch backport in SUSE Linux Enterprise Server 15 SP3
+  [compilation of kni fails there](https://bugs.dpdk.org/show_bug.cgi?id=728).
+  A fix would break existing SP2 installation and
+  [further options are discussed](http://mails.dpdk.org/archives/stable/2021-June/031210.html)
+
+* A [Build issue with clang 12.0.1](https://bugs.dpdk.org/show_bug.cgi?id=745)
+
+* A make [build issue with Fedora 34 with GCC11](https://bugs.dpdk.org/show_bug.cgi?id=744)
+
+* Meson based [build issues with ICC-19.1.1](https://bugs.dpdk.org/show_bug.cgi?id=747)
+
+19.11.10 Release Notes
+
+
+
+19.11.10 Fixes
+~~~~~~~~~~~~~~
+
+* app/crypto-perf: fix out-of-place mempool allocation
+* app/test: fix IPv6 header initialization
+* app/testpmd: change port link speed without stopping all
+* app/testpmd: fix help string for port reset
+* app/testpmd: fix IPv4 checksum
+* app/testpmd: fix MAC address after port reset
+* app/testpmd: fix offloads for newly attached port
+* app/testpmd: fix Tx checksum calculation for tunnel
+* bitmap: fix buffer overrun in bitmap init
+* bus: clarify log for non-NUMA-aware devices
+* bus/dpaa: fix freeing in FMAN interface destructor
+* common/mlx5: fix compatibility with OFED port query API
+* common/mlx5: fix Netlink port name padding in probing
+* common/mlx5: use new port query API if available
+* cryptodev: fix freeing after device release
+* crypto/mvsam: fix AES-GCM session parameters
+* crypto/mvsam: fix capabilities
+* crypto/mvsam: fix options parsing
+* crypto/mvsam: fix session data reset
+* crypto/octeontx: fix freeing after device release
+* crypto/qat: fix Arm build with special memcpy
+* devtools: fix file listing in maintainers check
+* distributor: fix 128-bit write alignment
+* doc: add limitation for ConnectX-4 with L2 in mlx5 guide
+* doc: announce common prefix for ethdev
+* doc: fix default burst size in testpmd
+* doc: fix spelling
+* drivers/net: fix memzone allocations for DMA memory
+* ethdev: fix doc of flow action
+* eventdev: fix event port setup in tx adapter
+* flow_classify: fix leaking rules on delete
+* (github-cpaelzer-stable/19.11) telemetry: fix race in telemetry control thread creation
+* (HEAD -> 19.11, tag: v19.11.10-rc2, origin-stable/19.11) version: 19.11.10-rc2
+* ipc: stop mp control thread on cleanup
+* kni: fix crash on userspace VA for segmented packets
+* kni: fix mbuf allocation for kernel side use
+* mempool/octeontx2: fix shift calculation
+* net/bnxt: check access to possible null pointer
+* net/bnxt: cleanup code
+* net/bnxt: clear cached statistics
+* net/bnxt: detect bad opaque in Rx completion
+* net/bnxt: fix auto-negotiation on Whitney+
+* net/bnxt: fix check for PTP support in FW
+* net/bnxt: fix error handling in VNIC prepare
+* net/bnxt: fix error messages in VNIC prepare
+* net/bnxt: fix missing barriers in completion handling
+* net/bnxt: fix nested lock during bonding
+* net/bnxt: fix ring and context memory allocation
+* net/bnxt: fix Rx burst size constraint
+* net/bnxt: fix Rx interrupt setting
+* net/bnxt: fix scalar Tx completion handling
+* net/bnxt: fix Tx descriptor status implementation
+* net/bnxt: fix typo in log message
+* net/bnxt: improve probing log message
+* net/bnxt: invoke device removal event on recovery failure
+* net/bnxt: remove unnecessary code
+* net/bnxt: remove unnecessary comment
+* net/bnxt: set flow error after tunnel redirection free
+* net/bnxt: set flow error when free filter not available
+* net/bnxt: use common function to free VNIC resource
+* net/bnxt: workaround spurious zero stats in Thor
+* net/bonding: check flow setting
+* net/bonding: fix error message on flow verify
+* net/ena: enable multi-segment in Tx offload flags
+* net/ena: trigger reset on Tx prepare failure
+* net/hinic/base: fix LRO
+* net/hinic: increase protection of the VLAN
+* net/hns3: fix delay for waiting to stop Rx/Tx
+* net/hns3: fix filter parsing comment
+* net/hns3: fix Tx prepare after stop
+* net/hns3: fix VLAN strip log
+* net/hns3: increase VF reset retry maximum
+* net/i40e: fix descriptor scan on Arm
+* net/i40e: fix multi-process shared data
+* net/iavf: fix RSS key access out of bound
+* net/iavf: fix Tx threshold check
+* net/ice/base: fix first profile mask
+* net/ice/base: revert change of first profile mask
+* net/ice: fix default RSS key generation
+* net/ice: fix memzone leak when firmware is missing
+* net/ixgbe: fix flow entry access after freeing
+* net/mlx5: fix incorrect r/w lock usage in DMA unmap
+* net/mlx5: fix IPIP multi-tunnel validation
+* net/mlx5: fix match MPLS over GRE with key
+* net/mlx5: fix MPLS RSS expansion
+* net/mlx5: fix overflow in mempool argument
+* net/mlx5: fix representor interrupt handler
+* net/mlx5: fix RoCE LAG bond device probing
+* net/mlx5: fix RSS flow item expansion for GRE key
+* net/mlx5: fix Rx/Tx queue checks
+* net/mlx5: fix switchdev mode recognition
+* net/mlx5: fix typo in vectorized Rx comments
+* net/mlx5: limit implicit MPLS RSS expansion over GRE
+* net/mlx5: limit inner RSS expansion for MPLS
+* net/mlx5: remove redundant operations in NEON Rx
+* net/mlx5: remove unsupported flow item MPLS over IP
+* net/mlx5: workaround drop action with old kernel
+* net/mvpp2: fix configured state dependency
+* net/mvpp2: fix port speed overflow
+* net/octeontx2: fix default MCAM allocation size
+* net/octeontx2: fix flow creation limit on CN98xx
+* net/octeontx2: use runtime LSO format indices
+* net/octeontx/base: fix debug build with clang
+* net/pfe: remove unnecessary null check
+* net/sfc: fix MAC stats lock in xstats query by ID
+* net/sfc: fix MAC stats update for stopped device
+* net/sfc: fix reading adapter state without locking
+* net/sfc: fix xstats query by ID according to ethdev
+* net/sfc: fix xstats query by unsorted list of IDs
+* net/softnic: fix connection memory leak
+* net/softnic: fix memory leak as profile is freed
+* net/virtio: fix aarch32 build
+* net/virtio: fix refill order in packed ring datapath
+* net/virtio: report maximum MTU in device info
+* power: fix namespace for internal struct
+* rib: fix max depth IPv6 lookup
+* (tag: v19.11.10-rc1) version: 19.11.10-rc1
+* test/crypto: fix mbuf reset after null check
+* test/crypto: fix mempool size for session-less
+* test/crypto: fix typo in AES case
+* test/crypto: fix typo in ESN case
+* test/mbuf: fix virtual address conversion
+* tests/eal: fix memory leak
+* vhost/crypto: check request pointer before dereference
+* vhost: fix crash on reconnect
+* vhost: fix missing guest pages table NUMA realloc
+* vhost: fix missing memory table NUMA realloc
+* vhost: utilize dynamic memory allocator
+
+19.11.10 Validation
+~~~~~~~~~~~~~~~~~~~
+
+* [Intel(R) Testing](http://mails.dpdk.org/archives/stable/2021-August/033130.html)
+
+   * Builds
+
+   * Basic Intel NIC (ixgbe, i40e) testing
+
+      * PF (i40e)
+      * PF (ixgbe)
+      * VF (i40e)
+      * VF (ixgbe)
+      * Compile Testing
+      * Intel NIC single core/NIC performance
+
+   * Basic cryptodev and virtio testing
+
+      * vhost/virtio basic loopback, PVP and performance test
+      * cryptodev Function/Performance
+
+* [Intel(R) Testing with Open vSwitch]
+
+   * OVS build and link testing with OVS 2.13 (make based)
+   * OVS build and link testing with OVS 2.14 (make based)
+   * VSPERF tests
+
+     * phy2phy_tput
+     * pvp_tput
+     * pvp_cont
+     * pvvp_tput
+     * pvpv_cont
+     * ovsdpdk_jumbo_p2p
+     * ovsdpdk_jumbo_pvp
+     * ovsdpdk_jumbo_p2p_upper_bound
+     * ovsdpdk_mq_pvp_rxqs_testpmd
+     * ovsdpdk_mq_pvp_rxqs_linux_bridge
+
+* [Canonical(R) Testing](http://mails.dpdk.org/archives/stable/2021-August/033126.html)
+
+   * Build tests of DPDK & OVS 2.13.3 on Ubuntu 20.04 (meson based)
+   * Build tests of DPDK & OVS 2.13.3 on Ubuntu 20.10 (meson based)
+   * Functional and performance tests based on OVS-DPDK on x86_64
+   * Autopkgtests for DPDK and OpenvSwitch
+
+* [Red Hat(R) Testing](http://mails.dpdk.org/archives/stable/2021-September/033218.html)
+
+   * Platform
+
+      * RHEL 8
+      * Kernel 4.18
+      * Qemu 6.0
+      * X540-AT2 NIC(ixgbe, 10G)
+      * Tested on 19.11.9-RC3
+
+   * Tests
+
+      * Guest with device assignment(PF) throughput testing(1G hugepage size): PASS
+      * Guest with device assignment(PF) throughput testing(2M hugepage size) : PASS
+      * Guest with device assignment(VF) throughput testing: PASS
+      * PVP (host dpdk testpmd as vswitch) 1Q: throughput testing: PASS
+      * PVP vhost-user 2Q throughput testing: PASS
+      * PVP vhost-user 1Q - cross numa node throughput testing: PASS
+      * Guest with vhost-user 2 queues throughput testing: PASS
+      * vhost-user reconnect with dpdk-client, qemu-server: qemu reconnect: PASS
+      * vhost-user reconnect with dpdk-client, qemu-server: ovs reconnect: PASS
+      * PVP 1Q live migration testing: PASS
+      * PVP 1Q cross numa node live migration testing: PASS
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing: PASS
+      * Guest with ovs+dpdk+vhost-user 1Q live migration testing (2M): PASS
+      * Guest with ovs+dpdk+vhost-user 2Q live migration testing: PASS
+      * Host PF + DPDK testing: PASS
+      * Host VF + DPDK testing: PASS
+
+* [Nvidia (R) Testing](http://mails.dpdk.org/archives/stable/2021-August/033131.html)
+
+   * functional tests on Mellanox hardware
+
+      * NIC: ConnectX-4 Lx / OS: Ubuntu 20.04 LTS / Driver: MLNX_OFED_LINUX-5.4-1.0.3.0 / Firmware: 14.31.1014
+      * NIC: ConnectX-4 Lx / OS: Ubuntu 20.04 LTS / kernel: 5.14.0-rc7 / Driver: rdma-core v36.0 / Firmware: 14.31.1014
+      * NIC: ConnectX-5 / OS: Ubuntu 20.04 LTS / Driver: MLNX_OFED_LINUX-5.4-1.0.3.0 / Firmware: 16.31.1014
+      * NIC: ConnectX-5 / OS: Ubuntu 20.04 LTS / kernel: 5.14.0-rc7 / Driver: v36.0 / Firmware: 16.31.1014
+
+   * Basic functionality:
+
+      * Send and receive multiple types of traffic.
+      * testpmd xstats counter test.
+      * testpmd timestamp test.
+      * Changing/checking link status through testpmd.
+      * RTE flow tests: Items: eth / vlan / ipv4 / ipv6 / tcp / udp / icmp / gre / nvgre / vxlan ip in ip / mplsoudp / mplsogre
+      * Actions: drop / queue / rss / mark / flag / jump / count / raw_encap / raw_decap / vxlan_encap / vxlan_decap / NAT / dec_ttl
+      * Some RSS tests.
+      * VLAN filtering, stripping and insertion tests.
+      * Checksum and TSO tests.
+      * ptype tests.
+      * link_status_interrupt example application tests.
+      * l3fwd-power example application tests.
+      * Multi-process example applications tests.
+
+   * Compilation tests with multiple configurations in the following OS/driver combinations are also passing:
+
+      * Ubuntu 20.04.2 with MLNX_OFED_LINUX-5.4-1.0.3.0.
+      * Ubuntu 20.04.2 with rdma-core master (64d1ae5).
+      * Ubuntu 20.04.2 with rdma-core v28.0.
+      * Ubuntu 18.04.5 with rdma-core v17.1.
+      * Ubuntu 18.04.5 with rdma-core master (5b0f5b2) (i386).
+      * Ubuntu 16.04.7 with rdma-core v22.7.
+      * Fedora 34 with rdma-core v36.0.
+      * Fedora 35 (Rawhide) with rdma-core v36.0 (only with gcc).
+      * CentOS 7 7.9.2009 with rdma-core master (64d1ae5).
+      * CentOS 7 7.9.2009 with MLNX_OFED_LINUX-5.4-1.0.3.0.
+      * CentOS 8 8.3.2011 with rdma-core master (64d1ae5).
+      * OpenSUSE Leap 15.3 with rdma-core v31.0.
+
+19.11.10 Known Issues
+~~~~~~~~~~~~~~~~~~~~~
+
+A few issues are still present, but none of them is an in-place regression.
+So far they are all issues with newer compilers, toolchains and kernels that
+happen to be incompatible with the 19.11.x code.
+
+* Due to a kernel patch backport in SUSE Linux Enterprise Server 15 SP3
+  [compilation of kni fails there](https://bugs.dpdk.org/show_bug.cgi?id=728).
+  A fix would break existing SP2 installation and
+  [further options are discussed](http://mails.dpdk.org/archives/stable/2021-June/031210.html)
+
+* A [Build issue with clang 12.0.1](https://bugs.dpdk.org/show_bug.cgi?id=745)
+
+* A make [build issue with Fedora 34 with GCC11](https://bugs.dpdk.org/show_bug.cgi?id=744)
+
+* Meson based [build issues with ICC-19.1.1](https://bugs.dpdk.org/show_bug.cgi?id=747)
diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index cea5c87..8273473 100644
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -322,7 +322,7 @@ Drivers
 
   Several customers have reported a link flap issue on 82579. The symptoms
   are random and intermittent link losses when 82579 is connected to specific
-  switches. the Issue was root caused as an inter-operability problem between
+  switches. the Issue was root caused as an interoperability problem between
   the NIC and at least some Broadcom PHYs in the Energy Efficient Ethernet
   wake mechanism.
 
diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst
index 0a81320..2b4651e 100644
--- a/doc/guides/sample_app_ug/l2_forward_cat.rst
+++ b/doc/guides/sample_app_ug/l2_forward_cat.rst
@@ -198,7 +198,7 @@ queried for system CPU information and L3CA capabilities via
 ``pqos_cap_get(...)`` and ``pqos_cap_get_type(..., PQOS_CAP_TYPE_L3CA, ...)``
 calls. When all capability and topology information is collected, the requested
 CAT configuration is validated. A check is then performed (on per socket basis)
-for a sufficient number of un-associated COS. COS are selected and
+for a sufficient number of unassociated COS. COS are selected and
 configured via the ``pqos_l3ca_set(...)`` call. Finally, COS are associated to
 relevant CPUs via ``pqos_l3ca_assoc_set(...)`` calls.
 
diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst
index 5fed464..a2db452 100644
--- a/doc/guides/sample_app_ug/performance_thread.rst
+++ b/doc/guides/sample_app_ug/performance_thread.rst
@@ -1194,7 +1194,7 @@ Tracing of events can be individually masked, and the mask may be programmed
 at run time. An unmasked event results in a callback that provides information
 about the event. The default callback simply prints trace information. The
 default mask is 0 (all events off) the mask can be modified by calling the
-function ``lthread_diagniostic_set_mask()``.
+function ``lthread_diagnostic_set_mask()``.
 
 It is possible register a user callback function to implement more
 sophisticated diagnostic functions.
diff --git a/doc/guides/sample_app_ug/vhost.rst b/doc/guides/sample_app_ug/vhost.rst
index a71ada6..66e804d 100644
--- a/doc/guides/sample_app_ug/vhost.rst
+++ b/doc/guides/sample_app_ug/vhost.rst
@@ -72,7 +72,7 @@ Run testpmd inside guest
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Make sure you have DPDK built inside the guest. Also make sure the
-corresponding virtio-net PCI device is bond to a uio driver, which
+corresponding virtio-net PCI device is bond to a UIO driver, which
 could be done by:
 
 .. code-block:: console
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 17a41c2..e727126 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3944,7 +3944,8 @@ This section lists supported pattern items and their attributes, if any.
 - ``gtp_psc``: match GTP PDU extension header with type 0x85.
 
   - ``pdu_type {unsigned}``: PDU type.
-  - ``qfi {unsigned}``: QoS flow identifier.
+
+  - ``qfi {unsigned}``: PPP, RQI and QoS flow identifier.
 
 - ``pppoes``, ``pppoed``: match PPPoE header.
 
@@ -4732,7 +4733,7 @@ Sample Raw encapsulation rule
 
 Raw encapsulation configuration can be set by the following commands
 
-Eecapsulating VxLAN::
+Encapsulating VxLAN::
 
  testpmd> set raw_encap 4 eth src is 10:11:22:33:44:55 / vlan tci is 1
         inner_type is 0x0800 / ipv4 / udp dst is 4789 / vxlan vni
diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index 6d77a7e..4affce4 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -50,7 +50,7 @@ if_destructor(struct __fman_if *__if)
 		free(bp);
 	}
 cleanup:
-	free(__if);
+	rte_free(__if);
 }
 
 static int
diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c
index 9ab8e83..d28ed0b 100644
--- a/drivers/bus/dpaa/base/fman/fman_hw.c
+++ b/drivers/bus/dpaa/base/fman/fman_hw.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright 2017 NXP
+ * Copyright 2017,2020 NXP
  *
  */
 
@@ -219,20 +219,20 @@ fman_if_stats_get(struct fman_if *p, struct rte_eth_stats *stats)
 	struct memac_regs *regs = m->ccsr_map;
 
 	/* read recved packet count */
-	stats->ipackets = ((u64)in_be32(&regs->rfrm_u)) << 32 |
-			in_be32(&regs->rfrm_l);
-	stats->ibytes = ((u64)in_be32(&regs->roct_u)) << 32 |
-			in_be32(&regs->roct_l);
-	stats->ierrors = ((u64)in_be32(&regs->rerr_u)) << 32 |
-			in_be32(&regs->rerr_l);
+	stats->ipackets = (u64)in_be32(&regs->rfrm_l) |
+			((u64)in_be32(&regs->rfrm_u)) << 32;
+	stats->ibytes = (u64)in_be32(&regs->roct_l) |
+			((u64)in_be32(&regs->roct_u)) << 32;
+	stats->ierrors = (u64)in_be32(&regs->rerr_l) |
+			((u64)in_be32(&regs->rerr_u)) << 32;
 
 	/* read xmited packet count */
-	stats->opackets = ((u64)in_be32(&regs->tfrm_u)) << 32 |
-			in_be32(&regs->tfrm_l);
-	stats->obytes = ((u64)in_be32(&regs->toct_u)) << 32 |
-			in_be32(&regs->toct_l);
-	stats->oerrors = ((u64)in_be32(&regs->terr_u)) << 32 |
-			in_be32(&regs->terr_l);
+	stats->opackets = (u64)in_be32(&regs->tfrm_l) |
+			((u64)in_be32(&regs->tfrm_u)) << 32;
+	stats->obytes = (u64)in_be32(&regs->toct_l) |
+			((u64)in_be32(&regs->toct_u)) << 32;
+	stats->oerrors = (u64)in_be32(&regs->terr_l) |
+			((u64)in_be32(&regs->terr_u)) << 32;
 }
 
 void
@@ -244,10 +244,9 @@ fman_if_stats_get_all(struct fman_if *p, uint64_t *value, int n)
 	uint64_t base_offset = offsetof(struct memac_regs, reoct_l);
 
 	for (i = 0; i < n; i++)
-		value[i] = ((u64)in_be32((char *)regs
-				+ base_offset + 8 * i + 4)) << 32 |
-				((u64)in_be32((char *)regs
-				+ base_offset + 8 * i));
+		value[i] = (((u64)in_be32((char *)regs + base_offset + 8 * i) |
+				(u64)in_be32((char *)regs + base_offset +
+				8 * i + 4)) << 32);
 }
 
 void
diff --git a/drivers/bus/dpaa/base/fman/netcfg_layer.c b/drivers/bus/dpaa/base/fman/netcfg_layer.c
index 36eca88..2ec504c 100644
--- a/drivers/bus/dpaa/base/fman/netcfg_layer.c
+++ b/drivers/bus/dpaa/base/fman/netcfg_layer.c
@@ -8,7 +8,7 @@
 #include <dpaa_of.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <error.h>
+#include <err.h>
 #include <net/if_arp.h>
 #include <assert.h>
 #include <unistd.h>
@@ -89,7 +89,7 @@ netcfg_acquire(void)
 	 */
 	skfd = socket(AF_PACKET, SOCK_RAW, 0);
 	if (unlikely(skfd < 0)) {
-		error(0, errno, "%s(): open(SOCK_RAW)", __func__);
+		err(0, "%s(): open(SOCK_RAW)", __func__);
 		return NULL;
 	}
 
diff --git a/drivers/bus/dpaa/base/qbman/bman_driver.c b/drivers/bus/dpaa/base/qbman/bman_driver.c
index 750b756..ee35e03 100644
--- a/drivers/bus/dpaa/base/qbman/bman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/bman_driver.c
@@ -11,6 +11,7 @@
 #include <process.h>
 #include "bman_priv.h"
 #include <sys/ioctl.h>
+#include <err.h>
 
 /*
  * Global variables of the max portal/pool number this bman version supported
@@ -40,7 +41,8 @@ static int fsl_bman_portal_init(uint32_t idx, int is_shared)
 	ret = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t),
 				     &cpuset);
 	if (ret) {
-		error(0, ret, "pthread_getaffinity_np()");
+		errno = ret;
+		err(0, "pthread_getaffinity_np()");
 		return ret;
 	}
 	pcfg.cpu = -1;
@@ -60,7 +62,8 @@ static int fsl_bman_portal_init(uint32_t idx, int is_shared)
 	map.index = idx;
 	ret = process_portal_map(&map);
 	if (ret) {
-		error(0, ret, "process_portal_map()");
+		errno = ret;
+		err(0, "process_portal_map()");
 		return ret;
 	}
 	/* Make the portal's cache-[enabled|inhibited] regions */
@@ -104,8 +107,10 @@ static int fsl_bman_portal_finish(void)
 	cfg = bman_destroy_affine_portal();
 	DPAA_BUG_ON(cfg != &pcfg);
 	ret = process_portal_unmap(&map.addr);
-	if (ret)
-		error(0, ret, "process_portal_unmap()");
+	if (ret) {
+		errno = ret;
+		err(0, "process_portal_unmap()");
+	}
 	return ret;
 }
 
diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c
index e1dee17..2aa3b68 100644
--- a/drivers/bus/dpaa/base/qbman/qman_driver.c
+++ b/drivers/bus/dpaa/base/qbman/qman_driver.c
@@ -9,6 +9,8 @@
 #include <process.h>
 #include "qman_priv.h"
 #include <sys/ioctl.h>
+#include <err.h>
+
 #include <rte_branch_prediction.h>
 
 /* Global variable containing revision id (even on non-control plane systems
@@ -40,7 +42,8 @@ static int fsl_qman_portal_init(uint32_t index, int is_shared)
 	map.index = index;
 	ret = process_portal_map(&map);
 	if (ret) {
-		error(0, ret, "process_portal_map()");
+		errno = ret;
+		err(0, "process_portal_map()");
 		return ret;
 	}
 	qpcfg.channel = map.channel;
@@ -86,8 +89,10 @@ static int fsl_qman_portal_finish(void)
 	cfg = qman_destroy_affine_portal(NULL);
 	DPAA_BUG_ON(cfg != &qpcfg);
 	ret = process_portal_unmap(&map.addr);
-	if (ret)
-		error(0, ret, "process_portal_unmap()");
+	if (ret) {
+		errno = ret;
+		err(0, "process_portal_unmap()");
+	}
 	return ret;
 }
 
@@ -136,7 +141,8 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
 
 	q_pcfg = kzalloc((sizeof(struct qm_portal_config)), 0);
 	if (!q_pcfg) {
-		error(0, -1, "q_pcfg kzalloc failed");
+		/* kzalloc sets errno */
+		err(0, "q_pcfg kzalloc failed");
 		return NULL;
 	}
 
@@ -145,7 +151,8 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd)
 	q_map.index = QBMAN_ANY_PORTAL_IDX;
 	ret = process_portal_map(&q_map);
 	if (ret) {
-		error(0, ret, "process_portal_map()");
+		errno = ret;
+		err(0, "process_portal_map()");
 		kfree(q_pcfg);
 		return NULL;
 	}
diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h
index 4deea5e..2660234 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -16,7 +16,7 @@ extern "C" {
 #include <rte_eventdev.h>
 
 /* FQ lookups (turn this on for 64bit user-space) */
-#if (__WORDSIZE == 64)
+#ifdef RTE_ARCH_64
 #define CONFIG_FSL_QMAN_FQ_LOOKUP
 /* if FQ lookups are supported, this controls the number of initialised,
  * s/w-consumed FQs that can be supported at any one time.
diff --git a/drivers/bus/dpaa/include/netcfg.h b/drivers/bus/dpaa/include/netcfg.h
index bf7bfae..e1f0461 100644
--- a/drivers/bus/dpaa/include/netcfg.h
+++ b/drivers/bus/dpaa/include/netcfg.h
@@ -9,7 +9,6 @@
 #define __NETCFG_H
 
 #include <fman.h>
-#include <argp.h>
 
 /* Configuration information related to a specific ethernet port */
 struct fm_eth_port_cfg {
diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h
index dd74cb7..a1e14dd 100644
--- a/drivers/bus/fslmc/fslmc_logs.h
+++ b/drivers/bus/fslmc/fslmc_logs.h
@@ -18,8 +18,6 @@ extern int dpaa2_logtype_bus;
 	rte_log(RTE_LOG_DEBUG, dpaa2_logtype_bus, "fslmc: %s(): " fmt "\n", \
 		__func__, ##args)
 
-#define BUS_INIT_FUNC_TRACE() DPAA2_BUS_DEBUG(" >>")
-
 #define DPAA2_BUS_INFO(fmt, args...) \
 	DPAA2_BUS_LOG(INFO, fmt, ## args)
 #define DPAA2_BUS_ERR(fmt, args...) \
diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c
index 54bea97..e88cecc 100644
--- a/drivers/bus/fslmc/qbman/qbman_portal.c
+++ b/drivers/bus/fslmc/qbman/qbman_portal.c
@@ -311,17 +311,9 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d)
 	eqcr_pi = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI);
 	p->eqcr.pi = eqcr_pi & p->eqcr.pi_ci_mask;
 	p->eqcr.pi_vb = eqcr_pi & QB_VALID_BIT;
-	if ((p->desc.qman_version & QMAN_REV_MASK) >= QMAN_REV_5000
-			&& (d->cena_access_mode == qman_cena_fastest_access))
-		p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI)
-					     & p->eqcr.pi_ci_mask;
-	else
-		p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_CI)
-					     & p->eqcr.pi_ci_mask;
-	p->eqcr.available = p->eqcr.pi_ring_size -
-				qm_cyc_diff(p->eqcr.pi_ring_size,
-				p->eqcr.ci & (p->eqcr.pi_ci_mask<<1),
-				p->eqcr.pi & (p->eqcr.pi_ci_mask<<1));
+	p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_CI)
+			& p->eqcr.pi_ci_mask;
+	p->eqcr.available = p->eqcr.pi_ring_size;
 
 	portal_idx_map[p->desc.idx] = p;
 	return p;
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index ab73c00..cabfe69 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -18,6 +18,7 @@
 #include <rte_bus.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
+#include <rte_lcore.h>
 #include <rte_per_lcore.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
@@ -150,7 +151,9 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 	}
 
 	if (dev->device.numa_node < 0) {
-		RTE_LOG(WARNING, EAL, "  Invalid NUMA socket, default to 0\n");
+		if (rte_socket_count() > 1)
+			RTE_LOG(INFO, EAL, "Device %s is not NUMA-aware, defaulting socket to 0\n",
+					dev->name);
 		dev->device.numa_node = 0;
 	}
 
diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c
index 3adef01..34676c4 100644
--- a/drivers/bus/vmbus/vmbus_common.c
+++ b/drivers/bus/vmbus/vmbus_common.c
@@ -15,6 +15,7 @@
 #include <rte_eal.h>
 #include <rte_tailq.h>
 #include <rte_devargs.h>
+#include <rte_lcore.h>
 #include <rte_malloc.h>
 #include <rte_errno.h>
 #include <rte_memory.h>
@@ -113,7 +114,9 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr,
 	dev->driver = dr;
 
 	if (dev->device.numa_node < 0) {
-		VMBUS_LOG(WARNING, "  Invalid NUMA socket, default to 0");
+		if (rte_socket_count() > 1)
+			VMBUS_LOG(INFO, "Device %s is not NUMA-aware, defaulting socket to 0",
+					guid);
 		dev->device.numa_node = 0;
 	}
 
diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile
index 59bd8ae..ff4f898 100644
--- a/drivers/common/dpaax/Makefile
+++ b/drivers/common/dpaax/Makefile
@@ -16,6 +16,7 @@ CFLAGS += -Wno-pointer-arith
 CFLAGS += -Wno-cast-qual
 
 CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib
 
 # versioning export map
 EXPORT_MAP := rte_common_dpaax_version.map
@@ -23,7 +24,7 @@ EXPORT_MAP := rte_common_dpaax_version.map
 #
 # all source are stored in SRCS-y
 #
-SRCS-y += dpaax_iova_table.c dpaa_of.c
+SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c
 
 LDLIBS += -lrte_eal
 
diff --git a/drivers/common/dpaax/caamflib.c b/drivers/common/dpaax/caamflib.c
new file mode 100644
index 0000000..55e2028
--- /dev/null
+++ b/drivers/common/dpaax/caamflib.c
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
+ *
+ * Copyright 2020 NXP
+ *
+ */
+
+#include <rta.h>
+
+/*
+ * SEC HW block revision.
+ *
+ * This *must not be confused with SEC version*:
+ * - SEC HW block revision format is "v"
+ * - SEC revision format is "x.y"
+ */
+enum rta_sec_era rta_sec_era;
diff --git a/drivers/common/dpaax/caamflib/compat.h b/drivers/common/dpaax/caamflib/compat.h
index ce946cc..95d887a 100644
--- a/drivers/common/dpaax/caamflib/compat.h
+++ b/drivers/common/dpaax/caamflib/compat.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <errno.h>
 
-#ifdef __GLIBC__
+#ifdef RTE_EXEC_ENV_LINUX
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,7 +24,7 @@
 #error "Undefined endianness"
 #endif
 
-#else
+#else /* !RTE_EXEC_ENV_LINUX */
 #error Environment not supported!
 #endif
 
@@ -40,7 +40,7 @@
 #define __maybe_unused __attribute__((unused))
 #endif
 
-#if defined(__GLIBC__) && !defined(pr_debug)
+#if !defined(pr_debug)
 #if !defined(SUPPRESS_PRINTS) && defined(RTA_DEBUG)
 #define pr_debug(fmt, ...) \
 	RTE_LOG(DEBUG, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__)
@@ -49,7 +49,7 @@
 #endif
 #endif /* pr_debug */
 
-#if defined(__GLIBC__) && !defined(pr_err)
+#if !defined(pr_err)
 #if !defined(SUPPRESS_PRINTS)
 #define pr_err(fmt, ...) \
 	RTE_LOG(ERR, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__)
@@ -58,7 +58,7 @@
 #endif
 #endif /* pr_err */
 
-#if defined(__GLIBC__) && !defined(pr_warn)
+#if !defined(pr_warn)
 #if !defined(SUPPRESS_PRINTS)
 #define pr_warn(fmt, ...) \
 	RTE_LOG(WARNING, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__)
@@ -101,7 +101,7 @@
 #endif
 
 /* Use Linux naming convention */
-#ifdef __GLIBC__
+#if defined(RTE_EXEC_ENV_LINUX) || defined(__GLIBC__)
 	#define swab16(x) rte_bswap16(x)
 	#define swab32(x) rte_bswap32(x)
 	#define swab64(x) rte_bswap64(x)
diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h
index 12c9d99..d2883d0 100644
--- a/drivers/common/dpaax/compat.h
+++ b/drivers/common/dpaax/compat.h
@@ -34,7 +34,6 @@
 #include <assert.h>
 #include <dirent.h>
 #include <inttypes.h>
-#include <error.h>
 #include <rte_byteorder.h>
 #include <rte_atomic.h>
 #include <rte_spinlock.h>
diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c
index 98b076e..3f3be4f 100644
--- a/drivers/common/dpaax/dpaax_iova_table.c
+++ b/drivers/common/dpaax/dpaax_iova_table.c
@@ -369,8 +369,10 @@ dpaax_iova_table_dump(void)
 	}
 
 	DPAAX_DEBUG(" === Start of PA->VA Translation Table ===");
-	if (dpaax_iova_table_p == NULL)
+	if (dpaax_iova_table_p == NULL) {
 		DPAAX_DEBUG("\tNULL");
+		return;
+	}
 
 	entry = dpaax_iova_table_p->entries;
 	for (i = 0; i < dpaax_iova_table_p->count; i++) {
diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build
index d41bb50..dc3e26d 100644
--- a/drivers/common/dpaax/meson.build
+++ b/drivers/common/dpaax/meson.build
@@ -8,7 +8,9 @@ if not is_linux
 	reason = 'only supported on linux'
 endif
 
-sources = files('dpaax_iova_table.c', 'dpaa_of.c')
+sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
+
+includes += include_directories('caamflib')
 
 cflags += ['-D_GNU_SOURCE']
 if cc.has_argument('-Wno-cast-qual')
diff --git a/drivers/common/dpaax/rte_common_dpaax_version.map b/drivers/common/dpaax/rte_common_dpaax_version.map
index f72eba7..837ce01 100644
--- a/drivers/common/dpaax/rte_common_dpaax_version.map
+++ b/drivers/common/dpaax/rte_common_dpaax_version.map
@@ -21,3 +21,7 @@ DPDK_20.0 {
 
 	local: *;
 };
+
+INTERNAL {
+	rta_sec_era;
+};
diff --git a/drivers/common/octeontx2/otx2_dev.h b/drivers/common/octeontx2/otx2_dev.h
index 7d9839c..61d8ff6 100644
--- a/drivers/common/octeontx2/otx2_dev.h
+++ b/drivers/common/octeontx2/otx2_dev.h
@@ -46,6 +46,9 @@
 	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&	\
 	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0))
 
+#define otx2_dev_is_98xx(dev)                                   \
+	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x3)
+
 struct otx2_dev;
 
 /* Link status callback */
diff --git a/drivers/common/qat/qat_device.h b/drivers/common/qat/qat_device.h
index c3f5ae8..7460dfd 100644
--- a/drivers/common/qat/qat_device.h
+++ b/drivers/common/qat/qat_device.h
@@ -29,7 +29,7 @@ struct qat_dev_cmd_param {
 enum qat_comp_num_im_buffers {
 	QAT_NUM_INTERM_BUFS_GEN1 = 12,
 	QAT_NUM_INTERM_BUFS_GEN2 = 20,
-	QAT_NUM_INTERM_BUFS_GEN3 = 20
+	QAT_NUM_INTERM_BUFS_GEN3 = 64
 };
 
 struct qat_device_info {
diff --git a/drivers/compress/qat/qat_comp.c b/drivers/compress/qat/qat_comp.c
index 533e34f..cd06809 100644
--- a/drivers/compress/qat/qat_comp.c
+++ b/drivers/compress/qat/qat_comp.c
@@ -68,8 +68,8 @@ qat_comp_build_request(void *in_op, uint8_t *out_msg,
 					ICP_QAT_FW_COMP_EOP
 				      : ICP_QAT_FW_COMP_NOT_EOP,
 				ICP_QAT_FW_COMP_NOT_BFINAL,
-				ICP_QAT_FW_COMP_NO_CNV,
-				ICP_QAT_FW_COMP_NO_CNV_RECOVERY);
+				ICP_QAT_FW_COMP_CNV,
+				ICP_QAT_FW_COMP_CNV_RECOVERY);
 	}
 
 	if (likely(qat_xform->qat_comp_request_type ==
@@ -286,7 +286,8 @@ qat_comp_process_response(void **op, uint8_t *resp, void *op_cookie,
 			rx_op->status = RTE_COMP_OP_STATUS_ERROR;
 			rx_op->debug_status = ERR_CODE_QAT_COMP_WRONG_FW;
 			*op = (void *)rx_op;
-			QAT_DP_LOG(ERR, "QAT has wrong firmware");
+			QAT_DP_LOG(ERR,
+					"This QAT hardware doesn't support compression operation");
 			++(*dequeue_err_count);
 			return 0;
 		}
diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c
index 5cdabad..dafd3da 100644
--- a/drivers/compress/qat/qat_comp_pmd.c
+++ b/drivers/compress/qat/qat_comp_pmd.c