From patchwork Mon Jul 24 20:00:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 9860213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 14CBE60349 for ; Mon, 24 Jul 2017 20:00:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0855E2859E for ; Mon, 24 Jul 2017 20:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1416285A2; Mon, 24 Jul 2017 20:00:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75A0B2859E for ; Mon, 24 Jul 2017 20:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbdGXUAs (ORCPT ); Mon, 24 Jul 2017 16:00:48 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:34037 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752005AbdGXUAl (ORCPT ); Mon, 24 Jul 2017 16:00:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=obsidianresearch.com; s=rsa1; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=43NZ6mAsRQo2pyaNCQYy5zJsRHHBpgUbpSZc55Dqv7Q=; b=gBPA+RsptFTkUHAEUNMe8PkcJgbCPCgkUn6LVRnqlw4r4EaEkGpdY5fdKUQBUMLt39oqVW2h/bsviY94m7fjiNJQlD2pRBj+rHQmqC45IbuFQcbU1grvJ5y53NZQX9vpKu+U1f5w/gO2EEgSQL5TIZ//VufRB7C+vNuNeAbXwtc=; Received: from [10.0.0.156] (helo=jggl.edm.orcorp.ca) by quartz.orcorp.ca with esmtps (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1dZjWx-0001rL-0C; Mon, 24 Jul 2017 14:00:39 -0600 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org, Leon Romanovsky , Doug Ledford , Benjamin Drung , Jarod Wilson Subject: [PATCH rdma-core 08/21] redhat: Fix duplicated udev rules in redhat packaging Date: Mon, 24 Jul 2017 14:00:16 -0600 Message-Id: <1500926429-31822-9-git-send-email-jgunthorpe@obsidianresearch.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500926429-31822-1-git-send-email-jgunthorpe@obsidianresearch.com> References: <1500926429-31822-1-git-send-email-jgunthorpe@obsidianresearch.com> X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.156 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP /usr/lib/udev/rules.d/libibumad.rules was claimed by rdma-core and libibumad.rpm /usr/lib/udev/rules.d/srp_daemon.rules was claimed by rdma-core and srp_daemon.rpm Fixes: 5a6f287a3cd ("libibumad: Introduce the /dev/infiniband/umad/${ibdev}:${port}.device alias") Fixes: d35e5c4f716 ("srp_daemon.service: Add support for hot-plugging") Signed-off-by: Jason Gunthorpe --- redhat/rdma-core.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index 6dbba733fe3236..f6cf1027e404e4 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -329,7 +329,8 @@ rm -rf %{buildroot}/%{_initrddir}/ %{_unitdir}/rdma.service %dir %{dracutlibdir}/modules.d/05rdma %{dracutlibdir}/modules.d/05rdma/module-setup.sh -%{_udevrulesdir}/* +%{_udevrulesdir}/98-rdma.rules +%{_udevrulesdir}/rdma-ndd.rules %{sysmodprobedir}/libmlx4.conf %{sysmodprobedir}/cxgb3.conf %{sysmodprobedir}/cxgb4.conf