DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] version: 20.11-rc0
@ 2020-08-10 15:15 Thomas Monjalon
  2020-08-11  9:31 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
                   ` (3 more replies)
  0 siblings, 4 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-10 15:15 UTC (permalink / raw)
  To: dev; +Cc: david.marchand

Start a new release cycle with empty release notes.
ABI check is disabled in 20.11 cycle.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 .travis.yml                            |  26 -----
 ABI_VERSION                            |   2 +-
 VERSION                                |   2 +-
 doc/guides/rel_notes/index.rst         |   1 +
 doc/guides/rel_notes/release_20_11.rst | 136 +++++++++++++++++++++++++
 5 files changed, 139 insertions(+), 28 deletions(-)
 create mode 100644 doc/guides/rel_notes/release_20_11.rst

diff --git a/.travis.yml b/.travis.yml
index 14f8124233..d6eeab371d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@
 language: c
 cache:
   ccache: true
-  directories:
-    - libabigail
-    - reference
 
 dist: bionic
 
@@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
 
-_libabigail_build_packages: &libabigail_build_packages
-  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
-
 _build_32b_packages: &build_32b_packages
   - *required_packages
   - [gcc-multilib]
@@ -34,10 +28,6 @@ _doc_packages: &doc_packages
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 script: ./.ci/${TRAVIS_OS_NAME}-build.sh
 
-env:
-  global:
-    - REF_GIT_TAG=v20.05
-
 jobs:
   include:
   # x86_64 gcc jobs
@@ -55,14 +45,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: amd64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # x86_64 clang jobs
   - env: DEF_LIB="static"
     arch: amd64
@@ -116,14 +98,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: arm64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # aarch64 clang jobs
   - env: DEF_LIB="static"
     arch: arm64
diff --git a/ABI_VERSION b/ABI_VERSION
index a9ac8dacb0..0ffaf17a11 100644
--- a/ABI_VERSION
+++ b/ABI_VERSION
@@ -1 +1 @@
-20.0.3
+20.0.4
diff --git a/VERSION b/VERSION
index 85e33446f8..8b0beab16a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.08.0
+20.11.0
diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index 05c9d837a4..fb70d1a5f3 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -8,6 +8,7 @@ Release Notes
     :maxdepth: 1
     :numbered:
 
+    release_20_11
     release_20_08
     release_20_05
     release_20_02
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
new file mode 100644
index 0000000000..df227a1773
--- /dev/null
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -0,0 +1,136 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2020 The DPDK contributors
+
+.. include:: <isonum.txt>
+
+DPDK Release 20.11
+==================
+
+.. **Read this first.**
+
+   The text in the sections below explains how to update the release notes.
+
+   Use proper spelling, capitalization and punctuation in all sections.
+
+   Variable and config names should be quoted as fixed width text:
+   ``LIKE_THIS``.
+
+   Build the docs and view the output file to ensure the changes are correct::
+
+      make doc-guides-html
+      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
+
+
+New Features
+------------
+
+.. This section should contain new features added in this release.
+   Sample format:
+
+   * **Add a title in the past tense with a full stop.**
+
+     Add a short 1-2 sentence description in the past tense.
+     The description should be enough to allow someone scanning
+     the release notes to understand the new feature.
+
+     If the feature adds a lot of sub-features you can use a bullet list
+     like this:
+
+     * Added feature foo to do something.
+     * Enhanced feature bar to do something else.
+
+     Refer to the previous release notes for examples.
+
+     Suggested order in release notes items:
+     * Core libs (EAL, mempool, ring, mbuf, buses)
+     * Device abstraction libs and PMDs
+       - ethdev (lib, PMDs)
+       - cryptodev (lib, PMDs)
+       - eventdev (lib, PMDs)
+       - etc
+     * Other libs
+     * Apps, Examples, Tools (if significant)
+
+     This section is a comment. Do not overwrite or remove it.
+     Also, make sure to start the actual text at the margin.
+     =======================================================
+
+
+Removed Items
+-------------
+
+.. This section should contain removed items in this release. Sample format:
+
+   * Add a short 1-2 sentence description of the removed item
+     in the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+API Changes
+-----------
+
+.. This section should contain API changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the API change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+ABI Changes
+-----------
+
+.. This section should contain ABI changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the ABI change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Known Issues
+------------
+
+.. This section should contain new known issues in this release. Sample format:
+
+   * **Add title in present tense with full stop.**
+
+     Add a short 1-2 sentence description of the known issue
+     in the present tense. Add information on any known workarounds.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Tested Platforms
+----------------
+
+.. This section should contain a list of platforms that were tested
+   with this release.
+
+   The format is:
+
+   * <vendor> platform with <vendor> <type of devices> combinations
+
+     * List of CPU
+     * List of OS
+     * List of devices
+     * Other relevant details...
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v2] version: 20.11-rc0
  2020-08-10 15:15 [dpdk-dev] [PATCH] version: 20.11-rc0 Thomas Monjalon
@ 2020-08-11  9:31 ` Thomas Monjalon
  2020-08-11  9:58 ` [dpdk-dev] [PATCH v3 1/2] " Thomas Monjalon
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11  9:31 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

Start a new release cycle with empty release notes.

The ABI version becomes 21.0.
The map files are updated to the new ABI major number (21).
Travis ABI check is disabled because compatibility is not preserved.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2: bump major ABI number (including .map changes)
---
 .travis.yml                                   |  26 ----
 ABI_VERSION                                   |   2 +-
 VERSION                                       |   2 +-
 config/meson.build                            |   5 +-
 devtools/update-abi.sh                        |   4 +-
 devtools/update_version_map_abi.py            |   4 +-
 doc/guides/rel_notes/index.rst                |   1 +
 doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
 .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
 .../rte_pmd_bbdev_fpga_lte_fec_version.map    |   2 +-
 .../null/rte_pmd_bbdev_null_version.map       |   2 +-
 .../rte_pmd_bbdev_turbo_sw_version.map        |   2 +-
 drivers/bus/ifpga/rte_bus_ifpga_version.map   |   2 +-
 drivers/bus/pci/rte_bus_pci_version.map       |   2 +-
 drivers/bus/vdev/rte_bus_vdev_version.map     |   2 +-
 drivers/bus/vmbus/rte_bus_vmbus_version.map   |   2 +-
 drivers/common/cpt/rte_common_cpt_version.map |   2 +-
 .../common/iavf/rte_common_iavf_version.map   |   4 +-
 .../common/mlx5/rte_common_mlx5_version.map   |   1 -
 .../common/mvep/rte_common_mvep_version.map   |   2 +-
 .../octeontx/rte_common_octeontx_version.map  |   2 +-
 .../compress/isal/rte_pmd_isal_version.map    |   2 +-
 .../rte_pmd_octeontx_compress_version.map     |   2 +-
 drivers/compress/qat/rte_pmd_qat_version.map  |   2 +-
 .../compress/zlib/rte_pmd_zlib_version.map    |   2 +-
 .../aesni_gcm/rte_pmd_aesni_gcm_version.map   |   2 +-
 .../aesni_mb/rte_pmd_aesni_mb_version.map     |   2 +-
 .../crypto/armv8/rte_pmd_armv8_version.map    |   2 +-
 .../caam_jr/rte_pmd_caam_jr_version.map       |   2 +-
 drivers/crypto/ccp/rte_pmd_ccp_version.map    |   2 +-
 .../crypto/kasumi/rte_pmd_kasumi_version.map  |   2 +-
 .../crypto/mvsam/rte_pmd_mvsam_version.map    |   2 +-
 .../crypto/nitrox/rte_pmd_nitrox_version.map  |   2 +-
 .../null/rte_pmd_null_crypto_version.map      |   2 +-
 .../rte_pmd_octeontx_crypto_version.map       |   2 +-
 .../rte_pmd_octeontx2_crypto_version.map      |   2 +-
 .../openssl/rte_pmd_openssl_version.map       |   2 +-
 .../rte_pmd_crypto_scheduler_version.map      |   2 +-
 .../crypto/snow3g/rte_pmd_snow3g_version.map  |   2 +-
 .../virtio/rte_pmd_virtio_crypto_version.map  |   2 +-
 drivers/crypto/zuc/rte_pmd_zuc_version.map    |   2 +-
 .../event/dpaa/rte_pmd_dpaa_event_version.map |   2 +-
 .../dpaa2/rte_pmd_dpaa2_event_version.map     |   2 +-
 .../event/dsw/rte_pmd_dsw_event_version.map   |   2 +-
 .../rte_pmd_octeontx_event_version.map        |   2 +-
 .../rte_pmd_octeontx2_event_version.map       |   2 +-
 .../event/opdl/rte_pmd_opdl_event_version.map |   2 +-
 .../rte_pmd_skeleton_event_version.map        |   2 +-
 drivers/event/sw/rte_pmd_sw_event_version.map |   2 +-
 .../bucket/rte_mempool_bucket_version.map     |   2 +-
 .../dpaa2/rte_mempool_dpaa2_version.map       |   2 +-
 .../octeontx/rte_mempool_octeontx_version.map |   2 +-
 .../mempool/ring/rte_mempool_ring_version.map |   2 +-
 .../stack/rte_mempool_stack_version.map       |   2 +-
 .../af_packet/rte_pmd_af_packet_version.map   |   2 +-
 drivers/net/af_xdp/rte_pmd_af_xdp_version.map |   2 +-
 drivers/net/ark/rte_pmd_ark_version.map       |   2 +-
 .../net/atlantic/rte_pmd_atlantic_version.map |   2 +-
 drivers/net/avp/rte_pmd_avp_version.map       |   2 +-
 drivers/net/axgbe/rte_pmd_axgbe_version.map   |   2 +-
 drivers/net/bnx2x/rte_pmd_bnx2x_version.map   |   2 +-
 drivers/net/bnxt/rte_pmd_bnxt_version.map     |   2 +-
 drivers/net/bonding/rte_pmd_bond_version.map  |   2 +-
 drivers/net/cxgbe/rte_pmd_cxgbe_version.map   |   2 +-
 drivers/net/dpaa/rte_pmd_dpaa_version.map     |   2 +-
 drivers/net/e1000/rte_pmd_e1000_version.map   |   2 +-
 drivers/net/ena/rte_pmd_ena_version.map       |   2 +-
 drivers/net/enetc/rte_pmd_enetc_version.map   |   2 +-
 drivers/net/enic/rte_pmd_enic_version.map     |   2 +-
 .../net/failsafe/rte_pmd_failsafe_version.map |   2 +-
 drivers/net/fm10k/rte_pmd_fm10k_version.map   |   2 +-
 drivers/net/hinic/rte_pmd_hinic_version.map   |   2 +-
 drivers/net/hns3/rte_pmd_hns3_version.map     |   2 +-
 drivers/net/i40e/rte_pmd_i40e_version.map     |   2 +-
 drivers/net/iavf/rte_pmd_iavf_version.map     |   2 +-
 drivers/net/ice/rte_pmd_ice_version.map       |   2 +-
 drivers/net/ionic/rte_pmd_ionic_version.map   |   1 -
 drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map |   2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map   |   2 +-
 drivers/net/kni/rte_pmd_kni_version.map       |   2 +-
 .../net/liquidio/rte_pmd_liquidio_version.map |   2 +-
 drivers/net/memif/rte_pmd_memif_version.map   |   2 +-
 drivers/net/mlx4/rte_pmd_mlx4_version.map     |   2 +-
 drivers/net/mlx5/rte_pmd_mlx5_version.map     |   6 +-
 drivers/net/mvneta/rte_pmd_mvneta_version.map |   2 +-
 drivers/net/mvpp2/rte_pmd_mvpp2_version.map   |   2 +-
 drivers/net/netvsc/rte_pmd_netvsc_version.map |   2 +-
 drivers/net/nfb/rte_pmd_nfb_version.map       |   2 +-
 drivers/net/nfp/rte_pmd_nfp_version.map       |   2 +-
 drivers/net/null/rte_pmd_null_version.map     |   2 +-
 .../net/octeontx/rte_pmd_octeontx_version.map |   2 +-
 .../octeontx2/rte_pmd_octeontx2_version.map   |   2 +-
 drivers/net/pcap/rte_pmd_pcap_version.map     |   2 +-
 drivers/net/pfe/rte_pmd_pfe_version.map       |   2 +-
 drivers/net/qede/rte_pmd_qede_version.map     |   2 +-
 drivers/net/ring/rte_pmd_ring_version.map     |   2 +-
 drivers/net/sfc/rte_pmd_sfc_version.map       |   2 +-
 .../net/softnic/rte_pmd_softnic_version.map   |   2 +-
 .../net/szedata2/rte_pmd_szedata2_version.map |   2 +-
 drivers/net/tap/rte_pmd_tap_version.map       |   2 +-
 .../net/thunderx/rte_pmd_thunderx_version.map |   2 +-
 .../rte_pmd_vdev_netvsc_version.map           |   2 +-
 drivers/net/vhost/rte_pmd_vhost_version.map   |   2 +-
 drivers/net/virtio/rte_pmd_virtio_version.map |   2 +-
 .../net/vmxnet3/rte_pmd_vmxnet3_version.map   |   2 +-
 .../rte_rawdev_dpaa2_cmdif_version.map        |   2 +-
 .../rte_rawdev_dpaa2_qdma_version.map         |   2 +-
 .../raw/ifpga/rte_rawdev_ifpga_version.map    |   2 +-
 drivers/raw/ioat/rte_rawdev_ioat_version.map  |   2 +-
 drivers/raw/ntb/rte_rawdev_ntb_version.map    |   2 +-
 .../rte_rawdev_octeontx2_dma_version.map      |   2 +-
 .../rte_rawdev_octeontx2_ep_version.map       |   1 -
 .../skeleton/rte_rawdev_skeleton_version.map  |   2 +-
 drivers/vdpa/ifc/rte_pmd_ifc_version.map      |   2 +-
 lib/librte_acl/rte_acl_version.map            |   2 +-
 .../rte_bitratestats_version.map              |   2 +-
 lib/librte_cfgfile/rte_cfgfile_version.map    |   2 +-
 lib/librte_cmdline/rte_cmdline_version.map    |   2 +-
 .../rte_cryptodev_version.map                 |   7 +-
 .../rte_distributor_version.map               |   2 +-
 lib/librte_eal/rte_eal_version.map            |  10 +-
 lib/librte_efd/rte_efd_version.map            |   2 +-
 lib/librte_ethdev/rte_ethdev_version.map      |   2 +-
 lib/librte_eventdev/rte_eventdev_version.map  |   2 +-
 lib/librte_gro/rte_gro_version.map            |   2 +-
 lib/librte_gso/rte_gso_version.map            |   2 +-
 lib/librte_hash/rte_hash_version.map          |   2 +-
 lib/librte_ip_frag/rte_ip_frag_version.map    |   2 +-
 lib/librte_jobstats/rte_jobstats_version.map  |   2 +-
 lib/librte_kni/rte_kni_version.map            |   2 +-
 lib/librte_kvargs/rte_kvargs_version.map      |   2 +-
 .../rte_latencystats_version.map              |   2 +-
 lib/librte_lpm/rte_lpm_version.map            |   2 +-
 lib/librte_mbuf/rte_mbuf_version.map          |   2 +-
 lib/librte_member/rte_member_version.map      |   2 +-
 lib/librte_mempool/rte_mempool_version.map    |   6 +-
 lib/librte_meter/rte_meter_version.map        |  14 +-
 lib/librte_metrics/rte_metrics_version.map    |   2 +-
 lib/librte_net/rte_net_version.map            |   2 +-
 lib/librte_pci/rte_pci_version.map            |   2 +-
 lib/librte_pdump/rte_pdump_version.map        |   2 +-
 lib/librte_pipeline/rte_pipeline_version.map  |   2 +-
 lib/librte_port/rte_port_version.map          |   2 +-
 lib/librte_power/rte_power_version.map        |   2 +-
 lib/librte_rawdev/rte_rawdev_version.map      |   2 +-
 lib/librte_reorder/rte_reorder_version.map    |   2 +-
 lib/librte_ring/rte_ring_version.map          |  13 +-
 lib/librte_sched/rte_sched_version.map        |   2 +-
 lib/librte_security/rte_security_version.map  |   2 +-
 lib/librte_table/rte_table_version.map        |   2 +-
 lib/librte_timer/rte_timer_version.map        |   2 +-
 lib/librte_vhost/rte_vhost_version.map        |   2 +-
 152 files changed, 299 insertions(+), 212 deletions(-)
 create mode 100644 doc/guides/rel_notes/release_20_11.rst

diff --git a/.travis.yml b/.travis.yml
index 14f8124233..d6eeab371d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@
 language: c
 cache:
   ccache: true
-  directories:
-    - libabigail
-    - reference
 
 dist: bionic
 
@@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
 
-_libabigail_build_packages: &libabigail_build_packages
-  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
-
 _build_32b_packages: &build_32b_packages
   - *required_packages
   - [gcc-multilib]
@@ -34,10 +28,6 @@ _doc_packages: &doc_packages
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 script: ./.ci/${TRAVIS_OS_NAME}-build.sh
 
-env:
-  global:
-    - REF_GIT_TAG=v20.05
-
 jobs:
   include:
   # x86_64 gcc jobs
@@ -55,14 +45,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: amd64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # x86_64 clang jobs
   - env: DEF_LIB="static"
     arch: amd64
@@ -116,14 +98,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: arm64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # aarch64 clang jobs
   - env: DEF_LIB="static"
     arch: arm64
diff --git a/ABI_VERSION b/ABI_VERSION
index a9ac8dacb0..aabe6ec390 100644
--- a/ABI_VERSION
+++ b/ABI_VERSION
@@ -1 +1 @@
-20.0.3
+21
diff --git a/VERSION b/VERSION
index 85e33446f8..8b0beab16a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.08.0
+20.11.0
diff --git a/config/meson.build b/config/meson.build
index cff8b33dd2..6996e5cbea 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -29,10 +29,7 @@ abi_version = run_command(find_program('cat', 'more'),
 # and have the soname be all but the final part of the abi_version.
 # e.g. v20.1 => librte_foo.so.20.1
 #    sonames => librte_foo.so.20
-# e.g. v20.0.1 => librte_foo.so.20.0.1
-#      sonames => librte_foo.so.20.0
-abi_va = abi_version.split('.')
-so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1]
+so_version = abi_version.split('.')[0]
 
 # extract all version information into the build configuration
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
diff --git a/devtools/update-abi.sh b/devtools/update-abi.sh
index b9b859a3e9..cdc1d1b13f 100755
--- a/devtools/update-abi.sh
+++ b/devtools/update-abi.sh
@@ -8,7 +8,7 @@ update_path="lib drivers"
 
 # check ABI version format string
 check_abi_version() {
-      echo $1 | grep -q -e "^[[:digit:]]\{1,2\}\.[[:digit:]]\{1,2\}$"
+      echo $1 | grep -q -e "^[[:digit:]]\{2\}$"
 }
 
 if [ -z "$1" ]; then
@@ -20,7 +20,7 @@ fi
 # check version string format
 if ! check_abi_version $abi_version ; then
       # output to stderr
-      >&2 echo "ABI version must be formatted as MAJOR.MINOR version"
+      >&2 echo "ABI version must be formatted as MAJOR version only"
       exit 1
 fi
 
diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
index 80a61641ed..efa1b2c613 100755
--- a/devtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -171,7 +171,7 @@ def __main():
                             help='path to linker version script file '
                                  '(pattern: *version.map)')
     arg_parser.add_argument("abi_version", type=str,
-                            help='target ABI version (pattern: MAJOR.MINOR)')
+                            help='target ABI version (only MAJOR number)')
 
     parsed = arg_parser.parse_args()
 
@@ -181,7 +181,7 @@ def __main():
         arg_parser.print_help()
         sys.exit(1)
 
-    if not re.match(r"\d{1,2}\.\d{1,2}", parsed.abi_version):
+    if not re.match(r"\d{2}", parsed.abi_version):
         print("Invalid ABI version: {}".format(parsed.abi_version),
               file=sys.stderr)
         arg_parser.print_help()
diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index 05c9d837a4..fb70d1a5f3 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -8,6 +8,7 @@ Release Notes
     :maxdepth: 1
     :numbered:
 
+    release_20_11
     release_20_08
     release_20_05
     release_20_02
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
new file mode 100644
index 0000000000..df227a1773
--- /dev/null
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -0,0 +1,136 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2020 The DPDK contributors
+
+.. include:: <isonum.txt>
+
+DPDK Release 20.11
+==================
+
+.. **Read this first.**
+
+   The text in the sections below explains how to update the release notes.
+
+   Use proper spelling, capitalization and punctuation in all sections.
+
+   Variable and config names should be quoted as fixed width text:
+   ``LIKE_THIS``.
+
+   Build the docs and view the output file to ensure the changes are correct::
+
+      make doc-guides-html
+      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
+
+
+New Features
+------------
+
+.. This section should contain new features added in this release.
+   Sample format:
+
+   * **Add a title in the past tense with a full stop.**
+
+     Add a short 1-2 sentence description in the past tense.
+     The description should be enough to allow someone scanning
+     the release notes to understand the new feature.
+
+     If the feature adds a lot of sub-features you can use a bullet list
+     like this:
+
+     * Added feature foo to do something.
+     * Enhanced feature bar to do something else.
+
+     Refer to the previous release notes for examples.
+
+     Suggested order in release notes items:
+     * Core libs (EAL, mempool, ring, mbuf, buses)
+     * Device abstraction libs and PMDs
+       - ethdev (lib, PMDs)
+       - cryptodev (lib, PMDs)
+       - eventdev (lib, PMDs)
+       - etc
+     * Other libs
+     * Apps, Examples, Tools (if significant)
+
+     This section is a comment. Do not overwrite or remove it.
+     Also, make sure to start the actual text at the margin.
+     =======================================================
+
+
+Removed Items
+-------------
+
+.. This section should contain removed items in this release. Sample format:
+
+   * Add a short 1-2 sentence description of the removed item
+     in the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+API Changes
+-----------
+
+.. This section should contain API changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the API change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+ABI Changes
+-----------
+
+.. This section should contain ABI changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the ABI change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Known Issues
+------------
+
+.. This section should contain new known issues in this release. Sample format:
+
+   * **Add title in present tense with full stop.**
+
+     Add a short 1-2 sentence description of the known issue
+     in the present tense. Add information on any known workarounds.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Tested Platforms
+----------------
+
+.. This section should contain a list of platforms that were tested
+   with this release.
+
+   The format is:
+
+   * <vendor> platform with <vendor> <type of devices> combinations
+
+     * List of CPU
+     * List of OS
+     * List of devices
+     * Other relevant details...
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
index b0fb9717fa..d723bc9b0e 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
+++ b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
index 6bcea2cc7f..a2ab086cd8 100644
--- a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
+++ b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/null/rte_pmd_bbdev_null_version.map
+++ b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
+++ b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/rte_bus_ifpga_version.map
index 05b4a28c1b..6e8f85da3c 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga_version.map
+++ b/drivers/bus/ifpga/rte_bus_ifpga_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ifpga_driver_register;
diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/rte_bus_pci_version.map
index 012d817e14..5b75d23671 100644
--- a/drivers/bus/pci/rte_bus_pci_version.map
+++ b/drivers/bus/pci/rte_bus_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pci_dump;
diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/rte_bus_vdev_version.map
index 5abb10ecb0..61b6cefcee 100644
--- a/drivers/bus/vdev/rte_bus_vdev_version.map
+++ b/drivers/bus/vdev/rte_bus_vdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vdev_add_custom_scan;
diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/rte_bus_vmbus_version.map
index cbaaebc06c..fa8e91c282 100644
--- a/drivers/bus/vmbus/rte_bus_vmbus_version.map
+++ b/drivers/bus/vmbus/rte_bus_vmbus_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vmbus_chan_close;
diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/rte_common_cpt_version.map
index 8c65cde6cf..4d85021a87 100644
--- a/drivers/common/cpt/rte_common_cpt_version.map
+++ b/drivers/common/cpt/rte_common_cpt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cpt_pmd_ops_helper_asym_get_mlen;
diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map
index 92ceac108d..44142499e0 100644
--- a/drivers/common/iavf/rte_common_iavf_version.map
+++ b/drivers/common/iavf/rte_common_iavf_version.map
@@ -1,11 +1,11 @@
 DPDK_21 {
 	global:
 
-	iavf_init_adminq;
-	iavf_shutdown_adminq;
 	iavf_aq_send_msg_to_pf;
 	iavf_clean_arq_element;
+	iavf_init_adminq;
 	iavf_set_mac_type;
+	iavf_shutdown_adminq;
 	iavf_vf_parse_hw_config;
 
 	local: *;
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
index 7729d0dd04..c4d57c08a7 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -93,4 +93,3 @@ INTERNAL {
 
 	mlx5_pci_driver_register;
 };
-
diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/rte_common_mvep_version.map
index 030928439d..e5af82c61d 100644
--- a/drivers/common/mvep/rte_common_mvep_version.map
+++ b/drivers/common/mvep/rte_common_mvep_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mvep_deinit;
diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/rte_common_octeontx_version.map
index 5f6aa8bd3a..30f3fa65e0 100644
--- a/drivers/common/octeontx/rte_common_octeontx_version.map
+++ b/drivers/common/octeontx/rte_common_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	octeontx_get_global_domain;
diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/rte_pmd_isal_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/isal/rte_pmd_isal_version.map
+++ b/drivers/compress/isal/rte_pmd_isal_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
+++ b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/qat/rte_pmd_qat_version.map
+++ b/drivers/compress/qat/rte_pmd_qat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/rte_pmd_zlib_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/zlib/rte_pmd_zlib_version.map
+++ b/drivers/compress/zlib/rte_pmd_zlib_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
+++ b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
+++ b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/rte_pmd_armv8_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/armv8/rte_pmd_armv8_version.map
+++ b/drivers/crypto/armv8/rte_pmd_armv8_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
+++ b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/rte_pmd_ccp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/ccp/rte_pmd_ccp_version.map
+++ b/drivers/crypto/ccp/rte_pmd_ccp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
+++ b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
+++ b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
+++ b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/rte_pmd_null_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/null/rte_pmd_null_crypto_version.map
+++ b/drivers/crypto/null/rte_pmd_null_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
+++ b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
+++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/openssl/rte_pmd_openssl_version.map
+++ b/drivers/crypto/openssl/rte_pmd_openssl_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
index 077afedce7..ca6f102d9f 100644
--- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
+++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cryptodev_scheduler_load_user_scheduler;
diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
+++ b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
+++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/rte_pmd_zuc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/zuc/rte_pmd_zuc_version.map
+++ b/drivers/crypto/zuc/rte_pmd_zuc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
+++ b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
+++ b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/rte_pmd_dsw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dsw/rte_pmd_dsw_event_version.map
+++ b/drivers/event/dsw/rte_pmd_dsw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
+++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
+++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/opdl/rte_pmd_opdl_event_version.map
+++ b/drivers/event/opdl/rte_pmd_opdl_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
+++ b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/rte_pmd_sw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/sw/rte_pmd_sw_event_version.map
+++ b/drivers/event/sw/rte_pmd_sw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/rte_mempool_bucket_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/bucket/rte_mempool_bucket_version.map
+++ b/drivers/mempool/bucket/rte_mempool_bucket_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
index 686b024624..473b8c90e8 100644
--- a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
+++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_dpaa2_mbuf_from_buf_addr;
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
+++ b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/ring/rte_mempool_ring_version.map
+++ b/drivers/mempool/ring/rte_mempool_ring_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/stack/rte_mempool_stack_version.map
+++ b/drivers/mempool/stack/rte_mempool_stack_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_packet/rte_pmd_af_packet_version.map
+++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
+++ b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/rte_pmd_ark_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ark/rte_pmd_ark_version.map
+++ b/drivers/net/ark/rte_pmd_ark_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map
index 9b04838d84..6e17832684 100644
--- a/drivers/net/atlantic/rte_pmd_atlantic_version.map
+++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/avp/rte_pmd_avp_version.map
+++ b/drivers/net/avp/rte_pmd_avp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/axgbe/rte_pmd_axgbe_version.map
+++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
+++ b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/rte_pmd_bnxt_version.map
index bb52562347..a050d86ab7 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt_version.map
+++ b/drivers/net/bnxt/rte_pmd_bnxt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_bnxt_get_vf_rx_status;
diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map
index 270c7d5d55..df81ee74c1 100644
--- a/drivers/net/bonding/rte_pmd_bond_version.map
+++ b/drivers/net/bonding/rte_pmd_bond_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_bond_8023ad_agg_selection_get;
diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
+++ b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
index 774aa0de45..87ce8f5b6c 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
+++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_dpaa_set_tx_loopback;
diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/e1000/rte_pmd_e1000_version.map
+++ b/drivers/net/e1000/rte_pmd_e1000_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/rte_pmd_ena_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ena/rte_pmd_ena_version.map
+++ b/drivers/net/ena/rte_pmd_ena_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enetc/rte_pmd_enetc_version.map
+++ b/drivers/net/enetc/rte_pmd_enetc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enic/rte_pmd_enic_version.map
+++ b/drivers/net/enic/rte_pmd_enic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/rte_pmd_failsafe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/failsafe/rte_pmd_failsafe_version.map
+++ b/drivers/net/failsafe/rte_pmd_failsafe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/fm10k/rte_pmd_fm10k_version.map
+++ b/drivers/net/fm10k/rte_pmd_fm10k_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/rte_pmd_hinic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hinic/rte_pmd_hinic_version.map
+++ b/drivers/net/hinic/rte_pmd_hinic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/rte_pmd_hns3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hns3/rte_pmd_hns3_version.map
+++ b/drivers/net/hns3/rte_pmd_hns3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
index f6cd3b3566..413c58cb21 100644
--- a/drivers/net/i40e/rte_pmd_i40e_version.map
+++ b/drivers/net/i40e/rte_pmd_i40e_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_i40e_add_vf_mac_addr;
diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/iavf/rte_pmd_iavf_version.map
+++ b/drivers/net/iavf/rte_pmd_iavf_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map
index d04b194c13..91f40225e9 100644
--- a/drivers/net/ice/rte_pmd_ice_version.map
+++ b/drivers/net/ice/rte_pmd_ice_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/net/ionic/rte_pmd_ionic_version.map
+++ b/drivers/net/ionic/rte_pmd_ionic_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
index 7e348e99b1..d8cc1026e0 100644
--- a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
+++ b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
index 911f8083f1..9402802b04 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_ixgbe_bypass_event_show;
diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/rte_pmd_kni_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/kni/rte_pmd_kni_version.map
+++ b/drivers/net/kni/rte_pmd_kni_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/liquidio/rte_pmd_liquidio_version.map
+++ b/drivers/net/liquidio/rte_pmd_liquidio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/rte_pmd_memif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/memif/rte_pmd_memif_version.map
+++ b/drivers/net/memif/rte_pmd_memif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mlx4/rte_pmd_mlx4_version.map
+++ b/drivers/net/mlx4/rte_pmd_mlx4_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/rte_pmd_mlx5_version.map
index c8b1031b02..bc1d3d06bf 100644
--- a/drivers/net/mlx5/rte_pmd_mlx5_version.map
+++ b/drivers/net/mlx5/rte_pmd_mlx5_version.map
@@ -1,10 +1,10 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
 EXPERIMENTAL {
-        global:
+	global:
 
-        # added in 20.02
+	# added in 20.02
 	rte_pmd_mlx5_get_dyn_flag_names;
 };
diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/rte_pmd_mvneta_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvneta/rte_pmd_mvneta_version.map
+++ b/drivers/net/mvneta/rte_pmd_mvneta_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
+++ b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/rte_pmd_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/netvsc/rte_pmd_netvsc_version.map
+++ b/drivers/net/netvsc/rte_pmd_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/rte_pmd_nfb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfb/rte_pmd_nfb_version.map
+++ b/drivers/net/nfb/rte_pmd_nfb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/rte_pmd_nfp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfp/rte_pmd_nfp_version.map
+++ b/drivers/net/nfp/rte_pmd_nfp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/null/rte_pmd_null_version.map
+++ b/drivers/net/null/rte_pmd_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/rte_pmd_octeontx_version.map
index f7cae02fac..6dda72890c 100644
--- a/drivers/net/octeontx/rte_pmd_octeontx_version.map
+++ b/drivers/net/octeontx/rte_pmd_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_octeontx_pchan_map;
diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
+++ b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pcap/rte_pmd_pcap_version.map
+++ b/drivers/net/pcap/rte_pmd_pcap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/rte_pmd_pfe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pfe/rte_pmd_pfe_version.map
+++ b/drivers/net/pfe/rte_pmd_pfe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/rte_pmd_qede_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/qede/rte_pmd_qede_version.map
+++ b/drivers/net/qede/rte_pmd_qede_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/rte_pmd_ring_version.map
index ebb6be2733..29770fe3e4 100644
--- a/drivers/net/ring/rte_pmd_ring_version.map
+++ b/drivers/net/ring/rte_pmd_ring_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_from_ring;
diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/sfc/rte_pmd_sfc_version.map
+++ b/drivers/net/sfc/rte_pmd_sfc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
index 50f113d5a2..530d2e6b72 100644
--- a/drivers/net/softnic/rte_pmd_softnic_version.map
+++ b/drivers/net/softnic/rte_pmd_softnic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_softnic_run;
diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/rte_pmd_szedata2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/szedata2/rte_pmd_szedata2_version.map
+++ b/drivers/net/szedata2/rte_pmd_szedata2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/rte_pmd_tap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/tap/rte_pmd_tap_version.map
+++ b/drivers/net/tap/rte_pmd_tap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/thunderx/rte_pmd_thunderx_version.map
+++ b/drivers/net/thunderx/rte_pmd_thunderx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
+++ b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/rte_pmd_vhost_version.map
index 16b591ccc4..634255829e 100644
--- a/drivers/net/vhost/rte_pmd_vhost_version.map
+++ b/drivers/net/vhost/rte_pmd_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_vhost_get_queue_event;
diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/virtio/rte_pmd_virtio_version.map
+++ b/drivers/net/virtio/rte_pmd_virtio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
+++ b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
+++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
index ca6a0d7626..280c79ea9c 100644
--- a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
+++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_qdma_attr_get;
diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
+++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ioat/rte_rawdev_ioat_version.map
+++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ntb/rte_rawdev_ntb_version.map
+++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
+++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
+++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
+++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/vdpa/ifc/rte_pmd_ifc_version.map
+++ b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/rte_acl_version.map
index c3daca8115..d97f2927bf 100644
--- a/lib/librte_acl/rte_acl_version.map
+++ b/lib/librte_acl/rte_acl_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_acl_add_rules;
diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/rte_bitratestats_version.map
index 88fc2912db..463f78a53a 100644
--- a/lib/librte_bitratestats/rte_bitratestats_version.map
+++ b/lib/librte_bitratestats/rte_bitratestats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_stats_bitrate_calc;
diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map
index 22c999fe16..180c42b717 100644
--- a/lib/librte_cfgfile/rte_cfgfile_version.map
+++ b/lib/librte_cfgfile/rte_cfgfile_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cfgfile_add_entry;
diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/rte_cmdline_version.map
index 95fce812ff..a99104457f 100644
--- a/lib/librte_cmdline/rte_cmdline_version.map
+++ b/lib/librte_cmdline/rte_cmdline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cirbuf_add_buf_head;
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
index a7a78dc41f..02f6dcf724 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_crypto_aead_algorithm_strings;
@@ -58,12 +58,11 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 	rte_cryptodev_info_get;
 	rte_cryptodev_sym_capability_get;
-} DPDK_20.0;
-
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map
index 1b7c643005..1ddcd01fe6 100644
--- a/lib/librte_distributor/rte_distributor_version.map
+++ b/lib/librte_distributor/rte_distributor_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_distributor_clear_returns;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index bf0c17c233..0b18e2ef85 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_panic;
@@ -6,6 +6,7 @@ DPDK_20.0 {
 	eal_timer_source;
 	per_lcore__lcore_id;
 	per_lcore__rte_errno;
+	per_lcore__thread_id;
 	rte_bus_dump;
 	rte_bus_find;
 	rte_bus_find_by_device;
@@ -221,13 +222,6 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	per_lcore__thread_id;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
 	global:
 
diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/rte_efd_version.map
index e010eecfe4..425c0a85a9 100644
--- a/lib/librte_efd/rte_efd_version.map
+++ b/lib/librte_efd/rte_efd_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_efd_create;
diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
index 1212a17d32..8d9d6b1c67 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	_rte_eth_dev_callback_process;
diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
index 91a62cd077..3d9d0ca054 100644
--- a/lib/librte_eventdev/rte_eventdev_version.map
+++ b/lib/librte_eventdev/rte_eventdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_event_crypto_adapter_caps_get;
diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/rte_gro_version.map
index 9f6fe79e57..19dc66b0d4 100644
--- a/lib/librte_gro/rte_gro_version.map
+++ b/lib/librte_gro/rte_gro_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gro_ctx_create;
diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/rte_gso_version.map
index 8505a59c27..60aa1b54e4 100644
--- a/lib/librte_gso/rte_gso_version.map
+++ b/lib/librte_gso/rte_gso_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gso_segment;
diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
index c2a909443d..c0db81014f 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_fbk_hash_create;
diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map
index 5dd34f828c..82b308ddb0 100644
--- a/lib/librte_ip_frag/rte_ip_frag_version.map
+++ b/lib/librte_ip_frag/rte_ip_frag_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ip_frag_free_death_row;
diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/rte_jobstats_version.map
index dbd2664ae2..3e166ad548 100644
--- a/lib/librte_jobstats/rte_jobstats_version.map
+++ b/lib/librte_jobstats/rte_jobstats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_jobstats_abort;
diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
index 9cd3cedc54..a93da95f36 100644
--- a/lib/librte_kni/rte_kni_version.map
+++ b/lib/librte_kni/rte_kni_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kni_alloc;
diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map
index 3ba0f4b59c..ed375bf4a3 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kvargs_count;
diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/rte_latencystats_version.map
index e04e63463f..0c4360ab43 100644
--- a/lib/librte_latencystats/rte_latencystats_version.map
+++ b/lib/librte_latencystats/rte_latencystats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_latencystats_get;
diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/rte_lpm_version.map
index bfccd7eacc..b4d437cc75 100644
--- a/lib/librte_lpm/rte_lpm_version.map
+++ b/lib/librte_lpm/rte_lpm_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_lpm6_add;
diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
index ab161bcdc7..a011aaead3 100644
--- a/lib/librte_mbuf/rte_mbuf_version.map
+++ b/lib/librte_mbuf/rte_mbuf_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_pktmbuf_linearize;
diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/rte_member_version.map
index 87780ae611..b8c6322e73 100644
--- a/lib/librte_member/rte_member_version.map
+++ b/lib/librte_member/rte_member_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_member_add;
diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
index 826a0b8824..50e22ee020 100644
--- a/lib/librte_mempool/rte_mempool_version.map
+++ b/lib/librte_mempool/rte_mempool_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mempool_audit;
@@ -31,12 +31,12 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 
 	rte_mempool_populate_iova;
 	rte_mempool_populate_virt;
-} DPDK_20.0;
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
index 58859d4d76..e2a2607f28 100644
--- a/lib/librte_meter/rte_meter_version.map
+++ b/lib/librte_meter/rte_meter_version.map
@@ -1,24 +1,18 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_meter_srtcm_config;
 	rte_meter_srtcm_profile_config;
 	rte_meter_trtcm_config;
 	rte_meter_trtcm_profile_config;
+	rte_meter_trtcm_rfc4115_config;
+	rte_meter_trtcm_rfc4115_profile_config;
 
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	rte_meter_trtcm_rfc4115_config;
-	rte_meter_trtcm_rfc4115_profile_config;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
-       global:
+	global:
 
 	rte_meter_trtcm_rfc4115_config;
 	rte_meter_trtcm_rfc4115_profile_config;
diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/rte_metrics_version.map
index c88939b117..20f99cd19a 100644
--- a/lib/librte_metrics/rte_metrics_version.map
+++ b/lib/librte_metrics/rte_metrics_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_metrics_get_names;
diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
index 8a4e75a3a0..621f237945 100644
--- a/lib/librte_net/rte_net_version.map
+++ b/lib/librte_net/rte_net_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_random_addr;
diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map
index 67eb845796..cd77c9dc9e 100644
--- a/lib/librte_pci/rte_pci_version.map
+++ b/lib/librte_pci/rte_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	pci_map_resource;
diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map
index 6d02ccce6d..2f9e952d0b 100644
--- a/lib/librte_pdump/rte_pdump_version.map
+++ b/lib/librte_pdump/rte_pdump_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pdump_disable;
diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
index 64d38afecd..9ed80eb041 100644
--- a/lib/librte_pipeline/rte_pipeline_version.map
+++ b/lib/librte_pipeline/rte_pipeline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pipeline_ah_packet_drop;
diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/rte_port_version.map
index 18c6154672..bd1fbb66b0 100644
--- a/lib/librte_port/rte_port_version.map
+++ b/lib/librte_port/rte_port_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_port_ethdev_reader_ops;
diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
index 00ee5753e2..69ca9af616 100644
--- a/lib/librte_power/rte_power_version.map
+++ b/lib/librte_power/rte_power_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_power_exit;
diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
index 63b54f598b..eb29a3ac0d 100644
--- a/lib/librte_rawdev/rte_rawdev_version.map
+++ b/lib/librte_rawdev/rte_rawdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_rawdev_close;
diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/rte_reorder_version.map
index cf444062df..8c0220d324 100644
--- a/lib/librte_reorder/rte_reorder_version.map
+++ b/lib/librte_reorder/rte_reorder_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_reorder_create;
diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map
index ac392f3ca9..e35d6b9712 100644
--- a/lib/librte_ring/rte_ring_version.map
+++ b/lib/librte_ring/rte_ring_version.map
@@ -1,21 +1,16 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ring_create;
+	rte_ring_create_elem;
 	rte_ring_dump;
 	rte_ring_free;
 	rte_ring_get_memsize;
+	rte_ring_get_memsize_elem;
 	rte_ring_init;
 	rte_ring_list_dump;
 	rte_ring_lookup;
+	rte_ring_reset;
 
 	local: *;
 };
-
-DPDK_21 {
-	global:
-
-	rte_ring_create_elem;
-	rte_ring_get_memsize_elem;
-	rte_ring_reset;
-} DPDK_20.0;
diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map
index cefd990367..3faef6f0a0 100644
--- a/lib/librte_sched/rte_sched_version.map
+++ b/lib/librte_sched/rte_sched_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_approx;
diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/rte_security_version.map
index b07314bbf4..d84eec0a88 100644
--- a/lib/librte_security/rte_security_version.map
+++ b/lib/librte_security/rte_security_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_security_attach_session;
diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map
index 40f72b1fe8..568a6c6a8f 100644
--- a/lib/librte_table/rte_table_version.map
+++ b/lib/librte_table/rte_table_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_table_acl_ops;
diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/rte_timer_version.map
index 4471cef92b..21e68ea7a2 100644
--- a/lib/librte_timer/rte_timer_version.map
+++ b/lib/librte_timer/rte_timer_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_timer_dump_stats;
diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
index 13ec53b638..20b4abcb4e 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vhost_avail_entries;
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v3 1/2] version: 20.11-rc0
  2020-08-10 15:15 [dpdk-dev] [PATCH] version: 20.11-rc0 Thomas Monjalon
  2020-08-11  9:31 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
@ 2020-08-11  9:58 ` Thomas Monjalon
  2020-08-11  9:58   ` [dpdk-dev] [PATCH v3 2/2] devtools: fix ABI update in map files Thomas Monjalon
  2020-08-11 11:27 ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Thomas Monjalon
  2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
  3 siblings, 1 reply; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11  9:58 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

Start a new release cycle with empty release notes.

The ABI version becomes 21.0.
The ABI major is back to normal, having only one number (21 vs 20.0).
The map files are updated to the new ABI major number (21).
Travis ABI check is disabled because compatibility is not preserved.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v3: add minor number to ABI_VERSION and remove workaround in scripts
v2: bump major ABI number (including .map changes)
---
 .travis.yml                                   |  26 ----
 ABI_VERSION                                   |   2 +-
 VERSION                                       |   2 +-
 config/meson.build                            |   5 +-
 doc/guides/rel_notes/index.rst                |   1 +
 doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
 .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
 .../rte_pmd_bbdev_fpga_lte_fec_version.map    |   2 +-
 .../null/rte_pmd_bbdev_null_version.map       |   2 +-
 .../rte_pmd_bbdev_turbo_sw_version.map        |   2 +-
 drivers/bus/ifpga/rte_bus_ifpga_version.map   |   2 +-
 drivers/bus/pci/rte_bus_pci_version.map       |   2 +-
 drivers/bus/vdev/rte_bus_vdev_version.map     |   2 +-
 drivers/bus/vmbus/rte_bus_vmbus_version.map   |   2 +-
 drivers/common/cpt/rte_common_cpt_version.map |   2 +-
 .../common/iavf/rte_common_iavf_version.map   |   4 +-
 .../common/mlx5/rte_common_mlx5_version.map   |   1 -
 .../common/mvep/rte_common_mvep_version.map   |   2 +-
 .../octeontx/rte_common_octeontx_version.map  |   2 +-
 .../compress/isal/rte_pmd_isal_version.map    |   2 +-
 .../rte_pmd_octeontx_compress_version.map     |   2 +-
 drivers/compress/qat/rte_pmd_qat_version.map  |   2 +-
 .../compress/zlib/rte_pmd_zlib_version.map    |   2 +-
 .../aesni_gcm/rte_pmd_aesni_gcm_version.map   |   2 +-
 .../aesni_mb/rte_pmd_aesni_mb_version.map     |   2 +-
 .../crypto/armv8/rte_pmd_armv8_version.map    |   2 +-
 .../caam_jr/rte_pmd_caam_jr_version.map       |   2 +-
 drivers/crypto/ccp/rte_pmd_ccp_version.map    |   2 +-
 .../crypto/kasumi/rte_pmd_kasumi_version.map  |   2 +-
 .../crypto/mvsam/rte_pmd_mvsam_version.map    |   2 +-
 .../crypto/nitrox/rte_pmd_nitrox_version.map  |   2 +-
 .../null/rte_pmd_null_crypto_version.map      |   2 +-
 .../rte_pmd_octeontx_crypto_version.map       |   2 +-
 .../rte_pmd_octeontx2_crypto_version.map      |   2 +-
 .../openssl/rte_pmd_openssl_version.map       |   2 +-
 .../rte_pmd_crypto_scheduler_version.map      |   2 +-
 .../crypto/snow3g/rte_pmd_snow3g_version.map  |   2 +-
 .../virtio/rte_pmd_virtio_crypto_version.map  |   2 +-
 drivers/crypto/zuc/rte_pmd_zuc_version.map    |   2 +-
 .../event/dpaa/rte_pmd_dpaa_event_version.map |   2 +-
 .../dpaa2/rte_pmd_dpaa2_event_version.map     |   2 +-
 .../event/dsw/rte_pmd_dsw_event_version.map   |   2 +-
 .../rte_pmd_octeontx_event_version.map        |   2 +-
 .../rte_pmd_octeontx2_event_version.map       |   2 +-
 .../event/opdl/rte_pmd_opdl_event_version.map |   2 +-
 .../rte_pmd_skeleton_event_version.map        |   2 +-
 drivers/event/sw/rte_pmd_sw_event_version.map |   2 +-
 .../bucket/rte_mempool_bucket_version.map     |   2 +-
 .../dpaa2/rte_mempool_dpaa2_version.map       |   2 +-
 .../octeontx/rte_mempool_octeontx_version.map |   2 +-
 .../mempool/ring/rte_mempool_ring_version.map |   2 +-
 .../stack/rte_mempool_stack_version.map       |   2 +-
 .../af_packet/rte_pmd_af_packet_version.map   |   2 +-
 drivers/net/af_xdp/rte_pmd_af_xdp_version.map |   2 +-
 drivers/net/ark/rte_pmd_ark_version.map       |   2 +-
 .../net/atlantic/rte_pmd_atlantic_version.map |   2 +-
 drivers/net/avp/rte_pmd_avp_version.map       |   2 +-
 drivers/net/axgbe/rte_pmd_axgbe_version.map   |   2 +-
 drivers/net/bnx2x/rte_pmd_bnx2x_version.map   |   2 +-
 drivers/net/bnxt/rte_pmd_bnxt_version.map     |   2 +-
 drivers/net/bonding/rte_pmd_bond_version.map  |   2 +-
 drivers/net/cxgbe/rte_pmd_cxgbe_version.map   |   2 +-
 drivers/net/dpaa/rte_pmd_dpaa_version.map     |   2 +-
 drivers/net/e1000/rte_pmd_e1000_version.map   |   2 +-
 drivers/net/ena/rte_pmd_ena_version.map       |   2 +-
 drivers/net/enetc/rte_pmd_enetc_version.map   |   2 +-
 drivers/net/enic/rte_pmd_enic_version.map     |   2 +-
 .../net/failsafe/rte_pmd_failsafe_version.map |   2 +-
 drivers/net/fm10k/rte_pmd_fm10k_version.map   |   2 +-
 drivers/net/hinic/rte_pmd_hinic_version.map   |   2 +-
 drivers/net/hns3/rte_pmd_hns3_version.map     |   2 +-
 drivers/net/i40e/rte_pmd_i40e_version.map     |   2 +-
 drivers/net/iavf/rte_pmd_iavf_version.map     |   2 +-
 drivers/net/ice/rte_pmd_ice_version.map       |   2 +-
 drivers/net/ionic/rte_pmd_ionic_version.map   |   1 -
 drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map |   2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map   |   2 +-
 drivers/net/kni/rte_pmd_kni_version.map       |   2 +-
 .../net/liquidio/rte_pmd_liquidio_version.map |   2 +-
 drivers/net/memif/rte_pmd_memif_version.map   |   2 +-
 drivers/net/mlx4/rte_pmd_mlx4_version.map     |   2 +-
 drivers/net/mlx5/rte_pmd_mlx5_version.map     |   6 +-
 drivers/net/mvneta/rte_pmd_mvneta_version.map |   2 +-
 drivers/net/mvpp2/rte_pmd_mvpp2_version.map   |   2 +-
 drivers/net/netvsc/rte_pmd_netvsc_version.map |   2 +-
 drivers/net/nfb/rte_pmd_nfb_version.map       |   2 +-
 drivers/net/nfp/rte_pmd_nfp_version.map       |   2 +-
 drivers/net/null/rte_pmd_null_version.map     |   2 +-
 .../net/octeontx/rte_pmd_octeontx_version.map |   2 +-
 .../octeontx2/rte_pmd_octeontx2_version.map   |   2 +-
 drivers/net/pcap/rte_pmd_pcap_version.map     |   2 +-
 drivers/net/pfe/rte_pmd_pfe_version.map       |   2 +-
 drivers/net/qede/rte_pmd_qede_version.map     |   2 +-
 drivers/net/ring/rte_pmd_ring_version.map     |   2 +-
 drivers/net/sfc/rte_pmd_sfc_version.map       |   2 +-
 .../net/softnic/rte_pmd_softnic_version.map   |   2 +-
 .../net/szedata2/rte_pmd_szedata2_version.map |   2 +-
 drivers/net/tap/rte_pmd_tap_version.map       |   2 +-
 .../net/thunderx/rte_pmd_thunderx_version.map |   2 +-
 .../rte_pmd_vdev_netvsc_version.map           |   2 +-
 drivers/net/vhost/rte_pmd_vhost_version.map   |   2 +-
 drivers/net/virtio/rte_pmd_virtio_version.map |   2 +-
 .../net/vmxnet3/rte_pmd_vmxnet3_version.map   |   2 +-
 .../rte_rawdev_dpaa2_cmdif_version.map        |   2 +-
 .../rte_rawdev_dpaa2_qdma_version.map         |   2 +-
 .../raw/ifpga/rte_rawdev_ifpga_version.map    |   2 +-
 drivers/raw/ioat/rte_rawdev_ioat_version.map  |   2 +-
 drivers/raw/ntb/rte_rawdev_ntb_version.map    |   2 +-
 .../rte_rawdev_octeontx2_dma_version.map      |   2 +-
 .../rte_rawdev_octeontx2_ep_version.map       |   1 -
 .../skeleton/rte_rawdev_skeleton_version.map  |   2 +-
 drivers/vdpa/ifc/rte_pmd_ifc_version.map      |   2 +-
 lib/librte_acl/rte_acl_version.map            |   2 +-
 .../rte_bitratestats_version.map              |   2 +-
 lib/librte_cfgfile/rte_cfgfile_version.map    |   2 +-
 lib/librte_cmdline/rte_cmdline_version.map    |   2 +-
 .../rte_cryptodev_version.map                 |   7 +-
 .../rte_distributor_version.map               |   2 +-
 lib/librte_eal/rte_eal_version.map            |  10 +-
 lib/librte_efd/rte_efd_version.map            |   2 +-
 lib/librte_ethdev/rte_ethdev_version.map      |   2 +-
 lib/librte_eventdev/rte_eventdev_version.map  |   2 +-
 lib/librte_gro/rte_gro_version.map            |   2 +-
 lib/librte_gso/rte_gso_version.map            |   2 +-
 lib/librte_hash/rte_hash_version.map          |   2 +-
 lib/librte_ip_frag/rte_ip_frag_version.map    |   2 +-
 lib/librte_jobstats/rte_jobstats_version.map  |   2 +-
 lib/librte_kni/rte_kni_version.map            |   2 +-
 lib/librte_kvargs/rte_kvargs_version.map      |   2 +-
 .../rte_latencystats_version.map              |   2 +-
 lib/librte_lpm/rte_lpm_version.map            |   2 +-
 lib/librte_mbuf/rte_mbuf_version.map          |   2 +-
 lib/librte_member/rte_member_version.map      |   2 +-
 lib/librte_mempool/rte_mempool_version.map    |   6 +-
 lib/librte_meter/rte_meter_version.map        |  14 +-
 lib/librte_metrics/rte_metrics_version.map    |   2 +-
 lib/librte_net/rte_net_version.map            |   2 +-
 lib/librte_pci/rte_pci_version.map            |   2 +-
 lib/librte_pdump/rte_pdump_version.map        |   2 +-
 lib/librte_pipeline/rte_pipeline_version.map  |   2 +-
 lib/librte_port/rte_port_version.map          |   2 +-
 lib/librte_power/rte_power_version.map        |   2 +-
 lib/librte_rawdev/rte_rawdev_version.map      |   2 +-
 lib/librte_reorder/rte_reorder_version.map    |   2 +-
 lib/librte_ring/rte_ring_version.map          |  13 +-
 lib/librte_sched/rte_sched_version.map        |   2 +-
 lib/librte_security/rte_security_version.map  |   2 +-
 lib/librte_table/rte_table_version.map        |   2 +-
 lib/librte_timer/rte_timer_version.map        |   2 +-
 lib/librte_vhost/rte_vhost_version.map        |   2 +-
 150 files changed, 295 insertions(+), 208 deletions(-)
 create mode 100644 doc/guides/rel_notes/release_20_11.rst

diff --git a/.travis.yml b/.travis.yml
index 14f8124233..d6eeab371d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@
 language: c
 cache:
   ccache: true
-  directories:
-    - libabigail
-    - reference
 
 dist: bionic
 
@@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
 
-_libabigail_build_packages: &libabigail_build_packages
-  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
-
 _build_32b_packages: &build_32b_packages
   - *required_packages
   - [gcc-multilib]
@@ -34,10 +28,6 @@ _doc_packages: &doc_packages
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 script: ./.ci/${TRAVIS_OS_NAME}-build.sh
 
-env:
-  global:
-    - REF_GIT_TAG=v20.05
-
 jobs:
   include:
   # x86_64 gcc jobs
@@ -55,14 +45,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: amd64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # x86_64 clang jobs
   - env: DEF_LIB="static"
     arch: amd64
@@ -116,14 +98,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: arm64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # aarch64 clang jobs
   - env: DEF_LIB="static"
     arch: arm64
diff --git a/ABI_VERSION b/ABI_VERSION
index a9ac8dacb0..5f39e91446 100644
--- a/ABI_VERSION
+++ b/ABI_VERSION
@@ -1 +1 @@
-20.0.3
+21.0
diff --git a/VERSION b/VERSION
index 85e33446f8..8b0beab16a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.08.0
+20.11.0
diff --git a/config/meson.build b/config/meson.build
index cff8b33dd2..6996e5cbea 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -29,10 +29,7 @@ abi_version = run_command(find_program('cat', 'more'),
 # and have the soname be all but the final part of the abi_version.
 # e.g. v20.1 => librte_foo.so.20.1
 #    sonames => librte_foo.so.20
-# e.g. v20.0.1 => librte_foo.so.20.0.1
-#      sonames => librte_foo.so.20.0
-abi_va = abi_version.split('.')
-so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1]
+so_version = abi_version.split('.')[0]
 
 # extract all version information into the build configuration
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index 05c9d837a4..fb70d1a5f3 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -8,6 +8,7 @@ Release Notes
     :maxdepth: 1
     :numbered:
 
+    release_20_11
     release_20_08
     release_20_05
     release_20_02
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
new file mode 100644
index 0000000000..df227a1773
--- /dev/null
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -0,0 +1,136 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2020 The DPDK contributors
+
+.. include:: <isonum.txt>
+
+DPDK Release 20.11
+==================
+
+.. **Read this first.**
+
+   The text in the sections below explains how to update the release notes.
+
+   Use proper spelling, capitalization and punctuation in all sections.
+
+   Variable and config names should be quoted as fixed width text:
+   ``LIKE_THIS``.
+
+   Build the docs and view the output file to ensure the changes are correct::
+
+      make doc-guides-html
+      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
+
+
+New Features
+------------
+
+.. This section should contain new features added in this release.
+   Sample format:
+
+   * **Add a title in the past tense with a full stop.**
+
+     Add a short 1-2 sentence description in the past tense.
+     The description should be enough to allow someone scanning
+     the release notes to understand the new feature.
+
+     If the feature adds a lot of sub-features you can use a bullet list
+     like this:
+
+     * Added feature foo to do something.
+     * Enhanced feature bar to do something else.
+
+     Refer to the previous release notes for examples.
+
+     Suggested order in release notes items:
+     * Core libs (EAL, mempool, ring, mbuf, buses)
+     * Device abstraction libs and PMDs
+       - ethdev (lib, PMDs)
+       - cryptodev (lib, PMDs)
+       - eventdev (lib, PMDs)
+       - etc
+     * Other libs
+     * Apps, Examples, Tools (if significant)
+
+     This section is a comment. Do not overwrite or remove it.
+     Also, make sure to start the actual text at the margin.
+     =======================================================
+
+
+Removed Items
+-------------
+
+.. This section should contain removed items in this release. Sample format:
+
+   * Add a short 1-2 sentence description of the removed item
+     in the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+API Changes
+-----------
+
+.. This section should contain API changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the API change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+ABI Changes
+-----------
+
+.. This section should contain ABI changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the ABI change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Known Issues
+------------
+
+.. This section should contain new known issues in this release. Sample format:
+
+   * **Add title in present tense with full stop.**
+
+     Add a short 1-2 sentence description of the known issue
+     in the present tense. Add information on any known workarounds.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Tested Platforms
+----------------
+
+.. This section should contain a list of platforms that were tested
+   with this release.
+
+   The format is:
+
+   * <vendor> platform with <vendor> <type of devices> combinations
+
+     * List of CPU
+     * List of OS
+     * List of devices
+     * Other relevant details...
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
index b0fb9717fa..d723bc9b0e 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
+++ b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
index 6bcea2cc7f..a2ab086cd8 100644
--- a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
+++ b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/null/rte_pmd_bbdev_null_version.map
+++ b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
+++ b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/rte_bus_ifpga_version.map
index 05b4a28c1b..6e8f85da3c 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga_version.map
+++ b/drivers/bus/ifpga/rte_bus_ifpga_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ifpga_driver_register;
diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/rte_bus_pci_version.map
index 012d817e14..5b75d23671 100644
--- a/drivers/bus/pci/rte_bus_pci_version.map
+++ b/drivers/bus/pci/rte_bus_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pci_dump;
diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/rte_bus_vdev_version.map
index 5abb10ecb0..61b6cefcee 100644
--- a/drivers/bus/vdev/rte_bus_vdev_version.map
+++ b/drivers/bus/vdev/rte_bus_vdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vdev_add_custom_scan;
diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/rte_bus_vmbus_version.map
index cbaaebc06c..fa8e91c282 100644
--- a/drivers/bus/vmbus/rte_bus_vmbus_version.map
+++ b/drivers/bus/vmbus/rte_bus_vmbus_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vmbus_chan_close;
diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/rte_common_cpt_version.map
index 8c65cde6cf..4d85021a87 100644
--- a/drivers/common/cpt/rte_common_cpt_version.map
+++ b/drivers/common/cpt/rte_common_cpt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cpt_pmd_ops_helper_asym_get_mlen;
diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map
index 92ceac108d..44142499e0 100644
--- a/drivers/common/iavf/rte_common_iavf_version.map
+++ b/drivers/common/iavf/rte_common_iavf_version.map
@@ -1,11 +1,11 @@
 DPDK_21 {
 	global:
 
-	iavf_init_adminq;
-	iavf_shutdown_adminq;
 	iavf_aq_send_msg_to_pf;
 	iavf_clean_arq_element;
+	iavf_init_adminq;
 	iavf_set_mac_type;
+	iavf_shutdown_adminq;
 	iavf_vf_parse_hw_config;
 
 	local: *;
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
index 7729d0dd04..c4d57c08a7 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -93,4 +93,3 @@ INTERNAL {
 
 	mlx5_pci_driver_register;
 };
-
diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/rte_common_mvep_version.map
index 030928439d..e5af82c61d 100644
--- a/drivers/common/mvep/rte_common_mvep_version.map
+++ b/drivers/common/mvep/rte_common_mvep_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mvep_deinit;
diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/rte_common_octeontx_version.map
index 5f6aa8bd3a..30f3fa65e0 100644
--- a/drivers/common/octeontx/rte_common_octeontx_version.map
+++ b/drivers/common/octeontx/rte_common_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	octeontx_get_global_domain;
diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/rte_pmd_isal_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/isal/rte_pmd_isal_version.map
+++ b/drivers/compress/isal/rte_pmd_isal_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
+++ b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/qat/rte_pmd_qat_version.map
+++ b/drivers/compress/qat/rte_pmd_qat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/rte_pmd_zlib_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/zlib/rte_pmd_zlib_version.map
+++ b/drivers/compress/zlib/rte_pmd_zlib_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
+++ b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
+++ b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/rte_pmd_armv8_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/armv8/rte_pmd_armv8_version.map
+++ b/drivers/crypto/armv8/rte_pmd_armv8_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
+++ b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/rte_pmd_ccp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/ccp/rte_pmd_ccp_version.map
+++ b/drivers/crypto/ccp/rte_pmd_ccp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
+++ b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
+++ b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
+++ b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/rte_pmd_null_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/null/rte_pmd_null_crypto_version.map
+++ b/drivers/crypto/null/rte_pmd_null_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
+++ b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
+++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/openssl/rte_pmd_openssl_version.map
+++ b/drivers/crypto/openssl/rte_pmd_openssl_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
index 077afedce7..ca6f102d9f 100644
--- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
+++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cryptodev_scheduler_load_user_scheduler;
diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
+++ b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
+++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/rte_pmd_zuc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/zuc/rte_pmd_zuc_version.map
+++ b/drivers/crypto/zuc/rte_pmd_zuc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
+++ b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
+++ b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/rte_pmd_dsw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dsw/rte_pmd_dsw_event_version.map
+++ b/drivers/event/dsw/rte_pmd_dsw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
+++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
+++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/opdl/rte_pmd_opdl_event_version.map
+++ b/drivers/event/opdl/rte_pmd_opdl_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
+++ b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/rte_pmd_sw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/sw/rte_pmd_sw_event_version.map
+++ b/drivers/event/sw/rte_pmd_sw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/rte_mempool_bucket_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/bucket/rte_mempool_bucket_version.map
+++ b/drivers/mempool/bucket/rte_mempool_bucket_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
index 686b024624..473b8c90e8 100644
--- a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
+++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_dpaa2_mbuf_from_buf_addr;
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
+++ b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/ring/rte_mempool_ring_version.map
+++ b/drivers/mempool/ring/rte_mempool_ring_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/stack/rte_mempool_stack_version.map
+++ b/drivers/mempool/stack/rte_mempool_stack_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_packet/rte_pmd_af_packet_version.map
+++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
+++ b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/rte_pmd_ark_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ark/rte_pmd_ark_version.map
+++ b/drivers/net/ark/rte_pmd_ark_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map
index 9b04838d84..6e17832684 100644
--- a/drivers/net/atlantic/rte_pmd_atlantic_version.map
+++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/avp/rte_pmd_avp_version.map
+++ b/drivers/net/avp/rte_pmd_avp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/axgbe/rte_pmd_axgbe_version.map
+++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
+++ b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/rte_pmd_bnxt_version.map
index bb52562347..a050d86ab7 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt_version.map
+++ b/drivers/net/bnxt/rte_pmd_bnxt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_bnxt_get_vf_rx_status;
diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map
index 270c7d5d55..df81ee74c1 100644
--- a/drivers/net/bonding/rte_pmd_bond_version.map
+++ b/drivers/net/bonding/rte_pmd_bond_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_bond_8023ad_agg_selection_get;
diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
+++ b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
index 774aa0de45..87ce8f5b6c 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
+++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_dpaa_set_tx_loopback;
diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/e1000/rte_pmd_e1000_version.map
+++ b/drivers/net/e1000/rte_pmd_e1000_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/rte_pmd_ena_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ena/rte_pmd_ena_version.map
+++ b/drivers/net/ena/rte_pmd_ena_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enetc/rte_pmd_enetc_version.map
+++ b/drivers/net/enetc/rte_pmd_enetc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enic/rte_pmd_enic_version.map
+++ b/drivers/net/enic/rte_pmd_enic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/rte_pmd_failsafe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/failsafe/rte_pmd_failsafe_version.map
+++ b/drivers/net/failsafe/rte_pmd_failsafe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/fm10k/rte_pmd_fm10k_version.map
+++ b/drivers/net/fm10k/rte_pmd_fm10k_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/rte_pmd_hinic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hinic/rte_pmd_hinic_version.map
+++ b/drivers/net/hinic/rte_pmd_hinic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/rte_pmd_hns3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hns3/rte_pmd_hns3_version.map
+++ b/drivers/net/hns3/rte_pmd_hns3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
index f6cd3b3566..413c58cb21 100644
--- a/drivers/net/i40e/rte_pmd_i40e_version.map
+++ b/drivers/net/i40e/rte_pmd_i40e_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_i40e_add_vf_mac_addr;
diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/iavf/rte_pmd_iavf_version.map
+++ b/drivers/net/iavf/rte_pmd_iavf_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map
index d04b194c13..91f40225e9 100644
--- a/drivers/net/ice/rte_pmd_ice_version.map
+++ b/drivers/net/ice/rte_pmd_ice_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/net/ionic/rte_pmd_ionic_version.map
+++ b/drivers/net/ionic/rte_pmd_ionic_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
index 7e348e99b1..d8cc1026e0 100644
--- a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
+++ b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
index 911f8083f1..9402802b04 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_ixgbe_bypass_event_show;
diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/rte_pmd_kni_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/kni/rte_pmd_kni_version.map
+++ b/drivers/net/kni/rte_pmd_kni_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/liquidio/rte_pmd_liquidio_version.map
+++ b/drivers/net/liquidio/rte_pmd_liquidio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/rte_pmd_memif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/memif/rte_pmd_memif_version.map
+++ b/drivers/net/memif/rte_pmd_memif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mlx4/rte_pmd_mlx4_version.map
+++ b/drivers/net/mlx4/rte_pmd_mlx4_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/rte_pmd_mlx5_version.map
index c8b1031b02..bc1d3d06bf 100644
--- a/drivers/net/mlx5/rte_pmd_mlx5_version.map
+++ b/drivers/net/mlx5/rte_pmd_mlx5_version.map
@@ -1,10 +1,10 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
 EXPERIMENTAL {
-        global:
+	global:
 
-        # added in 20.02
+	# added in 20.02
 	rte_pmd_mlx5_get_dyn_flag_names;
 };
diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/rte_pmd_mvneta_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvneta/rte_pmd_mvneta_version.map
+++ b/drivers/net/mvneta/rte_pmd_mvneta_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
+++ b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/rte_pmd_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/netvsc/rte_pmd_netvsc_version.map
+++ b/drivers/net/netvsc/rte_pmd_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/rte_pmd_nfb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfb/rte_pmd_nfb_version.map
+++ b/drivers/net/nfb/rte_pmd_nfb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/rte_pmd_nfp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfp/rte_pmd_nfp_version.map
+++ b/drivers/net/nfp/rte_pmd_nfp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/null/rte_pmd_null_version.map
+++ b/drivers/net/null/rte_pmd_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/rte_pmd_octeontx_version.map
index f7cae02fac..6dda72890c 100644
--- a/drivers/net/octeontx/rte_pmd_octeontx_version.map
+++ b/drivers/net/octeontx/rte_pmd_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_octeontx_pchan_map;
diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
+++ b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pcap/rte_pmd_pcap_version.map
+++ b/drivers/net/pcap/rte_pmd_pcap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/rte_pmd_pfe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pfe/rte_pmd_pfe_version.map
+++ b/drivers/net/pfe/rte_pmd_pfe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/rte_pmd_qede_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/qede/rte_pmd_qede_version.map
+++ b/drivers/net/qede/rte_pmd_qede_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/rte_pmd_ring_version.map
index ebb6be2733..29770fe3e4 100644
--- a/drivers/net/ring/rte_pmd_ring_version.map
+++ b/drivers/net/ring/rte_pmd_ring_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_from_ring;
diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/sfc/rte_pmd_sfc_version.map
+++ b/drivers/net/sfc/rte_pmd_sfc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
index 50f113d5a2..530d2e6b72 100644
--- a/drivers/net/softnic/rte_pmd_softnic_version.map
+++ b/drivers/net/softnic/rte_pmd_softnic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_softnic_run;
diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/rte_pmd_szedata2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/szedata2/rte_pmd_szedata2_version.map
+++ b/drivers/net/szedata2/rte_pmd_szedata2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/rte_pmd_tap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/tap/rte_pmd_tap_version.map
+++ b/drivers/net/tap/rte_pmd_tap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/thunderx/rte_pmd_thunderx_version.map
+++ b/drivers/net/thunderx/rte_pmd_thunderx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
+++ b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/rte_pmd_vhost_version.map
index 16b591ccc4..634255829e 100644
--- a/drivers/net/vhost/rte_pmd_vhost_version.map
+++ b/drivers/net/vhost/rte_pmd_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_vhost_get_queue_event;
diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/virtio/rte_pmd_virtio_version.map
+++ b/drivers/net/virtio/rte_pmd_virtio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
+++ b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
+++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
index ca6a0d7626..280c79ea9c 100644
--- a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
+++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_qdma_attr_get;
diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
+++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ioat/rte_rawdev_ioat_version.map
+++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ntb/rte_rawdev_ntb_version.map
+++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
+++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
+++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
+++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/vdpa/ifc/rte_pmd_ifc_version.map
+++ b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/rte_acl_version.map
index c3daca8115..d97f2927bf 100644
--- a/lib/librte_acl/rte_acl_version.map
+++ b/lib/librte_acl/rte_acl_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_acl_add_rules;
diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/rte_bitratestats_version.map
index 88fc2912db..463f78a53a 100644
--- a/lib/librte_bitratestats/rte_bitratestats_version.map
+++ b/lib/librte_bitratestats/rte_bitratestats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_stats_bitrate_calc;
diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map
index 22c999fe16..180c42b717 100644
--- a/lib/librte_cfgfile/rte_cfgfile_version.map
+++ b/lib/librte_cfgfile/rte_cfgfile_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cfgfile_add_entry;
diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/rte_cmdline_version.map
index 95fce812ff..a99104457f 100644
--- a/lib/librte_cmdline/rte_cmdline_version.map
+++ b/lib/librte_cmdline/rte_cmdline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cirbuf_add_buf_head;
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
index a7a78dc41f..02f6dcf724 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_crypto_aead_algorithm_strings;
@@ -58,12 +58,11 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 	rte_cryptodev_info_get;
 	rte_cryptodev_sym_capability_get;
-} DPDK_20.0;
-
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map
index 1b7c643005..1ddcd01fe6 100644
--- a/lib/librte_distributor/rte_distributor_version.map
+++ b/lib/librte_distributor/rte_distributor_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_distributor_clear_returns;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index bf0c17c233..0b18e2ef85 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_panic;
@@ -6,6 +6,7 @@ DPDK_20.0 {
 	eal_timer_source;
 	per_lcore__lcore_id;
 	per_lcore__rte_errno;
+	per_lcore__thread_id;
 	rte_bus_dump;
 	rte_bus_find;
 	rte_bus_find_by_device;
@@ -221,13 +222,6 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	per_lcore__thread_id;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
 	global:
 
diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/rte_efd_version.map
index e010eecfe4..425c0a85a9 100644
--- a/lib/librte_efd/rte_efd_version.map
+++ b/lib/librte_efd/rte_efd_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_efd_create;
diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
index 1212a17d32..8d9d6b1c67 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	_rte_eth_dev_callback_process;
diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
index 91a62cd077..3d9d0ca054 100644
--- a/lib/librte_eventdev/rte_eventdev_version.map
+++ b/lib/librte_eventdev/rte_eventdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_event_crypto_adapter_caps_get;
diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/rte_gro_version.map
index 9f6fe79e57..19dc66b0d4 100644
--- a/lib/librte_gro/rte_gro_version.map
+++ b/lib/librte_gro/rte_gro_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gro_ctx_create;
diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/rte_gso_version.map
index 8505a59c27..60aa1b54e4 100644
--- a/lib/librte_gso/rte_gso_version.map
+++ b/lib/librte_gso/rte_gso_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gso_segment;
diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
index c2a909443d..c0db81014f 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_fbk_hash_create;
diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map
index 5dd34f828c..82b308ddb0 100644
--- a/lib/librte_ip_frag/rte_ip_frag_version.map
+++ b/lib/librte_ip_frag/rte_ip_frag_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ip_frag_free_death_row;
diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/rte_jobstats_version.map
index dbd2664ae2..3e166ad548 100644
--- a/lib/librte_jobstats/rte_jobstats_version.map
+++ b/lib/librte_jobstats/rte_jobstats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_jobstats_abort;
diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
index 9cd3cedc54..a93da95f36 100644
--- a/lib/librte_kni/rte_kni_version.map
+++ b/lib/librte_kni/rte_kni_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kni_alloc;
diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map
index 3ba0f4b59c..ed375bf4a3 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kvargs_count;
diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/rte_latencystats_version.map
index e04e63463f..0c4360ab43 100644
--- a/lib/librte_latencystats/rte_latencystats_version.map
+++ b/lib/librte_latencystats/rte_latencystats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_latencystats_get;
diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/rte_lpm_version.map
index bfccd7eacc..b4d437cc75 100644
--- a/lib/librte_lpm/rte_lpm_version.map
+++ b/lib/librte_lpm/rte_lpm_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_lpm6_add;
diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
index ab161bcdc7..a011aaead3 100644
--- a/lib/librte_mbuf/rte_mbuf_version.map
+++ b/lib/librte_mbuf/rte_mbuf_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_pktmbuf_linearize;
diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/rte_member_version.map
index 87780ae611..b8c6322e73 100644
--- a/lib/librte_member/rte_member_version.map
+++ b/lib/librte_member/rte_member_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_member_add;
diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
index 826a0b8824..50e22ee020 100644
--- a/lib/librte_mempool/rte_mempool_version.map
+++ b/lib/librte_mempool/rte_mempool_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mempool_audit;
@@ -31,12 +31,12 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 
 	rte_mempool_populate_iova;
 	rte_mempool_populate_virt;
-} DPDK_20.0;
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
index 58859d4d76..e2a2607f28 100644
--- a/lib/librte_meter/rte_meter_version.map
+++ b/lib/librte_meter/rte_meter_version.map
@@ -1,24 +1,18 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_meter_srtcm_config;
 	rte_meter_srtcm_profile_config;
 	rte_meter_trtcm_config;
 	rte_meter_trtcm_profile_config;
+	rte_meter_trtcm_rfc4115_config;
+	rte_meter_trtcm_rfc4115_profile_config;
 
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	rte_meter_trtcm_rfc4115_config;
-	rte_meter_trtcm_rfc4115_profile_config;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
-       global:
+	global:
 
 	rte_meter_trtcm_rfc4115_config;
 	rte_meter_trtcm_rfc4115_profile_config;
diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/rte_metrics_version.map
index c88939b117..20f99cd19a 100644
--- a/lib/librte_metrics/rte_metrics_version.map
+++ b/lib/librte_metrics/rte_metrics_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_metrics_get_names;
diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
index 8a4e75a3a0..621f237945 100644
--- a/lib/librte_net/rte_net_version.map
+++ b/lib/librte_net/rte_net_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_random_addr;
diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map
index 67eb845796..cd77c9dc9e 100644
--- a/lib/librte_pci/rte_pci_version.map
+++ b/lib/librte_pci/rte_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	pci_map_resource;
diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map
index 6d02ccce6d..2f9e952d0b 100644
--- a/lib/librte_pdump/rte_pdump_version.map
+++ b/lib/librte_pdump/rte_pdump_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pdump_disable;
diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
index 64d38afecd..9ed80eb041 100644
--- a/lib/librte_pipeline/rte_pipeline_version.map
+++ b/lib/librte_pipeline/rte_pipeline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pipeline_ah_packet_drop;
diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/rte_port_version.map
index 18c6154672..bd1fbb66b0 100644
--- a/lib/librte_port/rte_port_version.map
+++ b/lib/librte_port/rte_port_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_port_ethdev_reader_ops;
diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
index 00ee5753e2..69ca9af616 100644
--- a/lib/librte_power/rte_power_version.map
+++ b/lib/librte_power/rte_power_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_power_exit;
diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
index 63b54f598b..eb29a3ac0d 100644
--- a/lib/librte_rawdev/rte_rawdev_version.map
+++ b/lib/librte_rawdev/rte_rawdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_rawdev_close;
diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/rte_reorder_version.map
index cf444062df..8c0220d324 100644
--- a/lib/librte_reorder/rte_reorder_version.map
+++ b/lib/librte_reorder/rte_reorder_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_reorder_create;
diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map
index ac392f3ca9..e35d6b9712 100644
--- a/lib/librte_ring/rte_ring_version.map
+++ b/lib/librte_ring/rte_ring_version.map
@@ -1,21 +1,16 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ring_create;
+	rte_ring_create_elem;
 	rte_ring_dump;
 	rte_ring_free;
 	rte_ring_get_memsize;
+	rte_ring_get_memsize_elem;
 	rte_ring_init;
 	rte_ring_list_dump;
 	rte_ring_lookup;
+	rte_ring_reset;
 
 	local: *;
 };
-
-DPDK_21 {
-	global:
-
-	rte_ring_create_elem;
-	rte_ring_get_memsize_elem;
-	rte_ring_reset;
-} DPDK_20.0;
diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map
index cefd990367..3faef6f0a0 100644
--- a/lib/librte_sched/rte_sched_version.map
+++ b/lib/librte_sched/rte_sched_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_approx;
diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/rte_security_version.map
index b07314bbf4..d84eec0a88 100644
--- a/lib/librte_security/rte_security_version.map
+++ b/lib/librte_security/rte_security_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_security_attach_session;
diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map
index 40f72b1fe8..568a6c6a8f 100644
--- a/lib/librte_table/rte_table_version.map
+++ b/lib/librte_table/rte_table_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_table_acl_ops;
diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/rte_timer_version.map
index 4471cef92b..21e68ea7a2 100644
--- a/lib/librte_timer/rte_timer_version.map
+++ b/lib/librte_timer/rte_timer_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_timer_dump_stats;
diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
index 13ec53b638..20b4abcb4e 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vhost_avail_entries;
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v3 2/2] devtools: fix ABI update in map files
  2020-08-11  9:58 ` [dpdk-dev] [PATCH v3 1/2] " Thomas Monjalon
@ 2020-08-11  9:58   ` Thomas Monjalon
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11  9:58 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

The script was using the full ABI version, including the minor number,
to version the symbols in the map files.
It is fixed to use only the major number for symbol versioning.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/update_version_map_abi.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
index 80a61641ed..10c3bc8098 100755
--- a/devtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -105,9 +105,9 @@ def __parse_map_file(f_in):
     return has_stable, stable_lines, experimental_lines, internal_lines
 
 
-def __generate_stable_abi(f_out, abi_version, lines):
+def __generate_stable_abi(f_out, abi_major, lines):
     # print ABI version header
-    print("DPDK_{} {{".format(abi_version), file=f_out)
+    print("DPDK_{} {{".format(abi_major), file=f_out)
 
     # print global section if it exists
     if lines:
@@ -186,6 +186,7 @@ def __main():
               file=sys.stderr)
         arg_parser.print_help()
         sys.exit(1)
+    abi_major = parsed.abi_version.split('.')[0]
 
     with open(parsed.map_file) as f_in:
         has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
@@ -193,7 +194,7 @@ def __main():
     with open(parsed.map_file, 'w') as f_out:
         need_newline = has_stable and experimental_lines
         if has_stable:
-            __generate_stable_abi(f_out, parsed.abi_version, stable_lines)
+            __generate_stable_abi(f_out, abi_major, stable_lines)
         if need_newline:
             # separate sections with a newline
             print(file=f_out)
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0
  2020-08-10 15:15 [dpdk-dev] [PATCH] version: 20.11-rc0 Thomas Monjalon
  2020-08-11  9:31 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
  2020-08-11  9:58 ` [dpdk-dev] [PATCH v3 1/2] " Thomas Monjalon
@ 2020-08-11 11:27 ` Thomas Monjalon
  2020-08-11 11:27   ` [dpdk-dev] [PATCH v4 2/2] devtools: fix ABI update in map files Thomas Monjalon
  2020-08-11 13:47   ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Kinsella, Ray
  2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
  3 siblings, 2 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11 11:27 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

Start a new release cycle with empty release notes.

The ABI version becomes 21.0.
The ABI major is back to normal, having only one number (21 vs 20.0).
The map files are updated to the new ABI major number (21).
The ABI exceptions specific to previous major version are dropped.
Travis ABI check is disabled because compatibility is not preserved.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v4: add -rc0 and remove temporary ABI exceptions
v3: add minor number to ABI_VERSION and remove workaround in scripts
v2: bump major ABI number (including .map changes)
---
 .travis.yml                                   |  26 ----
 ABI_VERSION                                   |   2 +-
 VERSION                                       |   2 +-
 config/meson.build                            |   5 +-
 devtools/libabigail.abignore                  |  60 --------
 doc/guides/rel_notes/index.rst                |   1 +
 doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
 .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
 .../rte_pmd_bbdev_fpga_lte_fec_version.map    |   2 +-
 .../null/rte_pmd_bbdev_null_version.map       |   2 +-
 .../rte_pmd_bbdev_turbo_sw_version.map        |   2 +-
 drivers/bus/ifpga/rte_bus_ifpga_version.map   |   2 +-
 drivers/bus/pci/rte_bus_pci_version.map       |   2 +-
 drivers/bus/vdev/rte_bus_vdev_version.map     |   2 +-
 drivers/bus/vmbus/rte_bus_vmbus_version.map   |   2 +-
 drivers/common/cpt/rte_common_cpt_version.map |   2 +-
 .../common/iavf/rte_common_iavf_version.map   |   4 +-
 .../common/mlx5/rte_common_mlx5_version.map   |   1 -
 .../common/mvep/rte_common_mvep_version.map   |   2 +-
 .../octeontx/rte_common_octeontx_version.map  |   2 +-
 .../compress/isal/rte_pmd_isal_version.map    |   2 +-
 .../rte_pmd_octeontx_compress_version.map     |   2 +-
 drivers/compress/qat/rte_pmd_qat_version.map  |   2 +-
 .../compress/zlib/rte_pmd_zlib_version.map    |   2 +-
 .../aesni_gcm/rte_pmd_aesni_gcm_version.map   |   2 +-
 .../aesni_mb/rte_pmd_aesni_mb_version.map     |   2 +-
 .../crypto/armv8/rte_pmd_armv8_version.map    |   2 +-
 .../caam_jr/rte_pmd_caam_jr_version.map       |   2 +-
 drivers/crypto/ccp/rte_pmd_ccp_version.map    |   2 +-
 .../crypto/kasumi/rte_pmd_kasumi_version.map  |   2 +-
 .../crypto/mvsam/rte_pmd_mvsam_version.map    |   2 +-
 .../crypto/nitrox/rte_pmd_nitrox_version.map  |   2 +-
 .../null/rte_pmd_null_crypto_version.map      |   2 +-
 .../rte_pmd_octeontx_crypto_version.map       |   2 +-
 .../rte_pmd_octeontx2_crypto_version.map      |   2 +-
 .../openssl/rte_pmd_openssl_version.map       |   2 +-
 .../rte_pmd_crypto_scheduler_version.map      |   2 +-
 .../crypto/snow3g/rte_pmd_snow3g_version.map  |   2 +-
 .../virtio/rte_pmd_virtio_crypto_version.map  |   2 +-
 drivers/crypto/zuc/rte_pmd_zuc_version.map    |   2 +-
 .../event/dpaa/rte_pmd_dpaa_event_version.map |   2 +-
 .../dpaa2/rte_pmd_dpaa2_event_version.map     |   2 +-
 .../event/dsw/rte_pmd_dsw_event_version.map   |   2 +-
 .../rte_pmd_octeontx_event_version.map        |   2 +-
 .../rte_pmd_octeontx2_event_version.map       |   2 +-
 .../event/opdl/rte_pmd_opdl_event_version.map |   2 +-
 .../rte_pmd_skeleton_event_version.map        |   2 +-
 drivers/event/sw/rte_pmd_sw_event_version.map |   2 +-
 .../bucket/rte_mempool_bucket_version.map     |   2 +-
 .../dpaa2/rte_mempool_dpaa2_version.map       |   2 +-
 .../octeontx/rte_mempool_octeontx_version.map |   2 +-
 .../mempool/ring/rte_mempool_ring_version.map |   2 +-
 .../stack/rte_mempool_stack_version.map       |   2 +-
 .../af_packet/rte_pmd_af_packet_version.map   |   2 +-
 drivers/net/af_xdp/rte_pmd_af_xdp_version.map |   2 +-
 drivers/net/ark/rte_pmd_ark_version.map       |   2 +-
 .../net/atlantic/rte_pmd_atlantic_version.map |   2 +-
 drivers/net/avp/rte_pmd_avp_version.map       |   2 +-
 drivers/net/axgbe/rte_pmd_axgbe_version.map   |   2 +-
 drivers/net/bnx2x/rte_pmd_bnx2x_version.map   |   2 +-
 drivers/net/bnxt/rte_pmd_bnxt_version.map     |   2 +-
 drivers/net/bonding/rte_pmd_bond_version.map  |   2 +-
 drivers/net/cxgbe/rte_pmd_cxgbe_version.map   |   2 +-
 drivers/net/dpaa/rte_pmd_dpaa_version.map     |   2 +-
 drivers/net/e1000/rte_pmd_e1000_version.map   |   2 +-
 drivers/net/ena/rte_pmd_ena_version.map       |   2 +-
 drivers/net/enetc/rte_pmd_enetc_version.map   |   2 +-
 drivers/net/enic/rte_pmd_enic_version.map     |   2 +-
 .../net/failsafe/rte_pmd_failsafe_version.map |   2 +-
 drivers/net/fm10k/rte_pmd_fm10k_version.map   |   2 +-
 drivers/net/hinic/rte_pmd_hinic_version.map   |   2 +-
 drivers/net/hns3/rte_pmd_hns3_version.map     |   2 +-
 drivers/net/i40e/rte_pmd_i40e_version.map     |   2 +-
 drivers/net/iavf/rte_pmd_iavf_version.map     |   2 +-
 drivers/net/ice/rte_pmd_ice_version.map       |   2 +-
 drivers/net/ionic/rte_pmd_ionic_version.map   |   1 -
 drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map |   2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map   |   2 +-
 drivers/net/kni/rte_pmd_kni_version.map       |   2 +-
 .../net/liquidio/rte_pmd_liquidio_version.map |   2 +-
 drivers/net/memif/rte_pmd_memif_version.map   |   2 +-
 drivers/net/mlx4/rte_pmd_mlx4_version.map     |   2 +-
 drivers/net/mlx5/rte_pmd_mlx5_version.map     |   6 +-
 drivers/net/mvneta/rte_pmd_mvneta_version.map |   2 +-
 drivers/net/mvpp2/rte_pmd_mvpp2_version.map   |   2 +-
 drivers/net/netvsc/rte_pmd_netvsc_version.map |   2 +-
 drivers/net/nfb/rte_pmd_nfb_version.map       |   2 +-
 drivers/net/nfp/rte_pmd_nfp_version.map       |   2 +-
 drivers/net/null/rte_pmd_null_version.map     |   2 +-
 .../net/octeontx/rte_pmd_octeontx_version.map |   2 +-
 .../octeontx2/rte_pmd_octeontx2_version.map   |   2 +-
 drivers/net/pcap/rte_pmd_pcap_version.map     |   2 +-
 drivers/net/pfe/rte_pmd_pfe_version.map       |   2 +-
 drivers/net/qede/rte_pmd_qede_version.map     |   2 +-
 drivers/net/ring/rte_pmd_ring_version.map     |   2 +-
 drivers/net/sfc/rte_pmd_sfc_version.map       |   2 +-
 .../net/softnic/rte_pmd_softnic_version.map   |   2 +-
 .../net/szedata2/rte_pmd_szedata2_version.map |   2 +-
 drivers/net/tap/rte_pmd_tap_version.map       |   2 +-
 .../net/thunderx/rte_pmd_thunderx_version.map |   2 +-
 .../rte_pmd_vdev_netvsc_version.map           |   2 +-
 drivers/net/vhost/rte_pmd_vhost_version.map   |   2 +-
 drivers/net/virtio/rte_pmd_virtio_version.map |   2 +-
 .../net/vmxnet3/rte_pmd_vmxnet3_version.map   |   2 +-
 .../rte_rawdev_dpaa2_cmdif_version.map        |   2 +-
 .../rte_rawdev_dpaa2_qdma_version.map         |   2 +-
 .../raw/ifpga/rte_rawdev_ifpga_version.map    |   2 +-
 drivers/raw/ioat/rte_rawdev_ioat_version.map  |   2 +-
 drivers/raw/ntb/rte_rawdev_ntb_version.map    |   2 +-
 .../rte_rawdev_octeontx2_dma_version.map      |   2 +-
 .../rte_rawdev_octeontx2_ep_version.map       |   1 -
 .../skeleton/rte_rawdev_skeleton_version.map  |   2 +-
 drivers/vdpa/ifc/rte_pmd_ifc_version.map      |   2 +-
 lib/librte_acl/rte_acl_version.map            |   2 +-
 .../rte_bitratestats_version.map              |   2 +-
 lib/librte_cfgfile/rte_cfgfile_version.map    |   2 +-
 lib/librte_cmdline/rte_cmdline_version.map    |   2 +-
 .../rte_cryptodev_version.map                 |   7 +-
 .../rte_distributor_version.map               |   2 +-
 lib/librte_eal/rte_eal_version.map            |  10 +-
 lib/librte_efd/rte_efd_version.map            |   2 +-
 lib/librte_ethdev/rte_ethdev_version.map      |   2 +-
 lib/librte_eventdev/rte_eventdev_version.map  |   2 +-
 lib/librte_gro/rte_gro_version.map            |   2 +-
 lib/librte_gso/rte_gso_version.map            |   2 +-
 lib/librte_hash/rte_hash_version.map          |   2 +-
 lib/librte_ip_frag/rte_ip_frag_version.map    |   2 +-
 lib/librte_jobstats/rte_jobstats_version.map  |   2 +-
 lib/librte_kni/rte_kni_version.map            |   2 +-
 lib/librte_kvargs/rte_kvargs_version.map      |   2 +-
 .../rte_latencystats_version.map              |   2 +-
 lib/librte_lpm/rte_lpm_version.map            |   2 +-
 lib/librte_mbuf/rte_mbuf_version.map          |   2 +-
 lib/librte_member/rte_member_version.map      |   2 +-
 lib/librte_mempool/rte_mempool_version.map    |   6 +-
 lib/librte_meter/rte_meter_version.map        |  14 +-
 lib/librte_metrics/rte_metrics_version.map    |   2 +-
 lib/librte_net/rte_net_version.map            |   2 +-
 lib/librte_pci/rte_pci_version.map            |   2 +-
 lib/librte_pdump/rte_pdump_version.map        |   2 +-
 lib/librte_pipeline/rte_pipeline_version.map  |   2 +-
 lib/librte_port/rte_port_version.map          |   2 +-
 lib/librte_power/rte_power_version.map        |   2 +-
 lib/librte_rawdev/rte_rawdev_version.map      |   2 +-
 lib/librte_reorder/rte_reorder_version.map    |   2 +-
 lib/librte_ring/rte_ring_version.map          |  13 +-
 lib/librte_sched/rte_sched_version.map        |   2 +-
 lib/librte_security/rte_security_version.map  |   2 +-
 lib/librte_table/rte_table_version.map        |   2 +-
 lib/librte_timer/rte_timer_version.map        |   2 +-
 lib/librte_vhost/rte_vhost_version.map        |   2 +-
 151 files changed, 295 insertions(+), 268 deletions(-)
 create mode 100644 doc/guides/rel_notes/release_20_11.rst

diff --git a/.travis.yml b/.travis.yml
index 14f8124233..d6eeab371d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@
 language: c
 cache:
   ccache: true
-  directories:
-    - libabigail
-    - reference
 
 dist: bionic
 
@@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
 
-_libabigail_build_packages: &libabigail_build_packages
-  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
-
 _build_32b_packages: &build_32b_packages
   - *required_packages
   - [gcc-multilib]
@@ -34,10 +28,6 @@ _doc_packages: &doc_packages
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 script: ./.ci/${TRAVIS_OS_NAME}-build.sh
 
-env:
-  global:
-    - REF_GIT_TAG=v20.05
-
 jobs:
   include:
   # x86_64 gcc jobs
@@ -55,14 +45,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: amd64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # x86_64 clang jobs
   - env: DEF_LIB="static"
     arch: amd64
@@ -116,14 +98,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: arm64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # aarch64 clang jobs
   - env: DEF_LIB="static"
     arch: arm64
diff --git a/ABI_VERSION b/ABI_VERSION
index a9ac8dacb0..5f39e91446 100644
--- a/ABI_VERSION
+++ b/ABI_VERSION
@@ -1 +1 @@
-20.0.3
+21.0
diff --git a/VERSION b/VERSION
index 85e33446f8..3f02088ffa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.08.0
+20.11.0-rc0
diff --git a/config/meson.build b/config/meson.build
index cff8b33dd2..6996e5cbea 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -29,10 +29,7 @@ abi_version = run_command(find_program('cat', 'more'),
 # and have the soname be all but the final part of the abi_version.
 # e.g. v20.1 => librte_foo.so.20.1
 #    sonames => librte_foo.so.20
-# e.g. v20.0.1 => librte_foo.so.20.0.1
-#      sonames => librte_foo.so.20.0
-abi_va = abi_version.split('.')
-so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1]
+so_version = abi_version.split('.')[0]
 
 # extract all version information into the build configuration
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 9fea822f36..2827d5ff7e 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -8,12 +8,6 @@
 [suppress_variable]
         symbol_version = INTERNAL
 
-; Ignore ABI 20.0.1 replaced with ABI 21
-[suppress_function]
-        symbol_version = DPDK_20.0.1
-[suppress_variable]
-        symbol_version = DPDK_20.0.1
-
 ; Explicit ignore for driver-only ABI
 [suppress_type]
         name = rte_cryptodev_ops
@@ -56,57 +50,3 @@
 [suppress_type]
         name = rte_mbuf_ext_shared_info
         has_data_member_inserted_between = {offset_of(refcnt_atomic), offset_of(refcnt_atomic)}
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Temporary exceptions till DPDK 20.11
-;;;;;;;;;;;;;;;;;;;;;;
-; Ignore moving OCTEONTX2 stable functions to INTERNAL
-[suppress_file]
-	file_name_regexp = ^librte_common_octeontx2\.
-[suppress_file]
-	file_name_regexp = ^librte_mempool_octeontx2\.
-; Ignore moving mlx5 stable functions to INTERNAL
-[suppress_file]
-	file_name_regexp = ^librte_common_mlx5\.
-; Ignore moving DPAAx stable functions to INTERNAL
-[suppress_file]
-        file_name_regexp = ^librte_common_dpaax\.
-[suppress_file]
-        file_name_regexp = ^librte_bus_fslmc\.
-[suppress_file]
-        file_name_regexp = ^librte_bus_dpaa\.
-[suppress_variable]
-        name = rte_dpaa_bpid_info
-[suppress_variable]
-        name = rte_dpaa_memsegs
-[suppress_variable]
-        name = rte_dpaa2_bpid_info
-[suppress_function]
-        name = rte_dpaa2_mbuf_alloc_bulk
-[suppress_function]
-        name_regexp = ^dpaa2?_.*tach$
-; Ignore soname changes for experimental libraries
-[suppress_file]
-	file_name_regexp = ^librte_bbdev\.
-[suppress_file]
-	file_name_regexp = ^librte_bpf\.
-[suppress_file]
-	file_name_regexp = ^librte_compressdev\.
-[suppress_file]
-	file_name_regexp = ^librte_fib\.
-[suppress_file]
-	file_name_regexp = ^librte_flow_classify\.
-[suppress_file]
-	file_name_regexp = ^librte_graph\.
-[suppress_file]
-	file_name_regexp = ^librte_ipsec\.
-[suppress_file]
-	file_name_regexp = ^librte_node\.
-[suppress_file]
-	file_name_regexp = ^librte_rcu\.
-[suppress_file]
-	file_name_regexp = ^librte_rib\.
-[suppress_file]
-	file_name_regexp = ^librte_telemetry\.
-[suppress_file]
-	file_name_regexp = ^librte_stack\.
diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index 05c9d837a4..fb70d1a5f3 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -8,6 +8,7 @@ Release Notes
     :maxdepth: 1
     :numbered:
 
+    release_20_11
     release_20_08
     release_20_05
     release_20_02
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
new file mode 100644
index 0000000000..df227a1773
--- /dev/null
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -0,0 +1,136 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2020 The DPDK contributors
+
+.. include:: <isonum.txt>
+
+DPDK Release 20.11
+==================
+
+.. **Read this first.**
+
+   The text in the sections below explains how to update the release notes.
+
+   Use proper spelling, capitalization and punctuation in all sections.
+
+   Variable and config names should be quoted as fixed width text:
+   ``LIKE_THIS``.
+
+   Build the docs and view the output file to ensure the changes are correct::
+
+      make doc-guides-html
+      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
+
+
+New Features
+------------
+
+.. This section should contain new features added in this release.
+   Sample format:
+
+   * **Add a title in the past tense with a full stop.**
+
+     Add a short 1-2 sentence description in the past tense.
+     The description should be enough to allow someone scanning
+     the release notes to understand the new feature.
+
+     If the feature adds a lot of sub-features you can use a bullet list
+     like this:
+
+     * Added feature foo to do something.
+     * Enhanced feature bar to do something else.
+
+     Refer to the previous release notes for examples.
+
+     Suggested order in release notes items:
+     * Core libs (EAL, mempool, ring, mbuf, buses)
+     * Device abstraction libs and PMDs
+       - ethdev (lib, PMDs)
+       - cryptodev (lib, PMDs)
+       - eventdev (lib, PMDs)
+       - etc
+     * Other libs
+     * Apps, Examples, Tools (if significant)
+
+     This section is a comment. Do not overwrite or remove it.
+     Also, make sure to start the actual text at the margin.
+     =======================================================
+
+
+Removed Items
+-------------
+
+.. This section should contain removed items in this release. Sample format:
+
+   * Add a short 1-2 sentence description of the removed item
+     in the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+API Changes
+-----------
+
+.. This section should contain API changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the API change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+ABI Changes
+-----------
+
+.. This section should contain ABI changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the ABI change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Known Issues
+------------
+
+.. This section should contain new known issues in this release. Sample format:
+
+   * **Add title in present tense with full stop.**
+
+     Add a short 1-2 sentence description of the known issue
+     in the present tense. Add information on any known workarounds.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Tested Platforms
+----------------
+
+.. This section should contain a list of platforms that were tested
+   with this release.
+
+   The format is:
+
+   * <vendor> platform with <vendor> <type of devices> combinations
+
+     * List of CPU
+     * List of OS
+     * List of devices
+     * Other relevant details...
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
index b0fb9717fa..d723bc9b0e 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
+++ b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
index 6bcea2cc7f..a2ab086cd8 100644
--- a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
+++ b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/null/rte_pmd_bbdev_null_version.map
+++ b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
+++ b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/rte_bus_ifpga_version.map
index 05b4a28c1b..6e8f85da3c 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga_version.map
+++ b/drivers/bus/ifpga/rte_bus_ifpga_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ifpga_driver_register;
diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/rte_bus_pci_version.map
index 012d817e14..5b75d23671 100644
--- a/drivers/bus/pci/rte_bus_pci_version.map
+++ b/drivers/bus/pci/rte_bus_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pci_dump;
diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/rte_bus_vdev_version.map
index 5abb10ecb0..61b6cefcee 100644
--- a/drivers/bus/vdev/rte_bus_vdev_version.map
+++ b/drivers/bus/vdev/rte_bus_vdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vdev_add_custom_scan;
diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/rte_bus_vmbus_version.map
index cbaaebc06c..fa8e91c282 100644
--- a/drivers/bus/vmbus/rte_bus_vmbus_version.map
+++ b/drivers/bus/vmbus/rte_bus_vmbus_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vmbus_chan_close;
diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/rte_common_cpt_version.map
index 8c65cde6cf..4d85021a87 100644
--- a/drivers/common/cpt/rte_common_cpt_version.map
+++ b/drivers/common/cpt/rte_common_cpt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cpt_pmd_ops_helper_asym_get_mlen;
diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map
index 92ceac108d..44142499e0 100644
--- a/drivers/common/iavf/rte_common_iavf_version.map
+++ b/drivers/common/iavf/rte_common_iavf_version.map
@@ -1,11 +1,11 @@
 DPDK_21 {
 	global:
 
-	iavf_init_adminq;
-	iavf_shutdown_adminq;
 	iavf_aq_send_msg_to_pf;
 	iavf_clean_arq_element;
+	iavf_init_adminq;
 	iavf_set_mac_type;
+	iavf_shutdown_adminq;
 	iavf_vf_parse_hw_config;
 
 	local: *;
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
index 7729d0dd04..c4d57c08a7 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -93,4 +93,3 @@ INTERNAL {
 
 	mlx5_pci_driver_register;
 };
-
diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/rte_common_mvep_version.map
index 030928439d..e5af82c61d 100644
--- a/drivers/common/mvep/rte_common_mvep_version.map
+++ b/drivers/common/mvep/rte_common_mvep_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mvep_deinit;
diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/rte_common_octeontx_version.map
index 5f6aa8bd3a..30f3fa65e0 100644
--- a/drivers/common/octeontx/rte_common_octeontx_version.map
+++ b/drivers/common/octeontx/rte_common_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	octeontx_get_global_domain;
diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/rte_pmd_isal_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/isal/rte_pmd_isal_version.map
+++ b/drivers/compress/isal/rte_pmd_isal_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
+++ b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/qat/rte_pmd_qat_version.map
+++ b/drivers/compress/qat/rte_pmd_qat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/rte_pmd_zlib_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/zlib/rte_pmd_zlib_version.map
+++ b/drivers/compress/zlib/rte_pmd_zlib_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
+++ b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
+++ b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/rte_pmd_armv8_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/armv8/rte_pmd_armv8_version.map
+++ b/drivers/crypto/armv8/rte_pmd_armv8_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
+++ b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/rte_pmd_ccp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/ccp/rte_pmd_ccp_version.map
+++ b/drivers/crypto/ccp/rte_pmd_ccp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
+++ b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
+++ b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
+++ b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/rte_pmd_null_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/null/rte_pmd_null_crypto_version.map
+++ b/drivers/crypto/null/rte_pmd_null_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
+++ b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
+++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/openssl/rte_pmd_openssl_version.map
+++ b/drivers/crypto/openssl/rte_pmd_openssl_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
index 077afedce7..ca6f102d9f 100644
--- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
+++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cryptodev_scheduler_load_user_scheduler;
diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
+++ b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
+++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/rte_pmd_zuc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/zuc/rte_pmd_zuc_version.map
+++ b/drivers/crypto/zuc/rte_pmd_zuc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
+++ b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
+++ b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/rte_pmd_dsw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dsw/rte_pmd_dsw_event_version.map
+++ b/drivers/event/dsw/rte_pmd_dsw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
+++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
+++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/opdl/rte_pmd_opdl_event_version.map
+++ b/drivers/event/opdl/rte_pmd_opdl_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
+++ b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/rte_pmd_sw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/sw/rte_pmd_sw_event_version.map
+++ b/drivers/event/sw/rte_pmd_sw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/rte_mempool_bucket_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/bucket/rte_mempool_bucket_version.map
+++ b/drivers/mempool/bucket/rte_mempool_bucket_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
index 686b024624..473b8c90e8 100644
--- a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
+++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_dpaa2_mbuf_from_buf_addr;
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
+++ b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/ring/rte_mempool_ring_version.map
+++ b/drivers/mempool/ring/rte_mempool_ring_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/stack/rte_mempool_stack_version.map
+++ b/drivers/mempool/stack/rte_mempool_stack_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_packet/rte_pmd_af_packet_version.map
+++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
+++ b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/rte_pmd_ark_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ark/rte_pmd_ark_version.map
+++ b/drivers/net/ark/rte_pmd_ark_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map
index 9b04838d84..6e17832684 100644
--- a/drivers/net/atlantic/rte_pmd_atlantic_version.map
+++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/avp/rte_pmd_avp_version.map
+++ b/drivers/net/avp/rte_pmd_avp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/axgbe/rte_pmd_axgbe_version.map
+++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
+++ b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/rte_pmd_bnxt_version.map
index bb52562347..a050d86ab7 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt_version.map
+++ b/drivers/net/bnxt/rte_pmd_bnxt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_bnxt_get_vf_rx_status;
diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map
index 270c7d5d55..df81ee74c1 100644
--- a/drivers/net/bonding/rte_pmd_bond_version.map
+++ b/drivers/net/bonding/rte_pmd_bond_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_bond_8023ad_agg_selection_get;
diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
+++ b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
index 774aa0de45..87ce8f5b6c 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
+++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_dpaa_set_tx_loopback;
diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/e1000/rte_pmd_e1000_version.map
+++ b/drivers/net/e1000/rte_pmd_e1000_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/rte_pmd_ena_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ena/rte_pmd_ena_version.map
+++ b/drivers/net/ena/rte_pmd_ena_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enetc/rte_pmd_enetc_version.map
+++ b/drivers/net/enetc/rte_pmd_enetc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enic/rte_pmd_enic_version.map
+++ b/drivers/net/enic/rte_pmd_enic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/rte_pmd_failsafe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/failsafe/rte_pmd_failsafe_version.map
+++ b/drivers/net/failsafe/rte_pmd_failsafe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/fm10k/rte_pmd_fm10k_version.map
+++ b/drivers/net/fm10k/rte_pmd_fm10k_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/rte_pmd_hinic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hinic/rte_pmd_hinic_version.map
+++ b/drivers/net/hinic/rte_pmd_hinic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/rte_pmd_hns3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hns3/rte_pmd_hns3_version.map
+++ b/drivers/net/hns3/rte_pmd_hns3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
index f6cd3b3566..413c58cb21 100644
--- a/drivers/net/i40e/rte_pmd_i40e_version.map
+++ b/drivers/net/i40e/rte_pmd_i40e_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_i40e_add_vf_mac_addr;
diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/iavf/rte_pmd_iavf_version.map
+++ b/drivers/net/iavf/rte_pmd_iavf_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map
index d04b194c13..91f40225e9 100644
--- a/drivers/net/ice/rte_pmd_ice_version.map
+++ b/drivers/net/ice/rte_pmd_ice_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/net/ionic/rte_pmd_ionic_version.map
+++ b/drivers/net/ionic/rte_pmd_ionic_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
index 7e348e99b1..d8cc1026e0 100644
--- a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
+++ b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
index 911f8083f1..9402802b04 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_ixgbe_bypass_event_show;
diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/rte_pmd_kni_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/kni/rte_pmd_kni_version.map
+++ b/drivers/net/kni/rte_pmd_kni_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/liquidio/rte_pmd_liquidio_version.map
+++ b/drivers/net/liquidio/rte_pmd_liquidio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/rte_pmd_memif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/memif/rte_pmd_memif_version.map
+++ b/drivers/net/memif/rte_pmd_memif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mlx4/rte_pmd_mlx4_version.map
+++ b/drivers/net/mlx4/rte_pmd_mlx4_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/rte_pmd_mlx5_version.map
index c8b1031b02..bc1d3d06bf 100644
--- a/drivers/net/mlx5/rte_pmd_mlx5_version.map
+++ b/drivers/net/mlx5/rte_pmd_mlx5_version.map
@@ -1,10 +1,10 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
 EXPERIMENTAL {
-        global:
+	global:
 
-        # added in 20.02
+	# added in 20.02
 	rte_pmd_mlx5_get_dyn_flag_names;
 };
diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/rte_pmd_mvneta_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvneta/rte_pmd_mvneta_version.map
+++ b/drivers/net/mvneta/rte_pmd_mvneta_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
+++ b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/rte_pmd_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/netvsc/rte_pmd_netvsc_version.map
+++ b/drivers/net/netvsc/rte_pmd_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/rte_pmd_nfb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfb/rte_pmd_nfb_version.map
+++ b/drivers/net/nfb/rte_pmd_nfb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/rte_pmd_nfp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfp/rte_pmd_nfp_version.map
+++ b/drivers/net/nfp/rte_pmd_nfp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/null/rte_pmd_null_version.map
+++ b/drivers/net/null/rte_pmd_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/rte_pmd_octeontx_version.map
index f7cae02fac..6dda72890c 100644
--- a/drivers/net/octeontx/rte_pmd_octeontx_version.map
+++ b/drivers/net/octeontx/rte_pmd_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_octeontx_pchan_map;
diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
+++ b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pcap/rte_pmd_pcap_version.map
+++ b/drivers/net/pcap/rte_pmd_pcap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/rte_pmd_pfe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pfe/rte_pmd_pfe_version.map
+++ b/drivers/net/pfe/rte_pmd_pfe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/rte_pmd_qede_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/qede/rte_pmd_qede_version.map
+++ b/drivers/net/qede/rte_pmd_qede_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/rte_pmd_ring_version.map
index ebb6be2733..29770fe3e4 100644
--- a/drivers/net/ring/rte_pmd_ring_version.map
+++ b/drivers/net/ring/rte_pmd_ring_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_from_ring;
diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/sfc/rte_pmd_sfc_version.map
+++ b/drivers/net/sfc/rte_pmd_sfc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
index 50f113d5a2..530d2e6b72 100644
--- a/drivers/net/softnic/rte_pmd_softnic_version.map
+++ b/drivers/net/softnic/rte_pmd_softnic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_softnic_run;
diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/rte_pmd_szedata2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/szedata2/rte_pmd_szedata2_version.map
+++ b/drivers/net/szedata2/rte_pmd_szedata2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/rte_pmd_tap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/tap/rte_pmd_tap_version.map
+++ b/drivers/net/tap/rte_pmd_tap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/thunderx/rte_pmd_thunderx_version.map
+++ b/drivers/net/thunderx/rte_pmd_thunderx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
+++ b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/rte_pmd_vhost_version.map
index 16b591ccc4..634255829e 100644
--- a/drivers/net/vhost/rte_pmd_vhost_version.map
+++ b/drivers/net/vhost/rte_pmd_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_vhost_get_queue_event;
diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/virtio/rte_pmd_virtio_version.map
+++ b/drivers/net/virtio/rte_pmd_virtio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
+++ b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
+++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
index ca6a0d7626..280c79ea9c 100644
--- a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
+++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_qdma_attr_get;
diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
+++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ioat/rte_rawdev_ioat_version.map
+++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ntb/rte_rawdev_ntb_version.map
+++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
+++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
+++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
+++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/vdpa/ifc/rte_pmd_ifc_version.map
+++ b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/rte_acl_version.map
index c3daca8115..d97f2927bf 100644
--- a/lib/librte_acl/rte_acl_version.map
+++ b/lib/librte_acl/rte_acl_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_acl_add_rules;
diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/rte_bitratestats_version.map
index 88fc2912db..463f78a53a 100644
--- a/lib/librte_bitratestats/rte_bitratestats_version.map
+++ b/lib/librte_bitratestats/rte_bitratestats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_stats_bitrate_calc;
diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map
index 22c999fe16..180c42b717 100644
--- a/lib/librte_cfgfile/rte_cfgfile_version.map
+++ b/lib/librte_cfgfile/rte_cfgfile_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cfgfile_add_entry;
diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/rte_cmdline_version.map
index 95fce812ff..a99104457f 100644
--- a/lib/librte_cmdline/rte_cmdline_version.map
+++ b/lib/librte_cmdline/rte_cmdline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cirbuf_add_buf_head;
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
index a7a78dc41f..02f6dcf724 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_crypto_aead_algorithm_strings;
@@ -58,12 +58,11 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 	rte_cryptodev_info_get;
 	rte_cryptodev_sym_capability_get;
-} DPDK_20.0;
-
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map
index 1b7c643005..1ddcd01fe6 100644
--- a/lib/librte_distributor/rte_distributor_version.map
+++ b/lib/librte_distributor/rte_distributor_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_distributor_clear_returns;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index bf0c17c233..0b18e2ef85 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_panic;
@@ -6,6 +6,7 @@ DPDK_20.0 {
 	eal_timer_source;
 	per_lcore__lcore_id;
 	per_lcore__rte_errno;
+	per_lcore__thread_id;
 	rte_bus_dump;
 	rte_bus_find;
 	rte_bus_find_by_device;
@@ -221,13 +222,6 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	per_lcore__thread_id;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
 	global:
 
diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/rte_efd_version.map
index e010eecfe4..425c0a85a9 100644
--- a/lib/librte_efd/rte_efd_version.map
+++ b/lib/librte_efd/rte_efd_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_efd_create;
diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
index 1212a17d32..8d9d6b1c67 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	_rte_eth_dev_callback_process;
diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
index 91a62cd077..3d9d0ca054 100644
--- a/lib/librte_eventdev/rte_eventdev_version.map
+++ b/lib/librte_eventdev/rte_eventdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_event_crypto_adapter_caps_get;
diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/rte_gro_version.map
index 9f6fe79e57..19dc66b0d4 100644
--- a/lib/librte_gro/rte_gro_version.map
+++ b/lib/librte_gro/rte_gro_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gro_ctx_create;
diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/rte_gso_version.map
index 8505a59c27..60aa1b54e4 100644
--- a/lib/librte_gso/rte_gso_version.map
+++ b/lib/librte_gso/rte_gso_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gso_segment;
diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
index c2a909443d..c0db81014f 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_fbk_hash_create;
diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map
index 5dd34f828c..82b308ddb0 100644
--- a/lib/librte_ip_frag/rte_ip_frag_version.map
+++ b/lib/librte_ip_frag/rte_ip_frag_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ip_frag_free_death_row;
diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/rte_jobstats_version.map
index dbd2664ae2..3e166ad548 100644
--- a/lib/librte_jobstats/rte_jobstats_version.map
+++ b/lib/librte_jobstats/rte_jobstats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_jobstats_abort;
diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
index 9cd3cedc54..a93da95f36 100644
--- a/lib/librte_kni/rte_kni_version.map
+++ b/lib/librte_kni/rte_kni_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kni_alloc;
diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map
index 3ba0f4b59c..ed375bf4a3 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kvargs_count;
diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/rte_latencystats_version.map
index e04e63463f..0c4360ab43 100644
--- a/lib/librte_latencystats/rte_latencystats_version.map
+++ b/lib/librte_latencystats/rte_latencystats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_latencystats_get;
diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/rte_lpm_version.map
index bfccd7eacc..b4d437cc75 100644
--- a/lib/librte_lpm/rte_lpm_version.map
+++ b/lib/librte_lpm/rte_lpm_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_lpm6_add;
diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
index ab161bcdc7..a011aaead3 100644
--- a/lib/librte_mbuf/rte_mbuf_version.map
+++ b/lib/librte_mbuf/rte_mbuf_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_pktmbuf_linearize;
diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/rte_member_version.map
index 87780ae611..b8c6322e73 100644
--- a/lib/librte_member/rte_member_version.map
+++ b/lib/librte_member/rte_member_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_member_add;
diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
index 826a0b8824..50e22ee020 100644
--- a/lib/librte_mempool/rte_mempool_version.map
+++ b/lib/librte_mempool/rte_mempool_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mempool_audit;
@@ -31,12 +31,12 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 
 	rte_mempool_populate_iova;
 	rte_mempool_populate_virt;
-} DPDK_20.0;
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
index 58859d4d76..e2a2607f28 100644
--- a/lib/librte_meter/rte_meter_version.map
+++ b/lib/librte_meter/rte_meter_version.map
@@ -1,24 +1,18 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_meter_srtcm_config;
 	rte_meter_srtcm_profile_config;
 	rte_meter_trtcm_config;
 	rte_meter_trtcm_profile_config;
+	rte_meter_trtcm_rfc4115_config;
+	rte_meter_trtcm_rfc4115_profile_config;
 
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	rte_meter_trtcm_rfc4115_config;
-	rte_meter_trtcm_rfc4115_profile_config;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
-       global:
+	global:
 
 	rte_meter_trtcm_rfc4115_config;
 	rte_meter_trtcm_rfc4115_profile_config;
diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/rte_metrics_version.map
index c88939b117..20f99cd19a 100644
--- a/lib/librte_metrics/rte_metrics_version.map
+++ b/lib/librte_metrics/rte_metrics_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_metrics_get_names;
diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
index 8a4e75a3a0..621f237945 100644
--- a/lib/librte_net/rte_net_version.map
+++ b/lib/librte_net/rte_net_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_random_addr;
diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map
index 67eb845796..cd77c9dc9e 100644
--- a/lib/librte_pci/rte_pci_version.map
+++ b/lib/librte_pci/rte_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	pci_map_resource;
diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map
index 6d02ccce6d..2f9e952d0b 100644
--- a/lib/librte_pdump/rte_pdump_version.map
+++ b/lib/librte_pdump/rte_pdump_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pdump_disable;
diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
index 64d38afecd..9ed80eb041 100644
--- a/lib/librte_pipeline/rte_pipeline_version.map
+++ b/lib/librte_pipeline/rte_pipeline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pipeline_ah_packet_drop;
diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/rte_port_version.map
index 18c6154672..bd1fbb66b0 100644
--- a/lib/librte_port/rte_port_version.map
+++ b/lib/librte_port/rte_port_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_port_ethdev_reader_ops;
diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
index 00ee5753e2..69ca9af616 100644
--- a/lib/librte_power/rte_power_version.map
+++ b/lib/librte_power/rte_power_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_power_exit;
diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
index 63b54f598b..eb29a3ac0d 100644
--- a/lib/librte_rawdev/rte_rawdev_version.map
+++ b/lib/librte_rawdev/rte_rawdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_rawdev_close;
diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/rte_reorder_version.map
index cf444062df..8c0220d324 100644
--- a/lib/librte_reorder/rte_reorder_version.map
+++ b/lib/librte_reorder/rte_reorder_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_reorder_create;
diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map
index ac392f3ca9..e35d6b9712 100644
--- a/lib/librte_ring/rte_ring_version.map
+++ b/lib/librte_ring/rte_ring_version.map
@@ -1,21 +1,16 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ring_create;
+	rte_ring_create_elem;
 	rte_ring_dump;
 	rte_ring_free;
 	rte_ring_get_memsize;
+	rte_ring_get_memsize_elem;
 	rte_ring_init;
 	rte_ring_list_dump;
 	rte_ring_lookup;
+	rte_ring_reset;
 
 	local: *;
 };
-
-DPDK_21 {
-	global:
-
-	rte_ring_create_elem;
-	rte_ring_get_memsize_elem;
-	rte_ring_reset;
-} DPDK_20.0;
diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map
index cefd990367..3faef6f0a0 100644
--- a/lib/librte_sched/rte_sched_version.map
+++ b/lib/librte_sched/rte_sched_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_approx;
diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/rte_security_version.map
index b07314bbf4..d84eec0a88 100644
--- a/lib/librte_security/rte_security_version.map
+++ b/lib/librte_security/rte_security_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_security_attach_session;
diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map
index 40f72b1fe8..568a6c6a8f 100644
--- a/lib/librte_table/rte_table_version.map
+++ b/lib/librte_table/rte_table_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_table_acl_ops;
diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/rte_timer_version.map
index 4471cef92b..21e68ea7a2 100644
--- a/lib/librte_timer/rte_timer_version.map
+++ b/lib/librte_timer/rte_timer_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_timer_dump_stats;
diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
index 13ec53b638..20b4abcb4e 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vhost_avail_entries;
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v4 2/2] devtools: fix ABI update in map files
  2020-08-11 11:27 ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Thomas Monjalon
@ 2020-08-11 11:27   ` Thomas Monjalon
  2020-08-11 13:47   ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Kinsella, Ray
  1 sibling, 0 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11 11:27 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

The script was using the full ABI version, including the minor number,
to version the symbols in the map files.
It is fixed to use only the major number for symbol versioning.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/update_version_map_abi.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
index 80a61641ed..10c3bc8098 100755
--- a/devtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -105,9 +105,9 @@ def __parse_map_file(f_in):
     return has_stable, stable_lines, experimental_lines, internal_lines
 
 
-def __generate_stable_abi(f_out, abi_version, lines):
+def __generate_stable_abi(f_out, abi_major, lines):
     # print ABI version header
-    print("DPDK_{} {{".format(abi_version), file=f_out)
+    print("DPDK_{} {{".format(abi_major), file=f_out)
 
     # print global section if it exists
     if lines:
@@ -186,6 +186,7 @@ def __main():
               file=sys.stderr)
         arg_parser.print_help()
         sys.exit(1)
+    abi_major = parsed.abi_version.split('.')[0]
 
     with open(parsed.map_file) as f_in:
         has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
@@ -193,7 +194,7 @@ def __main():
     with open(parsed.map_file, 'w') as f_out:
         need_newline = has_stable and experimental_lines
         if has_stable:
-            __generate_stable_abi(f_out, parsed.abi_version, stable_lines)
+            __generate_stable_abi(f_out, abi_major, stable_lines)
         if need_newline:
             # separate sections with a newline
             print(file=f_out)
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0
  2020-08-11 11:27 ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Thomas Monjalon
  2020-08-11 11:27   ` [dpdk-dev] [PATCH v4 2/2] devtools: fix ABI update in map files Thomas Monjalon
@ 2020-08-11 13:47   ` Kinsella, Ray
  2020-08-11 14:05     ` Thomas Monjalon
  1 sibling, 1 reply; 15+ messages in thread
From: Kinsella, Ray @ 2020-08-11 13:47 UTC (permalink / raw)
  To: Thomas Monjalon, dev
  Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson,
	Hemant Agrawal, Honnappa Nagarahalli, Luca Boccassi,
	Dodji Seketeli, Stephen Hemminger, Richardson, Bruce, Yigit,
	Ferruh, David Marchand

Hi Thomas,

On 11/08/2020 12:27, Thomas Monjalon wrote:
> Start a new release cycle with empty release notes.
> 
> The ABI version becomes 21.0.
> The ABI major is back to normal, having only one number (21 vs 20.0).
> The map files are updated to the new ABI major number (21).
> The ABI exceptions specific to previous major version are dropped.
> Travis ABI check is disabled because compatibility is not preserved.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> v4: add -rc0 and remove temporary ABI exceptions
> v3: add minor number to ABI_VERSION and remove workaround in scripts
> v2: bump major ABI number (including .map changes)
> ---
>  .travis.yml                                   |  26 ----
>  ABI_VERSION                                   |   2 +-
>  VERSION                                       |   2 +-
>  config/meson.build                            |   5 +-
>  devtools/libabigail.abignore                  |  60 --------

[SNIP]

> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
> index 9fea822f36..2827d5ff7e 100644
> --- a/devtools/libabigail.abignore
> +++ b/devtools/libabigail.abignore
> @@ -8,12 +8,6 @@
>  [suppress_variable]
>          symbol_version = INTERNAL
>  
> -; Ignore ABI 20.0.1 replaced with ABI 21
> -[suppress_function]
> -        symbol_version = DPDK_20.0.1
> -[suppress_variable]
> -        symbol_version = DPDK_20.0.1
> -
>  ; Explicit ignore for driver-only ABI
>  [suppress_type]
>          name = rte_cryptodev_ops


I think we might be safer doing a complete reset of libabigail.ignore.
We should leave only the suppressions for internal and experimental. 

My concern is that if we have suppressions that live in there forever,
it will becomes stale, and eventually we will end up suppressing things we don't intend.

So yes, if we strip out some of these - especially the enumeration suppressions,
We will end up having to suppress them again as we extend/modify the enumerations etc,
but for me that preferable to the risk of unintended supressions. 

What do others think?


> @@ -56,57 +50,3 @@
>  [suppress_type]
>          name = rte_mbuf_ext_shared_info
>          has_data_member_inserted_between = {offset_of(refcnt_atomic), offset_of(refcnt_atomic)}
> -
> -;;;;;;;;;;;;;;;;;;;;;;
> -; Temporary exceptions till DPDK 20.11
> -;;;;;;;;;;;;;;;;;;;;;;
> -; Ignore moving OCTEONTX2 stable functions to INTERNAL
> -[suppress_file]
> -	file_name_regexp = ^librte_common_octeontx2\.
> -[suppress_file]
> -	file_name_regexp = ^librte_mempool_octeontx2\.
> -; Ignore moving mlx5 stable functions to INTERNAL
> -[suppress_file]
> -	file_name_regexp = ^librte_common_mlx5\.
> -; Ignore moving DPAAx stable functions to INTERNAL
> -[suppress_file]
> -        file_name_regexp = ^librte_common_dpaax\.
> -[suppress_file]
> -        file_name_regexp = ^librte_bus_fslmc\.
> -[suppress_file]
> -        file_name_regexp = ^librte_bus_dpaa\.
> -[suppress_variable]
> -        name = rte_dpaa_bpid_info
> -[suppress_variable]
> -        name = rte_dpaa_memsegs
> -[suppress_variable]
> -        name = rte_dpaa2_bpid_info
> -[suppress_function]
> -        name = rte_dpaa2_mbuf_alloc_bulk
> -[suppress_function]
> -        name_regexp = ^dpaa2?_.*tach$
> -; Ignore soname changes for experimental libraries
> -[suppress_file]
> -	file_name_regexp = ^librte_bbdev\.
> -[suppress_file]
> -	file_name_regexp = ^librte_bpf\.
> -[suppress_file]
> -	file_name_regexp = ^librte_compressdev\.
> -[suppress_file]
> -	file_name_regexp = ^librte_fib\.
> -[suppress_file]
> -	file_name_regexp = ^librte_flow_classify\.
> -[suppress_file]
> -	file_name_regexp = ^librte_graph\.
> -[suppress_file]
> -	file_name_regexp = ^librte_ipsec\.
> -[suppress_file]
> -	file_name_regexp = ^librte_node\.
> -[suppress_file]
> -	file_name_regexp = ^librte_rcu\.
> -[suppress_file]
> -	file_name_regexp = ^librte_rib\.
> -[suppress_file]
> -	file_name_regexp = ^librte_telemetry\.
> -[suppress_file]
> -	file_name_regexp = ^librte_stack\.
[SNIP]

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0
  2020-08-10 15:15 [dpdk-dev] [PATCH] version: 20.11-rc0 Thomas Monjalon
                   ` (2 preceding siblings ...)
  2020-08-11 11:27 ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Thomas Monjalon
@ 2020-08-11 14:03 ` Thomas Monjalon
  2020-08-11 14:03   ` [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files Thomas Monjalon
                     ` (2 more replies)
  3 siblings, 3 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11 14:03 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

Start a new release cycle with empty release notes.

The ABI version becomes 21.0.
The ABI major is back to normal, having only one number (21 vs 20.0).
The map files are updated to the new ABI major number (21).
The ABI exceptions are dropped.
Travis ABI check is disabled because compatibility is not preserved.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v5: drop all ABI exceptions
v4: add -rc0 and remove temporary ABI exceptions
v3: add minor number to ABI_VERSION and remove workaround in scripts
v2: bump major ABI number (including .map changes)
---
 .travis.yml                                   |  26 ----
 ABI_VERSION                                   |   2 +-
 VERSION                                       |   2 +-
 config/meson.build                            |   5 +-
 devtools/libabigail.abignore                  | 103 -------------
 doc/guides/rel_notes/index.rst                |   1 +
 doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
 .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
 .../rte_pmd_bbdev_fpga_lte_fec_version.map    |   2 +-
 .../null/rte_pmd_bbdev_null_version.map       |   2 +-
 .../rte_pmd_bbdev_turbo_sw_version.map        |   2 +-
 drivers/bus/ifpga/rte_bus_ifpga_version.map   |   2 +-
 drivers/bus/pci/rte_bus_pci_version.map       |   2 +-
 drivers/bus/vdev/rte_bus_vdev_version.map     |   2 +-
 drivers/bus/vmbus/rte_bus_vmbus_version.map   |   2 +-
 drivers/common/cpt/rte_common_cpt_version.map |   2 +-
 .../common/iavf/rte_common_iavf_version.map   |   4 +-
 .../common/mlx5/rte_common_mlx5_version.map   |   1 -
 .../common/mvep/rte_common_mvep_version.map   |   2 +-
 .../octeontx/rte_common_octeontx_version.map  |   2 +-
 .../compress/isal/rte_pmd_isal_version.map    |   2 +-
 .../rte_pmd_octeontx_compress_version.map     |   2 +-
 drivers/compress/qat/rte_pmd_qat_version.map  |   2 +-
 .../compress/zlib/rte_pmd_zlib_version.map    |   2 +-
 .../aesni_gcm/rte_pmd_aesni_gcm_version.map   |   2 +-
 .../aesni_mb/rte_pmd_aesni_mb_version.map     |   2 +-
 .../crypto/armv8/rte_pmd_armv8_version.map    |   2 +-
 .../caam_jr/rte_pmd_caam_jr_version.map       |   2 +-
 drivers/crypto/ccp/rte_pmd_ccp_version.map    |   2 +-
 .../crypto/kasumi/rte_pmd_kasumi_version.map  |   2 +-
 .../crypto/mvsam/rte_pmd_mvsam_version.map    |   2 +-
 .../crypto/nitrox/rte_pmd_nitrox_version.map  |   2 +-
 .../null/rte_pmd_null_crypto_version.map      |   2 +-
 .../rte_pmd_octeontx_crypto_version.map       |   2 +-
 .../rte_pmd_octeontx2_crypto_version.map      |   2 +-
 .../openssl/rte_pmd_openssl_version.map       |   2 +-
 .../rte_pmd_crypto_scheduler_version.map      |   2 +-
 .../crypto/snow3g/rte_pmd_snow3g_version.map  |   2 +-
 .../virtio/rte_pmd_virtio_crypto_version.map  |   2 +-
 drivers/crypto/zuc/rte_pmd_zuc_version.map    |   2 +-
 .../event/dpaa/rte_pmd_dpaa_event_version.map |   2 +-
 .../dpaa2/rte_pmd_dpaa2_event_version.map     |   2 +-
 .../event/dsw/rte_pmd_dsw_event_version.map   |   2 +-
 .../rte_pmd_octeontx_event_version.map        |   2 +-
 .../rte_pmd_octeontx2_event_version.map       |   2 +-
 .../event/opdl/rte_pmd_opdl_event_version.map |   2 +-
 .../rte_pmd_skeleton_event_version.map        |   2 +-
 drivers/event/sw/rte_pmd_sw_event_version.map |   2 +-
 .../bucket/rte_mempool_bucket_version.map     |   2 +-
 .../dpaa2/rte_mempool_dpaa2_version.map       |   2 +-
 .../octeontx/rte_mempool_octeontx_version.map |   2 +-
 .../mempool/ring/rte_mempool_ring_version.map |   2 +-
 .../stack/rte_mempool_stack_version.map       |   2 +-
 .../af_packet/rte_pmd_af_packet_version.map   |   2 +-
 drivers/net/af_xdp/rte_pmd_af_xdp_version.map |   2 +-
 drivers/net/ark/rte_pmd_ark_version.map       |   2 +-
 .../net/atlantic/rte_pmd_atlantic_version.map |   2 +-
 drivers/net/avp/rte_pmd_avp_version.map       |   2 +-
 drivers/net/axgbe/rte_pmd_axgbe_version.map   |   2 +-
 drivers/net/bnx2x/rte_pmd_bnx2x_version.map   |   2 +-
 drivers/net/bnxt/rte_pmd_bnxt_version.map     |   2 +-
 drivers/net/bonding/rte_pmd_bond_version.map  |   2 +-
 drivers/net/cxgbe/rte_pmd_cxgbe_version.map   |   2 +-
 drivers/net/dpaa/rte_pmd_dpaa_version.map     |   2 +-
 drivers/net/e1000/rte_pmd_e1000_version.map   |   2 +-
 drivers/net/ena/rte_pmd_ena_version.map       |   2 +-
 drivers/net/enetc/rte_pmd_enetc_version.map   |   2 +-
 drivers/net/enic/rte_pmd_enic_version.map     |   2 +-
 .../net/failsafe/rte_pmd_failsafe_version.map |   2 +-
 drivers/net/fm10k/rte_pmd_fm10k_version.map   |   2 +-
 drivers/net/hinic/rte_pmd_hinic_version.map   |   2 +-
 drivers/net/hns3/rte_pmd_hns3_version.map     |   2 +-
 drivers/net/i40e/rte_pmd_i40e_version.map     |   2 +-
 drivers/net/iavf/rte_pmd_iavf_version.map     |   2 +-
 drivers/net/ice/rte_pmd_ice_version.map       |   2 +-
 drivers/net/ionic/rte_pmd_ionic_version.map   |   1 -
 drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map |   2 +-
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map   |   2 +-
 drivers/net/kni/rte_pmd_kni_version.map       |   2 +-
 .../net/liquidio/rte_pmd_liquidio_version.map |   2 +-
 drivers/net/memif/rte_pmd_memif_version.map   |   2 +-
 drivers/net/mlx4/rte_pmd_mlx4_version.map     |   2 +-
 drivers/net/mlx5/rte_pmd_mlx5_version.map     |   6 +-
 drivers/net/mvneta/rte_pmd_mvneta_version.map |   2 +-
 drivers/net/mvpp2/rte_pmd_mvpp2_version.map   |   2 +-
 drivers/net/netvsc/rte_pmd_netvsc_version.map |   2 +-
 drivers/net/nfb/rte_pmd_nfb_version.map       |   2 +-
 drivers/net/nfp/rte_pmd_nfp_version.map       |   2 +-
 drivers/net/null/rte_pmd_null_version.map     |   2 +-
 .../net/octeontx/rte_pmd_octeontx_version.map |   2 +-
 .../octeontx2/rte_pmd_octeontx2_version.map   |   2 +-
 drivers/net/pcap/rte_pmd_pcap_version.map     |   2 +-
 drivers/net/pfe/rte_pmd_pfe_version.map       |   2 +-
 drivers/net/qede/rte_pmd_qede_version.map     |   2 +-
 drivers/net/ring/rte_pmd_ring_version.map     |   2 +-
 drivers/net/sfc/rte_pmd_sfc_version.map       |   2 +-
 .../net/softnic/rte_pmd_softnic_version.map   |   2 +-
 .../net/szedata2/rte_pmd_szedata2_version.map |   2 +-
 drivers/net/tap/rte_pmd_tap_version.map       |   2 +-
 .../net/thunderx/rte_pmd_thunderx_version.map |   2 +-
 .../rte_pmd_vdev_netvsc_version.map           |   2 +-
 drivers/net/vhost/rte_pmd_vhost_version.map   |   2 +-
 drivers/net/virtio/rte_pmd_virtio_version.map |   2 +-
 .../net/vmxnet3/rte_pmd_vmxnet3_version.map   |   2 +-
 .../rte_rawdev_dpaa2_cmdif_version.map        |   2 +-
 .../rte_rawdev_dpaa2_qdma_version.map         |   2 +-
 .../raw/ifpga/rte_rawdev_ifpga_version.map    |   2 +-
 drivers/raw/ioat/rte_rawdev_ioat_version.map  |   2 +-
 drivers/raw/ntb/rte_rawdev_ntb_version.map    |   2 +-
 .../rte_rawdev_octeontx2_dma_version.map      |   2 +-
 .../rte_rawdev_octeontx2_ep_version.map       |   1 -
 .../skeleton/rte_rawdev_skeleton_version.map  |   2 +-
 drivers/vdpa/ifc/rte_pmd_ifc_version.map      |   2 +-
 lib/librte_acl/rte_acl_version.map            |   2 +-
 .../rte_bitratestats_version.map              |   2 +-
 lib/librte_cfgfile/rte_cfgfile_version.map    |   2 +-
 lib/librte_cmdline/rte_cmdline_version.map    |   2 +-
 .../rte_cryptodev_version.map                 |   7 +-
 .../rte_distributor_version.map               |   2 +-
 lib/librte_eal/rte_eal_version.map            |  10 +-
 lib/librte_efd/rte_efd_version.map            |   2 +-
 lib/librte_ethdev/rte_ethdev_version.map      |   2 +-
 lib/librte_eventdev/rte_eventdev_version.map  |   2 +-
 lib/librte_gro/rte_gro_version.map            |   2 +-
 lib/librte_gso/rte_gso_version.map            |   2 +-
 lib/librte_hash/rte_hash_version.map          |   2 +-
 lib/librte_ip_frag/rte_ip_frag_version.map    |   2 +-
 lib/librte_jobstats/rte_jobstats_version.map  |   2 +-
 lib/librte_kni/rte_kni_version.map            |   2 +-
 lib/librte_kvargs/rte_kvargs_version.map      |   2 +-
 .../rte_latencystats_version.map              |   2 +-
 lib/librte_lpm/rte_lpm_version.map            |   2 +-
 lib/librte_mbuf/rte_mbuf_version.map          |   2 +-
 lib/librte_member/rte_member_version.map      |   2 +-
 lib/librte_mempool/rte_mempool_version.map    |   6 +-
 lib/librte_meter/rte_meter_version.map        |  14 +-
 lib/librte_metrics/rte_metrics_version.map    |   2 +-
 lib/librte_net/rte_net_version.map            |   2 +-
 lib/librte_pci/rte_pci_version.map            |   2 +-
 lib/librte_pdump/rte_pdump_version.map        |   2 +-
 lib/librte_pipeline/rte_pipeline_version.map  |   2 +-
 lib/librte_port/rte_port_version.map          |   2 +-
 lib/librte_power/rte_power_version.map        |   2 +-
 lib/librte_rawdev/rte_rawdev_version.map      |   2 +-
 lib/librte_reorder/rte_reorder_version.map    |   2 +-
 lib/librte_ring/rte_ring_version.map          |  13 +-
 lib/librte_sched/rte_sched_version.map        |   2 +-
 lib/librte_security/rte_security_version.map  |   2 +-
 lib/librte_table/rte_table_version.map        |   2 +-
 lib/librte_timer/rte_timer_version.map        |   2 +-
 lib/librte_vhost/rte_vhost_version.map        |   2 +-
 151 files changed, 295 insertions(+), 311 deletions(-)
 create mode 100644 doc/guides/rel_notes/release_20_11.rst

diff --git a/.travis.yml b/.travis.yml
index 14f8124233..d6eeab371d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@
 language: c
 cache:
   ccache: true
-  directories:
-    - libabigail
-    - reference
 
 dist: bionic
 
@@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
   - *required_packages
   - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
 
-_libabigail_build_packages: &libabigail_build_packages
-  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
-
 _build_32b_packages: &build_32b_packages
   - *required_packages
   - [gcc-multilib]
@@ -34,10 +28,6 @@ _doc_packages: &doc_packages
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 script: ./.ci/${TRAVIS_OS_NAME}-build.sh
 
-env:
-  global:
-    - REF_GIT_TAG=v20.05
-
 jobs:
   include:
   # x86_64 gcc jobs
@@ -55,14 +45,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: amd64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # x86_64 clang jobs
   - env: DEF_LIB="static"
     arch: amd64
@@ -116,14 +98,6 @@ jobs:
         packages:
           - *required_packages
           - *doc_packages
-  - env: DEF_LIB="shared" ABI_CHECKS=1
-    arch: arm64
-    compiler: gcc
-    addons:
-      apt:
-        packages:
-          - *required_packages
-          - *libabigail_build_packages
   # aarch64 clang jobs
   - env: DEF_LIB="static"
     arch: arm64
diff --git a/ABI_VERSION b/ABI_VERSION
index a9ac8dacb0..5f39e91446 100644
--- a/ABI_VERSION
+++ b/ABI_VERSION
@@ -1 +1 @@
-20.0.3
+21.0
diff --git a/VERSION b/VERSION
index 85e33446f8..3f02088ffa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20.08.0
+20.11.0-rc0
diff --git a/config/meson.build b/config/meson.build
index cff8b33dd2..6996e5cbea 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -29,10 +29,7 @@ abi_version = run_command(find_program('cat', 'more'),
 # and have the soname be all but the final part of the abi_version.
 # e.g. v20.1 => librte_foo.so.20.1
 #    sonames => librte_foo.so.20
-# e.g. v20.0.1 => librte_foo.so.20.0.1
-#      sonames => librte_foo.so.20.0
-abi_va = abi_version.split('.')
-so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1]
+so_version = abi_version.split('.')[0]
 
 # extract all version information into the build configuration
 dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 9fea822f36..025f2c01bc 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -7,106 +7,3 @@
         symbol_version = INTERNAL
 [suppress_variable]
         symbol_version = INTERNAL
-
-; Ignore ABI 20.0.1 replaced with ABI 21
-[suppress_function]
-        symbol_version = DPDK_20.0.1
-[suppress_variable]
-        symbol_version = DPDK_20.0.1
-
-; Explicit ignore for driver-only ABI
-[suppress_type]
-        name = rte_cryptodev_ops
-; Ignore this enum update as it is part of an experimental API
-[suppress_type]
-        type_kind = enum
-        name = rte_crypto_asym_xform_type
-        changed_enumerators = RTE_CRYPTO_ASYM_XFORM_TYPE_LIST_END
-; Ignore updates of ring prod/cons
-[suppress_type]
-        type_kind = struct
-        name = rte_ring
-[suppress_type]
-        type_kind = struct
-        name = rte_event_ring
-; Ignore ethdev event enum update because new event cannot be
-; received if not registered
-[suppress_type]
-        type_kind = enum
-        name = rte_eth_event_type
-        changed_enumerators = RTE_ETH_EVENT_MAX
-; Ignore this enum update as new flags remain unknown to applications
-[suppress_type]
-	type_kind = enum
-	name = rte_cpu_flag_t
-	changed_enumerators = RTE_CPUFLAG_NUMFLAGS
-; Ignore Cryptodev AEAD xform enum and AEAD xform strings change
-; due to addition of Chacha20-Poly1305
-[suppress_type]
-        type_kind = enum
-        name = rte_crypto_aead_algorithm
-        changed_enumerators = RTE_CRYPTO_AEAD_LIST_END
-[suppress_variable]
-        name = rte_crypto_aead_algorithm_strings
-; Ignore updates of epoll event
-[suppress_type]
-        type_kind = struct
-        name = rte_epoll_event
-; Ignore updates of rte_mbuf_ext_shared_info refcnt_atomic
-[suppress_type]
-        name = rte_mbuf_ext_shared_info
-        has_data_member_inserted_between = {offset_of(refcnt_atomic), offset_of(refcnt_atomic)}
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Temporary exceptions till DPDK 20.11
-;;;;;;;;;;;;;;;;;;;;;;
-; Ignore moving OCTEONTX2 stable functions to INTERNAL
-[suppress_file]
-	file_name_regexp = ^librte_common_octeontx2\.
-[suppress_file]
-	file_name_regexp = ^librte_mempool_octeontx2\.
-; Ignore moving mlx5 stable functions to INTERNAL
-[suppress_file]
-	file_name_regexp = ^librte_common_mlx5\.
-; Ignore moving DPAAx stable functions to INTERNAL
-[suppress_file]
-        file_name_regexp = ^librte_common_dpaax\.
-[suppress_file]
-        file_name_regexp = ^librte_bus_fslmc\.
-[suppress_file]
-        file_name_regexp = ^librte_bus_dpaa\.
-[suppress_variable]
-        name = rte_dpaa_bpid_info
-[suppress_variable]
-        name = rte_dpaa_memsegs
-[suppress_variable]
-        name = rte_dpaa2_bpid_info
-[suppress_function]
-        name = rte_dpaa2_mbuf_alloc_bulk
-[suppress_function]
-        name_regexp = ^dpaa2?_.*tach$
-; Ignore soname changes for experimental libraries
-[suppress_file]
-	file_name_regexp = ^librte_bbdev\.
-[suppress_file]
-	file_name_regexp = ^librte_bpf\.
-[suppress_file]
-	file_name_regexp = ^librte_compressdev\.
-[suppress_file]
-	file_name_regexp = ^librte_fib\.
-[suppress_file]
-	file_name_regexp = ^librte_flow_classify\.
-[suppress_file]
-	file_name_regexp = ^librte_graph\.
-[suppress_file]
-	file_name_regexp = ^librte_ipsec\.
-[suppress_file]
-	file_name_regexp = ^librte_node\.
-[suppress_file]
-	file_name_regexp = ^librte_rcu\.
-[suppress_file]
-	file_name_regexp = ^librte_rib\.
-[suppress_file]
-	file_name_regexp = ^librte_telemetry\.
-[suppress_file]
-	file_name_regexp = ^librte_stack\.
diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
index 05c9d837a4..fb70d1a5f3 100644
--- a/doc/guides/rel_notes/index.rst
+++ b/doc/guides/rel_notes/index.rst
@@ -8,6 +8,7 @@ Release Notes
     :maxdepth: 1
     :numbered:
 
+    release_20_11
     release_20_08
     release_20_05
     release_20_02
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
new file mode 100644
index 0000000000..df227a1773
--- /dev/null
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -0,0 +1,136 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright 2020 The DPDK contributors
+
+.. include:: <isonum.txt>
+
+DPDK Release 20.11
+==================
+
+.. **Read this first.**
+
+   The text in the sections below explains how to update the release notes.
+
+   Use proper spelling, capitalization and punctuation in all sections.
+
+   Variable and config names should be quoted as fixed width text:
+   ``LIKE_THIS``.
+
+   Build the docs and view the output file to ensure the changes are correct::
+
+      make doc-guides-html
+      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
+
+
+New Features
+------------
+
+.. This section should contain new features added in this release.
+   Sample format:
+
+   * **Add a title in the past tense with a full stop.**
+
+     Add a short 1-2 sentence description in the past tense.
+     The description should be enough to allow someone scanning
+     the release notes to understand the new feature.
+
+     If the feature adds a lot of sub-features you can use a bullet list
+     like this:
+
+     * Added feature foo to do something.
+     * Enhanced feature bar to do something else.
+
+     Refer to the previous release notes for examples.
+
+     Suggested order in release notes items:
+     * Core libs (EAL, mempool, ring, mbuf, buses)
+     * Device abstraction libs and PMDs
+       - ethdev (lib, PMDs)
+       - cryptodev (lib, PMDs)
+       - eventdev (lib, PMDs)
+       - etc
+     * Other libs
+     * Apps, Examples, Tools (if significant)
+
+     This section is a comment. Do not overwrite or remove it.
+     Also, make sure to start the actual text at the margin.
+     =======================================================
+
+
+Removed Items
+-------------
+
+.. This section should contain removed items in this release. Sample format:
+
+   * Add a short 1-2 sentence description of the removed item
+     in the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+API Changes
+-----------
+
+.. This section should contain API changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the API change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+ABI Changes
+-----------
+
+.. This section should contain ABI changes. Sample format:
+
+   * sample: Add a short 1-2 sentence description of the ABI change
+     which was announced in the previous releases and made in this release.
+     Start with a scope label like "ethdev:".
+     Use fixed width quotes for ``function_names`` or ``struct_names``.
+     Use the past tense.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Known Issues
+------------
+
+.. This section should contain new known issues in this release. Sample format:
+
+   * **Add title in present tense with full stop.**
+
+     Add a short 1-2 sentence description of the known issue
+     in the present tense. Add information on any known workarounds.
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
+
+
+Tested Platforms
+----------------
+
+.. This section should contain a list of platforms that were tested
+   with this release.
+
+   The format is:
+
+   * <vendor> platform with <vendor> <type of devices> combinations
+
+     * List of CPU
+     * List of OS
+     * List of devices
+     * Other relevant details...
+
+   This section is a comment. Do not overwrite or remove it.
+   Also, make sure to start the actual text at the margin.
+   =======================================================
diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
index b0fb9717fa..d723bc9b0e 100644
--- a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
+++ b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
index 6bcea2cc7f..a2ab086cd8 100644
--- a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
+++ b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/null/rte_pmd_bbdev_null_version.map
+++ b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
+++ b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/rte_bus_ifpga_version.map
index 05b4a28c1b..6e8f85da3c 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga_version.map
+++ b/drivers/bus/ifpga/rte_bus_ifpga_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ifpga_driver_register;
diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/rte_bus_pci_version.map
index 012d817e14..5b75d23671 100644
--- a/drivers/bus/pci/rte_bus_pci_version.map
+++ b/drivers/bus/pci/rte_bus_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pci_dump;
diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/rte_bus_vdev_version.map
index 5abb10ecb0..61b6cefcee 100644
--- a/drivers/bus/vdev/rte_bus_vdev_version.map
+++ b/drivers/bus/vdev/rte_bus_vdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vdev_add_custom_scan;
diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/rte_bus_vmbus_version.map
index cbaaebc06c..fa8e91c282 100644
--- a/drivers/bus/vmbus/rte_bus_vmbus_version.map
+++ b/drivers/bus/vmbus/rte_bus_vmbus_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vmbus_chan_close;
diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/rte_common_cpt_version.map
index 8c65cde6cf..4d85021a87 100644
--- a/drivers/common/cpt/rte_common_cpt_version.map
+++ b/drivers/common/cpt/rte_common_cpt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cpt_pmd_ops_helper_asym_get_mlen;
diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map
index 92ceac108d..44142499e0 100644
--- a/drivers/common/iavf/rte_common_iavf_version.map
+++ b/drivers/common/iavf/rte_common_iavf_version.map
@@ -1,11 +1,11 @@
 DPDK_21 {
 	global:
 
-	iavf_init_adminq;
-	iavf_shutdown_adminq;
 	iavf_aq_send_msg_to_pf;
 	iavf_clean_arq_element;
+	iavf_init_adminq;
 	iavf_set_mac_type;
+	iavf_shutdown_adminq;
 	iavf_vf_parse_hw_config;
 
 	local: *;
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
index 7729d0dd04..c4d57c08a7 100644
--- a/drivers/common/mlx5/rte_common_mlx5_version.map
+++ b/drivers/common/mlx5/rte_common_mlx5_version.map
@@ -93,4 +93,3 @@ INTERNAL {
 
 	mlx5_pci_driver_register;
 };
-
diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/rte_common_mvep_version.map
index 030928439d..e5af82c61d 100644
--- a/drivers/common/mvep/rte_common_mvep_version.map
+++ b/drivers/common/mvep/rte_common_mvep_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mvep_deinit;
diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/rte_common_octeontx_version.map
index 5f6aa8bd3a..30f3fa65e0 100644
--- a/drivers/common/octeontx/rte_common_octeontx_version.map
+++ b/drivers/common/octeontx/rte_common_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	octeontx_get_global_domain;
diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/rte_pmd_isal_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/isal/rte_pmd_isal_version.map
+++ b/drivers/compress/isal/rte_pmd_isal_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
+++ b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/qat/rte_pmd_qat_version.map
+++ b/drivers/compress/qat/rte_pmd_qat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/rte_pmd_zlib_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/compress/zlib/rte_pmd_zlib_version.map
+++ b/drivers/compress/zlib/rte_pmd_zlib_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
+++ b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
+++ b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/rte_pmd_armv8_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/armv8/rte_pmd_armv8_version.map
+++ b/drivers/crypto/armv8/rte_pmd_armv8_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
+++ b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/rte_pmd_ccp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/ccp/rte_pmd_ccp_version.map
+++ b/drivers/crypto/ccp/rte_pmd_ccp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
+++ b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
+++ b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
+++ b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/rte_pmd_null_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/null/rte_pmd_null_crypto_version.map
+++ b/drivers/crypto/null/rte_pmd_null_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
+++ b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
+++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/openssl/rte_pmd_openssl_version.map
+++ b/drivers/crypto/openssl/rte_pmd_openssl_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
index 077afedce7..ca6f102d9f 100644
--- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
+++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cryptodev_scheduler_load_user_scheduler;
diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
+++ b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
+++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/rte_pmd_zuc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/crypto/zuc/rte_pmd_zuc_version.map
+++ b/drivers/crypto/zuc/rte_pmd_zuc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
+++ b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
+++ b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/rte_pmd_dsw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/dsw/rte_pmd_dsw_event_version.map
+++ b/drivers/event/dsw/rte_pmd_dsw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
+++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
+++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/opdl/rte_pmd_opdl_event_version.map
+++ b/drivers/event/opdl/rte_pmd_opdl_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
+++ b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/rte_pmd_sw_event_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/event/sw/rte_pmd_sw_event_version.map
+++ b/drivers/event/sw/rte_pmd_sw_event_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/rte_mempool_bucket_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/bucket/rte_mempool_bucket_version.map
+++ b/drivers/mempool/bucket/rte_mempool_bucket_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
index 686b024624..473b8c90e8 100644
--- a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
+++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_dpaa2_mbuf_from_buf_addr;
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
+++ b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/ring/rte_mempool_ring_version.map
+++ b/drivers/mempool/ring/rte_mempool_ring_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/mempool/stack/rte_mempool_stack_version.map
+++ b/drivers/mempool/stack/rte_mempool_stack_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_packet/rte_pmd_af_packet_version.map
+++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
+++ b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/rte_pmd_ark_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ark/rte_pmd_ark_version.map
+++ b/drivers/net/ark/rte_pmd_ark_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map
index 9b04838d84..6e17832684 100644
--- a/drivers/net/atlantic/rte_pmd_atlantic_version.map
+++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/avp/rte_pmd_avp_version.map
+++ b/drivers/net/avp/rte_pmd_avp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/axgbe/rte_pmd_axgbe_version.map
+++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
+++ b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/rte_pmd_bnxt_version.map
index bb52562347..a050d86ab7 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt_version.map
+++ b/drivers/net/bnxt/rte_pmd_bnxt_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_bnxt_get_vf_rx_status;
diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map
index 270c7d5d55..df81ee74c1 100644
--- a/drivers/net/bonding/rte_pmd_bond_version.map
+++ b/drivers/net/bonding/rte_pmd_bond_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_bond_8023ad_agg_selection_get;
diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
+++ b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
index 774aa0de45..87ce8f5b6c 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
+++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_dpaa_set_tx_loopback;
diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/e1000/rte_pmd_e1000_version.map
+++ b/drivers/net/e1000/rte_pmd_e1000_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/rte_pmd_ena_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/ena/rte_pmd_ena_version.map
+++ b/drivers/net/ena/rte_pmd_ena_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enetc/rte_pmd_enetc_version.map
+++ b/drivers/net/enetc/rte_pmd_enetc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/enic/rte_pmd_enic_version.map
+++ b/drivers/net/enic/rte_pmd_enic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/rte_pmd_failsafe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/failsafe/rte_pmd_failsafe_version.map
+++ b/drivers/net/failsafe/rte_pmd_failsafe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/fm10k/rte_pmd_fm10k_version.map
+++ b/drivers/net/fm10k/rte_pmd_fm10k_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/rte_pmd_hinic_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hinic/rte_pmd_hinic_version.map
+++ b/drivers/net/hinic/rte_pmd_hinic_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/rte_pmd_hns3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/hns3/rte_pmd_hns3_version.map
+++ b/drivers/net/hns3/rte_pmd_hns3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
index f6cd3b3566..413c58cb21 100644
--- a/drivers/net/i40e/rte_pmd_i40e_version.map
+++ b/drivers/net/i40e/rte_pmd_i40e_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_i40e_add_vf_mac_addr;
diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/iavf/rte_pmd_iavf_version.map
+++ b/drivers/net/iavf/rte_pmd_iavf_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map
index d04b194c13..91f40225e9 100644
--- a/drivers/net/ice/rte_pmd_ice_version.map
+++ b/drivers/net/ice/rte_pmd_ice_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/net/ionic/rte_pmd_ionic_version.map
+++ b/drivers/net/ionic/rte_pmd_ionic_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
index 7e348e99b1..d8cc1026e0 100644
--- a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
+++ b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
index 911f8083f1..9402802b04 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_ixgbe_bypass_event_show;
diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/rte_pmd_kni_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/kni/rte_pmd_kni_version.map
+++ b/drivers/net/kni/rte_pmd_kni_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/liquidio/rte_pmd_liquidio_version.map
+++ b/drivers/net/liquidio/rte_pmd_liquidio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/rte_pmd_memif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/memif/rte_pmd_memif_version.map
+++ b/drivers/net/memif/rte_pmd_memif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mlx4/rte_pmd_mlx4_version.map
+++ b/drivers/net/mlx4/rte_pmd_mlx4_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/rte_pmd_mlx5_version.map
index c8b1031b02..bc1d3d06bf 100644
--- a/drivers/net/mlx5/rte_pmd_mlx5_version.map
+++ b/drivers/net/mlx5/rte_pmd_mlx5_version.map
@@ -1,10 +1,10 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
 
 EXPERIMENTAL {
-        global:
+	global:
 
-        # added in 20.02
+	# added in 20.02
 	rte_pmd_mlx5_get_dyn_flag_names;
 };
diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/rte_pmd_mvneta_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvneta/rte_pmd_mvneta_version.map
+++ b/drivers/net/mvneta/rte_pmd_mvneta_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
+++ b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/rte_pmd_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/netvsc/rte_pmd_netvsc_version.map
+++ b/drivers/net/netvsc/rte_pmd_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/rte_pmd_nfb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfb/rte_pmd_nfb_version.map
+++ b/drivers/net/nfb/rte_pmd_nfb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/rte_pmd_nfp_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/nfp/rte_pmd_nfp_version.map
+++ b/drivers/net/nfp/rte_pmd_nfp_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/null/rte_pmd_null_version.map
+++ b/drivers/net/null/rte_pmd_null_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/rte_pmd_octeontx_version.map
index f7cae02fac..6dda72890c 100644
--- a/drivers/net/octeontx/rte_pmd_octeontx_version.map
+++ b/drivers/net/octeontx/rte_pmd_octeontx_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_octeontx_pchan_map;
diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
+++ b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pcap/rte_pmd_pcap_version.map
+++ b/drivers/net/pcap/rte_pmd_pcap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/rte_pmd_pfe_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/pfe/rte_pmd_pfe_version.map
+++ b/drivers/net/pfe/rte_pmd_pfe_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/rte_pmd_qede_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/qede/rte_pmd_qede_version.map
+++ b/drivers/net/qede/rte_pmd_qede_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/rte_pmd_ring_version.map
index ebb6be2733..29770fe3e4 100644
--- a/drivers/net/ring/rte_pmd_ring_version.map
+++ b/drivers/net/ring/rte_pmd_ring_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_from_ring;
diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/sfc/rte_pmd_sfc_version.map
+++ b/drivers/net/sfc/rte_pmd_sfc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
index 50f113d5a2..530d2e6b72 100644
--- a/drivers/net/softnic/rte_pmd_softnic_version.map
+++ b/drivers/net/softnic/rte_pmd_softnic_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pmd_softnic_run;
diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/rte_pmd_szedata2_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/szedata2/rte_pmd_szedata2_version.map
+++ b/drivers/net/szedata2/rte_pmd_szedata2_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/rte_pmd_tap_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/tap/rte_pmd_tap_version.map
+++ b/drivers/net/tap/rte_pmd_tap_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/thunderx/rte_pmd_thunderx_version.map
+++ b/drivers/net/thunderx/rte_pmd_thunderx_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
+++ b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/rte_pmd_vhost_version.map
index 16b591ccc4..634255829e 100644
--- a/drivers/net/vhost/rte_pmd_vhost_version.map
+++ b/drivers/net/vhost/rte_pmd_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_vhost_get_queue_event;
diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/virtio/rte_pmd_virtio_version.map
+++ b/drivers/net/virtio/rte_pmd_virtio_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
+++ b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
+++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
index ca6a0d7626..280c79ea9c 100644
--- a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
+++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_qdma_attr_get;
diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
+++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ioat/rte_rawdev_ioat_version.map
+++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/ntb/rte_rawdev_ntb_version.map
+++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
+++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
index acdaf587d2..4a76d1d52d 100644
--- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
+++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
@@ -1,4 +1,3 @@
 DPDK_21 {
-
 	local: *;
 };
diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
+++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
index f9f17e4f6e..4a76d1d52d 100644
--- a/drivers/vdpa/ifc/rte_pmd_ifc_version.map
+++ b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
@@ -1,3 +1,3 @@
-DPDK_20.0 {
+DPDK_21 {
 	local: *;
 };
diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/rte_acl_version.map
index c3daca8115..d97f2927bf 100644
--- a/lib/librte_acl/rte_acl_version.map
+++ b/lib/librte_acl/rte_acl_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_acl_add_rules;
diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/rte_bitratestats_version.map
index 88fc2912db..463f78a53a 100644
--- a/lib/librte_bitratestats/rte_bitratestats_version.map
+++ b/lib/librte_bitratestats/rte_bitratestats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_stats_bitrate_calc;
diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map
index 22c999fe16..180c42b717 100644
--- a/lib/librte_cfgfile/rte_cfgfile_version.map
+++ b/lib/librte_cfgfile/rte_cfgfile_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_cfgfile_add_entry;
diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/rte_cmdline_version.map
index 95fce812ff..a99104457f 100644
--- a/lib/librte_cmdline/rte_cmdline_version.map
+++ b/lib/librte_cmdline/rte_cmdline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	cirbuf_add_buf_head;
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
index a7a78dc41f..02f6dcf724 100644
--- a/lib/librte_cryptodev/rte_cryptodev_version.map
+++ b/lib/librte_cryptodev/rte_cryptodev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_crypto_aead_algorithm_strings;
@@ -58,12 +58,11 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 	rte_cryptodev_info_get;
 	rte_cryptodev_sym_capability_get;
-} DPDK_20.0;
-
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map
index 1b7c643005..1ddcd01fe6 100644
--- a/lib/librte_distributor/rte_distributor_version.map
+++ b/lib/librte_distributor/rte_distributor_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_distributor_clear_returns;
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index bf0c17c233..0b18e2ef85 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_panic;
@@ -6,6 +6,7 @@ DPDK_20.0 {
 	eal_timer_source;
 	per_lcore__lcore_id;
 	per_lcore__rte_errno;
+	per_lcore__thread_id;
 	rte_bus_dump;
 	rte_bus_find;
 	rte_bus_find_by_device;
@@ -221,13 +222,6 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	per_lcore__thread_id;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
 	global:
 
diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/rte_efd_version.map
index e010eecfe4..425c0a85a9 100644
--- a/lib/librte_efd/rte_efd_version.map
+++ b/lib/librte_efd/rte_efd_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_efd_create;
diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
index 1212a17d32..8d9d6b1c67 100644
--- a/lib/librte_ethdev/rte_ethdev_version.map
+++ b/lib/librte_ethdev/rte_ethdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	_rte_eth_dev_callback_process;
diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
index 91a62cd077..3d9d0ca054 100644
--- a/lib/librte_eventdev/rte_eventdev_version.map
+++ b/lib/librte_eventdev/rte_eventdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_event_crypto_adapter_caps_get;
diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/rte_gro_version.map
index 9f6fe79e57..19dc66b0d4 100644
--- a/lib/librte_gro/rte_gro_version.map
+++ b/lib/librte_gro/rte_gro_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gro_ctx_create;
diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/rte_gso_version.map
index 8505a59c27..60aa1b54e4 100644
--- a/lib/librte_gso/rte_gso_version.map
+++ b/lib/librte_gso/rte_gso_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_gso_segment;
diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
index c2a909443d..c0db81014f 100644
--- a/lib/librte_hash/rte_hash_version.map
+++ b/lib/librte_hash/rte_hash_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_fbk_hash_create;
diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map
index 5dd34f828c..82b308ddb0 100644
--- a/lib/librte_ip_frag/rte_ip_frag_version.map
+++ b/lib/librte_ip_frag/rte_ip_frag_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ip_frag_free_death_row;
diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/rte_jobstats_version.map
index dbd2664ae2..3e166ad548 100644
--- a/lib/librte_jobstats/rte_jobstats_version.map
+++ b/lib/librte_jobstats/rte_jobstats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_jobstats_abort;
diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
index 9cd3cedc54..a93da95f36 100644
--- a/lib/librte_kni/rte_kni_version.map
+++ b/lib/librte_kni/rte_kni_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kni_alloc;
diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map
index 3ba0f4b59c..ed375bf4a3 100644
--- a/lib/librte_kvargs/rte_kvargs_version.map
+++ b/lib/librte_kvargs/rte_kvargs_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_kvargs_count;
diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/rte_latencystats_version.map
index e04e63463f..0c4360ab43 100644
--- a/lib/librte_latencystats/rte_latencystats_version.map
+++ b/lib/librte_latencystats/rte_latencystats_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_latencystats_get;
diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/rte_lpm_version.map
index bfccd7eacc..b4d437cc75 100644
--- a/lib/librte_lpm/rte_lpm_version.map
+++ b/lib/librte_lpm/rte_lpm_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_lpm6_add;
diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
index ab161bcdc7..a011aaead3 100644
--- a/lib/librte_mbuf/rte_mbuf_version.map
+++ b/lib/librte_mbuf/rte_mbuf_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	__rte_pktmbuf_linearize;
diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/rte_member_version.map
index 87780ae611..b8c6322e73 100644
--- a/lib/librte_member/rte_member_version.map
+++ b/lib/librte_member/rte_member_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_member_add;
diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
index 826a0b8824..50e22ee020 100644
--- a/lib/librte_mempool/rte_mempool_version.map
+++ b/lib/librte_mempool/rte_mempool_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_mempool_audit;
@@ -31,12 +31,12 @@ DPDK_20.0 {
 	local: *;
 };
 
-DPDK_21 {
+DPDK_20.0 {
 	global:
 
 	rte_mempool_populate_iova;
 	rte_mempool_populate_virt;
-} DPDK_20.0;
+};
 
 EXPERIMENTAL {
 	global:
diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
index 58859d4d76..e2a2607f28 100644
--- a/lib/librte_meter/rte_meter_version.map
+++ b/lib/librte_meter/rte_meter_version.map
@@ -1,24 +1,18 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_meter_srtcm_config;
 	rte_meter_srtcm_profile_config;
 	rte_meter_trtcm_config;
 	rte_meter_trtcm_profile_config;
+	rte_meter_trtcm_rfc4115_config;
+	rte_meter_trtcm_rfc4115_profile_config;
 
 	local: *;
 };
 
-DPDK_21 {
-	global:
-
-	rte_meter_trtcm_rfc4115_config;
-	rte_meter_trtcm_rfc4115_profile_config;
-
-} DPDK_20.0;
-
 EXPERIMENTAL {
-       global:
+	global:
 
 	rte_meter_trtcm_rfc4115_config;
 	rte_meter_trtcm_rfc4115_profile_config;
diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/rte_metrics_version.map
index c88939b117..20f99cd19a 100644
--- a/lib/librte_metrics/rte_metrics_version.map
+++ b/lib/librte_metrics/rte_metrics_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_metrics_get_names;
diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
index 8a4e75a3a0..621f237945 100644
--- a/lib/librte_net/rte_net_version.map
+++ b/lib/librte_net/rte_net_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_eth_random_addr;
diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map
index 67eb845796..cd77c9dc9e 100644
--- a/lib/librte_pci/rte_pci_version.map
+++ b/lib/librte_pci/rte_pci_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	pci_map_resource;
diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map
index 6d02ccce6d..2f9e952d0b 100644
--- a/lib/librte_pdump/rte_pdump_version.map
+++ b/lib/librte_pdump/rte_pdump_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pdump_disable;
diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
index 64d38afecd..9ed80eb041 100644
--- a/lib/librte_pipeline/rte_pipeline_version.map
+++ b/lib/librte_pipeline/rte_pipeline_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_pipeline_ah_packet_drop;
diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/rte_port_version.map
index 18c6154672..bd1fbb66b0 100644
--- a/lib/librte_port/rte_port_version.map
+++ b/lib/librte_port/rte_port_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_port_ethdev_reader_ops;
diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
index 00ee5753e2..69ca9af616 100644
--- a/lib/librte_power/rte_power_version.map
+++ b/lib/librte_power/rte_power_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_power_exit;
diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
index 63b54f598b..eb29a3ac0d 100644
--- a/lib/librte_rawdev/rte_rawdev_version.map
+++ b/lib/librte_rawdev/rte_rawdev_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_rawdev_close;
diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/rte_reorder_version.map
index cf444062df..8c0220d324 100644
--- a/lib/librte_reorder/rte_reorder_version.map
+++ b/lib/librte_reorder/rte_reorder_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_reorder_create;
diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map
index ac392f3ca9..e35d6b9712 100644
--- a/lib/librte_ring/rte_ring_version.map
+++ b/lib/librte_ring/rte_ring_version.map
@@ -1,21 +1,16 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_ring_create;
+	rte_ring_create_elem;
 	rte_ring_dump;
 	rte_ring_free;
 	rte_ring_get_memsize;
+	rte_ring_get_memsize_elem;
 	rte_ring_init;
 	rte_ring_list_dump;
 	rte_ring_lookup;
+	rte_ring_reset;
 
 	local: *;
 };
-
-DPDK_21 {
-	global:
-
-	rte_ring_create_elem;
-	rte_ring_get_memsize_elem;
-	rte_ring_reset;
-} DPDK_20.0;
diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map
index cefd990367..3faef6f0a0 100644
--- a/lib/librte_sched/rte_sched_version.map
+++ b/lib/librte_sched/rte_sched_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_approx;
diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/rte_security_version.map
index b07314bbf4..d84eec0a88 100644
--- a/lib/librte_security/rte_security_version.map
+++ b/lib/librte_security/rte_security_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_security_attach_session;
diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map
index 40f72b1fe8..568a6c6a8f 100644
--- a/lib/librte_table/rte_table_version.map
+++ b/lib/librte_table/rte_table_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_table_acl_ops;
diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/rte_timer_version.map
index 4471cef92b..21e68ea7a2 100644
--- a/lib/librte_timer/rte_timer_version.map
+++ b/lib/librte_timer/rte_timer_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_timer_dump_stats;
diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
index 13ec53b638..20b4abcb4e 100644
--- a/lib/librte_vhost/rte_vhost_version.map
+++ b/lib/librte_vhost/rte_vhost_version.map
@@ -1,4 +1,4 @@
-DPDK_20.0 {
+DPDK_21 {
 	global:
 
 	rte_vhost_avail_entries;
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files
  2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
@ 2020-08-11 14:03   ` Thomas Monjalon
  2020-08-12  6:57     ` Kinsella, Ray
  2020-08-11 16:18   ` [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0 Kinsella, Ray
  2020-08-12  8:58   ` Kinsella, Ray
  2 siblings, 1 reply; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11 14:03 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, mdr, nhorman, kevin.laatz, bruce.richardson

The script was using the full ABI version, including the minor number,
to version the symbols in the map files.
It is fixed to use only the major number for symbol versioning.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/update_version_map_abi.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
index 80a61641ed..10c3bc8098 100755
--- a/devtools/update_version_map_abi.py
+++ b/devtools/update_version_map_abi.py
@@ -105,9 +105,9 @@ def __parse_map_file(f_in):
     return has_stable, stable_lines, experimental_lines, internal_lines
 
 
-def __generate_stable_abi(f_out, abi_version, lines):
+def __generate_stable_abi(f_out, abi_major, lines):
     # print ABI version header
-    print("DPDK_{} {{".format(abi_version), file=f_out)
+    print("DPDK_{} {{".format(abi_major), file=f_out)
 
     # print global section if it exists
     if lines:
@@ -186,6 +186,7 @@ def __main():
               file=sys.stderr)
         arg_parser.print_help()
         sys.exit(1)
+    abi_major = parsed.abi_version.split('.')[0]
 
     with open(parsed.map_file) as f_in:
         has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
@@ -193,7 +194,7 @@ def __main():
     with open(parsed.map_file, 'w') as f_out:
         need_newline = has_stable and experimental_lines
         if has_stable:
-            __generate_stable_abi(f_out, parsed.abi_version, stable_lines)
+            __generate_stable_abi(f_out, abi_major, stable_lines)
         if need_newline:
             # separate sections with a newline
             print(file=f_out)
-- 
2.27.0


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0
  2020-08-11 13:47   ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Kinsella, Ray
@ 2020-08-11 14:05     ` Thomas Monjalon
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-11 14:05 UTC (permalink / raw)
  To: dev
  Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson,
	Hemant Agrawal, Honnappa Nagarahalli, Luca Boccassi,
	Dodji Seketeli, Stephen Hemminger, Richardson, Bruce, Yigit,
	Ferruh, David Marchand, Kinsella, Ray

11/08/2020 15:47, Kinsella, Ray:
> On 11/08/2020 12:27, Thomas Monjalon wrote:
> > --- a/devtools/libabigail.abignore
> > +++ b/devtools/libabigail.abignore
> > @@ -8,12 +8,6 @@
> >  [suppress_variable]
> >          symbol_version = INTERNAL
> >  
> > -; Ignore ABI 20.0.1 replaced with ABI 21
> > -[suppress_function]
> > -        symbol_version = DPDK_20.0.1
> > -[suppress_variable]
> > -        symbol_version = DPDK_20.0.1
> > -
> >  ; Explicit ignore for driver-only ABI
> >  [suppress_type]
> >          name = rte_cryptodev_ops
> 
> I think we might be safer doing a complete reset of libabigail.ignore.
> We should leave only the suppressions for internal and experimental. 
> 
> My concern is that if we have suppressions that live in there forever,
> it will becomes stale, and eventually we will end up suppressing things we don't intend.
> 
> So yes, if we strip out some of these - especially the enumeration suppressions,
> We will end up having to suppress them again as we extend/modify the enumerations etc,
> but for me that preferable to the risk of unintended supressions. 
> 
> What do others think?

I removed all exceptions in v5.

I would like to apply this patch tomorrow morning.
All, please ack or nack quickly.



^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0
  2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
  2020-08-11 14:03   ` [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files Thomas Monjalon
@ 2020-08-11 16:18   ` Kinsella, Ray
  2020-08-12  9:02     ` Kinsella, Ray
  2020-08-12  8:58   ` Kinsella, Ray
  2 siblings, 1 reply; 15+ messages in thread
From: Kinsella, Ray @ 2020-08-11 16:18 UTC (permalink / raw)
  To: Thomas Monjalon, dev
  Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson,
	Fiona Trahe, Arek Kusztal, Olivier Matz, Ferruh Yigit

Hi Thomas,

In general it looks good, however you are letting the old version node 
DPDK_20.0 linger in a few places. We need to include an explicit FYI to tidy this up.

Remove versioning code:

Cryptodev
Fiona Trahe <fiona.trahe@intel.com>
Arek Kusztal <arkadiuszx.kusztal@intel.com>

Mempool
Olivier Matz <olivier.matz@6wind.com>

Remove alias to experimental:

Metering
Ferruh Yigit <ferruh.yigit@intel.com>

Thanks, 

Ray K

On 11/08/2020 15:03, Thomas Monjalon wrote:
> Start a new release cycle with empty release notes.
> 
> The ABI version becomes 21.0.
> The ABI major is back to normal, having only one number (21 vs 20.0).
> The map files are updated to the new ABI major number (21).
> The ABI exceptions are dropped.
> Travis ABI check is disabled because compatibility is not preserved.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> v5: drop all ABI exceptions
> v4: add -rc0 and remove temporary ABI exceptions
> v3: add minor number to ABI_VERSION and remove workaround in scripts
> v2: bump major ABI number (including .map changes)
> ---
>  .travis.yml                                   |  26 ----
>  ABI_VERSION                                   |   2 +-
>  VERSION                                       |   2 +-
>  config/meson.build                            |   5 +-
>  devtools/libabigail.abignore                  | 103 -------------
>  doc/guides/rel_notes/index.rst                |   1 +
>  doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
>  .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
>  .../rte_pmd_bbdev_fpga_lte_fec_version.map    |   2 +-
>  .../null/rte_pmd_bbdev_null_version.map       |   2 +-
>  .../rte_pmd_bbdev_turbo_sw_version.map        |   2 +-
>  drivers/bus/ifpga/rte_bus_ifpga_version.map   |   2 +-
>  drivers/bus/pci/rte_bus_pci_version.map       |   2 +-
>  drivers/bus/vdev/rte_bus_vdev_version.map     |   2 +-
>  drivers/bus/vmbus/rte_bus_vmbus_version.map   |   2 +-
>  drivers/common/cpt/rte_common_cpt_version.map |   2 +-
>  .../common/iavf/rte_common_iavf_version.map   |   4 +-
>  .../common/mlx5/rte_common_mlx5_version.map   |   1 -
>  .../common/mvep/rte_common_mvep_version.map   |   2 +-
>  .../octeontx/rte_common_octeontx_version.map  |   2 +-
>  .../compress/isal/rte_pmd_isal_version.map    |   2 +-
>  .../rte_pmd_octeontx_compress_version.map     |   2 +-
>  drivers/compress/qat/rte_pmd_qat_version.map  |   2 +-
>  .../compress/zlib/rte_pmd_zlib_version.map    |   2 +-
>  .../aesni_gcm/rte_pmd_aesni_gcm_version.map   |   2 +-
>  .../aesni_mb/rte_pmd_aesni_mb_version.map     |   2 +-
>  .../crypto/armv8/rte_pmd_armv8_version.map    |   2 +-
>  .../caam_jr/rte_pmd_caam_jr_version.map       |   2 +-
>  drivers/crypto/ccp/rte_pmd_ccp_version.map    |   2 +-
>  .../crypto/kasumi/rte_pmd_kasumi_version.map  |   2 +-
>  .../crypto/mvsam/rte_pmd_mvsam_version.map    |   2 +-
>  .../crypto/nitrox/rte_pmd_nitrox_version.map  |   2 +-
>  .../null/rte_pmd_null_crypto_version.map      |   2 +-
>  .../rte_pmd_octeontx_crypto_version.map       |   2 +-
>  .../rte_pmd_octeontx2_crypto_version.map      |   2 +-
>  .../openssl/rte_pmd_openssl_version.map       |   2 +-
>  .../rte_pmd_crypto_scheduler_version.map      |   2 +-
>  .../crypto/snow3g/rte_pmd_snow3g_version.map  |   2 +-
>  .../virtio/rte_pmd_virtio_crypto_version.map  |   2 +-
>  drivers/crypto/zuc/rte_pmd_zuc_version.map    |   2 +-
>  .../event/dpaa/rte_pmd_dpaa_event_version.map |   2 +-
>  .../dpaa2/rte_pmd_dpaa2_event_version.map     |   2 +-
>  .../event/dsw/rte_pmd_dsw_event_version.map   |   2 +-
>  .../rte_pmd_octeontx_event_version.map        |   2 +-
>  .../rte_pmd_octeontx2_event_version.map       |   2 +-
>  .../event/opdl/rte_pmd_opdl_event_version.map |   2 +-
>  .../rte_pmd_skeleton_event_version.map        |   2 +-
>  drivers/event/sw/rte_pmd_sw_event_version.map |   2 +-
>  .../bucket/rte_mempool_bucket_version.map     |   2 +-
>  .../dpaa2/rte_mempool_dpaa2_version.map       |   2 +-
>  .../octeontx/rte_mempool_octeontx_version.map |   2 +-
>  .../mempool/ring/rte_mempool_ring_version.map |   2 +-
>  .../stack/rte_mempool_stack_version.map       |   2 +-
>  .../af_packet/rte_pmd_af_packet_version.map   |   2 +-
>  drivers/net/af_xdp/rte_pmd_af_xdp_version.map |   2 +-
>  drivers/net/ark/rte_pmd_ark_version.map       |   2 +-
>  .../net/atlantic/rte_pmd_atlantic_version.map |   2 +-
>  drivers/net/avp/rte_pmd_avp_version.map       |   2 +-
>  drivers/net/axgbe/rte_pmd_axgbe_version.map   |   2 +-
>  drivers/net/bnx2x/rte_pmd_bnx2x_version.map   |   2 +-
>  drivers/net/bnxt/rte_pmd_bnxt_version.map     |   2 +-
>  drivers/net/bonding/rte_pmd_bond_version.map  |   2 +-
>  drivers/net/cxgbe/rte_pmd_cxgbe_version.map   |   2 +-
>  drivers/net/dpaa/rte_pmd_dpaa_version.map     |   2 +-
>  drivers/net/e1000/rte_pmd_e1000_version.map   |   2 +-
>  drivers/net/ena/rte_pmd_ena_version.map       |   2 +-
>  drivers/net/enetc/rte_pmd_enetc_version.map   |   2 +-
>  drivers/net/enic/rte_pmd_enic_version.map     |   2 +-
>  .../net/failsafe/rte_pmd_failsafe_version.map |   2 +-
>  drivers/net/fm10k/rte_pmd_fm10k_version.map   |   2 +-
>  drivers/net/hinic/rte_pmd_hinic_version.map   |   2 +-
>  drivers/net/hns3/rte_pmd_hns3_version.map     |   2 +-
>  drivers/net/i40e/rte_pmd_i40e_version.map     |   2 +-
>  drivers/net/iavf/rte_pmd_iavf_version.map     |   2 +-
>  drivers/net/ice/rte_pmd_ice_version.map       |   2 +-
>  drivers/net/ionic/rte_pmd_ionic_version.map   |   1 -
>  drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map |   2 +-
>  drivers/net/ixgbe/rte_pmd_ixgbe_version.map   |   2 +-
>  drivers/net/kni/rte_pmd_kni_version.map       |   2 +-
>  .../net/liquidio/rte_pmd_liquidio_version.map |   2 +-
>  drivers/net/memif/rte_pmd_memif_version.map   |   2 +-
>  drivers/net/mlx4/rte_pmd_mlx4_version.map     |   2 +-
>  drivers/net/mlx5/rte_pmd_mlx5_version.map     |   6 +-
>  drivers/net/mvneta/rte_pmd_mvneta_version.map |   2 +-
>  drivers/net/mvpp2/rte_pmd_mvpp2_version.map   |   2 +-
>  drivers/net/netvsc/rte_pmd_netvsc_version.map |   2 +-
>  drivers/net/nfb/rte_pmd_nfb_version.map       |   2 +-
>  drivers/net/nfp/rte_pmd_nfp_version.map       |   2 +-
>  drivers/net/null/rte_pmd_null_version.map     |   2 +-
>  .../net/octeontx/rte_pmd_octeontx_version.map |   2 +-
>  .../octeontx2/rte_pmd_octeontx2_version.map   |   2 +-
>  drivers/net/pcap/rte_pmd_pcap_version.map     |   2 +-
>  drivers/net/pfe/rte_pmd_pfe_version.map       |   2 +-
>  drivers/net/qede/rte_pmd_qede_version.map     |   2 +-
>  drivers/net/ring/rte_pmd_ring_version.map     |   2 +-
>  drivers/net/sfc/rte_pmd_sfc_version.map       |   2 +-
>  .../net/softnic/rte_pmd_softnic_version.map   |   2 +-
>  .../net/szedata2/rte_pmd_szedata2_version.map |   2 +-
>  drivers/net/tap/rte_pmd_tap_version.map       |   2 +-
>  .../net/thunderx/rte_pmd_thunderx_version.map |   2 +-
>  .../rte_pmd_vdev_netvsc_version.map           |   2 +-
>  drivers/net/vhost/rte_pmd_vhost_version.map   |   2 +-
>  drivers/net/virtio/rte_pmd_virtio_version.map |   2 +-
>  .../net/vmxnet3/rte_pmd_vmxnet3_version.map   |   2 +-
>  .../rte_rawdev_dpaa2_cmdif_version.map        |   2 +-
>  .../rte_rawdev_dpaa2_qdma_version.map         |   2 +-
>  .../raw/ifpga/rte_rawdev_ifpga_version.map    |   2 +-
>  drivers/raw/ioat/rte_rawdev_ioat_version.map  |   2 +-
>  drivers/raw/ntb/rte_rawdev_ntb_version.map    |   2 +-
>  .../rte_rawdev_octeontx2_dma_version.map      |   2 +-
>  .../rte_rawdev_octeontx2_ep_version.map       |   1 -
>  .../skeleton/rte_rawdev_skeleton_version.map  |   2 +-
>  drivers/vdpa/ifc/rte_pmd_ifc_version.map      |   2 +-
>  lib/librte_acl/rte_acl_version.map            |   2 +-
>  .../rte_bitratestats_version.map              |   2 +-
>  lib/librte_cfgfile/rte_cfgfile_version.map    |   2 +-
>  lib/librte_cmdline/rte_cmdline_version.map    |   2 +-
>  .../rte_cryptodev_version.map                 |   7 +-
>  .../rte_distributor_version.map               |   2 +-
>  lib/librte_eal/rte_eal_version.map            |  10 +-
>  lib/librte_efd/rte_efd_version.map            |   2 +-
>  lib/librte_ethdev/rte_ethdev_version.map      |   2 +-
>  lib/librte_eventdev/rte_eventdev_version.map  |   2 +-
>  lib/librte_gro/rte_gro_version.map            |   2 +-
>  lib/librte_gso/rte_gso_version.map            |   2 +-
>  lib/librte_hash/rte_hash_version.map          |   2 +-
>  lib/librte_ip_frag/rte_ip_frag_version.map    |   2 +-
>  lib/librte_jobstats/rte_jobstats_version.map  |   2 +-
>  lib/librte_kni/rte_kni_version.map            |   2 +-
>  lib/librte_kvargs/rte_kvargs_version.map      |   2 +-
>  .../rte_latencystats_version.map              |   2 +-
>  lib/librte_lpm/rte_lpm_version.map            |   2 +-
>  lib/librte_mbuf/rte_mbuf_version.map          |   2 +-
>  lib/librte_member/rte_member_version.map      |   2 +-
>  lib/librte_mempool/rte_mempool_version.map    |   6 +-
>  lib/librte_meter/rte_meter_version.map        |  14 +-
>  lib/librte_metrics/rte_metrics_version.map    |   2 +-
>  lib/librte_net/rte_net_version.map            |   2 +-
>  lib/librte_pci/rte_pci_version.map            |   2 +-
>  lib/librte_pdump/rte_pdump_version.map        |   2 +-
>  lib/librte_pipeline/rte_pipeline_version.map  |   2 +-
>  lib/librte_port/rte_port_version.map          |   2 +-
>  lib/librte_power/rte_power_version.map        |   2 +-
>  lib/librte_rawdev/rte_rawdev_version.map      |   2 +-
>  lib/librte_reorder/rte_reorder_version.map    |   2 +-
>  lib/librte_ring/rte_ring_version.map          |  13 +-
>  lib/librte_sched/rte_sched_version.map        |   2 +-
>  lib/librte_security/rte_security_version.map  |   2 +-
>  lib/librte_table/rte_table_version.map        |   2 +-
>  lib/librte_timer/rte_timer_version.map        |   2 +-
>  lib/librte_vhost/rte_vhost_version.map        |   2 +-
>  151 files changed, 295 insertions(+), 311 deletions(-)
>  create mode 100644 doc/guides/rel_notes/release_20_11.rst
> 
> diff --git a/.travis.yml b/.travis.yml
> index 14f8124233..d6eeab371d 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -2,9 +2,6 @@
>  language: c
>  cache:
>    ccache: true
> -  directories:
> -    - libabigail
> -    - reference
>  
>  dist: bionic
>  
> @@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
>    - *required_packages
>    - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
>  
> -_libabigail_build_packages: &libabigail_build_packages
> -  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
> -
>  _build_32b_packages: &build_32b_packages
>    - *required_packages
>    - [gcc-multilib]
> @@ -34,10 +28,6 @@ _doc_packages: &doc_packages
>  before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
>  script: ./.ci/${TRAVIS_OS_NAME}-build.sh
>  
> -env:
> -  global:
> -    - REF_GIT_TAG=v20.05
> -
>  jobs:
>    include:
>    # x86_64 gcc jobs
> @@ -55,14 +45,6 @@ jobs:
>          packages:
>            - *required_packages
>            - *doc_packages
> -  - env: DEF_LIB="shared" ABI_CHECKS=1
> -    arch: amd64
> -    compiler: gcc
> -    addons:
> -      apt:
> -        packages:
> -          - *required_packages
> -          - *libabigail_build_packages
>    # x86_64 clang jobs
>    - env: DEF_LIB="static"
>      arch: amd64
> @@ -116,14 +98,6 @@ jobs:
>          packages:
>            - *required_packages
>            - *doc_packages
> -  - env: DEF_LIB="shared" ABI_CHECKS=1
> -    arch: arm64
> -    compiler: gcc
> -    addons:
> -      apt:
> -        packages:
> -          - *required_packages
> -          - *libabigail_build_packages
>    # aarch64 clang jobs
>    - env: DEF_LIB="static"
>      arch: arm64
> diff --git a/ABI_VERSION b/ABI_VERSION
> index a9ac8dacb0..5f39e91446 100644
> --- a/ABI_VERSION
> +++ b/ABI_VERSION
> @@ -1 +1 @@
> -20.0.3
> +21.0
> diff --git a/VERSION b/VERSION
> index 85e33446f8..3f02088ffa 100644
> --- a/VERSION
> +++ b/VERSION
> @@ -1 +1 @@
> -20.08.0
> +20.11.0-rc0
> diff --git a/config/meson.build b/config/meson.build
> index cff8b33dd2..6996e5cbea 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -29,10 +29,7 @@ abi_version = run_command(find_program('cat', 'more'),
>  # and have the soname be all but the final part of the abi_version.
>  # e.g. v20.1 => librte_foo.so.20.1
>  #    sonames => librte_foo.so.20
> -# e.g. v20.0.1 => librte_foo.so.20.0.1
> -#      sonames => librte_foo.so.20.0
> -abi_va = abi_version.split('.')
> -so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1]
> +so_version = abi_version.split('.')[0]
>  
>  # extract all version information into the build configuration
>  dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
> index 9fea822f36..025f2c01bc 100644
> --- a/devtools/libabigail.abignore
> +++ b/devtools/libabigail.abignore
> @@ -7,106 +7,3 @@
>          symbol_version = INTERNAL
>  [suppress_variable]
>          symbol_version = INTERNAL
> -
> -; Ignore ABI 20.0.1 replaced with ABI 21
> -[suppress_function]
> -        symbol_version = DPDK_20.0.1
> -[suppress_variable]
> -        symbol_version = DPDK_20.0.1
> -
> -; Explicit ignore for driver-only ABI
> -[suppress_type]
> -        name = rte_cryptodev_ops
> -; Ignore this enum update as it is part of an experimental API
> -[suppress_type]
> -        type_kind = enum
> -        name = rte_crypto_asym_xform_type
> -        changed_enumerators = RTE_CRYPTO_ASYM_XFORM_TYPE_LIST_END
> -; Ignore updates of ring prod/cons
> -[suppress_type]
> -        type_kind = struct
> -        name = rte_ring
> -[suppress_type]
> -        type_kind = struct
> -        name = rte_event_ring
> -; Ignore ethdev event enum update because new event cannot be
> -; received if not registered
> -[suppress_type]
> -        type_kind = enum
> -        name = rte_eth_event_type
> -        changed_enumerators = RTE_ETH_EVENT_MAX
> -; Ignore this enum update as new flags remain unknown to applications
> -[suppress_type]
> -	type_kind = enum
> -	name = rte_cpu_flag_t
> -	changed_enumerators = RTE_CPUFLAG_NUMFLAGS
> -; Ignore Cryptodev AEAD xform enum and AEAD xform strings change
> -; due to addition of Chacha20-Poly1305
> -[suppress_type]
> -        type_kind = enum
> -        name = rte_crypto_aead_algorithm
> -        changed_enumerators = RTE_CRYPTO_AEAD_LIST_END
> -[suppress_variable]
> -        name = rte_crypto_aead_algorithm_strings
> -; Ignore updates of epoll event
> -[suppress_type]
> -        type_kind = struct
> -        name = rte_epoll_event
> -; Ignore updates of rte_mbuf_ext_shared_info refcnt_atomic
> -[suppress_type]
> -        name = rte_mbuf_ext_shared_info
> -        has_data_member_inserted_between = {offset_of(refcnt_atomic), offset_of(refcnt_atomic)}
> -
> -;;;;;;;;;;;;;;;;;;;;;;
> -; Temporary exceptions till DPDK 20.11
> -;;;;;;;;;;;;;;;;;;;;;;
> -; Ignore moving OCTEONTX2 stable functions to INTERNAL
> -[suppress_file]
> -	file_name_regexp = ^librte_common_octeontx2\.
> -[suppress_file]
> -	file_name_regexp = ^librte_mempool_octeontx2\.
> -; Ignore moving mlx5 stable functions to INTERNAL
> -[suppress_file]
> -	file_name_regexp = ^librte_common_mlx5\.
> -; Ignore moving DPAAx stable functions to INTERNAL
> -[suppress_file]
> -        file_name_regexp = ^librte_common_dpaax\.
> -[suppress_file]
> -        file_name_regexp = ^librte_bus_fslmc\.
> -[suppress_file]
> -        file_name_regexp = ^librte_bus_dpaa\.
> -[suppress_variable]
> -        name = rte_dpaa_bpid_info
> -[suppress_variable]
> -        name = rte_dpaa_memsegs
> -[suppress_variable]
> -        name = rte_dpaa2_bpid_info
> -[suppress_function]
> -        name = rte_dpaa2_mbuf_alloc_bulk
> -[suppress_function]
> -        name_regexp = ^dpaa2?_.*tach$
> -; Ignore soname changes for experimental libraries
> -[suppress_file]
> -	file_name_regexp = ^librte_bbdev\.
> -[suppress_file]
> -	file_name_regexp = ^librte_bpf\.
> -[suppress_file]
> -	file_name_regexp = ^librte_compressdev\.
> -[suppress_file]
> -	file_name_regexp = ^librte_fib\.
> -[suppress_file]
> -	file_name_regexp = ^librte_flow_classify\.
> -[suppress_file]
> -	file_name_regexp = ^librte_graph\.
> -[suppress_file]
> -	file_name_regexp = ^librte_ipsec\.
> -[suppress_file]
> -	file_name_regexp = ^librte_node\.
> -[suppress_file]
> -	file_name_regexp = ^librte_rcu\.
> -[suppress_file]
> -	file_name_regexp = ^librte_rib\.
> -[suppress_file]
> -	file_name_regexp = ^librte_telemetry\.
> -[suppress_file]
> -	file_name_regexp = ^librte_stack\.
> diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
> index 05c9d837a4..fb70d1a5f3 100644
> --- a/doc/guides/rel_notes/index.rst
> +++ b/doc/guides/rel_notes/index.rst
> @@ -8,6 +8,7 @@ Release Notes
>      :maxdepth: 1
>      :numbered:
>  
> +    release_20_11
>      release_20_08
>      release_20_05
>      release_20_02
> diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
> new file mode 100644
> index 0000000000..df227a1773
> --- /dev/null
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -0,0 +1,136 @@
> +.. SPDX-License-Identifier: BSD-3-Clause
> +   Copyright 2020 The DPDK contributors
> +
> +.. include:: <isonum.txt>
> +
> +DPDK Release 20.11
> +==================
> +
> +.. **Read this first.**
> +
> +   The text in the sections below explains how to update the release notes.
> +
> +   Use proper spelling, capitalization and punctuation in all sections.
> +
> +   Variable and config names should be quoted as fixed width text:
> +   ``LIKE_THIS``.
> +
> +   Build the docs and view the output file to ensure the changes are correct::
> +
> +      make doc-guides-html
> +      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
> +
> +
> +New Features
> +------------
> +
> +.. This section should contain new features added in this release.
> +   Sample format:
> +
> +   * **Add a title in the past tense with a full stop.**
> +
> +     Add a short 1-2 sentence description in the past tense.
> +     The description should be enough to allow someone scanning
> +     the release notes to understand the new feature.
> +
> +     If the feature adds a lot of sub-features you can use a bullet list
> +     like this:
> +
> +     * Added feature foo to do something.
> +     * Enhanced feature bar to do something else.
> +
> +     Refer to the previous release notes for examples.
> +
> +     Suggested order in release notes items:
> +     * Core libs (EAL, mempool, ring, mbuf, buses)
> +     * Device abstraction libs and PMDs
> +       - ethdev (lib, PMDs)
> +       - cryptodev (lib, PMDs)
> +       - eventdev (lib, PMDs)
> +       - etc
> +     * Other libs
> +     * Apps, Examples, Tools (if significant)
> +
> +     This section is a comment. Do not overwrite or remove it.
> +     Also, make sure to start the actual text at the margin.
> +     =======================================================
> +
> +
> +Removed Items
> +-------------
> +
> +.. This section should contain removed items in this release. Sample format:
> +
> +   * Add a short 1-2 sentence description of the removed item
> +     in the past tense.
> +
> +   This section is a comment. Do not overwrite or remove it.
> +   Also, make sure to start the actual text at the margin.
> +   =======================================================
> +
> +
> +API Changes
> +-----------
> +
> +.. This section should contain API changes. Sample format:
> +
> +   * sample: Add a short 1-2 sentence description of the API change
> +     which was announced in the previous releases and made in this release.
> +     Start with a scope label like "ethdev:".
> +     Use fixed width quotes for ``function_names`` or ``struct_names``.
> +     Use the past tense.
> +
> +   This section is a comment. Do not overwrite or remove it.
> +   Also, make sure to start the actual text at the margin.
> +   =======================================================
> +
> +
> +ABI Changes
> +-----------
> +
> +.. This section should contain ABI changes. Sample format:
> +
> +   * sample: Add a short 1-2 sentence description of the ABI change
> +     which was announced in the previous releases and made in this release.
> +     Start with a scope label like "ethdev:".
> +     Use fixed width quotes for ``function_names`` or ``struct_names``.
> +     Use the past tense.
> +
> +   This section is a comment. Do not overwrite or remove it.
> +   Also, make sure to start the actual text at the margin.
> +   =======================================================
> +
> +
> +Known Issues
> +------------
> +
> +.. This section should contain new known issues in this release. Sample format:
> +
> +   * **Add title in present tense with full stop.**
> +
> +     Add a short 1-2 sentence description of the known issue
> +     in the present tense. Add information on any known workarounds.
> +
> +   This section is a comment. Do not overwrite or remove it.
> +   Also, make sure to start the actual text at the margin.
> +   =======================================================
> +
> +
> +Tested Platforms
> +----------------
> +
> +.. This section should contain a list of platforms that were tested
> +   with this release.
> +
> +   The format is:
> +
> +   * <vendor> platform with <vendor> <type of devices> combinations
> +
> +     * List of CPU
> +     * List of OS
> +     * List of devices
> +     * Other relevant details...
> +
> +   This section is a comment. Do not overwrite or remove it.
> +   Also, make sure to start the actual text at the margin.
> +   =======================================================
> diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
> index b0fb9717fa..d723bc9b0e 100644
> --- a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
> +++ b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
>  
> diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
> index 6bcea2cc7f..a2ab086cd8 100644
> --- a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
> +++ b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
>  
> diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/baseband/null/rte_pmd_bbdev_null_version.map
> +++ b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
> +++ b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/rte_bus_ifpga_version.map
> index 05b4a28c1b..6e8f85da3c 100644
> --- a/drivers/bus/ifpga/rte_bus_ifpga_version.map
> +++ b/drivers/bus/ifpga/rte_bus_ifpga_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_ifpga_driver_register;
> diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/rte_bus_pci_version.map
> index 012d817e14..5b75d23671 100644
> --- a/drivers/bus/pci/rte_bus_pci_version.map
> +++ b/drivers/bus/pci/rte_bus_pci_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pci_dump;
> diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/rte_bus_vdev_version.map
> index 5abb10ecb0..61b6cefcee 100644
> --- a/drivers/bus/vdev/rte_bus_vdev_version.map
> +++ b/drivers/bus/vdev/rte_bus_vdev_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_vdev_add_custom_scan;
> diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/rte_bus_vmbus_version.map
> index cbaaebc06c..fa8e91c282 100644
> --- a/drivers/bus/vmbus/rte_bus_vmbus_version.map
> +++ b/drivers/bus/vmbus/rte_bus_vmbus_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_vmbus_chan_close;
> diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/rte_common_cpt_version.map
> index 8c65cde6cf..4d85021a87 100644
> --- a/drivers/common/cpt/rte_common_cpt_version.map
> +++ b/drivers/common/cpt/rte_common_cpt_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	cpt_pmd_ops_helper_asym_get_mlen;
> diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map
> index 92ceac108d..44142499e0 100644
> --- a/drivers/common/iavf/rte_common_iavf_version.map
> +++ b/drivers/common/iavf/rte_common_iavf_version.map
> @@ -1,11 +1,11 @@
>  DPDK_21 {
>  	global:
>  
> -	iavf_init_adminq;
> -	iavf_shutdown_adminq;
>  	iavf_aq_send_msg_to_pf;
>  	iavf_clean_arq_element;
> +	iavf_init_adminq;
>  	iavf_set_mac_type;
> +	iavf_shutdown_adminq;
>  	iavf_vf_parse_hw_config;
>  
>  	local: *;
> diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
> index 7729d0dd04..c4d57c08a7 100644
> --- a/drivers/common/mlx5/rte_common_mlx5_version.map
> +++ b/drivers/common/mlx5/rte_common_mlx5_version.map
> @@ -93,4 +93,3 @@ INTERNAL {
>  
>  	mlx5_pci_driver_register;
>  };
> -
> diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/rte_common_mvep_version.map
> index 030928439d..e5af82c61d 100644
> --- a/drivers/common/mvep/rte_common_mvep_version.map
> +++ b/drivers/common/mvep/rte_common_mvep_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_mvep_deinit;
> diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/rte_common_octeontx_version.map
> index 5f6aa8bd3a..30f3fa65e0 100644
> --- a/drivers/common/octeontx/rte_common_octeontx_version.map
> +++ b/drivers/common/octeontx/rte_common_octeontx_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	octeontx_get_global_domain;
> diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/rte_pmd_isal_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/compress/isal/rte_pmd_isal_version.map
> +++ b/drivers/compress/isal/rte_pmd_isal_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
> +++ b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/compress/qat/rte_pmd_qat_version.map
> +++ b/drivers/compress/qat/rte_pmd_qat_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/rte_pmd_zlib_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/compress/zlib/rte_pmd_zlib_version.map
> +++ b/drivers/compress/zlib/rte_pmd_zlib_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
> +++ b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
> +++ b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/rte_pmd_armv8_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/armv8/rte_pmd_armv8_version.map
> +++ b/drivers/crypto/armv8/rte_pmd_armv8_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
> +++ b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/rte_pmd_ccp_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/ccp/rte_pmd_ccp_version.map
> +++ b/drivers/crypto/ccp/rte_pmd_ccp_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
> +++ b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
> +++ b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
> +++ b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/rte_pmd_null_crypto_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/null/rte_pmd_null_crypto_version.map
> +++ b/drivers/crypto/null/rte_pmd_null_crypto_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
> +++ b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
> +++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/openssl/rte_pmd_openssl_version.map
> +++ b/drivers/crypto/openssl/rte_pmd_openssl_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
> index 077afedce7..ca6f102d9f 100644
> --- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
> +++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_cryptodev_scheduler_load_user_scheduler;
> diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
> +++ b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
> +++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/rte_pmd_zuc_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/crypto/zuc/rte_pmd_zuc_version.map
> +++ b/drivers/crypto/zuc/rte_pmd_zuc_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
> +++ b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
> +++ b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/rte_pmd_dsw_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/dsw/rte_pmd_dsw_event_version.map
> +++ b/drivers/event/dsw/rte_pmd_dsw_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
> +++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
> +++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/opdl/rte_pmd_opdl_event_version.map
> +++ b/drivers/event/opdl/rte_pmd_opdl_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
> +++ b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/rte_pmd_sw_event_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/event/sw/rte_pmd_sw_event_version.map
> +++ b/drivers/event/sw/rte_pmd_sw_event_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/rte_mempool_bucket_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/mempool/bucket/rte_mempool_bucket_version.map
> +++ b/drivers/mempool/bucket/rte_mempool_bucket_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
> index 686b024624..473b8c90e8 100644
> --- a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
> +++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_dpaa2_mbuf_from_buf_addr;
> diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
> +++ b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/mempool/ring/rte_mempool_ring_version.map
> +++ b/drivers/mempool/ring/rte_mempool_ring_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/mempool/stack/rte_mempool_stack_version.map
> +++ b/drivers/mempool/stack/rte_mempool_stack_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/af_packet/rte_pmd_af_packet_version.map
> +++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
> +++ b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/rte_pmd_ark_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/ark/rte_pmd_ark_version.map
> +++ b/drivers/net/ark/rte_pmd_ark_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map
> index 9b04838d84..6e17832684 100644
> --- a/drivers/net/atlantic/rte_pmd_atlantic_version.map
> +++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
>  
> diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/avp/rte_pmd_avp_version.map
> +++ b/drivers/net/avp/rte_pmd_avp_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/axgbe/rte_pmd_axgbe_version.map
> +++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
> +++ b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/rte_pmd_bnxt_version.map
> index bb52562347..a050d86ab7 100644
> --- a/drivers/net/bnxt/rte_pmd_bnxt_version.map
> +++ b/drivers/net/bnxt/rte_pmd_bnxt_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pmd_bnxt_get_vf_rx_status;
> diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map
> index 270c7d5d55..df81ee74c1 100644
> --- a/drivers/net/bonding/rte_pmd_bond_version.map
> +++ b/drivers/net/bonding/rte_pmd_bond_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_eth_bond_8023ad_agg_selection_get;
> diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
> +++ b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
> index 774aa0de45..87ce8f5b6c 100644
> --- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
> +++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pmd_dpaa_set_tx_loopback;
> diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/e1000/rte_pmd_e1000_version.map
> +++ b/drivers/net/e1000/rte_pmd_e1000_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/rte_pmd_ena_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/ena/rte_pmd_ena_version.map
> +++ b/drivers/net/ena/rte_pmd_ena_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/enetc/rte_pmd_enetc_version.map
> +++ b/drivers/net/enetc/rte_pmd_enetc_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/enic/rte_pmd_enic_version.map
> +++ b/drivers/net/enic/rte_pmd_enic_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/rte_pmd_failsafe_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/failsafe/rte_pmd_failsafe_version.map
> +++ b/drivers/net/failsafe/rte_pmd_failsafe_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/fm10k/rte_pmd_fm10k_version.map
> +++ b/drivers/net/fm10k/rte_pmd_fm10k_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/rte_pmd_hinic_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/hinic/rte_pmd_hinic_version.map
> +++ b/drivers/net/hinic/rte_pmd_hinic_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/rte_pmd_hns3_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/hns3/rte_pmd_hns3_version.map
> +++ b/drivers/net/hns3/rte_pmd_hns3_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
> index f6cd3b3566..413c58cb21 100644
> --- a/drivers/net/i40e/rte_pmd_i40e_version.map
> +++ b/drivers/net/i40e/rte_pmd_i40e_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pmd_i40e_add_vf_mac_addr;
> diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/iavf/rte_pmd_iavf_version.map
> +++ b/drivers/net/iavf/rte_pmd_iavf_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map
> index d04b194c13..91f40225e9 100644
> --- a/drivers/net/ice/rte_pmd_ice_version.map
> +++ b/drivers/net/ice/rte_pmd_ice_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
>  
> diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map
> index acdaf587d2..4a76d1d52d 100644
> --- a/drivers/net/ionic/rte_pmd_ionic_version.map
> +++ b/drivers/net/ionic/rte_pmd_ionic_version.map
> @@ -1,4 +1,3 @@
>  DPDK_21 {
> -
>  	local: *;
>  };
> diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
> index 7e348e99b1..d8cc1026e0 100644
> --- a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
> +++ b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
>  
> diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
> index 911f8083f1..9402802b04 100644
> --- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
> +++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pmd_ixgbe_bypass_event_show;
> diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/rte_pmd_kni_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/kni/rte_pmd_kni_version.map
> +++ b/drivers/net/kni/rte_pmd_kni_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/liquidio/rte_pmd_liquidio_version.map
> +++ b/drivers/net/liquidio/rte_pmd_liquidio_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/rte_pmd_memif_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/memif/rte_pmd_memif_version.map
> +++ b/drivers/net/memif/rte_pmd_memif_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/mlx4/rte_pmd_mlx4_version.map
> +++ b/drivers/net/mlx4/rte_pmd_mlx4_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/rte_pmd_mlx5_version.map
> index c8b1031b02..bc1d3d06bf 100644
> --- a/drivers/net/mlx5/rte_pmd_mlx5_version.map
> +++ b/drivers/net/mlx5/rte_pmd_mlx5_version.map
> @@ -1,10 +1,10 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
>  
>  EXPERIMENTAL {
> -        global:
> +	global:
>  
> -        # added in 20.02
> +	# added in 20.02
>  	rte_pmd_mlx5_get_dyn_flag_names;
>  };
> diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/rte_pmd_mvneta_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/mvneta/rte_pmd_mvneta_version.map
> +++ b/drivers/net/mvneta/rte_pmd_mvneta_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
> +++ b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/rte_pmd_netvsc_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/netvsc/rte_pmd_netvsc_version.map
> +++ b/drivers/net/netvsc/rte_pmd_netvsc_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/rte_pmd_nfb_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/nfb/rte_pmd_nfb_version.map
> +++ b/drivers/net/nfb/rte_pmd_nfb_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/rte_pmd_nfp_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/nfp/rte_pmd_nfp_version.map
> +++ b/drivers/net/nfp/rte_pmd_nfp_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/null/rte_pmd_null_version.map
> +++ b/drivers/net/null/rte_pmd_null_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/rte_pmd_octeontx_version.map
> index f7cae02fac..6dda72890c 100644
> --- a/drivers/net/octeontx/rte_pmd_octeontx_version.map
> +++ b/drivers/net/octeontx/rte_pmd_octeontx_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_octeontx_pchan_map;
> diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
> +++ b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/pcap/rte_pmd_pcap_version.map
> +++ b/drivers/net/pcap/rte_pmd_pcap_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/rte_pmd_pfe_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/pfe/rte_pmd_pfe_version.map
> +++ b/drivers/net/pfe/rte_pmd_pfe_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/rte_pmd_qede_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/qede/rte_pmd_qede_version.map
> +++ b/drivers/net/qede/rte_pmd_qede_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/rte_pmd_ring_version.map
> index ebb6be2733..29770fe3e4 100644
> --- a/drivers/net/ring/rte_pmd_ring_version.map
> +++ b/drivers/net/ring/rte_pmd_ring_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_eth_from_ring;
> diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/sfc/rte_pmd_sfc_version.map
> +++ b/drivers/net/sfc/rte_pmd_sfc_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
> index 50f113d5a2..530d2e6b72 100644
> --- a/drivers/net/softnic/rte_pmd_softnic_version.map
> +++ b/drivers/net/softnic/rte_pmd_softnic_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pmd_softnic_run;
> diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/rte_pmd_szedata2_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/szedata2/rte_pmd_szedata2_version.map
> +++ b/drivers/net/szedata2/rte_pmd_szedata2_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/rte_pmd_tap_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/tap/rte_pmd_tap_version.map
> +++ b/drivers/net/tap/rte_pmd_tap_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/thunderx/rte_pmd_thunderx_version.map
> +++ b/drivers/net/thunderx/rte_pmd_thunderx_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
> +++ b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/rte_pmd_vhost_version.map
> index 16b591ccc4..634255829e 100644
> --- a/drivers/net/vhost/rte_pmd_vhost_version.map
> +++ b/drivers/net/vhost/rte_pmd_vhost_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_eth_vhost_get_queue_event;
> diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/virtio/rte_pmd_virtio_version.map
> +++ b/drivers/net/virtio/rte_pmd_virtio_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
> +++ b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
> +++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
> index ca6a0d7626..280c79ea9c 100644
> --- a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
> +++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_qdma_attr_get;
> diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
> +++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/raw/ioat/rte_rawdev_ioat_version.map
> +++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/raw/ntb/rte_rawdev_ntb_version.map
> +++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
> +++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
> index acdaf587d2..4a76d1d52d 100644
> --- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
> +++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
> @@ -1,4 +1,3 @@
>  DPDK_21 {
> -
>  	local: *;
>  };
> diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
> +++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
> index f9f17e4f6e..4a76d1d52d 100644
> --- a/drivers/vdpa/ifc/rte_pmd_ifc_version.map
> +++ b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
> @@ -1,3 +1,3 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	local: *;
>  };
> diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/rte_acl_version.map
> index c3daca8115..d97f2927bf 100644
> --- a/lib/librte_acl/rte_acl_version.map
> +++ b/lib/librte_acl/rte_acl_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_acl_add_rules;
> diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/rte_bitratestats_version.map
> index 88fc2912db..463f78a53a 100644
> --- a/lib/librte_bitratestats/rte_bitratestats_version.map
> +++ b/lib/librte_bitratestats/rte_bitratestats_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_stats_bitrate_calc;
> diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map
> index 22c999fe16..180c42b717 100644
> --- a/lib/librte_cfgfile/rte_cfgfile_version.map
> +++ b/lib/librte_cfgfile/rte_cfgfile_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_cfgfile_add_entry;
> diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/rte_cmdline_version.map
> index 95fce812ff..a99104457f 100644
> --- a/lib/librte_cmdline/rte_cmdline_version.map
> +++ b/lib/librte_cmdline/rte_cmdline_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	cirbuf_add_buf_head;
> diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
> index a7a78dc41f..02f6dcf724 100644
> --- a/lib/librte_cryptodev/rte_cryptodev_version.map
> +++ b/lib/librte_cryptodev/rte_cryptodev_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_crypto_aead_algorithm_strings;
> @@ -58,12 +58,11 @@ DPDK_20.0 {
>  	local: *;
>  };
>  
> -DPDK_21 {
> +DPDK_20.0 {
>  	global:
>  	rte_cryptodev_info_get;
>  	rte_cryptodev_sym_capability_get;
> -} DPDK_20.0;
> -
> +};
>  
>  EXPERIMENTAL {
>  	global:
> diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map
> index 1b7c643005..1ddcd01fe6 100644
> --- a/lib/librte_distributor/rte_distributor_version.map
> +++ b/lib/librte_distributor/rte_distributor_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_distributor_clear_returns;
> diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
> index bf0c17c233..0b18e2ef85 100644
> --- a/lib/librte_eal/rte_eal_version.map
> +++ b/lib/librte_eal/rte_eal_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	__rte_panic;
> @@ -6,6 +6,7 @@ DPDK_20.0 {
>  	eal_timer_source;
>  	per_lcore__lcore_id;
>  	per_lcore__rte_errno;
> +	per_lcore__thread_id;
>  	rte_bus_dump;
>  	rte_bus_find;
>  	rte_bus_find_by_device;
> @@ -221,13 +222,6 @@ DPDK_20.0 {
>  	local: *;
>  };
>  
> -DPDK_21 {
> -	global:
> -
> -	per_lcore__thread_id;
> -
> -} DPDK_20.0;
> -
>  EXPERIMENTAL {
>  	global:
>  
> diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/rte_efd_version.map
> index e010eecfe4..425c0a85a9 100644
> --- a/lib/librte_efd/rte_efd_version.map
> +++ b/lib/librte_efd/rte_efd_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_efd_create;
> diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
> index 1212a17d32..8d9d6b1c67 100644
> --- a/lib/librte_ethdev/rte_ethdev_version.map
> +++ b/lib/librte_ethdev/rte_ethdev_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	_rte_eth_dev_callback_process;
> diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
> index 91a62cd077..3d9d0ca054 100644
> --- a/lib/librte_eventdev/rte_eventdev_version.map
> +++ b/lib/librte_eventdev/rte_eventdev_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_event_crypto_adapter_caps_get;
> diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/rte_gro_version.map
> index 9f6fe79e57..19dc66b0d4 100644
> --- a/lib/librte_gro/rte_gro_version.map
> +++ b/lib/librte_gro/rte_gro_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_gro_ctx_create;
> diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/rte_gso_version.map
> index 8505a59c27..60aa1b54e4 100644
> --- a/lib/librte_gso/rte_gso_version.map
> +++ b/lib/librte_gso/rte_gso_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_gso_segment;
> diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
> index c2a909443d..c0db81014f 100644
> --- a/lib/librte_hash/rte_hash_version.map
> +++ b/lib/librte_hash/rte_hash_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_fbk_hash_create;
> diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map
> index 5dd34f828c..82b308ddb0 100644
> --- a/lib/librte_ip_frag/rte_ip_frag_version.map
> +++ b/lib/librte_ip_frag/rte_ip_frag_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_ip_frag_free_death_row;
> diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/rte_jobstats_version.map
> index dbd2664ae2..3e166ad548 100644
> --- a/lib/librte_jobstats/rte_jobstats_version.map
> +++ b/lib/librte_jobstats/rte_jobstats_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_jobstats_abort;
> diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
> index 9cd3cedc54..a93da95f36 100644
> --- a/lib/librte_kni/rte_kni_version.map
> +++ b/lib/librte_kni/rte_kni_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_kni_alloc;
> diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map
> index 3ba0f4b59c..ed375bf4a3 100644
> --- a/lib/librte_kvargs/rte_kvargs_version.map
> +++ b/lib/librte_kvargs/rte_kvargs_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_kvargs_count;
> diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/rte_latencystats_version.map
> index e04e63463f..0c4360ab43 100644
> --- a/lib/librte_latencystats/rte_latencystats_version.map
> +++ b/lib/librte_latencystats/rte_latencystats_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_latencystats_get;
> diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/rte_lpm_version.map
> index bfccd7eacc..b4d437cc75 100644
> --- a/lib/librte_lpm/rte_lpm_version.map
> +++ b/lib/librte_lpm/rte_lpm_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_lpm6_add;
> diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
> index ab161bcdc7..a011aaead3 100644
> --- a/lib/librte_mbuf/rte_mbuf_version.map
> +++ b/lib/librte_mbuf/rte_mbuf_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	__rte_pktmbuf_linearize;
> diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/rte_member_version.map
> index 87780ae611..b8c6322e73 100644
> --- a/lib/librte_member/rte_member_version.map
> +++ b/lib/librte_member/rte_member_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_member_add;
> diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
> index 826a0b8824..50e22ee020 100644
> --- a/lib/librte_mempool/rte_mempool_version.map
> +++ b/lib/librte_mempool/rte_mempool_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_mempool_audit;
> @@ -31,12 +31,12 @@ DPDK_20.0 {
>  	local: *;
>  };
>  
> -DPDK_21 {
> +DPDK_20.0 {
>  	global:
>  
>  	rte_mempool_populate_iova;
>  	rte_mempool_populate_virt;
> -} DPDK_20.0;
> +};
>  
>  EXPERIMENTAL {
>  	global:
> diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
> index 58859d4d76..e2a2607f28 100644
> --- a/lib/librte_meter/rte_meter_version.map
> +++ b/lib/librte_meter/rte_meter_version.map
> @@ -1,24 +1,18 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_meter_srtcm_config;
>  	rte_meter_srtcm_profile_config;
>  	rte_meter_trtcm_config;
>  	rte_meter_trtcm_profile_config;
> +	rte_meter_trtcm_rfc4115_config;
> +	rte_meter_trtcm_rfc4115_profile_config;
>  
>  	local: *;
>  };
>  
> -DPDK_21 {
> -	global:
> -
> -	rte_meter_trtcm_rfc4115_config;
> -	rte_meter_trtcm_rfc4115_profile_config;
> -
> -} DPDK_20.0;
> -
>  EXPERIMENTAL {
> -       global:
> +	global:
>  
>  	rte_meter_trtcm_rfc4115_config;
>  	rte_meter_trtcm_rfc4115_profile_config;
> diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/rte_metrics_version.map
> index c88939b117..20f99cd19a 100644
> --- a/lib/librte_metrics/rte_metrics_version.map
> +++ b/lib/librte_metrics/rte_metrics_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_metrics_get_names;
> diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
> index 8a4e75a3a0..621f237945 100644
> --- a/lib/librte_net/rte_net_version.map
> +++ b/lib/librte_net/rte_net_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_eth_random_addr;
> diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map
> index 67eb845796..cd77c9dc9e 100644
> --- a/lib/librte_pci/rte_pci_version.map
> +++ b/lib/librte_pci/rte_pci_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	pci_map_resource;
> diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map
> index 6d02ccce6d..2f9e952d0b 100644
> --- a/lib/librte_pdump/rte_pdump_version.map
> +++ b/lib/librte_pdump/rte_pdump_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pdump_disable;
> diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
> index 64d38afecd..9ed80eb041 100644
> --- a/lib/librte_pipeline/rte_pipeline_version.map
> +++ b/lib/librte_pipeline/rte_pipeline_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_pipeline_ah_packet_drop;
> diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/rte_port_version.map
> index 18c6154672..bd1fbb66b0 100644
> --- a/lib/librte_port/rte_port_version.map
> +++ b/lib/librte_port/rte_port_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_port_ethdev_reader_ops;
> diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
> index 00ee5753e2..69ca9af616 100644
> --- a/lib/librte_power/rte_power_version.map
> +++ b/lib/librte_power/rte_power_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_power_exit;
> diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
> index 63b54f598b..eb29a3ac0d 100644
> --- a/lib/librte_rawdev/rte_rawdev_version.map
> +++ b/lib/librte_rawdev/rte_rawdev_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_rawdev_close;
> diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/rte_reorder_version.map
> index cf444062df..8c0220d324 100644
> --- a/lib/librte_reorder/rte_reorder_version.map
> +++ b/lib/librte_reorder/rte_reorder_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_reorder_create;
> diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map
> index ac392f3ca9..e35d6b9712 100644
> --- a/lib/librte_ring/rte_ring_version.map
> +++ b/lib/librte_ring/rte_ring_version.map
> @@ -1,21 +1,16 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_ring_create;
> +	rte_ring_create_elem;
>  	rte_ring_dump;
>  	rte_ring_free;
>  	rte_ring_get_memsize;
> +	rte_ring_get_memsize_elem;
>  	rte_ring_init;
>  	rte_ring_list_dump;
>  	rte_ring_lookup;
> +	rte_ring_reset;
>  
>  	local: *;
>  };
> -
> -DPDK_21 {
> -	global:
> -
> -	rte_ring_create_elem;
> -	rte_ring_get_memsize_elem;
> -	rte_ring_reset;
> -} DPDK_20.0;
> diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map
> index cefd990367..3faef6f0a0 100644
> --- a/lib/librte_sched/rte_sched_version.map
> +++ b/lib/librte_sched/rte_sched_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_approx;
> diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/rte_security_version.map
> index b07314bbf4..d84eec0a88 100644
> --- a/lib/librte_security/rte_security_version.map
> +++ b/lib/librte_security/rte_security_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_security_attach_session;
> diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map
> index 40f72b1fe8..568a6c6a8f 100644
> --- a/lib/librte_table/rte_table_version.map
> +++ b/lib/librte_table/rte_table_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_table_acl_ops;
> diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/rte_timer_version.map
> index 4471cef92b..21e68ea7a2 100644
> --- a/lib/librte_timer/rte_timer_version.map
> +++ b/lib/librte_timer/rte_timer_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_timer_dump_stats;
> diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
> index 13ec53b638..20b4abcb4e 100644
> --- a/lib/librte_vhost/rte_vhost_version.map
> +++ b/lib/librte_vhost/rte_vhost_version.map
> @@ -1,4 +1,4 @@
> -DPDK_20.0 {
> +DPDK_21 {
>  	global:
>  
>  	rte_vhost_avail_entries;
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files
  2020-08-11 14:03   ` [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files Thomas Monjalon
@ 2020-08-12  6:57     ` Kinsella, Ray
  0 siblings, 0 replies; 15+ messages in thread
From: Kinsella, Ray @ 2020-08-12  6:57 UTC (permalink / raw)
  To: Thomas Monjalon, dev
  Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson



On 11/08/2020 15:03, Thomas Monjalon wrote:
> The script was using the full ABI version, including the minor number,
> to version the symbols in the map files.
> It is fixed to use only the major number for symbol versioning.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  devtools/update_version_map_abi.py | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py
> index 80a61641ed..10c3bc8098 100755
> --- a/devtools/update_version_map_abi.py
> +++ b/devtools/update_version_map_abi.py
> @@ -105,9 +105,9 @@ def __parse_map_file(f_in):
>      return has_stable, stable_lines, experimental_lines, internal_lines
>  
>  
> -def __generate_stable_abi(f_out, abi_version, lines):
> +def __generate_stable_abi(f_out, abi_major, lines):
>      # print ABI version header
> -    print("DPDK_{} {{".format(abi_version), file=f_out)
> +    print("DPDK_{} {{".format(abi_major), file=f_out)
>  
>      # print global section if it exists
>      if lines:
> @@ -186,6 +186,7 @@ def __main():
>                file=sys.stderr)
>          arg_parser.print_help()
>          sys.exit(1)
> +    abi_major = parsed.abi_version.split('.')[0]
>  
>      with open(parsed.map_file) as f_in:
>          has_stable, stable_lines, experimental_lines, internal_lines = __parse_map_file(f_in)
> @@ -193,7 +194,7 @@ def __main():
>      with open(parsed.map_file, 'w') as f_out:
>          need_newline = has_stable and experimental_lines
>          if has_stable:
> -            __generate_stable_abi(f_out, parsed.abi_version, stable_lines)
> +            __generate_stable_abi(f_out, abi_major, stable_lines)
>          if need_newline:
>              # separate sections with a newline
>              print(file=f_out)
> 
Acked-by: Ray Kinsella <mdr@ashroe.eu>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0
  2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
  2020-08-11 14:03   ` [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files Thomas Monjalon
  2020-08-11 16:18   ` [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0 Kinsella, Ray
@ 2020-08-12  8:58   ` Kinsella, Ray
  2020-08-12  9:33     ` Thomas Monjalon
  2 siblings, 1 reply; 15+ messages in thread
From: Kinsella, Ray @ 2020-08-12  8:58 UTC (permalink / raw)
  To: Thomas Monjalon, dev
  Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson



On 11/08/2020 15:03, Thomas Monjalon wrote:
> Start a new release cycle with empty release notes.
> 
> The ABI version becomes 21.0.
> The ABI major is back to normal, having only one number (21 vs 20.0).
> The map files are updated to the new ABI major number (21).
> The ABI exceptions are dropped.
> Travis ABI check is disabled because compatibility is not preserved.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
> v5: drop all ABI exceptions
> v4: add -rc0 and remove temporary ABI exceptions
> v3: add minor number to ABI_VERSION and remove workaround in scripts
> v2: bump major ABI number (including .map changes)
> ---
>  .travis.yml                                   |  26 ----
>  ABI_VERSION                                   |   2 +-
>  VERSION                                       |   2 +-
>  config/meson.build                            |   5 +-
>  devtools/libabigail.abignore                  | 103 -------------
>  doc/guides/rel_notes/index.rst                |   1 +
>  doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
>  .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
[SNIP]

Acked-by: Ray Kinsella <mdr@ashroe.eu>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0
  2020-08-11 16:18   ` [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0 Kinsella, Ray
@ 2020-08-12  9:02     ` Kinsella, Ray
  0 siblings, 0 replies; 15+ messages in thread
From: Kinsella, Ray @ 2020-08-12  9:02 UTC (permalink / raw)
  To: Thomas Monjalon, dev
  Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson,
	Fiona Trahe, Arek Kusztal, Olivier Matz, Ferruh Yigit, Ori Kam

Hi Thomas,

Regex has a similar set of issues,

Warning: symbol rte_regexdev_unregister (Base) should be annotated  as ABI version DPDK_21 / DPDK_22, EXPERIMENTAL, or INTERNAL.
Warning: symbol rte_regexdev_register (Base) should be annotated  as ABI version DPDK_21 / DPDK_22, EXPERIMENTAL, or INTERNAL.
Warning: symbol rte_regexdev_get_device_by_name (Base) should be annotated  as ABI version DPDK_21 / DPDK_22, EXPERIMENTAL, or INTERNAL.
Warning: symbol rte_regexdev_is_valid_dev (Base) should be annotated  as ABI version DPDK_21 / DPDK_22, EXPERIMENTAL, or INTERNAL.

So on second thoughts, I will chase resolving these ABI issues seperately.
Sent an ACK on patch, I will chase these once it merges. 

Thanks,

Ray K

On 11/08/2020 17:18, Kinsella, Ray wrote:
> Hi Thomas,
> 
> In general it looks good, however you are letting the old version node 
> DPDK_20.0 linger in a few places. We need to include an explicit FYI to tidy this up.
> 
> Remove versioning code:
> 
> Cryptodev
> Fiona Trahe <fiona.trahe@intel.com>
> Arek Kusztal <arkadiuszx.kusztal@intel.com>
> 
> Mempool
> Olivier Matz <olivier.matz@6wind.com>
> 
> Remove alias to experimental:
> 
> Metering
> Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Thanks, 
> 
> Ray K
> 
> On 11/08/2020 15:03, Thomas Monjalon wrote:
>> Start a new release cycle with empty release notes.
>>
>> The ABI version becomes 21.0.
>> The ABI major is back to normal, having only one number (21 vs 20.0).
>> The map files are updated to the new ABI major number (21).
>> The ABI exceptions are dropped.
>> Travis ABI check is disabled because compatibility is not preserved.
>>
>> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
>> ---
>> v5: drop all ABI exceptions
>> v4: add -rc0 and remove temporary ABI exceptions
>> v3: add minor number to ABI_VERSION and remove workaround in scripts
>> v2: bump major ABI number (including .map changes)
>> ---
>>  .travis.yml                                   |  26 ----
>>  ABI_VERSION                                   |   2 +-
>>  VERSION                                       |   2 +-
>>  config/meson.build                            |   5 +-
>>  devtools/libabigail.abignore                  | 103 -------------
>>  doc/guides/rel_notes/index.rst                |   1 +
>>  doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
>>  .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
>>  .../rte_pmd_bbdev_fpga_lte_fec_version.map    |   2 +-
>>  .../null/rte_pmd_bbdev_null_version.map       |   2 +-
>>  .../rte_pmd_bbdev_turbo_sw_version.map        |   2 +-
>>  drivers/bus/ifpga/rte_bus_ifpga_version.map   |   2 +-
>>  drivers/bus/pci/rte_bus_pci_version.map       |   2 +-
>>  drivers/bus/vdev/rte_bus_vdev_version.map     |   2 +-
>>  drivers/bus/vmbus/rte_bus_vmbus_version.map   |   2 +-
>>  drivers/common/cpt/rte_common_cpt_version.map |   2 +-
>>  .../common/iavf/rte_common_iavf_version.map   |   4 +-
>>  .../common/mlx5/rte_common_mlx5_version.map   |   1 -
>>  .../common/mvep/rte_common_mvep_version.map   |   2 +-
>>  .../octeontx/rte_common_octeontx_version.map  |   2 +-
>>  .../compress/isal/rte_pmd_isal_version.map    |   2 +-
>>  .../rte_pmd_octeontx_compress_version.map     |   2 +-
>>  drivers/compress/qat/rte_pmd_qat_version.map  |   2 +-
>>  .../compress/zlib/rte_pmd_zlib_version.map    |   2 +-
>>  .../aesni_gcm/rte_pmd_aesni_gcm_version.map   |   2 +-
>>  .../aesni_mb/rte_pmd_aesni_mb_version.map     |   2 +-
>>  .../crypto/armv8/rte_pmd_armv8_version.map    |   2 +-
>>  .../caam_jr/rte_pmd_caam_jr_version.map       |   2 +-
>>  drivers/crypto/ccp/rte_pmd_ccp_version.map    |   2 +-
>>  .../crypto/kasumi/rte_pmd_kasumi_version.map  |   2 +-
>>  .../crypto/mvsam/rte_pmd_mvsam_version.map    |   2 +-
>>  .../crypto/nitrox/rte_pmd_nitrox_version.map  |   2 +-
>>  .../null/rte_pmd_null_crypto_version.map      |   2 +-
>>  .../rte_pmd_octeontx_crypto_version.map       |   2 +-
>>  .../rte_pmd_octeontx2_crypto_version.map      |   2 +-
>>  .../openssl/rte_pmd_openssl_version.map       |   2 +-
>>  .../rte_pmd_crypto_scheduler_version.map      |   2 +-
>>  .../crypto/snow3g/rte_pmd_snow3g_version.map  |   2 +-
>>  .../virtio/rte_pmd_virtio_crypto_version.map  |   2 +-
>>  drivers/crypto/zuc/rte_pmd_zuc_version.map    |   2 +-
>>  .../event/dpaa/rte_pmd_dpaa_event_version.map |   2 +-
>>  .../dpaa2/rte_pmd_dpaa2_event_version.map     |   2 +-
>>  .../event/dsw/rte_pmd_dsw_event_version.map   |   2 +-
>>  .../rte_pmd_octeontx_event_version.map        |   2 +-
>>  .../rte_pmd_octeontx2_event_version.map       |   2 +-
>>  .../event/opdl/rte_pmd_opdl_event_version.map |   2 +-
>>  .../rte_pmd_skeleton_event_version.map        |   2 +-
>>  drivers/event/sw/rte_pmd_sw_event_version.map |   2 +-
>>  .../bucket/rte_mempool_bucket_version.map     |   2 +-
>>  .../dpaa2/rte_mempool_dpaa2_version.map       |   2 +-
>>  .../octeontx/rte_mempool_octeontx_version.map |   2 +-
>>  .../mempool/ring/rte_mempool_ring_version.map |   2 +-
>>  .../stack/rte_mempool_stack_version.map       |   2 +-
>>  .../af_packet/rte_pmd_af_packet_version.map   |   2 +-
>>  drivers/net/af_xdp/rte_pmd_af_xdp_version.map |   2 +-
>>  drivers/net/ark/rte_pmd_ark_version.map       |   2 +-
>>  .../net/atlantic/rte_pmd_atlantic_version.map |   2 +-
>>  drivers/net/avp/rte_pmd_avp_version.map       |   2 +-
>>  drivers/net/axgbe/rte_pmd_axgbe_version.map   |   2 +-
>>  drivers/net/bnx2x/rte_pmd_bnx2x_version.map   |   2 +-
>>  drivers/net/bnxt/rte_pmd_bnxt_version.map     |   2 +-
>>  drivers/net/bonding/rte_pmd_bond_version.map  |   2 +-
>>  drivers/net/cxgbe/rte_pmd_cxgbe_version.map   |   2 +-
>>  drivers/net/dpaa/rte_pmd_dpaa_version.map     |   2 +-
>>  drivers/net/e1000/rte_pmd_e1000_version.map   |   2 +-
>>  drivers/net/ena/rte_pmd_ena_version.map       |   2 +-
>>  drivers/net/enetc/rte_pmd_enetc_version.map   |   2 +-
>>  drivers/net/enic/rte_pmd_enic_version.map     |   2 +-
>>  .../net/failsafe/rte_pmd_failsafe_version.map |   2 +-
>>  drivers/net/fm10k/rte_pmd_fm10k_version.map   |   2 +-
>>  drivers/net/hinic/rte_pmd_hinic_version.map   |   2 +-
>>  drivers/net/hns3/rte_pmd_hns3_version.map     |   2 +-
>>  drivers/net/i40e/rte_pmd_i40e_version.map     |   2 +-
>>  drivers/net/iavf/rte_pmd_iavf_version.map     |   2 +-
>>  drivers/net/ice/rte_pmd_ice_version.map       |   2 +-
>>  drivers/net/ionic/rte_pmd_ionic_version.map   |   1 -
>>  drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map |   2 +-
>>  drivers/net/ixgbe/rte_pmd_ixgbe_version.map   |   2 +-
>>  drivers/net/kni/rte_pmd_kni_version.map       |   2 +-
>>  .../net/liquidio/rte_pmd_liquidio_version.map |   2 +-
>>  drivers/net/memif/rte_pmd_memif_version.map   |   2 +-
>>  drivers/net/mlx4/rte_pmd_mlx4_version.map     |   2 +-
>>  drivers/net/mlx5/rte_pmd_mlx5_version.map     |   6 +-
>>  drivers/net/mvneta/rte_pmd_mvneta_version.map |   2 +-
>>  drivers/net/mvpp2/rte_pmd_mvpp2_version.map   |   2 +-
>>  drivers/net/netvsc/rte_pmd_netvsc_version.map |   2 +-
>>  drivers/net/nfb/rte_pmd_nfb_version.map       |   2 +-
>>  drivers/net/nfp/rte_pmd_nfp_version.map       |   2 +-
>>  drivers/net/null/rte_pmd_null_version.map     |   2 +-
>>  .../net/octeontx/rte_pmd_octeontx_version.map |   2 +-
>>  .../octeontx2/rte_pmd_octeontx2_version.map   |   2 +-
>>  drivers/net/pcap/rte_pmd_pcap_version.map     |   2 +-
>>  drivers/net/pfe/rte_pmd_pfe_version.map       |   2 +-
>>  drivers/net/qede/rte_pmd_qede_version.map     |   2 +-
>>  drivers/net/ring/rte_pmd_ring_version.map     |   2 +-
>>  drivers/net/sfc/rte_pmd_sfc_version.map       |   2 +-
>>  .../net/softnic/rte_pmd_softnic_version.map   |   2 +-
>>  .../net/szedata2/rte_pmd_szedata2_version.map |   2 +-
>>  drivers/net/tap/rte_pmd_tap_version.map       |   2 +-
>>  .../net/thunderx/rte_pmd_thunderx_version.map |   2 +-
>>  .../rte_pmd_vdev_netvsc_version.map           |   2 +-
>>  drivers/net/vhost/rte_pmd_vhost_version.map   |   2 +-
>>  drivers/net/virtio/rte_pmd_virtio_version.map |   2 +-
>>  .../net/vmxnet3/rte_pmd_vmxnet3_version.map   |   2 +-
>>  .../rte_rawdev_dpaa2_cmdif_version.map        |   2 +-
>>  .../rte_rawdev_dpaa2_qdma_version.map         |   2 +-
>>  .../raw/ifpga/rte_rawdev_ifpga_version.map    |   2 +-
>>  drivers/raw/ioat/rte_rawdev_ioat_version.map  |   2 +-
>>  drivers/raw/ntb/rte_rawdev_ntb_version.map    |   2 +-
>>  .../rte_rawdev_octeontx2_dma_version.map      |   2 +-
>>  .../rte_rawdev_octeontx2_ep_version.map       |   1 -
>>  .../skeleton/rte_rawdev_skeleton_version.map  |   2 +-
>>  drivers/vdpa/ifc/rte_pmd_ifc_version.map      |   2 +-
>>  lib/librte_acl/rte_acl_version.map            |   2 +-
>>  .../rte_bitratestats_version.map              |   2 +-
>>  lib/librte_cfgfile/rte_cfgfile_version.map    |   2 +-
>>  lib/librte_cmdline/rte_cmdline_version.map    |   2 +-
>>  .../rte_cryptodev_version.map                 |   7 +-
>>  .../rte_distributor_version.map               |   2 +-
>>  lib/librte_eal/rte_eal_version.map            |  10 +-
>>  lib/librte_efd/rte_efd_version.map            |   2 +-
>>  lib/librte_ethdev/rte_ethdev_version.map      |   2 +-
>>  lib/librte_eventdev/rte_eventdev_version.map  |   2 +-
>>  lib/librte_gro/rte_gro_version.map            |   2 +-
>>  lib/librte_gso/rte_gso_version.map            |   2 +-
>>  lib/librte_hash/rte_hash_version.map          |   2 +-
>>  lib/librte_ip_frag/rte_ip_frag_version.map    |   2 +-
>>  lib/librte_jobstats/rte_jobstats_version.map  |   2 +-
>>  lib/librte_kni/rte_kni_version.map            |   2 +-
>>  lib/librte_kvargs/rte_kvargs_version.map      |   2 +-
>>  .../rte_latencystats_version.map              |   2 +-
>>  lib/librte_lpm/rte_lpm_version.map            |   2 +-
>>  lib/librte_mbuf/rte_mbuf_version.map          |   2 +-
>>  lib/librte_member/rte_member_version.map      |   2 +-
>>  lib/librte_mempool/rte_mempool_version.map    |   6 +-
>>  lib/librte_meter/rte_meter_version.map        |  14 +-
>>  lib/librte_metrics/rte_metrics_version.map    |   2 +-
>>  lib/librte_net/rte_net_version.map            |   2 +-
>>  lib/librte_pci/rte_pci_version.map            |   2 +-
>>  lib/librte_pdump/rte_pdump_version.map        |   2 +-
>>  lib/librte_pipeline/rte_pipeline_version.map  |   2 +-
>>  lib/librte_port/rte_port_version.map          |   2 +-
>>  lib/librte_power/rte_power_version.map        |   2 +-
>>  lib/librte_rawdev/rte_rawdev_version.map      |   2 +-
>>  lib/librte_reorder/rte_reorder_version.map    |   2 +-
>>  lib/librte_ring/rte_ring_version.map          |  13 +-
>>  lib/librte_sched/rte_sched_version.map        |   2 +-
>>  lib/librte_security/rte_security_version.map  |   2 +-
>>  lib/librte_table/rte_table_version.map        |   2 +-
>>  lib/librte_timer/rte_timer_version.map        |   2 +-
>>  lib/librte_vhost/rte_vhost_version.map        |   2 +-
>>  151 files changed, 295 insertions(+), 311 deletions(-)
>>  create mode 100644 doc/guides/rel_notes/release_20_11.rst
>>
>> diff --git a/.travis.yml b/.travis.yml
>> index 14f8124233..d6eeab371d 100644
>> --- a/.travis.yml
>> +++ b/.travis.yml
>> @@ -2,9 +2,6 @@
>>  language: c
>>  cache:
>>    ccache: true
>> -  directories:
>> -    - libabigail
>> -    - reference
>>  
>>  dist: bionic
>>  
>> @@ -21,9 +18,6 @@ _aarch64_packages: &aarch64_packages
>>    - *required_packages
>>    - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu]
>>  
>> -_libabigail_build_packages: &libabigail_build_packages
>> -  - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev]
>> -
>>  _build_32b_packages: &build_32b_packages
>>    - *required_packages
>>    - [gcc-multilib]
>> @@ -34,10 +28,6 @@ _doc_packages: &doc_packages
>>  before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
>>  script: ./.ci/${TRAVIS_OS_NAME}-build.sh
>>  
>> -env:
>> -  global:
>> -    - REF_GIT_TAG=v20.05
>> -
>>  jobs:
>>    include:
>>    # x86_64 gcc jobs
>> @@ -55,14 +45,6 @@ jobs:
>>          packages:
>>            - *required_packages
>>            - *doc_packages
>> -  - env: DEF_LIB="shared" ABI_CHECKS=1
>> -    arch: amd64
>> -    compiler: gcc
>> -    addons:
>> -      apt:
>> -        packages:
>> -          - *required_packages
>> -          - *libabigail_build_packages
>>    # x86_64 clang jobs
>>    - env: DEF_LIB="static"
>>      arch: amd64
>> @@ -116,14 +98,6 @@ jobs:
>>          packages:
>>            - *required_packages
>>            - *doc_packages
>> -  - env: DEF_LIB="shared" ABI_CHECKS=1
>> -    arch: arm64
>> -    compiler: gcc
>> -    addons:
>> -      apt:
>> -        packages:
>> -          - *required_packages
>> -          - *libabigail_build_packages
>>    # aarch64 clang jobs
>>    - env: DEF_LIB="static"
>>      arch: arm64
>> diff --git a/ABI_VERSION b/ABI_VERSION
>> index a9ac8dacb0..5f39e91446 100644
>> --- a/ABI_VERSION
>> +++ b/ABI_VERSION
>> @@ -1 +1 @@
>> -20.0.3
>> +21.0
>> diff --git a/VERSION b/VERSION
>> index 85e33446f8..3f02088ffa 100644
>> --- a/VERSION
>> +++ b/VERSION
>> @@ -1 +1 @@
>> -20.08.0
>> +20.11.0-rc0
>> diff --git a/config/meson.build b/config/meson.build
>> index cff8b33dd2..6996e5cbea 100644
>> --- a/config/meson.build
>> +++ b/config/meson.build
>> @@ -29,10 +29,7 @@ abi_version = run_command(find_program('cat', 'more'),
>>  # and have the soname be all but the final part of the abi_version.
>>  # e.g. v20.1 => librte_foo.so.20.1
>>  #    sonames => librte_foo.so.20
>> -# e.g. v20.0.1 => librte_foo.so.20.0.1
>> -#      sonames => librte_foo.so.20.0
>> -abi_va = abi_version.split('.')
>> -so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1]
>> +so_version = abi_version.split('.')[0]
>>  
>>  # extract all version information into the build configuration
>>  dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int())
>> diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
>> index 9fea822f36..025f2c01bc 100644
>> --- a/devtools/libabigail.abignore
>> +++ b/devtools/libabigail.abignore
>> @@ -7,106 +7,3 @@
>>          symbol_version = INTERNAL
>>  [suppress_variable]
>>          symbol_version = INTERNAL
>> -
>> -; Ignore ABI 20.0.1 replaced with ABI 21
>> -[suppress_function]
>> -        symbol_version = DPDK_20.0.1
>> -[suppress_variable]
>> -        symbol_version = DPDK_20.0.1
>> -
>> -; Explicit ignore for driver-only ABI
>> -[suppress_type]
>> -        name = rte_cryptodev_ops
>> -; Ignore this enum update as it is part of an experimental API
>> -[suppress_type]
>> -        type_kind = enum
>> -        name = rte_crypto_asym_xform_type
>> -        changed_enumerators = RTE_CRYPTO_ASYM_XFORM_TYPE_LIST_END
>> -; Ignore updates of ring prod/cons
>> -[suppress_type]
>> -        type_kind = struct
>> -        name = rte_ring
>> -[suppress_type]
>> -        type_kind = struct
>> -        name = rte_event_ring
>> -; Ignore ethdev event enum update because new event cannot be
>> -; received if not registered
>> -[suppress_type]
>> -        type_kind = enum
>> -        name = rte_eth_event_type
>> -        changed_enumerators = RTE_ETH_EVENT_MAX
>> -; Ignore this enum update as new flags remain unknown to applications
>> -[suppress_type]
>> -	type_kind = enum
>> -	name = rte_cpu_flag_t
>> -	changed_enumerators = RTE_CPUFLAG_NUMFLAGS
>> -; Ignore Cryptodev AEAD xform enum and AEAD xform strings change
>> -; due to addition of Chacha20-Poly1305
>> -[suppress_type]
>> -        type_kind = enum
>> -        name = rte_crypto_aead_algorithm
>> -        changed_enumerators = RTE_CRYPTO_AEAD_LIST_END
>> -[suppress_variable]
>> -        name = rte_crypto_aead_algorithm_strings
>> -; Ignore updates of epoll event
>> -[suppress_type]
>> -        type_kind = struct
>> -        name = rte_epoll_event
>> -; Ignore updates of rte_mbuf_ext_shared_info refcnt_atomic
>> -[suppress_type]
>> -        name = rte_mbuf_ext_shared_info
>> -        has_data_member_inserted_between = {offset_of(refcnt_atomic), offset_of(refcnt_atomic)}
>> -
>> -;;;;;;;;;;;;;;;;;;;;;;
>> -; Temporary exceptions till DPDK 20.11
>> -;;;;;;;;;;;;;;;;;;;;;;
>> -; Ignore moving OCTEONTX2 stable functions to INTERNAL
>> -[suppress_file]
>> -	file_name_regexp = ^librte_common_octeontx2\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_mempool_octeontx2\.
>> -; Ignore moving mlx5 stable functions to INTERNAL
>> -[suppress_file]
>> -	file_name_regexp = ^librte_common_mlx5\.
>> -; Ignore moving DPAAx stable functions to INTERNAL
>> -[suppress_file]
>> -        file_name_regexp = ^librte_common_dpaax\.
>> -[suppress_file]
>> -        file_name_regexp = ^librte_bus_fslmc\.
>> -[suppress_file]
>> -        file_name_regexp = ^librte_bus_dpaa\.
>> -[suppress_variable]
>> -        name = rte_dpaa_bpid_info
>> -[suppress_variable]
>> -        name = rte_dpaa_memsegs
>> -[suppress_variable]
>> -        name = rte_dpaa2_bpid_info
>> -[suppress_function]
>> -        name = rte_dpaa2_mbuf_alloc_bulk
>> -[suppress_function]
>> -        name_regexp = ^dpaa2?_.*tach$
>> -; Ignore soname changes for experimental libraries
>> -[suppress_file]
>> -	file_name_regexp = ^librte_bbdev\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_bpf\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_compressdev\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_fib\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_flow_classify\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_graph\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_ipsec\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_node\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_rcu\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_rib\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_telemetry\.
>> -[suppress_file]
>> -	file_name_regexp = ^librte_stack\.
>> diff --git a/doc/guides/rel_notes/index.rst b/doc/guides/rel_notes/index.rst
>> index 05c9d837a4..fb70d1a5f3 100644
>> --- a/doc/guides/rel_notes/index.rst
>> +++ b/doc/guides/rel_notes/index.rst
>> @@ -8,6 +8,7 @@ Release Notes
>>      :maxdepth: 1
>>      :numbered:
>>  
>> +    release_20_11
>>      release_20_08
>>      release_20_05
>>      release_20_02
>> diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
>> new file mode 100644
>> index 0000000000..df227a1773
>> --- /dev/null
>> +++ b/doc/guides/rel_notes/release_20_11.rst
>> @@ -0,0 +1,136 @@
>> +.. SPDX-License-Identifier: BSD-3-Clause
>> +   Copyright 2020 The DPDK contributors
>> +
>> +.. include:: <isonum.txt>
>> +
>> +DPDK Release 20.11
>> +==================
>> +
>> +.. **Read this first.**
>> +
>> +   The text in the sections below explains how to update the release notes.
>> +
>> +   Use proper spelling, capitalization and punctuation in all sections.
>> +
>> +   Variable and config names should be quoted as fixed width text:
>> +   ``LIKE_THIS``.
>> +
>> +   Build the docs and view the output file to ensure the changes are correct::
>> +
>> +      make doc-guides-html
>> +      xdg-open build/doc/html/guides/rel_notes/release_20_11.html
>> +
>> +
>> +New Features
>> +------------
>> +
>> +.. This section should contain new features added in this release.
>> +   Sample format:
>> +
>> +   * **Add a title in the past tense with a full stop.**
>> +
>> +     Add a short 1-2 sentence description in the past tense.
>> +     The description should be enough to allow someone scanning
>> +     the release notes to understand the new feature.
>> +
>> +     If the feature adds a lot of sub-features you can use a bullet list
>> +     like this:
>> +
>> +     * Added feature foo to do something.
>> +     * Enhanced feature bar to do something else.
>> +
>> +     Refer to the previous release notes for examples.
>> +
>> +     Suggested order in release notes items:
>> +     * Core libs (EAL, mempool, ring, mbuf, buses)
>> +     * Device abstraction libs and PMDs
>> +       - ethdev (lib, PMDs)
>> +       - cryptodev (lib, PMDs)
>> +       - eventdev (lib, PMDs)
>> +       - etc
>> +     * Other libs
>> +     * Apps, Examples, Tools (if significant)
>> +
>> +     This section is a comment. Do not overwrite or remove it.
>> +     Also, make sure to start the actual text at the margin.
>> +     =======================================================
>> +
>> +
>> +Removed Items
>> +-------------
>> +
>> +.. This section should contain removed items in this release. Sample format:
>> +
>> +   * Add a short 1-2 sentence description of the removed item
>> +     in the past tense.
>> +
>> +   This section is a comment. Do not overwrite or remove it.
>> +   Also, make sure to start the actual text at the margin.
>> +   =======================================================
>> +
>> +
>> +API Changes
>> +-----------
>> +
>> +.. This section should contain API changes. Sample format:
>> +
>> +   * sample: Add a short 1-2 sentence description of the API change
>> +     which was announced in the previous releases and made in this release.
>> +     Start with a scope label like "ethdev:".
>> +     Use fixed width quotes for ``function_names`` or ``struct_names``.
>> +     Use the past tense.
>> +
>> +   This section is a comment. Do not overwrite or remove it.
>> +   Also, make sure to start the actual text at the margin.
>> +   =======================================================
>> +
>> +
>> +ABI Changes
>> +-----------
>> +
>> +.. This section should contain ABI changes. Sample format:
>> +
>> +   * sample: Add a short 1-2 sentence description of the ABI change
>> +     which was announced in the previous releases and made in this release.
>> +     Start with a scope label like "ethdev:".
>> +     Use fixed width quotes for ``function_names`` or ``struct_names``.
>> +     Use the past tense.
>> +
>> +   This section is a comment. Do not overwrite or remove it.
>> +   Also, make sure to start the actual text at the margin.
>> +   =======================================================
>> +
>> +
>> +Known Issues
>> +------------
>> +
>> +.. This section should contain new known issues in this release. Sample format:
>> +
>> +   * **Add title in present tense with full stop.**
>> +
>> +     Add a short 1-2 sentence description of the known issue
>> +     in the present tense. Add information on any known workarounds.
>> +
>> +   This section is a comment. Do not overwrite or remove it.
>> +   Also, make sure to start the actual text at the margin.
>> +   =======================================================
>> +
>> +
>> +Tested Platforms
>> +----------------
>> +
>> +.. This section should contain a list of platforms that were tested
>> +   with this release.
>> +
>> +   The format is:
>> +
>> +   * <vendor> platform with <vendor> <type of devices> combinations
>> +
>> +     * List of CPU
>> +     * List of OS
>> +     * List of devices
>> +     * Other relevant details...
>> +
>> +   This section is a comment. Do not overwrite or remove it.
>> +   Also, make sure to start the actual text at the margin.
>> +   =======================================================
>> diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
>> index b0fb9717fa..d723bc9b0e 100644
>> --- a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
>> +++ b/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>>  
>> diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
>> index 6bcea2cc7f..a2ab086cd8 100644
>> --- a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
>> +++ b/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>>  
>> diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/baseband/null/rte_pmd_bbdev_null_version.map
>> +++ b/drivers/baseband/null/rte_pmd_bbdev_null_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
>> +++ b/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/rte_bus_ifpga_version.map
>> index 05b4a28c1b..6e8f85da3c 100644
>> --- a/drivers/bus/ifpga/rte_bus_ifpga_version.map
>> +++ b/drivers/bus/ifpga/rte_bus_ifpga_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_ifpga_driver_register;
>> diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/rte_bus_pci_version.map
>> index 012d817e14..5b75d23671 100644
>> --- a/drivers/bus/pci/rte_bus_pci_version.map
>> +++ b/drivers/bus/pci/rte_bus_pci_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pci_dump;
>> diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/rte_bus_vdev_version.map
>> index 5abb10ecb0..61b6cefcee 100644
>> --- a/drivers/bus/vdev/rte_bus_vdev_version.map
>> +++ b/drivers/bus/vdev/rte_bus_vdev_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_vdev_add_custom_scan;
>> diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/rte_bus_vmbus_version.map
>> index cbaaebc06c..fa8e91c282 100644
>> --- a/drivers/bus/vmbus/rte_bus_vmbus_version.map
>> +++ b/drivers/bus/vmbus/rte_bus_vmbus_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_vmbus_chan_close;
>> diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/rte_common_cpt_version.map
>> index 8c65cde6cf..4d85021a87 100644
>> --- a/drivers/common/cpt/rte_common_cpt_version.map
>> +++ b/drivers/common/cpt/rte_common_cpt_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	cpt_pmd_ops_helper_asym_get_mlen;
>> diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/rte_common_iavf_version.map
>> index 92ceac108d..44142499e0 100644
>> --- a/drivers/common/iavf/rte_common_iavf_version.map
>> +++ b/drivers/common/iavf/rte_common_iavf_version.map
>> @@ -1,11 +1,11 @@
>>  DPDK_21 {
>>  	global:
>>  
>> -	iavf_init_adminq;
>> -	iavf_shutdown_adminq;
>>  	iavf_aq_send_msg_to_pf;
>>  	iavf_clean_arq_element;
>> +	iavf_init_adminq;
>>  	iavf_set_mac_type;
>> +	iavf_shutdown_adminq;
>>  	iavf_vf_parse_hw_config;
>>  
>>  	local: *;
>> diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/rte_common_mlx5_version.map
>> index 7729d0dd04..c4d57c08a7 100644
>> --- a/drivers/common/mlx5/rte_common_mlx5_version.map
>> +++ b/drivers/common/mlx5/rte_common_mlx5_version.map
>> @@ -93,4 +93,3 @@ INTERNAL {
>>  
>>  	mlx5_pci_driver_register;
>>  };
>> -
>> diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/rte_common_mvep_version.map
>> index 030928439d..e5af82c61d 100644
>> --- a/drivers/common/mvep/rte_common_mvep_version.map
>> +++ b/drivers/common/mvep/rte_common_mvep_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_mvep_deinit;
>> diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/rte_common_octeontx_version.map
>> index 5f6aa8bd3a..30f3fa65e0 100644
>> --- a/drivers/common/octeontx/rte_common_octeontx_version.map
>> +++ b/drivers/common/octeontx/rte_common_octeontx_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	octeontx_get_global_domain;
>> diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/rte_pmd_isal_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/compress/isal/rte_pmd_isal_version.map
>> +++ b/drivers/compress/isal/rte_pmd_isal_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
>> +++ b/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/compress/qat/rte_pmd_qat_version.map b/drivers/compress/qat/rte_pmd_qat_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/compress/qat/rte_pmd_qat_version.map
>> +++ b/drivers/compress/qat/rte_pmd_qat_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/rte_pmd_zlib_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/compress/zlib/rte_pmd_zlib_version.map
>> +++ b/drivers/compress/zlib/rte_pmd_zlib_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
>> +++ b/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
>> +++ b/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/rte_pmd_armv8_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/armv8/rte_pmd_armv8_version.map
>> +++ b/drivers/crypto/armv8/rte_pmd_armv8_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
>> +++ b/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/rte_pmd_ccp_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/ccp/rte_pmd_ccp_version.map
>> +++ b/drivers/crypto/ccp/rte_pmd_ccp_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
>> +++ b/drivers/crypto/kasumi/rte_pmd_kasumi_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
>> +++ b/drivers/crypto/mvsam/rte_pmd_mvsam_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
>> +++ b/drivers/crypto/nitrox/rte_pmd_nitrox_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/rte_pmd_null_crypto_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/null/rte_pmd_null_crypto_version.map
>> +++ b/drivers/crypto/null/rte_pmd_null_crypto_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
>> +++ b/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
>> +++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/rte_pmd_openssl_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/openssl/rte_pmd_openssl_version.map
>> +++ b/drivers/crypto/openssl/rte_pmd_openssl_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
>> index 077afedce7..ca6f102d9f 100644
>> --- a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
>> +++ b/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_cryptodev_scheduler_load_user_scheduler;
>> diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
>> +++ b/drivers/crypto/snow3g/rte_pmd_snow3g_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
>> +++ b/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/rte_pmd_zuc_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/crypto/zuc/rte_pmd_zuc_version.map
>> +++ b/drivers/crypto/zuc/rte_pmd_zuc_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
>> +++ b/drivers/event/dpaa/rte_pmd_dpaa_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
>> +++ b/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/rte_pmd_dsw_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/dsw/rte_pmd_dsw_event_version.map
>> +++ b/drivers/event/dsw/rte_pmd_dsw_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
>> +++ b/drivers/event/octeontx/rte_pmd_octeontx_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
>> +++ b/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/rte_pmd_opdl_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/opdl/rte_pmd_opdl_event_version.map
>> +++ b/drivers/event/opdl/rte_pmd_opdl_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
>> +++ b/drivers/event/skeleton/rte_pmd_skeleton_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/rte_pmd_sw_event_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/event/sw/rte_pmd_sw_event_version.map
>> +++ b/drivers/event/sw/rte_pmd_sw_event_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/rte_mempool_bucket_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/mempool/bucket/rte_mempool_bucket_version.map
>> +++ b/drivers/mempool/bucket/rte_mempool_bucket_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
>> index 686b024624..473b8c90e8 100644
>> --- a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
>> +++ b/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_dpaa2_mbuf_from_buf_addr;
>> diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
>> +++ b/drivers/mempool/octeontx/rte_mempool_octeontx_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/rte_mempool_ring_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/mempool/ring/rte_mempool_ring_version.map
>> +++ b/drivers/mempool/ring/rte_mempool_ring_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/rte_mempool_stack_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/mempool/stack/rte_mempool_stack_version.map
>> +++ b/drivers/mempool/stack/rte_mempool_stack_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/af_packet/rte_pmd_af_packet_version.map
>> +++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
>> +++ b/drivers/net/af_xdp/rte_pmd_af_xdp_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/rte_pmd_ark_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/ark/rte_pmd_ark_version.map
>> +++ b/drivers/net/ark/rte_pmd_ark_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/rte_pmd_atlantic_version.map
>> index 9b04838d84..6e17832684 100644
>> --- a/drivers/net/atlantic/rte_pmd_atlantic_version.map
>> +++ b/drivers/net/atlantic/rte_pmd_atlantic_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>>  
>> diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/avp/rte_pmd_avp_version.map
>> +++ b/drivers/net/avp/rte_pmd_avp_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/axgbe/rte_pmd_axgbe_version.map
>> +++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
>> +++ b/drivers/net/bnx2x/rte_pmd_bnx2x_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/rte_pmd_bnxt_version.map
>> index bb52562347..a050d86ab7 100644
>> --- a/drivers/net/bnxt/rte_pmd_bnxt_version.map
>> +++ b/drivers/net/bnxt/rte_pmd_bnxt_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pmd_bnxt_get_vf_rx_status;
>> diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map
>> index 270c7d5d55..df81ee74c1 100644
>> --- a/drivers/net/bonding/rte_pmd_bond_version.map
>> +++ b/drivers/net/bonding/rte_pmd_bond_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_eth_bond_8023ad_agg_selection_get;
>> diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
>> +++ b/drivers/net/cxgbe/rte_pmd_cxgbe_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/rte_pmd_dpaa_version.map
>> index 774aa0de45..87ce8f5b6c 100644
>> --- a/drivers/net/dpaa/rte_pmd_dpaa_version.map
>> +++ b/drivers/net/dpaa/rte_pmd_dpaa_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pmd_dpaa_set_tx_loopback;
>> diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/rte_pmd_e1000_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/e1000/rte_pmd_e1000_version.map
>> +++ b/drivers/net/e1000/rte_pmd_e1000_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/rte_pmd_ena_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/ena/rte_pmd_ena_version.map
>> +++ b/drivers/net/ena/rte_pmd_ena_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/rte_pmd_enetc_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/enetc/rte_pmd_enetc_version.map
>> +++ b/drivers/net/enetc/rte_pmd_enetc_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/rte_pmd_enic_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/enic/rte_pmd_enic_version.map
>> +++ b/drivers/net/enic/rte_pmd_enic_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/rte_pmd_failsafe_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/failsafe/rte_pmd_failsafe_version.map
>> +++ b/drivers/net/failsafe/rte_pmd_failsafe_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/fm10k/rte_pmd_fm10k_version.map
>> +++ b/drivers/net/fm10k/rte_pmd_fm10k_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/rte_pmd_hinic_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/hinic/rte_pmd_hinic_version.map
>> +++ b/drivers/net/hinic/rte_pmd_hinic_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/rte_pmd_hns3_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/hns3/rte_pmd_hns3_version.map
>> +++ b/drivers/net/hns3/rte_pmd_hns3_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/rte_pmd_i40e_version.map
>> index f6cd3b3566..413c58cb21 100644
>> --- a/drivers/net/i40e/rte_pmd_i40e_version.map
>> +++ b/drivers/net/i40e/rte_pmd_i40e_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pmd_i40e_add_vf_mac_addr;
>> diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/rte_pmd_iavf_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/iavf/rte_pmd_iavf_version.map
>> +++ b/drivers/net/iavf/rte_pmd_iavf_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map
>> index d04b194c13..91f40225e9 100644
>> --- a/drivers/net/ice/rte_pmd_ice_version.map
>> +++ b/drivers/net/ice/rte_pmd_ice_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>>  
>> diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/rte_pmd_ionic_version.map
>> index acdaf587d2..4a76d1d52d 100644
>> --- a/drivers/net/ionic/rte_pmd_ionic_version.map
>> +++ b/drivers/net/ionic/rte_pmd_ionic_version.map
>> @@ -1,4 +1,3 @@
>>  DPDK_21 {
>> -
>>  	local: *;
>>  };
>> diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
>> index 7e348e99b1..d8cc1026e0 100644
>> --- a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
>> +++ b/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>>  
>> diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
>> index 911f8083f1..9402802b04 100644
>> --- a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
>> +++ b/drivers/net/ixgbe/rte_pmd_ixgbe_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pmd_ixgbe_bypass_event_show;
>> diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/rte_pmd_kni_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/kni/rte_pmd_kni_version.map
>> +++ b/drivers/net/kni/rte_pmd_kni_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/rte_pmd_liquidio_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/liquidio/rte_pmd_liquidio_version.map
>> +++ b/drivers/net/liquidio/rte_pmd_liquidio_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/rte_pmd_memif_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/memif/rte_pmd_memif_version.map
>> +++ b/drivers/net/memif/rte_pmd_memif_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/mlx4/rte_pmd_mlx4_version.map
>> +++ b/drivers/net/mlx4/rte_pmd_mlx4_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/rte_pmd_mlx5_version.map
>> index c8b1031b02..bc1d3d06bf 100644
>> --- a/drivers/net/mlx5/rte_pmd_mlx5_version.map
>> +++ b/drivers/net/mlx5/rte_pmd_mlx5_version.map
>> @@ -1,10 +1,10 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>>  
>>  EXPERIMENTAL {
>> -        global:
>> +	global:
>>  
>> -        # added in 20.02
>> +	# added in 20.02
>>  	rte_pmd_mlx5_get_dyn_flag_names;
>>  };
>> diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/rte_pmd_mvneta_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/mvneta/rte_pmd_mvneta_version.map
>> +++ b/drivers/net/mvneta/rte_pmd_mvneta_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
>> +++ b/drivers/net/mvpp2/rte_pmd_mvpp2_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/rte_pmd_netvsc_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/netvsc/rte_pmd_netvsc_version.map
>> +++ b/drivers/net/netvsc/rte_pmd_netvsc_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/rte_pmd_nfb_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/nfb/rte_pmd_nfb_version.map
>> +++ b/drivers/net/nfb/rte_pmd_nfb_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/rte_pmd_nfp_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/nfp/rte_pmd_nfp_version.map
>> +++ b/drivers/net/nfp/rte_pmd_nfp_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/null/rte_pmd_null_version.map
>> +++ b/drivers/net/null/rte_pmd_null_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/rte_pmd_octeontx_version.map
>> index f7cae02fac..6dda72890c 100644
>> --- a/drivers/net/octeontx/rte_pmd_octeontx_version.map
>> +++ b/drivers/net/octeontx/rte_pmd_octeontx_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_octeontx_pchan_map;
>> diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
>> +++ b/drivers/net/octeontx2/rte_pmd_octeontx2_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/pcap/rte_pmd_pcap_version.map
>> +++ b/drivers/net/pcap/rte_pmd_pcap_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/rte_pmd_pfe_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/pfe/rte_pmd_pfe_version.map
>> +++ b/drivers/net/pfe/rte_pmd_pfe_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/rte_pmd_qede_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/qede/rte_pmd_qede_version.map
>> +++ b/drivers/net/qede/rte_pmd_qede_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/rte_pmd_ring_version.map
>> index ebb6be2733..29770fe3e4 100644
>> --- a/drivers/net/ring/rte_pmd_ring_version.map
>> +++ b/drivers/net/ring/rte_pmd_ring_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_eth_from_ring;
>> diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/sfc/rte_pmd_sfc_version.map
>> +++ b/drivers/net/sfc/rte_pmd_sfc_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
>> index 50f113d5a2..530d2e6b72 100644
>> --- a/drivers/net/softnic/rte_pmd_softnic_version.map
>> +++ b/drivers/net/softnic/rte_pmd_softnic_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pmd_softnic_run;
>> diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/rte_pmd_szedata2_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/szedata2/rte_pmd_szedata2_version.map
>> +++ b/drivers/net/szedata2/rte_pmd_szedata2_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/rte_pmd_tap_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/tap/rte_pmd_tap_version.map
>> +++ b/drivers/net/tap/rte_pmd_tap_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/rte_pmd_thunderx_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/thunderx/rte_pmd_thunderx_version.map
>> +++ b/drivers/net/thunderx/rte_pmd_thunderx_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
>> +++ b/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/rte_pmd_vhost_version.map
>> index 16b591ccc4..634255829e 100644
>> --- a/drivers/net/vhost/rte_pmd_vhost_version.map
>> +++ b/drivers/net/vhost/rte_pmd_vhost_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_eth_vhost_get_queue_event;
>> diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/rte_pmd_virtio_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/virtio/rte_pmd_virtio_version.map
>> +++ b/drivers/net/virtio/rte_pmd_virtio_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
>> +++ b/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
>> +++ b/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
>> index ca6a0d7626..280c79ea9c 100644
>> --- a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
>> +++ b/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_qdma_attr_get;
>> diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
>> +++ b/drivers/raw/ifpga/rte_rawdev_ifpga_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/rte_rawdev_ioat_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/raw/ioat/rte_rawdev_ioat_version.map
>> +++ b/drivers/raw/ioat/rte_rawdev_ioat_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/rte_rawdev_ntb_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/raw/ntb/rte_rawdev_ntb_version.map
>> +++ b/drivers/raw/ntb/rte_rawdev_ntb_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
>> +++ b/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
>> index acdaf587d2..4a76d1d52d 100644
>> --- a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
>> +++ b/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
>> @@ -1,4 +1,3 @@
>>  DPDK_21 {
>> -
>>  	local: *;
>>  };
>> diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
>> +++ b/drivers/raw/skeleton/rte_rawdev_skeleton_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
>> index f9f17e4f6e..4a76d1d52d 100644
>> --- a/drivers/vdpa/ifc/rte_pmd_ifc_version.map
>> +++ b/drivers/vdpa/ifc/rte_pmd_ifc_version.map
>> @@ -1,3 +1,3 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	local: *;
>>  };
>> diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/rte_acl_version.map
>> index c3daca8115..d97f2927bf 100644
>> --- a/lib/librte_acl/rte_acl_version.map
>> +++ b/lib/librte_acl/rte_acl_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_acl_add_rules;
>> diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/rte_bitratestats_version.map
>> index 88fc2912db..463f78a53a 100644
>> --- a/lib/librte_bitratestats/rte_bitratestats_version.map
>> +++ b/lib/librte_bitratestats/rte_bitratestats_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_stats_bitrate_calc;
>> diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map
>> index 22c999fe16..180c42b717 100644
>> --- a/lib/librte_cfgfile/rte_cfgfile_version.map
>> +++ b/lib/librte_cfgfile/rte_cfgfile_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_cfgfile_add_entry;
>> diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/rte_cmdline_version.map
>> index 95fce812ff..a99104457f 100644
>> --- a/lib/librte_cmdline/rte_cmdline_version.map
>> +++ b/lib/librte_cmdline/rte_cmdline_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	cirbuf_add_buf_head;
>> diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map
>> index a7a78dc41f..02f6dcf724 100644
>> --- a/lib/librte_cryptodev/rte_cryptodev_version.map
>> +++ b/lib/librte_cryptodev/rte_cryptodev_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_crypto_aead_algorithm_strings;
>> @@ -58,12 +58,11 @@ DPDK_20.0 {
>>  	local: *;
>>  };
>>  
>> -DPDK_21 {
>> +DPDK_20.0 {
>>  	global:
>>  	rte_cryptodev_info_get;
>>  	rte_cryptodev_sym_capability_get;
>> -} DPDK_20.0;
>> -
>> +};
>>  
>>  EXPERIMENTAL {
>>  	global:
>> diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map
>> index 1b7c643005..1ddcd01fe6 100644
>> --- a/lib/librte_distributor/rte_distributor_version.map
>> +++ b/lib/librte_distributor/rte_distributor_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_distributor_clear_returns;
>> diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
>> index bf0c17c233..0b18e2ef85 100644
>> --- a/lib/librte_eal/rte_eal_version.map
>> +++ b/lib/librte_eal/rte_eal_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	__rte_panic;
>> @@ -6,6 +6,7 @@ DPDK_20.0 {
>>  	eal_timer_source;
>>  	per_lcore__lcore_id;
>>  	per_lcore__rte_errno;
>> +	per_lcore__thread_id;
>>  	rte_bus_dump;
>>  	rte_bus_find;
>>  	rte_bus_find_by_device;
>> @@ -221,13 +222,6 @@ DPDK_20.0 {
>>  	local: *;
>>  };
>>  
>> -DPDK_21 {
>> -	global:
>> -
>> -	per_lcore__thread_id;
>> -
>> -} DPDK_20.0;
>> -
>>  EXPERIMENTAL {
>>  	global:
>>  
>> diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/rte_efd_version.map
>> index e010eecfe4..425c0a85a9 100644
>> --- a/lib/librte_efd/rte_efd_version.map
>> +++ b/lib/librte_efd/rte_efd_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_efd_create;
>> diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map
>> index 1212a17d32..8d9d6b1c67 100644
>> --- a/lib/librte_ethdev/rte_ethdev_version.map
>> +++ b/lib/librte_ethdev/rte_ethdev_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	_rte_eth_dev_callback_process;
>> diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/rte_eventdev_version.map
>> index 91a62cd077..3d9d0ca054 100644
>> --- a/lib/librte_eventdev/rte_eventdev_version.map
>> +++ b/lib/librte_eventdev/rte_eventdev_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_event_crypto_adapter_caps_get;
>> diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/rte_gro_version.map
>> index 9f6fe79e57..19dc66b0d4 100644
>> --- a/lib/librte_gro/rte_gro_version.map
>> +++ b/lib/librte_gro/rte_gro_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_gro_ctx_create;
>> diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/rte_gso_version.map
>> index 8505a59c27..60aa1b54e4 100644
>> --- a/lib/librte_gso/rte_gso_version.map
>> +++ b/lib/librte_gso/rte_gso_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_gso_segment;
>> diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/rte_hash_version.map
>> index c2a909443d..c0db81014f 100644
>> --- a/lib/librte_hash/rte_hash_version.map
>> +++ b/lib/librte_hash/rte_hash_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_fbk_hash_create;
>> diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map
>> index 5dd34f828c..82b308ddb0 100644
>> --- a/lib/librte_ip_frag/rte_ip_frag_version.map
>> +++ b/lib/librte_ip_frag/rte_ip_frag_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_ip_frag_free_death_row;
>> diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/rte_jobstats_version.map
>> index dbd2664ae2..3e166ad548 100644
>> --- a/lib/librte_jobstats/rte_jobstats_version.map
>> +++ b/lib/librte_jobstats/rte_jobstats_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_jobstats_abort;
>> diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/rte_kni_version.map
>> index 9cd3cedc54..a93da95f36 100644
>> --- a/lib/librte_kni/rte_kni_version.map
>> +++ b/lib/librte_kni/rte_kni_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_kni_alloc;
>> diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/rte_kvargs_version.map
>> index 3ba0f4b59c..ed375bf4a3 100644
>> --- a/lib/librte_kvargs/rte_kvargs_version.map
>> +++ b/lib/librte_kvargs/rte_kvargs_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_kvargs_count;
>> diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/rte_latencystats_version.map
>> index e04e63463f..0c4360ab43 100644
>> --- a/lib/librte_latencystats/rte_latencystats_version.map
>> +++ b/lib/librte_latencystats/rte_latencystats_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_latencystats_get;
>> diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/rte_lpm_version.map
>> index bfccd7eacc..b4d437cc75 100644
>> --- a/lib/librte_lpm/rte_lpm_version.map
>> +++ b/lib/librte_lpm/rte_lpm_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_lpm6_add;
>> diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/rte_mbuf_version.map
>> index ab161bcdc7..a011aaead3 100644
>> --- a/lib/librte_mbuf/rte_mbuf_version.map
>> +++ b/lib/librte_mbuf/rte_mbuf_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	__rte_pktmbuf_linearize;
>> diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/rte_member_version.map
>> index 87780ae611..b8c6322e73 100644
>> --- a/lib/librte_member/rte_member_version.map
>> +++ b/lib/librte_member/rte_member_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_member_add;
>> diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/rte_mempool_version.map
>> index 826a0b8824..50e22ee020 100644
>> --- a/lib/librte_mempool/rte_mempool_version.map
>> +++ b/lib/librte_mempool/rte_mempool_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_mempool_audit;
>> @@ -31,12 +31,12 @@ DPDK_20.0 {
>>  	local: *;
>>  };
>>  
>> -DPDK_21 {
>> +DPDK_20.0 {
>>  	global:
>>  
>>  	rte_mempool_populate_iova;
>>  	rte_mempool_populate_virt;
>> -} DPDK_20.0;
>> +};
>>  
>>  EXPERIMENTAL {
>>  	global:
>> diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map
>> index 58859d4d76..e2a2607f28 100644
>> --- a/lib/librte_meter/rte_meter_version.map
>> +++ b/lib/librte_meter/rte_meter_version.map
>> @@ -1,24 +1,18 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_meter_srtcm_config;
>>  	rte_meter_srtcm_profile_config;
>>  	rte_meter_trtcm_config;
>>  	rte_meter_trtcm_profile_config;
>> +	rte_meter_trtcm_rfc4115_config;
>> +	rte_meter_trtcm_rfc4115_profile_config;
>>  
>>  	local: *;
>>  };
>>  
>> -DPDK_21 {
>> -	global:
>> -
>> -	rte_meter_trtcm_rfc4115_config;
>> -	rte_meter_trtcm_rfc4115_profile_config;
>> -
>> -} DPDK_20.0;
>> -
>>  EXPERIMENTAL {
>> -       global:
>> +	global:
>>  
>>  	rte_meter_trtcm_rfc4115_config;
>>  	rte_meter_trtcm_rfc4115_profile_config;
>> diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/rte_metrics_version.map
>> index c88939b117..20f99cd19a 100644
>> --- a/lib/librte_metrics/rte_metrics_version.map
>> +++ b/lib/librte_metrics/rte_metrics_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_metrics_get_names;
>> diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map
>> index 8a4e75a3a0..621f237945 100644
>> --- a/lib/librte_net/rte_net_version.map
>> +++ b/lib/librte_net/rte_net_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_eth_random_addr;
>> diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/rte_pci_version.map
>> index 67eb845796..cd77c9dc9e 100644
>> --- a/lib/librte_pci/rte_pci_version.map
>> +++ b/lib/librte_pci/rte_pci_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	pci_map_resource;
>> diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/rte_pdump_version.map
>> index 6d02ccce6d..2f9e952d0b 100644
>> --- a/lib/librte_pdump/rte_pdump_version.map
>> +++ b/lib/librte_pdump/rte_pdump_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pdump_disable;
>> diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/rte_pipeline_version.map
>> index 64d38afecd..9ed80eb041 100644
>> --- a/lib/librte_pipeline/rte_pipeline_version.map
>> +++ b/lib/librte_pipeline/rte_pipeline_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_pipeline_ah_packet_drop;
>> diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/rte_port_version.map
>> index 18c6154672..bd1fbb66b0 100644
>> --- a/lib/librte_port/rte_port_version.map
>> +++ b/lib/librte_port/rte_port_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_port_ethdev_reader_ops;
>> diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map
>> index 00ee5753e2..69ca9af616 100644
>> --- a/lib/librte_power/rte_power_version.map
>> +++ b/lib/librte_power/rte_power_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_power_exit;
>> diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
>> index 63b54f598b..eb29a3ac0d 100644
>> --- a/lib/librte_rawdev/rte_rawdev_version.map
>> +++ b/lib/librte_rawdev/rte_rawdev_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_rawdev_close;
>> diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/rte_reorder_version.map
>> index cf444062df..8c0220d324 100644
>> --- a/lib/librte_reorder/rte_reorder_version.map
>> +++ b/lib/librte_reorder/rte_reorder_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_reorder_create;
>> diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map
>> index ac392f3ca9..e35d6b9712 100644
>> --- a/lib/librte_ring/rte_ring_version.map
>> +++ b/lib/librte_ring/rte_ring_version.map
>> @@ -1,21 +1,16 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_ring_create;
>> +	rte_ring_create_elem;
>>  	rte_ring_dump;
>>  	rte_ring_free;
>>  	rte_ring_get_memsize;
>> +	rte_ring_get_memsize_elem;
>>  	rte_ring_init;
>>  	rte_ring_list_dump;
>>  	rte_ring_lookup;
>> +	rte_ring_reset;
>>  
>>  	local: *;
>>  };
>> -
>> -DPDK_21 {
>> -	global:
>> -
>> -	rte_ring_create_elem;
>> -	rte_ring_get_memsize_elem;
>> -	rte_ring_reset;
>> -} DPDK_20.0;
>> diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/rte_sched_version.map
>> index cefd990367..3faef6f0a0 100644
>> --- a/lib/librte_sched/rte_sched_version.map
>> +++ b/lib/librte_sched/rte_sched_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_approx;
>> diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/rte_security_version.map
>> index b07314bbf4..d84eec0a88 100644
>> --- a/lib/librte_security/rte_security_version.map
>> +++ b/lib/librte_security/rte_security_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_security_attach_session;
>> diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/rte_table_version.map
>> index 40f72b1fe8..568a6c6a8f 100644
>> --- a/lib/librte_table/rte_table_version.map
>> +++ b/lib/librte_table/rte_table_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_table_acl_ops;
>> diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/rte_timer_version.map
>> index 4471cef92b..21e68ea7a2 100644
>> --- a/lib/librte_timer/rte_timer_version.map
>> +++ b/lib/librte_timer/rte_timer_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_timer_dump_stats;
>> diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map
>> index 13ec53b638..20b4abcb4e 100644
>> --- a/lib/librte_vhost/rte_vhost_version.map
>> +++ b/lib/librte_vhost/rte_vhost_version.map
>> @@ -1,4 +1,4 @@
>> -DPDK_20.0 {
>> +DPDK_21 {
>>  	global:
>>  
>>  	rte_vhost_avail_entries;
>>

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0
  2020-08-12  8:58   ` Kinsella, Ray
@ 2020-08-12  9:33     ` Thomas Monjalon
  0 siblings, 0 replies; 15+ messages in thread
From: Thomas Monjalon @ 2020-08-12  9:33 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, nhorman, kevin.laatz, bruce.richardson, Kinsella, Ray

12/08/2020 10:58, Kinsella, Ray:
> On 11/08/2020 15:03, Thomas Monjalon wrote:
> > Start a new release cycle with empty release notes.
> > 
> > The ABI version becomes 21.0.
> > The ABI major is back to normal, having only one number (21 vs 20.0).
> > The map files are updated to the new ABI major number (21).
> > The ABI exceptions are dropped.
> > Travis ABI check is disabled because compatibility is not preserved.
> > 
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > ---
> > v5: drop all ABI exceptions
> > v4: add -rc0 and remove temporary ABI exceptions
> > v3: add minor number to ABI_VERSION and remove workaround in scripts
> > v2: bump major ABI number (including .map changes)
> > ---
> >  .travis.yml                                   |  26 ----
> >  ABI_VERSION                                   |   2 +-
> >  VERSION                                       |   2 +-
> >  config/meson.build                            |   5 +-
> >  devtools/libabigail.abignore                  | 103 -------------
> >  doc/guides/rel_notes/index.rst                |   1 +
> >  doc/guides/rel_notes/release_20_11.rst        | 136 ++++++++++++++++++
> >  .../rte_pmd_bbdev_fpga_5gnr_fec_version.map   |   2 +-
> [SNIP]
> 
> Acked-by: Ray Kinsella <mdr@ashroe.eu>

Series applied.



^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2020-08-12  9:33 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-10 15:15 [dpdk-dev] [PATCH] version: 20.11-rc0 Thomas Monjalon
2020-08-11  9:31 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2020-08-11  9:58 ` [dpdk-dev] [PATCH v3 1/2] " Thomas Monjalon
2020-08-11  9:58   ` [dpdk-dev] [PATCH v3 2/2] devtools: fix ABI update in map files Thomas Monjalon
2020-08-11 11:27 ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Thomas Monjalon
2020-08-11 11:27   ` [dpdk-dev] [PATCH v4 2/2] devtools: fix ABI update in map files Thomas Monjalon
2020-08-11 13:47   ` [dpdk-dev] [PATCH v4 1/2] version: 20.11-rc0 Kinsella, Ray
2020-08-11 14:05     ` Thomas Monjalon
2020-08-11 14:03 ` [dpdk-dev] [PATCH v5 " Thomas Monjalon
2020-08-11 14:03   ` [dpdk-dev] [PATCH v5 2/2] devtools: fix ABI update in map files Thomas Monjalon
2020-08-12  6:57     ` Kinsella, Ray
2020-08-11 16:18   ` [dpdk-dev] [PATCH v5 1/2] version: 20.11-rc0 Kinsella, Ray
2020-08-12  9:02     ` Kinsella, Ray
2020-08-12  8:58   ` Kinsella, Ray
2020-08-12  9:33     ` Thomas Monjalon

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git