From owner-svn-src-all@freebsd.org  Thu Jun 29 23:56:51 2017
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 C1614DA84F9;
 Thu, 29 Jun 2017 23:56:51 +0000 (UTC) (envelope-from gjb@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 862A3787C6;
 Thu, 29 Jun 2017 23:56:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5TNuoL5076761;
 Thu, 29 Jun 2017 23:56:50 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5TNuojd076759;
 Thu, 29 Jun 2017 23:56:50 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201706292356.v5TNuojd076759@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 29 Jun 2017 23:56:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r320486 - in releng/11.1/sys: conf sys
X-SVN-Group: releng
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: in releng/11.1/sys: conf sys
X-SVN-Commit-Revision: 320486
X-SVN-Commit-Repository: base
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.23
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: Thu, 29 Jun 2017 23:56:51 -0000

Author: gjb
Date: Thu Jun 29 23:56:50 2017
New Revision: 320486
URL: https://svnweb.freebsd.org/changeset/base/320486

Log:
  - Copy stable/11@r320475 to releng/11.1 as part of the 11.1-RELEASE
    cycle.
  - Prune svn:mergeinfo from the new branch.
  - Bump __FreeBSD_version.
  - Rename releng/11.1 to RC1.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
     - copied from r320475, stable/11/
Directory Properties:
  releng/11.1/   (props changed)
Modified:
  releng/11.1/sys/conf/newvers.sh
  releng/11.1/sys/sys/param.h

Modified: releng/11.1/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu Jun 29 17:34:48 2017	(r320475)
+++ releng/11.1/sys/conf/newvers.sh	Thu Jun 29 23:56:50 2017	(r320486)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="BETA3"
+BRANCH="RC1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/11.1/sys/sys/param.h
==============================================================================
--- stable/11/sys/sys/param.h	Thu Jun 29 17:34:48 2017	(r320475)
+++ releng/11.1/sys/sys/param.h	Thu Jun 29 23:56:50 2017	(r320486)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100514	/* Master, propagated to newvers */
+#define __FreeBSD_version 1101000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,