From owner-svn-src-stable-10@FreeBSD.ORG  Mon Jan 19 07:29:29 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A81F5150;
 Mon, 19 Jan 2015 07:29:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 930FDFE4;
 Mon, 19 Jan 2015 07:29:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0J7TTU5050721;
 Mon, 19 Jan 2015 07:29:29 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0J7TTZJ050718;
 Mon, 19 Jan 2015 07:29:29 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201501190729.t0J7TTZJ050718@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 19 Jan 2015 07:29:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r277373 - in stable/10/contrib/ofed: usr.bin usr.lib
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2015 07:29:29 -0000

Author: ngie
Date: Mon Jan 19 07:29:28 2015
New Revision: 277373
URL: https://svnweb.freebsd.org/changeset/base/277373

Log:
  MFC r276805:
  
  X-MFC note: the svn:mergeinfo for this MFC was accidentally committed via
              r277371
  
  r276805 (by ngie):
  
    Build contrib/ofed/usr.{bin,lib} in parallel
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/contrib/ofed/usr.bin/Makefile
  stable/10/contrib/ofed/usr.lib/Makefile

Modified: stable/10/contrib/ofed/usr.bin/Makefile
==============================================================================
--- stable/10/contrib/ofed/usr.bin/Makefile	Mon Jan 19 07:29:07 2015	(r277372)
+++ stable/10/contrib/ofed/usr.bin/Makefile	Mon Jan 19 07:29:28 2015	(r277373)
@@ -8,4 +8,6 @@ SUBDIR= ibaddr ibnetdiscover ibping ibpo
 SUBDIR+= osmtest
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: stable/10/contrib/ofed/usr.lib/Makefile
==============================================================================
--- stable/10/contrib/ofed/usr.lib/Makefile	Mon Jan 19 07:29:07 2015	(r277372)
+++ stable/10/contrib/ofed/usr.lib/Makefile	Mon Jan 19 07:29:28 2015	(r277373)
@@ -1,6 +1,6 @@
-.include <bsd.own.mk>
-
 SUBDIR=	libibcommon libibmad libibumad libibverbs libmlx4 libmthca \
 	libopensm libosmcomp libosmvendor libibcm librdmacm libsdp
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>