From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 02:40:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADE8B16A419; Wed,  3 Oct 2007 02:40:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4AEBB16A421
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 02:40:17 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4241013C447
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 02:40:17 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l932eHIZ066077
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 02:40:17 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l932eEwl066074
	for perforce@freebsd.org; Wed, 3 Oct 2007 02:40:14 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 3 Oct 2007 02:40:14 GMT
Message-Id: <200710030240.l932eEwl066074@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127122 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 03 Oct 2007 02:40:18 -0000

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

Change 127122 by imp@imp_paco-paco on 2007/10/03 02:39:44

	IFC @127120

Affected files ...

.. //depot/projects/arm/src/Makefile.inc1#29 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#28 integrate
.. //depot/projects/arm/src/UPDATING#20 integrate
.. //depot/projects/arm/src/cddl/lib/Makefile#4 integrate
.. //depot/projects/arm/src/cddl/sbin/zfs/Makefile#3 integrate
.. //depot/projects/arm/src/cddl/sbin/zpool/Makefile#3 integrate
.. //depot/projects/arm/src/cddl/usr.bin/Makefile#4 integrate
.. //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#3 integrate
.. //depot/projects/arm/src/cddl/usr.sbin/Makefile#4 integrate
.. //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#3 integrate
.. //depot/projects/arm/src/contrib/gcc/opts.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/arm/src/etc/defaults/rc.conf#18 integrate
.. //depot/projects/arm/src/etc/rc.d/Makefile#10 integrate
.. //depot/projects/arm/src/etc/rc.d/cached#2 delete
.. //depot/projects/arm/src/etc/rc.d/nscd#3 integrate
.. //depot/projects/arm/src/include/Makefile#13 integrate
.. //depot/projects/arm/src/lib/libc/Makefile#7 integrate
.. //depot/projects/arm/src/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/arm/src/lib/libpthread/Makefile#6 integrate
.. //depot/projects/arm/src/lib/libthr/Makefile#8 integrate
.. //depot/projects/arm/src/lib/libutil/expand_number.3#2 integrate
.. //depot/projects/arm/src/lib/libutil/flopen.3#3 integrate
.. //depot/projects/arm/src/lib/libutil/humanize_number.3#4 integrate
.. //depot/projects/arm/src/lib/libutil/kld.3#3 integrate
.. //depot/projects/arm/src/libexec/atrun/Makefile#3 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 integrate
.. //depot/projects/arm/src/sbin/ggate/Makefile#4 integrate
.. //depot/projects/arm/src/share/man/man4/pci.4#3 integrate
.. //depot/projects/arm/src/share/man/man9/pci.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/sleepqueue.9#4 integrate
.. //depot/projects/arm/src/share/misc/committers-src.dot#7 integrate
.. //depot/projects/arm/src/share/mk/bsd.libnames.mk#7 integrate
.. //depot/projects/arm/src/share/mk/bsd.prog.mk#4 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/legacy.c#3 integrate
.. //depot/projects/arm/src/sys/amd64/include/legacyvar.h#3 integrate
.. //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#10 integrate
.. //depot/projects/arm/src/sys/arm/arm/locore.S#24 integrate
.. //depot/projects/arm/src/sys/arm/conf/AVILA#15 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#9 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#11 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#12 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#10 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#20 integrate
.. //depot/projects/arm/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/arm/src/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pci.c#6 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate
.. //depot/projects/arm/src/sys/dev/bge/if_bge.c#34 integrate
.. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#11 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#18 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#11 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbbvar.h#7 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#30 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#13 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_private.h#13 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_user.c#5 integrate
.. //depot/projects/arm/src/sys/dev/pci/pcib_private.h#8 integrate
.. //depot/projects/arm/src/sys/dev/pci/pcivar.h#13 integrate
.. //depot/projects/arm/src/sys/geom/geom_event.c#4 integrate
.. //depot/projects/arm/src/sys/i386/i386/legacy.c#3 integrate
.. //depot/projects/arm/src/sys/i386/include/legacyvar.h#3 integrate
.. //depot/projects/arm/src/sys/i386/pci/pci_bus.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_sx.c#14 integrate
.. //depot/projects/arm/src/sys/kern/sched_ule.c#25 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#37 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#15 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_constants.h#18 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.h#9 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_timer.c#16 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_var.h#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.c#23 integrate
.. //depot/projects/arm/src/sys/powerpc/powermac/grackle.c#3 integrate
.. //depot/projects/arm/src/sys/powerpc/powermac/uninorth.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/apb.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#12 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#13 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/hv_pci.c#4 integrate
.. //depot/projects/arm/src/sys/sys/param.h#35 integrate
.. //depot/projects/arm/src/sys/sys/pciio.h#2 integrate
.. //depot/projects/arm/src/sys/vm/vm_object.c#23 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.c#32 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.h#15 integrate
.. //depot/projects/arm/src/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate
.. //depot/projects/arm/src/tools/make_libdeps.sh#3 integrate
.. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#9 integrate
.. //depot/projects/arm/src/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/arm/src/usr.bin/Makefile#6 integrate
.. //depot/projects/arm/src/usr.sbin/Makefile#15 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/cached/Makefile#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/agent.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agent.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/Makefile.inc#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/group.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/group.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/passwd.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/passwd.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/services.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/services.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cached.8#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/cached.c#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/cached.conf.5#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachedcli.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachedcli.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachelib.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachelib.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cacheplcs.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cacheplcs.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/config.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/config.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/debug.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/debug.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/hashtable.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/log.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/log.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_rs_query.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_rs_query.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_ws_query.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_ws_query.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/parser.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/parser.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/protocol.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/protocol.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/query.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/query.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/singletons.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/singletons.h#2 delete
.. //depot/projects/arm/src/usr.sbin/config/Makefile#4 integrate
.. //depot/projects/arm/src/usr.sbin/cron/cron/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#5 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agent.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agent.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/Makefile.inc#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/group.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/passwd.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/services.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cachelib.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cachelib.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cacheplcs.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cacheplcs.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/config.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/config.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/debug.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/hashtable.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/log.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/log.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_ws_query.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_ws_query.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscd.8#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscd.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscd.conf.5#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscdcli.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscdcli.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/parser.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/parser.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/protocol.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/protocol.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/query.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/query.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/singletons.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/singletons.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate

Differences ...

==== //depot/projects/arm/src/Makefile.inc1#29 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -330,8 +330,7 @@
 .endfor
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/libexec usr/sbin usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -415,9 +414,7 @@
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/include usr/lib32 usr/share/misc
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1027,12 +1024,20 @@
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+		lib/libopie lib/libpam ${_default_thread_lib} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
 
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib=	lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/libpthread
+.endif
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L

==== //depot/projects/arm/src/ObsoleteFiles.inc#28 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h

==== //depot/projects/arm/src/UPDATING#20 (text+ko) ====

@@ -21,6 +21,20 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070930:
+	The PCI code has been made aware of PCI domains. This means that
+	the location strings as used by pciconf(8) etc are now in the
+	following format: pci<domain>:<bus>:<device>[:<function>]. It
+	also means that consumers of <sys/pciio.h> potentially need to
+	be recompiled; this includes the hal and xorg-server ports.
+
+20070928:
+        The caching daemon (cached) was renamed to nscd. nscd.conf
+        configuration file should be used instead of cached.conf and
+        nscd_enable, nscd_pidfile and nscd_flags options should be used
+        instead of cached_enable, cached_pidfile and cached_flags in
+        rc.conf.
+
 20070704:
         The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +901,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $

==== //depot/projects/arm/src/cddl/lib/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,9 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _libzpool=	libzpool
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/cddl/sbin/zfs/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/cddl/sbin/zpool/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/cddl/usr.bin/Makefile#4 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_ztest}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
@@ -15,7 +15,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/cddl/usr.sbin/Makefile#4 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_zdb}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _zdb=	zdb
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
@@ -16,7 +16,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/contrib/gcc/opts.c#3 (text+ko) ====

@@ -20,7 +20,7 @@
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */
 
 #include "config.h"
 #include "system.h"
@@ -501,7 +501,10 @@
       flag_reorder_functions = 1;
       flag_tree_store_ccp = 1;
       flag_tree_store_copy_prop = 1;
-      flag_tree_vrp = 1;
+      /* XXX: some issues with ports have been traced to -ftree-vrp.
+         So remove it from -O2 and above.  Note that jdk1{5,6} are affected
+         and they build with w/-O3 - so we cannot just move it to -O3. */
+      // flag_tree_vrp = 1;
 
       if (!optimize_size)
 	{

==== //depot/projects/arm/src/contrib/wpa_supplicant/main.c#3 (text) ====

@@ -82,7 +82,7 @@
 	       "  -N = start describing new interface\n");
 
 	printf("example:\n"
-	       "  wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
+	       "  wpa_supplicant -Dbsd -iwlan0 -c/etc/wpa_supplicant.conf\n");
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 }
 

==== //depot/projects/arm/src/etc/defaults/rc.conf#18 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -495,7 +495,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -503,6 +502,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/arm/src/etc/rc.d/Makefile#10 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/arm/src/etc/rc.d/nscd#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nscd,v 1.4 2007/08/09 13:06:11 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
 #
 
 # PROVIDE: nscd
@@ -8,7 +8,7 @@
 # BEFORE: LOGIN
 
 #
-# Add the following lines to /etc/rc.conf to enable cached:
+# Add the following lines to /etc/rc.conf to enable nscd:
 #
 # nscd_enable="YES"
 #
@@ -24,9 +24,29 @@
 extra_commands="flush"
 flush_cmd="${command} -I all"
 
-nscd_enable=${nscd_enable:-"NO"}
-nscd_pidfile=${nscd_pidfile:-"/var/run/nscd.pid"}
-nscd_flags=${nscd_flags:-""}
+# usage: _nscd_set_option <option name> <default value>
+#
+_nscd_set_option() {
+	local _optname _defoptval _nscd_opt_val _cached_opt_val
+	_optname=$1
+	_defoptval=$2
+
+	_nscd_opt_val=$(eval "echo \$nscd_${_optname}")
+	_cached_opt_val=$(eval "echo \$cached_${_optname}")
+	
+	if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
+		warn "You should use nscd_${_optname} instead of" \
+		    "cached_${_optname}"
+		setvar "nscd_${_optname}" "$_cached_opt_val"
+	else
+		setvar "nscd_${_optname}" "${_nscd_opt_val:-$_defoptval}"
+	fi
+}
+
 
 load_rc_config $name
+_nscd_set_option "enable" "NO"
+_nscd_set_option "pidfile" "/var/run/nscd.pid"
+_nscd_set_option "flags" ""
 run_rc_command "$1"
+

==== //depot/projects/arm/src/include/Makefile#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -45,11 +45,13 @@
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
+	geom/mirror geom/multipath geom/nop \
+	geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/arm/src/lib/libc/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
 
 SHLIBDIR?= /lib
 
@@ -23,6 +23,7 @@
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
+DPADD+=	${LIBGCC}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc
 

==== //depot/projects/arm/src/lib/libc/gen/Makefile.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.127 2007/07/04 23:27:38 peter Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -85,7 +85,8 @@
 	fpclassify.3 isnormal.3
 MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3
 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \
-	fts.3 fts_read.3 fts.3 fts_set.3
+	fts.3 fts_read.3 fts.3 fts_set.3 fts.3 fts_set_clientptr.3 \
+	fts.3 fts_get_clientptr.3 fts.3 fts_get_stream.3
 MLINKS+=ftw.3 nftw.3
 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
 	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \

==== //depot/projects/arm/src/lib/libpthread/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -11,7 +11,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -47,7 +48,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread"
+.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/arm/src/lib/libthr/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -43,7 +44,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libthr"
+.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/arm/src/lib/libutil/expand_number.3#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/expand_number.3,v 1.2 2007/09/05 14:25:16 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/expand_number.3,v 1.3 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd April 16, 2007
 .Dt EXPAND_NUMBER 3
@@ -83,4 +83,4 @@
 The
 .Fn expand_number
 function first appeared in
-.Fx 7.0 .
+.Fx 6.3 .

==== //depot/projects/arm/src/lib/libutil/flopen.3#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.5 2007/08/03 09:20:28 des Exp $
+.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.6 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd May 10, 2007
 .Dt FLOPEN 3
@@ -93,6 +93,11 @@
 .Xr errno 2 ,
 .Xr flock 2 ,
 .Xr open 2
+.Sh HISTORY
+The
+.Fn flopen
+function first appeared in
+.Fx 6.3 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/arm/src/lib/libutil/humanize_number.3#4 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"	$NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.11 2007/09/05 14:25:16 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.12 2007/09/28 15:31:44 obrien Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -147,9 +147,11 @@
 .Dv HN_GETSCALE
 is specified, the prefix index number will be returned instead.
 .Sh SEE ALSO
-.Xr expand_number 3 
+.Xr expand_number 3
 .Sh HISTORY
 The
 .Fn humanize_number
 function first appeared in
-.Nx 2.0 .
+.Nx 2.0
+and then in
+.Fx 5.3 .

==== //depot/projects/arm/src/lib/libutil/kld.3#3 (text) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/kld.3,v 1.3 2006/09/30 10:34:13 ru Exp $
+.\" $FreeBSD: src/lib/libutil/kld.3,v 1.4 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd February 18, 2006
 .Os
@@ -83,7 +83,7 @@
 and
 .Fn kld_load
 functions first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
 .Sh AUTHORS
 The
 .Fn kld_isloaded

==== //depot/projects/arm/src/libexec/atrun/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
@@ -16,7 +16,7 @@
 WFORMAT=0
 
 DPADD=	${LIBPAM} ${LIBUTIL}
-LDADD=	-lpam -lutil
+LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \

==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 (text+ko) ====

@@ -20,7 +20,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1065 2007/09/15 05:37:31 jkoshy Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1067 2007/09/28 05:14:39 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -1366,6 +1366,12 @@
 	utility has been added to control the behavior of disk devices
 	using this feature.</para>
 
+      <para>A new <literal>GEOM_VIRSTOR</literal> class has been added
+	to provide virtual storage devices of arbitrary size with
+	physical devices as backing store.  More information can be
+	found in the manual page for its control utility,
+	&man.gvirstor.8;.</para>
+
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
 	It creates a very huge provider (41PB) <filename>/dev/gzero</filename>
 	and is mainly useful for performance testing.
@@ -1549,8 +1555,8 @@
       MIB described in RFC 2790.  &merged;</para>
 
     <para>The &man.camcontrol.8; utility now supports
-      a <command>readcap</command> to display the size of
-      devices.</para>
+      a <command>readcap</command> command to display the size of
+      devices. &merged;</para>
 
     <para>The &man.cmp.1; utility now supports an <option>-h</option>
       flag to compare the symbolic link itself rather than the
@@ -1902,7 +1908,7 @@
     <para>The objformat(1) utility and getobjformat(3) library (the
       last remnants of a.out object file support) have been removed.</para>
 
-    <para>The &man.pam.nologin.8; module no longer provides a
+    <para>The &man.pam.nologin.8; module no longer provides
       an authentication function; instead it now provides an account
       management function.  Third-party files in
       <filename>/usr/local/etc/pam.d</filename> may  

==== //depot/projects/arm/src/sbin/ggate/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,7 @@
 	${_ggated} \
 	ggatel
 
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")   
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
 .endif

==== //depot/projects/arm/src/share/man/man4/pci.4#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.18 2007/04/07 14:36:18 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
 .\"
-.Dd October 24, 1999
+.Dd September 30, 2007
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@
 .Bl -tag -width pd_vendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pd_name
 .Tn PCI
 device driver name.
@@ -150,7 +150,7 @@
 .Bl -tag -width pc_subvendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pc_hdr
 .Tn PCI
 header type.
@@ -257,9 +257,10 @@
 .It pi_sel
 A
 .Va pcisel
-structure which specifies the bus, slot and function the user would like to
-query.
-If the specific bus is not found, errno will be set to ENODEV and -1 returned from the ioctl.
+structure which specifies the domain, bus, slot and function the user would
+like to query.
+If the specific bus is not found, errno will be set to ENODEV and -1 returned
+from the ioctl.
 .It pi_reg
 The
 .Tn PCI

==== //depot/projects/arm/src/share/man/man9/pci.9#2 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/pci.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
 .\"
-.Dd January 22, 2005
+.Dd September 30, 2007
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -39,6 +39,7 @@
 .Nm pci_set_powerstate ,
 .Nm pci_get_powerstate ,
 .Nm pci_find_bsf ,
+.Nm pci_find_dbsf ,
 .Nm pci_find_device
 .Nd PCI bus interface
 .Sh SYNOPSIS
@@ -65,6 +66,8 @@
 .Ft device_t
 .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func"
 .Ft device_t
+.Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func"
+.Ft device_t
 .Fn pci_find_device "uint16_t vendor" "uint16_t device"
 .Sh DESCRIPTION
 The
@@ -198,6 +201,30 @@
 number actually refers to the number of the device on the bus,
 which does not necessarily indicate its geographic location
 in terms of a physical slot.
+Note that in case the system has multiple PCI domains,
+the
+.Fn pci_find_bsf
+function only searches the first one.
+Actually, it is equivalent to:
+.Bd -literal -offset indent
+pci_find_dbsf(0, bus, slot, func);
+.Ed
+.Pp
+The
+.Fn pci_find_dbsf
+function looks up the
+.Vt device_t
+of a PCI device, given its
+.Fa domain ,
+.Fa bus ,
+.Fa slot ,
+and
+.Fa func .
+The
+.Fa slot
+number actually refers to the number of the device on the bus,
+which does not necessarily indicate its geographic location
+in terms of a physical slot.
 .Pp
 The
 .Fn pci_find_device

==== //depot/projects/arm/src/share/man/man9/sleepqueue.9#4 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.15 2007/03/09 22:41:01 jhb Exp $
+.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.16 2007/09/28 11:13:40 gabor Exp $
 .\"
-.Dd March 10, 2004
+.Dd August 13, 2007
 .Dt SLEEPQUEUE 9
 .Os
 .Sh NAME
@@ -54,11 +54,11 @@
 .Ft void
 .Fn sleepq_abort "struct thread *td"
 .Ft void
-.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags"
+.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags" "int queue"
 .Ft struct sleepqueue *
 .Fn sleepq_alloc "void"
 .Ft void
-.Fn sleepq_broadcast "void *wchan" "int flags" "int pri"
+.Fn sleepq_broadcast "void *wchan" "int flags" "int pri" "int queue"
 .Ft int
 .Fn sleepq_calc_signal_retval "int sig"
 .Ft int
@@ -74,7 +74,7 @@
 .Ft void
 .Fn sleepq_remove "struct thread *td" "void *wchan"
 .Ft void
-.Fn sleepq_signal "void *wchan" "int flags" "int pri"

>>> TRUNCATED FOR MAIL (1000 lines) <<<