From owner-p4-projects@FreeBSD.ORG  Mon Jun  2 15:35:28 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A28D837B404; Mon,  2 Jun 2003 15:35:27 -0700 (PDT)
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 59B3537B401
	for <perforce@freebsd.org>; Mon,  2 Jun 2003 15:35:27 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F21CC43F3F
	for <perforce@freebsd.org>; Mon,  2 Jun 2003 15:35:26 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h52MZQ0U099409
	for <perforce@freebsd.org>; Mon, 2 Jun 2003 15:35:26 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h52MZQjD099406
	for perforce@freebsd.org; Mon, 2 Jun 2003 15:35:26 -0700 (PDT)
Date: Mon, 2 Jun 2003 15:35:26 -0700 (PDT)
Message-Id: <200306022235.h52MZQjD099406@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 32426 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: Mon, 02 Jun 2003 22:35:28 -0000

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

Change 32426 by peter@peter_hammer on 2003/06/02 15:35:08

	IFC @32425

Affected files ...

.. //depot/projects/hammer/lib/Makefile#18 integrate
.. //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#9 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#19 integrate

Differences ...

==== //depot/projects/hammer/lib/Makefile#18 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.159 2003/06/01 00:32:21 marcel Exp $
+# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:

==== //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#2 (text+ko) ====

@@ -22,7 +22,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.6 2003/06/02 22:30:59 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>

==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#9 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.79 2003/03/05 04:39:24 marcel Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.80 2003/06/02 22:22:52 peter Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H

==== //depot/projects/hammer/usr.sbin/Makefile#19 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.254 2003/05/25 07:39:06 peter Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.255 2003/06/02 22:22:52 peter Exp $
 
 .if ${MACHINE_ARCH} != "powerpc"
 _sysinstall=sysinstall