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>

1 files changed, 6 insertions, 101 deletions

diff --git a/debian/control b/debian/control
index 2a8c4373..81a8fcc4 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9),
                python-sphinx-rtd-theme,
                texlive-fonts-recommended,
                texlive-latex-extra
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Section: libs
 Homepage: http://www.dpdk.org
 Vcs-Git: https://gerrit.fd.io/r/deb_dpdk
@@ -35,39 +35,7 @@ Depends: hwdata,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Recommends: dpdk-igb-uio-dkms (= ${binary:Version}) [arm64],
-            dpdk-rte-kni-dkms (= ${binary:Version}) [arm64],
-            librte-pmd-af-packet17.05 (= ${binary:Version}),
-            librte-pmd-ark17.05 (= ${binary:Version}),
-            librte-pmd-avp17.05 (= ${binary:Version}) [amd64],
-            librte-pmd-bnxt17.05 (= ${binary:Version}),
-            librte-pmd-bond17.05 (= ${binary:Version}),
-            librte-pmd-crypto-scheduler17.05 (= ${binary:Version}),
-            librte-pmd-cxgbe17.05 (= ${binary:Version}),
-            librte-pmd-e1000-17.05 (= ${binary:Version}),
-            librte-pmd-ena17.05 (= ${binary:Version}),
-            librte-pmd-enic17.05 (= ${binary:Version}) [amd64 arm64 i386],
-            librte-pmd-fm10k17.05 (= ${binary:Version}) [amd64 i386],
-            librte-pmd-i40e17.05 (= ${binary:Version}),
-            librte-pmd-ixgbe17.05 (= ${binary:Version}) [amd64 arm64 i386],
-            librte-pmd-kni17.05 (= ${binary:Version}) [amd64 arm64 ppc64el],
-            librte-pmd-lio17.05 (= ${binary:Version}),
-            librte-pmd-nfp17.05 (= ${binary:Version}),
-            librte-pmd-null-crypto17.05 (= ${binary:Version}),
-            librte-pmd-null17.05 (= ${binary:Version}),
-            librte-pmd-octeontx-ssovf17.05 (= ${binary:Version}),
-            librte-pmd-pcap17.05 (= ${binary:Version}),
-            librte-pmd-qede17.05 (= ${binary:Version}),
-            librte-pmd-ring17.05 (= ${binary:Version}),
-            librte-pmd-sfc-efx17.05 (= ${binary:Version}) [amd64],
-            librte-pmd-skeleton-event17.05 (= ${binary:Version}),
-            librte-pmd-sw-event17.05 (= ${binary:Version}),
-            librte-pmd-tap17.05 (= ${binary:Version}),
-            librte-pmd-thunderx-nicvf17.05 (= ${binary:Version}),
-            librte-pmd-vhost17.05 (= ${binary:Version}),
-            librte-pmd-virtio17.05 (= ${binary:Version}),
-            librte-pmd-vmxnet3-uio17.05 (= ${binary:Version}) [amd64 arm64 i386],
-            librte-pmd-xenvirt17.05 (= ${binary:Version}) [amd64 arm64 i386]
+Recommends: ${librte:Recommends},
 Suggests: dpdk-doc,
           dpdk-igb-uio-dkms (= ${binary:Version}),
           dpdk-rte-kni-dkms (= ${binary:Version}),
@@ -137,71 +105,7 @@ Architecture: amd64 arm64 i386 ppc64el
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libpcap-dev,
-         librte-acl17.05 (= ${binary:Version}),
-         librte-bitratestats17.05 (= ${binary:Version}),
-         librte-cfgfile17.05 (= ${binary:Version}),
-         librte-cmdline17.05 (= ${binary:Version}),
-         librte-cryptodev17.05 (= ${binary:Version}),
-         librte-distributor17.05 (= ${binary:Version}),
-         librte-eal17.05 (= ${binary:Version}),
-         librte-efd17.05 (= ${binary:Version}),
-         librte-ethdev17.05 (= ${binary:Version}),
-         librte-eventdev17.05 (= ${binary:Version}),
-         librte-hash17.05 (= ${binary:Version}),
-         librte-ip-frag17.05 (= ${binary:Version}),
-         librte-jobstats17.05 (= ${binary:Version}),
-         librte-kni17.05 (= ${binary:Version}) [amd64 arm64 ppc64el],
-         librte-kvargs17.05 (= ${binary:Version}),
-         librte-latencystats17.05 (= ${binary:Version}),
-         librte-lpm17.05 (= ${binary:Version}),
-         librte-mbuf17.05 (= ${binary:Version}),
-         librte-mempool-ring17.05 (= ${binary:Version}),
-         librte-mempool17.05 (= ${binary:Version}),
-         librte-mempool-stack17.05 (= ${binary:Version}),
-         librte-meter17.05 (= ${binary:Version}),
-         librte-metrics17.05 (= ${binary:Version}),
-         librte-net17.05 (= ${binary:Version}),
-         librte-pdump17.05 (= ${binary:Version}),
-         librte-pipeline17.05 (= ${binary:Version}),
-         librte-pmd-af-packet17.05 (= ${binary:Version}),
-         librte-pmd-ark17.05 (= ${binary:Version}),
-         librte-pmd-avp17.05 (= ${binary:Version}) [amd64],
-         librte-pmd-bnxt17.05 (= ${binary:Version}),
-         librte-pmd-bond17.05 (= ${binary:Version}),
-         librte-pmd-crypto-scheduler17.05 (= ${binary:Version}),
-         librte-pmd-cxgbe17.05 (= ${binary:Version}),
-         librte-pmd-e1000-17.05 (= ${binary:Version}),
-         librte-pmd-ena17.05 (= ${binary:Version}),
-         librte-pmd-enic17.05 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-pmd-fm10k17.05 (= ${binary:Version}) [amd64 i386],
-         librte-pmd-i40e17.05 (= ${binary:Version}),
-         librte-pmd-ixgbe17.05 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-pmd-kni17.05 (= ${binary:Version}) [amd64 arm64 ppc64el],
-         librte-pmd-lio17.05 (= ${binary:Version}),
-         librte-pmd-nfp17.05 (= ${binary:Version}),
-         librte-pmd-null-crypto17.05 (= ${binary:Version}),
-         librte-pmd-null17.05 (= ${binary:Version}),
-         librte-pmd-octeontx-ssovf17.05 (= ${binary:Version}),
-         librte-pmd-pcap17.05 (= ${binary:Version}),
-         librte-pmd-qede17.05 (= ${binary:Version}),
-         librte-pmd-ring17.05 (= ${binary:Version}),
-         librte-pmd-sfc-efx17.05 (= ${binary:Version}) [amd64],
-         librte-pmd-skeleton-event17.05 (= ${binary:Version}),
-         librte-pmd-sw-event17.05 (= ${binary:Version}),
-         librte-pmd-tap17.05 (= ${binary:Version}),
-         librte-pmd-thunderx-nicvf17.05 (= ${binary:Version}),
-         librte-pmd-vhost17.05 (= ${binary:Version}),
-         librte-pmd-virtio17.05 (= ${binary:Version}),
-         librte-pmd-vmxnet3-uio17.05 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-pmd-xenvirt17.05 (= ${binary:Version}) [amd64 arm64 i386],
-         librte-port17.05 (= ${binary:Version}),
-         librte-power17.05 (= ${binary:Version}),
-         librte-reorder17.05 (= ${binary:Version}),
-         librte-ring17.05 (= ${binary:Version}),
-         librte-sched17.05 (= ${binary:Version}),
-         librte-table17.05 (= ${binary:Version}),
-         librte-timer17.05 (= ${binary:Version}),
-         librte-vhost17.05 (= ${binary:Version}),
+         ${librte:Depends},
          ${misc:Depends}
 Description: Data Plane Development Kit (basic development files)
  DPDK is a set of libraries for fast packet processing. Applications run
@@ -227,7 +131,7 @@ Description: Data Plane Development Kit (libethdev runtime library)
 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
@@ -792,7 +696,7 @@ Description: Data Plane Development Kit (librte_timer runtime library)
 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
@@ -1041,3 +945,4 @@ Description: Data Plane Development Kit (librte_pmd_thunderx_nicvf runtime libra
  in user-space and communicate directly with dedicated network interfaces.
  .
  This package contains the runtime libraries for librte_pmd_thunderx_nicvf.
+