From owner-svn-src-head@freebsd.org  Mon Nov 23 19:44:40 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3845A36B78;
 Mon, 23 Nov 2015 19:44:40 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A01D515B8;
 Mon, 23 Nov 2015 19:44:40 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tANJidR4094321;
 Mon, 23 Nov 2015 19:44:39 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANJidZk094320;
 Mon, 23 Nov 2015 19:44:39 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511231944.tANJidZk094320@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 23 Nov 2015 19:44:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291220 - head/share/man/man4
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2015 19:44:40 -0000

Author: ngie
Date: Mon Nov 23 19:44:39 2015
New Revision: 291220
URL: https://svnweb.freebsd.org/changeset/base/291220

Log:
  Revert r291170
  
  The mlx5* driver(s) are built [*]/installed separate from the OFED stack thanks
  to recent refactoring done in the linuxkpi(4) module.
  
  Always install the manpages instead of conditionally installing them if
  MK_OFED != no
  
  * Further refactoring of sys/ofed and linuxkpi(4) is pending to fully divorce
    mlx5* from ofed headers
  
  MFC after: never
  Requested by: hps

Modified:
  head/share/man/man4/Makefile

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Mon Nov 23 18:58:00 2015	(r291219)
+++ head/share/man/man4/Makefile	Mon Nov 23 19:44:39 2015	(r291220)
@@ -274,6 +274,7 @@ MAN=	aac.4 \
 	mk48txx.4 \
 	mld.4 \
 	mlx.4 \
+	mlx5en.4 \
 	mly.4 \
 	mmc.4 \
 	mmcsd.4 \
@@ -652,6 +653,7 @@ MLINKS+=lp.4 plip.4
 MLINKS+=malo.4 if_malo.4
 MLINKS+=md.4 vn.4
 MLINKS+=mem.4 kmem.4
+MLINKS+=mlx5en.4 mce.4
 MLINKS+=mn.4 if_mn.4
 MLINKS+=mos.4 if_mos.4
 MLINKS+=msk.4 if_msk.4
@@ -851,12 +853,6 @@ MAN+=		iscsi_initiator.4
 
 .endif
 
-.if ${MK_OFED} != "no"
-MAN+=		mlx5en.4
-
-MLINKS+=mlx5en.4 mce.4
-.endif
-
 .if ${MK_TESTS} != "no"
 ATF=            ${.CURDIR}/../../../contrib/atf
 .PATH:          ${ATF}/doc