diff --git a/_service b/_service
index 15019f3..056f161 100644
--- a/_service
+++ b/_service
@@ -8,7 +8,7 @@
@PARENT_TAG@.@TAG_OFFSET@.%h
v(.*)
\1
- 1f4780139d626c9d5cdd8386edf76a1c0043741e
+ 222fa83a789cd24a1e0900389587d47812fba086
suse/rdma-core.spec
diff --git a/prebuild-pandoc.sh b/prebuild-pandoc.sh
index 98e6b23..6e787c0 100644
--- a/prebuild-pandoc.sh
+++ b/prebuild-pandoc.sh
@@ -1,6 +1,6 @@
#!/bin/bash
TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: | awk '{ print $NF}')
-OUTDIR=$(tar tf rdma-core-18.1.0.1f4780139d62.tar.gz | head -n 1)
+OUTDIR=$(tar tf $TARBALL | head -n 1)
rm -Rf $OUTDIR
tar xf $TARBALL
diff --git a/prebuilt-pandoc.tgz b/prebuilt-pandoc.tgz
index 1a2a8e7..7e97d97 100644
--- a/prebuilt-pandoc.tgz
+++ b/prebuilt-pandoc.tgz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bb73f2fca391590206191cd3e22c42b0cb55843c5a11f3c7f20b165e4b90c44b
-size 11399
+oid sha256:fd18e775f46c48e30c534d27b59471ea8073f86a510a2638dad6fff554c5c5be
+size 16111
diff --git a/rdma-core-18.1.0.1f4780139d62.tar.gz b/rdma-core-18.1.0.1f4780139d62.tar.gz
deleted file mode 100644
index aee4193..0000000
--- a/rdma-core-18.1.0.1f4780139d62.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28e196e8ef6675e0533b7e6be8bf8c5e2b558894f59d9cca4f3d2755cc415fb4
-size 1107295
diff --git a/rdma-core-20.1.0.222fa83a789c.tar.gz b/rdma-core-20.1.0.222fa83a789c.tar.gz
new file mode 100644
index 0000000..ac78afa
--- /dev/null
+++ b/rdma-core-20.1.0.222fa83a789c.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92c5ae0e278c8ece176f7b38ba28eb3aa297e8e5d29fcbace914338ea7e164cb
+size 1121999
diff --git a/rdma-core.changes b/rdma-core.changes
index a51c9e1..716139f 100644
--- a/rdma-core.changes
+++ b/rdma-core.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct 15 08:15:29 UTC 2018 - nmoreychaisemartin@suse.com
+
+- Update to rdma-core v20.1 (fate#325887, fate#325919, fate#326000)
+ * No release notes available
+- Drop patches merged upstream:
+ * suse-Add-recommends-for-rxe_cfg-requirements.patch
+ adds recommends for the relevant packages
+ * rxe-switch-to-iproute2-for-rxe_cfg.patch
+ switches to iproute2 commands
+
-------------------------------------------------------------------
Thu Aug 2 09:25:16 UTC 2018 - nmoreychaisemartin@suse.com
diff --git a/rdma-core.spec b/rdma-core.spec
index 65cc51c..77bdfab 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -17,9 +17,9 @@
%bcond_without systemd
-%define git_ver .0.1f4780139d62
+%define git_ver .0.222fa83a789c
Name: rdma-core
-Version: 18.1
+Version: 20.1
Release: 0
Summary: RDMA core userspace libraries and daemons
License: GPL-2.0-only OR BSD-2-Clause
@@ -50,8 +50,6 @@ Source: rdma-core-%{version}%{git_ver}.tar.gz
Source1: baselibs.conf
Source2: prebuild-pandoc.sh
Source3: prebuilt-pandoc.tgz
-Patch0: rxe-switch-to-iproute2-for-rxe_cfg.patch
-Patch1: suse-Add-recommends-for-rxe_cfg-requirements.patch
BuildRequires: binutils
BuildRequires: cmake >= 2.8.11
BuildRequires: gcc
@@ -169,6 +167,9 @@ Obsoletes: librxe-rdmav2 < %{version}-%{release}
Requires: %{mlx4_lname} = %{version}-%{release}
Requires: %{mlx5_lname} = %{version}-%{release}
%endif
+# Recommended packages for rxe_cfg
+Recommends: ethtool
+Recommends: iproute2
%description -n libibverbs
libibverbs is a library that allows userspace processes to use RDMA
@@ -317,8 +318,6 @@ on those changes.
%prep
%setup -q -n %{name}-%{version}%{git_ver}
-%patch0
-%patch1
#Extract prebuilt pandoc file in the buildlib directory
(cd buildlib && tar xf %{S:3})
@@ -531,6 +530,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
%{_includedir}/infiniband/*
%{_includedir}/rdma/*
%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*.pc
%{_mandir}/man3/ibv_*
%{_mandir}/man3/rdma*
%{_mandir}/man3/umad*
diff --git a/rxe-switch-to-iproute2-for-rxe_cfg.patch b/rxe-switch-to-iproute2-for-rxe_cfg.patch
deleted file mode 100644
index a2d2f25..0000000
--- a/rxe-switch-to-iproute2-for-rxe_cfg.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 310719781cf21b656f2bda440b85634c91093f17
-Author: Nicolas Morey-Chaisemartin
-Date: Wed Aug 1 14:59:43 2018 +0200
-
- rxe: switch to iproute2 for rxe_cfg
-
- ifconfig is now deprecated in most distro in favour on iproute2.
- Drop ifconfig support and use iproute2
-
- Signed-off-by: Nicolas Morey-Chaisemartin
-
-diff --git debian/control debian/control
-index 340e8ec96291..2e1c4b835c98 100644
---- debian/control
-+++ debian/control
-@@ -29,7 +29,7 @@ Depends: lsb-base (>= 3.2-14~),
- ${misc:Depends},
- ${perl:Depends},
- ${shlibs:Depends}
--Recommends: dmidecode, ethtool, net-tools
-+Recommends: dmidecode, ethtool, iproute2
- Breaks: infiniband-diags (<< 2.0.0)
- Replaces: infiniband-diags (<< 2.0.0)
- Description: RDMA core userspace infrastructure and documentation
-diff --git providers/rxe/rxe_cfg.in providers/rxe/rxe_cfg.in
-index 0a8583da1860..e3956d82b450 100755
---- providers/rxe/rxe_cfg.in
-+++ providers/rxe/rxe_cfg.in
-@@ -189,22 +189,22 @@ sub get_dev_info {
- $ipv4_addr{$eth} = " ";
- $eth_mtu{$eth} = "";
-
-- @lines = `ifconfig $eth`;
-+ @lines = `ip addr show $eth`;
- foreach $line (@lines) {
-- # get IP address
-- if ($line =~ /inet addr/) {
-- $line =~ s/^\s+inet addr://g;
-- @fields = split(/\s+/, $line);
-- $ipv4_addr{$eth} = $fields[0];
-- }
-+ # get IP address
-+ if ($line =~ /inet /) {
-+ $line =~ s/^\s+inet ([0-9.]+)\//$1 /g;
-+ @fields = split(/\s+/, $line);
-+ $ipv4_addr{$eth} = $fields[0];
-+ }
-
-- # get ethernet mtu
-- if ($line =~ /MTU:/) {
-- $line =~ s/^.*MTU://g;
-- @fields = split(/\s+/, $line);
-- $eth_mtu{$eth} = $fields[0];
-- }
-- }
-+ # get ethernet mtu
-+ if ($line =~ /mtu /) {
-+ $line =~ s/^.*mtu //g;
-+ @fields = split(/\s+/, $line);
-+ $eth_mtu{$eth} = $fields[0];
-+ }
-+ }
- }
-
- # get rxe mtu
-@@ -525,8 +525,8 @@ sub do_start {
- foreach my $rxe (@rxe_array) {
- my $stat = get_devinfo($rxe);
- if ($stat =~ "PORT_DOWN") {
-- my $cmd = "ifconfig $eth_names{$rxe} up";
-- system($cmd);
-+ my $cmd = "ip link set $eth_names{$rxe} up";
-+ system($cmd);
- }
- }
-
diff --git a/suse-Add-recommends-for-rxe_cfg-requirements.patch b/suse-Add-recommends-for-rxe_cfg-requirements.patch
deleted file mode 100644
index f25661a..0000000
--- a/suse-Add-recommends-for-rxe_cfg-requirements.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit b48bd3c32dceed87981acf27057b62658b3c5f4c
-Author: Nicolas Morey-Chaisemartin
-Date: Wed Aug 1 15:32:54 2018 +0200
-
- suse: Add recommends for rxe_cfg requirements
-
- rxe_cfg requires ethtool and iproute2 or net-tools.
- net-tools (more precisely ifconfig) being deprecated on all recent SUSE version,
- recommends iproute2
-
- Signed-off-by: Nicolas Morey-Chaisemartin
-
-diff --git suse/rdma-core.spec suse/rdma-core.spec
-index 1df500af58ce..2743596aa6cf 100644
---- suse/rdma-core.spec
-+++ suse/rdma-core.spec
-@@ -166,6 +166,9 @@ Obsoletes: librxe-rdmav2 < %{version}-%{release}
- Requires: %{mlx4_lname} = %{version}-%{release}
- Requires: %{mlx5_lname} = %{version}-%{release}
- %endif
-+# Recommended packages for rxe_cfg
-+Recommends: ethtool
-+Recommends: iproute2
-
- %description -n libibverbs
- libibverbs is a library that allows userspace processes to use RDMA