From owner-svn-src-all@freebsd.org  Fri Jul  8 13:08:27 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 CC252B837CA;
 Fri,  8 Jul 2016 13:08:27 +0000 (UTC)
 (envelope-from skreuzer@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 9E30C1F41;
 Fri,  8 Jul 2016 13:08:27 +0000 (UTC)
 (envelope-from skreuzer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u68D8QX5085203;
 Fri, 8 Jul 2016 13:08:26 GMT (envelope-from skreuzer@FreeBSD.org)
Received: (from skreuzer@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u68D8QvJ085202;
 Fri, 8 Jul 2016 13:08:26 GMT (envelope-from skreuzer@FreeBSD.org)
Message-Id: <201607081308.u68D8QvJ085202@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: skreuzer set sender to
 skreuzer@FreeBSD.org using -f
From: Steven Kreuzer <skreuzer@FreeBSD.org>
Date: Fri, 8 Jul 2016 13:08:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302431 - head/release/doc/en_US.ISO8859-1/relnotes
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jul 2016 13:08:27 -0000

Author: skreuzer (doc,ports committer)
Date: Fri Jul  8 13:08:26 2016
New Revision: 302431
URL: https://svnweb.freebsd.org/changeset/base/302431

Log:
  Document 302110, Merge netmap support from ncxgbe/ncxl to vcxgbe/vcxl
  
  Approved by:	re (gjb, implicit, relnotes)

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Jul  8 12:47:09 2016	(r302430)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml	Fri Jul  8 13:08:26 2016	(r302431)
@@ -1296,6 +1296,11 @@
       <para revision="288654">The &man.lagg.4; driver has been updated
 	to remove support for the <literal>fec</literal>
 	protocol.</para>
+
+       <para revision="302110" contrib="sponsor" sponsor="&chelsio;">netmap
+	support from the ncxgbe/ncxl interfaces has been merged into the
+	vcxgbe/vcxl interfaces for the &man.cxgbe.4; driver.</para>
+
     </sect2>
   </sect1>