Merge branch '16.11.x' into 17.05.x

Conflicts:
	app/test-pmd/parameters.c
	app/test-pmd/testpmd.c
	debian/changelog
	debian/control
	debian/patches/fix-vhost-user-socket-permission.patch
	debian/rules
	doc/guides/cryptodevs/qat.rst
	doc/guides/nics/thunderx.rst
	doc/guides/rel_notes/release_16_11.rst
	drivers/net/i40e/i40e_rxtx_vec_neon.c
	drivers/net/ixgbe/ixgbe_rxtx.c
	drivers/net/mlx5/mlx5_rxtx.c
	drivers/net/nfp/nfp_net.c
	drivers/net/qede/qede_ethdev.c
	drivers/net/thunderx/nicvf_struct.h
	drivers/net/virtio/virtio_ethdev.c
	drivers/net/virtio/virtio_pci.c
	drivers/net/virtio/virtio_pci.h
	drivers/net/virtio/virtio_user/virtio_user_dev.c
	drivers/net/virtio/virtio_user/virtio_user_dev.h
	drivers/net/virtio/virtio_user_ethdev.c
	examples/dpdk_qat/main.c
	examples/performance-thread/l3fwd-thread/main.c
	examples/quota_watermark/qw/init.c
	lib/librte_eal/bsdapp/eal/eal_pci.c
	lib/librte_eal/common/include/rte_version.h
	lib/librte_vhost/socket.c
	lib/librte_vhost/vhost.c
	lib/librte_vhost/vhost.h
	pkg/dpdk.spec
	test/test/test_mempool.c

Change-Id: I04809b1bcf4ecee4c171c5acb60a8a8aac8cc4a8
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

diff --cc debian/changelog
index 2551944,31b8289..0500e8a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,37 +1,57 @@@
 +dpdk (17.05-1~git1) UNRELEASED; urgency=medium
 +
 +  * New Upstream release 17.05; For a full list of changes (LP: #1691661)
 +    see http://dpdk.org/doc/guides/rel_notes/release_17_05.html
 +    - adapt to use MAJOR_ABI configuration to avoid the sub-lib abi
 +      version breakage of the past.
 +    - add d/update-helper* to update d/control and d/*.symbols for new versions
 +    - adapt to new build trigger and location of tests; provide further
 +      test tools (testacl, testpipeline) together with the already
 +      provided "test" tool in /usr/share/dpdk/test/ of dpdk-dev.
 +      Note: testpmd is installed "officially" by install-sdk and therefore
 +      stays separate from other test tools.
 +    - updated library arch availability/dependency: librte-kni is
 +      available on ppc64el; librte-pmd-i40e on all arches;
 +      librte-pmd-fm10k gone on ppc64el
 +    - package the 19 new sub-libs / pmds that are now built by default
 +    - rename and update symbols files to match the update to DPDK 17.05
 +
 + -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 16 May 2017 15:38:17 +0200
 +
+ dpdk (16.11.2-1~git1) UNRELEASED; urgency=medium
+ 
+   [ Christian Ehrhardt ]
+   * Merge stable update to 16.11.2; For a list of changes
+     see http://dpdk.org/ml/archives/announce/2017-May/000131.html
+   * Dropped changes - patches that were included in 16.11.2 stable:
+     - d/p/kni-fix-build-with-kernel-4.11.patch
+     - d/p/nicvf-0002-net-thunderx-fix-32-bit-build.patch
+     - d/p/nicvf-0006-mk-fix-lib-filtering-when-linking-app.patch
+     - d/p/nicvf-0008-net-thunderx-fix-stats-access-out-of-bounds.patch
+     - d/p/nicvf-0010-net-thunderx-fix-deadlock-in-Rx-path.patch
+ 
+   [ Luca Boccassi ]
+   * Optionally generate libdpdk-dbgsym metapackage that depends on every
+     librte/PMD binary package's dbgsym. Keep it disabled by default, and
+     let users choose to enable it by passing dbgsym_meta via DEB_BUILD_OPTIONS.
+     Thanks Jan Blunck for the patch!
+   * Generate dependency list of libdpdk-dev to all librte and PMDs packages
+     dynamically at build time.
+   * Generate list of recommends for dpdk dynamically at build time.
+   * dpdk-modules-$KVERS: depend on same kernel version used to build rather than
+     just recommend - in-kernel API/ABI is not stable.
+   * Support for building packages for the new mempool framework has been added.
+     In 17.05 and newer a mempool framework was added, that has to be loaded
+     like a PMD. So any "plugin" will be linked in RTE_EAL_PMD_PATH just like
+     the PMDs. No mempool plugins are built for now, so it is currently a no-op.
+   * Drop libethdev4, librte-cryptodev1 and librte-eal2 transitional packages,
+     no longer needed.
+   * Fix some upstream documentation links in the packages metadata.
+     Thanks Chas Williams!
+   * Fix building debugging symbols for -dbgsym packages. Thanks Chas Williams!
+ 
+  -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Thu, 08 Jun 2017 10:05:44 -0600
+ 
  dpdk (16.11.1-1~git1) UNRELEASED; urgency=medium
  
    [ Christian Ehrhardt ]

diff --cc debian/control
index 2a8c437,8963f09..81a8fcc
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -224,10 -128,10 +128,10 @@@ Description: Data Plane Development Ki
   .
   This package contains the runtime libraries for libethdev.
  
 -Package: librte-acl2
 +Package: librte-acl17.05
  Architecture: amd64 arm64 i386 ppc64el
  Multi-Arch: same
- Homepage: http://dpdk.org/doc/api/rte__ethdev_8h.html
+ Homepage: http://dpdk.org/doc/api/rte__acl_8h.html
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Conflicts: libdpdk0
@@@ -789,10 -695,10 +693,10 @@@ Description: Data Plane Development Ki
   .
   This package contains the runtime libraries for librte_timer.
  
 -Package: librte-vhost3
 +Package: librte-vhost17.05
  Architecture: amd64 arm64 i386 ppc64el
  Multi-Arch: same
- Homepage: http://dpdk.org/doc/api/rte__virtio__net_8h.html
+ Homepage: http://dpdk.org/doc/api/rte__vhost_8h.html
  Pre-Depends: ${misc:Pre-Depends}
  Depends: ${misc:Depends}, ${shlibs:Depends}
  Conflicts: libdpdk0

diff --cc debian/rules
index 04a9d02,9d2d3b9..4d17188
mode 100644,100755..100644
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -146,7 -176,6 +176,7 @@@ endi
  ifeq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
        sed -ri -e 's,(RTE_MACHINE=).*,\1$(RTE_MACHINE),' \
                -e 's,(RTE_NEXT_ABI=).*,\1n,' \
-               -e 's,(CONFIG_RTE_MAJOR_ABI=).*,\1$(ABIVERSION),' \
++              -e 's,(CONFIG_RTE_MAJOR_ABI=).*,\1$(DPDK_ABI),' \
                -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
                -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
                -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \