From owner-svn-src-head@freebsd.org  Fri Dec 16 17:44:58 2016
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 21BC7C82717;
 Fri, 16 Dec 2016 17:44:58 +0000 (UTC)
 (envelope-from lifanov@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 E5AA3D7C;
 Fri, 16 Dec 2016 17:44:57 +0000 (UTC)
 (envelope-from lifanov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBGHivAN009879;
 Fri, 16 Dec 2016 17:44:57 GMT (envelope-from lifanov@FreeBSD.org)
Received: (from lifanov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBGHiv3Q009878;
 Fri, 16 Dec 2016 17:44:57 GMT (envelope-from lifanov@FreeBSD.org)
Message-Id: <201612161744.uBGHiv3Q009878@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lifanov set sender to
 lifanov@FreeBSD.org using -f
From: Nikolai Lifanov <lifanov@FreeBSD.org>
Date: Fri, 16 Dec 2016 17:44:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310160 - head
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.23
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: Fri, 16 Dec 2016 17:44:58 -0000

Author: lifanov (ports committer)
Date: Fri Dec 16 17:44:56 2016
New Revision: 310160
URL: https://svnweb.freebsd.org/changeset/base/310160

Log:
  retain cc.4.gz man page for Chelsio T6 NICs
  
  This man page was removed in r225583 when cc.4 was renamed to mod_cc.4
  With reintroduction of cc.4 "make installworld; make delete-old" was
  no longer convergent.
  
  Reported by:	Trond Endrestøl
  Reviewed by:	np, matthew
  Approved by:	np, matthew (mentor)
  Differential Revision:	https://reviews.freebsd.org/D8816

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri Dec 16 17:41:20 2016	(r310159)
+++ head/ObsoleteFiles.inc	Fri Dec 16 17:44:56 2016	(r310160)
@@ -2939,7 +2939,6 @@ OLD_FILES+=usr/lib32/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
-OLD_FILES+=usr/share/man/man4/cc.4.gz
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz