Drop fix-power-default-config.patch, merged upstream

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

diff --git a/debian/patches/fix-power-default-config.patch b/debian/patches/fix-power-default-config.patch
deleted file mode 100644 (file)
index d306fc5..0000000
--- a/debian/patches/fix-power-default-config.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: config: fix power8 default conf
-
-Latest dpdk FTBFS for power8 default config.
-This (re-)enables a config symbol as recommended by IBM
-(gowrishankar.m@in.ibm.com)
-
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-
-Origin: No, will be pushed by IBM
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2016-09-02
---- a/config/defconfig_ppc_64-power8-linuxapp-gcc
-+++ b/config/defconfig_ppc_64-power8-linuxapp-gcc
-@@ -51,7 +51,6 @@
- CONFIG_RTE_LIBRTE_IXGBE_PMD=n
- CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
- CONFIG_RTE_LIBRTE_VMXNET3_PMD=n
--CONFIG_RTE_LIBRTE_PMD_BOND=n
- CONFIG_RTE_LIBRTE_ENIC_PMD=n
- CONFIG_RTE_LIBRTE_FM10K_PMD=n
- CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n

diff --git a/debian/patches/series b/debian/patches/series
index c2b79f0..2b80696 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix-vhost-user-socket-permission.patch
-fix-power-default-config.patch
 mk-use-make-silent-flag-to-print-HTML-doc-version.patch
 mk-fix-excluding-.doctrees-when-installing-docs.patch
 mk-sort-list-of-shared-objects-in-linker-script.patch