Upstream includes this in rdma-core v25.

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e67bd176c3d..d3a663f17ed9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,6 +12,7 @@ pkgbase = infiniband-diags
 	depends = perl
 	provides = libibmad
 	conflicts = libibmad
+	conflicts = rdma-core
 	replaces = libibmad
 	source = infiniband-diags-2.2.0.tar.gz::https://github.com/linux-rdma/infiniband-diags/archive/2.2.0.tar.gz
 	sha256sums = 8f3bae228a53e0f69a242f8d315230dd1e7d7ee8a1bf14ebde80603173a43ff3
diff --git a/PKGBUILD b/PKGBUILD
index 129621729962..358c24740406 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86_64' 'i686')
 url='https://www.openfabrics.org/index.php/overview.html'
 license=('GPL2' 'custom:"OpenIB.org BSD"')
 provides=('libibmad')
-conflicts=('libibmad')
+conflicts=('libibmad' 'rdma-core')
 replaces=('libibmad')
 depends=('opensm' 'perl')
 makedepends=('python-docutils')