Merge ~paelzer/ubuntu/+source/dpdk:bug-1836365-LTS-summer-2019-disco into ubuntu/+source/dpdk:ubuntu/disco-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1836365-dpdk-stable-summer-2019

Unmerged commits

bbb324c... by Christian Ehrhardt  on 2019-07-12

changelog: mention fix for mlx rdma-core dependencies (LP: #1820957)

Change-Id: I65637239c64b939eede5bdd532106c13e5400834
Signed-off-by: Christian Ehrhardt <email address hidden>

34cfcfe... by Christian Ehrhardt  on 2019-07-12

update-maintainer

Change-Id: I24ad0550284f7b7a4ce2e6a7b4f3066c4951e172
Signed-off-by: Christian Ehrhardt <email address hidden>

2e460d6... by Christian Ehrhardt  on 2019-07-12

changelog: Make DPDK LTS release available in Disco (LP: #1784816)

Change-Id: I4645a1ad14a99d0f9564a1ba8dde4d265010f615
Signed-off-by: Christian Ehrhardt <email address hidden>

9bcf5b3... by Luca Boccassi on 2019-07-05

Merge branch 'gbp' into 'experimental'

Add gbp.conf and CI config

See merge request debian/dpdk!1

e77068c... by Luca Boccassi on 2019-07-04

Add gbp.conf file

Gbp-Dch: ignore

3761e64... by Luca Boccassi on 2019-07-04

Add .gitlab.yml file to run CI on Salsa

Gbp-Dch: ignore

8866da0... by Luca Boccassi on 2019-07-05

Merge branch 'experimental-18.11.2-1' into 'experimental'

Experimental 18.11.2 1

See merge request debian/dpdk!2

d116693... by Christian Ehrhardt  on 2019-07-04

d/README.source: add info about salsa git usage

Change-Id: I1707e7e96b3179a72873b03e150b1be513207f7f
Signed-off-by: Christian Ehrhardt <email address hidden>

c1f2dfb... by Christian Ehrhardt  on 2019-07-04

d/control: set VCS to be Salsa based

Change-Id: I67d511ca4cc888fe9a937b1b6aabe0fe4bd285b2
Signed-off-by: Christian Ehrhardt <email address hidden>

5e64e15... by Christian Ehrhardt  on 2019-07-04

changelog: mention debian/rules: clean doc files

Change-Id: Ie5916373388c10e61388fdb17ece7b7e60a9b3f2
Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
new file mode 100755
index 0000000..4eb7c3c
--- /dev/null
+++ b/.ci/linux-build.sh
@@ -0,0 +1,24 @@
+#!/bin/sh -xe
+
+on_error() {
+    if [ $? = 0 ]; then
+        exit
+    fi
+    FILES_TO_PRINT="build/meson-logs/testlog.txt build/.ninja_log build/meson-logs/meson-log.txt"
+
+    for pr_file in $FILES_TO_PRINT; do
+        if [ -e "$pr_file" ]; then
+            cat "$pr_file"
+        fi
+    done
+}
+trap on_error EXIT
+
+if [ "$AARCH64" = "1" ]; then
+    # convert the arch specifier
+    OPTS="$OPTS --cross-file config/arm/arm64_armv8_linuxapp_gcc"
+fi
+
+OPTS="$OPTS --default-library=$DEF_LIB"
+meson build --werror -Dexamples=all $OPTS
+ninja -C build
diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
new file mode 100755
index 0000000..acdf9f3
--- /dev/null
+++ b/.ci/linux-setup.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+python3 -m pip install --upgrade meson --user
diff --git a/.gitignore b/.gitignore
index 9105e26..1c3555a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@ doc/guides/cryptodevs/overview_feature_table.txt
 doc/guides/cryptodevs/overview_cipher_table.txt
 doc/guides/cryptodevs/overview_auth_table.txt
 doc/guides/cryptodevs/overview_aead_table.txt
+<<<<<<< .gitignore
+=======
+doc/guides/cryptodevs/overview_asym_table.txt
+>>>>>>> .gitignore
 doc/guides/compressdevs/overview_feature_table.txt
 cscope.out.po
 cscope.out.in
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..7b167fa
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,98 @@
+language: c
+cache: ccache
+compiler:
+  - gcc
+  - clang
+
+dist: xenial
+
+os:
+  - linux
+
+addons:
+  apt:
+    update: true
+    packages: &required_packages
+      - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools, python3-wheel, python3-pip, ninja-build]
+
+aarch64_packages: &aarch64_packages
+  - *required_packages
+  - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross]
+
+extra_packages: &extra_packages
+  - *required_packages
+  - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
+
+before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
+
+env:
+  - DEF_LIB="static"
+  - DEF_LIB="shared"
+  - DEF_LIB="static" OPTS="-Denable_kmods=false"
+  - DEF_LIB="shared" OPTS="-Denable_kmods=false"
+
+matrix:
+  include:
+  - env: DEF_LIB="static" OPTS="-Denable_kmods=false" AARCH64=1
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - *aarch64_packages
+  - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" AARCH64=1
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - *aarch64_packages
+  - env: DEF_LIB="static" EXTRA_PACKAGES=1
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="shared" EXTRA_PACKAGES=1
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="static" EXTRA_PACKAGES=1
+    compiler: clang
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="shared" EXTRA_PACKAGES=1
+    compiler: clang
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
+    compiler: clang
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+  - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1
+    compiler: clang
+    addons:
+      apt:
+        packages:
+          - *extra_packages
+
+
+script: ./.ci/${TRAVIS_OS_NAME}-build.sh
diff --git a/MAINTAINERS b/MAINTAINERS
index 71ba312..a19dbb3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -120,6 +120,15 @@ F: config/rte_config.h
 F: buildtools/gen-pmdinfo-cfile.sh
 F: buildtools/symlink-drivers-solibs.sh
 
+<<<<<<< MAINTAINERS
+=======
+Public CI
+M: Aaron Conole <[e-mail]>
+M: Michael Santana <[e-mail]>
+F: .travis.yml
+F: .ci/
+
+>>>>>>> MAINTAINERS
 ABI versioning
 M: Neil Horman <[e-mail]>
 F: lib/librte_compat/
@@ -234,7 +243,11 @@ F: drivers/net/i40e/i40e_rxtx_vec_neon.c
 F: drivers/net/virtio/virtio_rxtx_simple_neon.c
 
 IBM POWER (alpha)
+<<<<<<< MAINTAINERS
 M: Chao Zhu <[e-mail]>
+=======
+M: David Christensen <[e-mail]>
+>>>>>>> MAINTAINERS
 F: lib/librte_eal/common/arch/ppc_64/
 F: lib/librte_eal/common/include/arch/ppc_64/
 F: drivers/net/i40e/i40e_rxtx_vec_altivec.c
diff --git a/app/pdump/main.c b/app/pdump/main.c
index 9e86bf6..7007cfe 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -494,6 +494,10 @@ cleanup_pdump_resources(void)
 {
 	int i;
 	struct pdump_tuples *pt;
+<<<<<<< app/pdump/main.c
+=======
+	char name[RTE_ETH_NAME_MAX_LEN];
+>>>>>>> app/pdump/main.c
 
 	/* disable pdump and free the pdump_tuple resources */
 	for (i = 0; i < num_tuples; i++) {
@@ -510,6 +514,24 @@ cleanup_pdump_resources(void)
 			free_ring_data(pt->rx_ring, pt->rx_vdev_id, &pt->stats);
 		if (pt->dir & RTE_PDUMP_FLAG_TX)
 			free_ring_data(pt->tx_ring, pt->tx_vdev_id, &pt->stats);
+<<<<<<< app/pdump/main.c
+=======
+
+		/* Remove the vdev(s) created */
+		if (pt->dir & RTE_PDUMP_FLAG_RX) {
+			rte_eth_dev_get_name_by_port(pt->rx_vdev_id, name);
+			rte_eal_hotplug_remove("vdev", name);
+		}
+
+		if (pt->single_pdump_dev)
+			continue;
+
+		if (pt->dir & RTE_PDUMP_FLAG_TX) {
+			rte_eth_dev_get_name_by_port(pt->tx_vdev_id, name);
+			rte_eal_hotplug_remove("vdev", name);
+		}
+
+>>>>>>> app/pdump/main.c
 	}
 	cleanup_rings();
 }
diff --git a/app/test-bbdev/test_bbdev.c b/app/test-bbdev/test_bbdev.c
index a914817..d64c5cd 100644
--- a/app/test-bbdev/test_bbdev.c
+++ b/app/test-bbdev/test_bbdev.c
@@ -14,6 +14,11 @@
 #include <rte_bbdev.h>
 #include <rte_bbdev_op.h>
 #include <rte_bbdev_pmd.h>
+<<<<<<< app/test-bbdev/test_bbdev.c
+=======
+#include<string.h>
+#include <rte_string_fns.h>
+>>>>>>> app/test-bbdev/test_bbdev.c
 
 #include "main.h"
 
@@ -788,14 +793,22 @@ test_bbdev_driver_init(void)
 
 	/* Initialize the maximum amount of devices */
 	do {
+<<<<<<< app/test-bbdev/test_bbdev.c
 		sprintf(name_tmp, "%s%i", "name_", num_devs);
+=======
+		snprintf(name_tmp, sizeof(name_tmp), "%s%i", "name_", num_devs);
+>>>>>>> app/test-bbdev/test_bbdev.c
 		dev2 = rte_bbdev_allocate(name_tmp);
 		TEST_ASSERT(dev2 != NULL,
 				"Failed to initialize bbdev driver");
 		++num_devs;
 	} while (num_devs < (RTE_BBDEV_MAX_DEVS - 1));
 
+<<<<<<< app/test-bbdev/test_bbdev.c
 	sprintf(name_tmp, "%s%i", "name_", num_devs);
+=======
+	snprintf(name_tmp, sizeof(name_tmp), "%s%i", "name_", num_devs);
+>>>>>>> app/test-bbdev/test_bbdev.c
 	dev2 = rte_bbdev_allocate(name_tmp);
 	TEST_ASSERT(dev2 == NULL, "Failed to initialize bbdev driver number %d "
 			"more drivers than RTE_BBDEV_MAX_DEVS: %d ", num_devs,
@@ -804,7 +817,11 @@ test_bbdev_driver_init(void)
 	num_devs--;
 
 	while (num_devs >= num_devs_tmp) {
+<<<<<<< app/test-bbdev/test_bbdev.c
 		sprintf(name_tmp, "%s%i", "name_", num_devs);
+=======
+		snprintf(name_tmp, sizeof(name_tmp), "%s%i", "name_", num_devs);
+>>>>>>> app/test-bbdev/test_bbdev.c
 		dev2 = rte_bbdev_get_named_dev(name_tmp);
 		TEST_ASSERT_SUCCESS(rte_bbdev_release(dev2),
 				"Failed to uninitialize bbdev driver %s ",
@@ -825,7 +842,11 @@ test_bbdev_driver_init(void)
 	TEST_ASSERT_FAIL(rte_bbdev_release(NULL),
 			"Failed to uninitialize bbdev driver with NULL bbdev");
 
+<<<<<<< app/test-bbdev/test_bbdev.c
 	sprintf(name_tmp, "%s", "invalid_name");
+=======
+	strlcpy(name_tmp, "invalid_name", sizeof(name_tmp));
+>>>>>>> app/test-bbdev/test_bbdev.c
 	dev2 = rte_bbdev_get_named_dev(name_tmp);
 	TEST_ASSERT_FAIL(rte_bbdev_release(dev2),
 			"Failed to uninitialize bbdev driver with invalid name");
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index fbe6cc9..e4c5048 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -1953,7 +1953,14 @@ offload_latency_test_dec(struct rte_mempool *mempool, struct test_buffers *bufs,
 		if (unlikely(num_to_process - dequeued < burst_sz))
 			burst_sz = num_to_process - dequeued;
 
+<<<<<<< app/test-bbdev/test_bbdev_perf.c
 		rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz);
+=======
+		ret = rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz);
+		TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops",
+				burst_sz);
+
+>>>>>>> app/test-bbdev/test_bbdev_perf.c
 		if (test_vector.op_type != RTE_BBDEV_OP_NONE)
 			copy_reference_dec_op(ops_enq, burst_sz, dequeued,
 					bufs->inputs,
@@ -2035,7 +2042,14 @@ offload_latency_test_enc(struct rte_mempool *mempool, struct test_buffers *bufs,
 		if (unlikely(num_to_process - dequeued < burst_sz))
 			burst_sz = num_to_process - dequeued;
 
+<<<<<<< app/test-bbdev/test_bbdev_perf.c
 		rte_bbdev_enc_op_alloc_bulk(mempool, ops_enq, burst_sz);
+=======
+		ret = rte_bbdev_enc_op_alloc_bulk(mempool, ops_enq, burst_sz);
+		TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops",
+				burst_sz);
+
+>>>>>>> app/test-bbdev/test_bbdev_perf.c
 		if (test_vector.op_type != RTE_BBDEV_OP_NONE)
 			copy_reference_enc_op(ops_enq, burst_sz, dequeued,
 					bufs->inputs,
diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 953e058..f383fd2 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -129,6 +129,14 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs,
 
 		struct rte_cryptodev_info cdev_info;
 		uint8_t socket_id = rte_cryptodev_socket_id(cdev_id);
+<<<<<<< app/test-crypto-perf/main.c
+=======
+		/* range check the socket_id - negative values become big
+		 * positive ones due to use of unsigned value
+		 */
+		if (socket_id >= RTE_MAX_NUMA_NODES)
+			socket_id = 0;
+>>>>>>> app/test-crypto-perf/main.c
 
 		rte_cryptodev_info_get(cdev_id, &cdev_info);
 		if (opts->nb_qps > cdev_info.max_nb_queue_pairs) {
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index 8618775..c17db81 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -327,7 +327,12 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
 		}
 
 		if (new_cycles - dead_lock_cycles > dead_lock_sample &&
+<<<<<<< app/test-eventdev/test_perf_common.c
 				opt->prod_type == EVT_PROD_TYPE_SYNT) {
+=======
+		    (opt->prod_type == EVT_PROD_TYPE_SYNT ||
+		     opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR)) {
+>>>>>>> app/test-eventdev/test_perf_common.c
 			remaining = t->outstand_pkts - processed_pkts(t);
 			if (dead_lock_remaining == remaining) {
 				rte_event_dev_dump(opt->dev_id, stdout);
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 1275074..63b6f4a 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -94,6 +94,7 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
 		cl,
 		"\n"
 		"Help is available for the following sections:\n\n"
+<<<<<<< app/test-pmd/cmdline.c
 		"    help control    : Start and stop forwarding.\n"
 		"    help display    : Displaying port, stats and config "
 		"information.\n"
@@ -102,6 +103,17 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
 		"    help registers  : Reading and setting port registers.\n"
 		"    help filters    : Filters configuration help.\n"
 		"    help all        : All of the above sections.\n\n"
+=======
+		"    help control                    : Start and stop forwarding.\n"
+		"    help display                    : Displaying port, stats and config "
+		"information.\n"
+		"    help config                     : Configuration information.\n"
+		"    help ports                      : Configuring ports.\n"
+		"    help registers                  : Reading and setting port registers.\n"
+		"    help filters                    : Filters configuration help.\n"
+		"    help traffic_management         : Traffic Management commmands.\n"
+		"    help all                        : All of the above sections.\n\n"
+>>>>>>> app/test-pmd/cmdline.c
 	);
 
 }
@@ -210,6 +222,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 
 			"show port meter stats (port_id) (meter_id) (clear)\n"
 			"    Get meter stats on a port\n\n"
+<<<<<<< app/test-pmd/cmdline.c
                         "show port tm cap (port_id)\n"
                         "       Display the port TM capability.\n\n"
 
@@ -225,6 +238,34 @@ static void cmd_help_long_parsed(void *parsed_result,
                         "show port tm node stats (port_id) (node_id) (clear)\n"
                         "       Display the port TM node stats.\n\n"
 
+=======
+
+			"show fwd stats all\n"
+			"    Display statistics for all fwd engines.\n\n"
+
+			"clear fwd stats all\n"
+			"    Clear statistics for all fwd engines.\n\n"
+
+			"show port (port_id) rx_offload capabilities\n"
+			"    List all per queue and per port Rx offloading"
+			" capabilities of a port\n\n"
+
+			"show port (port_id) rx_offload configuration\n"
+			"    List port level and all queue level"
+			" Rx offloading configuration\n\n"
+
+			"show port (port_id) tx_offload capabilities\n"
+			"    List all per queue and per port"
+			" Tx offloading capabilities of a port\n\n"
+
+			"show port (port_id) tx_offload configuration\n"
+			"    List port level and all queue level"
+			" Tx offloading configuration\n\n"
+
+			"show port (port_id) tx_metadata\n"
+			"    Show Tx metadata value set"
+			" for a specific port\n\n"
+>>>>>>> app/test-pmd/cmdline.c
 		);
 	}
 
@@ -642,11 +683,14 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"E-tag set filter del e-tag-id (value) port (port_id)\n"
 			"    Delete an E-tag forwarding filter on a port\n\n"
 
+<<<<<<< app/test-pmd/cmdline.c
 #if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
 			"set port tm hierarchy default (port_id)\n"
 			"	Set default traffic Management hierarchy on a port\n\n"
 
 #endif
+=======
+>>>>>>> app/test-pmd/cmdline.c
 			"ddp add (port_id) (profile_path[,backup_profile_path])\n"
 			"    Load a profile package on a port\n\n"
 
@@ -727,6 +771,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"show port (port_id) queue-region\n"
 			"    show all queue region related configuration info\n\n"
 
+<<<<<<< app/test-pmd/cmdline.c
 			"add port tm node shaper profile (port_id) (shaper_profile_id)"
 			" (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size)"
 			" (packet_length_adjust)\n"
@@ -783,6 +828,8 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"port tm hierarchy commit (port_id) (clean_on_fail)\n"
 			"	Commit tm hierarchy.\n\n"
 
+=======
+>>>>>>> app/test-pmd/cmdline.c
 			"vxlan ip-version (ipv4|ipv6) vni (vni) udp-src"
 			" (udp-src) udp-dst (udp-dst) ip-src (ip-src) ip-dst"
 			" (ip-dst) eth-src (eth-src) eth-dst (eth-dst)\n"
@@ -918,6 +965,55 @@ static void cmd_help_long_parsed(void *parsed_result,
 
 			"port config (port_id) udp_tunnel_port add|rm vxlan|geneve (udp_port)\n\n"
 			"    Add/remove UDP tunnel port for tunneling offload\n\n"
+<<<<<<< app/test-pmd/cmdline.c
+=======
+
+			"port config <port_id> rx_offload vlan_strip|"
+			"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
+			"outer_ipv4_cksum|macsec_strip|header_split|"
+			"vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+			"scatter|timestamp|security|keep_crc on|off\n"
+			"     Enable or disable a per port Rx offloading"
+			" on all Rx queues of a port\n\n"
+
+			"port (port_id) rxq (queue_id) rx_offload vlan_strip|"
+			"ipv4_cksum|udp_cksum|tcp_cksum|tcp_lro|qinq_strip|"
+			"outer_ipv4_cksum|macsec_strip|header_split|"
+			"vlan_filter|vlan_extend|jumbo_frame|crc_strip|"
+			"scatter|timestamp|security|keep_crc on|off\n"
+			"    Enable or disable a per queue Rx offloading"
+			" only on a specific Rx queue\n\n"
+
+			"port config (port_id) tx_offload vlan_insert|"
+			"ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
+			"udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
+			"gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|"
+			"macsec_insert|mt_lockfree|multi_segs|mbuf_fast_free|"
+			"security|match_metadata on|off\n"
+			"    Enable or disable a per port Tx offloading"
+			" on all Tx queues of a port\n\n"
+
+			"port (port_id) txq (queue_id) tx_offload vlan_insert|"
+			"ipv4_cksum|udp_cksum|tcp_cksum|sctp_cksum|tcp_tso|"
+			"udp_tso|outer_ipv4_cksum|qinq_insert|vxlan_tnl_tso|"
+			"gre_tnl_tso|ipip_tnl_tso|geneve_tnl_tso|macsec_insert"
+			"|mt_lockfree|multi_segs|mbuf_fast_free|security"
+			" on|off\n"
+			"    Enable or disable a per queue Tx offloading"
+			" only on a specific Tx queue\n\n"
+
+			"bpf-load rx|tx (port) (queue) (J|M|B) (file_name)\n"
+			"    Load an eBPF program as a callback"
+			" for particular RX/TX queue\n\n"
+
+			"bpf-unload rx|tx (port) (queue)\n"
+			"    Unload previously loaded eBPF program"
+			" for particular RX/TX queue\n\n"
+
+			"port config (port_id) tx_metadata (value)\n"
+			"    Set Tx metadata value per port. Testpmd will add this value"
+			" to any Tx packet sent from this port\n\n"
+>>>>>>> app/test-pmd/cmdline.c
 		);
 	}
 
@@ -1137,6 +1233,110 @@ static void cmd_help_long_parsed(void *parsed_result,
 			" flow rules\n\n"
 		);
 	}
+<<<<<<< app/test-pmd/cmdline.c
+=======
+
+	if (show_all || !strcmp(res->section, "traffic_management")) {
+		cmdline_printf(
+			cl,
+			"\n"
+			"Traffic Management:\n"
+			"--------------\n"
+			"show port tm cap (port_id)\n"
+			"       Display the port TM capability.\n\n"
+
+			"show port tm level cap (port_id) (level_id)\n"
+			"       Display the port TM hierarchical level capability.\n\n"
+
+			"show port tm node cap (port_id) (node_id)\n"
+			"       Display the port TM node capability.\n\n"
+
+			"show port tm node type (port_id) (node_id)\n"
+			"       Display the port TM node type.\n\n"
+
+			"show port tm node stats (port_id) (node_id) (clear)\n"
+			"       Display the port TM node stats.\n\n"
+
+#if defined RTE_LIBRTE_PMD_SOFTNIC && defined RTE_LIBRTE_SCHED
+			"set port tm hierarchy default (port_id)\n"
+			"       Set default traffic Management hierarchy on a port\n\n"
+#endif
+
+			"add port tm node shaper profile (port_id) (shaper_profile_id)"
+			" (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size)"
+			" (packet_length_adjust)\n"
+			"       Add port tm node private shaper profile.\n\n"
+
+			"del port tm node shaper profile (port_id) (shaper_profile_id)\n"
+			"       Delete port tm node private shaper profile.\n\n"
+
+			"add port tm node shared shaper (port_id) (shared_shaper_id)"
+			" (shaper_profile_id)\n"
+			"       Add/update port tm node shared shaper.\n\n"
+
+			"del port tm node shared shaper (port_id) (shared_shaper_id)\n"
+			"       Delete port tm node shared shaper.\n\n"
+
+			"set port tm node shaper profile (port_id) (node_id)"
+			" (shaper_profile_id)\n"
+			"       Set port tm node shaper profile.\n\n"
+
+			"add port tm node wred profile (port_id) (wred_profile_id)"
+			" (color_g) (min_th_g) (max_th_g) (maxp_inv_g) (wq_log2_g)"
+			" (color_y) (min_th_y) (max_th_y) (maxp_inv_y) (wq_log2_y)"
+			" (color_r) (min_th_r) (max_th_r) (maxp_inv_r) (wq_log2_r)\n"
+			"       Add port tm node wred profile.\n\n"
+
+			"del port tm node wred profile (port_id) (wred_profile_id)\n"
+			"       Delete port tm node wred profile.\n\n"
+
+			"add port tm nonleaf node (port_id) (node_id) (parent_node_id)"
+			" (priority) (weight) (level_id) (shaper_profile_id)"
+			" (n_sp_priorities) (stats_mask) (n_shared_shapers)"
+			" [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+			"       Add port tm nonleaf node.\n\n"
+
+			"add port tm leaf node (port_id) (node_id) (parent_node_id)"
+			" (priority) (weight) (level_id) (shaper_profile_id)"
+			" (cman_mode) (wred_profile_id) (stats_mask) (n_shared_shapers)"
+			" [(shared_shaper_id_0) (shared_shaper_id_1)...]\n"
+			"       Add port tm leaf node.\n\n"
+
+			"del port tm node (port_id) (node_id)\n"
+			"       Delete port tm node.\n\n"
+
+			"set port tm node parent (port_id) (node_id) (parent_node_id)"
+			" (priority) (weight)\n"
+			"       Set port tm node parent.\n\n"
+
+			"suspend port tm node (port_id) (node_id)"
+			"       Suspend tm node.\n\n"
+
+			"resume port tm node (port_id) (node_id)"
+			"       Resume tm node.\n\n"
+
+			"port tm hierarchy commit (port_id) (clean_on_fail)\n"
+			"       Commit tm hierarchy.\n\n"
+
+			"set port tm mark ip_ecn (port) (green) (yellow)"
+			" (red)\n"
+			"    Enables/Disables the traffic management marking"
+			" for IP ECN (Explicit Congestion Notification)"
+			" packets on a given port\n\n"
+
+			"set port tm mark ip_dscp (port) (green) (yellow)"
+			" (red)\n"
+			"    Enables/Disables the traffic management marking"
+			" on the port for IP dscp packets\n\n"
+
+			"set port tm mark vlan_dei (port) (green) (yellow)"
+			" (red)\n"
+			"    Enables/Disables the traffic management marking"
+			" on the port for VLAN packets with DEI enabled\n\n"
+		);
+	}
+
+>>>>>>> app/test-pmd/cmdline.c
 }
 
 cmdline_parse_token_string_t cmd_help_long_help =
@@ -1145,12 +1345,21 @@ cmdline_parse_token_string_t cmd_help_long_help =
 cmdline_parse_token_string_t cmd_help_long_section =
 	TOKEN_STRING_INITIALIZER(struct cmd_help_long_result, section,
 			"all#control#display#config#"
+<<<<<<< app/test-pmd/cmdline.c
 			"ports#registers#filters");
+=======
+			"ports#registers#filters#traffic_management");
+>>>>>>> app/test-pmd/cmdline.c
 
 cmdline_parse_inst_t cmd_help_long = {
 	.f = cmd_help_long_parsed,
 	.data = NULL,
+<<<<<<< app/test-pmd/cmdline.c
 	.help_str = "help all|control|display|config|ports|register|filters: "
+=======
+	.help_str = "help all|control|display|config|ports|register|"
+		"filters|traffic_management: "
+>>>>>>> app/test-pmd/cmdline.c
 		"Show help",
 	.tokens = {
 		(void *)&cmd_help_long_help,
@@ -12070,7 +12279,11 @@ cmd_set_hash_global_config_parsed(void *parsed_result,
 							res->port_id);
 	else
 		printf("Global hash configurations have been set "
+<<<<<<< app/test-pmd/cmdline.c
 			"succcessfully by port %d\n", res->port_id);
+=======
+			"successfully by port %d\n", res->port_id);
+>>>>>>> app/test-pmd/cmdline.c
 }
 
 cmdline_parse_token_string_t cmd_set_hash_global_config_all =
@@ -15567,10 +15780,16 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
 	struct cmd_set_mplsogre_encap_result *res = parsed_result;
 	union {
 		uint32_t mplsogre_label;
+<<<<<<< app/test-pmd/cmdline.c
 		uint8_t label[3];
 	} id = {
 		.mplsogre_label =
 			rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+=======
+		uint8_t label[4];
+	} id = {
+		.mplsogre_label = rte_cpu_to_be_32(res->label<<12),
+>>>>>>> app/test-pmd/cmdline.c
 	};
 
 	if (strcmp(res->mplsogre, "mplsogre_encap") == 0)
@@ -15583,7 +15802,11 @@ static void cmd_set_mplsogre_encap_parsed(void *parsed_result,
 		mplsogre_encap_conf.select_ipv4 = 0;
 	else
 		return;
+<<<<<<< app/test-pmd/cmdline.c
 	rte_memcpy(mplsogre_encap_conf.label, &id.label[1], 3);
+=======
+	rte_memcpy(mplsogre_encap_conf.label, &id.label, 3);
+>>>>>>> app/test-pmd/cmdline.c
 	if (mplsogre_encap_conf.select_ipv4) {
 		IPV4_ADDR_TO_UINT(res->ip_src, mplsogre_encap_conf.ipv4_src);
 		IPV4_ADDR_TO_UINT(res->ip_dst, mplsogre_encap_conf.ipv4_dst);
@@ -15804,10 +16027,16 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
 	struct cmd_set_mplsoudp_encap_result *res = parsed_result;
 	union {
 		uint32_t mplsoudp_label;
+<<<<<<< app/test-pmd/cmdline.c
 		uint8_t label[3];
 	} id = {
 		.mplsoudp_label =
 			rte_cpu_to_be_32(res->label) & RTE_BE32(0x00ffffff),
+=======
+		uint8_t label[4];
+	} id = {
+		.mplsoudp_label = rte_cpu_to_be_32(res->label<<12),
+>>>>>>> app/test-pmd/cmdline.c
 	};
 
 	if (strcmp(res->mplsoudp, "mplsoudp_encap") == 0)
@@ -15820,7 +16049,11 @@ static void cmd_set_mplsoudp_encap_parsed(void *parsed_result,
 		mplsoudp_encap_conf.select_ipv4 = 0;
 	else
 		return;
+<<<<<<< app/test-pmd/cmdline.c
 	rte_memcpy(mplsoudp_encap_conf.label, &id.label[1], 3);
+=======
+	rte_memcpy(mplsoudp_encap_conf.label, &id.label, 3);
+>>>>>>> app/test-pmd/cmdline.c
 	mplsoudp_encap_conf.udp_src = rte_cpu_to_be_16(res->udp_src);
 	mplsoudp_encap_conf.udp_dst = rte_cpu_to_be_16(res->udp_dst);
 	if (mplsoudp_encap_conf.select_ipv4) {
@@ -17627,7 +17860,11 @@ print_rx_offloads(uint64_t offloads)
 	begin = __builtin_ctzll(offloads);
 	end = sizeof(offloads) * CHAR_BIT - __builtin_clzll(offloads);
 
+<<<<<<< app/test-pmd/cmdline.c
 	single_offload = 1 << begin;
+=======
+	single_offload = 1ULL << begin;
+>>>>>>> app/test-pmd/cmdline.c
 	for (bit = begin; bit < end; bit++) {
 		if (offloads & single_offload)
 			printf(" %s",
@@ -18021,7 +18258,11 @@ print_tx_offloads(uint64_t offloads)
 	begin = __builtin_ctzll(offloads);
 	end = sizeof(offloads) * CHAR_BIT - __builtin_clzll(offloads);
 
+<<<<<<< app/test-pmd/cmdline.c
 	single_offload = 1 << begin;
+=======
+	single_offload = 1ULL << begin;
+>>>>>>> app/test-pmd/cmdline.c
 	for (bit = begin; bit < end; bit++) {
 		if (offloads & single_offload)
 			printf(" %s",
@@ -18198,13 +18439,21 @@ search_tx_offload(const char *name)
 	single_offload = 1;
 	for (bit = 0; bit < sizeof(single_offload) * CHAR_BIT; bit++) {
 		single_name = rte_eth_dev_tx_offload_name(single_offload);
+<<<<<<< app/test-pmd/cmdline.c
+=======
+		if (single_name == NULL)
+			break;
+>>>>>>> app/test-pmd/cmdline.c
 		if (!strcasecmp(single_name, name)) {
 			found = 1;
 			break;
 		} else if (!strcasecmp(single_name, "UNKNOWN"))
 			break;
+<<<<<<< app/test-pmd/cmdline.c
 		else if (single_name == NULL)
 			break;
+=======
+>>>>>>> app/test-pmd/cmdline.c
 		single_offload <<= 1;
 	}
 
@@ -18457,7 +18706,11 @@ cmd_show_tx_metadata_parsed(void *parsed_result,
 	}
 	if (!strcmp(res->cmd_keyword, "tx_metadata")) {
 		printf("Port %u tx_metadata: %u\n", res->cmd_pid,
+<<<<<<< app/test-pmd/cmdline.c
 				ports[res->cmd_pid].tx_metadata);
+=======
+			rte_be_to_cpu_32(ports[res->cmd_pid].tx_metadata));
+>>>>>>> app/test-pmd/cmdline.c
 	}
 }
 
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 23ea7cc..e8f5f53 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -35,6 +35,10 @@ enum index {
 	PREFIX,
 	BOOLEAN,
 	STRING,
+<<<<<<< app/test-pmd/cmdline_flow.c
+=======
+	HEX,
+>>>>>>> app/test-pmd/cmdline_flow.c
 	MAC_ADDR,
 	IPV4_ADDR,
 	IPV6_ADDR,
@@ -1122,6 +1126,12 @@ static int parse_boolean(struct context *, const struct token *,
 static int parse_string(struct context *, const struct token *,
 			const char *, unsigned int,
 			void *, unsigned int);
+<<<<<<< app/test-pmd/cmdline_flow.c
+=======
+static int parse_hex(struct context *ctx, const struct token *token,
+			const char *str, unsigned int len,
+			void *buf, unsigned int size);
+>>>>>>> app/test-pmd/cmdline_flow.c
 static int parse_mac_addr(struct context *, const struct token *,
 			  const char *, unsigned int,
 			  void *, unsigned int);
@@ -1198,6 +1208,16 @@ static const struct token token_list[] = {
 		.call = parse_string,
 		.comp = comp_none,
 	},
+<<<<<<< app/test-pmd/cmdline_flow.c
+=======
+	[HEX] = {
+		.name = "{hex}",
+		.type = "HEX",
+		.help = "fixed string",
+		.call = parse_hex,
+		.comp = comp_none,
+	},
+>>>>>>> app/test-pmd/cmdline_flow.c
 	[MAC_ADDR] = {
 		.name = "{MAC address}",
 		.type = "MAC-48",
@@ -2306,7 +2326,11 @@ static const struct token token_list[] = {
 	[ACTION_RSS_KEY] = {
 		.name = "key",
 		.help = "RSS hash key",
+<<<<<<< app/test-pmd/cmdline_flow.c
 		.next = NEXT(action_rss, NEXT_ENTRY(STRING)),
+=======
+		.next = NEXT(action_rss, NEXT_ENTRY(HEX)),
+>>>>>>> app/test-pmd/cmdline_flow.c
 		.args = ARGS(ARGS_ENTRY_ARB(0, 0),
 			     ARGS_ENTRY_ARB
 			     (offsetof(struct action_rss_data, conf) +
@@ -3808,6 +3832,10 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
 	header += sizeof(gre);
 	memcpy(mpls.label_tc_s, mplsogre_encap_conf.label,
 	       RTE_DIM(mplsogre_encap_conf.label));
+<<<<<<< app/test-pmd/cmdline_flow.c
+=======
+	mpls.label_tc_s[2] |= 0x1;
+>>>>>>> app/test-pmd/cmdline_flow.c
 	memcpy(header, &mpls, sizeof(mpls));
 	header += sizeof(mpls);
 	action_encap_data->conf.size = header -
@@ -3998,6 +4026,10 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
 	header += sizeof(udp);
 	memcpy(mpls.label_tc_s, mplsoudp_encap_conf.label,
 	       RTE_DIM(mplsoudp_encap_conf.label));
+<<<<<<< app/test-pmd/cmdline_flow.c
+=======
+	mpls.label_tc_s[2] |= 0x1;
+>>>>>>> app/test-pmd/cmdline_flow.c
 	memcpy(header, &mpls, sizeof(mpls));
 	header += sizeof(mpls);
 	action_encap_data->conf.size = header -
@@ -4439,6 +4471,124 @@ error:
 	return -1;
 }
 
+<<<<<<< app/test-pmd/cmdline_flow.c
+=======
+static int
+parse_hex_string(const char *src, uint8_t *dst, uint32_t *size)
+{
+	char *c = NULL;
+	uint32_t i, len;
+	char tmp[3];
+
+	/* Check input parameters */
+	if ((src == NULL) ||
+		(dst == NULL) ||
+		(size == NULL) ||
+		(*size == 0))
+		return -1;
+
+	/* Convert chars to bytes */
+	for (i = 0, len = 0; i < *size; i += 2) {
+		snprintf(tmp, 3, "%s", src + i);
+		dst[len++] = strtoul(tmp, &c, 16);
+		if (*c != 0) {
+			len--;
+			dst[len] = 0;
+			*size = len;
+			return -1;
+		}
+	}
+	dst[len] = 0;
+	*size = len;
+
+	return 0;
+}
+
+static int
+parse_hex(struct context *ctx, const struct token *token,
+		const char *str, unsigned int len,
+		void *buf, unsigned int size)
+{
+	const struct arg *arg_data = pop_args(ctx);
+	const struct arg *arg_len = pop_args(ctx);
+	const struct arg *arg_addr = pop_args(ctx);
+	char tmp[16]; /* Ought to be enough. */
+	int ret;
+	unsigned int hexlen = len;
+	unsigned int length = 256;
+	uint8_t hex_tmp[length];
+
+	/* Arguments are expected. */
+	if (!arg_data)
+		return -1;
+	if (!arg_len) {
+		push_args(ctx, arg_data);
+		return -1;
+	}
+	if (!arg_addr) {
+		push_args(ctx, arg_len);
+		push_args(ctx, arg_data);
+		return -1;
+	}
+	size = arg_data->size;
+	/* Bit-mask fill is not supported. */
+	if (arg_data->mask)
+		goto error;
+	if (!ctx->object)
+		return len;
+
+	/* translate bytes string to array. */
+	if (str[0] == '0' && ((str[1] == 'x') ||
+			(str[1] == 'X'))) {
+		str += 2;
+		hexlen -= 2;
+	}
+	if (hexlen > length)
+		return -1;
+	ret = parse_hex_string(str, hex_tmp, &hexlen);
+	if (ret < 0)
+		goto error;
+	/* Let parse_int() fill length information first. */
+	ret = snprintf(tmp, sizeof(tmp), "%u", hexlen);
+	if (ret < 0)
+		goto error;
+	push_args(ctx, arg_len);
+	ret = parse_int(ctx, token, tmp, ret, NULL, 0);
+	if (ret < 0) {
+		pop_args(ctx);
+		goto error;
+	}
+	buf = (uint8_t *)ctx->object + arg_data->offset;
+	/* Output buffer is not necessarily NUL-terminated. */
+	memcpy(buf, hex_tmp, hexlen);
+	memset((uint8_t *)buf + hexlen, 0x00, size - hexlen);
+	if (ctx->objmask)
+		memset((uint8_t *)ctx->objmask + arg_data->offset,
+					0xff, hexlen);
+	/* Save address if requested. */
+	if (arg_addr->size) {
+		memcpy((uint8_t *)ctx->object + arg_addr->offset,
+		       (void *[]){
+			(uint8_t *)ctx->object + arg_data->offset
+		       },
+		       arg_addr->size);
+		if (ctx->objmask)
+			memcpy((uint8_t *)ctx->objmask + arg_addr->offset,
+			       (void *[]){
+				(uint8_t *)ctx->objmask + arg_data->offset
+			       },
+			       arg_addr->size);
+	}
+	return len;
+error:
+	push_args(ctx, arg_addr);
+	push_args(ctx, arg_len);
+	push_args(ctx, arg_data);
+	return -1;
+
+}
+
+>>>>>>> app/test-pmd/cmdline_flow.c
 /**
  * Parse a MAC address.
  *
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index 4c76348..1b9bf2a 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -1156,6 +1156,7 @@ struct cmd_add_port_tm_node_wred_profile_result {
 	uint16_t port_id;
 	uint32_t wred_profile_id;
 	cmdline_fixed_string_t color_g;
+<<<<<<< app/test-pmd/cmdline_tm.c
 	uint16_t min_th_g;
 	uint16_t max_th_g;
 	uint16_t maxp_inv_g;
@@ -1168,6 +1169,20 @@ struct cmd_add_port_tm_node_wred_profile_result {
 	cmdline_fixed_string_t color_r;
 	uint16_t min_th_r;
 	uint16_t max_th_r;
+=======
+	uint64_t min_th_g;
+	uint64_t max_th_g;
+	uint16_t maxp_inv_g;
+	uint16_t wq_log2_g;
+	cmdline_fixed_string_t color_y;
+	uint64_t min_th_y;
+	uint64_t max_th_y;
+	uint16_t maxp_inv_y;
+	uint16_t wq_log2_y;
+	cmdline_fixed_string_t color_r;
+	uint64_t min_th_r;
+	uint64_t max_th_r;
+>>>>>>> app/test-pmd/cmdline_tm.c
 	uint16_t maxp_inv_r;
 	uint16_t wq_log2_r;
 };
@@ -1206,11 +1221,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
+<<<<<<< app/test-pmd/cmdline_tm.c
 			min_th_g, UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
 			max_th_g, UINT16);
+=======
+			min_th_g, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_wred_profile_result,
+			max_th_g, UINT64);
+>>>>>>> app/test-pmd/cmdline_tm.c
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1226,11 +1249,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
+<<<<<<< app/test-pmd/cmdline_tm.c
 			min_th_y, UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
 			max_th_y, UINT16);
+=======
+			min_th_y, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_wred_profile_result,
+			max_th_y, UINT64);
+>>>>>>> app/test-pmd/cmdline_tm.c
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
@@ -1246,11 +1277,19 @@ cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
+<<<<<<< app/test-pmd/cmdline_tm.c
 			min_th_r, UINT16);
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
 			max_th_r, UINT16);
+=======
+			min_th_r, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_wred_profile_result,
+			max_th_r, UINT64);
+>>>>>>> app/test-pmd/cmdline_tm.c
 cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_wred_profile_result,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index b9e5dd9..93d5fb9 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2955,7 +2955,10 @@ vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id)
 void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
+<<<<<<< app/test-pmd/config.c
 	int vlan_offload;
+=======
+>>>>>>> app/test-pmd/config.c
 	struct rte_eth_dev_info dev_info;
 
 	if (port_id_is_invalid(port_id, ENABLED_WARN))
@@ -2963,8 +2966,13 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 	if (vlan_id_is_invalid(vlan_id))
 		return;
 
+<<<<<<< app/test-pmd/config.c
 	vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
 	if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD) {
+=======
+	if (ports[port_id].dev_conf.txmode.offloads &
+	    DEV_TX_OFFLOAD_QINQ_INSERT) {
+>>>>>>> app/test-pmd/config.c
 		printf("Error, as QinQ has been enabled.\n");
 		return;
 	}
@@ -2983,7 +2991,10 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 void
 tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 {
+<<<<<<< app/test-pmd/config.c
 	int vlan_offload;
+=======
+>>>>>>> app/test-pmd/config.c
 	struct rte_eth_dev_info dev_info;
 
 	if (port_id_is_invalid(port_id, ENABLED_WARN))
@@ -2993,11 +3004,14 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 	if (vlan_id_is_invalid(vlan_id_outer))
 		return;
 
+<<<<<<< app/test-pmd/config.c
 	vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
 	if (!(vlan_offload & ETH_VLAN_EXTEND_OFFLOAD)) {
 		printf("Error, as QinQ hasn't been enabled.\n");
 		return;
 	}
+=======
+>>>>>>> app/test-pmd/config.c
 	rte_eth_dev_info_get(port_id, &dev_info);
 	if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) == 0) {
 		printf("Error: qinq insert not supported by port %d\n",
@@ -3006,7 +3020,12 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 	}
 
 	tx_vlan_reset(port_id);
+<<<<<<< app/test-pmd/config.c
 	ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_QINQ_INSERT;
+=======
+	ports[port_id].dev_conf.txmode.offloads |= (DEV_TX_OFFLOAD_VLAN_INSERT |
+						    DEV_TX_OFFLOAD_QINQ_INSERT);
+>>>>>>> app/test-pmd/config.c
 	ports[port_id].tx_vlan_id = vlan_id;
 	ports[port_id].tx_vlan_id_outer = vlan_id_outer;
 }
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index ffeee20..9cb9b30 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -575,7 +575,11 @@ mbuf_copy_split(const struct rte_mbuf *ms, struct rte_mbuf *md[],
 
 /*
  * Allocate a new mbuf with up to tx_pkt_nb_segs segments.
+<<<<<<< app/test-pmd/csumonly.c
  * Copy packet contents and offload information into then new segmented mbuf.
+=======
+ * Copy packet contents and offload information into the new segmented mbuf.
+>>>>>>> app/test-pmd/csumonly.c
  */
 static struct rte_mbuf *
 pkt_copy_split(const struct rte_mbuf *pkt)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 4c75587..f42f1da 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -188,6 +188,11 @@ struct fwd_engine * fwd_engines[] = {
 	NULL,
 };
 
+<<<<<<< app/test-pmd/testpmd.c
+=======
+struct rte_mempool *mempools[RTE_MAX_NUMA_NODES];
+
+>>>>>>> app/test-pmd/testpmd.c
 struct fwd_config cur_fwd_config;
 struct fwd_engine *cur_fwd_eng = &io_fwd_engine; /**< IO mode by default. */
 uint32_t retry_enabled;
@@ -844,7 +849,11 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
 /*
  * Configuration initialisation done once at init time.
  */
+<<<<<<< app/test-pmd/testpmd.c
 static void
+=======
+static struct rte_mempool *
+>>>>>>> app/test-pmd/testpmd.c
 mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
 		 unsigned int socket_id)
 {
@@ -922,6 +931,10 @@ err:
 	} else if (verbose_level > 0) {
 		rte_mempool_dump(stdout, rte_mp);
 	}
+<<<<<<< app/test-pmd/testpmd.c
+=======
+	return rte_mp;
+>>>>>>> app/test-pmd/testpmd.c
 }
 
 /*
@@ -1139,6 +1152,7 @@ init_config(void)
 		uint8_t i;
 
 		for (i = 0; i < num_sockets; i++)
+<<<<<<< app/test-pmd/testpmd.c
 			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
 					 socket_ids[i]);
 	} else {
@@ -1147,6 +1161,20 @@ init_config(void)
 		else
 			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
 						 socket_num);
+=======
+			mempools[i] = mbuf_pool_create(mbuf_data_size,
+						       nb_mbuf_per_pool,
+						       socket_ids[i]);
+	} else {
+		if (socket_num == UMA_NO_CONFIG)
+			mempools[0] = mbuf_pool_create(mbuf_data_size,
+						       nb_mbuf_per_pool, 0);
+		else
+			mempools[socket_num] = mbuf_pool_create
+							(mbuf_data_size,
+							 nb_mbuf_per_pool,
+							 socket_num);
+>>>>>>> app/test-pmd/testpmd.c
 	}
 
 	init_port_config();
@@ -1388,7 +1416,11 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		printf("  RX-packets: %-14"PRIu64" RX-dropped: %-14"PRIu64"RX-total: "
 		       "%-"PRIu64"\n",
 		       stats->ipackets, stats->imissed,
+<<<<<<< app/test-pmd/testpmd.c
 		       (uint64_t) (stats->ipackets + stats->imissed));
+=======
+		       stats->ipackets + stats->imissed);
+>>>>>>> app/test-pmd/testpmd.c
 
 		if (cur_fwd_eng == &csum_fwd_engine)
 			printf("  Bad-ipcsum: %-14"PRIu64" Bad-l4csum: %-14"PRIu64"Bad-outer-l4csum: %-14"PRIu64"\n",
@@ -1402,13 +1434,21 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		printf("  TX-packets: %-14"PRIu64" TX-dropped: %-14"PRIu64"TX-total: "
 		       "%-"PRIu64"\n",
 		       stats->opackets, port->tx_dropped,
+<<<<<<< app/test-pmd/testpmd.c
 		       (uint64_t) (stats->opackets + port->tx_dropped));
+=======
+		       stats->opackets + port->tx_dropped);
+>>>>>>> app/test-pmd/testpmd.c
 	}
 	else {
 		printf("  RX-packets:             %14"PRIu64"    RX-dropped:%14"PRIu64"    RX-total:"
 		       "%14"PRIu64"\n",
 		       stats->ipackets, stats->imissed,
+<<<<<<< app/test-pmd/testpmd.c
 		       (uint64_t) (stats->ipackets + stats->imissed));
+=======
+		       stats->ipackets + stats->imissed);
+>>>>>>> app/test-pmd/testpmd.c
 
 		if (cur_fwd_eng == &csum_fwd_engine)
 			printf("  Bad-ipcsum:%14"PRIu64"    Bad-l4csum:%14"PRIu64"    Bad-outer-l4csum: %-14"PRIu64"\n",
@@ -1423,7 +1463,11 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
 		printf("  TX-packets:             %14"PRIu64"    TX-dropped:%14"PRIu64"    TX-total:"
 		       "%14"PRIu64"\n",
 		       stats->opackets, port->tx_dropped,
+<<<<<<< app/test-pmd/testpmd.c
 		       (uint64_t) (stats->opackets + port->tx_dropped));
+=======
+		       stats->opackets + port->tx_dropped);
+>>>>>>> app/test-pmd/testpmd.c
 	}
 
 #ifdef RTE_TEST_PMD_RECORD_BURST_STATS
@@ -1471,15 +1515,30 @@ fwd_stream_stats_display(streamid_t stream_id)
 	       "TX Port=%2d/Queue=%2d %s\n",
 	       fwd_top_stats_border, fs->rx_port, fs->rx_queue,
 	       fs->tx_port, fs->tx_queue, fwd_top_stats_border);
+<<<<<<< app/test-pmd/testpmd.c
 	printf("  RX-packets: %-14u TX-packets: %-14u TX-dropped: %-14u",
+=======
+	printf("  RX-packets: %-14"PRIu64" TX-packets: %-14"PRIu64
+	       " TX-dropped: %-14"PRIu64,
+>>>>>>> app/test-pmd/testpmd.c
 	       fs->rx_packets, fs->tx_packets, fs->fwd_dropped);
 
 	/* if checksum mode */
 	if (cur_fwd_eng == &csum_fwd_engine) {
+<<<<<<< app/test-pmd/testpmd.c
 	       printf("  RX- bad IP checksum: %-14u  Rx- bad L4 checksum: "
 			"%-14u Rx- bad outer L4 checksum: %-14u\n",
 			fs->rx_bad_ip_csum, fs->rx_bad_l4_csum,
 			fs->rx_bad_outer_l4_csum);
+=======
+		printf("  RX- bad IP checksum: %-14"PRIu64
+		       "  Rx- bad L4 checksum: %-14"PRIu64
+		       " Rx- bad outer L4 checksum: %-14"PRIu64"\n",
+			fs->rx_bad_ip_csum, fs->rx_bad_l4_csum,
+			fs->rx_bad_outer_l4_csum);
+	} else {
+		printf("\n");
+>>>>>>> app/test-pmd/testpmd.c
 	}
 
 #ifdef RTE_TEST_PMD_RECORD_BURST_STATS
@@ -1755,9 +1814,12 @@ stop_packet_forwarding(void)
 	uint64_t total_rx_dropped;
 	uint64_t total_tx_dropped;
 	uint64_t total_rx_nombuf;
+<<<<<<< app/test-pmd/testpmd.c
 	uint64_t tx_dropped;
 	uint64_t rx_bad_ip_csum;
 	uint64_t rx_bad_l4_csum;
+=======
+>>>>>>> app/test-pmd/testpmd.c
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
 	uint64_t fwd_cycles;
 #endif
@@ -1784,6 +1846,7 @@ stop_packet_forwarding(void)
 	fwd_cycles = 0;
 #endif
 	for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
+<<<<<<< app/test-pmd/testpmd.c
 		if (cur_fwd_config.nb_fwd_streams >
 		    cur_fwd_config.nb_fwd_ports) {
 			fwd_stream_stats_display(sm_id);
@@ -1816,6 +1879,24 @@ stop_packet_forwarding(void)
 
 		ports[fwd_streams[sm_id]->rx_port].rx_bad_outer_l4_csum +=
 				fwd_streams[sm_id]->rx_bad_outer_l4_csum;
+=======
+		struct fwd_stream *fs = fwd_streams[sm_id];
+
+		if (cur_fwd_config.nb_fwd_streams >
+		    cur_fwd_config.nb_fwd_ports) {
+			fwd_stream_stats_display(sm_id);
+			ports[fs->tx_port].tx_stream = NULL;
+			ports[fs->rx_port].rx_stream = NULL;
+		} else {
+			ports[fs->tx_port].tx_stream = fs;
+			ports[fs->rx_port].rx_stream = fs;
+		}
+		ports[fs->tx_port].tx_dropped += fs->fwd_dropped;
+		ports[fs->rx_port].rx_bad_ip_csum += fs->rx_bad_ip_csum;
+		ports[fs->rx_port].rx_bad_l4_csum += fs->rx_bad_l4_csum;
+		ports[fs->rx_port].rx_bad_outer_l4_csum +=
+				fs->rx_bad_outer_l4_csum;
+>>>>>>> app/test-pmd/testpmd.c
 
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
 		fwd_cycles = (uint64_t) (fwd_cycles +
@@ -2399,6 +2480,10 @@ pmd_test_exit(void)
 	struct rte_device *device;
 	portid_t pt_id;
 	int ret;
+<<<<<<< app/test-pmd/testpmd.c
+=======
+	int i;
+>>>>>>> app/test-pmd/testpmd.c
 
 	if (test_done == 0)
 		stop_packet_forwarding();
@@ -2406,9 +2491,19 @@ pmd_test_exit(void)
 	if (ports != NULL) {
 		no_link_check = 1;
 		RTE_ETH_FOREACH_DEV(pt_id) {
+<<<<<<< app/test-pmd/testpmd.c
 			printf("\nShutting down port %d...\n", pt_id);
 			fflush(stdout);
 			stop_port(pt_id);
+=======
+			printf("\nStopping port %d...\n", pt_id);
+			fflush(stdout);
+			stop_port(pt_id);
+		}
+		RTE_ETH_FOREACH_DEV(pt_id) {
+			printf("\nShutting down port %d...\n", pt_id);
+			fflush(stdout);
+>>>>>>> app/test-pmd/testpmd.c
 			close_port(pt_id);
 
 			/*
@@ -2448,6 +2543,13 @@ pmd_test_exit(void)
 			return;
 		}
 	}
+<<<<<<< app/test-pmd/testpmd.c
+=======
+	for (i = 0 ; i < RTE_MAX_NUMA_NODES ; i++) {
+		if (mempools[i])
+			rte_mempool_free(mempools[i]);
+	}
+>>>>>>> app/test-pmd/testpmd.c
 
 	printf("\nBye...\n");
 }
@@ -2961,8 +3063,14 @@ init_port_dcb_config(portid_t pid,
 	port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
 
 	/* re-configure the device . */
+<<<<<<< app/test-pmd/testpmd.c
 	rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
 
+=======
+	retval = rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
+	if (retval < 0)
+		return retval;
+>>>>>>> app/test-pmd/testpmd.c
 	rte_eth_dev_info_get(pid, &rte_port->dev_info);
 
 	/* If dev_info.vmdq_pool_base is greater than 0,
@@ -3054,6 +3162,11 @@ print_stats(void)
 	printf("\nPort statistics ====================================");
 	for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++)
 		nic_stats_display(fwd_ports_ids[i]);
+<<<<<<< app/test-pmd/testpmd.c
+=======
+
+	fflush(stdout);
+>>>>>>> app/test-pmd/testpmd.c
 }
 
 static void
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 3ff11e6..7478ad1 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -119,12 +119,21 @@ struct fwd_stream {
 	unsigned int retry_enabled;
 
 	/* "read-write" results */
+<<<<<<< app/test-pmd/testpmd.h
 	unsigned int rx_packets;  /**< received packets */
 	unsigned int tx_packets;  /**< received packets transmitted */
 	unsigned int fwd_dropped; /**< received packets not forwarded */
 	unsigned int rx_bad_ip_csum ; /**< received packets has bad ip checksum */
 	unsigned int rx_bad_l4_csum ; /**< received packets has bad l4 checksum */
 	unsigned int rx_bad_outer_l4_csum;
+=======
+	uint64_t rx_packets;  /**< received packets */
+	uint64_t tx_packets;  /**< received packets transmitted */
+	uint64_t fwd_dropped; /**< received packets not forwarded */
+	uint64_t rx_bad_ip_csum ; /**< received packets has bad ip checksum */
+	uint64_t rx_bad_l4_csum ; /**< received packets has bad l4 checksum */
+	uint64_t rx_bad_outer_l4_csum;
+>>>>>>> app/test-pmd/testpmd.h
 	/**< received packets has bad outer l4 checksum */
 	unsigned int gro_times;	/**< GRO operation times */
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
@@ -173,7 +182,10 @@ struct rte_port {
 	uint16_t                tunnel_tso_segsz; /**< Segmentation offload MSS for tunneled pkts. */
 	uint16_t                tx_vlan_id;/**< The tag ID */
 	uint16_t                tx_vlan_id_outer;/**< The outer tag ID */
+<<<<<<< app/test-pmd/testpmd.h
 	void                    *fwd_ctx;   /**< Forwarding mode context */
+=======
+>>>>>>> app/test-pmd/testpmd.h
 	uint64_t                rx_bad_ip_csum; /**< rx pkts with bad ip checksum  */
 	uint64_t                rx_bad_l4_csum; /**< rx pkts with bad l4 checksum */
 	uint64_t                rx_bad_outer_l4_csum;
diff --git a/buildtools/symlink-drivers-solibs.sh b/buildtools/symlink-drivers-solibs.sh
index 9826c6a..ad327c8 100644
--- a/buildtools/symlink-drivers-solibs.sh
+++ b/buildtools/symlink-drivers-solibs.sh
@@ -7,6 +7,13 @@
 # others, e.g. PCI device PMDs depending on the PCI bus driver.
 
 # parameters to script are paths relative to install prefix:
+<<<<<<< buildtools/symlink-drivers-solibs.sh
 # 1. directory containing driver files e.g. lib64/dpdk/drivers
 # 2. directory for installed regular libs e.g. lib64
 ln -rsf ${DESTDIR}/${MESON_INSTALL_PREFIX}/$1/* ${DESTDIR}/${MESON_INSTALL_PREFIX}/$2
+=======
+# 1. directory for installed regular libs e.g. lib64
+# 2. subdirectory of libdir where the pmds are
+
+cd ${MESON_INSTALL_DESTDIR_PREFIX}/$1 && ln -sfv $2/librte_*.so* .
+>>>>>>> buildtools/symlink-drivers-solibs.sh
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 3f91725..5f54667 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -6,6 +6,10 @@
 march_opt = '-march=@0@'.format(machine)
 
 arm_force_native_march = false
+<<<<<<< config/arm/meson.build
+=======
+arm_force_default_march = (machine == 'default')
+>>>>>>> config/arm/meson.build
 
 machine_args_generic = [
 	['default', ['-march=armv8-a+crc+crypto']],
@@ -47,6 +51,10 @@ flags_common_default = [
 flags_generic = [
 	['RTE_MACHINE', '"armv8a"'],
 	['RTE_MAX_LCORE', 256],
+<<<<<<< config/arm/meson.build
+=======
+	['RTE_USE_C11_MEM_MODEL', true],
+>>>>>>> config/arm/meson.build
 	['RTE_CACHE_LINE_SIZE', 128]]
 flags_cavium = [
 	['RTE_MACHINE', '"thunderx"'],
@@ -57,11 +65,19 @@ flags_cavium = [
 	['RTE_USE_C11_MEM_MODEL', false]]
 flags_dpaa = [
 	['RTE_MACHINE', '"dpaa"'],
+<<<<<<< config/arm/meson.build
+=======
+	['RTE_USE_C11_MEM_MODEL', true],
+>>>>>>> config/arm/meson.build
 	['RTE_CACHE_LINE_SIZE', 64],
 	['RTE_MAX_NUMA_NODES', 1],
 	['RTE_MAX_LCORE', 16]]
 flags_dpaa2 = [
 	['RTE_MACHINE', '"dpaa2"'],
+<<<<<<< config/arm/meson.build
+=======
+	['RTE_USE_C11_MEM_MODEL', true],
+>>>>>>> config/arm/meson.build
 	['RTE_CACHE_LINE_SIZE', 64],
 	['RTE_MAX_NUMA_NODES', 1],
 	['RTE_MAX_LCORE', 16],
@@ -102,7 +118,14 @@ else
 	cmd_generic = ['generic', '', '', 'default', '']
 	cmd_output = cmd_generic # Set generic by default
 	machine_args = [] # Clear previous machine args
+<<<<<<< config/arm/meson.build
 	if not meson.is_cross_build()
+=======
+	if arm_force_default_march and not meson.is_cross_build()
+		machine = impl_generic
+		impl_pn = 'default'
+	elif not meson.is_cross_build()
+>>>>>>> config/arm/meson.build
 		# The script returns ['Implementer', 'Variant', 'Architecture',
 		# 'Primary Part number', 'Revision']
 		detect_vendor = find_program(join_paths(
@@ -112,8 +135,13 @@ else
 			cmd_output = cmd.stdout().to_lower().strip().split(' ')
 		endif
 		# Set to generic if variable is not found
+<<<<<<< config/arm/meson.build
 		machine = get_variable('impl_' + cmd_output[0], 'generic')
 		if machine == 'generic'
+=======
+		machine = get_variable('impl_' + cmd_output[0], ['generic'])
+		if machine[0] == 'generic'
+>>>>>>> config/arm/meson.build
 			machine = impl_generic
 			cmd_output = cmd_generic
 		endif
diff --git a/config/meson.build b/config/meson.build
index db32499..c785912 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -1,6 +1,16 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
+<<<<<<< config/meson.build
+=======
+# driver .so files often depend upon the bus drivers for their connect bus,
+# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
+# to be in the library path, so symlink the drivers from the main lib directory.
+meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+		get_option('libdir'),
+		pmd_subdir_opt)
+
+>>>>>>> config/meson.build
 # set the machine type and cflags for it
 if meson.is_cross_build()
 	machine = host_machine.cpu()
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 33efb5e..10d0380 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -1,14 +1,33 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
+<<<<<<< config/x86/meson.build
 # for checking defines we need to use the correct compiler flags
 march_opt = '-march=@0@'.format(machine)
+=======
+# get binutils version for the workaround of Bug 97
+ldver = run_command('ld', '-v').stdout().strip()
+if ldver.contains('2.30')
+	if cc.has_argument('-mno-avx512f')
+		machine_args += '-mno-avx512f'
+		message('Binutils 2.30 detected, disabling AVX512 support as workaround for bug #97')
+	endif
+	if ldver.contains('2.31') and cc.has_argument('-mno-avx512f')
+		machine_args += '-mno-avx512f'
+		message('Binutils 2.31 detected, disabling AVX512 support as workaround for bug #249')
+	endif
+endif
+>>>>>>> config/x86/meson.build
 
 # we require SSE4.2 for DPDK
 sse_errormsg = '''SSE4.2 instruction set is required for DPDK.
 Please set the machine type to "nehalem" or "corei7" or higher value'''
 
+<<<<<<< config/x86/meson.build
 if cc.get_define('__SSE4_2__', args: march_opt) == ''
+=======
+if cc.get_define('__SSE4_2__', args: machine_args) == ''
+>>>>>>> config/x86/meson.build
 	error(sse_errormsg)
 endif
 
@@ -28,6 +47,7 @@ else
 	dpdk_conf.set('RTE_ARCH', 'i686')
 endif
 
+<<<<<<< config/x86/meson.build
 if cc.get_define('__AES__', args: march_opt) != ''
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_AES']
@@ -45,6 +65,25 @@ if cc.get_define('__AVX2__', args: march_opt) != ''
 	compile_time_cpuflags += ['RTE_CPUFLAG_AVX2']
 endif
 if cc.get_define('__AVX512F__', args: march_opt) != ''
+=======
+if cc.get_define('__AES__', args: machine_args) != ''
+	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AES', 1)
+	compile_time_cpuflags += ['RTE_CPUFLAG_AES']
+endif
+if cc.get_define('__PCLMUL__', args: machine_args) != ''
+	dpdk_conf.set('RTE_MACHINE_CPUFLAG_PCLMULQDQ', 1)
+	compile_time_cpuflags += ['RTE_CPUFLAG_PCLMULQDQ']
+endif
+if cc.get_define('__AVX__', args: machine_args) != ''
+	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX', 1)
+	compile_time_cpuflags += ['RTE_CPUFLAG_AVX']
+endif
+if cc.get_define('__AVX2__', args: machine_args) != ''
+	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX2', 1)
+	compile_time_cpuflags += ['RTE_CPUFLAG_AVX2']
+endif
+if cc.get_define('__AVX512F__', args: machine_args) != ''
+>>>>>>> config/x86/meson.build
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_AVX512F', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_AVX512F']
 endif
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..0bd9950
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,20 @@
+*.debhelper.log
+*.substvars
+*.postinst.debhelper
+*.postrm.debhelper
+*.prerm.debhelper
+*.dkms.debhelper
+build/
+control.modules
+debhelper-build-stamp
+dpdk-dev/
+dpdk-doc/
+dpdk-igb-uio-dkms/
+dpdk-modules-*/
+dpdk-rte-kni-dkms/
+dpdk/
+files
+libdpdk-dev/
+librte*/
+libethdev*/
+VERSION
diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
new file mode 100644
index 0000000..33c3a64
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff --git a/debian/README.source b/debian/README.source
index a21f5ee..1d22354 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -40,3 +40,33 @@ fi
 
 Open a new terminal or souce ~/.bashrc, and then you will be able to use
 dquilt.
+<<<<<<< debian/README.source
+=======
+
+***************
+
+After using Gerrit on FD.io (thanks!) for a while we converged on using salsa
+The main page is at https://salsa.debian.org/debian/dpdk
+
+Branches that we use:
+- sid                   - main development branch, uploads to unstable from here
+- experimental          - development if frozen, merged to sid on a new release
+- pristine-tar          - artifact of gbp import to recreate tarballs
+- upstream              - artifact of gbp import reflecting new versions
+                          upstream following mainline "master" releases
+                          e.g. 18.11 -> 19.02 -> 19.05 -> ...
+- upstream-XX.YY-stable - to keep updates linear stable releases like 18.11.2
+                          will go here, branched from XX.YY
+                          e.g. 17.11 -> 18.11 -> 19.11 -> ...
+- stretch*              - track updates/backports to stable Debian releases
+
+The majority of changes is co-maintained in Salsa directly.
+Uploads to existing Ubuntu releases are maintained in git Ubuntu [1]
+at https://git.launchpad.net/ubuntu/+source/dpdk
+
+There are branches per Ubuntu release which are forked off the Debian branch
+at the time. SRU [2] uploads follow the usual process based on these branches.
+
+[1]: https://ubuntu.com/blog/developing-ubuntu-using-git
+[2]: https://wiki.ubuntu.com/StableReleaseUpdates
+>>>>>>> debian/README.source
diff --git a/debian/changelog b/debian/changelog
index f146fc1..88ed729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,66 @@
+<<<<<<< debian/changelog
+=======
+dpdk (18.11.2-1ubuntu0.19.04.1) disco; urgency=medium
+
+  * Make DPDK LTS release available in Disco (LP: #1784816)
+    - includes a fix for mlx rdma-core dependencies (LP: #1820957)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 12 Jul 2019 14:35:59 +0200
+
+dpdk (18.11.2-1) experimental; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * Merge stable update to 18.11.2; For a list of changes see
+    http://doc.dpdk.org/guides-18.11/rel_notes/release_18_11.html#id1
+    - refresh 0004-build-bump-minimum-Meson-version-to-0.47.1.patch for 18.11.2
+    - drop changes upstream in 18.11.2
+      0002-build-use-generic-march-on-arm64-when-using-default.patch
+      lp-1827102-kni-fix-build-with-Linux-5.1.patch
+
+  [ Santiago Ruano Rincón ]
+  * debian/rules: clean doc files
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 04 Jul 2019 11:05:14 +0200
+
+dpdk (18.11.1-3) experimental; urgency=medium
+
+  * d/control: add dependencies to libdpdk-dev: libelf-dev and libjansson-dev
+    to avoid pkg-config issues
+  * d/control: drop unused build dependency to libcap-dev
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 08 May 2019 09:25:26 +0200
+
+dpdk (18.11.1-2) experimental; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * d/control: drop shlibs:Depends from dpdk as it has no binaries anymore
+  * d/p/lp-1827102-kni-fix-build-with-Linux-5.1.patch fix kni DKMS build with
+    Linux 5.1 kernels (LP: #1827102)
+
+  [ Luca Boccassi ]
+  * Bump Standards-Version to 4.3.0, no changes.
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 03 May 2019 15:08:25 +0200
+
+dpdk (18.11.1-1) experimental; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * Merge stable update to 18.11.1; For a list of changes see
+    https://doc.dpdk.org/guides-18.11/rel_notes/release_18_11.html
+    - refresh 0004-build-bump-minimum-Meson-version-to-0.47.1.patch for 18.11.1
+    - drop changes upstream in 18.11.1
+      0001-doc-fix-garbage-text-in-generated-HTML-guides.patch
+      0003-build-mention-march-in-pkg-config-description.patch
+      0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch
+      0002-kni-fix-build-for-igb_ndo_bridge_setlink-in-Linux-5..patch
+  * d/control: fix usability issue with mlx PMDs which might need rdma-core
+    to be installed. In most cases users will want this, to be able to
+    drop rdma-core if unwanted in some cases this is only a recommends added
+    to librte-pmd-mlx4-18.11 and librte-pmd-mlx5-18.11 (Closes: #925141)
+
+ -- Luca Boccassi <[e-mail]>  Tue, 16 Apr 2019 11:14:13 +0100
+
+>>>>>>> debian/changelog
 dpdk (18.11-6) unstable; urgency=medium
 
   [ Luca Boccassi ]
diff --git a/debian/control b/debian/control
index 833bf48..0628588 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,11 @@
 Source: dpdk
 Priority: optional
+<<<<<<< debian/control
 Maintainer: Debian DPDK Maintainers <[e-mail]>
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian DPDK Maintainers <[e-mail]>
+>>>>>>> debian/control
 Uploaders: Luca Boccassi <[e-mail]>,
            Christian Ehrhardt <[e-mail]>,
            Santiago Ruano Rincón <[e-mail]>,
@@ -11,7 +16,10 @@ Build-Depends: debhelper (>= 10.3~),
                graphviz <!nodoc>,
                inkscape <!nodoc>,
                libbsd-dev,
+<<<<<<< debian/control
                libcap-dev,
+=======
+>>>>>>> debian/control
                libelf-dev,
                libibverbs-dev (>= 16~),
                libipsec-mb-dev [amd64],
@@ -28,12 +36,21 @@ Build-Depends: debhelper (>= 10.3~),
                texlive-fonts-recommended <!nodoc>,
                texlive-latex-extra <!nodoc>,
                zlib1g-dev,
+<<<<<<< debian/control
 Standards-Version: 4.2.1
 Rules-Requires-Root: no
 Section: libs
 Homepage: https://www.dpdk.org
 Vcs-Git: https://gerrit.fd.io/r/deb_dpdk
 Vcs-Browser: https://gerrit.fd.io/r/gitweb?p=deb_dpdk.git
+=======
+Standards-Version: 4.3.0
+Rules-Requires-Root: no
+Section: libs
+Homepage: https://www.dpdk.org
+Vcs-Git: https://salsa.debian.org/debian/dpdk.git
+Vcs-Browser: https://salsa.debian.org/debian/dpdk
+>>>>>>> debian/control
 
 Package: dpdk
 Section: admin
@@ -43,7 +60,10 @@ Depends: hwdata,
          pciutils,
          ${misc:Depends},
          ${python3:Depends},
+<<<<<<< debian/control
          ${shlibs:Depends},
+=======
+>>>>>>> debian/control
 Recommends: librte-mempool18.11,
             librte-mempool-ring18.11,
             librte-pmd-af-packet18.11,
@@ -145,6 +165,11 @@ Pre-Depends: ${misc:Pre-Depends},
 Depends: libbsd-dev,
          libibverbs-dev,
          libipsec-mb-dev [amd64],
+<<<<<<< debian/control
+=======
+         libelf-dev,
+         libjansson-dev,
+>>>>>>> debian/control
          libmnl-dev,
          libnuma-dev,
          libpcap-dev,
@@ -1745,6 +1770,10 @@ Homepage: https://dpdk.org/doc/guides/nics/mlx4.html
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+<<<<<<< debian/control
+=======
+         rdma-core,
+>>>>>>> debian/control
 Conflicts: libdpdk0,
 Description: Data Plane Development Kit (librte-pmd-mlx4 runtime library)
  DPDK is a set of libraries for fast packet processing. Applications run
@@ -1759,6 +1788,10 @@ Homepage: https://dpdk.org/doc/guides/nics/mlx5.html
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+<<<<<<< debian/control
+=======
+         rdma-core,
+>>>>>>> debian/control
 Conflicts: libdpdk0,
 Description: Data Plane Development Kit (librte-pmd-mlx5 runtime library)
  DPDK is a set of libraries for fast packet processing. Applications run
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..d8a5db4
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = experimental
+upstream-branch = upstream-18.11-stable
+pristine-tar = True
+
+[dch]
+customizations=/usr/share/doc/git-buildpackage/examples/wrap_cl.py
diff --git a/debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch b/debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch
index 89cc6c4..25262c0 100644
--- a/debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch
+++ b/debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch
@@ -35,7 +35,11 @@ Origin: https://patches.dpdk.org/patch/49995/
 --- a/meson.build
 +++ b/meson.build
 @@ -5,7 +5,7 @@ project('DPDK', 'C',
+<<<<<<< debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch
  	version: '18.11.0',
+=======
+ 	version: '18.11.2',
+>>>>>>> debian/patches/0004-build-bump-minimum-Meson-version-to-0.47.1.patch
  	license: 'BSD',
  	default_options: ['buildtype=release', 'default_library=static'],
 -	meson_version: '>= 0.41'
diff --git a/debian/patches/series b/debian/patches/series
index 38b80db..ac6c141 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,15 @@
+<<<<<<< debian/patches/series
 0001-doc-fix-garbage-text-in-generated-HTML-guides.patch
 0002-build-use-generic-march-on-arm64-when-using-default.patch
 0003-build-mention-march-in-pkg-config-description.patch
+=======
+>>>>>>> debian/patches/series
 0004-build-bump-minimum-Meson-version-to-0.47.1.patch
 0005-build-use-dependency-instead-of-find_library.patch
 0006-build-reorder-libraries-and-build-eal-before-cmdline.patch
 0007-build-use-dependency-for-libbsd-instead-of-manual-ap.patch
+<<<<<<< debian/patches/series
 0001-kni-fix-build-for-dev_open-in-Linux-5.0.patch
 0002-kni-fix-build-for-igb_ndo_bridge_setlink-in-Linux-5..patch
+=======
+>>>>>>> debian/patches/series
diff --git a/debian/rules b/debian/rules
index 2d69b82..3a266cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,6 +107,16 @@ override_dh_auto_clean:
 		debian/control.modules debian/VERSION
 	sed -i '/Package: dpdk-modules-/,/`tail -n1 debian/control.modules.in`/d' debian/control
 	rm -f debian/dpdk-igb-uio-dkms.dkms debian/dpdk-rte-kni-dkms.dkms
+<<<<<<< debian/rules
+=======
+	rm -f doc/guides/compressdevs/overview_feature_table.txt \
+		doc/guides/cryptodevs/overview_aead_table.txt \
+		doc/guides/cryptodevs/overview_asym_table.txt \
+		doc/guides/cryptodevs/overview_auth_table.txt \
+		doc/guides/cryptodevs/overview_cipher_table.txt \
+		doc/guides/cryptodevs/overview_feature_table.txt \
+		doc/guides/nics/overview_table.txt
+>>>>>>> debian/rules
 	dh_auto_clean
 
 override_dh_auto_configure:
diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index 85d67fb..75b4aa5 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -90,9 +90,16 @@ bad=$(echo "$headlines" | grep -E --color=always \
 	-e ':.*\<[hsf]w\>' \
 	-e ':.*\<l[234]\>' \
 	-e ':.*\<api\>' \
+<<<<<<< devtools/check-git-log.sh
 	-e ':.*\<arm\>' \
 	-e ':.*\<armv7\>' \
 	-e ':.*\<armv8\>' \
+=======
+	-e ':.*\<ARM\>' \
+	-e ':.*\<(Aarch64|AArch64|AARCH64|Aarch32|AArch32|AARCH32)\>' \
+	-e ':.*\<(Armv7|ARMv7|ArmV7|armV7|ARMV7)\>' \
+	-e ':.*\<(Armv8|ARMv8|ArmV8|armV8|ARMV8)\>' \
+>>>>>>> devtools/check-git-log.sh
 	-e ':.*\<crc\>' \
 	-e ':.*\<dma\>' \
 	-e ':.*\<eeprom\>' \
diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 1d21e91..51f6f11 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -31,6 +31,10 @@ build_map_changes()
 		# Triggering this rule sets in_sec to 1, which actives the
 		# symbol rule below
 		/^.*{/ {
+<<<<<<< devtools/check-symbol-change.sh
+=======
+			gsub("+", "");
+>>>>>>> devtools/check-symbol-change.sh
 			if (in_map == 1) {
 				sec=$(NF-1); in_sec=1;
 			}
@@ -96,7 +100,11 @@ check_for_rule_violations()
 			then
 				# Just inform the user of this occurrence, but
 				# don't flag it as an error
+<<<<<<< devtools/check-symbol-change.sh
 				echo -n "INFO: symbol $syname is added but "
+=======
+				echo -n "INFO: symbol $symname is added but "
+>>>>>>> devtools/check-symbol-change.sh
 				echo -n "patch has insuficient context "
 				echo -n "to determine the section name "
 				echo -n "please ensure the version is "
@@ -104,6 +112,7 @@ check_for_rule_violations()
 				continue
 			fi
 
+<<<<<<< devtools/check-symbol-change.sh
 			if [ "$secname" != "EXPERIMENTAL" ]
 			then
 				# Symbols that are getting added in a section
@@ -124,6 +133,48 @@ check_for_rule_violations()
 		else
 
 			if [ "$secname" != "EXPERIMENTAL" ]
+=======
+			oldsecname=$(sed -n \
+			"s#$mname $symname \(.*\) del#\1#p" "$mapdb")
+
+			# A symbol can not enter a non experimental
+			# section directly
+			if [ -z "$oldsecname" ]
+			then
+				if [ "$secname" = 'EXPERIMENTAL' ]
+				then
+					echo -n "INFO: symbol $symname has "
+					echo -n "been added to the "
+					echo -n "EXPERIMENTAL section of the "
+					echo "version map"
+					continue
+				else
+					echo -n "ERROR: symbol $symname "
+					echo -n "is added in the $secname "
+					echo -n "section, but is expected to "
+					echo -n "be added in the EXPERIMENTAL "
+					echo "section of the version map"
+					ret=1
+					continue
+				fi
+			fi
+
+			# This symbol is moving between two sections (the
+			# original section is not experimental).
+			# This can be legit, just warn.
+			if [ "$oldsecname" != 'EXPERIMENTAL' ]
+			then
+				echo -n "INFO: symbol $symname is being "
+				echo -n "moved from $oldsecname to $secname. "
+				echo -n "Ensure that it has gone through the "
+				echo "deprecation process"
+				continue
+			fi
+		else
+
+			if ! grep -q "$mname $symname .* add" "$mapdb" && \
+			   [ "$secname" != "EXPERIMENTAL" ]
+>>>>>>> devtools/check-symbol-change.sh
 			then
 				# Just inform users that non-experimenal
 				# symbols need to go through a deprecation
diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index ee8debe..5803b63 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -44,6 +44,11 @@ print_usage () {
 }
 
 check_forbidden_additions() { # <patch>
+<<<<<<< devtools/checkpatches.sh
+=======
+	res=0
+
+>>>>>>> devtools/checkpatches.sh
 	# refrain from new additions of rte_panic() and rte_exit()
 	# multiple folders and expressions are separated by spaces
 	awk -v FOLDERS="lib drivers" \
@@ -51,7 +56,12 @@ check_forbidden_additions() { # <patch>
 		-v RET_ON_FAIL=1 \
 		-v MESSAGE='Using rte_panic/rte_exit' \
 		-f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
+<<<<<<< devtools/checkpatches.sh
 		"$1"
+=======
+		"$1" || res=1
+
+>>>>>>> devtools/checkpatches.sh
 	# svg figures must be included with wildcard extension
 	# because of png conversion for pdf docs
 	awk -v FOLDERS='doc' \
@@ -59,7 +69,13 @@ check_forbidden_additions() { # <patch>
 		-v RET_ON_FAIL=1 \
 		-v MESSAGE='Using explicit .svg extension instead of .*' \
 		-f $(dirname $(readlink -e $0))/check-forbidden-tokens.awk \
+<<<<<<< devtools/checkpatches.sh
 		"$1"
+=======
+		"$1" || res=1
+
+	return $res
+>>>>>>> devtools/checkpatches.sh
 }
 
 number=0
diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 42f4ad0..83a93bb 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -9,6 +9,10 @@ default_path=$PATH
 # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2)
 # - DPDK_DEP_ARCHIVE
 # - DPDK_DEP_CFLAGS
+<<<<<<< devtools/test-build.sh
+=======
+# - DPDK_DEP_ELF (y/[n])
+>>>>>>> devtools/test-build.sh
 # - DPDK_DEP_ISAL (y/[n])
 # - DPDK_DEP_JSON (y/[n])
 # - DPDK_DEP_LDFLAGS
@@ -96,6 +100,10 @@ reset_env ()
 	unset CROSS
 	unset DPDK_DEP_ARCHIVE
 	unset DPDK_DEP_CFLAGS
+<<<<<<< devtools/test-build.sh
+=======
+	unset DPDK_DEP_ELF
+>>>>>>> devtools/test-build.sh
 	unset DPDK_DEP_ISAL
 	unset DPDK_DEP_JSON
 	unset DPDK_DEP_LDFLAGS
@@ -148,7 +156,11 @@ config () # <directory> <target> <options>
 		test "$DPDK_DEP_ARCHIVE" != y || \
 		sed -ri       's,(RESOURCE_TAR=)n,\1y,' $1/.config
 		test "$DPDK_DEP_ISAL" != y || \
+<<<<<<< devtools/test-build.sh
 		sed -ri           's,(ISAL_PMD=)n,\1y,' $1/.config
+=======
+		sed -ri           's,(PMD_ISAL=)n,\1y,' $1/.config
+>>>>>>> devtools/test-build.sh
 		test "$DPDK_DEP_MLX" != y || \
 		sed -ri           's,(MLX._PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SZE" != y || \
@@ -156,6 +168,11 @@ config () # <directory> <target> <options>
 		test "$DPDK_DEP_ZLIB" != y || \
 		sed -ri          's,(BNX2X_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_ZLIB" != y || \
+<<<<<<< devtools/test-build.sh
+=======
+		sed -ri           's,(PMD_ZLIB=)n,\1y,' $1/.config
+		test "$DPDK_DEP_ZLIB" != y || \
+>>>>>>> devtools/test-build.sh
 		sed -ri   's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config
 		test "$DPDK_DEP_PCAP" != y || \
 		sed -ri               's,(PCAP=)n,\1y,' $1/.config
@@ -176,7 +193,11 @@ config () # <directory> <target> <options>
 		test "$DPDK_DEP_SSL" != y || \
 		sed -ri        's,(PMD_OPENSSL=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SSL" != y || \
+<<<<<<< devtools/test-build.sh
 		sed -ri            's,(PMD_QAT=)n,\1y,' $1/.config
+=======
+		sed -ri            's,(QAT_SYM=)n,\1y,' $1/.config
+>>>>>>> devtools/test-build.sh
 		test -z "$FLEXRAN_SDK" || \
 		sed -ri     's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config
 		sed -ri           's,(SCHED_.*=)n,\1y,' $1/.config
@@ -186,7 +207,13 @@ config () # <directory> <target> <options>
 		sed -ri          's,(MVPP2_PMD=)n,\1y,' $1/.config
 		test -z "$LIBMUSDK_PATH" || \
 		sed -ri         's,(MVNETA_PMD=)n,\1y,' $1/.config
+<<<<<<< devtools/test-build.sh
 		test -z "$DPDK_DEP_JSON" || \
+=======
+		test "$DPDK_DEP_ELF" != y || \
+		sed -ri            's,(BPF_ELF=)n,\1y,' $1/.config
+		test "$DPDK_DEP_JSON" != y || \
+>>>>>>> devtools/test-build.sh
 		sed -ri          's,(TELEMETRY=)n,\1y,' $1/.config
 		build_config_hook $1 $2 $3
 
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 79109b7..f031d8a 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -7,7 +7,11 @@
 # * if a build-directory already exists we assume it was properly configured
 # Run ninja after configuration is done.
 
+<<<<<<< devtools/test-meson-builds.sh
 srcdir=$(dirname $(readlink -m $0))/..
+=======
+srcdir=$(dirname $(readlink -f $0))/..
+>>>>>>> devtools/test-meson-builds.sh
 MESON=${MESON:-meson}
 use_shared="--default-library=shared"
 
@@ -24,7 +28,11 @@ build () # <directory> <meson options>
 {
 	builddir=$1
 	shift
+<<<<<<< devtools/test-meson-builds.sh
 	if [ ! -d "$builddir" ] ; then
+=======
+	if [ ! -f "$builddir/build.ninja" ] ; then
+>>>>>>> devtools/test-meson-builds.sh
 		options="--werror -Dexamples=all $*"
 		echo "$MESON $options $srcdir $builddir"
 		$MESON $options $srcdir $builddir
@@ -36,6 +44,10 @@ build () # <directory> <meson options>
 
 # shared and static linked builds with gcc and clang
 for c in gcc clang ; do
+<<<<<<< devtools/test-meson-builds.sh
+=======
+	command -v $c >/dev/null 2>&1 || continue
+>>>>>>> devtools/test-meson-builds.sh
 	for s in static shared ; do
 		export CC="ccache $c"
 		build build-$c-$s --default-library=$s
@@ -43,7 +55,16 @@ for c in gcc clang ; do
 done
 
 # test compilation with minimal x86 instruction set
+<<<<<<< devtools/test-meson-builds.sh
 build build-x86-default -Dmachine=nehalem $use_shared
+=======
+default_machine='nehalem'
+ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false)
+if [ "$ok" = "false" ] ; then
+	default_machine='corei7'
+fi
+build build-x86-default -Dmachine=$default_machine $use_shared
+>>>>>>> devtools/test-meson-builds.sh
 
 # enable cross compilation if gcc cross-compiler is found
 c=aarch64-linux-gnu-gcc
diff --git a/doc/guides/compressdevs/overview.rst b/doc/guides/compressdevs/overview.rst
index 70bbe82..07bdaa3 100644
--- a/doc/guides/compressdevs/overview.rst
+++ b/doc/guides/compressdevs/overview.rst
@@ -18,7 +18,11 @@ Supported Feature Flags
      without making any modifications to it (no compression done).
 
    - "OOP SGL In SGL Out" feature flag stands for
+<<<<<<< doc/guides/compressdevs/overview.rst
      "Out-of-place Scatter-gather list Input, Scatter-gater list Output",
+=======
+     "Out-of-place Scatter-gather list Input, Scatter-gather list Output",
+>>>>>>> doc/guides/compressdevs/overview.rst
      which means PMD supports different scatter-gather styled input and output buffers
      (i.e. both can consists of multiple segments).
 
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index c883306..3484984 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -9,6 +9,10 @@ from sphinx import __version__ as sphinx_version
 from sphinx.highlighting import PygmentsBridge
 from pygments.formatters.latex import LatexFormatter
 from os import listdir
+<<<<<<< doc/guides/conf.py
+=======
+from os import environ
+>>>>>>> doc/guides/conf.py
 from os.path import basename
 from os.path import dirname
 from os.path import join as path_join
@@ -37,7 +41,13 @@ html_add_permalinks = ""
 html_show_copyright = False
 highlight_language = 'none'
 
+<<<<<<< doc/guides/conf.py
 version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'])
+=======
+# If MAKEFLAGS is exported by the user, garbage text might end up in version
+version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'],
+                                  env=dict(environ, MAKEFLAGS=""))
+>>>>>>> doc/guides/conf.py
 version = version.decode('utf-8').rstrip()
 release = version
 
@@ -388,6 +398,14 @@ def setup(app):
                             'AEAD',
                             'AEAD algorithms in crypto drivers',
                             'AEAD algorithm')
+<<<<<<< doc/guides/conf.py
+=======
+    table_file = dirname(__file__) + '/cryptodevs/overview_asym_table.txt'
+    generate_overview_table(table_file, 5,
+                            'Asymmetric',
+                            'Asymmetric algorithms in crypto drivers',
+                            'Asymmetric algorithm')
+>>>>>>> doc/guides/conf.py
     table_file = dirname(__file__) + '/compressdevs/overview_feature_table.txt'
     generate_overview_table(table_file, 1,
                             'Features',
diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst
index d96698a..517c5c3 100644
--- a/doc/guides/contributing/coding_style.rst
+++ b/doc/guides/contributing/coding_style.rst
@@ -825,10 +825,17 @@ format.
 .. code-block:: python
 
 	sources = files('file1.c', ...)
+<<<<<<< doc/guides/contributing/coding_style.rst
 	headers = files('file1.c', ...)
 
 
 The will build based on a number of conventions and assumptions within the DPDK
+=======
+	headers = files('file1.h', ...)
+
+
+This will build based on a number of conventions and assumptions within the DPDK
+>>>>>>> doc/guides/contributing/coding_style.rst
 itself, for example, that the library name is the same as the directory name in
 which the files are stored.
 
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index c28a95c..af59be8 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -40,14 +40,22 @@ The main directories that contain files related to documentation are shown below
        |-- ...
 
 
+<<<<<<< doc/guides/contributing/documentation.rst
 The API documentation is built from `Doxygen <http://www.stack.nl/~dimitri/doxygen/>`_ comments in the header files.
+=======
+The API documentation is built from `Doxygen <http://www.doxygen.nl>`_ comments in the header files.
+>>>>>>> doc/guides/contributing/documentation.rst
 These files are mainly in the ``lib/librte_*`` directories although some of the Poll Mode Drivers in ``drivers/net``
 are also documented with Doxygen.
 
 The configuration files that are used to control the Doxygen output are in the ``doc/api`` directory.
 
 The user guides such as *The Programmers Guide* and the *FreeBSD* and *Linux Getting Started* Guides are generated
+<<<<<<< doc/guides/contributing/documentation.rst
 from RST markup text files using the `Sphinx <http://sphinx-doc.org/index.html>`_ Documentation Generator.
+=======
+from RST markup text files using the `Sphinx <http://sphinx-doc.org>`_ Documentation Generator.
+>>>>>>> doc/guides/contributing/documentation.rst
 
 These files are included in the ``doc/guides/`` directory.
 The output is controlled by the ``doc/guides/conf.py`` file.
@@ -174,7 +182,12 @@ For full support with figure and table captioning the latest version of Sphinx c
    sudo pip install --upgrade sphinx
    sudo pip install --upgrade sphinx_rtd_theme
 
+<<<<<<< doc/guides/contributing/documentation.rst
 For further information on getting started with Sphinx see the `Sphinx Tutorial <http://sphinx-doc.org/tutorial.html>`_.
+=======
+For further information on getting started with Sphinx see the
+`Sphinx Getting Started <http://www.sphinx-doc.org/en/master/usage/quickstart.html>`_.
+>>>>>>> doc/guides/contributing/documentation.rst
 
 .. Note::
 
@@ -204,6 +217,22 @@ The main required packages can be installed as follows:
    # Red Hat/Fedora, selective install.
    sudo dnf     -y install texlive-collection-latexextra
 
+<<<<<<< doc/guides/contributing/documentation.rst
+=======
+`Latexmk <http://personal.psu.edu/jcc8/software/latexmk-jcc/>`_ is a perl script
+for running LaTeX for resolving cross references,
+and it also runs auxiliary programs like bibtex, makeindex if necessary, and dvips.
+It has also a number of other useful capabilities (see man 1 latexmk).
+
+.. code-block:: console
+
+   # Ubuntu/Debian.
+   sudo apt-get -y install latexmk
+
+   # Red Hat/Fedora.
+   sudo dnf     -y install latexmk
+
+>>>>>>> doc/guides/contributing/documentation.rst
 
 Build commands
 ~~~~~~~~~~~~~~
@@ -583,7 +612,11 @@ Doxygen Guidelines
 
 The DPDK API is documented using Doxygen comment annotations in the header files.
 Doxygen is a very powerful tool, it is extremely configurable and with a little effort can be used to create expressive documents.
+<<<<<<< doc/guides/contributing/documentation.rst
 See the `Doxygen website <http://www.stack.nl/~dimitri/doxygen/>`_ for full details on how to use it.
+=======
+See the `Doxygen website <http://www.doxygen.nl>`_ for full details on how to use it.
+>>>>>>> doc/guides/contributing/documentation.rst
 
 The following are some guidelines for use of Doxygen in the DPDK API documentation:
 
diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index a64bb03..4d0ccef 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -8,7 +8,11 @@ Contributing Code to DPDK
 
 This document outlines the guidelines for submitting code to DPDK.
 
+<<<<<<< doc/guides/contributing/patches.rst
 The DPDK development process is modelled (loosely) on the Linux Kernel development model so it is worth reading the
+=======
+The DPDK development process is modeled (loosely) on the Linux Kernel development model so it is worth reading the
+>>>>>>> doc/guides/contributing/patches.rst
 Linux kernel guide on submitting patches:
 `How to Get Your Change Into the Linux Kernel <https://www.kernel.org/doc/html/latest/process/submitting-patches.html>`_.
 The rationale for many of the DPDK guidelines is explained in greater detail in the kernel guidelines.
@@ -32,6 +36,13 @@ The mailing list for DPDK development is `[e-mail] <http://mails.dpdk.org/ar
 Contributors will need to `register for the mailing list <http://mails.dpdk.org/listinfo/dev>`_ in order to submit patches.
 It is also worth registering for the DPDK `Patchwork <http://patches.dpdk.org/project/dpdk/list/>`_
 
+<<<<<<< doc/guides/contributing/patches.rst
+=======
+If you are using the GitHub service, you can link your repository to
+the ``travis-ci.org`` build service.  When you push patches to your GitHub
+repository, the travis service will automatically build your changes.
+
+>>>>>>> doc/guides/contributing/patches.rst
 The development process requires some familiarity with the ``git`` version control system.
 Refer to the `Pro Git Book <http://www.git-scm.com/book/>`_ for further information.
 
diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst
index 01b3624..23965d7 100644
--- a/doc/guides/contributing/versioning.rst
+++ b/doc/guides/contributing/versioning.rst
@@ -548,15 +548,24 @@ utilities which can be installed via a package manager. For example::
 
 The syntax of the ``validate-abi.sh`` utility is::
 
+<<<<<<< doc/guides/contributing/versioning.rst
    ./devtools/validate-abi.sh <REV1> <REV2> <TARGET>
 
 Where ``REV1`` and ``REV2`` are valid gitrevisions(7)
 https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
 on the local repo and target is the usual DPDK compilation target.
+=======
+   ./devtools/validate-abi.sh <REV1> <REV2>
+
+Where ``REV1`` and ``REV2`` are valid gitrevisions(7)
+https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
+on the local repo.
+>>>>>>> doc/guides/contributing/versioning.rst
 
 For example::
 
    # Check between the previous and latest commit:
+<<<<<<< doc/guides/contributing/versioning.rst
    ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linuxapp-gcc
 
    # Check between two tags:
@@ -571,3 +580,22 @@ compile both tags) it will create compatibility reports in the
 follows::
 
   grep -lr Incompatible compat_reports/
+=======
+   ./devtools/validate-abi.sh HEAD~1 HEAD
+
+   # Check on a specific compilation target:
+   ./devtools/validate-abi.sh -t x86_64-native-linux-gcc HEAD~1 HEAD
+
+   # Check between two tags:
+   ./devtools/validate-abi.sh v2.0.0 v2.1.0
+
+   # Check between git master and local topic-branch "vhost-hacking":
+   ./devtools/validate-abi.sh master vhost-hacking
+
+After the validation script completes (it can take a while since it need to
+compile both tags) it will create compatibility reports in the
+``./abi-check/compat_report`` directory. Listed incompatibilities can be found
+as follows::
+
+  grep -lr Incompatible abi-check/compat_reports/
+>>>>>>> doc/guides/contributing/versioning.rst
diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst
index 63e060d..3818e52 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -1,5 +1,9 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
+<<<<<<< doc/guides/cryptodevs/aesni_mb.rst
     Copyright(c) 2015-2017 Intel Corporation.
+=======
+    Copyright(c) 2015-2018 Intel Corporation.
+>>>>>>> doc/guides/cryptodevs/aesni_mb.rst
 
 AESN-NI Multi Buffer Crypto Poll Mode Driver
 ============================================
@@ -51,6 +55,11 @@ Limitations
 
 * Chained mbufs are not supported.
 * Only in-place is currently supported (destination address is the same as source address).
+<<<<<<< doc/guides/cryptodevs/aesni_mb.rst
+=======
+* RTE_CRYPTO_AEAD_AES_GCM only works properly when the multi-buffer library is
+  0.51.0 or newer.
+>>>>>>> doc/guides/cryptodevs/aesni_mb.rst
 
 
 Installation
@@ -59,8 +68,13 @@ Installation
 To build DPDK with the AESNI_MB_PMD the user is required to download the multi-buffer
 library from `here <https://github.com/01org/intel-ipsec-mb>`_
 and compile it on their user system before building DPDK.
+<<<<<<< doc/guides/cryptodevs/aesni_mb.rst
 The latest version of the library supported by this PMD is v0.50, which
 can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.50.zip>`_.
+=======
+The latest version of the library supported by this PMD is v0.51, which
+can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.51.zip>`.
+>>>>>>> doc/guides/cryptodevs/aesni_mb.rst
 
 .. code-block:: console
 
@@ -123,7 +137,11 @@ Extra notes
 For AES Counter mode (AES-CTR), the library supports two different sizes for Initialization
 Vector (IV):
 
+<<<<<<< doc/guides/cryptodevs/aesni_mb.rst
 * 12 bytes: used mainly for IPSec, as it requires 12 bytes from the user, which internally
+=======
+* 12 bytes: used mainly for IPsec, as it requires 12 bytes from the user, which internally
+>>>>>>> doc/guides/cryptodevs/aesni_mb.rst
   are appended the counter block (4 bytes), which is set to 1 for the first block
   (no padding required from the user)
 
diff --git a/doc/guides/cryptodevs/features/aesni_gcm.ini b/doc/guides/cryptodevs/features/aesni_gcm.ini
index b9e9c90..d213eed 100644
--- a/doc/guides/cryptodevs/features/aesni_gcm.ini
+++ b/doc/guides/cryptodevs/features/aesni_gcm.ini
@@ -30,3 +30,11 @@ AES GMAC = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/aesni_gcm.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'aesni_gcm' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/aesni_gcm.ini
diff --git a/doc/guides/cryptodevs/features/aesni_mb.ini b/doc/guides/cryptodevs/features/aesni_mb.ini
index f729574..b6939bd 100644
--- a/doc/guides/cryptodevs/features/aesni_mb.ini
+++ b/doc/guides/cryptodevs/features/aesni_mb.ini
@@ -32,6 +32,7 @@ DES DOCSIS BPI = Y
 ;
 [Auth]
 MD5 HMAC     = Y
+<<<<<<< doc/guides/cryptodevs/features/aesni_mb.ini
 SHA1 HMAC    = Y
 SHA224 HMAC  = Y
 SHA256 HMAC  = Y
@@ -39,9 +40,35 @@ SHA384 HMAC  = Y
 SHA512 HMAC  = Y
 AES XCBC MAC = Y
 AES CMAC (128)  = Y
+=======
+SHA1         = Y
+SHA1 HMAC    = Y
+SHA224       = Y
+SHA224 HMAC  = Y
+SHA256       = Y
+SHA256 HMAC  = Y
+SHA384       = Y
+SHA384 HMAC  = Y
+SHA512       = Y
+SHA512 HMAC  = Y
+AES XCBC MAC = Y
+AES CMAC (128)  = Y
+AES GMAC     = Y
+>>>>>>> doc/guides/cryptodevs/features/aesni_mb.ini
 
 ;
 ; Supported AEAD algorithms of the 'aesni_mb' crypto driver.
 ;
 [AEAD]
 AES CCM (128) = Y
+<<<<<<< doc/guides/cryptodevs/features/aesni_mb.ini
+=======
+AES GCM (128) = Y
+AES GCM (192) = Y
+AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'aesni_mb' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/aesni_mb.ini
diff --git a/doc/guides/cryptodevs/features/armv8.ini b/doc/guides/cryptodevs/features/armv8.ini
index 1e10477..28b32d1 100644
--- a/doc/guides/cryptodevs/features/armv8.ini
+++ b/doc/guides/cryptodevs/features/armv8.ini
@@ -26,3 +26,11 @@ SHA256 HMAC  = Y
 ; Supported AEAD algorithms of the 'armv8' crypto driver.
 ;
 [AEAD]
+<<<<<<< doc/guides/cryptodevs/features/armv8.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'armv8' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/armv8.ini
diff --git a/doc/guides/cryptodevs/features/caam_jr.ini b/doc/guides/cryptodevs/features/caam_jr.ini
index 68f8d81..9fe6353 100644
--- a/doc/guides/cryptodevs/features/caam_jr.ini
+++ b/doc/guides/cryptodevs/features/caam_jr.ini
@@ -44,3 +44,11 @@ SHA512 HMAC  = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/caam_jr.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'dpaa2_sec' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/caam_jr.ini
diff --git a/doc/guides/cryptodevs/features/ccp.ini b/doc/guides/cryptodevs/features/ccp.ini
index 4722e13..88145a1 100644
--- a/doc/guides/cryptodevs/features/ccp.ini
+++ b/doc/guides/cryptodevs/features/ccp.ini
@@ -57,3 +57,11 @@ SHA3_512 HMAC   = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/ccp.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'ccp' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/ccp.ini
diff --git a/doc/guides/cryptodevs/features/default.ini b/doc/guides/cryptodevs/features/default.ini
index 810da0d..7e6f797 100644
--- a/doc/guides/cryptodevs/features/default.ini
+++ b/doc/guides/cryptodevs/features/default.ini
@@ -95,3 +95,15 @@ AES GCM (256) =
 AES CCM (128) =
 AES CCM (192) =
 AES CCM (256) =
+<<<<<<< doc/guides/cryptodevs/features/default.ini
+=======
+;
+; Supported Asymmetric algorithms of a default crypto driver.
+;
+[Asymmetric]
+RSA =
+DSA =
+Modular Exponentiation =
+Modular Inversion =
+Diffie-hellman =
+>>>>>>> doc/guides/cryptodevs/features/default.ini
diff --git a/doc/guides/cryptodevs/features/dpaa2_sec.ini b/doc/guides/cryptodevs/features/dpaa2_sec.ini
index 69700df..ca8df2d 100644
--- a/doc/guides/cryptodevs/features/dpaa2_sec.ini
+++ b/doc/guides/cryptodevs/features/dpaa2_sec.ini
@@ -44,3 +44,11 @@ SHA512 HMAC  = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/dpaa2_sec.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'dpaa2_sec' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/dpaa2_sec.ini
diff --git a/doc/guides/cryptodevs/features/dpaa_sec.ini b/doc/guides/cryptodevs/features/dpaa_sec.ini
index 937b621..15ec61c 100644
--- a/doc/guides/cryptodevs/features/dpaa_sec.ini
+++ b/doc/guides/cryptodevs/features/dpaa_sec.ini
@@ -44,3 +44,11 @@ SHA512 HMAC  = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/dpaa_sec.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'dpaa_sec' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/dpaa_sec.ini
diff --git a/doc/guides/cryptodevs/features/kasumi.ini b/doc/guides/cryptodevs/features/kasumi.ini
index 0e138f5..bceb571 100644
--- a/doc/guides/cryptodevs/features/kasumi.ini
+++ b/doc/guides/cryptodevs/features/kasumi.ini
@@ -22,3 +22,11 @@ KASUMI F9 = Y
 ; Supported AEAD algorithms of the 'kasumi' crypto driver.
 ;
 [AEAD]
+<<<<<<< doc/guides/cryptodevs/features/kasumi.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'kasumi' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/kasumi.ini
diff --git a/doc/guides/cryptodevs/features/mvsam.ini b/doc/guides/cryptodevs/features/mvsam.ini
index 0cc90a5..c084308 100644
--- a/doc/guides/cryptodevs/features/mvsam.ini
+++ b/doc/guides/cryptodevs/features/mvsam.ini
@@ -52,3 +52,11 @@ AES GMAC     = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/mvsam.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'mvsam' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/mvsam.ini
diff --git a/doc/guides/cryptodevs/features/null.ini b/doc/guides/cryptodevs/features/null.ini
index ecf5779..80dcef5 100644
--- a/doc/guides/cryptodevs/features/null.ini
+++ b/doc/guides/cryptodevs/features/null.ini
@@ -24,3 +24,11 @@ NULL = Y
 ; Supported AEAD algorithms of the 'null' crypto driver.
 ;
 [AEAD]
+<<<<<<< doc/guides/cryptodevs/features/null.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'null' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/null.ini
diff --git a/doc/guides/cryptodevs/features/octeontx.ini b/doc/guides/cryptodevs/features/octeontx.ini
index 307ab88..8246530 100644
--- a/doc/guides/cryptodevs/features/octeontx.ini
+++ b/doc/guides/cryptodevs/features/octeontx.ini
@@ -60,3 +60,11 @@ ZUC EIA3     = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/octeontx.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'octeontx' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/octeontx.ini
diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini
index 4f15ee0..a59dd18 100644
--- a/doc/guides/cryptodevs/features/qat.ini
+++ b/doc/guides/cryptodevs/features/qat.ini
@@ -60,3 +60,11 @@ AES GCM (256) = Y
 AES CCM (128) = Y
 AES CCM (192) = Y
 AES CCM (256) = Y
+<<<<<<< doc/guides/cryptodevs/features/qat.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'qat' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/qat.ini
diff --git a/doc/guides/cryptodevs/features/snow3g.ini b/doc/guides/cryptodevs/features/snow3g.ini
index 2771361..87123f4 100644
--- a/doc/guides/cryptodevs/features/snow3g.ini
+++ b/doc/guides/cryptodevs/features/snow3g.ini
@@ -22,3 +22,11 @@ SNOW3G UIA2 = Y
 ; Supported AEAD algorithms of the 'snow3g' crypto driver.
 ;
 [AEAD]
+<<<<<<< doc/guides/cryptodevs/features/snow3g.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'snow3g' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/snow3g.ini
diff --git a/doc/guides/cryptodevs/features/virtio.ini b/doc/guides/cryptodevs/features/virtio.ini
index 168fc17..d47b4ec 100644
--- a/doc/guides/cryptodevs/features/virtio.ini
+++ b/doc/guides/cryptodevs/features/virtio.ini
@@ -24,3 +24,11 @@ SHA1 HMAC      = Y
 ; Supported AEAD algorithms of the 'virtio' crypto driver.
 ;
 [AEAD]
+<<<<<<< doc/guides/cryptodevs/features/virtio.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'virtio' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/virtio.ini
diff --git a/doc/guides/cryptodevs/features/zuc.ini b/doc/guides/cryptodevs/features/zuc.ini
index 5bb02af..b747eff 100644
--- a/doc/guides/cryptodevs/features/zuc.ini
+++ b/doc/guides/cryptodevs/features/zuc.ini
@@ -22,3 +22,11 @@ ZUC EIA3 = Y
 ; Supported AEAD algorithms of the 'zuc' crypto driver.
 ;
 [AEAD]
+<<<<<<< doc/guides/cryptodevs/features/zuc.ini
+=======
+
+;
+; Supported Asymmetric algorithms of the 'zuc' crypto driver.
+;
+[Asymmetric]
+>>>>>>> doc/guides/cryptodevs/features/zuc.ini
diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst
index bdc30f6..3e7cbbc 100644
--- a/doc/guides/cryptodevs/openssl.rst
+++ b/doc/guides/cryptodevs/openssl.rst
@@ -46,6 +46,17 @@ Supported AEAD algorithms:
 * ``RTE_CRYPTO_AEAD_AES_GCM``
 * ``RTE_CRYPTO_AEAD_AES_CCM``
 
+<<<<<<< doc/guides/cryptodevs/openssl.rst
+=======
+Supported Asymmetric Crypto algorithms:
+
+* ``RTE_CRYPTO_ASYM_XFORM_RSA``
+* ``RTE_CRYPTO_ASYM_XFORM_DSA``
+* ``RTE_CRYPTO_ASYM_XFORM_DH``
+* ``RTE_CRYPTO_ASYM_XFORM_MODINV``
+* ``RTE_CRYPTO_ASYM_XFORM_MODEX``
+
+>>>>>>> doc/guides/cryptodevs/openssl.rst
 
 Installation
 ------------
diff --git a/doc/guides/cryptodevs/overview.rst b/doc/guides/cryptodevs/overview.rst
index 607e758..51444a4 100644
--- a/doc/guides/cryptodevs/overview.rst
+++ b/doc/guides/cryptodevs/overview.rst
@@ -18,7 +18,11 @@ Supported Feature Flags
      being the operation in-place (input address = output address).
 
    - "OOP SGL In SGL Out" feature flag stands for
+<<<<<<< doc/guides/cryptodevs/overview.rst
      "Out-of-place Scatter-gather list Input, Scatter-gater list Output",
+=======
+     "Out-of-place Scatter-gather list Input, Scatter-gather list Output",
+>>>>>>> doc/guides/cryptodevs/overview.rst
      which means pmd supports different scatter-gather styled input and output buffers
      (i.e. both can consists of multiple segments).
 
@@ -58,3 +62,13 @@ Supported AEAD Algorithms
 .. _table_crypto_pmd_aead_algos:
 
 .. include:: overview_aead_table.txt
+<<<<<<< doc/guides/cryptodevs/overview.rst
+=======
+
+Supported Asymmetric Algorithms
+-------------------------------
+
+.. _table_crypto_pmd_asym_algos:
+
+.. include:: overview_asym_table.txt
+>>>>>>> doc/guides/cryptodevs/overview.rst
diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index 9fb9f01..211e8a1 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -79,10 +79,16 @@ Limitations
 * SNOW 3G (UIA2) and ZUC (EIA3) supported only if hash length and offset fields are byte-multiple.
 * No BSD support as BSD QAT kernel driver not available.
 * ZUC EEA3/EIA3 is not supported by dh895xcc devices
+<<<<<<< doc/guides/cryptodevs/qat.rst
 * Maximum additional authenticated data (AAD) for GCM is 240 bytes long.
 * Queue pairs are not thread-safe (that is, within a single queue pair, RX and TX from different lcores is not supported).
 
 
+=======
+* Maximum additional authenticated data (AAD) for GCM is 240 bytes long and must be passed to the device in a buffer rounded up to the nearest block-size multiple (x16) and padded with zeros.
+* Queue pairs are not thread-safe (that is, within a single queue pair, RX and TX from different lcores is not supported).
+
+>>>>>>> doc/guides/cryptodevs/qat.rst
 Extra notes on KASUMI F9
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/doc/guides/cryptodevs/scheduler.rst b/doc/guides/cryptodevs/scheduler.rst
index a754a27..bae6932 100644
--- a/doc/guides/cryptodevs/scheduler.rst
+++ b/doc/guides/cryptodevs/scheduler.rst
@@ -165,7 +165,11 @@ operation:
    For pure small packet size (64 bytes) traffic however the multi-core mode is not
    an optimal solution, as it doesn't give significant per-core performance improvement.
    For mixed traffic (IMIX) the optimal number of worker cores is around 2-3.
+<<<<<<< doc/guides/cryptodevs/scheduler.rst
    For large packets (1.5 Kbytes) scheduler shows linear scaling in performance
+=======
+   For large packets (1.5 kbytes) scheduler shows linear scaling in performance
+>>>>>>> doc/guides/cryptodevs/scheduler.rst
    up to eight cores.
    Each worker uses its own slave cryptodev. Only software cryptodevs
    are supported. Only the same type of cryptodevs should be used concurrently.
diff --git a/doc/guides/eventdevs/opdl.rst b/doc/guides/eventdevs/opdl.rst
index 0262a33..f74d96e 100644
--- a/doc/guides/eventdevs/opdl.rst
+++ b/doc/guides/eventdevs/opdl.rst
@@ -8,7 +8,11 @@ The OPDL (Ordered Packet Distribution Library) eventdev is a specific\
 implementation of the eventdev API. It is particularly suited to packet\
 processing workloads that have high throughput and low latency requirements.\
 All packets follow the same path through the device. The order in which\
+<<<<<<< doc/guides/eventdevs/opdl.rst
 packets  follow is determinted by the order in which queues are set up.\
+=======
+packets  follow is determined by the order in which queues are set up.\
+>>>>>>> doc/guides/eventdevs/opdl.rst
 Events are left on the ring until they are transmitted. As a result packets\
 do not go out of order
 
diff --git a/doc/guides/eventdevs/sw.rst b/doc/guides/eventdevs/sw.rst
index afdcad7..16850e6 100644
--- a/doc/guides/eventdevs/sw.rst
+++ b/doc/guides/eventdevs/sw.rst
@@ -70,7 +70,11 @@ Credit Quanta
 The credit quanta is the number of credits that a port will fetch at a time from
 the instance's credit pool. Higher numbers will cause less overhead in the
 atomic credit fetch code, however it also reduces the overall number of credits
+<<<<<<< doc/guides/eventdevs/sw.rst
 in the system faster. A balanced number (eg 32) ensures that only small numbers
+=======
+in the system faster. A balanced number (e.g. 32) ensures that only small numbers
+>>>>>>> doc/guides/eventdevs/sw.rst
 of credits are pre-allocated at a time, while also mitigating performance impact
 of the atomics.
 
@@ -100,7 +104,11 @@ feature would be significant.
 ~~~~~~~~~~~~~~~~~~
 
 The software eventdev does not support creating queues that handle all types of
+<<<<<<< doc/guides/eventdevs/sw.rst
 traffic. An eventdev with this capability allows enqueueing Atomic, Ordered and
+=======
+traffic. An eventdev with this capability allows enqueuing Atomic, Ordered and
+>>>>>>> doc/guides/eventdevs/sw.rst
 Parallel traffic to the same queue, but scheduling each of them appropriately.
 
 The reason to not allow Atomic, Ordered and Parallel event types in the
diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst
index a47d6db..3868b99 100644
--- a/doc/guides/howto/lm_bond_virtio_sriov.rst
+++ b/doc/guides/howto/lm_bond_virtio_sriov.rst
@@ -328,7 +328,11 @@ On host_server_2: Terminal 1
 
 .. code-block:: console
 
+<<<<<<< doc/guides/howto/lm_bond_virtio_sriov.rst
    testomd> show port info all
+=======
+   testpmd> show port info all
+>>>>>>> doc/guides/howto/lm_bond_virtio_sriov.rst
    testpmd> show port stats all
    testpmd> show bonding config 2
    testpmd> port attach 0000:00:04.0
diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst
index 3f5ebd5..ecb1b2e 100644
--- a/doc/guides/howto/lm_virtio_vhost_user.rst
+++ b/doc/guides/howto/lm_virtio_vhost_user.rst
@@ -243,7 +243,11 @@ On host_server_2: Terminal 1
 
 .. code-block:: console
 
+<<<<<<< doc/guides/howto/lm_virtio_vhost_user.rst
    testomd> show port info all
+=======
+   testpmd> show port info all
+>>>>>>> doc/guides/howto/lm_virtio_vhost_user.rst
    testpmd> show port stats all
 
 Virtio traffic is seen at P0 and P1.
@@ -338,7 +342,11 @@ reset_vf_on_212_131.sh
    #!/bin/sh
    # This script is run on the host 10.237.212.131 to reset SRIOV
 
+<<<<<<< doc/guides/howto/lm_virtio_vhost_user.rst
    # BDF for Ninatic NIC is 0000:06:00.0
+=======
+   # BDF for Niantic NIC is 0000:06:00.0
+>>>>>>> doc/guides/howto/lm_virtio_vhost_user.rst
    cat /sys/bus/pci/devices/0000\:06\:00.0/max_vfs
    echo 0 > /sys/bus/pci/devices/0000\:06\:00.0/max_vfs
    cat /sys/bus/pci/devices/0000\:06\:00.0/max_vfs
diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index 6a8534d..fa854f2 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -23,7 +23,11 @@ In this example we will create a simple rule that drops packets whose IPv4
 destination equals 192.168.3.2. This code is equivalent to the following
 testpmd command (wrapped for clarity)::
 
+<<<<<<< doc/guides/howto/rte_flow.rst
   tpmd> flow create 0 ingress pattern eth / vlan /
+=======
+  testpmd> flow create 0 ingress pattern eth / vlan /
+>>>>>>> doc/guides/howto/rte_flow.rst
                     ipv4 dst is 192.168.3.2 / end actions drop / end
 
 Code
@@ -118,7 +122,11 @@ a mask.
 This code is equivalent to the following testpmd command (wrapped for
 clarity)::
 
+<<<<<<< doc/guides/howto/rte_flow.rst
   tpmd> flow create 0 ingress pattern eth / vlan /
+=======
+  testpmd> flow create 0 ingress pattern eth / vlan /
+>>>>>>> doc/guides/howto/rte_flow.rst
                     ipv4 dst spec 192.168.3.0 dst mask 255.255.255.0 /
                     end actions drop / end
 
@@ -219,7 +227,11 @@ In this example we will create a rule that routes all vlan id 123 to queue 3.
 This code is equivalent to the following testpmd command (wrapped for
 clarity)::
 
+<<<<<<< doc/guides/howto/rte_flow.rst
   tpmd> flow create 0 ingress pattern eth / vlan vid spec 123 /
+=======
+  testpmd> flow create 0 ingress pattern eth / vlan vid spec 123 /
+>>>>>>> doc/guides/howto/rte_flow.rst
                     end actions queue index 3 / end
 
 Code
diff --git a/doc/guides/howto/virtio_user_as_exceptional_path.rst b/doc/guides/howto/virtio_user_as_exceptional_path.rst
index 4910c12..66034a0 100644
--- a/doc/guides/howto/virtio_user_as_exceptional_path.rst
+++ b/doc/guides/howto/virtio_user_as_exceptional_path.rst
@@ -1,7 +1,11 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
     Copyright(c) 2016 Intel Corporation.
 
+<<<<<<< doc/guides/howto/virtio_user_as_exceptional_path.rst
 .. _virtio_user_as_excpetional_path:
+=======
+.. _virtio_user_as_exceptional_path:
+>>>>>>> doc/guides/howto/virtio_user_as_exceptional_path.rst
 
 Virtio_user as Exceptional Path
 ===============================
@@ -22,7 +26,11 @@ solution is very promising in:
 *   Features
 
     vhost-net is born to be a networking solution, which has lots of networking
+<<<<<<< doc/guides/howto/virtio_user_as_exceptional_path.rst
     related featuers, like multi queue, tso, multi-seg mbuf, etc.
+=======
+    related features, like multi queue, tso, multi-seg mbuf, etc.
+>>>>>>> doc/guides/howto/virtio_user_as_exceptional_path.rst
 
 *   Performance
 
@@ -38,7 +46,11 @@ in :numref:`figure_virtio_user_as_exceptional_path`.
 
 .. figure:: img/virtio_user_as_exceptional_path.*
 
+<<<<<<< doc/guides/howto/virtio_user_as_exceptional_path.rst
    Overview of a DPDK app using virtio-user as excpetional path
+=======
+   Overview of a DPDK app using virtio-user as exceptional path
+>>>>>>> doc/guides/howto/virtio_user_as_exceptional_path.rst
 
 
 Sample Usage
@@ -75,7 +87,11 @@ compiling the kernel and those kernel modules should be inserted.
 
 * ``queues``
 
+<<<<<<< doc/guides/howto/virtio_user_as_exceptional_path.rst
     Number of multi-queues. Each qeueue will be served by a kthread. For example:
+=======
+    Number of multi-queues. Each queue will be served by a kthread. For example:
+>>>>>>> doc/guides/howto/virtio_user_as_exceptional_path.rst
 
     .. code-block:: console
 
diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
index 9d1f0fa..c4c39fd 100644
--- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
@@ -14,6 +14,7 @@ This chapter describes how to cross compile DPDK for ARM64 from x86 build hosts.
 Obtain the cross tool chain
 ---------------------------
 The latest cross compile tool chain can be downloaded from:
+<<<<<<< doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
 https://releases.linaro.org/components/toolchain/binaries/latest/aarch64-linux-gnu/.
 
 Following is the step to get the version 7.2.1, latest one at the time of this writing.
@@ -21,18 +22,36 @@ Following is the step to get the version 7.2.1, latest one at the time of this w
 .. code-block:: console
 
    wget https://releases.linaro.org/components/toolchain/binaries/latest/aarch64-linux-gnu/gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu.tar.xz
+=======
+https://developer.arm.com/open-source/gnu-toolchain/gnu-a/downloads.
+
+Following is the step to get the version 8.2, latest one at the time of this writing.
+
+.. code-block:: console
+
+   wget https://developer.arm.com/-/media/Files/downloads/gnu-a/8.2-2019.01/gcc-arm-8.2-2019.01-x86_64-aarch64-linux-gnu.tar.xz
+>>>>>>> doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
 
 Unzip and add into the PATH
 ---------------------------
 
 .. code-block:: console
 
+<<<<<<< doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
    tar -xvf gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu.tar.xz
    export PATH=$PATH:<cross_install_dir>/gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu/bin
 
 .. note::
 
    For the host requirements and other info, refer to the release note section: https://releases.linaro.org/components/toolchain/binaries/latest/
+=======
+   tar -xvf gcc-arm-8.2-2019.01-x86_64-aarch64-linux-gnu.tar.xz
+   export PATH=$PATH:<cross_install_dir>/gcc-arm-8.2-2019.01-x86_64-aarch64-linux-gnu/bin
+
+.. note::
+
+   For the host requirements and other info, refer to the release note section: https://releases.linaro.org/components/toolchain/binaries/
+>>>>>>> doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
 
 Getting the prerequisite library
 --------------------------------
@@ -69,8 +88,13 @@ Copy the NUMA header files and lib to the cross compiler's directories:
 
 .. code-block:: console
 
+<<<<<<< doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
    cp <numa_install_dir>/include/numa*.h <cross_install_dir>/gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu/bin/../aarch64-linux-gnu/libc/usr/include/
    cp <numa_install_dir>/lib/libnuma.a <cross_install_dir>/gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/7.2.1/
+=======
+   cp <numa_install_dir>/include/numa*.h <cross_install_dir>/gcc-arm-8.2-2019.01-x86_64-aarch64-linux-gnu/bin/../aarch64-linux-gnu/libc/usr/include/
+   cp <numa_install_dir>/lib/libnuma.a <cross_install_dir>/gcc-arm-8.2-2019.01-x86_64-aarch64-linux-gnu/lib/gcc/aarch64-linux-gnu/8.2/
+>>>>>>> doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
 
 .. _configure_and_cross_compile_dpdk_build:
 
diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst
index 29c5f47..b5427cb 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -70,6 +70,18 @@ Compilation of the DPDK
 
     * libnuma-dev in Debian/Ubuntu;
 
+<<<<<<< doc/guides/linux_gsg/sys_reqs.rst
+=======
+    .. note::
+
+        On systems with NUMA support, `libnuma-dev` (aka `numactl-devel`)
+        is a recommended dependency when `--legacy-mem` switch is used,
+        and a *required* dependency if default memory mode is used.
+        While DPDK will compile and run without `libnuma`
+        even on NUMA-enabled systems,
+        both usability and performance will be degraded.
+
+>>>>>>> doc/guides/linux_gsg/sys_reqs.rst
 *   Python, version 2.7+ or 3.2+, to use various helper scripts included in the DPDK package.
 
 
@@ -175,7 +187,11 @@ In the case of a dual-socket NUMA system,
 the number of hugepages reserved at boot time is generally divided equally between the two sockets
 (on the assumption that sufficient memory is present on both sockets).
 
+<<<<<<< doc/guides/linux_gsg/sys_reqs.rst
 See the Documentation/kernel-parameters.txt file in your Linux source tree for further details of these and other kernel options.
+=======
+See the Documentation/admin-guide/kernel-parameters.txt file in your Linux source tree for further details of these and other kernel options.
+>>>>>>> doc/guides/linux_gsg/sys_reqs.rst
 
 **Alternative:**
 
diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst
index 80591b1..4f6a9b1 100644
--- a/doc/guides/nics/atlantic.rst
+++ b/doc/guides/nics/atlantic.rst
@@ -18,7 +18,11 @@ Supported features
 - Port statistics
 - RSS (Receive Side Scaling)
 - Checksum offload
+<<<<<<< doc/guides/nics/atlantic.rst
 - Jumbo Frame upto 16K
+=======
+- Jumbo Frame up to 16K
+>>>>>>> doc/guides/nics/atlantic.rst
 
 Configuration Information
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst
index 58d88ee..4f40018 100644
--- a/doc/guides/nics/cxgbe.rst
+++ b/doc/guides/nics/cxgbe.rst
@@ -126,7 +126,11 @@ enabling debugging options may affect system performance.
 
 - ``CONFIG_RTE_LIBRTE_CXGBE_TPUT`` (default **y**)
 
+<<<<<<< doc/guides/nics/cxgbe.rst
   Toggle behaviour to prefer Throughput or Latency.
+=======
+  Toggle behavior to prefer Throughput or Latency.
+>>>>>>> doc/guides/nics/cxgbe.rst
 
 Runtime Options
 ~~~~~~~~~~~~~~~
@@ -140,7 +144,11 @@ be passed as part of EAL arguments. For example,
 
 - ``keep_ovlan`` (default **0**)
 
+<<<<<<< doc/guides/nics/cxgbe.rst
   Toggle behaviour to keep/strip outer VLAN in Q-in-Q packets. If
+=======
+  Toggle behavior to keep/strip outer VLAN in Q-in-Q packets. If
+>>>>>>> doc/guides/nics/cxgbe.rst
   enabled, the outer VLAN tag is preserved in Q-in-Q packets. Otherwise,
   the outer VLAN tag is stripped in Q-in-Q packets.
 
diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst
index 2173673..b702304 100644
--- a/doc/guides/nics/dpaa.rst
+++ b/doc/guides/nics/dpaa.rst
@@ -251,7 +251,11 @@ state during application initialization:
   automatically be assigned from the these high perf PUSH queues. Any queue
   configuration beyond that will be standard Rx queues. The application can
   choose to change their number if HW portals are limited.
+<<<<<<< doc/guides/nics/dpaa.rst
   The valid values are from '0' to '4'. The valuse shall be set to '0' if the
+=======
+  The valid values are from '0' to '4'. The values shall be set to '0' if the
+>>>>>>> doc/guides/nics/dpaa.rst
   application want to use eventdev with DPAA device.
 
 
diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst
index 769dc4e..117ceb1 100644
--- a/doc/guides/nics/dpaa2.rst
+++ b/doc/guides/nics/dpaa2.rst
@@ -379,7 +379,11 @@ active  --  Ethernet, crypto, compression, etc.
 DPBP based Mempool driver
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
+<<<<<<< doc/guides/nics/dpaa2.rst
 The DPBP driver is bound to a DPBP objects and provides sevices to
+=======
+The DPBP driver is bound to a DPBP objects and provides services to
+>>>>>>> doc/guides/nics/dpaa2.rst
 create a hardware offloaded packet buffer mempool.
 
 DPAA2 NIC Driver
diff --git a/doc/guides/nics/enetc.rst b/doc/guides/nics/enetc.rst
index 8038bf2..a08e15f 100644
--- a/doc/guides/nics/enetc.rst
+++ b/doc/guides/nics/enetc.rst
@@ -69,7 +69,11 @@ Supported ENETC SoCs
 Prerequisites
 ~~~~~~~~~~~~~
 
+<<<<<<< doc/guides/nics/enetc.rst
 There are three main pre-requisities for executing ENETC PMD on a ENETC
+=======
+There are three main pre-requisites for executing ENETC PMD on a ENETC
+>>>>>>> doc/guides/nics/enetc.rst
 compatible board:
 
 1. **ARM 64 Tool Chain**
diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index bc38f51..632b47c 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -224,7 +224,11 @@ the use of SR-IOV.
     passthrough devices do not require libvirt, port profiles, and VM-FEX.
 
 
+<<<<<<< doc/guides/nics/enic.rst
 .. _enic-genic-flow-api:
+=======
+.. _enic-generic-flow-api:
+>>>>>>> doc/guides/nics/enic.rst
 
 Generic Flow API support
 ------------------------
@@ -247,7 +251,11 @@ Generic Flow API is supported. The baseline support is:
   in the pattern.
 
   - Attributes: ingress
+<<<<<<< doc/guides/nics/enic.rst
   - Items: eth, ipv4, ipv6, udp, tcp, vxlan, inner eth, ipv4, ipv6, udp, tcp
+=======
+  - Items: eth, vlan, ipv4, ipv6, udp, tcp, vxlan, inner eth, vlan, ipv4, ipv6, udp, tcp
+>>>>>>> doc/guides/nics/enic.rst
   - Actions: queue and void
   - Selectors: 'is', 'spec' and 'mask'. 'last' is not supported
   - In total, up to 64 bytes of mask is allowed across all headers
@@ -255,7 +263,11 @@ Generic Flow API is supported. The baseline support is:
 - **1300 and later series VICS with advanced filters enabled**
 
   - Attributes: ingress
+<<<<<<< doc/guides/nics/enic.rst
   - Items: eth, ipv4, ipv6, udp, tcp, vxlan, inner eth, ipv4, ipv6, udp, tcp
+=======
+  - Items: eth, vlan, ipv4, ipv6, udp, tcp, vxlan, inner eth, vlan, ipv4, ipv6, udp, tcp
+>>>>>>> doc/guides/nics/enic.rst
   - Actions: queue, mark, drop, flag and void
   - Selectors: 'is', 'spec' and 'mask'. 'last' is not supported
   - In total, up to 64 bytes of mask is allowed across all headers
@@ -266,6 +278,15 @@ Generic Flow API is supported. The baseline support is:
 
   - Action: count
 
+<<<<<<< doc/guides/nics/enic.rst
+=======
+The VIC performs packet matching after applying VLAN strip. If VLAN
+stripping is enabled, EtherType in the ETH item corresponds to the
+stripped VLAN header's EtherType. Stripping does not affect the VLAN
+item. TCI and EtherType in the VLAN item are matched against those in
+the (stripped) VLAN header whether stripping is enabled or disabled.
+
+>>>>>>> doc/guides/nics/enic.rst
 More features may be added in future firmware and new versions of the VIC.
 Please refer to the release notes.
 
@@ -450,6 +471,10 @@ PKT_RX_VLAN_STRIPPED mbuf flags would not be set. This mode is enabled with the
     1000 for 1300 series VICs). Filters are checked for matching in the order they
     were added. Since there currently is no grouping or priority support,
     'catch-all' filters should be added last.
+<<<<<<< doc/guides/nics/enic.rst
+=======
+  - The supported range of IDs for the 'MARK' action is 0 - 0xFFFD.
+>>>>>>> doc/guides/nics/enic.rst
 
 - **Statistics**
 
diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index d3f9048..2117ab9 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -285,7 +285,11 @@ Inner RSS
 
 Supports RX RSS hashing on Inner headers.
 
+<<<<<<< doc/guides/nics/features.rst
 * **[users]    rte_flow_action_rss**: ``level``.
+=======
+* **[uses]    rte_flow_action_rss**: ``level``.
+>>>>>>> doc/guides/nics/features.rst
 * **[provides] mbuf**: ``mbuf.ol_flags:PKT_RX_RSS_HASH``, ``mbuf.rss``.
 
 
@@ -495,7 +499,11 @@ Supports adding traffic mirroring rules.
 Inline crypto
 -------------
 
+<<<<<<< doc/guides/nics/features.rst
 Supports inline crypto processing (eg. inline IPsec). See Security library and PMD documentation for more details.
+=======
+Supports inline crypto processing (e.g. inline IPsec). See Security library and PMD documentation for more details.
+>>>>>>> doc/guides/nics/features.rst
 
 * **[uses]       rte_eth_rxconf,rte_eth_rxmode**: ``offloads:DEV_RX_OFFLOAD_SECURITY``,
 * **[uses]       rte_eth_txconf,rte_eth_txmode**: ``offloads:DEV_TX_OFFLOAD_SECURITY``.
diff --git a/doc/guides/nics/features/qede.ini b/doc/guides/nics/features/qede.ini
index 0d08100..8d89853 100644
--- a/doc/guides/nics/features/qede.ini
+++ b/doc/guides/nics/features/qede.ini
@@ -23,6 +23,10 @@ N-tuple filter       = Y
 Tunnel filter        = Y
 Flow director        = Y
 Flow control         = Y
+<<<<<<< doc/guides/nics/features/qede.ini
+=======
+Flow API             = Y
+>>>>>>> doc/guides/nics/features/qede.ini
 CRC offload          = Y
 VLAN offload         = Y
 L3 checksum offload  = Y
diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index bfacbd1..302e66b 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -571,7 +571,11 @@ bandwidth setting.
 TC TX scheduling mode setting
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+<<<<<<< doc/guides/nics/i40e.rst
 There're 2 TX scheduling modes for TCs, round robin and strict priority mode.
+=======
+There are 2 TX scheduling modes for TCs, round robin and strict priority mode.
+>>>>>>> doc/guides/nics/i40e.rst
 If a TC is set to strict priority mode, it can consume unlimited bandwidth.
 It means if APP has set the max bandwidth for that TC, it comes to no
 effect.
@@ -695,3 +699,12 @@ See :numref:`figure_intel_perf_test_setup` for the performance test setup.
    * Start creating a stream on packet generator.
 
    * Set the Ethernet II type to 0x0800.
+<<<<<<< doc/guides/nics/i40e.rst
+=======
+
+Tx bytes affected by the link status change
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For firmware versions prior to 6.01 for X710 series and 3.33 for X722 series, the tx_bytes statistics data is affected by
+the link down event. Each time the link status changes to down, the tx_bytes decreases 110 bytes.
+>>>>>>> doc/guides/nics/i40e.rst
diff --git a/doc/guides/nics/ifc.rst b/doc/guides/nics/ifc.rst
index 48f9adf..3629035 100644
--- a/doc/guides/nics/ifc.rst
+++ b/doc/guides/nics/ifc.rst
@@ -19,9 +19,15 @@ Config File Options
 
 The following option can be modified in the ``config`` file.
 
+<<<<<<< doc/guides/nics/ifc.rst
 - ``CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD`` (default ``y`` for linux)
 
   Toggle compilation of the ``librte_ifcvf_vdpa`` driver.
+=======
+- ``CONFIG_RTE_LIBRTE_IFC_PMD`` (default ``y`` for linux)
+
+  Toggle compilation of the ``librte_pmd_ifc`` driver.
+>>>>>>> doc/guides/nics/ifc.rst
 
 
 IFCVF vDPA Implementation
diff --git a/doc/guides/nics/ixgbe.rst b/doc/guides/nics/ixgbe.rst
index 1c294b0..083efb2 100644
--- a/doc/guides/nics/ixgbe.rst
+++ b/doc/guides/nics/ixgbe.rst
@@ -203,8 +203,13 @@ as a workaround.
 X550 does not support legacy interrupt mode
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+<<<<<<< doc/guides/nics/ixgbe.rst
 Desccription
 ^^^^^^^^^^^^
+=======
+Description
+^^^^^^^^^^^
+>>>>>>> doc/guides/nics/ixgbe.rst
 X550 cannot get interrupts if using ``uio_pci_generic`` module or using legacy
 interrupt mode of ``igb_uio`` or ``vfio``. Because the errata of X550 states
 that the Interrupt Status bit is not implemented. The errata is the item #22
diff --git a/doc/guides/nics/kni.rst b/doc/guides/nics/kni.rst
index 204fbd5..27a78bd 100644
--- a/doc/guides/nics/kni.rst
+++ b/doc/guides/nics/kni.rst
@@ -64,7 +64,11 @@ backend device by default.
 PMD arguments
 -------------
 
+<<<<<<< doc/guides/nics/kni.rst
 ``no_request_thread``, by default PMD creates a phtread for each KNI interface
+=======
+``no_request_thread``, by default PMD creates a pthread for each KNI interface
+>>>>>>> doc/guides/nics/kni.rst
 to handle Linux network interface control commands, like ``ifconfig kni0 up``
 
 With ``no_request_thread`` option, pthread is not created and control commands
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 23f0f57..e74c409 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -85,6 +85,14 @@ Limitations
 
   - Forked secondary process not supported.
   - All mempools must be initialized before rte_eth_dev_start().
+<<<<<<< doc/guides/nics/mlx5.rst
+=======
+  - External memory unregistered in EAL memseg list cannot be used for DMA
+    unless such memory has been registered by ``mlx5_mr_update_ext_mp()`` in
+    primary process and remapped to the same virtual address in secondary
+    process. If the external memory is registered by primary process but has
+    different virtual address in secondary process, unexpected error may happen.
+>>>>>>> doc/guides/nics/mlx5.rst
 
 - Flow pattern without any specific vlan will match for vlan packets as well:
 
@@ -148,7 +156,11 @@ Limitations
 
 - E-Switch VXLAN decapsulation Flow:
 
+<<<<<<< doc/guides/nics/mlx5.rst
   - can be appiled to PF port only.
+=======
+  - can be applied to PF port only.
+>>>>>>> doc/guides/nics/mlx5.rst
   - must specify VF port action (packet redirection from PF to VF).
   - must specify tunnel outer UDP local (destination) port, wildcards not allowed.
   - must specify tunnel outer VNI, wildcards not allowed.
@@ -163,7 +175,11 @@ Limitations
   - must specify the VXLAN item with tunnel outer parameters.
   - must specify the tunnel outer VNI in the VXLAN item.
   - must specify the tunnel outer remote (destination) UDP port in the VXLAN item.
+<<<<<<< doc/guides/nics/mlx5.rst
   - must specify the tunnel outer local (source) IPv4 or IPv6 in the , this address will locally (with scope link) assigned to the outer network interace, wildcards not allowed.
+=======
+  - must specify the tunnel outer local (source) IPv4 or IPv6 in the , this address will locally (with scope link) assigned to the outer network interface, wildcards not allowed.
+>>>>>>> doc/guides/nics/mlx5.rst
   - must specify the tunnel outer remote (destination) IPv4 or IPv6 in the VXLAN item, group IPs allowed.
   - must specify the tunnel outer destination MAC address in the VXLAN item, this address will be used to create neigh rule.
 
@@ -227,6 +243,7 @@ Environment variables
   enabled and most useful when ``CONFIG_RTE_EAL_PMD_PATH`` is also set,
   since ``LD_LIBRARY_PATH`` has no effect in this case.
 
+<<<<<<< doc/guides/nics/mlx5.rst
 - ``MLX5_PMD_ENABLE_PADDING``
 
   Enables HW packet padding in PCI bus transactions.
@@ -241,6 +258,8 @@ Environment variables
   This is disabled by default since this can also decrease performance for
   unaligned packet sizes.
 
+=======
+>>>>>>> doc/guides/nics/mlx5.rst
 - ``MLX5_SHUT_UP_BF``
 
   Configures HW Tx doorbell register as IO-mapped.
@@ -295,6 +314,22 @@ Run-time configuration
 
   - CPU having 128B cacheline with ConnectX-5 and Bluefield.
 
+<<<<<<< doc/guides/nics/mlx5.rst
+=======
+- ``rxq_pkt_pad_en`` parameter [int]
+
+  A nonzero value enables padding Rx packet to the size of cacheline on PCI
+  transaction. This feature would waste PCI bandwidth but could improve
+  performance by avoiding partial cacheline write which may cause costly
+  read-modify-copy in memory transaction on some architectures. Disabled by
+  default.
+
+  Supported on:
+
+  - x86_64 with ConnectX-4, ConnectX-4 LX, ConnectX-5, ConnectX-6 and Bluefield.
+  - POWER8 and ARMv8 with ConnectX-4 LX, ConnectX-5, ConnectX-6 and Bluefield.
+
+>>>>>>> doc/guides/nics/mlx5.rst
 - ``mprq_en`` parameter [int]
 
   A nonzero value enables configuring Multi-Packet Rx queues. Rx queue is
@@ -307,7 +342,11 @@ Run-time configuration
   buffers per a packet, one large buffer is posted in order to receive multiple
   packets on the buffer. A MPRQ buffer consists of multiple fixed-size strides
   and each stride receives one packet. MPRQ can improve throughput for
+<<<<<<< doc/guides/nics/mlx5.rst
   small-packet tarffic.
+=======
+  small-packet traffic.
+>>>>>>> doc/guides/nics/mlx5.rst
 
   When MPRQ is enabled, max_rx_pkt_len can be larger than the size of
   user-provided mbuf even if DEV_RX_OFFLOAD_SCATTER isn't enabled. PMD will
@@ -318,7 +357,11 @@ Run-time configuration
 - ``mprq_log_stride_num`` parameter [int]
 
   Log 2 of the number of strides for Multi-Packet Rx queue. Configuring more
+<<<<<<< doc/guides/nics/mlx5.rst
   strides can reduce PCIe tarffic further. If configured value is not in the
+=======
+  strides can reduce PCIe traffic further. If configured value is not in the
+>>>>>>> doc/guides/nics/mlx5.rst
   range of device capability, the default value will be set with a warning
   message. The default value is 4 which is 16 strides per a buffer, valid only
   if ``mprq_en`` is set.
@@ -565,7 +608,11 @@ Either RDMA Core library with a recent enough Linux kernel release
 (recommended) or Mellanox OFED, which provides compatibility with older
 releases.
 
+<<<<<<< doc/guides/nics/mlx5.rst
 RMDA Core with Linux Kernel
+=======
+RDMA Core with Linux Kernel
+>>>>>>> doc/guides/nics/mlx5.rst
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Minimal kernel version : v4.14 or the most recent 4.14-rc (see `Linux installation documentation`_)
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index b2ddeab..a3aa485 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -91,7 +91,11 @@ Limitations
   chance to start in a sane state.
 
 - MUSDK architecture does not support changing configuration in run time.
+<<<<<<< doc/guides/nics/mvpp2.rst
   All nessesary configurations should be done before first dev_start().
+=======
+  All necessary configurations should be done before first dev_start().
+>>>>>>> doc/guides/nics/mvpp2.rst
 
 - RX queue start/stop is not supported.
 
diff --git a/doc/guides/nics/netvsc.rst b/doc/guides/nics/netvsc.rst
index 87fabf5..adb62ec 100644
--- a/doc/guides/nics/netvsc.rst
+++ b/doc/guides/nics/netvsc.rst
@@ -89,7 +89,11 @@ operations:
 
 .. Note::
 
+<<<<<<< doc/guides/nics/netvsc.rst
    The dpkd-devbind.py script can not be used since it only handles PCI devices.
+=======
+   The dpdk-devbind.py script can not be used since it only handles PCI devices.
+>>>>>>> doc/guides/nics/netvsc.rst
 
 
 Prerequisites
diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index 4006528..170e5a6 100644
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -96,7 +96,11 @@ Non-supported Features
 
 The features not yet supported include:
 
+<<<<<<< doc/guides/nics/sfc_efx.rst
 - Receive queue interupts
+=======
+- Receive queue interrupts
+>>>>>>> doc/guides/nics/sfc_efx.rst
 
 - Priority-based flow control
 
@@ -207,12 +211,21 @@ Supported actions:
 
 Validating flow rules depends on the firmware variant.
 
+<<<<<<< doc/guides/nics/sfc_efx.rst
 Ethernet destinaton individual/group match
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Ethernet item supports I/G matching, if only the corresponding bit is set
 in the mask of destination address. If destinaton address in the spec is
 multicast, it matches all multicast (and broadcast) packets, oherwise it
+=======
+Ethernet destination individual/group match
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ethernet item supports I/G matching, if only the corresponding bit is set
+in the mask of destination address. If destination address in the spec is
+multicast, it matches all multicast (and broadcast) packets, otherwise it
+>>>>>>> doc/guides/nics/sfc_efx.rst
 matches unicast packets that are not filtered by other flow rules.
 
 Exceptions to flow rules
@@ -346,10 +359,17 @@ boolean parameters value.
 
 - ``perf_profile`` [auto|throughput|low-latency] (default **throughput**)
 
+<<<<<<< doc/guides/nics/sfc_efx.rst
   Choose hardware tunning to be optimized for either throughput or
   low-latency.
   **auto** allows NIC firmware to make a choice based on
   installed licences and firmware variant configured using **sfboot**.
+=======
+  Choose hardware tuning to be optimized for either throughput or
+  low-latency.
+  **auto** allows NIC firmware to make a choice based on
+  installed licenses and firmware variant configured using **sfboot**.
+>>>>>>> doc/guides/nics/sfc_efx.rst
 
 - ``stats_update_period_ms`` [long] (default **1000**)
 
diff --git a/doc/guides/nics/szedata2.rst b/doc/guides/nics/szedata2.rst
index a2092f9..f3b2981 100644
--- a/doc/guides/nics/szedata2.rst
+++ b/doc/guides/nics/szedata2.rst
@@ -89,7 +89,11 @@ The NFB cards are multi-port multi-queue cards, where (generally) data from any
 Ethernet port may be sent to any queue.
 They were historically represented in DPDK as a single port.
 
+<<<<<<< doc/guides/nics/szedata2.rst
 However, the new NFB-200G2QL card employs an addon cable which allows to connect
+=======
+However, the new NFB-200G2QL card employs an add-on cable which allows to connect
+>>>>>>> doc/guides/nics/szedata2.rst
 it to two physical PCI-E slots at the same time (see the diagram below).
 This is done to allow 200 Gbps of traffic to be transferred through the PCI-E
 bus (note that a single PCI-E 3.0 x16 slot provides only 125 Gbps theoretical
diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst
index 9a3d7b3..c42db54 100644
--- a/doc/guides/nics/tap.rst
+++ b/doc/guides/nics/tap.rst
@@ -40,7 +40,11 @@ actual MAC address: ``00:64:74:61:70:[00-FF]``.
    --vdev=net_tap0,mac="00:64:74:61:70:11"
 
 The MAC address will have a user value passed as string. The MAC address is in
+<<<<<<< doc/guides/nics/tap.rst
 format with delimeter ``:``. The string is byte converted to hex and you get
+=======
+format with delimiter ``:``. The string is byte converted to hex and you get
+>>>>>>> doc/guides/nics/tap.rst
 the actual MAC address: ``00:64:74:61:70:11``.
 
 It is possible to specify a remote netdevice to capture packets from by adding
diff --git a/doc/guides/platform/dpaa.rst b/doc/guides/platform/dpaa.rst
index 3904871..63ecf2c 100644
--- a/doc/guides/platform/dpaa.rst
+++ b/doc/guides/platform/dpaa.rst
@@ -4,7 +4,11 @@
 NXP QorIQ DPAA Board Support Package
 ====================================
 
+<<<<<<< doc/guides/platform/dpaa.rst
 This doc has information about steps to setup QorIq dpaa
+=======
+This doc has information about steps to setup QorIQ dpaa
+>>>>>>> doc/guides/platform/dpaa.rst
 based layerscape platform and information about common offload
 hw block drivers of **NXP QorIQ DPAA** SoC family.
 
@@ -38,7 +42,11 @@ Common Offload HW Block Drivers
 Steps To Setup Platform
 -----------------------
 
+<<<<<<< doc/guides/platform/dpaa.rst
 There are four main pre-requisities for executing DPAA PMD on a DPAA
+=======
+There are four main pre-requisites for executing DPAA PMD on a DPAA
+>>>>>>> doc/guides/platform/dpaa.rst
 compatible board:
 
 1. **ARM 64 Tool Chain**
diff --git a/doc/guides/platform/dpaa2.rst b/doc/guides/platform/dpaa2.rst
index 5a64406..33f439e 100644
--- a/doc/guides/platform/dpaa2.rst
+++ b/doc/guides/platform/dpaa2.rst
@@ -4,7 +4,11 @@
 NXP QorIQ DPAA2 Board Support Package
 =====================================
 
+<<<<<<< doc/guides/platform/dpaa2.rst
 This doc has information about steps to setup NXP QoriQ DPAA2 platform
+=======
+This doc has information about steps to setup NXP QorIQ DPAA2 platform
+>>>>>>> doc/guides/platform/dpaa2.rst
 and information about common offload hw block drivers of
 **NXP QorIQ DPAA2** SoC family.
 
@@ -48,7 +52,11 @@ Common Offload HW Block Drivers
 Steps To Setup Platform
 -----------------------
 
+<<<<<<< doc/guides/platform/dpaa2.rst
 There are four main pre-requisities for executing DPAA2 PMD on a DPAA2
+=======
+There are four main pre-requisites for executing DPAA2 PMD on a DPAA2
+>>>>>>> doc/guides/platform/dpaa2.rst
 compatible board:
 
 1. **ARM 64 Tool Chain**
diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index 9de1444..fc9ddaf 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -78,7 +78,11 @@ From the application point of view, each instance of a bbdev device consists of
 one or more queues identified by queue IDs. While different devices may have
 different capabilities (e.g. support different operation types), all queues on
 a device support identical configuration possibilities. A queue is configured
+<<<<<<< doc/guides/prog_guide/bbdev.rst
 for only one type of operation and is configured at initializations time.
+=======
+for only one type of operation and is configured at initialization time.
+>>>>>>> doc/guides/prog_guide/bbdev.rst
 When an operation is enqueued to a specific queue ID, the result is dequeued
 from the same queue ID.
 
@@ -678,7 +682,11 @@ bbdev framework, by giving a sample code performing a loop-back operation with a
 baseband processor capable of transceiving data packets.
 
 The following sample C-like pseudo-code shows the basic steps to encode several
+<<<<<<< doc/guides/prog_guide/bbdev.rst
 buffers using (**sw_trubo**) bbdev PMD.
+=======
+buffers using (**sw_turbo**) bbdev PMD.
+>>>>>>> doc/guides/prog_guide/bbdev.rst
 
 .. code-block:: c
 
diff --git a/doc/guides/prog_guide/compressdev.rst b/doc/guides/prog_guide/compressdev.rst
index 87e2649..9f6902d 100644
--- a/doc/guides/prog_guide/compressdev.rst
+++ b/doc/guides/prog_guide/compressdev.rst
@@ -17,7 +17,11 @@ Device Creation
 
 Physical compression devices are discovered during the bus probe of the EAL function
 which is executed at DPDK initialization, based on their unique device identifier.
+<<<<<<< doc/guides/prog_guide/compressdev.rst
 For eg. PCI devices can be identified using PCI BDF (bus/bridge, device, function).
+=======
+For e.g. PCI devices can be identified using PCI BDF (bus/bridge, device, function).
+>>>>>>> doc/guides/prog_guide/compressdev.rst
 Specific physical compression devices, like other physical devices in DPDK can be
 white-listed or black-listed using the EAL command line options.
 
@@ -379,7 +383,11 @@ using priv_xform would look like:
         setup op->m_src and op->m_dst;
     }
     num_enqd = rte_compressdev_enqueue_burst(cdev_id, 0, comp_ops, NUM_OPS);
+<<<<<<< doc/guides/prog_guide/compressdev.rst
     /* wait for this to complete before enqueing next*/
+=======
+    /* wait for this to complete before enqueuing next*/
+>>>>>>> doc/guides/prog_guide/compressdev.rst
     do {
         num_deque = rte_compressdev_dequeue_burst(cdev_id, 0 , &processed_ops, NUM_OPS);
     } while (num_dqud < num_enqd);
@@ -526,7 +534,11 @@ An example pseudocode to set up and process a stream having NUM_CHUNKS with each
         op->src.length = CHUNK_LEN;
         op->input_chksum = 0;
         num_enqd = rte_compressdev_enqueue_burst(cdev_id, 0, &op[i], 1);
+<<<<<<< doc/guides/prog_guide/compressdev.rst
         /* wait for this to complete before enqueing next*/
+=======
+        /* wait for this to complete before enqueuing next*/
+>>>>>>> doc/guides/prog_guide/compressdev.rst
         do {
             num_deqd = rte_compressdev_dequeue_burst(cdev_id, 0 , &processed_ops, 1);
         } while (num_deqd < num_enqd);
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst
index 8ee33c8..a5d0ba6 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -14,7 +14,11 @@ and AEAD symmetric and asymmetric Crypto operations.
 Design Principles
 -----------------
 
+<<<<<<< doc/guides/prog_guide/cryptodev_lib.rst
 The cryptodev library follows the same basic principles as those used in DPDKs
+=======
+The cryptodev library follows the same basic principles as those used in DPDK's
+>>>>>>> doc/guides/prog_guide/cryptodev_lib.rst
 Ethernet Device framework. The Crypto framework provides a generic Crypto device
 framework which supports both physical (hardware) and virtual (software) Crypto
 devices as well as a generic Crypto API which allows Crypto devices to be
@@ -48,7 +52,11 @@ From the command line using the --vdev EAL option
    * If DPDK application requires multiple software crypto PMD devices then required
      number of ``--vdev`` with appropriate libraries are to be added.
 
+<<<<<<< doc/guides/prog_guide/cryptodev_lib.rst
    * An Application with crypto PMD instaces sharing the same library requires unique ID.
+=======
+   * An Application with crypto PMD instances sharing the same library requires unique ID.
+>>>>>>> doc/guides/prog_guide/cryptodev_lib.rst
 
    Example: ``--vdev  'crypto_aesni_mb0' --vdev  'crypto_aesni_mb1'``
 
@@ -382,7 +390,11 @@ Operation Management and Allocation
 
 The cryptodev library provides an API set for managing Crypto operations which
 utilize the Mempool Library to allocate operation buffers. Therefore, it ensures
+<<<<<<< doc/guides/prog_guide/cryptodev_lib.rst
 that the crytpo operation is interleaved optimally across the channels and
+=======
+that the crypto operation is interleaved optimally across the channels and
+>>>>>>> doc/guides/prog_guide/cryptodev_lib.rst
 ranks for optimal processing.
 A ``rte_crypto_op`` contains a field indicating the pool that it originated from.
 When calling ``rte_crypto_op_free(op)``, the operation returns to its original pool.
@@ -586,7 +598,11 @@ Sample code
 
 There are various sample applications that show how to use the cryptodev library,
 such as the L2fwd with Crypto sample application (L2fwd-crypto) and
+<<<<<<< doc/guides/prog_guide/cryptodev_lib.rst
 the IPSec Security Gateway application (ipsec-secgw).
+=======
+the IPsec Security Gateway application (ipsec-secgw).
+>>>>>>> doc/guides/prog_guide/cryptodev_lib.rst
 
 While these applications demonstrate how an application can be created to perform
 generic crypto operation, the required complexity hides the basic steps of
@@ -767,7 +783,11 @@ using one of the crypto PMDs available in DPDK.
 
     /*
      * Dequeue the crypto operations until all the operations
+<<<<<<< doc/guides/prog_guide/cryptodev_lib.rst
      * are proccessed in the crypto device.
+=======
+     * are processed in the crypto device.
+>>>>>>> doc/guides/prog_guide/cryptodev_lib.rst
      */
     uint16_t num_dequeued_ops, total_num_dequeued_ops = 0;
     do {
@@ -846,7 +866,11 @@ the order in which the transforms are passed indicates the order of the chaining
 Not all asymmetric crypto xforms are supported for chaining. Currently supported
 asymmetric crypto chaining is Diffie-Hellman private key generation followed by
 public generation. Also, currently API does not support chaining of symmetric and
+<<<<<<< doc/guides/prog_guide/cryptodev_lib.rst
 asymmetric crypto xfroms.
+=======
+asymmetric crypto xforms.
+>>>>>>> doc/guides/prog_guide/cryptodev_lib.rst
 
 Each xform defines specific asymmetric crypto algo. Currently supported are:
 * RSA
diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst
index da83a31..d1c9202 100644
--- a/doc/guides/prog_guide/dev_kit_build_system.rst
+++ b/doc/guides/prog_guide/dev_kit_build_system.rst
@@ -216,8 +216,11 @@ Objects
 Misc
 ^^^^
 
+<<<<<<< doc/guides/prog_guide/dev_kit_build_system.rst
 *   rte.doc.mk: Documentation in the development kit framework
 
+=======
+>>>>>>> doc/guides/prog_guide/dev_kit_build_system.rst
 *   rte.gnuconfigure.mk: Build an application that is configure-based.
 
 *   rte.subdir.mk: Build several directories in the development kit framework.
@@ -249,7 +252,11 @@ Creates the following symbol:
 Which ``dpdk-pmdinfogen`` scans for.  Using this information other relevant
 bits of data can be exported from the object file and used to produce a
 hardware support description, that ``dpdk-pmdinfogen`` then encodes into a
+<<<<<<< doc/guides/prog_guide/dev_kit_build_system.rst
 json formatted string in the following format:
+=======
+JSON formatted string in the following format:
+>>>>>>> doc/guides/prog_guide/dev_kit_build_system.rst
 
 .. code-block:: c
 
diff --git a/doc/guides/prog_guide/efd_lib.rst b/doc/guides/prog_guide/efd_lib.rst
index cb1a1df..9b418cf 100644
--- a/doc/guides/prog_guide/efd_lib.rst
+++ b/doc/guides/prog_guide/efd_lib.rst
@@ -423,6 +423,10 @@ References
 
 1- EFD is based on collaborative research work between Intel and
 Carnegie Mellon University (CMU), interested readers can refer to the paper
+<<<<<<< doc/guides/prog_guide/efd_lib.rst
 “Scaling Up Clustered Network Appliances with ScaleBricks;” Dong Zhou et al.
+=======
+"Scaling Up Clustered Network Appliances with ScaleBricks" Dong Zhou et al.
+>>>>>>> doc/guides/prog_guide/efd_lib.rst
 at SIGCOMM 2015 (`http://conferences.sigcomm.org/sigcomm/2015/pdf/papers/p241.pdf`)
 for more information.
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst
index 8b5d050..e95f85e 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -147,6 +147,7 @@ A default validator callback is provided by EAL, which can be enabled with a
 ``--socket-limit`` command-line option, for a simple way to limit maximum amount
 of memory that can be used by DPDK application.
 
+<<<<<<< doc/guides/prog_guide/env_abstraction_layer.rst
 .. note::
 
     In multiprocess scenario, all related processes (i.e. primary process, and
@@ -155,6 +156,15 @@ of memory that can be used by DPDK application.
     secondary processes must be run in the same mode. The same is applicable to
     ``--single-file-segments`` command-line option - both primary and secondary
     processes must shared this mode.
+=======
+.. warning::
+    Memory subsystem uses DPDK IPC internally, so memory allocations/callbacks
+    and IPC must not be mixed: it is not safe to allocate/free memory inside
+    memory-related or IPC callbacks, and it is not safe to use IPC inside
+    memory-related callbacks. See chapter
+    :ref:`Multi-process Support <Multi-process_Support>` for more details about
+    DPDK IPC.
+>>>>>>> doc/guides/prog_guide/env_abstraction_layer.rst
 
 + Legacy memory mode
 
@@ -450,6 +460,31 @@ Those TLS include *_cpuset* and *_socket_id*:
 *	*_socket_id* stores the NUMA node of the CPU set. If the CPUs in CPU set belong to different NUMA node, the *_socket_id* will be set to SOCKET_ID_ANY.
 
 
+<<<<<<< doc/guides/prog_guide/env_abstraction_layer.rst
+=======
+Control Thread API
+~~~~~~~~~~~~~~~~~~
+
+It is possible to create Control Threads using the public API
+``rte_ctrl_thread_create()``.
+Those threads can be used for management/infrastructure tasks and are used
+internally by DPDK for multi process support and interrupt handling.
+
+Those threads will be scheduled on CPUs part of the original process CPU
+affinity from which the dataplane and service lcores are excluded.
+
+For example, on a 8 CPUs system, starting a dpdk application with -l 2,3
+(dataplane cores), then depending on the affinity configuration which can be
+controlled with tools like taskset (Linux) or cpuset (FreeBSD),
+
+- with no affinity configuration, the Control Threads will end up on
+  0-1,4-7 CPUs.
+- with affinity restricted to 2-4, the Control Threads will end up on
+  CPU 4.
+- with affinity restricted to 2-3, the Control Threads will end up on
+  CPU 2 (master lcore, which is the default when no CPU is available).
+
+>>>>>>> doc/guides/prog_guide/env_abstraction_layer.rst
 .. _known_issue_label:
 
 Known Issues
@@ -635,7 +670,11 @@ The most important fields in the structure and how they are used are described b
 
 Malloc heap is a doubly-linked list, where each element keeps track of its
 previous and next elements. Due to the fact that hugepage memory can come and
+<<<<<<< doc/guides/prog_guide/env_abstraction_layer.rst
 go, neighbouring malloc elements may not necessarily be adjacent in memory.
+=======
+go, neighboring malloc elements may not necessarily be adjacent in memory.
+>>>>>>> doc/guides/prog_guide/env_abstraction_layer.rst
 Also, since a malloc element may span multiple pages, its contents may not
 necessarily be IOVA-contiguous either - each malloc element is only guaranteed
 to be virtually contiguous.
diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
index 0166bb4..7e5a0f3 100644
--- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
@@ -157,7 +157,11 @@ The servicing_weight member of struct rte_event_eth_rx_adapter_queue_conf
 is applicable when the adapter uses a service core function. The application
 has to enable Rx queue interrupts when configuring the ethernet device
 using the ``rte_eth_dev_configure()`` function and then use a servicing_weight
+<<<<<<< doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 of zero when addding the Rx queue to the adapter.
+=======
+of zero when adding the Rx queue to the adapter.
+>>>>>>> doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 
 The adapter creates a thread blocked on the interrupt, on an interrupt this
 thread enqueues the port id and the queue id to a ring buffer. The adapter
@@ -175,9 +179,15 @@ Rx Callback for SW Rx Adapter
 For SW based packet transfers, i.e., when the
 ``RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT`` is not set in the adapter's
 capabilities flags for a particular ethernet device, the service function
+<<<<<<< doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 temporarily enqueues mbufs to an event buffer before batch enqueueing these
 to the event device. If the buffer fills up, the service function stops
 dequeueing packets from the ethernet device. The application may want to
+=======
+temporarily enqueues mbufs to an event buffer before batch enqueuing these
+to the event device. If the buffer fills up, the service function stops
+dequeuing packets from the ethernet device. The application may want to
+>>>>>>> doc/guides/prog_guide/event_ethernet_rx_adapter.rst
 monitor the buffer fill level and instruct the service function to selectively
 enqueue packets to the event device. The application may also use some other
 criteria to decide which packets should enter the event device even when
diff --git a/doc/guides/prog_guide/eventdev.rst b/doc/guides/prog_guide/eventdev.rst
index 8fcae54..234d469 100644
--- a/doc/guides/prog_guide/eventdev.rst
+++ b/doc/guides/prog_guide/eventdev.rst
@@ -42,7 +42,11 @@ The rte_event structure contains the following metadata fields, which the
 application fills in to have the event scheduled as required:
 
 * ``flow_id`` - The targeted flow identifier for the enq/deq operation.
+<<<<<<< doc/guides/prog_guide/eventdev.rst
 * ``event_type`` - The source of this event, eg RTE_EVENT_TYPE_ETHDEV or CPU.
+=======
+* ``event_type`` - The source of this event, e.g. RTE_EVENT_TYPE_ETHDEV or CPU.
+>>>>>>> doc/guides/prog_guide/eventdev.rst
 * ``sub_event_type`` - Distinguishes events inside the application, that have
   the same event_type (see above)
 * ``op`` - This field takes one of the RTE_EVENT_OP_* values, and tells the
@@ -265,7 +269,11 @@ Linking Queues and Ports
 The final step is to "wire up" the ports to the queues. After this, the
 eventdev is capable of scheduling events, and when cores request work to do,
 the correct events are provided to that core. Note that the RX core takes input
+<<<<<<< doc/guides/prog_guide/eventdev.rst
 from eg: a NIC so it is not linked to any eventdev queues.
+=======
+from e.g.: a NIC so it is not linked to any eventdev queues.
+>>>>>>> doc/guides/prog_guide/eventdev.rst
 
 Linking all workers to atomic queues, and the TX core to the single-link queue
 can be achieved like this:
@@ -276,7 +284,11 @@ can be achieved like this:
         uint8_t tx_port_id = 5;
         uint8_t atomic_qs[] = {0, 1};
         uint8_t single_link_q = 2;
+<<<<<<< doc/guides/prog_guide/eventdev.rst
         uin8t_t priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+=======
+        uint8_t priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+>>>>>>> doc/guides/prog_guide/eventdev.rst
 
         for(int worker_port_id = 1; worker_port_id <= 4; worker_port_id++) {
                 int links_made = rte_event_port_link(dev_id, worker_port_id, atomic_qs, NULL, 2);
diff --git a/doc/guides/prog_guide/generic_receive_offload_lib.rst b/doc/guides/prog_guide/generic_receive_offload_lib.rst
index 9c6a4d0..f79d3aa 100644
--- a/doc/guides/prog_guide/generic_receive_offload_lib.rst
+++ b/doc/guides/prog_guide/generic_receive_offload_lib.rst
@@ -191,3 +191,25 @@ Header fields deciding if packets are neighbors include:
         ignore IPv4 ID fields for the packets whose DF bit is 1.
         Additionally, packets which have different value of DF bit can't
         be merged.
+<<<<<<< doc/guides/prog_guide/generic_receive_offload_lib.rst
+=======
+
+GRO Library Limitations
+-----------------------
+
+- GRO library uses MBUF->l2_len/l3_len/l4_len/outer_l2_len/
+  outer_l3_len/packet_type to get protocol headers for the
+  input packet, rather than parsing the packet header. Therefore,
+  before call GRO APIs to merge packets, user applications
+  must set MBUF->l2_len/l3_len/l4_len/outer_l2_len/outer_l3_len/
+  packet_type to the same values as the protocol headers of the
+  packet.
+
+- GRO library doesn't support to process the packets with IPv4
+  Options or VLAN tagged.
+
+- GRO library just supports to process the packet organized
+  in a single MBUF. If the input packet consists of multiple
+  MBUFs (i.e. chained MBUFs), GRO reassembly behaviors are
+  unknown.
+>>>>>>> doc/guides/prog_guide/generic_receive_offload_lib.rst
diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst
index 33ea980..95fad64 100644
--- a/doc/guides/prog_guide/kernel_nic_interface.rst
+++ b/doc/guides/prog_guide/kernel_nic_interface.rst
@@ -225,7 +225,11 @@ application functions:
 
 ``config_promiscusity``:
 
+<<<<<<< doc/guides/prog_guide/kernel_nic_interface.rst
     Called when the user changes the promiscusity state of the KNI
+=======
+    Called when the user changes the promiscuity state of the KNI
+>>>>>>> doc/guides/prog_guide/kernel_nic_interface.rst
     interface.  For example, when the user runs ``ip link set promisc
     [on|off] dev <ifaceX>``. If the user sets this callback function to
     NULL, but sets the ``port_id`` field to a value other than -1, a default
diff --git a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
index 56abee5..142c3ba 100644
--- a/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
+++ b/doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
@@ -477,22 +477,38 @@ Create a bonded device in round robin mode with two slaves specified by their PC
 
 .. code-block:: console
 
+<<<<<<< doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
     $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0, slave=0000:00a:00.01,slave=0000:004:00.00' -- --port-topology=chained
+=======
+    $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00' -- --port-topology=chained
+>>>>>>> doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
 
 Create a bonded device in round robin mode with two slaves specified by their PCI address and an overriding MAC address:
 
 .. code-block:: console
 
+<<<<<<< doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
     $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0, slave=0000:00a:00.01,slave=0000:004:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained
+=======
+    $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=0,slave=0000:0a:00.01,slave=0000:04:00.00,mac=00:1e:67:1d:fd:1d' -- --port-topology=chained
+>>>>>>> doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
 
 Create a bonded device in active backup mode with two slaves specified, and a primary slave specified by their PCI addresses:
 
 .. code-block:: console
 
+<<<<<<< doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
     $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1, slave=0000:00a:00.01,slave=0000:004:00.00,primary=0000:00a:00.01' -- --port-topology=chained
+=======
+    $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=1,slave=0000:0a:00.01,slave=0000:04:00.00,primary=0000:0a:00.01' -- --port-topology=chained
+>>>>>>> doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
 
 Create a bonded device in balance mode with two slaves specified by their PCI addresses, and a transmission policy of layer 3 + 4 forwarding:
 
 .. code-block:: console
 
+<<<<<<< doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
     $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2, slave=0000:00a:00.01,slave=0000:004:00.00,xmit_policy=l34' -- --port-topology=chained
+=======
+    $RTE_TARGET/app/testpmd -l 0-3 -n 4 --vdev 'net_bonding0,mode=2,slave=0000:0a:00.01,slave=0000:04:00.00,xmit_policy=l34' -- --port-topology=chained
+>>>>>>> doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst
diff --git a/doc/guides/prog_guide/lpm_lib.rst b/doc/guides/prog_guide/lpm_lib.rst
index 99563a4..794929c 100644
--- a/doc/guides/prog_guide/lpm_lib.rst
+++ b/doc/guides/prog_guide/lpm_lib.rst
@@ -195,4 +195,8 @@ References
     `http://www.ietf.org/rfc/rfc1519 <http://www.ietf.org/rfc/rfc1519>`_
 
 *   Pankaj Gupta, Algorithms for Routing Lookups and Packet Classification, PhD Thesis, Stanford University,
+<<<<<<< doc/guides/prog_guide/lpm_lib.rst
     2000  (`http://klamath.stanford.edu/~pankaj/thesis/ thesis_1sided.pdf <http://klamath.stanford.edu/~pankaj/thesis/%20thesis_1sided.pdf>`_ )
+=======
+    2000  (`http://klamath.stanford.edu/~pankaj/thesis/thesis_1sided.pdf <http://klamath.stanford.edu/~pankaj/thesis/thesis_1sided.pdf>`_ )
+>>>>>>> doc/guides/prog_guide/lpm_lib.rst
diff --git a/doc/guides/prog_guide/metrics_lib.rst b/doc/guides/prog_guide/metrics_lib.rst
index e68e4e7..645d849 100644
--- a/doc/guides/prog_guide/metrics_lib.rst
+++ b/doc/guides/prog_guide/metrics_lib.rst
@@ -25,7 +25,11 @@ individual device. Since the metrics library is self-contained, the only
 restriction on port numbers is that they are less than ``RTE_MAX_ETHPORTS``
 - there is no requirement for the ports to actually exist.
 
+<<<<<<< doc/guides/prog_guide/metrics_lib.rst
 Initialising the library
+=======
+Initializing the library
+>>>>>>> doc/guides/prog_guide/metrics_lib.rst
 ------------------------
 
 Before the library can be used, it has to be initialized by calling
diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst
index 1384fe3..f4f5aab 100644
--- a/doc/guides/prog_guide/multi_proc_support.rst
+++ b/doc/guides/prog_guide/multi_proc_support.rst
@@ -176,7 +176,11 @@ Some of these are documented below:
 
 *   The use of function pointers between multiple processes running based of different compiled binaries is not supported,
     since the location of a given function in one process may be different to its location in a second.
+<<<<<<< doc/guides/prog_guide/multi_proc_support.rst
     This prevents the librte_hash library from behaving properly as in a multi-threaded instance,
+=======
+    This prevents the librte_hash library from behaving properly as in a multi-process instance,
+>>>>>>> doc/guides/prog_guide/multi_proc_support.rst
     since it uses a pointer to the hash function internally.
 
 To work around this issue, it is recommended that multi-process applications perform the hash calculations by directly calling
@@ -263,9 +267,15 @@ To send a request, a message descriptor ``rte_mp_msg`` must be populated.
 Additionally, a ``timespec`` value must be specified as a timeout, after which
 IPC will stop waiting and return.
 
+<<<<<<< doc/guides/prog_guide/multi_proc_support.rst
 For synchronous synchronous requests, the ``rte_mp_reply`` descriptor must also
 be created. This is where the responses will be stored. The list of fields that
 will be populated by IPC are as follows:
+=======
+For synchronous requests, the ``rte_mp_reply`` descriptor must also be created.
+This is where the responses will be stored.
+The list of fields that will be populated by IPC are as follows:
+>>>>>>> doc/guides/prog_guide/multi_proc_support.rst
 
 * ``nb_sent`` - number indicating how many requests were sent (i.e. how many
   peer processes were active at the time of the request).
@@ -273,7 +283,11 @@ will be populated by IPC are as follows:
   those peer processes that were active at the time of request, how many have
   replied)
 * ``msgs`` - pointer to where all of the responses are stored. The order in
+<<<<<<< doc/guides/prog_guide/multi_proc_support.rst
   which responses appear is undefined. Whendoing sycnrhonous requests, this
+=======
+  which responses appear is undefined. When doing synchronous requests, this
+>>>>>>> doc/guides/prog_guide/multi_proc_support.rst
   memory must be freed by the requestor after request completes!
 
 For asynchronous requests, a function pointer to the callback function must be
@@ -309,6 +323,16 @@ If a response is required, a new ``rte_mp_msg`` message descriptor must be
 constructed and sent via ``rte_mp_reply()`` function, along with ``peer``
 pointer. The resulting response will then be delivered to the correct requestor.
 
+<<<<<<< doc/guides/prog_guide/multi_proc_support.rst
+=======
+.. warning::
+    Simply returning a value when processing a request callback will not send a
+    response to the request - it must always be explicitly sent even in case
+    of errors. Implementation of error signalling rests with the application,
+    there is no built-in way to indicate success or error for a request. Failing
+    to do so will cause the requestor to time out while waiting on a response.
+
+>>>>>>> doc/guides/prog_guide/multi_proc_support.rst
 Misc considerations
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -318,6 +342,14 @@ supported. However, since sending messages (not requests) does not involve an
 IPC thread, sending messages while processing another message or request is
 supported.
 
+<<<<<<< doc/guides/prog_guide/multi_proc_support.rst
+=======
+Since the memory sybsystem 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.
+
+>>>>>>> doc/guides/prog_guide/multi_proc_support.rst
 Asynchronous request callbacks may be triggered either from IPC thread or from
 interrupt thread, depending on whether the request has timed out. It is
 therefore suggested to avoid waiting for interrupt-based events (such as alarms)
diff --git a/doc/guides/prog_guide/poll_mode_drv.rst b/doc/guides/prog_guide/poll_mode_drv.rst
index b2cf483..73eecc4 100644
--- a/doc/guides/prog_guide/poll_mode_drv.rst
+++ b/doc/guides/prog_guide/poll_mode_drv.rst
@@ -374,9 +374,15 @@ parameters to those ports.
   this argument allows user to specify which switch ports to enable port
   representors for.::
 
+<<<<<<< doc/guides/prog_guide/poll_mode_drv.rst
    -w BDBF,representor=0
    -w BDBF,representor=[0,4,6,9]
    -w BDBF,representor=[0-31]
+=======
+   -w DBDF,representor=0
+   -w DBDF,representor=[0,4,6,9]
+   -w DBDF,representor=[0-31]
+>>>>>>> doc/guides/prog_guide/poll_mode_drv.rst
 
 Note: PMDs are not required to support the standard device arguments and users
 should consult the relevant PMD documentation to see support devargs.
diff --git a/doc/guides/prog_guide/power_man.rst b/doc/guides/prog_guide/power_man.rst
index 68b7e8b..3fa8a18 100644
--- a/doc/guides/prog_guide/power_man.rst
+++ b/doc/guides/prog_guide/power_man.rst
@@ -184,7 +184,11 @@ API Overview for Empty Poll Power Management
 
 * **Update Valid Poll Counter**: update the valid poll counter.
 
+<<<<<<< doc/guides/prog_guide/power_man.rst
 * **Set the Fequence Index**: update the power state/frequency mapping.
+=======
+* **Set the Frequency Index**: update the power state/frequency mapping.
+>>>>>>> doc/guides/prog_guide/power_man.rst
 
 * **Detect empty poll state change**: empty poll state change detection algorithm then take action.
 
@@ -195,6 +199,14 @@ The mechanism can applied to any device which is based on polling. e.g. NIC, FPG
 References
 ----------
 
+<<<<<<< doc/guides/prog_guide/power_man.rst
 *   l3fwd-power: The sample application in DPDK that performs L3 forwarding with power management.
 
 *   The "L3 Forwarding with Power Management Sample Application" chapter in the *DPDK Sample Application's User Guide*.
+=======
+*   The :doc:`../sample_app_ug/l3_forward_power_man`
+    chapter in the :doc:`../sample_app_ug/index` section.
+
+*   The :doc:`../sample_app_ug/vm_power_management`
+    chapter in the :doc:`../sample_app_ug/index` section.
+>>>>>>> doc/guides/prog_guide/power_man.rst
diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst
index 02f0561..fa16fa6 100644
--- a/doc/guides/prog_guide/profile_app.rst
+++ b/doc/guides/prog_guide/profile_app.rst
@@ -64,7 +64,11 @@ The default ``cntvct_el0`` based ``rte_rdtsc()`` provides a portable means to
 get a wall clock counter in user space. Typically it runs at <= 100MHz.
 
 The alternative method to enable ``rte_rdtsc()`` for a high resolution wall
+<<<<<<< doc/guides/prog_guide/profile_app.rst
 clock counter is through the armv8 PMU subsystem. The PMU cycle counter runs
+=======
+clock counter is through the ARMv8 PMU subsystem. The PMU cycle counter runs
+>>>>>>> doc/guides/prog_guide/profile_app.rst
 at CPU frequency. However, access to the PMU cycle counter from user space is
 not enabled by default in the arm64 linux kernel. It is possible to enable
 cycle counter for user space access by configuring the PMU from the privileged
@@ -75,7 +79,11 @@ scheme.  Application can choose the PMU based implementation with
 ``CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU``.
 
 The example below shows the steps to configure the PMU based cycle counter on
+<<<<<<< doc/guides/prog_guide/profile_app.rst
 an armv8 machine.
+=======
+an ARMv8 machine.
+>>>>>>> doc/guides/prog_guide/profile_app.rst
 
 .. code-block:: console
 
diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
index c186375..c767e46 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2131,7 +2131,11 @@ as defined in the ``rte_flow_action_raw_decap``
 
 This action modifies the payload of matched flows. The data supplied must
 be a valid header, either holding layer 2 data in case of removing layer 2
+<<<<<<< doc/guides/prog_guide/rte_flow.rst
 before eincapsulation of layer 3 tunnel (for example MPLSoGRE) or complete
+=======
+before encapsulation of layer 3 tunnel (for example MPLSoGRE) or complete
+>>>>>>> doc/guides/prog_guide/rte_flow.rst
 tunnel definition starting from layer 2 and moving to the tunnel item itself.
 When applied to the original packet the resulting packet must be a
 valid packet.
@@ -2281,7 +2285,11 @@ Action: ``DEC_TTL``
 Decrease TTL value.
 
 If there is no valid RTE_FLOW_ITEM_TYPE_IPV4 or RTE_FLOW_ITEM_TYPE_IPV6
+<<<<<<< doc/guides/prog_guide/rte_flow.rst
 in pattern, Some PMDs will reject rule because behaviour will be undefined.
+=======
+in pattern, Some PMDs will reject rule because behavior will be undefined.
+>>>>>>> doc/guides/prog_guide/rte_flow.rst
 
 .. _table_rte_flow_action_dec_ttl:
 
@@ -2299,7 +2307,11 @@ Action: ``SET_TTL``
 Assigns a new TTL value.
 
 If there is no valid RTE_FLOW_ITEM_TYPE_IPV4 or RTE_FLOW_ITEM_TYPE_IPV6
+<<<<<<< doc/guides/prog_guide/rte_flow.rst
 in pattern, Some PMDs will reject rule because behaviour will be undefined.
+=======
+in pattern, Some PMDs will reject rule because behavior will be undefined.
+>>>>>>> doc/guides/prog_guide/rte_flow.rst
 
 .. _table_rte_flow_action_set_ttl:
 
@@ -2314,7 +2326,14 @@ in pattern, Some PMDs will reject rule because behaviour will be undefined.
 Action: ``SET_MAC_SRC``
 ^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< doc/guides/prog_guide/rte_flow.rst
 Set source MAC address
+=======
+Set source MAC address.
+
+It must be used with a valid RTE_FLOW_ITEM_TYPE_ETH flow pattern item.
+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
+>>>>>>> doc/guides/prog_guide/rte_flow.rst
 
 .. _table_rte_flow_action_set_mac_src:
 
@@ -2329,7 +2348,14 @@ Set source MAC address
 Action: ``SET_MAC_DST``
 ^^^^^^^^^^^^^^^^^^^^^^^
 
+<<<<<<< doc/guides/prog_guide/rte_flow.rst
 Set source MAC address
+=======
+Set destination MAC address.
+
+It must be used with a valid RTE_FLOW_ITEM_TYPE_ETH flow pattern item.
+Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
+>>>>>>> doc/guides/prog_guide/rte_flow.rst
 
 .. _table_rte_flow_action_set_mac_dst:
 
@@ -2719,7 +2745,11 @@ Caveats
 - API operations are synchronous and blocking (``EAGAIN`` cannot be
   returned).
 
+<<<<<<< doc/guides/prog_guide/rte_flow.rst
 - There is no provision for reentrancy/multi-thread safety, although nothing
+=======
+- There is no provision for re-entrancy/multi-thread safety, although nothing
+>>>>>>> doc/guides/prog_guide/rte_flow.rst
   should prevent different devices from being configured at the same
   time. PMDs may protect their control path functions accordingly.
 
diff --git a/doc/guides/prog_guide/rte_security.rst b/doc/guides/prog_guide/rte_security.rst
index cb70caa..f0fd2f0 100644
--- a/doc/guides/prog_guide/rte_security.rst
+++ b/doc/guides/prog_guide/rte_security.rst
@@ -40,7 +40,11 @@ Inline Crypto
 ~~~~~~~~~~~~~
 
 RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO:
+<<<<<<< doc/guides/prog_guide/rte_security.rst
 The crypto processing for security protocol (e.g. IPSec) is processed
+=======
+The crypto processing for security protocol (e.g. IPsec) is processed
+>>>>>>> doc/guides/prog_guide/rte_security.rst
 inline during receive and transmission on NIC port. The flow based
 security action should be configured on the port.
 
@@ -48,7 +52,11 @@ Ingress Data path - The packet is decrypted in RX path and relevant
 crypto status is set in Rx descriptors. After the successful inline
 crypto processing the packet is presented to host as a regular Rx packet
 however all security protocol related headers are still attached to the
+<<<<<<< doc/guides/prog_guide/rte_security.rst
 packet. e.g. In case of IPSec, the IPSec tunnel headers (if any),
+=======
+packet. e.g. In case of IPsec, the IPsec tunnel headers (if any),
+>>>>>>> doc/guides/prog_guide/rte_security.rst
 ESP/AH headers will remain in the packet but the received packet
 contains the decrypted data where the encrypted data was when the packet
 arrived. The driver Rx path check the descriptors and and based on the
@@ -111,7 +119,11 @@ Inline protocol offload
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL:
+<<<<<<< doc/guides/prog_guide/rte_security.rst
 The crypto and protocol processing for security protocol (e.g. IPSec)
+=======
+The crypto and protocol processing for security protocol (e.g. IPsec)
+>>>>>>> doc/guides/prog_guide/rte_security.rst
 is processed inline during receive and transmission.  The flow based
 security action should be configured on the port.
 
@@ -119,7 +131,11 @@ Ingress Data path - The packet is decrypted in the RX path and relevant
 crypto status is set in the Rx descriptors. After the successful inline
 crypto processing the packet is presented to the host as a regular Rx packet
 but all security protocol related headers are optionally removed from the
+<<<<<<< doc/guides/prog_guide/rte_security.rst
 packet. e.g. in the case of IPSec, the IPSec tunnel headers (if any),
+=======
+packet. e.g. in the case of IPsec, the IPsec tunnel headers (if any),
+>>>>>>> doc/guides/prog_guide/rte_security.rst
 ESP/AH headers will be removed from the packet and the received packet
 will contains the decrypted packet only. The driver Rx path checks the
 descriptors and based on the crypto status sets additional flags in
@@ -132,7 +148,11 @@ to identify the security processing done on the packet.
     The underlying device in this case is stateful. It is expected that
     the device shall support crypto processing for all kind of packets matching
     to a given flow, this includes fragmented packets (post reassembly).
+<<<<<<< doc/guides/prog_guide/rte_security.rst
     E.g. in case of IPSec the device may internally manage anti-replay etc.
+=======
+    E.g. in case of IPsec the device may internally manage anti-replay etc.
+>>>>>>> doc/guides/prog_guide/rte_security.rst
     It will provide a configuration option for anti-replay behavior i.e. to drop
     the packets or pass them to driver with error flags set in the descriptor.
 
@@ -150,7 +170,11 @@ to cross the MTU size.
 .. note::
 
     The underlying device will manage state information required for egress
+<<<<<<< doc/guides/prog_guide/rte_security.rst
     processing. E.g. in case of IPSec, the seq number will be added to the
+=======
+    processing. E.g. in case of IPsec, the seq number will be added to the
+>>>>>>> doc/guides/prog_guide/rte_security.rst
     packet, however the device shall provide indication when the sequence number
     is about to overflow. The underlying device may support post encryption TSO.
 
@@ -199,13 +223,21 @@ crypto device.
 Decryption: The packet is sent to the crypto device for security
 protocol processing. The device will decrypt the packet and it will also
 optionally remove additional security headers from the packet.
+<<<<<<< doc/guides/prog_guide/rte_security.rst
 E.g. in case of IPSec, IPSec tunnel headers (if any), ESP/AH headers
+=======
+E.g. in case of IPsec, IPsec tunnel headers (if any), ESP/AH headers
+>>>>>>> doc/guides/prog_guide/rte_security.rst
 will be removed from the packet and the decrypted packet may contain
 plain data only.
 
 .. note::
 
+<<<<<<< doc/guides/prog_guide/rte_security.rst
     In case of IPSec the device may internally manage anti-replay etc.
+=======
+    In case of IPsec the device may internally manage anti-replay etc.
+>>>>>>> doc/guides/prog_guide/rte_security.rst
     It will provide a configuration option for anti-replay behavior i.e. to drop
     the packets or pass them to driver with error flags set in descriptor.
 
@@ -217,7 +249,11 @@ for any protocol header addition.
 
 .. note::
 
+<<<<<<< doc/guides/prog_guide/rte_security.rst
     In the case of IPSec, the seq number will be added to the packet,
+=======
+    In the case of IPsec, the seq number will be added to the packet,
+>>>>>>> doc/guides/prog_guide/rte_security.rst
     It shall provide an indication when the sequence number is about to
     overflow.
 
@@ -549,7 +585,11 @@ IPsec related configuration parameters are defined in ``rte_security_ipsec_xform
         struct rte_security_ipsec_sa_options options;
         /**< various SA options */
         enum rte_security_ipsec_sa_direction direction;
+<<<<<<< doc/guides/prog_guide/rte_security.rst
         /**< IPSec SA Direction - Egress/Ingress */
+=======
+        /**< IPsec SA Direction - Egress/Ingress */
+>>>>>>> doc/guides/prog_guide/rte_security.rst
         enum rte_security_ipsec_sa_protocol proto;
         /**< IPsec SA Protocol - AH/ESP */
         enum rte_security_ipsec_sa_mode mode;
diff --git a/doc/guides/prog_guide/traffic_management.rst b/doc/guides/prog_guide/traffic_management.rst
index 98ac431..54c4550 100644
--- a/doc/guides/prog_guide/traffic_management.rst
+++ b/doc/guides/prog_guide/traffic_management.rst
@@ -39,7 +39,11 @@ whether a specific implementation does meet the needs to the user application.
 At the TM level, users can get high level idea with the help of various
 parameters such as maximum number of nodes, maximum number of hierarchical
 levels, maximum number of shapers, maximum number of private shapers, type of
+<<<<<<< doc/guides/prog_guide/traffic_management.rst
 scheduling algorithm (Strict Priority, Weighted Fair Queueing , etc.), etc.,
+=======
+scheduling algorithm (Strict Priority, Weighted Fair Queuing , etc.), etc.,
+>>>>>>> doc/guides/prog_guide/traffic_management.rst
 supported by the implementation.
 
 Likewise, users can query the capability of the TM at the hierarchical level to
diff --git a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst
index c77df33..a573191 100644
--- a/doc/guides/prog_guide/vhost_lib.rst
+++ b/doc/guides/prog_guide/vhost_lib.rst
@@ -63,7 +63,11 @@ The following is an overview of some key Vhost API functions:
       512).
 
     * zero copy is really good for VM2VM case. For iperf between two VMs, the
+<<<<<<< doc/guides/prog_guide/vhost_lib.rst
       boost could be above 70% (when TSO is enableld).
+=======
+      boost could be above 70% (when TSO is enabled).
+>>>>>>> doc/guides/prog_guide/vhost_lib.rst
 
     * For zero copy in VM2NIC case, guest Tx used vring may be starved if the
       PMD driver consume the mbuf but not release them timely.
diff --git a/doc/guides/rawdevs/ifpga_rawdev.rst b/doc/guides/rawdevs/ifpga_rawdev.rst
index d400db6..8e5aa0d 100644
--- a/doc/guides/rawdevs/ifpga_rawdev.rst
+++ b/doc/guides/rawdevs/ifpga_rawdev.rst
@@ -91,7 +91,11 @@ Run-time parameters
 -------------------
 
 This driver is invoked automatically in systems added with Intel FPGA,
+<<<<<<< doc/guides/rawdevs/ifpga_rawdev.rst
 but PR and IFPGA Bus scan is trigged by command line using
+=======
+but PR and IFPGA Bus scan is triggered by command line using
+>>>>>>> doc/guides/rawdevs/ifpga_rawdev.rst
 ``--vdev 'ifpga_rawdev_cfg`` EAL option.
 
 The following device parameters are supported:
diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst
index a1face9..01c10f3 100644
--- a/doc/guides/rel_notes/known_issues.rst
+++ b/doc/guides/rel_notes/known_issues.rst
@@ -676,7 +676,11 @@ igb uio legacy mode can not be used in X710/XL710/XXV710
 
 **Description**:
    X710/XL710/XXV710 NICs lack support for indicating INTx is asserted via the interrupt
+<<<<<<< doc/guides/rel_notes/known_issues.rst
    bit in the PCI status register. Linux delected them from INTx support table. The related
+=======
+   bit in the PCI status register. Linux deleted them from INTx support table. The related
+>>>>>>> doc/guides/rel_notes/known_issues.rst
    `commit <https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/drivers/pci/quirks.c?id=8bcf4525c5d43306c5fd07e132bc8650e3491aec>`_.
 
 **Implication**:
@@ -722,9 +726,15 @@ Linux kernel 4.10.0 iommu attribute read error
 **Description**:
    When VT-d is enabled (``iommu=pt intel_iommu=on``), reading IOMMU attributes from
    /sys/devices/virtual/iommu/dmarXXX/intel-iommu/cap on Linux kernel 4.10.0 error.
+<<<<<<< doc/guides/rel_notes/known_issues.rst
    This bug is fixed in `Linux commmit a7fdb6e648fb
    <https://patchwork.kernel.org/patch/9595727/>`_,
    This bug is introduced in `Linux commmit 39ab9555c241
+=======
+   This bug is fixed in `Linux commit a7fdb6e648fb
+   <https://patchwork.kernel.org/patch/9595727/>`_,
+   This bug is introduced in `Linux commit 39ab9555c241
+>>>>>>> doc/guides/rel_notes/known_issues.rst
    <https://patchwork.kernel.org/patch/9554403/>`_,
 
 **Implication**:
@@ -826,3 +836,41 @@ Kernel crash when hot-unplug igb_uio device while DPDK application is running
 
 **Driver/Module**:
    ``igb_uio`` module.
+<<<<<<< doc/guides/rel_notes/known_issues.rst
+=======
+
+
+AVX-512 support disabled
+------------------------
+
+**Description**:
+   ``AVX-512`` support has been disabled on some conditions.
+   This shouldn't be confused with ``CONFIG_RTE_ENABLE_AVX512`` config option which is already
+   disabled by default. This config option defines if ``AVX-512`` specific implementations of
+   some file to be used or not. What has been disabled is compiler feature to produce ``AVX-512``
+   instructions from any source code.
+
+   On DPDK v18.11 ``AVX-512`` is disabled for all ``GCC`` builds which reported to cause a performance
+   drop.
+
+   On DPDK v19.02 ``AVX-512`` disable scope is reduced to ``GCC`` and ``binutils version 2.30`` based
+   on information accrued from the GCC community defect.
+
+**Reason**:
+   Generated ``AVX-512`` code cause crash:
+   https://bugs.dpdk.org/show_bug.cgi?id=97
+   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88096
+
+**Resolution/Workaround**:
+   * Update ``binutils`` to newer version than ``2.30``.
+
+   OR
+
+   * Use different compiler, like ``clang`` for this case.
+
+**Affected Environment/Platform**:
+    ``GCC`` and ``binutils version 2.30``.
+
+**Driver/Module**:
+    ALL.
+>>>>>>> doc/guides/rel_notes/known_issues.rst
diff --git a/doc/guides/rel_notes/release_17_11.rst b/doc/guides/rel_notes/release_17_11.rst
index 2a93af3..da39952 100644
--- a/doc/guides/rel_notes/release_17_11.rst
+++ b/doc/guides/rel_notes/release_17_11.rst
@@ -168,7 +168,11 @@ New Features
   * The DES CBC algorithm.
   * The DES DOCSIS BPI algorithm.
 
+<<<<<<< doc/guides/rel_notes/release_17_11.rst
   This change requires version 0.47 of the IPSec Multi-buffer library. For
+=======
+  This change requires version 0.47 of the IPsec Multi-buffer library. For
+>>>>>>> doc/guides/rel_notes/release_17_11.rst
   more details see the :doc:`../cryptodevs/aesni_mb` documentation.
 
 * **Updated the OpenSSL PMD.**
@@ -198,7 +202,11 @@ New Features
 * **Added the Security Offload Library.**
 
   Added an experimental library - ``rte_security``. This provide security APIs
+<<<<<<< doc/guides/rel_notes/release_17_11.rst
   for protocols like IPSec using inline ipsec offload to ethernet devices or
+=======
+  for protocols like IPsec using inline ipsec offload to ethernet devices or
+>>>>>>> doc/guides/rel_notes/release_17_11.rst
   full protocol offload with lookaside crypto devices.
 
   See the :doc:`../prog_guide/rte_security` section of the DPDK Programmers
@@ -207,11 +215,19 @@ New Features
 * **Updated the DPAA2_SEC crypto driver to support rte_security.**
 
   Updated the ``dpaa2_sec`` crypto PMD to support ``rte_security`` lookaside
+<<<<<<< doc/guides/rel_notes/release_17_11.rst
   protocol offload for IPSec.
 
 * **Updated the IXGBE ethernet driver to support rte_security.**
 
   Updated ixgbe ethernet PMD to support ``rte_security`` inline IPSec offload.
+=======
+  protocol offload for IPsec.
+
+* **Updated the IXGBE ethernet driver to support rte_security.**
+
+  Updated ixgbe ethernet PMD to support ``rte_security`` inline IPsec offload.
+>>>>>>> doc/guides/rel_notes/release_17_11.rst
 
 * **Updated i40e driver to support GTP-C/GTP-U.**
 
@@ -509,7 +525,11 @@ ABI Changes
 * **New parameter added to rte_eth_dev.**
 
   A new parameter ``security_ctx`` has been added to ``rte_eth_dev`` to
+<<<<<<< doc/guides/rel_notes/release_17_11.rst
   support security operations like IPSec inline.
+=======
+  support security operations like IPsec inline.
+>>>>>>> doc/guides/rel_notes/release_17_11.rst
 
 * **New parameter added to rte_cryptodev.**
 
diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst
index 65bab55..7a5b91e 100644
--- a/doc/guides/rel_notes/release_18_11.rst
+++ b/doc/guides/rel_notes/release_18_11.rst
@@ -861,3 +861,833 @@ Tested Platforms
 
      * Ubuntu 18.04.1 LTS with NXP QorIQ LSDK 1809 support packages
      * Ubuntu 16.04.3 LTS with NXP QorIQ LSDK 1803 support packages
+<<<<<<< doc/guides/rel_notes/release_18_11.rst
+=======
+
+18.11.1  Release Notes
+----------------------
+
+18.11.1 Fixes
+~~~~~~~~~~~~~
+
+* app/bbdev: fix return value check
+* app/eventdev: detect deadlock for timer event producer
+* app/pdump: fix vdev cleanup
+* app/testpmd: expand RED queue thresholds to 64 bits
+* app/testpmd: fix MPLS BoS bit default value
+* app/testpmd: fix MPLSoGRE encapsulation
+* app/testpmd: fix MPLSoUDP encapsulation
+* app/testpmd: fix quit to stop all ports before close
+* app/testpmd: fix Tx metadata show command
+* bb/turbo_sw: fix dynamic linking
+* build: fix meson check for binutils 2.30
+* build: fix variable name in dependency error message
+* build: mention -march in pkg-config description
+* build: use static deps for pkg-config libs.private
+* bus/dpaa: do nothing if bus not present
+* bus/dpaa: fix logical to physical core affine logic
+* bus/fslmc: fix parse method for bus devices
+* bus/fslmc: fix ring mode to use correct cache settings
+* bus/fslmc: fix to convert error msg to warning
+* bus/fslmc: fix to reset portal memory before use
+* bus/fslmc: fix to use correct physical core for logical core
+* bus/ifpga: fix AFU probe failure handler
+* bus/ifpga: fix build for cpp applications
+* bus/ifpga: fix forcing optional devargs
+* bus/vmbus: fix race in subchannel creation
+* common/qat: remove check of valid firmware response
+* compressdev: fix structure comment
+* compress/qat: fix dequeue error counter
+* compress/qat: fix returned status on overflow
+* compress/qat: fix return on building request error
+* config: enable C11 memory model for armv8 with meson
+* crypto/dpaa2_sec: fix FLC address for physical mode
+* crypto/qat: fix block size error handling
+* crypto/qat: fix digest in wireless auth case
+* crypto/qat: fix message for CCM when setting unused counter
+* crypto/qat: fix message for NULL algo setting unused counter
+* devtools: fix build check for whether meson has run
+* devtools: fix return of forbidden addition checks
+* devtools: fix symbol check when adding experimental section
+* devtools: fix wrong headline lowercase for arm
+* doc: add dependency for PDF in contributing guide
+* doc: add GCM AAD limitation in qat guide
+* doc: add GRO limitations in programmers guide
+* doc: add missing loopback option in testpmd guide
+* doc: clarify libnuma requirement for NUMA systems
+* doc: fix AESNI_MB guide
+* doc: fix a parameter name in testpmd guide
+* doc: fix a typo in power management guide
+* doc: fix a typo in testpmd guide
+* doc: fix a typo in testpmd guide
+* doc: fix flow action command names in testpmd guide
+* doc: fix garbage text in generated HTML guides
+* doc: fix ifc naming
+* doc: fix MAC address rewrite actions in prog guide
+* doc: fix references in power management guide
+* doc: remove note on memory mode limitation in multi-process
+* drivers/crypto: fix PMDs memory leak
+* drivers: fix sprintf with snprintf
+* drivers/net: fix several Tx prepare functions
+* eal/bsd: remove clean up of files at startup
+* eal: check string parameter lengths
+* eal: clean up unused files on initialization
+* eal: close multi-process socket during cleanup
+* eal: fix build of external app with clang on armv8
+* eal: fix clang build with intrinsics forced
+* eal: fix core number validation
+* eal: fix detection of duplicate option register
+* eal: fix leak on multi-process request error
+* eal: fix log level of error in option register
+* eal: fix missing newline in a log
+* eal: fix out of bound access when no CPU available
+* eal: fix strdup usages in internal config
+* eal/linux: fix parsing zero socket memory and limits
+* efd: fix tail queue leak
+* ethdev: declare Tx prepare API as not experimental
+* ethdev: fix errno to have positive value
+* ethdev: fix typo in queue setup error log
+* eventdev: fix error log in eth Rx adapter
+* eventdev: fix eth Tx adapter queue count checks
+* eventdev: fix xstats documentation typo
+* eventdev: remove redundant timer adapter function prototypes
+* examples/bond: fix crash when there is no active slave
+* examples/bond: fix initialization order
+* examples/flow_filtering: fix example documentation
+* examples/ipsec-secgw: fix crypto-op might never get dequeued
+* examples/ipsec-secgw: fix inbound SA checking
+* examples/ipsec-secgw: fix outbound codepath for single SA
+* examples/ipsec-secgw: make local variables static
+* examples/kni: fix crash while handling userspace request
+* examples/tep_term: remove unused constant
+* examples/vhost_crypto: fix bracket
+* examples/vhost: fix a typo
+* examples/vhost: fix path allocation failure handling
+* gro: check invalid TCP header length
+* gro: fix overflow of payload length calculation
+* gso: fix VxLAN/GRE tunnel checks
+* hash: fix out-of-bound write while freeing key slot
+* hash: fix return of bulk lookup
+* ip_frag: fix IPv6 when MTU sizes not aligned to 8 bytes
+* kni: fix build for dev_open in Linux 5.0
+* kni: fix build for igb_ndo_bridge_setlink in Linux 5.0
+* kni: fix build on RHEL 8
+* kni: fix build on RHEL8 for arm and Power9
+* malloc: fix deadlock when reading stats
+* malloc: fix duplicate mem event notification
+* malloc: fix finding maximum contiguous IOVA size
+* malloc: make alignment requirements more stringent
+* malloc: notify primary process about hotplug in secondary
+* mem: check for memfd support in segment fd API
+* mem: fix segment fd API error code for external segment
+* mem: fix storing old policy
+* mem: fix variable shadowing
+* memzone: fix unlock on initialization failure
+* mk: do not install meson.build in usertools
+* mk: fix scope of disabling AVX512F support
+* net/af_packet: fix setting MTU decrements sockaddr twice
+* net/avf/base: fix comment referencing internal data
+* net/bnx2x: cleanup info logs
+* net/bnx2x: fix segfaults due to stale interrupt status
+* net/bonding: fix possible null pointer reference
+* net/bonding: fix reset active slave
+* net/cxgbe: fix control queue mbuf pool naming convention
+* net/cxgbe: fix overlapping regions in TID table
+* net/cxgbe: skip parsing match items with no spec
+* net/dpaa2: fix bad check for not-null
+* net/dpaa2: fix device init for secondary process
+* net/dpaa: fix secondary process
+* net/ena: add reset reason in Rx error
+* net/ena: add supported RSS offloads types
+* net/ena: destroy queues if start failed
+* net/ena: do not reconfigure queues on reset
+* net/ena: fix cleanup for out of order packets
+* net/ena: fix dev init with multi-process
+* net/ena: fix errno to positive value
+* net/ena: fix invalid reference to variable in union
+* net/ena: skip packet with wrong request id
+* net/ena: update completion queue after cleanup
+* net/enic: remove useless include
+* net: fix underflow for checksum of invalid IPv4 packets
+* net/fm10k: fix internal switch initial status
+* net/i40e: clear VF reset flags after reset
+* net/i40e: fix config name in comment
+* net/i40e: fix get RSS conf
+* net/i40e: fix getting RSS configuration
+* net/i40e: fix overwriting RSS RETA
+* net/i40e: fix port close
+* net/i40e: fix queue region DCB configure
+* net/i40e: fix statistics
+* net/i40e: fix statistics inconsistency
+* net/i40e: fix using recovery mode firmware
+* net/i40e: fix VF overwrite PF RSS LUT for X722
+* net/i40e: perform basic validation on VF messages
+* net/i40e: remove redundant reset of queue number
+* net/i40e: revert fix offload not supported mask
+* net/ifc: store only registered device instance
+* net/ifcvf: fix typo on struct name
+* net/igb: fix LSC interrupt when using MSI-X
+* net/ixgbe/base: add LHA ID
+* net/ixgbe: fix crash on remove
+* net/ixgbe: fix over using multicast table for VF
+* net/ixgbe: fix overwriting RSS RETA
+* net/ixgbe: fix Rx LRO capability offload for x550
+* net/mlx5: fix build for armv8
+* net/mlx5: fix deprecated library API for Rx padding
+* net/mlx5: fix function documentation
+* net/mlx5: fix instruction hotspot on replenishing Rx buffer
+* net/mlx5: fix Multi-Packet RQ mempool free
+* net/mlx5: fix Rx packet padding
+* net/mlx5: fix shared counter allocation logic
+* net/mlx5: fix TC rule handle assignment
+* net/mlx5: fix typos and code style
+* net/mlx5: fix validation of Rx queue number
+* net/mlx5: fix VXLAN port registration race condition
+* net/mlx5: fix VXLAN without decap action for E-Switch
+* net/mlx5: remove checks for outer tunnel items on E-Switch
+* net/mlx5: support ethernet type for tunnels on E-Switch
+* net/mlx5: support tunnel inner items on E-Switch
+* net/mlx5: validate ethernet type on E-Switch
+* net/mlx5: validate tunnel inner items on E-Switch
+* net/netvsc: disable multi-queue on older servers
+* net/netvsc: enable SR-IOV
+* net/netvsc: fix probe when VF not found
+* net/netvsc: fix transmit descriptor pool cleanup
+* net/qede: fix performance bottleneck in Rx path
+* net/qede: remove prefetch in Tx path
+* net/sfc: add missing header guard to TSO header file
+* net/sfc/base: fix Tx descriptor max number check
+* net/sfc: discard last seen VLAN TCI if Tx packet is dropped
+* net/sfc: fix crash in EF10 TSO if no payload
+* net/sfc: fix datapath name references in logs
+* net/sfc: fix port ID log
+* net/sfc: fix Rx packets counter
+* net/sfc: fix typo in preprocessor check
+* net/sfc: fix VF error/missed stats mapping
+* net/sfc: pass HW Tx queue index on creation
+* net/tap: add buffer overflow checks before checksum
+* net/tap: allow full length names
+* net/tap: fix possible uninitialized variable access
+* net/tap: let kernel choose tun device name
+* net/vhost: fix double free of MAC address
+* net/virtio: add barrier before reading the flags
+* net/virtio-user: fix used ring in cvq handling
+* raw/ifpga: fix memory leak
+* Revert "net/mlx5: fix instruction hotspot on replenishing Rx buffer"
+* sched: fix memory leak on init failure
+* telemetry: fix using ports of different types
+* test: check zero socket memory as valid
+* test/crypto: fix misleading trace message
+* test/fbarray: add to meson
+* test/hash: fix perf result
+* test/mem: add external mem autotest to meson
+* test/metrics: fix a negative case
+* timer: fix race condition
+* version: 18.11.1-rc1
+* version: 18.11.1-rc2
+* vfio: allow secondary process to query IOMMU type
+* vfio: do not unregister callback in secondary process
+* vfio: fix error message
+* vhost/crypto: fix possible dead loop
+* vhost/crypto: fix possible out of bound access
+* vhost: enforce avail index and desc read ordering
+* vhost: enforce desc flags and content read ordering