From owner-p4-projects@FreeBSD.ORG  Wed Aug 18 00:29:03 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32E0016A4D0; Wed, 18 Aug 2004 00:29:03 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0E8A816A4CE
	for <perforce@freebsd.org>; Wed, 18 Aug 2004 00:29:03 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 043F843D2F
	for <perforce@freebsd.org>; Wed, 18 Aug 2004 00:29:03 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7I0T2Xk020403
	for <perforce@freebsd.org>; Wed, 18 Aug 2004 00:29:02 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I0T2C1020400
	for perforce@freebsd.org; Wed, 18 Aug 2004 00:29:02 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 18 Aug 2004 00:29:02 GMT
Message-Id: <200408180029.i7I0T2C1020400@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 59943 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Aug 2004 00:29:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=59943

Change 59943 by peter@peter_daintree on 2004/08/18 00:28:37

	IFC @59942  (6.0-current!)

Affected files ...

.. //depot/projects/hammer/sys/conf/newvers.sh#12 integrate
.. //depot/projects/hammer/sys/sys/param.h#41 integrate

Differences ...

==== //depot/projects/hammer/sys/conf/newvers.sh#12 (text+ko) ====

@@ -28,10 +28,10 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.62 2004/07/01 06:40:12 ps Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.63 2004/08/18 00:21:12 scottl Exp $
 
 TYPE="FreeBSD"
-REVISION="5.2"
+REVISION="6.0"
 BRANCH="CURRENT"
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"

==== //depot/projects/hammer/sys/sys/param.h#41 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.209 2004/08/08 03:21:37 alfred Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.210 2004/08/18 00:21:12 scottl Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -55,7 +55,7 @@
  * scheme is:  <major><two digit minor><0 if release branch, otherwise 1>xx
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 502128	/* Master, propagated to newvers */
+#define __FreeBSD_version 600000	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>